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

10452 Commits

Author SHA1 Message Date
Jan Christoph Uhde beae8a8f74 first changes for set/get payload methods -> 
toVelocyPack now returns slices
 2016-07-15 16:38:13 +02:00
Jan Christoph Uhde 6e9304cdc4 Merge remote-tracking branch 'origin/devel' into obi-rest-changes 
* origin/devel: (43 commits)
  added dev button to graphs view [ci skip]
  grunt build [ci skip]
  Remove jshint
  Mention updating license info
  Prevent World War 3
  Always use --global-style when installing npm deps
  gv - editable & createable nodes, edges [ci skip]
  Rebuild aardvark
  Make sure Show Interface check asks for HTML
  oops, @not supported here.
  Fix phrase explaining when the collections are dropped alongside the graph definition.
  fixed issue #1941
  gv [ci skip]
  added test for "fake" _key values
  fixed issue #1942
  In Farbe und in STEREREOOOUU!
  grunt [ci skip]
  gv [ci skip]
  Fix documentation.
  Fix fix.
  ...
 2016-07-15 09:20:04 +00:00
Jan Steemann 2441b2f700 Merge branch 'devel' of https://github.com/arangodb/arangodb into devel 2016-07-14 10:09:01 +02:00
Jan Steemann a1c2b7cc63 fixed issue #1941 2016-07-14 10:08:17 +02:00
Jan Steemann 6d856efd4f added test for "fake" _key values 2016-07-14 09:29:42 +02:00
Jan Christoph Uhde 682cf7a2f1 virtualize functions of request/response 2016-07-14 08:40:05 +02:00
jsteemann f5608449b2 fixed issue #1942 2016-07-13 20:32:59 +02:00
Max Neunhoeffer a78fd42b67 Merge branch 'HLC' into devel 2016-07-13 12:52:33 +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
jsteemann fe079b50f3 prevent compile warning 2016-07-13 09:45:23 +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
Michael Hackstein 6e5f6d1a48 Fixed failure tests in SkiplistIndex 2016-07-13 07:26:35 +02:00
Max Neunhoeffer 4649036943 Add and read out HLC time stamps in HTTP headers. 2016-07-12 23:36:14 +02:00
Max Neunhoeffer 985723e468 Add HLC timestamp as HTTP header in asyncRequst and syncRequest. 2016-07-12 23:11:57 +02:00
Max Neunhoeffer 18925faf8f Merge branch 'devel' into HLC 2016-07-12 22:51:40 +02:00
Michael Hackstein c46ff5c085 Merge branch 'devel' of github.com:arangodb/arangodb into devel 2016-07-12 18:07:21 +02:00
Michael Hackstein 63bad694c5 Fixed a bug with reset of new skiplist index iterator 2016-07-12 18:07:11 +02:00
jsteemann 522b23590b whitespace removal 2016-07-12 17:58:05 +02:00
jsteemann d687cd7ebe micro optimization for key generator key tracking 2016-07-12 17:16:06 +02:00
jsteemann 04992ab68d Merge branch 'devel' of https://github.com/arangodb/arangodb into devel 2016-07-12 17:01:40 +02:00
jsteemann 94556cb9fb explicit 2016-07-12 17:01:34 +02:00
Max Neunhoeffer 386f0fe883 Remove an unused var. 2016-07-12 16:56:51 +02:00
jsteemann 76f55d84bc remove unused variable 2016-07-12 16:56:48 +02:00
jsteemann 28479d3778 explicit 2016-07-12 16:56:42 +02:00
Max Neunhoeffer 183bcb50df FIx typo. 2016-07-12 16:55:59 +02:00
Max Neunhoeffer 2c2c50aa19 Rewrite old revision strings with new HLC time stamps. 2016-07-12 16:51:25 +02:00
jsteemann 6713ec39dc Merge branch 'devel' of https://github.com/arangodb/arangodb into devel 2016-07-12 16:49:36 +02:00
Jan Steemann 5773154791 complaints 2016-07-12 15:37:37 +01:00
Jan Steemann d9aa695cea complaints 2016-07-12 15:36:47 +01:00
jsteemann dcfaee33e9 Merge branch 'devel' of https://github.com/arangodb/arangodb into devel 2016-07-12 15:57:40 +02:00
Jan Steemann 403ba8a30c fixed issue #1937 2016-07-12 15:57:19 +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
Jan Steemann 1719d3c993 fix destructuring of Externals in MERGE 2016-07-12 13:37:39 +02:00
Jan Steemann 233453bb42 ignore primary and edge indexes during cluster restore 2016-07-12 10:18:12 +02:00
Jan Steemann 3705a1d2f9 Merge branch 'devel' of https://github.com/arangodb/arangodb into devel 2016-07-12 09:45:52 +02:00
Jan Steemann 6f3091e30a fix recovery issues 2016-07-12 09:45:45 +02:00
Jan Steemann 94bd64d9ab fix complaining about null keys 2016-07-12 09:42:32 +02:00
Jan Christoph Uhde 4f357502b0 fix: add missing mutex 2016-07-12 09:30:49 +02:00
Max Neunhoeffer 7571a16c9d Merge branch 'devel' of ssh://github.com/ArangoDB/ArangoDB into devel 2016-07-11 23:46:12 +02:00
Max Neunhoeffer 869a820275 Use babies in handler for arangorestore. 
This fixes bad performance and corresponding errors due to timeouts
in the cluster case with synchronous replication in the restored
collections.
 2016-07-11 23:37:38 +02:00
Jan Steemann 2d7faa795a Merge branch 'devel' of https://github.com/arangodb/arangodb into devel 2016-07-11 18:39:18 +02:00
Jan Steemann 10db618129 fix recovery 2016-07-11 18:36:00 +02:00
Jan Steemann fe25732635 ignore document not found on recovery 2016-07-11 15:40:42 +02:00
Jan Steemann fe845d4b7a respond with better error message 2016-07-11 13:42:14 +02:00
Frank Celler 36a9b7852e Merge branch 'devel' into HLC 2016-07-11 07:03:49 +00:00
Michael Hackstein 9f60536584 Merge branch 'devel' of github.com:arangodb/arangodb into devel 2016-07-11 08:58:59 +02:00
Jan Steemann cb14a63778 pass UDF name into UDF call via this argument 2016-07-08 14:31:14 +02:00
Andreas Streichardt 256d5b818d Merge branch 'devel' of github.com:arangodb/arangodb into devel 2016-07-07 18:50:24 +02:00
jsteemann ba8a8a8afe Merge branch 'devel' of https://github.com/arangodb/arangodb into devel 2016-07-07 16:56:17 +02:00
jsteemann 3c536d6aff do not make options hidden 2016-07-07 16:56:07 +02:00
Max Neunhoeffer a98916d755 Merge branch 'devel' into HLC 2016-07-07 15:23:24 +02:00
Jan Steemann 351f800eb1 fix upsert 2016-07-07 15:15:43 +02:00
Jan Steemann 3e50e06140 fixed comment 2016-07-07 15:15:42 +02:00
Jan Steemann 664cf840e7 fix assertion failure 2016-07-07 13:24:07 +02:00
Jan Steemann f8b61c6723 added tests 2016-07-07 12:22:24 +02:00
Jan Christoph Uhde b2e29c4353 fix: createResponse -> setResponseCode; remove delete 
remove delete _response in RestEdgesHandler
 2016-07-07 08:54:41 +00:00
Jan Christoph Uhde d5a64253ec fix: add missing mutex 2016-07-07 09:01:43 +02:00
Jan Christoph Uhde 7996b2c152 fix: RestAqlHandler - use getVpackOptionsForDump 2016-07-07 08:56:22 +02:00
Michael Hackstein 768177518f Merge branch 'devel' of github.com:arangodb/arangodb into devel 2016-07-06 22:42:52 +02:00
Michael Hackstein b285cd26a3 Internal cleanup of TraversalOptions. Now the options know the the expressions not the traverser any more. Preparation to use other indexes 2016-07-06 22:42:46 +02:00
jsteemann a7b5bb60fd fixed issue #1929 2016-07-06 21:34:39 +02:00
Andreas Streichardt 7bb0740c4e remove bogus includes 2016-07-06 18:18:01 +02:00
Max Neunhoeffer 02a5e5cc8f Merge branch 'devel' into HLC 2016-07-06 11:03:41 +02:00
Jan Steemann 617a833040 handle "isSystem" somewhat smarter 2016-07-06 10:23:37 +02:00
Max Neunhoeffer 200d47a0bc Fix revision id bug. 2016-07-06 10:02:26 +02:00
Max Neunhoeffer 1a04b0112f Fix lastRevision in collection to use revision. 2016-07-06 09:38:20 +02:00
Max Neunhoeffer f441fceed8 More fixes for new revision timestamps. 2016-07-06 09:15:48 +02:00
Jan Steemann 2fa2487081 fixed "Could not extract custom attribute" issue 2016-07-06 08:44:22 +02:00
Jan Steemann 373aaffa20 Revert "don't update if there's nothing to do" 
This reverts commit 7455ef20ef.
 2016-07-06 07:56:48 +02:00
Jan Steemann d8ead99c72 penalize backwards sorting 2016-07-06 07:41:18 +02:00
Jan Steemann 7455ef20ef don't update if there's nothing to do 2016-07-06 07:41:08 +02:00
Jan Steemann f9bafa4b14 slightly penalize index type 2016-07-06 07:41:01 +02:00
Max Neunhoeffer 41c5451168 Extract conversion _rev string <-> rid into functions. 
Also fixes another place where this conversion was wrong.
 2016-07-05 23:52:30 +02:00
Max Neunhoeffer ae1a9497c6 Fix extractRevision again. 2016-07-05 22:18:09 +02:00
Max Neunhoeffer bbfeafe830 Fix compilation. 2016-07-05 21:57:37 +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 6963c70dc8 fix unittest http_server 2016-07-05 15:36:31 +02:00
jsteemann c5dbfd7c7b honor presence of persistent index for sorting 2016-07-05 13:04:38 +02:00
Jan Steemann ca86704086 beautify handling of optimizer rules 2016-07-05 11:21:04 +02:00
Michael Hackstein b39785ab3f Fixed an VPackExternal error in Cluster Traverser. 2016-07-05 10:33:45 +02:00
Jan Christoph Uhde 5805758cee make it compile - more ugly casts 2016-07-05 09:56:50 +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
Jan Christoph Uhde 41ecd18fc1 Merge branch 'devel' into FHM 
* devel:
  add: VPackValidator to RestVocbaseBaseHandler
  add tags to .gitignore and add .editorconfig
 2016-07-05 08:06:12 +02:00
Max Neunhoeffer bc82322353 Start adding a hybrid logical clock. 2016-07-05 00:28:04 +02:00
Max Neunhoeffer b7e957664f Handle replicationFactor and numberOfShards in arangorestore. 
This adds an option --default-replication-factor to arangorestore and
makes it more convenient to specify the number of shards for restored
collections.
 2016-07-05 00:10:20 +02:00
Andreas Streichardt 32a77560d9 Fix namespace stuff for VC++ 2016-07-04 18:44:04 +02:00
Frank Celler d5bb7687f3 removed unecessary prefix 2016-07-04 17:44:35 +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
Jan Steemann 8617a8f82d Merge branch 'devel' of https://github.com/arangodb/arangodb into devel 2016-07-04 16:47:35 +02:00
Jan Steemann 1769299e95 make optimizer not skip "use-indexes-rule", even if enough plans have been created already 2016-07-04 16:31:14 +02:00
Michael Hackstein c19df03649 Merge branch 'devel' of github.com:arangodb/arangodb into devel 2016-07-04 16:26:08 +02:00
Michael Hackstein 12011060c0 Removed now obsolete code 2016-07-04 16:25:59 +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