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

1683 Commits

Author SHA1 Message Date
jsteemann 666b2f8da9 renaming 2017-02-27 14:38:27 +01:00
Michael Hackstein ae14ae99a5 Merge branch 'engine-api' of github.com:arangodb/arangodb into engine-api 2017-02-27 13:01:12 +01:00
Michael Hackstein a884ee2bfb Intermediate commit. Moved many toVPack functions of LogicalCollection to a unified vpack + ignore-keys alternative. This commit is used to run all tests everywhere. May be red 2017-02-27 13:01:07 +01:00
jsteemann 94ce6a65f8 renamed methods 2017-02-27 11:22:44 +01:00
jsteemann d0df1952e8 Merge branch 'devel' of https://github.com/arangodb/arangodb into engine-api 2017-02-24 17:51:59 +01:00
Michael Hackstein de31c68539 Moved isVolatile into MMfiles collection. 2017-02-23 14:56:54 +01:00
Michael Hackstein aa442fc4ac Removed a velocypack-aliases include from voc-type.h 2017-02-23 13:07:32 +01:00
Kaveh Vahedipour 4cc830b0df merge from 3.1 2017-02-20 20:05:52 +01:00
Jan Christoph Uhde 071137adf6 move doCompact into PhysicalColletion 2017-02-20 10:53:11 +01:00
Jan Christoph Uhde 2d5e74f7f6 move journaize() to PhysicalCollection 
MMFilesCollection ctor might be buggy
 2017-02-17 20:06:47 +01:00
jsteemann 089ff78d2d moved collection lock state into its own struct 2017-02-16 10:27:14 +01:00
jsteemann 0909ffe69b moved helper functions into their own file 2017-02-14 13:44:54 +01:00
jsteemann 80be198a39 moved helper classes into their own file 2017-02-14 12:35:34 +01:00
jsteemann 5ebeb5f144 Merge branch 'devel' of https://github.com/arangodb/arangodb into engine-api 2017-02-13 16:29:40 +01:00
Kaveh Vahedipour a49fe5ad21 Merge branch 'devel' of https://github.com/arangodb/arangodb into devel 2017-02-13 16:00:43 +01:00
Kaveh Vahedipour 6a5d61c2f1 avoidServers correctly in again 2017-02-13 16:00:30 +01:00
jsteemann 1ce4d4a97e Merge branch 'devel' of https://github.com/arangodb/arangodb into engine-api 2017-02-13 15:29:59 +01:00
jsteemann 92f61416ca Merge branch 'engine-api' of https://github.com/arangodb/arangodb into engine-api 2017-02-13 15:25:17 +01:00
Andreas Streichardt e3d8f19368 Fix unused variables 2017-02-13 15:22:58 +01:00
jsteemann 7e690a0c61 renaming 2017-02-13 15:18:40 +01:00
Michael Hackstein e0bdc5c122 Merge branch 'engine-api' of github.com:arangodb/arangodb into engine-api 2017-02-13 14:58:54 +01:00
jsteemann 5d5d8b0a93 Merge branch 'devel' of https://github.com/arangodb/arangodb into engine-api 2017-02-13 14:36:39 +01:00
Andreas Streichardt 1bb8f97773 Fix secondaries 2017-02-13 14:00:19 +01:00
jsteemann eb73dbf960 renaming 2017-02-13 13:30:57 +01:00
jsteemann f09ec85127 renaming 2017-02-13 12:27:26 +01:00
Michael Hackstein c10fbf8b13 Merge branch 'engine-api' of github.com:arangodb/arangodb into engine-api 2017-02-13 10:40:59 +01:00
Michael Hackstein 3add00025a Fixed a possible throw in destructor. 2017-02-13 10:40:42 +01:00
Kaveh Vahedipour 51fe9fae6c when registering callbacks fail, we should have some' to go on 2017-02-13 09:00:56 +01:00
Frank Celler 392e8233eb fixed compile error on Mac 2017-02-12 18:32:12 +01:00
jsteemann 1e78acad49 fix size_t vs uint64_t confusion 2017-02-10 23:43:47 +01:00
Jan Christoph Uhde 16a9ddd78d fix ServerState.cpp 2017-02-10 20:52:26 +01:00
Andreas Streichardt 39436dac89 Finally remove lock methods 2017-02-10 19:47:31 +01:00
Andreas Streichardt 488b71cf54 Merge branch 'devel' of github.com:arangodb/arangodb into devel 2017-02-10 19:40:51 +01:00
Andreas Streichardt fe07f3515f Fixup registering with agency 2017-02-10 19:35:11 +01:00
Kaveh Vahedipour 7fbf9fb621 AgencyCallBacks registry and unregistry are more talkative than bool 2017-02-10 17:31:26 +01:00
Kaveh Vahedipour 76e5dec3d7 agent with less traffic 2017-02-10 17:03:15 +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 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
Max Neunhoeffer 226fd54db2 Fix shutdown bug around ClusterComm and ClusterCommThread. 2017-02-09 12:37:49 +01:00
Max Neunhoeffer 7f291fe369 Reactivate TRI_ASSERT(false) if ClusterComm is used after destruction. 2017-02-09 11:58:25 +01:00
Max Neunhoeffer 141927e084 Implement timeout in TraverserEngineRegistry. 2017-02-09 11:54:38 +01:00
Michael Hackstein 5dfd652d64 Merge branch 'devel' of github.com:arangodb/arangodb into engine-api 2017-02-08 15:57:30 +01:00
Jan Christoph Uhde 9d7462b8ec disable temporarily assert in clustercom until AQLFeature is ready @max 2017-02-08 13:25:34 +01:00
Max Neunhoeffer bc9cb47b5d Add assertion for nullptr in ClusterComm::instance() 2017-02-08 11:07:12 +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
jsteemann 01d3ad67b1 Merge branch 'devel' of https://github.com/arangodb/arangodb into engine-api 2017-02-08 00:59:16 +01:00
Max Neunhoeffer 883c11ea45 Handle the case that ClusterComm is already shut down gracefully. 
This touches every single place where ClusterComm is being used.
 2017-02-07 15:31:40 +01:00
jsteemann 8dfb97c0bd Merge branch 'devel' of https://github.com/arangodb/arangodb into engine-api 2017-02-06 17:04:35 +01:00
Frank Celler e3fe51faa8 better threads working handling 2017-02-06 16:32:55 +01:00
Max Neunhoeffer 3f6ec436f8 Output a warning if Schmutz runs for longer than 30s. 2017-02-06 15:50:01 +01:00
jsteemann 6b3a4d1dc3 Merge branch 'devel' of https://github.com/arangodb/arangodb into engine-api 2017-02-06 15:48:54 +01:00
Max Neunhoeffer 71dae630c3 Store ClusterComm singleton in shared_ptr. 2017-02-06 15:25:18 +01:00
jsteemann ab11410911 Merge branch 'devel' of https://github.com/arangodb/arangodb into engine-api 2017-02-06 13:05:11 +01:00
Kaveh Vahedipour c49c853b01 back ports from 3.1 2017-02-06 10:18:40 +01:00
Max Neunhoeffer 20e2128a44 Fix shardDistribution in case of leader change. 2017-02-06 09:45:00 +01:00
Simon Grätzer 9247a03058 Merge branch 'devel' of https://github.com/arangodb/arangodb into devel 2017-02-05 04:08:51 +01:00
Frank Celler 37805f6bc9 safety check 2017-02-04 13:08:13 +01:00
Frank Celler 602795deea safety check 2017-02-04 13:08:08 +01:00
Simon Grätzer 63dfe865ba Merge branch 'devel' of https://github.com/arangodb/arangodb into devel 2017-02-03 21:27:08 +01:00
jsteemann 3c5edeb9b2 fix cluster AQL statistics 2017-02-03 11:47:36 +01:00
Max Neunhoeffer 72fa45cc94 Port better reporting of longish Schmutz behaviour to devel. 2017-02-03 10:47:13 +01:00
jsteemann 950c3f40ad fix cluster AQL statistics 2017-02-03 10:43:40 +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 a1b3bfcc80 dont include ServerState when not needed 2017-02-02 10:16:53 +01:00
jsteemann fa917937c4 do not use namespaces in header files 2017-02-01 13:41:31 +01:00
jsteemann 2383548270 use initializer 2017-02-01 13:03:59 +01:00
jsteemann 9a8e2bc57a Merge branch 'devel' of https://github.com/arangodb/arangodb into devel 2017-02-01 10:39:42 +01:00
jsteemann 126f9a21fe fix index ids 2017-02-01 10:39:21 +01:00
Max Neunhoeffer 48be25bdde Add diagnostics to see background jobs that do not run. 
If a job is only executed more than 5 seconds later than it was
scheduled, an error is logged.
 2017-02-01 09:36:33 +01:00
jsteemann 4fa2a6a1d0 Merge branch 'devel' of https://github.com/arangodb/arangodb into engine-api 2017-01-31 14:57:17 +01:00
Max Neunhoeffer 460e27d31c Log level down to debug for Schmutz-Startung. 2017-01-31 14:39:34 +01:00
Max Neunhoeffer c4d5d982c7 Fix bugs of threads not announcing that they are busy. 2017-01-31 14:07:54 +01:00
Simon Grätzer bcc1a83ae5 Merge branch 'devel' of https://github.com/arangodb/arangodb into devel 2017-01-31 13:38:17 +01:00
jsteemann 8b62579789 Merge branch 'devel' of https://github.com/arangodb/arangodb into engine-api 2017-01-31 10:04:56 +01:00
Max Neunhoeffer d8171651bf Fix assert. 2017-01-31 09:03:48 +01:00
Max Neunhoeffer d8d8ef9755 Add an assertion. 2017-01-31 09:03:41 +01:00
jsteemann 5cb4e3e685 Merge branch 'devel' of https://github.com/arangodb/arangodb into engine-api 2017-01-31 08:51:42 +01:00
jsteemann 6598828449 Merge branch 'devel' of https://github.com/arangodb/arangodb into engine-api 2017-01-31 00:33:42 +01:00
Max Neunhoeffer 9525f46b2b Some cleanup of comments for better understandability. 2017-01-30 23:22:58 +01:00
jsteemann 16c19ad927 cppcheck 2017-01-30 23:02:05 +01:00
Max Neunhoeffer cbae239aea Merge branch 'devel' of ssh://github.com/ArangoDB/ArangoDB into devel 2017-01-30 22:32:40 +01:00
Max Neunhoeffer af3c206d89 Try to solve sporadic shutdown blockage in heartbeat thread. 2017-01-30 22:32:05 +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
jsteemann cb9bf7c2ff added obsolete parameter optionality 2017-01-30 17:06:02 +01:00
Max Neunhoeffer 61b353edc5 Fix fix of concurrently running Schmutzes. 2017-01-30 15:45:15 +01:00
Max Neunhoeffer 1aca50fd71 Merge branch 'devel' of ssh://github.com/ArangoDB/ArangoDB into devel 2017-01-30 14:03:04 +01:00
Max Neunhoeffer fa296ebf40 Fix running multiple Schmutzes running concurrently. 2017-01-30 14:02:24 +01:00
jsteemann 1294cf6128 Merge branch 'devel' of https://github.com/arangodb/arangodb into engine-api 2017-01-30 12:53:19 +01:00
jsteemann d96ce9af37 Merge branch 'devel' of https://github.com/arangodb/arangodb into engine-api 2017-01-30 12:53:10 +01:00
Kaveh Vahedipour 6647fb1c14 no need to udate single host agencies' endpoints 2017-01-30 09:55:34 +01:00
Simon Grätzer 9829e931e3 Merge branch 'devel' of https://github.com/arangodb/arangodb into devel 2017-01-30 01:50:09 +01:00
Max Neunhoeffer f09ecd21b2 Logging level for background job debugging down to DEBUG. 2017-01-29 23:05:33 +01:00
Max Neunhoeffer c62c521a43 Fix closure for background jobs in HeartbeatThread one more time. 2017-01-29 00:08:12 +01:00
Max Neunhoeffer 3ac470cbb2 Fix closure for background jobs in HeartbeatThread. 2017-01-28 23:57:40 +01:00
Max Neunhoeffer 5dee45a6c1 Delete boost::asio::io_service::strand. 2017-01-28 23:45:19 +01:00
Max Neunhoeffer 429ffcd43c Count callbacks in _strand in HeartbeatThread and log. 2017-01-28 22:13:21 +01:00
Max Neunhoeffer 4e2a9be028 Merge branch 'devel' of ssh://github.com/arangodb/arangodb into devel 2017-01-28 21:27:41 +01:00
Max Neunhoeffer 8b4ed89d14 More logging on level info. 2017-01-28 21:26:34 +01:00