Skip to content

Commit 92b8268

Browse files
committed
work with comments
1 parent 201a9f9 commit 92b8268

File tree

2 files changed

+3
-4
lines changed

2 files changed

+3
-4
lines changed

src/Interpreters/InsertDependenciesBuilder.cpp

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1006,7 +1006,7 @@ void InsertDependenciesBuilder::collectAllDependencies()
10061006
return;
10071007
}
10081008

1009-
if (isView(id)) // StorageMaterializedView, StorageLiveView, StorageWindowView have some id in inner_tables
1009+
if (isView(id))
10101010
{
10111011
auto inner_table = inner_tables.at(id);
10121012
if (!inner_table.empty() && inner_table != id)
@@ -1135,11 +1135,11 @@ Chain InsertDependenciesBuilder::createPreSink(StorageIDPrivate view_id) const
11351135
adding_missing_defaults_dag.getRequiredColumnsNames(),
11361136
insert_context);
11371137

1138-
auto merged_dah = ActionsDAG::merge(std::move(extracting_subcolumns_dag), std::move(adding_missing_defaults_dag));
1138+
auto merged_dag = ActionsDAG::merge(std::move(extracting_subcolumns_dag), std::move(adding_missing_defaults_dag));
11391139

11401140
/// Actually we don't know structure of input blocks from query/table,
11411141
/// because some clients break insertion protocol (columns != header)
1142-
result.addSink(std::make_shared<ConvertingTransform>(input_headers.at(view_id), std::make_shared<ExpressionActions>(std::move(merged_dah))));
1142+
result.addSink(std::make_shared<ConvertingTransform>(input_headers.at(view_id), std::make_shared<ExpressionActions>(std::move(merged_dag))));
11431143

11441144
inner_metadata->check(result.getOutputHeader().getColumnsWithTypeAndName());
11451145

src/Processors/Executors/PushingAsyncPipelineExecutor.cpp

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -111,7 +111,6 @@ static void threadFunction(
111111
data.has_exception = true;
112112
}
113113

114-
/// Finish source in case of exception. Otherwise thread.join() may hung.
115114
if (data.source)
116115
data.source->finish();
117116

0 commit comments

Comments
 (0)