1
0
Fork 0
Commit Graph

4025 Commits

Author SHA1 Message Date
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 6713ec39dc Merge branch 'devel' of https://github.com/arangodb/arangodb into devel 2016-07-12 16:49:36 +02:00
Jan Steemann 7a445934b7 Fix VS complaints 2016-07-12 15:39:09 +01: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
Frank Celler 36a9b7852e Merge branch 'devel' into HLC 2016-07-11 07:03:49 +00:00
Max Neunhoeffer 464d885f65 Merge branch 'devel' of ssh://github.com/ArangoDB/ArangoDB into devel 2016-07-08 23:58:21 +02:00
Max Neunhoeffer 2fcbf1e488 Fix a bug in the VPack->V8 conversion.
Happened when a special attribute _key etc. did not contain a string
value, which is allowed below the top level of a document in a
collection.
2016-07-08 23:57:05 +02:00
Jan Steemann 69e037341b fixed my "optimization" 2016-07-08 15:42:27 +02:00
Jan Steemann 1e21fcfdf5 use compare() instead of find() 2016-07-08 12:09:44 +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 c19df03649 Merge branch 'devel' of github.com:arangodb/arangodb into devel 2016-07-04 16:26:08 +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
jsteemann 9593ac122d dont include unused StringBuffer 2016-07-04 15:00:08 +02:00
jsteemann a9c34259cf micro optimizations 2016-06-30 14:54:51 +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 2525816892 fixed function signature in error reporting 2016-06-22 14:30:33 +02:00
Frank Celler 6b25a02cad fixed typo 2016-06-21 15:50:20 +02:00
Frank Celler 08799da4d0 child should not remove the pid-file 2016-06-21 15:48:00 +02:00