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

328 Commits

Author SHA1 Message Date
Simon Grätzer 27c617fe10 Merge branch 'devel' of https://github.com/arangodb/arangodb into devel 
# Conflicts:
#	3rdParty/V8/v8
#	arangod/Transaction/Methods.h
#	arangod/Utils/UserTransaction.h
#	arangod/V8Server/v8-collection.cpp
 2017-03-01 14:52:35 +01:00
jsteemann dc72ec3ee7 fixed a race when dropping databases 2017-02-23 15:22:50 +01:00
Simon Grätzer edab268572 Merge branch 'devel' of https://github.com/arangodb/arangodb into devel 
# Conflicts:
#	arangod/Aql/FunctionDefinitions.cpp
#	arangod/Aql/Functions.h
#	arangod/Utils/ExplicitTransaction.h
 2017-02-10 15:21:24 +01:00
jsteemann d024a6d00a remove logging for non-topics 2017-02-10 09:32:50 +01:00
Michael Hackstein 5dfd652d64 Merge branch 'devel' of github.com:arangodb/arangodb into engine-api 2017-02-08 15:57:30 +01:00
Max Neunhoeffer bde48d524d Change undocumented behaviour in case of invalid rev in JS document ops. 
An invalid rev should lead to a 1200 ("conflict") error rather than a
1239 ("illegal document revision") error. This is more intuitive and
in line with the corresponding change in the HTTP API. No tests needed
adjustment.
 2017-02-08 10:59:04 +01:00
Frank Celler 0da95481ea added locks for keep-alive 2017-02-08 09:41:18 +01:00
jsteemann f213d67de0 Merge branch 'devel' of https://github.com/arangodb/arangodb into engine-api 2017-02-07 13:04:40 +01:00
jsteemann d503a4d354 added reactor type 2017-02-07 12:41:41 +01:00
Frank Celler 9588595335 added more info about scheduler status 2017-02-07 11:22:23 +01:00
jsteemann ac9e28d353 fix typo 2017-02-06 17:38:36 +01:00
Frank Celler e3fe51faa8 better threads working handling 2017-02-06 16:32:55 +01:00
jsteemann ab11410911 Merge branch 'devel' of https://github.com/arangodb/arangodb into engine-api 2017-02-06 13:05:11 +01:00
Simon Grätzer 9967053d11 Merge branch 'devel' of https://github.com/arangodb/arangodb into devel 2017-02-04 15:01:12 +01:00
jsteemann 3c9c826210 make method protected 2017-02-03 16:44:30 +01:00
jsteemann 902429ddfd less log spam at startup 2017-02-03 11:42:03 +01:00
Simon Grätzer 13f19fe51b Merge branch 'devel' of https://github.com/arangodb/arangodb into devel 
# Conflicts:
#	arangod/CMakeLists.txt
#	arangod/RestServer/arangod.cpp
#	arangod/Utils/ExplicitTransaction.h
#	arangod/V8Server/v8-collection.cpp
 2017-02-02 11:25:23 +01:00
jsteemann fa917937c4 do not use namespaces in header files 2017-02-01 13:41:31 +01:00
jsteemann e2a312450f fix out-of-memory handling at startup 2017-02-01 13:00:05 +01:00
jsteemann 09851cdf75 Merge branch 'devel' of https://github.com/arangodb/arangodb into engine-api 2017-01-27 16:37:32 +01:00
Simon Grätzer 64343cd579 Merge branch 'devel' of https://github.com/arangodb/arangodb into devel 
# Conflicts:
#	scripts/startLocalCluster.sh
 2017-01-27 15:58:22 +01:00
Frank Celler 0457e2f587 safety check 2017-01-27 14:02:16 +01:00
jsteemann bbca3dde1c Merge branch 'devel' of https://github.com/arangodb/arangodb into engine-api 2017-01-27 13:52:36 +01:00
Frank Celler 9a5a50e2d5 more cleanup on statistics 2017-01-27 13:17:08 +01:00
jsteemann f37a2d8014 Merge branch 'devel' of https://github.com/arangodb/arangodb into engine-api 2017-01-27 12:11:57 +01:00
Frank Celler 4a0282cc2b added missing mutex 2017-01-27 12:03:31 +01:00
Frank Celler 71ba997fba Merge branch 'devel' of github.com:arangodb/arangodb into devel 2017-01-27 11:30:39 +01:00
Frank Celler 30da97f2a5 RestHandler destructor should be virtual 2017-01-27 11:30:25 +01:00
jsteemann 1089c7b2fd Merge branch 'devel' of https://github.com/arangodb/arangodb into engine-api 2017-01-27 11:27:16 +01:00
Max Neunhoeffer 8c7a0b5a48 Fix a used after free error. 2017-01-27 11:17:42 +01:00
jsteemann f0d4770879 Merge branch 'devel' of https://github.com/arangodb/arangodb into engine-api 2017-01-27 11:16:37 +01:00
Frank Celler c4a62cb108 release from unique_ptr when adding as response 2017-01-27 10:52:00 +01:00
Max Neunhoeffer ddd114ca32 Cleanup. 2017-01-27 09:03:22 +01:00
Frank Celler e0c00c6de6 improved statistics 2017-01-26 23:43:27 +01:00
Frank Celler 5ba89e88ca fixed nullptr check 2017-01-26 23:32:51 +01:00
jsteemann 2709504d74 Merge branch 'devel' of https://github.com/arangodb/arangodb into engine-api 2017-01-26 15:21:08 +01:00
jsteemann 34a110a08b mini fixes 2017-01-26 10:49:42 +01:00
Frank Celler fa114470f5 fixes for statistics 2017-01-25 22:31:00 +01:00
Frank Celler 8a7ca6e635 removed STATS 2017-01-25 21:24:37 +01:00
jsteemann 5c0110070f Merge branch 'devel' of https://github.com/arangodb/arangodb into engine-api 2017-01-25 10:27:31 +01:00
jsteemann 208729ae10 use make_unique 2017-01-25 10:26:48 +01:00
Simon Grätzer e4593743b2 Merge branch 'devel' of https://github.com/arangodb/arangodb into devel 2017-01-24 00:38:07 +01:00
jsteemann 5ca0c89374 Merge branch 'devel' of https://github.com/arangodb/arangodb into engine-api 2017-01-23 16:56:46 +01:00
Jan Christoph Uhde 4007bf476a add ouput for communication tracemode debugging 2017-01-23 16:14:22 +01:00
Simon Grätzer ed8bdd8e89 Merge branch 'devel' of https://github.com/arangodb/arangodb into devel 2017-01-23 13:23:03 +01:00
jsteemann 38a932275a Merge branch 'devel' of https://github.com/arangodb/arangodb into engine-api 2017-01-23 10:36:03 +01:00
jsteemann f9fb701505 moved LogfileManager into engine 2017-01-23 10:30:55 +01:00
Jan Christoph Uhde b0d6afa3fa add trace debugging for vst 2017-01-23 10:30:21 +01:00
Simon Grätzer b69fa07aca Merge branch 'devel' of https://github.com/arangodb/arangodb into devel 2017-01-22 15:55:06 +01:00
Frank Celler f12c38dc0b added work context 2017-01-22 12:53:52 +01:00
Simon Grätzer d71ebf7c1d Merge branch 'devel' of https://github.com/arangodb/arangodb into devel 2017-01-20 14:42:19 +01:00
Max Neunhoeffer f35e3a7aaf Merge branch 'devel' into schmutz-ng 2017-01-16 09:54:09 +01:00
Andreas Streichardt 191f399ce2 Move AgencyCallback stuff to cluster so it is (hopefully) clear that this 
is being used within the cluster and not within the agency.
 2017-01-13 18:08:27 +01:00
Simon Grätzer 27dcb11af3 Merge branch 'devel' of https://github.com/arangodb/arangodb into devel 2017-01-13 15:00:59 +01:00
jsteemann ac7d9af48f attempt to validate utf8 sequences in vst 2017-01-12 13:22:19 +01:00
Simon Grätzer 0b5a1f6b70 Merge branch 'devel' of https://github.com/arangodb/arangodb into devel 2017-01-11 14:47:00 +01:00
Wilfried Goesgens 071b6c199e remove unused headers 2017-01-11 11:54:15 +01:00
Simon Grätzer 9a6c7196a6 Merge branch 'devel' of https://github.com/arangodb/arangodb into devel 2016-12-26 20:52:29 +01:00
Max Neunhoeffer d37e887eb9 Merge conflict. 2016-12-23 12:11:44 +01:00
Simon Grätzer 7afebc2223 Merge branch 'devel' of https://github.com/arangodb/arangodb into devel 2016-12-17 14:10:03 +01:00
jsteemann 4f10a6fb9c experimental micro optimizations 2016-12-16 15:52:16 +01:00
Simon Grätzer d1a47f5b29 Merge branch 'devel' of https://github.com/arangodb/arangodb into devel 2016-12-15 18:46:21 +01:00
jsteemann 9b42e9cee6 some improvements for memory management 
added more memory diagnostics for memory usage:
- collection.figures() now returns a "readCache" attribute which contains the
  number of and memory usage of entries in the document revisions cache for the
  collection, and a "revisions" attribute with the number and memory usage
  of entries in the storage engine's revision lookup table for the collection
- the default value for --database.revision-cache-target-size was changed from
  75% of RAM to 30% of RAM
 2016-12-15 15:30:28 +01:00
Simon Grätzer 5889ebb32b Merge branch 'devel' of https://github.com/arangodb/arangodb into devel 2016-12-13 13:54:29 +01:00
jsteemann b96897e296 fixed some issues detected by coverity build tool 2016-12-12 15:41:54 +01:00
Simon Grätzer 4fe234803e Merge branch 'devel' of https://github.com/arangodb/arangodb into devel 2016-12-09 17:37:51 +01:00
jsteemann 995b47fa8d remove unused code 2016-12-09 17:16:58 +01:00
Simon Grätzer 7ef7857006 Merge branch 'devel' of https://github.com/arangodb/arangodb into devel 2016-11-28 22:27:14 +01:00
Frank Celler 4339f27c22 added missing header 2016-11-28 17:05:50 +01:00
Simon Grätzer bc4c441f30 Merge branch 'devel' of https://github.com/arangodb/arangodb into devel 2016-11-25 17:03:26 +01:00
Kaveh Vahedipour 029ff44bb0 Merge back FMH to devel 2016-11-25 16:03:13 +01:00
jsteemann 15487d49ba use make_unique 2016-11-25 15:35:54 +01:00
jsteemann 94865160f5 use make_unique 2016-11-25 15:12:30 +01:00
jsteemann 363263b054 use TRI_ASSERT 2016-11-25 14:30:54 +01:00
Simon Grätzer 9bcf8cd407 Merge branch 'devel' of https://github.com/arangodb/arangodb into devel 2016-11-25 12:30:39 +01:00
Jan Christoph Uhde 22bc12825b switch to arangodb mutexes 2016-11-24 10:40:40 +01:00
Jan Christoph Uhde 199c82c1f8 switch back to unordered_map by using unique_ptr 2016-11-24 10:07:05 +01:00
Jan Christoph Uhde 1dfc0d8243 remove deadlock 2016-11-24 09:41:43 +01:00
Jan Christoph Uhde 2325fbfbe1 fix race condition 2016-11-24 08:59:21 +01:00
Kaveh Vahedipour b464b378bf new transact api for agency 2016-11-23 17:59:48 +01:00
Jan Christoph Uhde b9700165bb work on agent creation in vpp commTask 2016-11-23 15:05:33 +01:00
Jan Christoph Uhde e543eed70d Merge branch 'devel' of github.com:arangodb/arangodb into devel 
* 'devel' of github.com:arangodb/arangodb:
  remove -q - it doesn't work with older git versions
  Fix a typo.
 2016-11-23 14:07:02 +01:00
Jan Christoph Uhde b40a18aac1 pass startTime into processRead 2016-11-23 14:06:36 +01:00
Simon Grätzer 66951f4f8e Merge branch 'devel' of https://github.com/arangodb/arangodb into devel 2016-11-23 13:17:27 +01:00
Max Neunhoeffer 9a7f5af465 Fix a typo. 2016-11-23 11:48:40 +01:00
Jan Christoph Uhde 2bd70e5b9f fix request statistics and add a ruby test 2016-11-23 11:29:25 +01:00
Kaveh Vahedipour ab34880bea Merge remote-tracking branch 'origin/devel' into FMH 2016-11-22 10:30:25 +01:00
Simon Grätzer e4bc60a755 Merge branch 'devel' of https://github.com/arangodb/arangodb into devel 2016-11-21 17:44:12 +01:00
Andreas Streichardt 02eb298f0c extra startup check: enforce that the user set a jwt-secret when running in cluster mode with authentication enabled 2016-11-18 16:15:09 +01:00
Kaveh Vahedipour ffe7f9f3ad merged in devel 2016-11-16 14:59:53 +01:00
Simon Grätzer 58288283ce Merge branch 'devel' of https://github.com/arangodb/arangodb into devel 2016-11-09 12:12:59 +01:00
Jan Steemann cb4a471dfd Merge branch 'devel' of https://github.com/arangodb/arangodb into devel 2016-11-09 08:26:20 +01:00
Jan Steemann b0119bb652 issue #2149, issue #2159 
do not overwrite CORS response headers set by Foxx application with hard-coded default values
 2016-11-09 08:25:45 +01:00
Jan Christoph Uhde 2dc309db38 make protocol switching less verbose 2016-11-08 15:18:50 +01:00
Simon Grätzer bcf545c856 Merge branch 'devel' of https://github.com/arangodb/arangodb into devel 2016-11-08 11:38:49 +01:00
Frank Celler a1003cb5d3 cosmetics 2016-11-07 17:20:56 +01:00
Simon Grätzer 1c0253e5dc Merge branch 'devel' of https://github.com/arangodb/arangodb into devel 2016-11-03 00:12:56 +01:00
Jan Steemann eeac8e5ae9 remove unused test code 2016-10-31 13:08:13 +01:00
Jan Steemann 9957dab8dc remove non-unused PathHandler 2016-10-31 12:15:07 +01:00
jsteemann cfc9ecd198 fix Visual Studio complaints 2016-10-31 09:59:18 +01:00