This is an automated email from the ASF dual-hosted git repository.
panxiaolei pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/doris.git
The following commit(s) were added to refs/heads/master by this push:
new f4e2eb65646 remove unused code and adjust clang-tidy checks (#25405)
f4e2eb65646 is described below
commit f4e2eb656465c393f0f3c39a67669dee486671ce
Author: Pxl <pxl...@qq.com>
AuthorDate: Fri Oct 13 16:27:37 2023 +0800
remove unused code and adjust clang-tidy checks (#25405)
remove unused code and adjust clang-tidy checks
---
.clang-tidy | 18 +++----
be/src/vec/columns/column.h | 4 --
be/src/vec/columns/column_array.cpp | 5 --
be/src/vec/columns/column_array.h | 1 -
be/src/vec/columns/column_complex.h | 2 -
be/src/vec/columns/column_decimal.h | 1 -
be/src/vec/columns/column_dictionary.h | 2 -
be/src/vec/columns/column_map.cpp | 6 ---
be/src/vec/columns/column_map.h | 1 -
be/src/vec/columns/column_nullable.cpp | 91 +++++++++++++++++++---------------
be/src/vec/columns/column_nullable.h | 20 ++------
be/src/vec/columns/column_string.cpp | 5 --
be/src/vec/columns/column_string.h | 2 -
be/src/vec/columns/column_struct.cpp | 6 ---
be/src/vec/columns/column_struct.h | 1 -
be/src/vec/columns/column_vector.h | 2 -
be/src/vec/columns/predicate_column.h | 2 -
17 files changed, 61 insertions(+), 108 deletions(-)
diff --git a/.clang-tidy b/.clang-tidy
index f571e162545..aad12455701 100644
--- a/.clang-tidy
+++ b/.clang-tidy
@@ -4,21 +4,15 @@ Checks: |
clang-analyzer-*,
-*,
bugprone-redundant-branch-condition,
- modernize-use-override,
- modernize-use-equals-default,
- modernize-use-equals-delete,
- modernize-use-nodiscard,
- modernize-use-nullptr,
- modernize-use-bool-literals,
- modernize-use-using,
+ modernize-*,
+ -modernize-use-trailing-return-type,
+ -modernize-use-nodiscard,
misc-redundant-expression,
misc-unused-*,
-misc-unused-parameters,
- readability-make-member-function-const,
- readability-non-const-parameter,
- readability-static-accessed-through-instance,
- readability-redundant-*,
- readability-braces-around-statements,
+ readability-*,
+ -readability-identifier-length,
+ -readability-implicit-bool-conversion,
portability-simd-intrinsics,
performance-type-promotion-in-math-fn,
performance-faster-string-find,
diff --git a/be/src/vec/columns/column.h b/be/src/vec/columns/column.h
index 45ca44ee057..b21c5d83862 100644
--- a/be/src/vec/columns/column.h
+++ b/be/src/vec/columns/column.h
@@ -545,10 +545,6 @@ public:
/// Zero, if could not be determined.
virtual size_t allocated_bytes() const = 0;
- /// Make memory region readonly with mprotect if it is large enough.
- /// The operation is slow and performed only for debug builds.
- virtual void protect() {}
-
/// If the column contains subcolumns (such as Array, Nullable, etc), do
callback on them.
/// Shallow: doesn't do recursive calls; don't do call for itself.
using ColumnCallback = std::function<void(WrappedPtr&)>;
diff --git a/be/src/vec/columns/column_array.cpp
b/be/src/vec/columns/column_array.cpp
index 06e3e35ce0b..53144d883f8 100644
--- a/be/src/vec/columns/column_array.cpp
+++ b/be/src/vec/columns/column_array.cpp
@@ -434,11 +434,6 @@ size_t ColumnArray::allocated_bytes() const {
return get_data().allocated_bytes() + get_offsets().allocated_bytes();
}
-void ColumnArray::protect() {
- get_data().protect();
- get_offsets().protect();
-}
-
ColumnPtr ColumnArray::convert_to_full_column_if_const() const {
/// It is possible to have an array with constant data and non-constant
offsets.
/// Example is the result of expression: replicate('hello', [1])
diff --git a/be/src/vec/columns/column_array.h
b/be/src/vec/columns/column_array.h
index 42d263dea31..668abd1ef62 100644
--- a/be/src/vec/columns/column_array.h
+++ b/be/src/vec/columns/column_array.h
@@ -174,7 +174,6 @@ public:
void reserve(size_t n) override;
size_t byte_size() const override;
size_t allocated_bytes() const override;
- void protect() override;
ColumnPtr replicate(const IColumn::Offsets& replicate_offsets) const
override;
void replicate(const uint32_t* counts, size_t target_size, IColumn&
column) const override;
ColumnPtr convert_to_full_column_if_const() const override;
diff --git a/be/src/vec/columns/column_complex.h
b/be/src/vec/columns/column_complex.h
index 9e959d4a64f..b25ae9f1577 100644
--- a/be/src/vec/columns/column_complex.h
+++ b/be/src/vec/columns/column_complex.h
@@ -118,8 +118,6 @@ public:
size_t allocated_bytes() const override { return byte_size(); }
- void protect() override {}
-
void insert_value(T value) { data.emplace_back(std::move(value)); }
[[noreturn]] void get_permutation(bool reverse, size_t limit, int
nan_direction_hint,
diff --git a/be/src/vec/columns/column_decimal.h
b/be/src/vec/columns/column_decimal.h
index e86a12dc3cb..85ce339608d 100644
--- a/be/src/vec/columns/column_decimal.h
+++ b/be/src/vec/columns/column_decimal.h
@@ -113,7 +113,6 @@ public:
size_t size() const override { return data.size(); }
size_t byte_size() const override { return data.size() * sizeof(data[0]); }
size_t allocated_bytes() const override { return data.allocated_bytes(); }
- void protect() override { data.protect(); }
void reserve(size_t n) override { data.reserve(n); }
void resize(size_t n) override { data.resize(n); }
diff --git a/be/src/vec/columns/column_dictionary.h
b/be/src/vec/columns/column_dictionary.h
index 3c9b64b6541..e00e5b425f8 100644
--- a/be/src/vec/columns/column_dictionary.h
+++ b/be/src/vec/columns/column_dictionary.h
@@ -105,8 +105,6 @@ public:
size_t allocated_bytes() const override { return byte_size(); }
- void protect() override {}
-
void get_permutation(bool reverse, size_t limit, int nan_direction_hint,
IColumn::Permutation& res) const override {
LOG(FATAL) << "get_permutation not supported in ColumnDictionary";
diff --git a/be/src/vec/columns/column_map.cpp
b/be/src/vec/columns/column_map.cpp
index 2ccd86314a4..f7c456a19c1 100644
--- a/be/src/vec/columns/column_map.cpp
+++ b/be/src/vec/columns/column_map.cpp
@@ -465,10 +465,4 @@ size_t ColumnMap::allocated_bytes() const {
get_offsets().allocated_bytes();
}
-void ColumnMap::protect() {
- offsets_column->protect();
- keys_column->protect();
- values_column->protect();
-}
-
} // namespace doris::vectorized
diff --git a/be/src/vec/columns/column_map.h b/be/src/vec/columns/column_map.h
index acb1bc964bb..7464aa18946 100644
--- a/be/src/vec/columns/column_map.h
+++ b/be/src/vec/columns/column_map.h
@@ -177,7 +177,6 @@ public:
void resize(size_t n) override;
size_t byte_size() const override;
size_t allocated_bytes() const override;
- void protect() override;
void update_xxHash_with_value(size_t start, size_t end, uint64_t& hash,
const uint8_t* __restrict null_data) const
override;
diff --git a/be/src/vec/columns/column_nullable.cpp
b/be/src/vec/columns/column_nullable.cpp
index b3386a4fe6d..494a85eabe7 100644
--- a/be/src/vec/columns/column_nullable.cpp
+++ b/be/src/vec/columns/column_nullable.cpp
@@ -20,12 +20,6 @@
#include "vec/columns/column_nullable.h"
-#include <string.h>
-
-#include <algorithm>
-
-#include "util/hash_util.hpp"
-#include "util/simd/bits.h"
#include "vec/columns/column_const.h"
#include "vec/common/arena.h"
#include "vec/common/assert_cast.h"
@@ -70,7 +64,7 @@ void ColumnNullable::update_xxHash_with_value(size_t start,
size_t end, uint64_t
if (!has_null()) {
nested_column->update_xxHash_with_value(start, end, hash, nullptr);
} else {
- auto* __restrict real_null_data =
+ const auto* __restrict real_null_data =
assert_cast<const ColumnUInt8&>(*null_map).get_data().data();
for (int i = start; i < end; ++i) {
if (real_null_data[i] != 0) {
@@ -86,7 +80,7 @@ void ColumnNullable::update_crc_with_value(size_t start,
size_t end, uint64_t& h
if (!has_null()) {
nested_column->update_crc_with_value(start, end, hash, nullptr);
} else {
- auto* __restrict real_null_data =
+ const auto* __restrict real_null_data =
assert_cast<const ColumnUInt8&>(*null_map).get_data().data();
for (int i = start; i < end; ++i) {
if (real_null_data[i] != 0) {
@@ -98,10 +92,11 @@ void ColumnNullable::update_crc_with_value(size_t start,
size_t end, uint64_t& h
}
void ColumnNullable::update_hash_with_value(size_t n, SipHash& hash) const {
- if (is_null_at(n))
+ if (is_null_at(n)) {
hash.update(0);
- else
+ } else {
get_nested_column().update_hash_with_value(n, hash);
+ }
}
void ColumnNullable::update_hashes_with_value(std::vector<SipHash>& hashes,
@@ -109,12 +104,15 @@ void
ColumnNullable::update_hashes_with_value(std::vector<SipHash>& hashes,
DCHECK(null_data == nullptr);
auto s = hashes.size();
DCHECK(s == size());
- auto* __restrict real_null_data = assert_cast<const
ColumnUInt8&>(*null_map).get_data().data();
+ const auto* __restrict real_null_data =
+ assert_cast<const ColumnUInt8&>(*null_map).get_data().data();
if (!has_null()) {
nested_column->update_hashes_with_value(hashes, nullptr);
} else {
for (int i = 0; i < s; ++i) {
- if (real_null_data[i] != 0) hashes[i].update(0);
+ if (real_null_data[i] != 0) {
+ hashes[i].update(0);
+ }
}
nested_column->update_hashes_with_value(hashes, real_null_data);
}
@@ -126,7 +124,8 @@ void
ColumnNullable::update_crcs_with_value(std::vector<uint64_t>& hashes,
DCHECK(null_data == nullptr);
auto s = hashes.size();
DCHECK(s == size());
- auto* __restrict real_null_data = assert_cast<const
ColumnUInt8&>(*null_map).get_data().data();
+ const auto* __restrict real_null_data =
+ assert_cast<const ColumnUInt8&>(*null_map).get_data().data();
if (!has_null()) {
nested_column->update_crcs_with_value(hashes, type, nullptr);
} else {
@@ -143,12 +142,15 @@ void ColumnNullable::update_hashes_with_value(uint64_t*
__restrict hashes,
const uint8_t* __restrict
null_data) const {
DCHECK(null_data == nullptr);
auto s = size();
- auto* __restrict real_null_data = assert_cast<const
ColumnUInt8&>(*null_map).get_data().data();
+ const auto* __restrict real_null_data =
+ assert_cast<const ColumnUInt8&>(*null_map).get_data().data();
if (!has_null()) {
nested_column->update_hashes_with_value(hashes, nullptr);
} else {
for (int i = 0; i < s; ++i) {
- if (real_null_data[i] != 0) hashes[i] =
HashUtil::xxHash64NullWithSeed(hashes[i]);
+ if (real_null_data[i] != 0) {
+ hashes[i] = HashUtil::xxHash64NullWithSeed(hashes[i]);
+ }
}
nested_column->update_hashes_with_value(hashes, real_null_data);
}
@@ -166,7 +168,9 @@ MutableColumnPtr ColumnNullable::clone_resized(size_t
new_size) const {
count * sizeof(get_null_map_data()[0]));
/// If resizing to bigger one, set all new values to NULLs.
- if (new_size > count) memset(&new_null_map->get_data()[count], 1,
new_size - count);
+ if (new_size > count) {
+ memset(&new_null_map->get_data()[count], 1, new_size - count);
+ }
}
return ColumnNullable::create(std::move(new_nested_col),
std::move(new_null_map));
@@ -177,15 +181,16 @@ Field ColumnNullable::operator[](size_t n) const {
}
void ColumnNullable::get(size_t n, Field& res) const {
- if (is_null_at(n))
+ if (is_null_at(n)) {
res = Null();
- else
+ } else {
get_nested_column().get(n, res);
+ }
}
StringRef ColumnNullable::get_data_at(size_t n) const {
if (is_null_at(n)) {
- return StringRef((const char*)nullptr, 0);
+ return {(const char*)nullptr, 0};
}
return get_nested_column().get_data_at(n);
}
@@ -220,15 +225,17 @@ StringRef
ColumnNullable::serialize_value_into_arena(size_t n, Arena& arena,
const auto& arr = get_null_map_data();
static constexpr auto s = sizeof(arr[0]);
- auto pos = arena.alloc_continue(s, begin);
+ auto* pos = arena.alloc_continue(s, begin);
memcpy(pos, &arr[n], s);
- if (arr[n]) return StringRef(pos, s);
+ if (arr[n]) {
+ return {pos, s};
+ }
auto nested_ref = get_nested_column().serialize_value_into_arena(n, arena,
begin);
/// serialize_value_into_arena may reallocate memory. Have to use ptr from
nested_ref.data and move it back.
- return StringRef(nested_ref.data - s, nested_ref.size + s);
+ return {nested_ref.data - s, nested_ref.size + s};
}
const char* ColumnNullable::deserialize_and_insert_from_arena(const char* pos)
{
@@ -283,17 +290,17 @@ void
ColumnNullable::deserialize_vec(std::vector<StringRef>& keys, const size_t
}
void ColumnNullable::insert_range_from(const IColumn& src, size_t start,
size_t length) {
- const ColumnNullable& nullable_col = assert_cast<const
ColumnNullable&>(src);
+ const auto& nullable_col = assert_cast<const ColumnNullable&>(src);
_get_null_map_column().insert_range_from(*nullable_col.null_map, start,
length);
get_nested_column().insert_range_from(*nullable_col.nested_column, start,
length);
- auto& src_null_map_data = nullable_col.get_null_map_data();
+ const auto& src_null_map_data = nullable_col.get_null_map_data();
_has_null = has_null();
_has_null |= simd::contain_byte(src_null_map_data.data() + start, length,
1);
}
void ColumnNullable::insert_indices_from(const IColumn& src, const int*
indices_begin,
const int* indices_end) {
- const ColumnNullable& src_concrete = assert_cast<const
ColumnNullable&>(src);
+ const auto& src_concrete = assert_cast<const ColumnNullable&>(src);
get_nested_column().insert_indices_from(src_concrete.get_nested_column(),
indices_begin,
indices_end);
_get_null_map_column().insert_indices_from(src_concrete.get_null_map_column(),
indices_begin,
@@ -313,7 +320,7 @@ void ColumnNullable::insert(const Field& x) {
}
void ColumnNullable::insert_from(const IColumn& src, size_t n) {
- const ColumnNullable& src_concrete = assert_cast<const
ColumnNullable&>(src);
+ const auto& src_concrete = assert_cast<const ColumnNullable&>(src);
get_nested_column().insert_from(src_concrete.get_nested_column(), n);
auto is_null = src_concrete.get_null_map_data()[n];
_has_null |= is_null;
@@ -357,7 +364,7 @@ size_t ColumnNullable::filter(const Filter& filter) {
}
Status ColumnNullable::filter_by_selector(const uint16_t* sel, size_t
sel_size, IColumn* col_ptr) {
- const ColumnNullable* nullable_col_ptr = reinterpret_cast<const
ColumnNullable*>(col_ptr);
+ const auto* nullable_col_ptr = reinterpret_cast<const
ColumnNullable*>(col_ptr);
ColumnPtr nest_col_ptr = nullable_col_ptr->nested_column;
ColumnPtr null_map_ptr = nullable_col_ptr->null_map;
RETURN_IF_ERROR(get_nested_column().filter_by_selector(
@@ -388,11 +395,12 @@ int ColumnNullable::compare_at(size_t n, size_t m, const
IColumn& rhs_,
/// instead of the usual nan_direction_hint and is used to implement
/// the ordering specified by either NULLS FIRST or NULLS LAST in the
/// ORDER BY construction.
- const ColumnNullable& nullable_rhs = assert_cast<const
ColumnNullable&>(rhs_);
+ const auto& nullable_rhs = assert_cast<const ColumnNullable&>(rhs_);
if (is_null_at(n)) {
return nullable_rhs.is_null_at(m) ? 0 : null_direction_hint;
- } else if (nullable_rhs.is_null_at(m)) {
+ }
+ if (nullable_rhs.is_null_at(m)) {
return -null_direction_hint;
}
@@ -412,10 +420,11 @@ void ColumnNullable::get_permutation(bool reverse, size_t
limit, int null_direct
size_t write_idx = 0;
size_t end_idx = res.size();
- if (!limit)
+ if (!limit) {
limit = end_idx;
- else
+ } else {
limit = std::min(end_idx, limit);
+ }
while (read_idx < limit && !is_null_at(res[read_idx])) {
++read_idx;
@@ -488,11 +497,6 @@ size_t ColumnNullable::allocated_bytes() const {
return get_nested_column().allocated_bytes() +
get_null_map_column().allocated_bytes();
}
-void ColumnNullable::protect() {
- get_nested_column().protect();
- get_null_map_column().protect();
-}
-
ColumnPtr ColumnNullable::replicate(const Offsets& offsets) const {
ColumnPtr replicated_data = get_nested_column().replicate(offsets);
ColumnPtr replicated_null_map = get_null_map_column().replicate(offsets);
@@ -514,7 +518,9 @@ void ColumnNullable::apply_null_map_impl(const ColumnUInt8&
map) {
LOG(FATAL) << "Inconsistent sizes of ColumnNullable objects";
}
- for (size_t i = 0, size = arr1.size(); i < size; ++i) arr1[i] |= negative
^ arr2[i];
+ for (size_t i = 0, size = arr1.size(); i < size; ++i) {
+ arr1[i] |= negative ^ arr2[i];
+ }
}
void ColumnNullable::apply_null_map(const ColumnUInt8& map) {
@@ -558,13 +564,16 @@ bool ColumnNullable::has_null(size_t size) const {
}
ColumnPtr make_nullable(const ColumnPtr& column, bool is_nullable) {
- if (is_column_nullable(*column)) return column;
+ if (is_column_nullable(*column)) {
+ return column;
+ }
- if (is_column_const(*column))
+ if (is_column_const(*column)) {
return ColumnConst::create(
make_nullable(assert_cast<const
ColumnConst&>(*column).get_data_column_ptr(),
is_nullable),
column->size());
+ }
return ColumnNullable::create(column, ColumnUInt8::create(column->size(),
is_nullable ? 1 : 0));
}
@@ -575,7 +584,7 @@ ColumnPtr remove_nullable(const ColumnPtr& column) {
}
if (is_column_const(*column)) {
- auto& column_nested = assert_cast<const
ColumnConst&>(*column).get_data_column_ptr();
+ const auto& column_nested = assert_cast<const
ColumnConst&>(*column).get_data_column_ptr();
if (is_column_nullable(*column_nested)) {
return ColumnConst::create(
assert_cast<const
ColumnNullable&>(*column_nested).get_nested_column_ptr(),
@@ -594,7 +603,7 @@ ColumnPtr ColumnNullable::index(const IColumn& indexes,
size_t limit) const {
void check_set_nullable(ColumnPtr& argument_column,
ColumnVector<UInt8>::MutablePtr& null_map,
bool is_single) {
- if (auto* nullable =
check_and_get_column<ColumnNullable>(*argument_column)) {
+ if (const auto* nullable =
check_and_get_column<ColumnNullable>(*argument_column)) {
// Danger: Here must dispose the null map data first! Because
// argument_columns[i]=nullable->get_nested_column_ptr(); will release
the mem
// of column nullable mem of null map
diff --git a/be/src/vec/columns/column_nullable.h
b/be/src/vec/columns/column_nullable.h
index 223e8eb9ae8..e26b5a8cc09 100644
--- a/be/src/vec/columns/column_nullable.h
+++ b/be/src/vec/columns/column_nullable.h
@@ -20,10 +20,6 @@
#pragma once
-#include <glog/logging.h>
-#include <stdint.h>
-#include <sys/types.h>
-
#include <functional>
#include <ostream>
#include <string>
@@ -49,14 +45,9 @@
class SipHash;
-namespace doris {
-namespace vectorized {
+namespace doris::vectorized {
class Arena;
class ColumnSorter;
-} // namespace vectorized
-} // namespace doris
-
-namespace doris::vectorized {
using NullMap = ColumnUInt8::Container;
using ConstNullMapPtr = const NullMap*;
@@ -127,7 +118,7 @@ public:
void serialize_vec(std::vector<StringRef>& keys, size_t num_rows,
size_t max_row_byte_size) const override;
- void deserialize_vec(std::vector<StringRef>& keys, const size_t num_rows)
override;
+ void deserialize_vec(std::vector<StringRef>& keys, size_t num_rows)
override;
void insert_range_from(const IColumn& src, size_t start, size_t length)
override;
void insert_indices_from(const IColumn& src, const int* indices_begin,
@@ -137,7 +128,7 @@ public:
template <typename ColumnType>
void insert_from_with_type(const IColumn& src, size_t n) {
- const ColumnNullable& src_concrete = assert_cast<const
ColumnNullable&>(src);
+ const auto& src_concrete = assert_cast<const ColumnNullable&>(src);
assert_cast<ColumnType*>(nested_column.get())
->insert_from(src_concrete.get_nested_column(), n);
auto is_null = src_concrete.get_null_map_data()[n];
@@ -220,7 +211,6 @@ public:
void resize(size_t n) override;
size_t byte_size() const override;
size_t allocated_bytes() const override;
- void protect() override;
ColumnPtr replicate(const Offsets& replicate_offsets) const override;
void replicate(const uint32_t* counts, size_t target_size, IColumn&
column) const override;
void update_xxHash_with_value(size_t start, size_t end, uint64_t& hash,
@@ -253,7 +243,7 @@ public:
}
bool structure_equals(const IColumn& rhs) const override {
- if (auto rhs_nullable = typeid_cast<const ColumnNullable*>(&rhs)) {
+ if (const auto* rhs_nullable = typeid_cast<const
ColumnNullable*>(&rhs)) {
return
nested_column->structure_equals(*rhs_nullable->nested_column);
}
return false;
@@ -342,7 +332,7 @@ public:
void replace_column_data(const IColumn& rhs, size_t row, size_t self_row =
0) override {
DCHECK(size() > self_row);
- const ColumnNullable& nullable_rhs = assert_cast<const
ColumnNullable&>(rhs);
+ const auto& nullable_rhs = assert_cast<const ColumnNullable&>(rhs);
null_map->replace_column_data(*nullable_rhs.null_map, row, self_row);
if (!nullable_rhs.is_null_at(row)) {
diff --git a/be/src/vec/columns/column_string.cpp
b/be/src/vec/columns/column_string.cpp
index 580790916b6..2664ea3bafc 100644
--- a/be/src/vec/columns/column_string.cpp
+++ b/be/src/vec/columns/column_string.cpp
@@ -510,11 +510,6 @@ void ColumnString::sort_column(const ColumnSorter* sorter,
EqualFlags& flags,
sorter->sort_column(static_cast<const ColumnString&>(*this), flags, perms,
range, last_column);
}
-void ColumnString::protect() {
- get_chars().protect();
- get_offsets().protect();
-}
-
void ColumnString::compare_internal(size_t rhs_row_id, const IColumn& rhs, int
nan_direction_hint,
int direction, std::vector<uint8>& cmp_res,
uint8* __restrict filter) const {
diff --git a/be/src/vec/columns/column_string.h
b/be/src/vec/columns/column_string.h
index 99dc9fa8714..0b7ebe08b21 100644
--- a/be/src/vec/columns/column_string.h
+++ b/be/src/vec/columns/column_string.h
@@ -118,8 +118,6 @@ public:
return chars.allocated_bytes() + offsets.allocated_bytes();
}
- void protect() override;
-
MutableColumnPtr clone_resized(size_t to_size) const override;
MutableColumnPtr get_shrinked_column() override;
diff --git a/be/src/vec/columns/column_struct.cpp
b/be/src/vec/columns/column_struct.cpp
index a83585252d0..c5fbc4b4bf4 100644
--- a/be/src/vec/columns/column_struct.cpp
+++ b/be/src/vec/columns/column_struct.cpp
@@ -347,12 +347,6 @@ size_t ColumnStruct::allocated_bytes() const {
return res;
}
-void ColumnStruct::protect() {
- for (auto& column : columns) {
- column->protect();
- }
-}
-
void ColumnStruct::for_each_subcolumn(ColumnCallback callback) {
for (auto& column : columns) {
callback(column);
diff --git a/be/src/vec/columns/column_struct.h
b/be/src/vec/columns/column_struct.h
index 59587ce04e3..535604f7260 100644
--- a/be/src/vec/columns/column_struct.h
+++ b/be/src/vec/columns/column_struct.h
@@ -163,7 +163,6 @@ public:
void resize(size_t n) override;
size_t byte_size() const override;
size_t allocated_bytes() const override;
- void protect() override;
void for_each_subcolumn(ColumnCallback callback) override;
bool structure_equals(const IColumn& rhs) const override;
diff --git a/be/src/vec/columns/column_vector.h
b/be/src/vec/columns/column_vector.h
index 0b4192626ae..0cf100ce07b 100644
--- a/be/src/vec/columns/column_vector.h
+++ b/be/src/vec/columns/column_vector.h
@@ -332,8 +332,6 @@ public:
size_t allocated_bytes() const override { return data.allocated_bytes(); }
- void protect() override { data.protect(); }
-
void insert_value(const T value) { data.push_back(value); }
/// This method implemented in header because it could be possibly
devirtualized.
diff --git a/be/src/vec/columns/predicate_column.h
b/be/src/vec/columns/predicate_column.h
index 652488f9ab7..2f543e40211 100644
--- a/be/src/vec/columns/predicate_column.h
+++ b/be/src/vec/columns/predicate_column.h
@@ -349,8 +349,6 @@ public:
size_t allocated_bytes() const override { return byte_size(); }
- void protect() override {}
-
void get_permutation(bool reverse, size_t limit, int nan_direction_hint,
IColumn::Permutation& res) const override {
LOG(FATAL) << "get_permutation not supported in PredicateColumnType";
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscr...@doris.apache.org
For additional commands, e-mail: commits-h...@doris.apache.org
