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

10403 Commits

Author SHA1 Message Date
jsteemann ccf3b206bd Merge branch 'devel' of https://github.com/arangodb/arangodb into readcache 2016-07-14 10:13:43 +02: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
jsteemann 0c4d507ffc Merge branch 'devel' of https://github.com/arangodb/arangodb into readcache 2016-07-14 09:32:08 +02:00
Jan Steemann 6d856efd4f added test for "fake" _key values 2016-07-14 09:29:42 +02:00
jsteemann 3be664ca56 Merge branch 'devel' of https://github.com/arangodb/arangodb into readcache 2016-07-14 09:29:21 +02:00
jsteemann f5608449b2 fixed issue #1942 2016-07-13 20:32:59 +02:00
jsteemann 5672171c11 initial commit for rc implementation 2016-07-13 17:33:17 +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