Merge pull request #12401 from ClickHouse/fix_segfault_in_storage_merge

alexey-milovidov · web-flow · commit 7c2bd32c9c9d · 2020-07-11T00:19:00.000+03:00
Fix another Context-related segfault
diff --git a/src/Processors/Pipe.cpp b/src/Processors/Pipe.cpp
@@ -90,6 +90,10 @@ Pipe::Pipe(Pipes && pipes, ProcessorPtr transform)
 
         max_parallel_streams += pipe.max_parallel_streams;
         processors.insert(processors.end(), pipe.processors.begin(), pipe.processors.end());
+
+        std::move(pipe.table_locks.begin(), pipe.table_locks.end(), std::back_inserter(table_locks));
+        std::move(pipe.interpreter_context.begin(), pipe.interpreter_context.end(), std::back_inserter(interpreter_context));
+        std::move(pipe.storage_holders.begin(), pipe.storage_holders.end(), std::back_inserter(storage_holders));
     }
 
     output_port = &transform->getOutputs().front();
diff --git a/tests/queries/0_stateless/01193_metadata_loading.sh b/tests/queries/0_stateless/01193_metadata_loading.sh
@@ -39,9 +39,7 @@ done
 wait
 
 $CLICKHOUSE_CLIENT -q "CREATE TABLE $db.table_merge (i UInt64, d Date, s String, n Nested(i UInt8, f Float32)) ENGINE=Merge('$db', '^table_')"
-#FIXME the following query leads to segfault
-#$CLICKHOUSE_CLIENT -q "SELECT count() * $count_multiplier, i, d, s, n.i, n.f FROM $db.table_merge GROUP BY i, d, s, n.i, n.f ORDER BY i"
-$CLICKHOUSE_CLIENT -q "SELECT 10000, i, d, s, n.i, n.f FROM $db.table_1_1 GROUP BY i, d, s, n.i, n.f ORDER BY i"
+$CLICKHOUSE_CLIENT -q "SELECT count() * $count_multiplier, i, d, s, n.i, n.f FROM $db.table_merge GROUP BY i, d, s, n.i, n.f ORDER BY i"
 
 db_engine=`$CLICKHOUSE_CLIENT -q "SELECT engine FROM system.databases WHERE name='$db'"`
 
@@ -53,7 +51,6 @@ $CLICKHOUSE_CLIENT -q "SELECT '01193_metadata_loading', $elapsed_ms FORMAT Null"
 
 if [[ $elapsed_ms -le $max_time_ms ]]; then echo ok; fi
 
-#$CLICKHOUSE_CLIENT -q "SELECT count() * $count_multiplier, i, d, s, n.i, n.f FROM $db.table_merge GROUP BY i, d, s, n.i, n.f ORDER BY i"
-$CLICKHOUSE_CLIENT -q "SELECT 8000, i, d, s, n.i, n.f FROM $db.table_1_1 GROUP BY i, d, s, n.i, n.f ORDER BY i"
+$CLICKHOUSE_CLIENT -q "SELECT count() * $count_multiplier, i, d, s, n.i, n.f FROM $db.table_merge GROUP BY i, d, s, n.i, n.f ORDER BY i"
 
 $CLICKHOUSE_CLIENT -q "DROP DATABASE $db"

Original file line number	Diff line number	Diff line change
`@@ -90,6 +90,10 @@ Pipe::Pipe(Pipes && pipes, ProcessorPtr transform)`
`90`	`90`
`91`	`91`	`max_parallel_streams += pipe.max_parallel_streams;`
`92`	`92`	`processors.insert(processors.end(), pipe.processors.begin(), pipe.processors.end());`
	`93`	`+`
	`94`	`+ std::move(pipe.table_locks.begin(), pipe.table_locks.end(), std::back_inserter(table_locks));`
	`95`	`+ std::move(pipe.interpreter_context.begin(), pipe.interpreter_context.end(), std::back_inserter(interpreter_context));`
	`96`	`+ std::move(pipe.storage_holders.begin(), pipe.storage_holders.end(), std::back_inserter(storage_holders));`
`93`	`97`	`}`
`94`	`98`
`95`	`99`	`output_port = &transform->getOutputs().front();`