make insert_dependencies as vector in PlanResourceHolder

Author: CheSema

src/Interpreters/InsertDependenciesBuilder.cpp

@@ -778,7 +778,7 @@ bool InsertDependenciesBuilder::observePath(const DependencyPath & path)
 {
     const auto & parent = path.parent(1);
     const auto & current = path.current();
-    LOG_TEST(logger, "collectPath: {}", path.debugString());
+    LOG_TEST(logger, "observePath: {}", path.debugString());
 
     auto storage = current == init_table_id ? init_storage : DatabaseCatalog::instance().tryGetTable(current, init_context);
     auto lock = storage ? storage->tryLockForShare(init_context->getInitialQueryId(), init_context->getSettingsRef()[Setting::lock_acquire_timeout]) : nullptr;
@@ -859,7 +859,7 @@ bool InsertDependenciesBuilder::observePath(const DependencyPath & path)
 
         select_queries[current] = metadata->getSelectQuery().inner_query;
         input_headers[current] = output_headers.at(path.parent(2));
-        // output_headers is filled at next call collectPath(inner_table)
+        // output_headers is filled at next call observePath(inner_table)
 
         std::tie(select_contexts[current], insert_contexts[current]) = createSelectInsertContext(path);
 

src/QueryPipeline/Chain.h

@@ -59,8 +59,7 @@ class Chain
     void addInterpreterContext(ContextPtr context) { holder.interpreter_context.emplace_back(std::move(context)); }
     void addInsertDependenciesBuilder(InsertDependenciesBuilderConstPtr insert_dependencies)
     {
-        chassert(!holder.insert_dependencies_holder);
-        holder.insert_dependencies_holder = insert_dependencies;
+        holder.insert_dependencies_holders.push_back(insert_dependencies);
     }
 
 

src/QueryPipeline/QueryPlanResourceHolder.cpp

@@ -13,11 +13,7 @@ QueryPlanResourceHolder & QueryPlanResourceHolder::append(QueryPlanResourceHolde
     interpreter_context.insert(interpreter_context.end(),
                                rhs.interpreter_context.begin(), rhs.interpreter_context.end());
     query_id_holders.insert(query_id_holders.end(), rhs.query_id_holders.begin(), rhs.query_id_holders.end());
-
-    if (insert_dependencies_holder && rhs.insert_dependencies_holder)
-        chassert(insert_dependencies_holder == rhs.insert_dependencies_holder);
-
-    insert_dependencies_holder = std::move(rhs.insert_dependencies_holder);
+    insert_dependencies_holders.insert(insert_dependencies_holders.end(), rhs.insert_dependencies_holders.begin(), rhs.insert_dependencies_holders.end());
 
     return *this;
 }

src/QueryPipeline/QueryPlanResourceHolder.h

@@ -35,7 +35,7 @@ struct QueryPlanResourceHolder
     std::vector<StoragePtr> storage_holders;
     std::vector<TableLockHolder> table_locks;
     std::vector<std::shared_ptr<QueryIdHolder>> query_id_holders;
-    InsertDependenciesBuilderConstPtr insert_dependencies_holder;
+    std::vector<InsertDependenciesBuilderConstPtr> insert_dependencies_holders;
 };
 
 }