Skip to content

Commit 67e2a40

Browse files
authored
[fix] remove useless const_cast and explain const_cast for vec (4) (#56603)
### What problem does this PR solve? go through whole be/ and find all const_cast Issue Number: #55057 Problem Summary: 1. remove useless const_cast 2. explain why using const_cast does not result in undefined behavior 3. don't modify some const_cast (1) some code in DBUG_EXECUTE_IF or test file (2) underlying data structures, such as cow (3) const_cast<const T*>
1 parent c763723 commit 67e2a40

15 files changed

Lines changed: 63 additions & 21 deletions

‎be/src/olap/rowset/segment_v2/column_reader.cpp‎

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1364,11 +1364,10 @@ Status FileColumnIterator::next_batch(size_t* n, vectorized::MutableColumnPtr& d
13641364
DCHECK_EQ(this_run, num_rows);
13651365
} else {
13661366
*has_null = true;
1367-
const auto* null_col =
1367+
auto* null_col =
13681368
vectorized::check_and_get_column<vectorized::ColumnNullable>(dst.get());
13691369
if (null_col != nullptr) {
1370-
const_cast<vectorized::ColumnNullable*>(null_col)->insert_many_defaults(
1371-
this_run);
1370+
null_col->insert_many_defaults(this_run);
13721371
} else {
13731372
return Status::InternalError("unexpected column type in column reader");
13741373
}
@@ -1426,15 +1425,14 @@ Status FileColumnIterator::read_by_rowids(const rowid_t* rowids, const size_t co
14261425
auto origin_index = _page.data_decoder->current_index();
14271426
if (this_read_count > 0) {
14281427
if (is_null) {
1429-
const auto* null_col =
1428+
auto* null_col =
14301429
vectorized::check_and_get_column<vectorized::ColumnNullable>(
14311430
dst.get());
14321431
if (UNLIKELY(null_col == nullptr)) {
14331432
return Status::InternalError("unexpected column type in column reader");
14341433
}
14351434

1436-
const_cast<vectorized::ColumnNullable*>(null_col)->insert_many_defaults(
1437-
this_read_count);
1435+
null_col->insert_many_defaults(this_read_count);
14381436
} else {
14391437
size_t read_count = this_read_count;
14401438

‎be/src/vec/columns/column.cpp‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -36,6 +36,7 @@ std::string IColumn::dump_structure() const {
3636
res << ", " << subcolumn->dump_structure();
3737
};
3838

39+
// simply read using for_each_subcolumn without modification; const_cast can be used.
3940
const_cast<IColumn*>(this)->for_each_subcolumn(callback);
4041

4142
res << ")";

‎be/src/vec/columns/column.h‎

Lines changed: 13 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -321,6 +321,7 @@ class IColumn : public COW<IColumn> {
321321
/// Returns pointer to the position after the read data.
322322
virtual const char* deserialize_and_insert_from_arena(const char* pos) = 0;
323323

324+
// todo: Consider replacing stringref with slice.
324325
virtual void serialize_vec(StringRef* keys, size_t num_rows) const {
325326
throw doris::Exception(ErrorCode::NOT_IMPLEMENTED_ERROR,
326327
"Method serialize_vec is not supported for " + get_name());
@@ -595,7 +596,7 @@ class IColumn : public COW<IColumn> {
595596
*
596597
* To avoid confusion between these cases, we don't have isContiguous method.
597598
*/
598-
599+
// todo: We should support a non-const version of get_raw_data that returns a Slice.
599600
virtual StringRef get_raw_data() const {
600601
throw doris::Exception(ErrorCode::NOT_IMPLEMENTED_ERROR,
601602
"Column {} is not a contiguous block of memory", get_name());
@@ -707,11 +708,21 @@ const Type* check_and_get_column(const IColumn& column) {
707708
return typeid_cast<const Type*>(&column);
708709
}
709710

711+
template <typename Type>
712+
Type* check_and_get_column(IColumn& column) {
713+
return typeid_cast<Type*>(&column);
714+
}
715+
710716
template <typename Type>
711717
const Type* check_and_get_column(const IColumn* column) {
712718
return typeid_cast<const Type*>(column);
713719
}
714720

721+
template <typename Type>
722+
Type* check_and_get_column(IColumn* column) {
723+
return typeid_cast<Type*>(column);
724+
}
725+
715726
template <typename Type>
716727
bool is_column(const IColumn& column) {
717728
return check_and_get_column<Type>(&column);
@@ -730,7 +741,7 @@ ColumnType::Ptr check_and_get_column_ptr(const ColumnPtr& column) {
730741
if (raw_type_ptr == nullptr) {
731742
return nullptr;
732743
}
733-
return typename ColumnType::Ptr(const_cast<ColumnType*>(raw_type_ptr));
744+
return typename ColumnType::Ptr(raw_type_ptr);
734745
}
735746

736747
/// True if column's an ColumnConst instance. It's just a syntax sugar for type check.

‎be/src/vec/columns/column_array.cpp‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -293,6 +293,8 @@ size_t ColumnArray::get_max_row_byte_size() const {
293293

294294
void ColumnArray::serialize_vec(StringRef* keys, size_t num_rows) const {
295295
for (size_t i = 0; i < num_rows; ++i) {
296+
// Used in hash_map_context.h, this address is allocated via Arena,
297+
// but passed through StringRef, so using const_cast is acceptable.
296298
keys[i].size += serialize_impl(const_cast<char*>(keys[i].data + keys[i].size), i);
297299
}
298300
}

‎be/src/vec/columns/column_const.h‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -200,6 +200,8 @@ class ColumnConst final : public COWHelper<IColumn, ColumnConst> {
200200
void serialize_vec(StringRef* keys, size_t num_rows) const override {
201201
DCHECK_EQ(data->size(), 1);
202202
for (size_t i = 0; i < num_rows; i++) {
203+
// Used in hash_map_context.h, this address is allocated via Arena,
204+
// but passed through StringRef, so using const_cast is acceptable.
203205
serialize_impl(const_cast<char*>(keys[i].data + keys[i].size), i);
204206
}
205207
}

‎be/src/vec/columns/column_decimal.cpp‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -77,6 +77,8 @@ size_t ColumnDecimal<T>::get_max_row_byte_size() const {
7777
template <PrimitiveType T>
7878
void ColumnDecimal<T>::serialize_vec(StringRef* keys, size_t num_rows) const {
7979
for (size_t i = 0; i < num_rows; ++i) {
80+
// Used in hash_map_context.h, this address is allocated via Arena,
81+
// but passed through StringRef, so using const_cast is acceptable.
8082
keys[i].size += serialize_impl(const_cast<char*>(keys[i].data + keys[i].size), i);
8183
}
8284
}

‎be/src/vec/columns/column_map.cpp‎

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -517,8 +517,8 @@ Status ColumnMap::deduplicate_keys(bool recursive) {
517517
values_column_ = (assert_cast<ColumnNullable&>(*values_column)).get_nested_column_ptr();
518518
}
519519

520-
if (const auto* values_map = check_and_get_column<ColumnMap>(values_column_.get())) {
521-
RETURN_IF_ERROR((const_cast<ColumnMap*>(values_map))->deduplicate_keys(recursive));
520+
if (ColumnMap* values_map = check_and_get_column<ColumnMap>(values_column_.get())) {
521+
RETURN_IF_ERROR(values_map->deduplicate_keys(recursive));
522522
}
523523
}
524524

@@ -718,6 +718,8 @@ void ColumnMap::sort_column(const ColumnSorter* sorter, EqualFlags& flags,
718718

719719
void ColumnMap::serialize_vec(StringRef* keys, size_t num_rows) const {
720720
for (size_t i = 0; i < num_rows; ++i) {
721+
// Used in hash_map_context.h, this address is allocated via Arena,
722+
// but passed through StringRef, so using const_cast is acceptable.
721723
keys[i].size += serialize_impl(const_cast<char*>(keys[i].data + keys[i].size), i);
722724
}
723725
}

‎be/src/vec/columns/column_nullable.cpp‎

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -248,11 +248,15 @@ void ColumnNullable::serialize_vec(StringRef* keys, size_t num_rows) const {
248248
const bool has_null = simd::contain_byte(get_null_map_data().data(), num_rows, 1);
249249
if (has_null) {
250250
for (size_t i = 0; i < num_rows; ++i) {
251+
// Used in hash_map_context.h, this address is allocated via Arena,
252+
// but passed through StringRef, so using const_cast is acceptable.
251253
keys[i].size += serialize_impl(const_cast<char*>(keys[i].data + keys[i].size), i);
252254
}
253255
} else {
254256
const auto& arr = get_null_map_data();
255257
for (size_t i = 0; i < num_rows; ++i) {
258+
// Used in hash_map_context.h, this address is allocated via Arena,
259+
// but passed through StringRef, so using const_cast is acceptable.
256260
memcpy_fixed<NullMap::value_type>(const_cast<char*>(keys[i].data + keys[i].size),
257261
(char*)&arr[i]);
258262
keys[i].size += sizeof(NullMap::value_type);
@@ -357,13 +361,12 @@ size_t ColumnNullable::filter(const Filter& filter) {
357361

358362
Status ColumnNullable::filter_by_selector(const uint16_t* sel, size_t sel_size, IColumn* col_ptr) {
359363
auto* nullable_col_ptr = assert_cast<ColumnNullable*>(col_ptr);
360-
ColumnPtr nest_col_ptr = nullable_col_ptr->_nested_column;
364+
WrappedPtr nest_col_ptr = nullable_col_ptr->_nested_column;
361365

362366
/// `get_null_map_data` will set `_need_update_has_null` to true
363367
auto& res_nullmap = nullable_col_ptr->get_null_map_data();
364368

365-
RETURN_IF_ERROR(get_nested_column().filter_by_selector(
366-
sel, sel_size, const_cast<doris::vectorized::IColumn*>(nest_col_ptr.get())));
369+
RETURN_IF_ERROR(get_nested_column().filter_by_selector(sel, sel_size, nest_col_ptr.get()));
367370
DCHECK(res_nullmap.empty());
368371
res_nullmap.resize(sel_size);
369372
auto& cur_nullmap = get_null_map_column().get_data();

‎be/src/vec/columns/column_string.cpp‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -461,6 +461,8 @@ size_t ColumnStr<T>::get_max_row_byte_size() const {
461461
template <typename T>
462462
void ColumnStr<T>::serialize_vec(StringRef* keys, size_t num_rows) const {
463463
for (size_t i = 0; i < num_rows; ++i) {
464+
// Used in hash_map_context.h, this address is allocated via Arena,
465+
// but passed through StringRef, so using const_cast is acceptable.
464466
keys[i].size += serialize_impl(const_cast<char*>(keys[i].data + keys[i].size), i);
465467
}
466468
}

‎be/src/vec/columns/column_struct.cpp‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -436,6 +436,8 @@ void ColumnStruct::sort_column(const ColumnSorter* sorter, EqualFlags& flags,
436436

437437
void ColumnStruct::serialize_vec(StringRef* keys, size_t num_rows) const {
438438
for (size_t i = 0; i < num_rows; ++i) {
439+
// Used in hash_map_context.h, this address is allocated via Arena,
440+
// but passed through StringRef, so using const_cast is acceptable.
439441
keys[i].size += serialize_impl(const_cast<char*>(keys[i].data + keys[i].size), i);
440442
}
441443
}

0 commit comments

Comments
 (0)