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

1033 Commits

Author SHA1 Message Date
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 389ebe3e4a fix issue caused by wrong merge 2017-02-10 11:12:24 +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
jsteemann 7fedb4e956 moved files into engine directory 2017-01-23 13:52:57 +01:00
Michael Hackstein 92ad574c97 Moved Indexes to StorageEngine 2017-01-23 13:32:23 +01:00
jsteemann 952c3f848e factored out transaction manager from logfile manager 2017-01-23 12:31:45 +01:00
jsteemann f9fb701505 moved LogfileManager into engine 2017-01-23 10:30:55 +01:00
Simon Grätzer 1d66c418b6 Merge branch 'devel' of https://github.com/arangodb/arangodb into devel 
# Conflicts:
#	arangod/CMakeLists.txt
 2017-01-16 17:56:44 +01:00
jsteemann cdabaa931f renaming 2017-01-16 14:48:13 +01:00
Simon Grätzer 20d32d05b2 Merge branch 'devel' of https://github.com/arangodb/arangodb into devel 
# Conflicts:
#	arangod/VocBase/LogicalCollection.cpp
 2017-01-09 13:34:37 +01:00
jsteemann 016f3dfb5b added try...catch 2017-01-09 08:27:59 +01:00
Andreas Streichardt a47a9712af Brake internal, authenticated cluster foxx requests again so we don't 
break the normal usecases
 2017-01-06 16:43:24 +01:00
Andreas Streichardt e1b0b9c5f3 Remove useless if 2017-01-05 18:42:04 +01:00
Andreas Streichardt 25ee54b156 Only enable basic auth for coordinators and dbservers 2017-01-05 18:13:02 +01:00
Andreas Streichardt 975e7a65b2 Fix cluster internal requests in authentication enabled cluster 2017-01-05 16:20:15 +01:00
jsteemann 7359ac44b2 more style cleanup 2017-01-05 10:52:03 +01:00
jsteemann 080bef039f fix compile warning 2017-01-04 14:06:32 +01:00
Simon Grätzer 431df0c5a4 Merge branch 'devel' of https://github.com/arangodb/arangodb into devel 2016-12-21 11:56:44 +01:00