Skip to content

Commit

Permalink
update
Browse files Browse the repository at this point in the history
  • Loading branch information
zhangstar333 committed Sep 25, 2024
1 parent 46b7ce4 commit 7a8d44c
Show file tree
Hide file tree
Showing 2 changed files with 9 additions and 5 deletions.
2 changes: 1 addition & 1 deletion be/src/agent/be_exec_version_manager.h
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ constexpr inline int VARIANT_SERDE = 6; // change variant serde to fix P
constexpr inline int AGGREGATION_2_1_VERSION =
6; // some aggregation changed the data format after this version
constexpr inline int USE_CONST_SERDE =
7; // support const column in serialize/deserialize function: PR #41175
1000; // support const column in serialize/deserialize function: PR #41175

class BeExecVersionManager {
public:
Expand Down
12 changes: 8 additions & 4 deletions be/src/vec/core/block.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -511,10 +511,14 @@ std::string Block::dump_data(size_t begin, size_t row_limit, bool allow_null_mis
std::string s;
if (data[i].column) {
if (data[i].type->is_nullable() && !data[i].column->is_nullable()) {
assert(allow_null_mismatch);
s = assert_cast<const DataTypeNullable*>(data[i].type.get())
->get_nested_type()
->to_string(*data[i].column, row_num);
if (is_column_const(*data[i].column)) {
s = data[i].to_string(0);
} else {
assert(allow_null_mismatch);
s = assert_cast<const DataTypeNullable*>(data[i].type.get())
->get_nested_type()
->to_string(*data[i].column, row_num);
}
} else {
s = data[i].to_string(row_num);
}
Expand Down

0 comments on commit 7a8d44c

Please sign in to comment.