thevar1able/ClickHouse
1
0
Fork 0
mirror of https://github.com/ClickHouse/ClickHouse.git synced 2024-11-22 15:42:02 +00:00
Code Issues Packages Projects Releases Wiki Activity

Try fix

Browse Source
This commit is contained in:
kssenii 2021-04-23 17:24:03 +00:00
parent a927611fcf
commit d032651aba
3 changed files with 6 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

0
programs/server/00992_system_parts_race_condition_zookeeper_long.reference Normal file
View File

2
src/Core/Block.cpp
View File

@ -371,7 +371,7 @@ void Block::setColumns(const Columns & columns)
void Block::setColumn(size_t position, ColumnWithTypeAndName && column)
{
if (position > data.size())
if (position >= data.size())
throw Exception(ErrorCodes::POSITION_OUT_OF_BOUND, "Position {} out of bound in Block::setColumn(), max position {}",
position, toString(data.size()));

14
src/Interpreters/InterpreterInsertQuery.cpp
View File

@ -238,20 +238,16 @@ BlockIO InterpreterInsertQuery::execute()
/// Allow to insert Nullable into non-Nullable columns, NULL values will be added as defaults values.
if (getContext()->getSettingsRef().insert_null_as_default)
{
auto query_columns_names_and_types = query_sample_block.getNamesAndTypesList();
const auto & input_columns = res.pipeline.getHeader().getColumns();
const auto & query_columns = query_sample_block.getColumns();
const auto & input_columns = res.pipeline.getHeader().getColumnsWithTypeAndName();
const auto & query_columns = query_sample_block.getColumnsWithTypeAndName();
const auto & output_columns = metadata_snapshot->getColumns();
size_t col_idx = 0;
for (const auto & column : query_columns_names_and_types)
for (size_t col_idx = 0; col_idx < input_columns.size(); ++col_idx)
{
/// Change query sample block columns to Nullable to allow inserting nullable columns, where NULL values will be substituted with
/// default column values (in AddingDefaultBlockOutputStream), so all values will be cast correctly.
if (input_columns[col_idx]->isNullable() && !query_columns[col_idx]->isNullable() && output_columns.hasDefault(column.name))
query_sample_block.setColumn(col_idx, ColumnWithTypeAndName(makeNullable(query_columns[col_idx]), makeNullable(column.type), column.name));
col_idx++;
if (input_columns[col_idx].type->isNullable() && !query_columns[col_idx].type->isNullable() && output_columns.hasDefault(query_columns[col_idx].name))
query_sample_block.setColumn(col_idx, ColumnWithTypeAndName(makeNullable(query_columns[col_idx].column), makeNullable(query_columns[col_idx].type), query_columns[col_idx].name));
}
}
}