This is an automated email from the ASF dual-hosted git repository.
yiguolei 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 989e6d1cf9 [chore]fix clang compile error (#11021)
989e6d1cf9 is described below
commit 989e6d1cf9e2de07675571772567c29c75f61bad
Author: plat1ko <platonekos...@gmail.com>
AuthorDate: Wed Jul 20 08:28:47 2022 +0800
[chore]fix clang compile error (#11021)
---
be/src/exec/arrow/parquet_row_group_reader.h | 1 -
be/src/olap/like_column_predicate.cpp | 66 ------------------------
be/src/olap/like_column_predicate.h | 1 -
be/src/vec/common/hash_table/string_hash_table.h | 8 +--
4 files changed, 4 insertions(+), 72 deletions(-)
diff --git a/be/src/exec/arrow/parquet_row_group_reader.h
b/be/src/exec/arrow/parquet_row_group_reader.h
index 6cd5724828..2946e7425e 100644
--- a/be/src/exec/arrow/parquet_row_group_reader.h
+++ b/be/src/exec/arrow/parquet_row_group_reader.h
@@ -86,7 +86,6 @@ private:
private:
int64_t _range_start_offset;
int64_t _range_size;
- int64_t _file_size;
std::map<int, std::vector<ExprContext*>> _slot_conjuncts;
std::unordered_set<int> _filter_group;
diff --git a/be/src/olap/like_column_predicate.cpp
b/be/src/olap/like_column_predicate.cpp
index 243b5c9d5c..f7eea7dabb 100644
--- a/be/src/olap/like_column_predicate.cpp
+++ b/be/src/olap/like_column_predicate.cpp
@@ -39,72 +39,6 @@ void LikeColumnPredicate::evaluate(ColumnBlock* block,
uint16_t* sel, uint16_t*
}
}
-void LikeColumnPredicate::evaluate(vectorized::IColumn& column, uint16_t* sel,
- uint16_t* size) const {
- uint16_t new_size = 0;
-
- if (column.is_nullable()) {
- auto* nullable_col =
vectorized::check_and_get_column<vectorized::ColumnNullable>(column);
- auto& null_map_data = nullable_col->get_null_map_column().get_data();
- auto& nested_col = nullable_col->get_nested_column();
- if (nested_col.is_column_dictionary()) {
- auto* nested_col_ptr = vectorized::check_and_get_column<
-
vectorized::ColumnDictionary<vectorized::Int32>>(nested_col);
- auto& data_array = nested_col_ptr->get_data();
- for (uint16_t i = 0; i < *size; i++) {
- uint16_t idx = sel[i];
- sel[new_size] = idx;
- if (null_map_data[idx]) {
- new_size += _opposite;
- continue;
- }
-
- StringValue cell_value =
nested_col_ptr->get_value(data_array[idx]);
- doris_udf::StringVal target;
- cell_value.to_string_val(&target);
- new_size += _opposite ^ ((_state->function)(_fn_ctx, target,
pattern).val);
- }
- } else {
- for (uint16_t i = 0; i < *size; i++) {
- uint16_t idx = sel[i];
- sel[new_size] = idx;
- if (null_map_data[idx]) {
- new_size += _opposite;
- continue;
- }
-
- StringRef cell_value = nested_col.get_data_at(idx);
- doris_udf::StringVal target = cell_value.to_string_val();
- new_size += _opposite ^ ((_state->function)(_fn_ctx, target,
pattern).val);
- }
- }
- } else {
- if (column.is_column_dictionary()) {
- auto* nested_col_ptr = vectorized::check_and_get_column<
- vectorized::ColumnDictionary<vectorized::Int32>>(column);
- auto& data_array = nested_col_ptr->get_data();
- for (uint16_t i = 0; i < *size; i++) {
- uint16_t idx = sel[i];
- sel[new_size] = idx;
- StringValue cell_value =
nested_col_ptr->get_value(data_array[idx]);
- doris_udf::StringVal target;
- cell_value.to_string_val(&target);
- new_size += _opposite ^ ((_state->function)(_fn_ctx, target,
pattern).val);
- }
- } else {
- for (uint16_t i = 0; i < *size; i++) {
- uint16_t idx = sel[i];
- sel[new_size] = idx;
- StringRef cell_value = column.get_data_at(idx);
- doris_udf::StringVal target = cell_value.to_string_val();
- new_size += _opposite ^ ((_state->function)(_fn_ctx, target,
pattern).val);
- }
- }
- }
-
- *size = new_size;
-}
-
void LikeColumnPredicate::evaluate_vec(const vectorized::IColumn& column,
uint16_t size,
bool* flags) const {
if (column.is_nullable()) {
diff --git a/be/src/olap/like_column_predicate.h
b/be/src/olap/like_column_predicate.h
index 68d6c14f2c..b72846ff5f 100644
--- a/be/src/olap/like_column_predicate.h
+++ b/be/src/olap/like_column_predicate.h
@@ -33,7 +33,6 @@ public:
PredicateType type() const override { return PredicateType::EQ; }
void evaluate_vec(const vectorized::IColumn& column, uint16_t size, bool*
flags) const override;
- void evaluate(vectorized::IColumn& column, uint16_t* sel, uint16_t* size)
const;
void evaluate(ColumnBlock* block, uint16_t* sel, uint16_t* size) const
override;
diff --git a/be/src/vec/common/hash_table/string_hash_table.h
b/be/src/vec/common/hash_table/string_hash_table.h
index b6e4a04da7..2dc2c25a29 100644
--- a/be/src/vec/common/hash_table/string_hash_table.h
+++ b/be/src/vec/common/hash_table/string_hash_table.h
@@ -295,28 +295,28 @@ protected:
break;
}
case 1: {
- iterator1.template operator++();
+ ++iterator1;
if (iterator1 == container->m1.end()) {
need_switch_to_next = true;
}
break;
}
case 2: {
- iterator2.template operator++();
+ ++iterator2;
if (iterator2 == container->m2.end()) {
need_switch_to_next = true;
}
break;
}
case 3: {
- iterator3.template operator++();
+ ++iterator3;
if (iterator3 == container->m3.end()) {
need_switch_to_next = true;
}
break;
}
case 4: {
- iterator4.template operator++();
+ ++iterator4;
break;
}
}
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscr...@doris.apache.org
For additional commands, e-mail: commits-h...@doris.apache.org
