Skip to content

Commit 0f73bd6

Browse files
authored
[refactor](be) Use column check helper for type casts (apache#63946)
### What problem does this PR solve? Problem Summary: Replace direct typeid_cast usage for Doris column type checks with the column-specific check_and_get_column helper. This keeps column downcast checks consistent across core column code, expression evaluation, storage segment code, and related table reader tests without changing behavior. ### Release note None ### Check List (For Author) - Test <!-- At least one of them must be included. --> - [ ] Regression test - [ ] Unit Test - [ ] Manual test (add detailed scripts or steps below) - [ ] No need to test or manual test. Explain why: - [ ] This is a refactor/code format and no logic has been changed. - [ ] Previous test can cover this change. - [ ] No code files have been changed. - [ ] Other reason <!-- Add your reason? --> - Behavior changed: - [ ] No. - [ ] Yes. <!-- Explain the behavior change --> - Does this need documentation? - [ ] No. - [ ] Yes. <!-- Add document PR link here. eg: apache/doris-website#1214 --> ### Check List (For Reviewer who merge this PR) - [ ] Confirm the release note - [ ] Confirm test cases - [ ] Confirm document - [ ] Add branch pick label <!-- Add branch pick label that this PR should merge into -->
1 parent daab2c0 commit 0f73bd6

12 files changed

Lines changed: 55 additions & 50 deletions

File tree

‎be/src/core/column/column_array.cpp‎

Lines changed: 32 additions & 31 deletions
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,8 @@ namespace doris {
5050
namespace {
5151

5252
const ColumnArray::ColumnOffsets& check_array_offsets_column(const IColumn& offsets_column) {
53-
const auto* offsets_concrete = typeid_cast<const ColumnArray::ColumnOffsets*>(&offsets_column);
53+
const auto* offsets_concrete =
54+
check_and_get_column<ColumnArray::ColumnOffsets>(&offsets_column);
5455
if (!offsets_concrete) {
5556
throw doris::Exception(ErrorCode::INTERNAL_ERROR, "offsets_column must be a ColumnUInt64");
5657
__builtin_unreachable();
@@ -851,35 +852,35 @@ size_t filter_generic_inplace(const Filter& filter, IColumn& src_data, ColumnOff
851852
ColumnArrayDataOffsets filter_return_new_dispatch(const Filter& filt, ssize_t result_size_hint,
852853
const ColumnPtr& data,
853854
const ColumnOffsets* offsets) {
854-
if (typeid_cast<const ColumnUInt8*>(data.get()))
855+
if (check_and_get_column<ColumnUInt8>(data.get()))
855856
return filter_number_return_new<TYPE_BOOLEAN>(filt, result_size_hint, data, offsets);
856-
if (typeid_cast<const ColumnInt8*>(data.get()))
857+
if (check_and_get_column<ColumnInt8>(data.get()))
857858
return filter_number_return_new<TYPE_TINYINT>(filt, result_size_hint, data, offsets);
858-
if (typeid_cast<const ColumnInt16*>(data.get()))
859+
if (check_and_get_column<ColumnInt16>(data.get()))
859860
return filter_number_return_new<TYPE_SMALLINT>(filt, result_size_hint, data, offsets);
860-
if (typeid_cast<const ColumnInt32*>(data.get()))
861+
if (check_and_get_column<ColumnInt32>(data.get()))
861862
return filter_number_return_new<TYPE_INT>(filt, result_size_hint, data, offsets);
862-
if (typeid_cast<const ColumnInt64*>(data.get()))
863+
if (check_and_get_column<ColumnInt64>(data.get()))
863864
return filter_number_return_new<TYPE_BIGINT>(filt, result_size_hint, data, offsets);
864-
if (typeid_cast<const ColumnFloat32*>(data.get()))
865+
if (check_and_get_column<ColumnFloat32>(data.get()))
865866
return filter_number_return_new<TYPE_FLOAT>(filt, result_size_hint, data, offsets);
866-
if (typeid_cast<const ColumnFloat64*>(data.get()))
867+
if (check_and_get_column<ColumnFloat64>(data.get()))
867868
return filter_number_return_new<TYPE_DOUBLE>(filt, result_size_hint, data, offsets);
868-
if (typeid_cast<const ColumnDate*>(data.get()))
869+
if (check_and_get_column<ColumnDate>(data.get()))
869870
return filter_number_return_new<TYPE_DATE>(filt, result_size_hint, data, offsets);
870-
if (typeid_cast<const ColumnDateV2*>(data.get()))
871+
if (check_and_get_column<ColumnDateV2>(data.get()))
871872
return filter_number_return_new<TYPE_DATEV2>(filt, result_size_hint, data, offsets);
872-
if (typeid_cast<const ColumnDateTime*>(data.get()))
873+
if (check_and_get_column<ColumnDateTime>(data.get()))
873874
return filter_number_return_new<TYPE_DATETIME>(filt, result_size_hint, data, offsets);
874-
if (typeid_cast<const ColumnDateTimeV2*>(data.get()))
875+
if (check_and_get_column<ColumnDateTimeV2>(data.get()))
875876
return filter_number_return_new<TYPE_DATETIMEV2>(filt, result_size_hint, data, offsets);
876-
if (typeid_cast<const ColumnTimeStampTz*>(data.get()))
877+
if (check_and_get_column<ColumnTimeStampTz>(data.get()))
877878
return filter_number_return_new<TYPE_TIMESTAMPTZ>(filt, result_size_hint, data, offsets);
878-
if (typeid_cast<const ColumnTimeV2*>(data.get()))
879+
if (check_and_get_column<ColumnTimeV2>(data.get()))
879880
return filter_number_return_new<TYPE_TIMEV2>(filt, result_size_hint, data, offsets);
880-
if (typeid_cast<const ColumnIPv4*>(data.get()))
881+
if (check_and_get_column<ColumnIPv4>(data.get()))
881882
return filter_number_return_new<TYPE_IPV4>(filt, result_size_hint, data, offsets);
882-
if (typeid_cast<const ColumnString*>(data.get()))
883+
if (check_and_get_column<ColumnString>(data.get()))
883884
return filter_string_return_new(filt, result_size_hint, data, offsets);
884885
return filter_generic_return_new(filt, result_size_hint, data, offsets);
885886
}
@@ -917,33 +918,33 @@ ColumnPtr ColumnArray::filter(const Filter& filt, ssize_t result_size_hint) cons
917918
// In order not to destroy the original logic, the original logic is still retained here.
918919
size_t filter_inplace_dispatch(const Filter& filter, IColumn& src_data,
919920
ColumnOffsets& src_offsets) {
920-
if (typeid_cast<ColumnUInt8*>(&src_data))
921+
if (check_and_get_column<ColumnUInt8>(&src_data))
921922
return filter_number_inplace<TYPE_BOOLEAN>(filter, src_data, src_offsets);
922-
if (typeid_cast<ColumnInt8*>(&src_data))
923+
if (check_and_get_column<ColumnInt8>(&src_data))
923924
return filter_number_inplace<TYPE_TINYINT>(filter, src_data, src_offsets);
924-
if (typeid_cast<ColumnInt16*>(&src_data))
925+
if (check_and_get_column<ColumnInt16>(&src_data))
925926
return filter_number_inplace<TYPE_SMALLINT>(filter, src_data, src_offsets);
926-
if (typeid_cast<ColumnInt32*>(&src_data))
927+
if (check_and_get_column<ColumnInt32>(&src_data))
927928
return filter_number_inplace<TYPE_INT>(filter, src_data, src_offsets);
928-
if (typeid_cast<ColumnInt64*>(&src_data))
929+
if (check_and_get_column<ColumnInt64>(&src_data))
929930
return filter_number_inplace<TYPE_BIGINT>(filter, src_data, src_offsets);
930-
if (typeid_cast<ColumnFloat32*>(&src_data))
931+
if (check_and_get_column<ColumnFloat32>(&src_data))
931932
return filter_number_inplace<TYPE_FLOAT>(filter, src_data, src_offsets);
932-
if (typeid_cast<ColumnFloat64*>(&src_data))
933+
if (check_and_get_column<ColumnFloat64>(&src_data))
933934
return filter_number_inplace<TYPE_DOUBLE>(filter, src_data, src_offsets);
934-
if (typeid_cast<ColumnDate*>(&src_data))
935+
if (check_and_get_column<ColumnDate>(&src_data))
935936
return filter_number_inplace<TYPE_DATE>(filter, src_data, src_offsets);
936-
if (typeid_cast<ColumnDateV2*>(&src_data))
937+
if (check_and_get_column<ColumnDateV2>(&src_data))
937938
return filter_number_inplace<TYPE_DATEV2>(filter, src_data, src_offsets);
938-
if (typeid_cast<ColumnDateTime*>(&src_data))
939+
if (check_and_get_column<ColumnDateTime>(&src_data))
939940
return filter_number_inplace<TYPE_DATETIME>(filter, src_data, src_offsets);
940-
if (typeid_cast<ColumnDateTimeV2*>(&src_data))
941+
if (check_and_get_column<ColumnDateTimeV2>(&src_data))
941942
return filter_number_inplace<TYPE_DATETIMEV2>(filter, src_data, src_offsets);
942-
if (typeid_cast<ColumnTimeStampTz*>(&src_data))
943+
if (check_and_get_column<ColumnTimeStampTz>(&src_data))
943944
return filter_number_inplace<TYPE_TIMESTAMPTZ>(filter, src_data, src_offsets);
944-
if (typeid_cast<ColumnTimeV2*>(&src_data))
945+
if (check_and_get_column<ColumnTimeV2>(&src_data))
945946
return filter_number_inplace<TYPE_TIMEV2>(filter, src_data, src_offsets);
946-
if (typeid_cast<ColumnIPv4*>(&src_data))
947+
if (check_and_get_column<ColumnIPv4>(&src_data))
947948
return filter_number_inplace<TYPE_IPV4>(filter, src_data, src_offsets);
948949
return filter_generic_inplace(filter, src_data, src_offsets);
949950
}
@@ -953,7 +954,7 @@ size_t ColumnArray::filter(const Filter& filter) {
953954
return 0;
954955
}
955956

956-
if (auto* nullable_data_column = typeid_cast<ColumnNullable*>(data.get())) {
957+
if (auto* nullable_data_column = check_and_get_column<ColumnNullable>(data.get())) {
957958
const auto result_size = filter_arrays_impl_only_data(
958959
nullable_data_column->get_null_map_data(), get_offsets(), filter);
959960

‎be/src/core/column/column_const.cpp‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ namespace doris {
3535

3636
ColumnPtr squash_const(const ColumnPtr& col) {
3737
ColumnPtr res = col;
38-
while (const auto* c = typeid_cast<const ColumnConst*>(res.get())) {
38+
while (const auto* c = check_and_get_column<ColumnConst>(res.get())) {
3939
res = c->get_data_column_ptr();
4040
}
4141
return res;

‎be/src/core/column/column_const.h‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -264,7 +264,7 @@ class ColumnConst final : public COWHelper<IColumn, ColumnConst> {
264264
void for_each_subcolumn(ColumnCallback callback) override { callback(data); }
265265

266266
bool structure_equals(const IColumn& rhs) const override {
267-
if (const auto* rhs_concrete = typeid_cast<const ColumnConst*>(&rhs)) {
267+
if (const auto* rhs_concrete = check_and_get_column<ColumnConst>(&rhs)) {
268268
return data->structure_equals(*rhs_concrete->data);
269269
}
270270
return false;

‎be/src/core/column/column_decimal.h‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -204,7 +204,7 @@ class ColumnDecimal final : public COWHelper<IColumn, ColumnDecimal<T>> {
204204
MutableColumnPtr permute(const IColumn::Permutation& perm, size_t limit) const override;
205205

206206
bool structure_equals(const IColumn& rhs) const override {
207-
if (auto rhs_concrete = typeid_cast<const ColumnDecimal<T>*>(&rhs))
207+
if (auto rhs_concrete = check_and_get_column<ColumnDecimal<T>>(&rhs))
208208
return scale == rhs_concrete->scale;
209209
return false;
210210
}

‎be/src/core/column/column_nullable.h‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -261,7 +261,7 @@ class ColumnNullable final : public COWHelper<IColumn, ColumnNullable> {
261261
}
262262

263263
bool structure_equals(const IColumn& rhs) const override {
264-
if (const auto* rhs_nullable = typeid_cast<const ColumnNullable*>(&rhs)) {
264+
if (const auto* rhs_nullable = check_and_get_column<ColumnNullable>(&rhs)) {
265265
return _nested_column->structure_equals(*rhs_nullable->_nested_column);
266266
}
267267
return false;

‎be/src/core/column/column_struct.cpp‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -386,7 +386,7 @@ void ColumnStruct::for_each_subcolumn(ColumnCallback callback) {
386386
}
387387

388388
bool ColumnStruct::structure_equals(const IColumn& rhs) const {
389-
if (const auto* rhs_tuple = typeid_cast<const ColumnStruct*>(&rhs)) {
389+
if (const auto* rhs_tuple = check_and_get_column<ColumnStruct>(&rhs)) {
390390
const size_t tuple_size = columns.size();
391391
if (tuple_size != rhs_tuple->columns.size()) {
392392
return false;

‎be/src/exprs/function/if.cpp‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -240,7 +240,7 @@ class FunctionIf : public IFunction {
240240
return Status::OK();
241241
}
242242

243-
const auto* cond_col = typeid_cast<const ColumnUInt8*>(arg_cond.column.get());
243+
const auto* cond_col = check_and_get_column<ColumnUInt8>(arg_cond.column.get());
244244
const ColumnConst* cond_const_col =
245245
check_and_get_column_const<ColumnUInt8>(arg_cond.column.get());
246246

‎be/src/exprs/vcondition_expr.cpp‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -194,7 +194,7 @@ Status VectorizedIfExpr::execute_for_null_then_else(Block& block,
194194
return Status::OK();
195195
}
196196

197-
const auto* cond_col = typeid_cast<const ColumnUInt8*>(arg_cond.column.get());
197+
const auto* cond_col = check_and_get_column<ColumnUInt8>(arg_cond.column.get());
198198
const ColumnConst* cond_const_col =
199199
check_and_get_column_const<ColumnUInt8>(arg_cond.column.get());
200200

@@ -781,4 +781,4 @@ Status VectorizedCoalesceExpr::execute_column_impl(VExprContext* context, const
781781
return Status::OK();
782782
}
783783

784-
} // namespace doris
784+
} // namespace doris

‎be/src/storage/segment/row_binlog_segment_writer.cpp‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -312,7 +312,7 @@ Status RowBinlogSegmentWriter::_fill_binlog_columns(size_t num_rows,
312312
// wrong op only happens when partial-update, it will be fixed by delete bitmap when publish
313313
const FieldType op_col_type = _tablet_schema->column(binlog_cids[1]).type();
314314
IColumn* op_col_ptr = binlog_prefix_columns[1].get();
315-
auto* op_nullable_column = typeid_cast<ColumnNullable*>(op_col_ptr);
315+
auto* op_nullable_column = check_and_get_column<ColumnNullable>(op_col_ptr);
316316
IColumn* op_nested_column = op_nullable_column != nullptr
317317
? &op_nullable_column->get_nested_column()
318318
: op_col_ptr;
@@ -329,7 +329,7 @@ Status RowBinlogSegmentWriter::_fill_binlog_columns(size_t num_rows,
329329
// we can't get correct timestamp when commit
330330
IColumn* ts_col_ptr = binlog_prefix_columns[2].get();
331331
auto timestamp = UnixMillis();
332-
auto* ts_nullable_column = typeid_cast<ColumnNullable*>(ts_col_ptr);
332+
auto* ts_nullable_column = check_and_get_column<ColumnNullable>(ts_col_ptr);
333333
if (ts_nullable_column != nullptr) {
334334
assert_cast<ColumnInt64*>(&ts_nullable_column->get_nested_column())
335335
->insert_many_vals(timestamp, num_rows);

‎be/src/storage/segment/segment_iterator.cpp‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2566,8 +2566,8 @@ void SegmentIterator::_update_tso_col_if_needed(const std::vector<ColumnId>& col
25662566

25672567
if (_is_pred_column[tso_col_idx]) {
25682568
// Nullable predicate column is represented as ColumnNullable(predicate_col)
2569-
if (auto* tso_nullable =
2570-
typeid_cast<ColumnNullable*>(_current_return_columns[tso_col_idx].get())) {
2569+
if (auto* tso_nullable = check_and_get_column<ColumnNullable>(
2570+
_current_return_columns[tso_col_idx].get())) {
25712571
_current_return_columns[tso_col_idx]->clear();
25722572
auto value = commit_time;
25732573
for (size_t j = 0; j < num_rows; j++) {
@@ -2592,7 +2592,7 @@ void SegmentIterator::_update_tso_col_if_needed(const std::vector<ColumnId>& col
25922592
auto column = Schema::get_data_type_ptr(*column_desc)->create_column();
25932593
DCHECK(column_desc->type() == FieldType::OLAP_FIELD_TYPE_BIGINT);
25942594

2595-
if (auto* tso_nullable = typeid_cast<ColumnNullable*>(column.get())) {
2595+
if (auto* tso_nullable = check_and_get_column<ColumnNullable>(column.get())) {
25962596
auto* col_ptr = assert_cast<ColumnInt64*>(&tso_nullable->get_nested_column());
25972597
for (size_t j = 0; j < num_rows; j++) {
25982598
col_ptr->insert_value(commit_time);

0 commit comments

Comments
 (0)