arangodb · neunhoef · Jan 8, 2019 · Jul 23, 2018 · Jul 24, 2018 · Jul 25, 2018
diff --git a/arangod/Aql/AqlFunctionFeature.cpp b/arangod/Aql/AqlFunctionFeature.cpp
@@ -428,8 +428,8 @@ void AqlFunctionFeature::addMiscFunctions() {
        &Functions::CurrentUser});  // deterministic, but not cacheable
   add({"CURRENT_DATABASE", "", Function::makeFlags(FF::Deterministic),
        &Functions::CurrentDatabase});  // deterministic, but not cacheable
-  add({"CHECK_DOCUMENT", ".", Function::makeFlags(FF::CanRunOnDBServer), 
-       &Functions::CheckDocument}); // not deterministic and not cacheable
+  add({"CHECK_DOCUMENT", ".", Function::makeFlags(FF::CanRunOnDBServer),
+       &Functions::CheckDocument});  // not deterministic and not cacheable
   add({"COLLECTION_COUNT", ".h", Function::makeFlags(), &Functions::CollectionCount});  // not deterministic and not cacheable
   add({"PREGEL_RESULT", ".", Function::makeFlags(FF::CanRunOnDBServer),
        &Functions::PregelResult});  // not deterministic and not cacheable

diff --git a/arangod/Aql/AstNode.cpp b/arangod/Aql/AstNode.cpp
@@ -978,7 +978,7 @@ void AstNode::toVelocyPackValue(VPackBuilder& builder) const {
 
   if (type == NODE_TYPE_OBJECT) {
     builder.openObject();
-    
+
     std::unordered_set<VPackStringRef> keys;
     size_t const n = numMembers();
 

diff --git a/arangod/Aql/ClusterBlocks.cpp b/arangod/Aql/ClusterBlocks.cpp
@@ -40,7 +40,6 @@
 #include "Cluster/ClusterComm.h"
 #include "Cluster/ClusterInfo.h"
 #include "Cluster/ServerState.h"
-#include "Scheduler/JobGuard.h"
 #include "Scheduler/SchedulerFeature.h"
 #include "Transaction/Methods.h"
 #include "Transaction/StandaloneContext.h"

diff --git a/arangod/Aql/Expression.cpp b/arangod/Aql/Expression.cpp
@@ -672,7 +672,7 @@ AqlValue Expression::executeSimpleExpressionObject(AstNode const* node,
       if (mustCheckUniqueness) {
         std::string key(member->getString());
 
-        // track each individual object key 
+        // track each individual object key
         auto it = keys.find(key);
 
         if (it != keys.end()) {
@@ -687,7 +687,8 @@ AqlValue Expression::executeSimpleExpressionObject(AstNode const* node,
           keys.emplace(std::move(key));
         }
       } else {
-        builder->add(VPackValuePair(member->getStringValue(), member->getStringLength(), VPackValueType::String));
+        builder->add(VPackValuePair(member->getStringValue(),
+                                    member->getStringLength(), VPackValueType::String));
       }
 
       // value

diff --git a/arangod/Aql/Functions.cpp b/arangod/Aql/Functions.cpp
@@ -217,9 +217,9 @@ bool isValidDocument(VPackSlice slice) {
 
   if (slice.isObject()) {
     std::unordered_set<VPackStringRef> keys;
-  
+
     auto it = VPackObjectIterator(slice, true);
-    
+
     while (it.valid()) {
       if (!keys.emplace(it.key().stringRef()).second) {
         // duplicate key
@@ -6769,8 +6769,7 @@ AqlValue Functions::CollectionCount(ExpressionContext*, transaction::Methods* tr
 }
 
 /// @brief function CHECK_DOCUMENT
-AqlValue Functions::CheckDocument(ExpressionContext*,
-                                  transaction::Methods* trx,
+AqlValue Functions::CheckDocument(ExpressionContext*, transaction::Methods* trx,
                                   VPackFunctionParameters const& parameters) {
   AqlValue const& value = extractFunctionParameterValue(parameters, 0);
   if (!value.isObject()) {

diff --git a/arangod/Aql/RestAqlHandler.cpp b/arangod/Aql/RestAqlHandler.cpp
@@ -45,7 +45,6 @@
 #include "Logger/Logger.h"
 #include "Rest/HttpRequest.h"
 #include "Rest/HttpResponse.h"
-#include "Scheduler/JobGuard.h"
 #include "Scheduler/Scheduler.h"
 #include "Scheduler/SchedulerFeature.h"
 #include "Transaction/Methods.h"

diff --git a/arangod/Aql/Scopes.cpp b/arangod/Aql/Scopes.cpp
@@ -172,7 +172,7 @@ void Scopes::addVariable(Variable* variable) {
 void Scopes::replaceVariable(Variable* variable) {
   TRI_ASSERT(!_activeScopes.empty());
   TRI_ASSERT(variable != nullptr);
-      
+
   _activeScopes.back()->addVariable(variable);
 }
 

diff --git a/arangod/Aql/SharedQueryState.cpp b/arangod/Aql/SharedQueryState.cpp
@@ -70,6 +70,6 @@ bool SharedQueryState::executeContinueCallback() const {
   }
   // do NOT use scheduler->post(), can have high latency that
   //  then backs up libcurl callbacks to other objects
-  scheduler->queue(RequestPriority::HIGH, _continueCallback);
+  scheduler->queue(RequestLane::CLIENT_AQL, _continueCallback);
   return true;
 }
diff --git a/arangod/CMakeLists.txt b/arangod/CMakeLists.txt
@@ -142,8 +142,8 @@ SET(ARANGOD_SOURCES
   ${ProductVersionFiles}
   ${ENTERPRISE_FILES}
   Actions/ActionFeature.cpp
-  Actions/RestActionHandler.cpp
   Actions/actions.cpp
+  Actions/RestActionHandler.cpp
   Agency/ActiveFailoverJob.cpp
   Agency/AddFollower.cpp
   Agency/AgencyComm.cpp
@@ -190,11 +190,11 @@ SET(ARANGOD_SOURCES
   Aql/ClusterBlocks.cpp
   Aql/ClusterNodes.cpp
   Aql/CollectBlock.cpp
-  Aql/CollectNode.cpp
-  Aql/CollectOptions.cpp
   Aql/Collection.cpp
-  Aql/Collections.cpp
   Aql/CollectionAccessingNode.cpp
+  Aql/Collections.cpp
+  Aql/CollectNode.cpp
+  Aql/CollectOptions.cpp
   Aql/Condition.cpp
   Aql/ConditionFinder.cpp
   Aql/DocumentProducingBlock.cpp
@@ -212,8 +212,9 @@ SET(ARANGOD_SOURCES
   Aql/FixedVarExpressionContext.cpp
   Aql/Function.cpp
   Aql/Functions.cpp
-  Aql/Graphs.cpp
+  Aql/grammar.cpp
   Aql/GraphNode.cpp
+  Aql/Graphs.cpp
   Aql/IndexBlock.cpp
   Aql/IndexNode.cpp
   Aql/ModificationBlocks.cpp
@@ -223,19 +224,19 @@ SET(ARANGOD_SOURCES
   Aql/Optimizer.cpp
   Aql/OptimizerRules.cpp
   Aql/OptimizerRulesCluster.cpp
-  Aql/OptimizerRulesReplaceFunctions.cpp
   Aql/OptimizerRulesFeature.cpp
+  Aql/OptimizerRulesReplaceFunctions.cpp
   Aql/Parser.cpp
   Aql/PlanCache.cpp
-  Aql/QueryExecutionState.cpp
-  Aql/QueryProfile.cpp
   Aql/Quantifier.cpp
   Aql/Query.cpp
   Aql/QueryCache.cpp
   Aql/QueryCursor.cpp
+  Aql/QueryExecutionState.cpp
   Aql/QueryExpressionContext.cpp
   Aql/QueryList.cpp
   Aql/QueryOptions.cpp
+  Aql/QueryProfile.cpp
   Aql/QueryRegistry.cpp
   Aql/QueryResources.cpp
   Aql/QueryString.cpp
@@ -244,32 +245,31 @@ SET(ARANGOD_SOURCES
   Aql/RestAqlHandler.cpp
   Aql/Scopes.cpp
   Aql/SharedQueryState.cpp
-  Aql/ShortStringStorage.cpp
   Aql/ShortestPathBlock.cpp
   Aql/ShortestPathNode.cpp
+  Aql/ShortStringStorage.cpp
   Aql/SortBlock.cpp
   Aql/SortCondition.cpp
   Aql/SortNode.cpp
   Aql/SortRegister.cpp
   Aql/SubqueryBlock.cpp
+  Aql/tokens.cpp
   Aql/TraversalBlock.cpp
   Aql/TraversalConditionFinder.cpp
   Aql/TraversalNode.cpp
   Aql/V8Executor.cpp
   Aql/Variable.cpp
   Aql/VariableGenerator.cpp
   Aql/WakeupQueryCallback.cpp
-  Aql/grammar.cpp
-  Aql/tokens.cpp
   Auth/Common.cpp
   Auth/TokenCache.cpp
   Auth/User.cpp
   Auth/UserManager.cpp
   Cache/BucketState.cpp
   Cache/Cache.cpp
+  Cache/CachedValue.cpp
   Cache/CacheManagerFeature.cpp
   Cache/CacheManagerFeatureThreads.cpp
-  Cache/CachedValue.cpp
   Cache/Finding.cpp
   Cache/Manager.cpp
   Cache/ManagerTasks.cpp
@@ -322,6 +322,8 @@ SET(ARANGOD_SOURCES
   Cluster/TraverserEngineRegistry.cpp
   Cluster/UpdateCollection.cpp
   Cluster/v8-cluster.cpp
+  GeneralServer/Acceptor.cpp
+  GeneralServer/AcceptorTcp.cpp
   GeneralServer/AsyncJobManager.cpp
   GeneralServer/AuthenticationFeature.cpp
   GeneralServer/GeneralCommTask.cpp
@@ -330,16 +332,20 @@ SET(ARANGOD_SOURCES
   GeneralServer/GeneralServerFeature.cpp
   GeneralServer/HttpCommTask.cpp
   GeneralServer/IoTask.cpp
+  GeneralServer/ListenTask.cpp
   GeneralServer/RestHandler.cpp
   GeneralServer/RestHandlerFactory.cpp
+  GeneralServer/SocketSslTcp.cpp
+  GeneralServer/SocketTask.cpp
+  GeneralServer/Task.cpp
   GeneralServer/VstCommTask.cpp
   GeoIndex/Index.cpp
   GeoIndex/Near.cpp
   Graph/AttributeWeightShortestPathFinder.cpp
   Graph/BaseOptions.cpp
   Graph/BreadthFirstEnumerator.cpp
-  Graph/ConstantWeightShortestPathFinder.cpp
   Graph/ClusterTraverserCache.cpp
+  Graph/ConstantWeightShortestPathFinder.cpp
   Graph/EdgeCollectionInfo.cpp
   Graph/Graph.cpp
   Graph/GraphManager.cpp
@@ -350,10 +356,10 @@ SET(ARANGOD_SOURCES
   Graph/ShortestPathResult.cpp
   Graph/SingleServerEdgeCursor.cpp
   Graph/SingleServerTraverser.cpp
+  Graph/Traverser.cpp
   Graph/TraverserCache.cpp
   Graph/TraverserCacheFactory.cpp
   Graph/TraverserDocumentCache.cpp
-  Graph/Traverser.cpp
   Graph/TraverserOptions.cpp
   Indexes/Index.cpp
   Indexes/IndexFactory.cpp
@@ -366,35 +372,36 @@ SET(ARANGOD_SOURCES
   Pregel/AlgoRegistry.cpp
   Pregel/Algos/AsyncSCC.cpp
   Pregel/Algos/ConnectedComponents.cpp
+  Pregel/Algos/DMID/DMID.cpp
   Pregel/Algos/EffectiveCloseness/EffectiveCloseness.cpp
   Pregel/Algos/EffectiveCloseness/HLLCounter.cpp
   Pregel/Algos/HITS.cpp
+  Pregel/Algos/LabelPropagation.cpp
   Pregel/Algos/LineRank.cpp
   Pregel/Algos/PageRank.cpp
   Pregel/Algos/RecoveringPageRank.cpp
-  Pregel/Algos/ShortestPath.cpp
-  Pregel/Algos/SSSP.cpp
   Pregel/Algos/SCC.cpp
+  Pregel/Algos/ShortestPath.cpp
   Pregel/Algos/SLPA.cpp
-  Pregel/Algos/LabelPropagation.cpp
-  Pregel/Algos/DMID/DMID.cpp
+  Pregel/Algos/SSSP.cpp
   Pregel/Conductor.cpp
   Pregel/GraphStore.cpp
   Pregel/IncomingCache.cpp
   Pregel/OutgoingCache.cpp
   Pregel/PregelFeature.cpp
   Pregel/Recovery.cpp
   Pregel/Utils.cpp
-  Pregel/Worker.cpp
-  Pregel/Worker-templates-native-types.cpp
   Pregel/Worker-templates-algorithms.cpp
+  Pregel/Worker-templates-native-types.cpp
+  Pregel/Worker.cpp
   Pregel/WorkerConfig.cpp
-  Replication/DatabaseReplicationApplier.cpp
-  Replication/GlobalReplicationApplier.cpp
-  Replication/GlobalInitialSyncer.cpp
+  Replication/common-defines.cpp
   Replication/DatabaseInitialSyncer.cpp
+  Replication/DatabaseReplicationApplier.cpp
   Replication/DatabaseTailingSyncer.cpp
   Replication/GlobalInitialSyncer.cpp
+  Replication/GlobalInitialSyncer.cpp
+  Replication/GlobalRep
10000
licationApplier.cpp
   Replication/GlobalTailingSyncer.cpp
   Replication/InitialSyncer.cpp
   Replication/ReplicationApplier.cpp
@@ -403,7 +410,6 @@ SET(ARANGOD_SOURCES
   Replication/ReplicationFeature.cpp
   Replication/Syncer.cpp
   Replication/TailingSyncer.cpp
-  Replication/common-defines.cpp
   Replication/utilities.cpp
   RestHandler/RestAdminDatabaseHandler.cpp
   RestHandler/RestAdminLogHandler.cpp
@@ -472,15 +478,9 @@ SET(ARANGOD_SOURCES
   RestServer/UpgradeFeature.cpp
   RestServer/ViewTypesFeature.cpp
   RestServer/VocbaseContext.cpp
-  Scheduler/Acceptor.cpp
-  Scheduler/AcceptorTcp.cpp
-  Scheduler/JobGuard.cpp
-  Scheduler/ListenTask.cpp
   Scheduler/Scheduler.cpp
   Scheduler/SchedulerFeature.cpp
-  Scheduler/SocketSslTcp.cpp
-  Scheduler/SocketTask.cpp
-  Scheduler/Task.cpp
+  Scheduler/SupervisedScheduler.cpp
   Sharding/ShardDistributionReporter.cpp
   Sharding/ShardingFeature.cpp
   Sharding/ShardingInfo.cpp
@@ -516,24 +516,29 @@ SET(ARANGOD_SOURCES
   Utils/OperationCursor.cpp
   Utils/SingleCollectionTransaction.cpp
   V8Server/FoxxQueuesFeature.cpp
-  V8Server/V8Context.cpp
-  V8Server/V8DealerFeature.cpp
   V8Server/v8-actions.cpp
   V8Server/v8-collection-util.cpp
   V8Server/v8-collection.cpp
   V8Server/v8-dispatcher.cpp
+  V8Server/v8-general-graph.cpp
   V8Server/v8-query.cpp
   V8Server/v8-replication.cpp
   V8Server/v8-statistics.cpp
-  V8Server/v8-users.cpp
-  V8Server/v8-user-structures.cpp
   V8Server/v8-user-functions.cpp
+  V8Server/v8-user-structures.cpp
+  V8Server/v8-users.cpp
   V8Server/v8-util.cpp
   V8Server/v8-views.cpp
   V8Server/v8-vocbase.cpp
   V8Server/v8-voccursor.cpp
   V8Server/v8-vocindex.cpp
-  V8Server/v8-general-graph.cpp
+  V8Server/V8Context.cpp
+  V8Server/V8DealerFeature.cpp
+  VocBase/KeyGenerator.cpp
+  VocBase/LogicalCollection.cpp
+  VocBase/LogicalDataSource.cpp
+  VocBase/LogicalView.cpp
+  VocBase/ManagedDocumentResult.cpp
   VocBase/Methods/AqlUserFunctions.cpp
   VocBase/Methods/Collections.cpp
   VocBase/Methods/Databases.cpp
@@ -559,7 +564,7 @@ if (USE_MAINTAINER_MODE)
 endif()
 
 if (NOT MSVC)
-  set(ARANGOD_SOURCES ${ARANGOD_SOURCES} Scheduler/AcceptorUnixDomain.cpp Scheduler/SocketUnixDomain.cpp)
+  set(ARANGOD_SOURCES ${ARANGOD_SOURCES} GeneralServer/AcceptorUnixDomain.cpp GeneralServer/SocketUnixDomain.cpp)
 endif()
 
 include(ClusterEngine/CMakeLists.txt)

diff --git a/arangod/Cache/CacheManagerFeature.cpp b/arangod/Cache/CacheManagerFeature.cpp
@@ -44,7 +44,6 @@ using namespace arangodb::application_features;
 using namespace arangodb::basics;
 using namespace arangodb::cache;
 using namespace arangodb::options;
-using namespace arangodb::rest;
 
 namespace arangodb {
 
@@ -102,7 +101,7 @@ void CacheManagerFeature::start() {
 
   auto scheduler = SchedulerFeature::SCHEDULER;
   auto postFn = [scheduler](std::function<void()> fn) -> bool {
-    scheduler->queue(RequestPriority::LOW, fn);
+    scheduler->queue(RequestLane::INTERNAL_LOW, fn);
     return true;
   };
   _manager.reset(new Manager(postFn, _cacheSize));