Merge collision

ilejn · ilejn · commit 0f4309476768 · 2025-10-06T22:14:06.000Z
diff --git a/src/Processors/Formats/Impl/ArrowColumnToCHColumn.cpp b/src/Processors/Formats/Impl/ArrowColumnToCHColumn.cpp
@@ -1024,7 +1024,7 @@ static ColumnWithTypeAndName readNonNullableColumnFromArrowColumn(
                 auto tmp_lc_column = lc_type->createColumn();
                 auto tmp_dict_column = IColumn::mutate(assert_cast<ColumnLowCardinality *>(tmp_lc_column.get())->getDictionaryPtr());
                 dynamic_cast<IColumnUnique *>(tmp_dict_column.get())->uniqueInsertRangeFrom(*dict_column.column, 0, dict_column.column->size());
-                size_t expected_dictionary_size = dict_column.column->size() + (dict_info.default_value_index == -1) + make_nullable_if_low_cardinality;
+                size_t expected_dictionary_size = dict_column.column->size() + (dict_info.default_value_index == -1) + is_lc_nullable;
                 if (tmp_dict_column->size() != expected_dictionary_size)
                 {
                     throw Exception(

Original file line number	Diff line number	Diff line change
`@@ -1024,7 +1024,7 @@ static ColumnWithTypeAndName readNonNullableColumnFromArrowColumn(`
`1024`	`1024`	`auto tmp_lc_column = lc_type->createColumn();`
`1025`	`1025`	`auto tmp_dict_column = IColumn::mutate(assert_cast<ColumnLowCardinality *>(tmp_lc_column.get())->getDictionaryPtr());`
`1026`	`1026`	`dynamic_cast<IColumnUnique >(tmp_dict_column.get())->uniqueInsertRangeFrom(dict_column.column, 0, dict_column.column->size());`
`1027`		`- size_t expected_dictionary_size = dict_column.column->size() + (dict_info.default_value_index == -1) + make_nullable_if_low_cardinality;`
	`1027`	`+ size_t expected_dictionary_size = dict_column.column->size() + (dict_info.default_value_index == -1) + is_lc_nullable;`
`1028`	`1028`	`if (tmp_dict_column->size() != expected_dictionary_size)`
`1029`	`1029`	`{`
`1030`	`1030`	`throw Exception(`