Bug fix 3.5/fix smart join restrictions (#9534)

jsteemann · KVS85 · commit 313d60e65644 · 2019-07-22T15:52:08.000+03:00
* fixed a query abort error with smart joins if both collections were
restricted to a single shard using the "restrict-to-single-shard"
optimizer rule

* updated CHANGELOG

* try to fix Windows build error
diff --git a/CHANGELOG b/CHANGELOG
@@ -1,6 +1,9 @@
 v3.5.0-rc.5 (2019-XX-XX)
 ------------------------
 
+* Fixed a query abort error with smart joins if both collections were restricted to a
+  single shard using the "restrict-to-single-shard" optimizer rule.
+
 * Fixed a performance regression of COLLECT WITH COUNT INTO.
 
 * Fixed some races in cluster collection creation, which allowed collections with the
diff --git a/arangod/Aql/EngineInfoContainerDBServer.cpp b/arangod/Aql/EngineInfoContainerDBServer.cpp
@@ -171,8 +171,7 @@ void EngineInfoContainerDBServer::EngineInfo::addNode(ExecutionNode* node) {
     TRI_ASSERT(sourceImpl);
 
     if (node->isRestricted()) {
-      TRI_ASSERT(sourceImpl->restrictedShard.empty());
-      sourceImpl->restrictedShard = node->restrictedShard();
+      sourceImpl->restrictedShards.emplace(node->restrictedShard());
     }
   };
 
@@ -315,10 +314,10 @@ void EngineInfoContainerDBServer::EngineInfo::serializeSnippet(
     bool isResponsibleForInitializeCursor) const {
   auto* collection = boost::get<CollectionSource>(&_source);
   TRI_ASSERT(collection);
-  auto& restrictedShard = collection->restrictedShard;
+  auto const& restrictedShards = collection->restrictedShards;
 
-  if (!restrictedShard.empty()) {
-    if (id != restrictedShard) {
+  if (!restrictedShards.empty()) {
+    if (restrictedShards.find(id) == restrictedShards.end()) {
       return;
     }
     // We only have one shard it has to be responsible!
diff --git a/arangod/Aql/EngineInfoContainerDBServer.h b/arangod/Aql/EngineInfoContainerDBServer.h
@@ -88,7 +88,6 @@ class EngineInfoContainerDBServer {
     explicit EngineInfo(size_t idOfRemoteNode) noexcept;
     EngineInfo(EngineInfo&& other) noexcept;
     ~EngineInfo();
-    EngineInfo(EngineInfo&) = delete;
     EngineInfo(EngineInfo const& other) = delete;
 
 #if (_MSC_VER != 0)
@@ -124,14 +123,11 @@ class EngineInfoContainerDBServer {
 
    private:
     struct CollectionSource {
-      explicit CollectionSource(aql::Collection* collection) noexcept
-        : collection(collection) {
-      }
-      CollectionSource(CollectionSource&&) = default;
-      CollectionSource& operator=(CollectionSource&&) = default;
+      explicit CollectionSource(aql::Collection* collection)
+        : collection(collection) {}
 
       aql::Collection* collection{};  // The collection used to connect to this engine
-      std::string restrictedShard;    // The shard this snippet is restricted to
+      std::unordered_set<std::string> restrictedShards{}; // The shards this snippet is restricted to
     };
 
     struct ViewSource {
