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

1048 Commits

Author SHA1 Message Date
Simon Grätzer 080048b080 Merge branch 'devel' of https://github.com/arangodb/arangodb into devel 2017-03-01 15:05:25 +01:00
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 0ac29eb177 don't fail when using optional features as dependencies 2017-03-01 12:52:51 +01:00
jsteemann de22bd10cf removed unused include 2017-02-27 17:32:06 +01:00
Dan Larkin 09600f0971 Added hash cache system. 2017-02-24 15:31:40 -05:00
jsteemann dc72ec3ee7 fixed a race when dropping databases 2017-02-23 15:22:50 +01:00
jsteemann f5c8932744 initial version of query execution plan cache, still very rough 2017-02-21 11:58:38 +01:00
Max Neunhoeffer e00cf05e08 Merge branch 'devel' of ssh://github.com/ArangoDB/ArangoDB into devel 2017-02-16 13:43:14 +01:00
Max Neunhoeffer 38812fa9d2 Lower log level to debug in shutdown message. 2017-02-16 13:40:45 +01:00
Jan Christoph Uhde 174c9543ca disable rocksdb engine in arangod 2017-02-15 11:07:56 +01:00
jsteemann cbe8ee1172 renamed feature 2017-02-14 12:35:54 +01:00
Frank Celler 9f63ca6d21 added topic SSL 2017-02-12 18:19:24 +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
Jan Christoph Uhde fcda5f167f Merge branch 'devel' of github.com:arangodb/arangodb into devel 
* 'devel' of github.com:arangodb/arangodb:
  attempt to fix some compile warnings caused by Boost header files
  fix some log topics
  fix segfault
  sendAppendEntries does resonable estimation of follower time needs leading to less frequent spamming of followers
  fix issue caused by wrong merge
  fix global loglevel adjustment
  fix typo
 2017-02-10 12:14:05 +01:00
jsteemann 389ebe3e4a fix issue caused by wrong merge 2017-02-10 11:12:24 +01:00
Jan Christoph Uhde 9131cde18b Merge branch 'devel' of github.com:arangodb/arangodb into devel 
* 'devel' of github.com:arangodb/arangodb:
  fix another merge conflict
  fix compile error after merge
  remove logging for non-topics
  Destroy all traverser engines when AQL is shut down.
 2017-02-10 10:58:07 +01:00
Jan Christoph Uhde 7a66b0772a clean up headers 2017-02-10 10:57:51 +01:00
jsteemann 680a659184 fix another merge conflict 2017-02-10 09:38:42 +01:00
jsteemann 0850e8293a Merge branch 'devel' of https://github.com/arangodb/arangodb into devel 2017-02-10 09:34:55 +01:00
jsteemann d024a6d00a remove logging for non-topics 2017-02-10 09:32:50 +01:00
Max Neunhoeffer fd3f3a88e7 Destroy all traverser engines when AQL is shut down. 2017-02-10 09:12:15 +01:00
Jan Christoph Uhde 714dd3ee3a rebase database-management 2017-02-09 18:47:20 +01:00
jsteemann 76aa4f3ca2 less log spam 2017-02-09 17:42:10 +01:00
jsteemann 302464726d properly initialize members 2017-02-09 17:41:22 +01:00
Max Neunhoeffer f5a22b18b3 Kill queries in registry at shutdown. 2017-02-09 16:54:13 +01:00
Max Neunhoeffer 298b9ffc3b Add AQLFeature. 2017-02-09 11:57:51 +01:00
Max Neunhoeffer 141927e084 Implement timeout in TraverserEngineRegistry. 2017-02-09 11:54:38 +01:00
Michael Hackstein dfc9f29e69 Moved FunctionDefinitions to an AqlFunctionFeature. This now has a defined startup ordering 2017-02-08 15:45:59 +01:00
jsteemann 2c9e220f03 refactoring 2017-02-07 14:36:03 +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
jsteemann 20715944ca remove unused include 2017-02-06 22:51:10 +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 c463955b68 re-added startup option compatibility with 3.1 2017-02-03 22:40:18 +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 e2a312450f fix out-of-memory handling at startup 2017-02-01 13:00:05 +01:00
jsteemann 6598828449 Merge branch 'devel' of https://github.com/arangodb/arangodb into engine-api 2017-01-31 00:33:42 +01:00
Simon Grätzer 40b3d1511c Merge branch 'devel' of https://github.com/arangodb/arangodb into devel 2017-01-30 20:39:36 +01:00
Dan Larkin b4ec71d33a Fixed compilation bug 2017-01-30 14:26:06 -05:00
Dan Larkin 5b736dc319 Changed index-filling to dispatch batch insertion tasks to scheduler, obsoleted index-threads option. 2017-01-30 13:05:10 -05:00
jsteemann 4b98e961f6 fix loglevel 2017-01-30 15:51:37 +01:00
jsteemann d96ce9af37 Merge branch 'devel' of https://github.com/arangodb/arangodb into engine-api 2017-01-30 12:53:10 +01:00
Simon Grätzer 37243315e9 Merge branch 'devel' of https://github.com/arangodb/arangodb into devel 2017-01-28 15:30:28 +01:00
Max Neunhoeffer fbb32650a3 Prevent log spam. 2017-01-28 01:43:15 +01:00
jsteemann 044499e454 added startup option --query.memory-limit 2017-01-27 17:33:57 +01:00
Max Neunhoeffer d8eeae13e0 Try to fix drop database bug with Collector. 
Wait for a phase in the Collector with no queued operations before
actually destroying the LogicalCollections. This is to make sure that
no more DOCUMENT ditches are around.
 2017-01-27 16:57:51 +01:00
Simon Grätzer 4c370a09fe Merge branch 'devel' of https://github.com/arangodb/arangodb into devel 
# Conflicts:
#	arangod/Cluster/ClusterInfo.h
 2017-01-24 16:41:34 +01:00
jsteemann 2b66199204 Merge branch 'devel' of https://github.com/arangodb/arangodb into engine-api 2017-01-24 16:27:32 +01:00
Max Neunhoeffer 27e975c016 Let AgencyComm timeout early, if server is already stopping. 2017-01-24 14:43:17 +01:00
jsteemann e3bcb90916 remove revisions cache 2017-01-24 10:48:07 +01:00