Hawkin
/
arangodb
mirror of https://gitee.com/bigwinds/arangodb
1
0
Fork 0
Code Issues Projects Releases Wiki Activity
35,255 Commits 358 Branches 495 Tags 994 MiB
Commit Graph

1700 Commits

Author SHA1 Message Date
Jan Steemann d57c3ef792 removed unused method 2016-09-01 12:02:24 +02:00
Jan Steemann a2f0b0a49f Merge branch 'devel' of https://github.com/arangodb/arangodb into devel 2016-09-01 11:20:15 +02:00
Jan Steemann e03d550985 removed unused methods 2016-09-01 11:19:55 +02:00
jsteemann be820ac927 fix freeing of nullptr 2016-09-01 08:42:17 +02:00
jsteemann 149ef4ab8b fix freeing of nullptr 2016-09-01 08:39:44 +02:00
jsteemann 2d1e0bd3ae fixed some leaks 2016-08-31 15:30:47 +02:00
jsteemann a04934ce50 Merge branch 'engine-vs-velocystream' of https://github.com/arangodb/arangodb into generic-col-types 2016-08-31 09:25:09 +02:00
Jan Christoph Uhde ed111a39a1 Merge branch 'devel' into obi-velocystream-try-merge-devel 
* devel: (24 commits)
  minor fixes
  fix effect that on second install we will complain about mismatching passwords
  only test for cleaning up 3rdparty if we're parametrized to do so.
  fix CMake so it finds the PythonInterpreter even with oder versions
  hexify corrupted markers
  Fix comments
  fixed cluster start
  issue #2022: double max allowed request body size, cap --batch-size value in arangoimp
  fixed issue #2023: added replicationFactor to docs
  improve the perf script
  fix perfsetupscript
  clean up perf script
  add SYSTEM flag to boost includes to avoid warnings
  Adding Foxx access to agency
  Adding Foxx access to agency
  fix compile warning
  Add missing windows library.
  fix windows compile problems.
  Fix syntax error in windows client installer.
  If we have relative paths that are working, make them absolute so they still work after CWD's of arangod
  ...

Conflicts:
	arangod/Agency/AgentConfiguration.cpp
	arangod/GeneralServer/HttpCommTask.cpp
	arangod/RestServer/DatabaseFeature.cpp
	arangod/VocBase/datafile.cpp
 2016-08-30 22:04:31 +02:00
jsteemann 9b94287fb7 unify id handling? 2016-08-30 16:07:35 +02:00
jsteemann 9e708112a6 privatize some TRI_datafile_t internals 2016-08-29 15:43:03 +02:00
Jan Christoph Uhde 3d26df27a0 prepare the fixing of resthandlers 2016-08-27 00:27:07 +02:00
jsteemann 50d4d5493c Merge branch 'devel' of https://github.com/arangodb/arangodb into generic-col-types 2016-08-26 15:32:24 +02:00
jsteemann 4f994f70b5 fix compile warning 2016-08-26 15:31:57 +02:00
jsteemann 598990eb5c Merge branch 'devel' of https://github.com/arangodb/arangodb into generic-col-types 2016-08-26 15:27:37 +02:00
Wilfried Goesgens 1a4675865e Merge branch 'devel' of github.com:arangodb/ArangoDB into pipeline 2016-08-26 14:55:48 +02:00
jsteemann 0fe0e89a89 invalidate bucket data 2016-08-26 14:53:37 +02:00
jsteemann 4727c833c8 fixed some leaks 2016-08-26 14:29:31 +02:00
Wilfried Goesgens 1de83c020d fix windows compile problems. 2016-08-26 14:17:28 +02:00
jsteemann a31fe62c34 Merge branch 'engine-vs-velocystream' of https://github.com/arangodb/arangodb into generic-col-types 2016-08-26 14:02:27 +02:00
jsteemann 22b1b7b7e7 added unload() functionality for indexes (untested) 2016-08-26 14:00:03 +02:00
Michael Hackstein 0985e7fc88 Merge branch 'engine-vs-velocystream' of github.com:arangodb/arangodb into generic-col-types 2016-08-26 12:52:41 +02:00
Wilfried Goesgens 3d6810ecfe If we have relative paths that are working, make them absolute so they still work after CWD's of arangod 2016-08-26 12:50:48 +02:00
jsteemann 8a6d054642 Merge branch 'devel' of https://github.com/arangodb/arangodb into engine-vs-velocystream 2016-08-26 12:37:07 +02:00
Michael Hackstein 1c883a811c Potential fix for unload->load. Needs to be validated. 2016-08-26 12:35:33 +02:00
jsteemann 08f1fa3a22 added assertions to prevent buffer overruns 2016-08-26 12:04:28 +02:00
jsteemann 9ae2cb36e9 fix dumping of VPackSlices without CustomTypeHandler 2016-08-26 10:51:54 +02:00
Wilfried Goesgens d37c9a751f fix syntax :-( 2016-08-25 17:50:08 +02:00
Wilfried Goesgens f39ec1c591 Windows install: no backslash strings in cmake. 2016-08-25 17:35:29 +02:00
Michael Hackstein 7d6402b15c Fixed soem crashes and undefined behaviuor. Server does not crash during tests, however a lot of them are still red 2016-08-25 14:51:03 +02:00
Michael Hackstein e1ac5175b1 Merge branch 'engine-vs-velocystream' of github.com:arangodb/arangodb into generic-col-types 2016-08-25 11:09:11 +02:00
Michael Hackstein 1f3dabc8e1 Merge branch 'engine-vs-velocystream' of github.com:arangodb/arangodb into generic-col-types 2016-08-25 11:08:39 +02:00
jsteemann f4aa60ed0d Merge branch 'devel' of https://github.com/arangodb/arangodb into engine-vs-velocystream 2016-08-25 10:38:26 +02:00
Wilfried Goesgens 4939e02fb2 Make the existance of the database directory non-mandatory again. 2016-08-25 10:07:37 +02:00
Michael Hackstein 2af30f056d Moved index creation to use LogicalCollection instead of TRI_collection_t. Involved changes of the constructor, all can now be created using iid and Slice. Removed specialized functions to create/find indixes in v8-voc index. Also the iteration is modified. This commit compiles but tests will fail. Merge commit. 2016-08-25 09:57:36 +02:00
jsteemann 1dab450622 Merge branch 'devel' of https://github.com/arangodb/arangodb into readcache 2016-08-24 17:35:10 +02:00
jsteemann 07055384b8 Merge branch 'devel' of https://github.com/arangodb/arangodb into readcache 2016-08-24 17:34:59 +02:00
jsteemann 04f5fbbdb2 fixed issue #2018 2016-08-24 17:33:49 +02:00
Jan Christoph Uhde f9feb14a6e Revert "Merge branch 'obi-velocystream-attribute-translator' into obi-velocystream" 
This reverts commit 76679e1636, reversing
changes made to 5be5030983.

Conflicts:
	arangod/GeneralServer/VppCommTask.cpp
 2016-08-24 15:26:49 +02:00
Wilfried Goesgens 1688655509 Merge branch 'devel' of github.com:arangodb/ArangoDB into pipeline 2016-08-24 14:46:48 +02:00
Wilfried Goesgens 1f162ac882 Implement scheme to more clever pass the directories from the build process to the run-time 
We will now try to evaluate the toplevel install directory from the configured binary dir.
We will use this toplever directory when searching for other directories.
 2016-08-24 14:45:08 +02:00
Jan Christoph Uhde 76679e1636 Merge branch 'obi-velocystream-attribute-translator' into obi-velocystream 
* obi-velocystream-attribute-translator:
  add options to Slice::get and use them for VPackHeader
  add translator to VelocyPackHelper and headerOption to Vpp Protocol

Conflicts:
	arangod/GeneralServer/VppCommTask.cpp
	lib/Rest/CommonDefines.h
 2016-08-24 09:18:35 +02:00
Jan Christoph Uhde 8f5e6f65d6 add translator to VelocyPackHelper and headerOption to Vpp Protocol 2016-08-23 13:05:50 +02:00
jsteemann 5f06a5c025 Merge branch 'devel' of https://github.com/arangodb/arangodb into readcache 2016-08-23 12:13:08 +02:00
Jan Steemann 5dd8c8feee throw exception in StringBuffer ctor when no memory is available 2016-08-22 17:36:12 +02:00
Mark 3bd5c27c0c changes for Visual Studio 2016-08-19 17:22:57 +02:00
Jan Christoph Uhde e1e7e2da0b Merge remote-tracking branch 'origin/engine-vs-velocystream' into obi-velocystream-merge 
* origin/engine-vs-velocystream: (91 commits)
  removed useless include
  removed JsonParser
  removed JsonHelper
  Fixed another failed nullptr handling in LogicalCollection cluster case.
  Fixed undefined behaviour in rest error creation
  Implemented updated of LogicalCollectionInfo. Right now this is only used in Cluster Mode
  agency startup changed to bootstrapping
  Mention howto control core files on linux.
  shutdown fixed
  Removed create / drop system collection from Cluster test. This is forbidden now
  The logical colleciton now knows it's journalSize
  Fixed a bug in collectionNameResolver. It now returns cid 0 for not found collections in cluster again.
  pushing corrected unittest script and cluster startup scripts
  adjusting startup scripts
  missing source file added
  we have a bootstrapping agency
  votes are processed correctly again
  Add module.context.createDocumentationRouter
  Don't implicitely build the windows packages.
  remove debug print
  ...

Conflicts:
	arangod/Cluster/ClusterComm.cpp
	arangod/GeneralServer/VppCommTask.h
	arangod/RestHandler/RestBaseHandler.cpp
	lib/Rest/VppRequest.h
 2016-08-19 14:35:05 +02:00
jsteemann f6ca78f9e7 removed JsonParser 2016-08-19 12:39:26 +02:00
Frank Celler d17f42379b fix errors during shutdown 2016-08-19 12:27:01 +02:00
jsteemann e9866698aa removed JsonHelper 2016-08-19 12:24:12 +02:00
jsteemann c5f151da5c Merge branch 'devel' of https://github.com/arangodb/arangodb into readcache 2016-08-19 11:01:15 +02:00
Jan Christoph Uhde 3a9867f86d merge with frank 2016-08-19 10:00:43 +02:00
Jan Christoph Uhde 61cb8f561f Merge remote-tracking branch 'origin/obi-velocystream-frank' into obi-velocystream 
* origin/obi-velocystream-frank:
  fixed ownership of handler

Conflicts:
	arangod/GeneralServer/VppCommTask.cpp
 2016-08-19 09:58:27 +02:00
Kaveh Vahedipour d8cb8a33ac pushing corrected unittest script and cluster startup scripts 2016-08-19 09:49:44 +02:00
Frank Celler aed99f6b53 fixed ownership of handler 2016-08-18 23:06:36 +02:00
Wilfried Goesgens dadd9833d1 Implement detection whether we are in a git repo and use the toplevel source dir. 2016-08-18 17:53:47 +02:00
jsteemann d7b2141da0 Merge branch 'devel' of https://github.com/arangodb/arangodb into readcache 2016-08-18 16:22:00 +02:00
Wilfried Goesgens 7250db8830 Merge branch 'devel' of github.com:arangodb/ArangoDB into pipeline 2016-08-18 15:59:12 +02:00
Wilfried Goesgens 976b25b745 We nowadays install to /usr/share/arangodb3/ 2016-08-18 15:57:33 +02:00
jsteemann 0ec5ae6c59 signal under the lock 2016-08-17 17:06:51 +02:00
jsteemann 1b5ff51d05 potentially fix thread pool shutdown issues 2016-08-17 11:30:27 +02:00
jsteemann 84656f776b move CleanupThread into engine 2016-08-17 10:48:17 +02:00
jsteemann 2ab782aeb2 removed obsolete defines 2016-08-16 17:51:33 +02:00
jsteemann d5af72f47f fix typo in method name 2016-08-16 13:11:39 +02:00
Jan Christoph Uhde 1d1e19678d failed try to resolve externals 2016-08-15 22:58:21 +02:00
Jan Christoph Uhde df3d83ae9e add sanitizeExternalsChecked function 2016-08-15 22:21:02 +02:00
Michael Hackstein 7b328d39e9 Merge branch 'devel' of github.com:arangodb/arangodb into engine-vs-velocystream 2016-08-11 12:41:08 +02:00
servusoft 3b5c9a73d5 Update build-repository.h.in 2016-08-09 13:39:46 +02:00
servusoft 48da84a323 Create build-repository.h.in 
Adjustment for Repository Version
 2016-08-09 13:23:59 +02:00
Wilfried Goesgens 2f3c03f126 Simplify 2016-08-08 10:16:34 +02:00
servusoft 4a1eb6c8da Global definition heap memory (TRI_V8_MAXHEAP) and adoptation for ARM 2016-08-05 18:50:53 +02:00
jsteemann 95ac01313b privatization 2016-08-04 17:06:51 +02:00
jsteemann f44effd225 Merge branch 'devel' of https://github.com/arangodb/arangodb into readcache 2016-08-02 12:59:06 +02:00
Jan Steemann 8e591c16c2 fixed random number generator initialization 2016-08-02 12:25:46 +02:00
jsteemann 5cdbfc423d Merge branch 'devel' of https://github.com/arangodb/arangodb into readcache 2016-08-02 11:57:37 +02:00
Jan Steemann 2870a9f10f visual studio 2016-08-02 11:46:44 +02:00
jsteemann 788922f55a some fixes 2016-08-01 17:16:23 +02:00
Frank Celler 4d81c4c733 just in case someone changes the epoch 2016-08-01 13:43:30 +02:00
Frank Celler af6cbe272a fixed epoch computation 2016-08-01 13:43:30 +02:00
jsteemann 71bd7deace Merge branch 'devel' of https://github.com/arangodb/arangodb into readcache 2016-08-01 09:04:17 +02:00
Frank Celler a078a4fd70 just in case someone changes the epoch 2016-07-31 18:56:14 +02:00
Frank Celler 792f42d5af fixed epoch computation 2016-07-31 11:27:59 +02:00
jsteemann ebaabdb076 Merge branch 'obi-velocystream-4' of https://github.com/arangodb/arangodb into engine-vs-velocystream 2016-07-28 16:11:26 +02:00
jsteemann cc5eaea09c Merge branch 'devel' of https://github.com/arangodb/arangodb into readcache 2016-07-28 09:10:17 +02:00
Frank Celler 24db83573a added thread affinity for MacOSX 2016-07-27 22:29:59 +02:00
jsteemann 55eda66d4a Merge branch 'devel' of https://github.com/arangodb/arangodb into readcache 2016-07-27 15:57:56 +02:00
jsteemann 10a60b5458 refactoring 2016-07-27 15:40:25 +02:00
Jan Christoph Uhde 36167b8e17 Merge remote-tracking branch 'origin/devel' into obi-velocystream-4 
* origin/devel: (23 commits)
  Fix trusted origin tests
  Fix CORS with credentials
  New version of script.
  updated CHANGELOG
  grunt build [ci skip]
  improved gv
  added expand function to gv
  enable: compile_commands.json
  semistandard fix
  improved gv
  gv bugfix
  updated license
  improved gv
  Adapting to 64 bit ARM architecture (aarch64) at the exceptions for TRI_PADDING_32
  improved gv performance
  fix handling of empty query strings
  fixed query editor issues
  Modularize perf script.
  Add one more event.
  Add a first perf probe monitoring script.
  ...

Conflicts:
	arangod/GeneralServer/HttpCommTask.cpp
 2016-07-27 13:25:34 +02:00
jsteemann 26ce0c6936 some collection handling refactoring 2016-07-27 13:12:26 +02:00
servusoft 44c9fb824e Adapting to 64 bit ARM architecture (aarch64) at the exceptions for TRI_PADDING_32 2016-07-26 18:56:53 +02:00
Frank Celler 078457c302 cleanup of calls 2016-07-26 17:20:14 +02:00
jsteemann b54f0a15d8 removed last occurrence of TRI_vector_t in arangod 2016-07-26 08:04:30 +02:00
jsteemann 7653b922b3 moved TRI_MSync out of server.h 2016-07-18 17:58:28 +02:00
Jan Steemann a0ff5e9dc3 remove unused JsonHelper includes 2016-07-18 13:52:08 +02:00
Wilfried Goesgens 15f1990b57 by @servusoft : use signed char if we want to operate with `-1` 2016-07-18 11:19:43 +02:00
Max Neunhoeffer a78fd42b67 Merge branch 'HLC' into devel 2016-07-13 12:52:33 +02:00
Max Neunhoeffer 4202b817ed Fix fix. 2016-07-13 12:22:00 +02:00
Max Neunhoeffer 3df0d2dc32 Fix bug in HybridLogicalClock. 2016-07-13 12:21:17 +02:00
Jan Christoph Uhde 03e89265fd Merge branch 'devel' of github.com:arangodb/arangodb into obi-merge-restserver 
* 'devel' of github.com:arangodb/arangodb:
  updated CHANGELOG
  fixed array index batch insertion issue
  Fix syntax errors in  user auth documentation
  fix grammer.
  prevent compile warning
 2016-07-13 11:35:16 +02:00
Jan Steemann 6b7defc737 fixed array index batch insertion issue 2016-07-13 11:32:39 +02:00
Jan Christoph Uhde ff49d7b0b4 Merge remote-tracking branch 'origin/devel' into obi-merge-restserver-next 
* origin/devel: (105 commits)
  Fixed failure tests in SkiplistIndex
  Fixed a bug with reset of new skiplist index iterator
  whitespace removal
  micro optimization for key generator key tracking
  GraphQL! Hype! 🎉
  explicit
  remove unused variable
  explicit
  Fix VS complaints
  complaints
  complaints
  updated CHANGELOG
  fixed issue #1937
  Modified the SkiplistIndex lookup s.t. it does not build one large VPackBuilder containing all combinations of search values, but instead has an option to rewrite it in-place and just has to maintain the intervals.
  ignore revision ids
  fix destructuring of Externals in MERGE
  make it code.
  ignore primary and edge indexes during cluster restore
  grunt build [ci skip]
  semist.
  ...
 2016-07-13 07:33:13 +00:00
Max Neunhoeffer 4649036943 Add and read out HLC time stamps in HTTP headers. 2016-07-12 23:36:14 +02:00
Max Neunhoeffer 27fcfecee3 Handle overflow of counter in HLC better. 2016-07-12 23:00:23 +02:00
Max Neunhoeffer 18925faf8f Merge branch 'devel' into HLC 2016-07-12 22:51:40 +02:00
jsteemann dcfaee33e9 Merge branch 'devel' of https://github.com/arangodb/arangodb into devel 2016-07-12 15:57:40 +02:00
Max Neunhoeffer 846e6b6127 Merge remote-tracking branch 'origin/devel' into HLC 2016-07-12 15:10:24 +02:00
Michael Hackstein daeef23761 Merge branch 'devel' of github.com:arangodb/arangodb into devel 2016-07-12 14:46:35 +02:00
Michael Hackstein d9e1f41871 Modified the SkiplistIndex lookup s.t. it does not build one large VPackBuilder containing all combinations of search values, but instead has an option to rewrite it in-place and just has to maintain the intervals. 2016-07-12 14:46:24 +02:00
Max Neunhoeffer 17e4c05de5 Change encoding of HLC time stamps, tolerate old ticks in _rev. 2016-07-12 14:01:33 +02:00
jsteemann e03cf68861 ignore revision ids 2016-07-12 13:54:41 +02:00
Wilfried Goesgens 1f356900c3 Fix missing include; thanks to @servusoft for pointing this out. 2016-07-11 15:39:10 +02:00
Jan Steemann 40fd951234 issue #1936 2016-07-11 09:57:30 +02:00
Max Neunhoeffer a98916d755 Merge branch 'devel' into HLC 2016-07-07 15:23:24 +02:00
Jan Steemann ac567074f3 fixed ifdef 2016-07-07 11:41:45 +02:00
Jan Steemann 44ca89362e fixed issue #1930 2016-07-07 11:14:23 +02:00
jsteemann a7c59c60f3 don't log client tool errors to Windows event log 2016-07-06 12:30:02 +02:00
Max Neunhoeffer 1a04b0112f Fix lastRevision in collection to use revision. 2016-07-06 09:38:20 +02:00
Max Neunhoeffer 3e789c0519 Improve checking of valid revision timestamps. 2016-07-05 22:53:06 +02:00
Max Neunhoeffer bf3a6de760 Fix extractRevision for new revision format. 2016-07-05 21:55:42 +02:00
Max Neunhoeffer 7fe9fcc00e Use hybrid logical clock for _rev entries. 2016-07-05 21:15:32 +02:00
Jan Christoph Uhde 4aa7222d98 Merge remote-tracking branch 'origin/devel' into FHM 
* origin/devel:
  Start adding a hybrid logical clock.
  Handle replicationFactor and numberOfShards in arangorestore.
  upgrade script for homebrew
  Fix namespace stuff for VC++
  Use standard GNU install dirs
 2016-07-05 08:09:08 +02:00
Max Neunhoeffer bc82322353 Start adding a hybrid logical clock. 2016-07-05 00:28:04 +02:00
Frank Celler a8e29450f4 Merge branch 'devel' of github.com:arangodb/arangodb into FMH 2016-07-04 17:13:38 +02:00
Frank Celler 38a55ed13c Merge branch 'devel' of github.com:arangodb/arangodb into FMH 2016-07-04 17:09:40 +02:00
Michael Hackstein d273b387f8 Improved Traversal internal API. It now does less copying and creates less objects. Also it is way simpler to understand. 2016-07-04 16:16:58 +02:00
Andreas Streichardt e6e7363901 Remove lockfile if we are the same (now stale) pid 
fixes docker setups (our pid will always be 1)
 2016-06-30 12:14:56 +02:00
jsteemann 4a5b75b485 escape Unicode characters in JSON dumps 2016-06-29 12:53:08 +02:00
jsteemann cc3365f830 add optional Unicode character escaping when dumping VPack to JSON 2016-06-29 01:01:24 +02:00
Jan Steemann 8002607b67 prevent VS warnings 2016-06-28 17:16:48 +02:00
Michael Hackstein 808cb97707 Fixed a bug in SHORTEST_PATH using a distance attribute. In some cases the computed path was not correct. 2016-06-27 16:57:47 +02:00
jsteemann e340b2d710 more index optimizations 2016-06-25 19:34:18 +02:00
jsteemann 8f0991e18e potential performance optimizations 
simplifications

small optimizations
 2016-06-23 14:47:44 +02:00
Jan Steemann 8f16458d8a fixed crash in nonce handling 2016-06-21 11:35:34 +02:00
jsteemann 55fce39574 optimizations for neighbors queries 2016-06-20 18:37:46 +02:00
jsteemann a9242cf131 don't ignore function return value 2016-06-20 09:55:44 +02:00
Alan Plum 8a640eb1b5
ERROR_APPLICATION_* -> ERROR_SERVICE_* 2016-06-17 20:02:25 +02:00
Alan Plum 9375d49c8c
Nicer error docs 2016-06-17 20:02:24 +02:00
jsteemann 43574e509e Merge branch 'devel' of https://github.com/arangodb/arangodb into devel 2016-06-17 16:28:04 +02:00
jsteemann 6a8a95252e StringRef extensions 2016-06-17 16:26:46 +02:00
Frank Celler 8635ddad43 do NOT follow symlinks on recursive delete 2016-06-17 10:51:35 +02:00
jsteemann 3d1c4aa451 fix typo 2016-06-17 09:04:37 +02:00
jsteemann 1eff077480 small changes 2016-06-16 18:06:51 +02:00
jsteemann 6c6a0e0649 fix compile error w/ assertions 2016-06-16 13:32:32 +02:00
jsteemann ca4edc60e0 small optimizations for traversal 2016-06-16 13:26:46 +02:00
jsteemann 6683bc02a7 small traversal optimizations 2016-06-16 09:44:24 +02:00
jsteemann adf778a0d8 two unused typedefs less 2016-06-15 22:40:31 +02:00
jsteemann bd31f53802 avoid warnings with g++6 2016-06-15 20:10:09 +02:00
jsteemann 9f1d9d9a23 renamed CharLengthPair to StringRef 2016-06-15 19:33:08 +02:00
Jan Steemann 1726c53805 fixed some import edge cases 2016-06-15 18:16:49 +02:00
jsteemann 766f79baa3 Merge branch 'devel' of https://github.com/arangodb/arangodb into devel 2016-06-15 09:54:17 +02:00
jsteemann fc34a53b14 speed up 2016-06-15 09:38:45 +02:00