database/doris
2
0
Fork 0
Code Issues Pull Requests Actions 3 Packages Projects Releases Wiki Activity

[fix](schema-change) Fix schema-change from non-null to null (#36389)

Browse Source 
https://github.com/apache/doris/pull/32913
This commit is contained in:
Lightman
2024-06-26 20:20:50 +08:00
committed by GitHub
parent a6a84b8ecc
commit 23cf494b48
2 changed files with 19 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
be/src/olap/schema_change.cpp
View File

@ -341,7 +341,7 @@ Status BlockChanger::change_block(vectorized::Block* ref_block,
assert_cast<vectorized::ColumnNullable*>(new_col->assume_mutable().get());
new_nullable_col->change_nested_column(ref_col);
new_nullable_col->get_null_map_data().resize_fill(new_nullable_col->size());
new_nullable_col->get_null_map_data().resize_fill(ref_col->size());
} else {
// nullable to not nullable:
// suppose column `c_phone` is originally varchar(16) NOT NULL,
@ -389,11 +389,24 @@ Status BlockChanger::_check_cast_valid(vectorized::ColumnPtr ref_column,
return Status::DataQualityError("Null data is changed to not nullable");
}
} else {
const auto* new_null_map =
const auto& null_map_column =
vectorized::check_and_get_column<vectorized::ColumnNullable>(new_column)
->get_null_map_column()
.get_data()
.data();
->get_null_map_column();
const auto& nested_column =
vectorized::check_and_get_column<vectorized::ColumnNullable>(new_column)
->get_nested_column();
const auto* new_null_map = null_map_column.get_data().data();
if (null_map_column.size() != new_column->size() ||
nested_column.size() != new_column->size()) {
DCHECK(false) << "null_map_column_size=" << null_map_column.size()
<< " new_column_size=" << new_column->size()
<< " nested_column_size=" << nested_column.size();
return Status::InternalError(
"null_map_column size is changed, null_map_column_size={}, "
"new_column_size={}",
null_map_column.size(), new_column->size());
}
bool is_changed = false;
for (size_t i = 0; i < ref_column->size(); i++) {

2
fe/fe-core/src/main/java/org/apache/doris/alter/SchemaChangeJobV2.java
View File

@ -443,7 +443,7 @@ public class SchemaChangeJobV2 extends AlterJobV2 {
if (indexColumnMap.containsKey(SchemaChangeHandler.SHADOW_NAME_PREFIX + column.getName())) {
Column newColumn = indexColumnMap.get(
SchemaChangeHandler.SHADOW_NAME_PREFIX + column.getName());
if (newColumn.getType() != column.getType()) {
if (!newColumn.getType().equals(column.getType())) {
try {
SlotRef slot = new SlotRef(destSlotDesc);
slot.setCol(column.getName());