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

1543 Commits

Author SHA1 Message Date
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
Frank Celler aed99f6b53 fixed ownership of handler 2016-08-18 23:06:36 +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