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

13248 Commits

Author SHA1 Message Date
Max Neunhoeffer 38812fa9d2 Lower log level to debug in shutdown message. 2017-02-16 13:40:45 +01:00
Jan Christoph Uhde 6ac5aa9691 fix spelling 2017-02-16 13:39:15 +01:00
Jan Christoph Uhde b34d4356bc remove dead code 2017-02-16 13:14:27 +01:00
Michael Hackstein a3aae2e43b Moved saveIndex logic into the physical collection 2017-02-16 12:53:05 +01:00
jsteemann e7a0b181e6 fix potential deadlock 2017-02-16 12:04:36 +01:00
jsteemann aa09e8cb27 moved properties 2017-02-16 10:34:14 +01:00
jsteemann a09d13168d removed now unused declaration 2017-02-16 10:30:26 +01:00
jsteemann 089ff78d2d moved collection lock state into its own struct 2017-02-16 10:27:14 +01:00
jsteemann fbd7f5d265 simplfied APIs 2017-02-16 10:00:46 +01:00
Simon Grätzer f58e7a4185 Merge branch 'devel' of https://github.com/graetzer/arangodb into devel 2017-02-15 17:54:35 +01:00
Simon Grätzer 63bca59945 stuff 2017-02-15 17:54:09 +01:00
jsteemann a743ec4320 Merge branch 'engine-api' of https://github.com/arangodb/arangodb into devel 2017-02-15 16:55:35 +01:00
Michael Hackstein 94fbfaa453 Moved the entire logic of open() to the Physical collection. It is different for each StorageEngine. 2017-02-15 16:26:55 +01:00
Andreas Streichardt 8de9941df5 Also remove from includes 2017-02-15 16:18:41 +01:00
Andreas Streichardt c8302bc50d Remove useless methods 2017-02-15 16:16:16 +01:00
Michael Hackstein d82e72f7fc Merge branch 'engine-api' of github.com:arangodb/arangodb into engine-api 2017-02-15 15:48:39 +01:00
Michael Hackstein c3ff82f4e1 Moved version management to MMFiles collection. Logical does not need to know it. Removed PhysicalCollection inclode from logicical collection. Now we should rebuild less code whan changing sth in storage engine. 2017-02-15 15:48:33 +01:00
jsteemann 97728e51c1 simplifications 2017-02-15 15:19:40 +01:00
jsteemann ce853ffa64 Merge branch 'devel' of https://github.com/arangodb/arangodb into engine-api 2017-02-15 14:46:58 +01:00
Michael Hackstein 71a004492a Merge branch 'devel' of github.com:arangodb/arangodb into engine-api 2017-02-15 14:35:34 +01:00
Andreas Streichardt 43692a97a2 Fixed unused variable 2017-02-15 14:10:44 +01:00
jsteemann e8a9d1347e attempt to fix build with picky compilers 2017-02-15 13:59:03 +01:00
jsteemann 3f34efc1bb remove _resolver property 2017-02-15 13:13:43 +01:00
jsteemann 09da6bea7f simplify internal APIs 2017-02-15 12:57:43 +01:00
jsteemann 7ff2e19abb Merge branch 'devel' of https://github.com/arangodb/arangodb into engine-api 2017-02-15 12:46:06 +01:00
jsteemann 45eb3eb1fd Merge branch 'engine-api' of https://github.com/arangodb/arangodb into engine-api 2017-02-15 12:42:19 +01:00
jsteemann d49c5c3fc0 simplified internal APIs a bit 2017-02-15 12:42:07 +01:00
Michael Hackstein cc999641a5 Merge branch 'engine-api' of github.com:arangodb/arangodb into engine-api 2017-02-15 12:36:53 +01:00
Jan Christoph Uhde be89cac445 move path from logical to physical 2017-02-15 11:43:38 +01:00
jsteemann 112d07f6c2 protect all properties of TransactionState 2017-02-15 11:37:35 +01:00
Michael Hackstein d49cbffc46 Moved revision handling from Logical to MMFiles collection. That is only relevant for MMFiles. 2017-02-15 11:26:58 +01:00
jsteemann f68a793174 Merge branch 'devel' of https://github.com/arangodb/arangodb into engine-api 2017-02-15 11:15:15 +01:00
jsteemann b6173827c9 remove unused method 2017-02-15 11:15:07 +01:00
jsteemann c69eb0a7d5 protect some properties 2017-02-15 11:14:56 +01:00
Jan Christoph Uhde 174c9543ca disable rocksdb engine in arangod 2017-02-15 11:07:56 +01:00
jsteemann b4027dc02c make property protected 2017-02-15 10:41:34 +01:00
jsteemann ffa5e2aa54 Merge branch 'engine-api' of https://github.com/arangodb/arangodb into engine-api 2017-02-15 10:26:11 +01:00
jsteemann df3a3eff9f refactoring 2017-02-15 10:26:05 +01:00
Michael Hackstein 9e41a7a6bb Merge branch 'engine-api' of github.com:arangodb/arangodb into engine-api 2017-02-15 10:09:55 +01:00
Michael Hackstein 089816a353 Moved Rollback Operation and InsertIntoIndexes from Logical to MMFilesCollection. This is marker/index specific code. 2017-02-15 10:09:51 +01:00
jsteemann 328ff8a09e Merge branch 'devel' of https://github.com/arangodb/arangodb into engine-api 2017-02-15 00:09:42 +01:00
jsteemann 01bf68549d simplifications 2017-02-14 22:48:51 +01:00
Jan Christoph Uhde 586443ca7b Merge branch 'devel' of github.com:arangodb/arangodb into devel 
* 'devel' of github.com:arangodb/arangodb:
  updated CHANGELOG
  JWT uses seconds
  Linting
  Clarify session TTL vs cookie TTL
  More cookie options
  fixed missing semicolon
  optimized graph management view
  REALLY fix routing tests
  Really fix routing
  Fix routing
  allow to specify the directory for the windows client build
  Fix Foxx routing
  Define Foxx's expected routing behaviour
  Spring cleaning
  potential fixes for MSVC
 2017-02-14 22:02:20 +01:00
jsteemann bc080ae58f removed unused node type 2017-02-14 16:52:30 +01:00
jsteemann 12b973dc4b fix my compile errors 2017-02-14 16:41:31 +01:00
jsteemann 60e0b03b06 remove unused method 2017-02-14 16:23:07 +01:00
jsteemann 3ba6f1a1f5 Merge branch 'devel' of https://github.com/arangodb/arangodb into engine-api 2017-02-14 16:16:01 +01:00
Jan Christoph Uhde ce3b1ff9b5 Merge branch 'obi-storage' into devel 
* obi-storage:
  move compation locking / figures out of logical collection

Conflicts:
	arangod/MMFiles/MMFilesCollection.h
	arangod/VocBase/LogicalCollection.h
 2017-02-14 16:14:25 +01:00
jsteemann 8c9dd79aeb potential fixes for MSVC 2017-02-14 16:11:18 +01:00
Simon Grätzer 4ec41ed31d Stuff 2017-02-14 16:01:53 +01:00
jsteemann 1b5445731b potential fixes for MSVC 2017-02-14 16:01:00 +01:00
Kaveh Vahedipour 37472ddcdc revisited the appendEntries API 2017-02-14 15:18:07 +01:00
Michael Hackstein 50368b9985 Moved CollectionRead/WriteLocker to MMFiles. Also moved cleanupIndexes to MMFilesCollection 2017-02-14 15:12:36 +01:00
Kaveh Vahedipour b6756bad65 Merge branch 'devel' of https://github.com/arangodb/arangodb into devel 2017-02-14 15:08:03 +01:00
Kaveh Vahedipour 05250b6c7b back port of bug fixes in 3.1 2017-02-14 15:07:51 +01:00
Michael Hackstein dffd9fc807 Merge branch 'engine-api' of github.com:arangodb/arangodb into engine-api 2017-02-14 14:08:56 +01:00
Michael Hackstein d5e14a95f4 Moved truncate logic from Transaction::Methods to MMFilesCollection. It can do optimizations if close to the DB layer 2017-02-14 13:50:29 +01:00
jsteemann 0909ffe69b moved helper functions into their own file 2017-02-14 13:44:54 +01:00
Simon Grätzer 35cd39f859 Merge branch 'devel' of https://github.com/graetzer/arangodb into devel 2017-02-14 13:39:05 +01:00
Simon Grätzer 3f0b01023d Added comments to keys 2017-02-14 13:38:58 +01:00
jsteemann 8a2e353f3d move encoding functions into their own file 2017-02-14 12:57:15 +01:00
jsteemann be77decb2d remove an unused include 2017-02-14 12:39:50 +01:00
Michael Hackstein c6830fb999 Moved more internal logic from Logical to Physical collection 2017-02-14 12:38:09 +01:00
jsteemann cbe8ee1172 renamed feature 2017-02-14 12:35:54 +01:00
jsteemann 80be198a39 moved helper classes into their own file 2017-02-14 12:35:34 +01:00
Jan Christoph Uhde 071d147c5f move compation locking / figures out of logical collection 2017-02-14 12:34:46 +01:00
jsteemann 8e912ef4dc Merge branch 'devel' of https://github.com/arangodb/arangodb into engine-api 2017-02-14 12:08:16 +01:00
Michael Hackstein 6605a01410 Moved lookupDocument form LogicalCollection into MMFilesCollection. It is SE specific. 2017-02-14 11:37:45 +01:00
jsteemann 9ede671aa3 pre-reserve array 2017-02-14 11:34:34 +01:00
jsteemann ff956f1696 expose rawSuffix 2017-02-14 11:25:12 +01:00
jsteemann 202bfe1963 Merge branch 'suffix-decoding' of https://github.com/arangodb/arangodb into devel 2017-02-14 11:00:24 +01:00
Michael Hackstein 32bd15d098 Renamed collection->update() to update the properties of a collection to collection->updateProperties(). There is another update() which is used for the stored Documents. 2017-02-14 10:32:24 +01:00
Michael Hackstein c8757efc8e Moved engine specific logic of Document Remove from Logical To Physical Collection 2017-02-14 10:20:32 +01:00
jsteemann b666254d4b make constructor explicit 2017-02-14 08:59:05 +01:00
Michael Hackstein 03e77aee4a Merge branch 'engine-api' of github.com:arangodb/arangodb into engine-api 2017-02-13 17:58:56 +01:00
Michael Hackstein 2824c349bb Moved EngineSpecific logic of update() from LogicalCollection to MMFilesCollection. 2017-02-13 17:45:33 +01:00
jsteemann 9efc1c7b61 moved transaction status into its own file 2017-02-13 17:28:02 +01:00
jsteemann 72fa7ac85d move _hasOperations flag into engine 2017-02-13 17:07:49 +01:00
jsteemann 2532627a80 Merge branch 'engine-api' of https://github.com/arangodb/arangodb into engine-api 2017-02-13 16:54:13 +01:00
jsteemann a184697072 move RocksDB-specific transactions into engine 2017-02-13 16:53:58 +01:00
Michael Hackstein ae12fc0133 Merge branch 'engine-api' of github.com:arangodb/arangodb into engine-api 2017-02-13 16:37:48 +01:00
jsteemann 5ebeb5f144 Merge branch 'devel' of https://github.com/arangodb/arangodb into engine-api 2017-02-13 16:29:40 +01:00
Michael Hackstein c42b358987 Merge branch 'engine-api' of github.com:arangodb/arangodb into engine-api 2017-02-13 16:27:41 +01:00
Michael Hackstein 91a0d30122 Moved the engine specific parts of remove from LogicalCollection to Physical Collection. 2017-02-13 16:17:26 +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
Andreas Streichardt bbd3728b08 Log action errors to the outside only when in MAINTAINER_MODE 
but do always log to the logfile
 2017-02-13 15:53:09 +01:00
Andreas Streichardt bc1c2127e0 No need for forward declaration as include is there anyway (and 
required)
 2017-02-13 15:53:08 +01:00
jsteemann 0e5cd5ea1d fix compile errors 2017-02-13 15:42:35 +01:00
jsteemann 383b534f5d fix compile errors 2017-02-13 15:42:02 +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
Jan Christoph Uhde 0f3e42cf26 Merge branch 'devel' of github.com:arangodb/arangodb into devel 
* 'devel' of github.com:arangodb/arangodb:
  Fix unused variables
  don't allow to run against pre-running server - it may fail
  arangoexport: continue documentation
 2017-02-13 15:23:18 +01:00
Andreas Streichardt e3d8f19368 Fix unused variables 2017-02-13 15:22:58 +01:00
Jan Christoph Uhde 82f91cfa1b prepare move of compaction to physicalcollection 2017-02-13 15:22:38 +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
Michael Hackstein 0c30c290c6 Moved parts of LogicalCollection->insert() into the PhysicalCollectioN 2017-02-13 14:38:22 +01:00
Jan Christoph Uhde ab5d307567 Merge branch 'devel' of github.com:arangodb/arangodb into devel 
* 'devel' of github.com:arangodb/arangodb:
  jslint
  arangoexport: continue documentation
  Fix secondaries
  arangoexport: continue documentation
  added missing file
  remove global namespace include
 2017-02-13 14:36:46 +01:00
jsteemann 5d5d8b0a93 Merge branch 'devel' of https://github.com/arangodb/arangodb into engine-api 2017-02-13 14:36:39 +01:00
jsteemann 16189aa969 moved TransactionHints.h 2017-02-13 14:36:27 +01:00
Andreas Streichardt 1bb8f97773 Fix secondaries 2017-02-13 14:00:19 +01:00
jsteemann 101fac3fa8 Merge branch 'devel' of https://github.com/arangodb/arangodb into engine-api 2017-02-13 13:31:36 +01:00
jsteemann eb73dbf960 renaming 2017-02-13 13:30:57 +01:00
jsteemann b3ac54d065 remove global namespace include 2017-02-13 13:03:33 +01:00
Jan Christoph Uhde 27309d1de0 Merge branch 'devel' of github.com:arangodb/arangodb into devel 
* 'devel' of github.com:arangodb/arangodb: (47 commits)
  arangoexport: continue documentation
  arangoexport: documentation continued
  arangoexport: config for client package
  arangoexport: refix xml attribute escaping
  arangoexport: Documentation
  README_maintainers: mention pythons webserver to view generated documentation
  arangoexport: Documentation
  arangoexport: start documentation
  arangoexport: switch to LOG_TOPIC
  arangoexport: xgmml encode attribute values
  arangoexport: remove unnecessary xmlns declaration
  arangoexport: added stats http, written size
  arangoexport: take --xgmml-label-attribute into account
  arangoexport: xgmml set label attribute
  arangoexport: error msgs improvements, dont create file if collection or graph are 404
  added arangoexport to Documentation/CMakeLists
  updated ReleaseNotes and added NewFeatures32
  arangoexport: added manpage
  arangoexport: mention in CHANGELOG
  arangoexport: inital work on test
  ...
 2017-02-13 12:59:58 +01:00
jsteemann f09ec85127 renaming 2017-02-13 12:27:26 +01:00
Kaveh Vahedipour 27c35dd782 WFS set 2017-02-13 12:02:33 +01:00
Jan Christoph Uhde 163b3d45bf remove fullyCollected and friends from LogicalCollection 2017-02-13 11:47:22 +01:00
jsteemann fa2e98ded6 Merge branch 'devel' of https://github.com/arangodb/arangodb into engine-api 2017-02-13 10:50:40 +01:00
Michael Hackstein 4b604d798f Merge branch 'devel' of github.com:arangodb/arangodb into devel 2017-02-13 10:49:36 +01:00
Kaveh Vahedipour 0a03034d15 Merge branch 'devel' of https://github.com/arangodb/arangodb into devel 2017-02-13 10:48:43 +01:00
Kaveh Vahedipour a86ae11d76 fixed wrong logic in FailedLeader job 2017-02-13 10:48:31 +01:00
Jan Christoph Uhde 6249055f56 remove RocksDBEngine from EngineSelectorFeature 2017-02-13 10:44:13 +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
jsteemann f5d83935f0 renamed class 2017-02-13 10:12:36 +01:00
Michael Hackstein 85b2cf8ca2 Merge branch 'devel' of github.com:arangodb/arangodb into devel 2017-02-13 09:59:32 +01:00
Max Neunhoeffer 3658379067 Merge branch 'devel' of ssh://github.com/ArangoDB/ArangoDB into devel 2017-02-13 09:58:07 +01:00
Max Neunhoeffer c5d79c5a85 Fix Supervision bug in failedFollower. 2017-02-13 09:57:47 +01:00
Michael Hackstein f4c558096a Merge branch 'engine-api' of github.com:arangodb/arangodb into devel 2017-02-13 09:50:43 +01:00
jsteemann eea22a4971 Merge branch 'devel' of https://github.com/arangodb/arangodb into engine-api 2017-02-13 09:45:44 +01:00
Kaveh Vahedipour 51fe9fae6c when registering callbacks fail, we should have some' to go on 2017-02-13 09:00:56 +01:00
jsteemann 8b273b5eaf Merge branch 'devel' of https://github.com/arangodb/arangodb into engine-api 2017-02-13 08:37:41 +01:00
Simon Grätzer 9fb0ade7ce Less locking 2017-02-13 03:06:36 +01:00
Simon Grätzer 62464be81f Stuff 2017-02-13 02:45:38 +01:00
Frank Celler 392e8233eb fixed compile error on Mac 2017-02-12 18:32:12 +01:00
Frank Celler 9f63ca6d21 added topic SSL 2017-02-12 18:19:24 +01:00
Simon Grätzer 10c503ccf3 More profiling 2017-02-12 13:21:59 +01:00
Michael Hackstein 5c7b971122 Removed the old slice based skiplist iterator and renamed SkiplistIterator2 => SkiplistIterator 2017-02-12 12:59:14 +01:00
Michael Hackstein 9be60be0b9 Removed AnyDirectionEdgeIndexIterator. Not used anymore, internally there is no ANY 2017-02-12 12:44:25 +01:00
Simon Grätzer bb0fa96251 Adding logging 2017-02-12 01:58:43 +01:00
Simon Grätzer 2c1e40f342 fix 2017-02-12 01:39:33 +01:00
Simon Grätzer 7198acc88e Added profiling 2017-02-12 00:53:52 +01:00
Simon Grätzer 3fd10aae34 Adding tryLock 2017-02-12 00:13:44 +01:00
Simon Grätzer aa4d117999 hmpf 2017-02-11 22:44:00 +01:00
Simon Grätzer 6853359e56 grr 2017-02-11 22:40:26 +01:00
Simon Grätzer cbe05181b8 added some lockers 2017-02-11 22:39:12 +01:00
Simon Grätzer becca2bdbb Testing randomized bucket access 2017-02-11 21:40:35 +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
Jan Christoph Uhde b0c4b7b38a remove rocksdb engine from build 2017-02-10 20:40:47 +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
Michael Hackstein 48166a294c TraversalNode now does not know anything about EdgeIndexes any more. Removed isMMFilesEdgeIndex from Transaction, no obsolete 2017-02-10 18:18:23 +01:00
Simon Grätzer 5f2f6727d3 Fixing log topics 2017-02-10 18:07:02 +01:00
Max Neunhoeffer dad4f34f7a Fix a wrong log message. 2017-02-10 17:44:18 +01:00
Kaveh Vahedipour 7fbf9fb621 AgencyCallBacks registry and unregistry are more talkative than bool 2017-02-10 17:31:26 +01:00
Kaveh Vahedipour 6aa7080803 Merge branch 'devel' of https://github.com/arangodb/arangodb into devel 2017-02-10 17:03:24 +01:00
Kaveh Vahedipour 76e5dec3d7 agent with less traffic 2017-02-10 17:03:15 +01:00
Simon Grätzer f2bae38ed6 Merge branch 'devel' of https://github.com/graetzer/arangodb into devel 
# Conflicts:
#	arangod/Pregel/Worker.cpp
 2017-02-10 16:35:48 +01:00
Simon Grätzer 1a0d9ff9c7 Starting checkpointing 2017-02-10 16:33:55 +01:00
Simon Grätzer 4edba27b41 Fixed log topic 2017-02-10 16:31:38 +01:00
Michael Hackstein 01d5559ad5 Removed unnecessary includes 2017-02-10 16:28:05 +01:00
Michael Hackstein 07154391a2 Removed iteratorForSlice on Indexes and adapted index scan on transaction, because it can now only be used for ANY or ALL scans. 2017-02-10 15:47: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 bf81a5901b Merge branch 'devel' of github.com:arangodb/arangodb into devel 
* 'devel' of github.com:arangodb/arangodb:
  changelog
  updated CHANGELOG
  error out if package build fails
  fix rpm debug packages on older systems without SHA checksum in the binaries
  fix V8 job dispatching in case another job is cancelled
  size_t is correct
  some diagnostics if tasks are not found
  css
 2017-02-10 15:14:56 +01:00
Jan Christoph Uhde 929390cee1 move index marker creation to storage engine 
remove MMFilesLogfileManager from LogicalCollection

fix marker type
 2017-02-10 15:14:34 +01:00
Michael Hackstein 9ff4eef129 Merge branch 'engine-api' of github.com:arangodb/arangodb into engine-api 2017-02-10 15:11:42 +01:00
Michael Hackstein 6b5d4b1d3d Reimplemented EdgeCollectionInfo to use Ast Conditions instead of VelocyPack. 2017-02-10 15:11:36 +01:00
jsteemann 5b4a018caf Merge branch 'devel' of https://github.com/arangodb/arangodb into engine-api 2017-02-10 14:29:44 +01:00
Michael Hackstein 16dda09b4a Preperation to remove knowledge of EdgeIndex from ShortestPathNode 2017-02-10 14:24:13 +01:00
jsteemann 16bd3b0356 fix V8 job dispatching in case another job is cancelled 2017-02-10 14:23:34 +01:00
Michael Hackstein 0007f666c4 Merge branch 'devel' of github.com:arangodb/arangodb into engine-api 2017-02-10 13:19:15 +01:00
Kaveh Vahedipour dabdb8febb size_t is correct 2017-02-10 13:10:46 +01:00
Michael Hackstein 49f2283d9b Merge branch 'engine-api' of github.com:arangodb/arangodb into engine-api 2017-02-10 12:27:49 +01:00
Michael Hackstein d5f2e8fba5 Fixed a uniqueness bug in api/edges 2017-02-10 12:27:45 +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 9678d528bf Merge branch 'devel' of https://github.com/arangodb/arangodb into engine-api 2017-02-10 11:33:54 +01:00
Kaveh Vahedipour 06c1f70bac Merge branch 'devel' of https://github.com/arangodb/arangodb into devel 2017-02-10 11:26:03 +01:00
Kaveh Vahedipour 29d73b2e9c sendAppendEntries does resonable estimation of follower time needs leading to less frequent spamming of followers 2017-02-10 11:25:55 +01:00
jsteemann 7196b67319 Merge branch 'devel' of https://github.com/arangodb/arangodb into engine-api 2017-02-10 11:13:19 +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
Michael Hackstein 96e2f4a1a0 Merge branch 'engine-api' of github.com:arangodb/arangodb into engine-api 2017-02-10 10:45:56 +01:00
Michael Hackstein 27c6756367 Readded POST _api/edges a client js module uses it ;( 2017-02-10 10:45:47 +01:00
jsteemann 103ceec2f5 Merge branch 'devel' of https://github.com/arangodb/arangodb into engine-api 2017-02-10 09:43:23 +01:00
jsteemann 680a659184 fix another merge conflict 2017-02-10 09:38:42 +01:00
jsteemann 23ed96b7a7 fix compile error after merge 2017-02-10 09:36:49 +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
jsteemann c314b9fdd3 Merge branch 'devel' of https://github.com/arangodb/arangodb into engine-api 2017-02-10 09:12:28 +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 05804be1a4 Merge branch 'devel' of https://github.com/arangodb/arangodb into engine-api 2017-02-09 17:53:34 +01:00
jsteemann b6218159c3 remove static_assert (thanks MSVC) 2017-02-09 17:42:38 +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
Michael Hackstein e13064e83b Merge branch 'engine-api' of github.com:arangodb/arangodb into engine-api 2017-02-09 17:15:51 +01:00
Michael Hackstein b43cf48252 Added a self-contained edge condition builder that allows to create AQL conditions without actually having an AQL query. The RestEdgesHandler uses it to serve requests for edges now. Removed undocumented endpoints PUT/POST /_api/edges as obsolete. 2017-02-09 17:15:42 +01:00
Max Neunhoeffer f5a22b18b3 Kill queries in registry at shutdown. 2017-02-09 16:54:13 +01:00
Frank Celler dc5e946c05 version number is now generated 2017-02-09 16:35:10 +01:00
jsteemann ab21b0b1ff move functionality into engine 2017-02-09 14:50:41 +01:00
Max Neunhoeffer 6be0c909b6 Merge remote-tracking branch 'origin/devel' into maxtests 2017-02-09 14:39:51 +01:00
jsteemann 434fad5691 remove static_assert (thanks MSVC) 2017-02-09 13:39:01 +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 298b9ffc3b Add AQLFeature. 2017-02-09 11:57:51 +01:00