Skip to content

Commit 02449b1

Browse files
platonekoeldenmoon
authored andcommitted
[chore]fix clang compile error (apache#11021)
1 parent be199cb commit 02449b1

File tree

4 files changed

+4
-72
lines changed

4 files changed

+4
-72
lines changed

be/src/exec/arrow/parquet_row_group_reader.h

-1
Original file line numberDiff line numberDiff line change
@@ -86,7 +86,6 @@ class RowGroupReader {
8686
private:
8787
int64_t _range_start_offset;
8888
int64_t _range_size;
89-
int64_t _file_size;
9089
std::map<int, std::vector<ExprContext*>> _slot_conjuncts;
9190
std::unordered_set<int> _filter_group;
9291

be/src/olap/like_column_predicate.cpp

-66
Original file line numberDiff line numberDiff line change
@@ -39,72 +39,6 @@ void LikeColumnPredicate::evaluate(ColumnBlock* block, uint16_t* sel, uint16_t*
3939
}
4040
}
4141

42-
void LikeColumnPredicate::evaluate(vectorized::IColumn& column, uint16_t* sel,
43-
uint16_t* size) const {
44-
uint16_t new_size = 0;
45-
46-
if (column.is_nullable()) {
47-
auto* nullable_col = vectorized::check_and_get_column<vectorized::ColumnNullable>(column);
48-
auto& null_map_data = nullable_col->get_null_map_column().get_data();
49-
auto& nested_col = nullable_col->get_nested_column();
50-
if (nested_col.is_column_dictionary()) {
51-
auto* nested_col_ptr = vectorized::check_and_get_column<
52-
vectorized::ColumnDictionary<vectorized::Int32>>(nested_col);
53-
auto& data_array = nested_col_ptr->get_data();
54-
for (uint16_t i = 0; i < *size; i++) {
55-
uint16_t idx = sel[i];
56-
sel[new_size] = idx;
57-
if (null_map_data[idx]) {
58-
new_size += _opposite;
59-
continue;
60-
}
61-
62-
StringValue cell_value = nested_col_ptr->get_value(data_array[idx]);
63-
doris_udf::StringVal target;
64-
cell_value.to_string_val(&target);
65-
new_size += _opposite ^ ((_state->function)(_fn_ctx, target, pattern).val);
66-
}
67-
} else {
68-
for (uint16_t i = 0; i < *size; i++) {
69-
uint16_t idx = sel[i];
70-
sel[new_size] = idx;
71-
if (null_map_data[idx]) {
72-
new_size += _opposite;
73-
continue;
74-
}
75-
76-
StringRef cell_value = nested_col.get_data_at(idx);
77-
doris_udf::StringVal target = cell_value.to_string_val();
78-
new_size += _opposite ^ ((_state->function)(_fn_ctx, target, pattern).val);
79-
}
80-
}
81-
} else {
82-
if (column.is_column_dictionary()) {
83-
auto* nested_col_ptr = vectorized::check_and_get_column<
84-
vectorized::ColumnDictionary<vectorized::Int32>>(column);
85-
auto& data_array = nested_col_ptr->get_data();
86-
for (uint16_t i = 0; i < *size; i++) {
87-
uint16_t idx = sel[i];
88-
sel[new_size] = idx;
89-
StringValue cell_value = nested_col_ptr->get_value(data_array[idx]);
90-
doris_udf::StringVal target;
91-
cell_value.to_string_val(&target);
92-
new_size += _opposite ^ ((_state->function)(_fn_ctx, target, pattern).val);
93-
}
94-
} else {
95-
for (uint16_t i = 0; i < *size; i++) {
96-
uint16_t idx = sel[i];
97-
sel[new_size] = idx;
98-
StringRef cell_value = column.get_data_at(idx);
99-
doris_udf::StringVal target = cell_value.to_string_val();
100-
new_size += _opposite ^ ((_state->function)(_fn_ctx, target, pattern).val);
101-
}
102-
}
103-
}
104-
105-
*size = new_size;
106-
}
107-
10842
void LikeColumnPredicate::evaluate_vec(const vectorized::IColumn& column, uint16_t size,
10943
bool* flags) const {
11044
if (column.is_nullable()) {

be/src/olap/like_column_predicate.h

-1
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,6 @@ class LikeColumnPredicate : public ColumnPredicate {
3333

3434
PredicateType type() const override { return PredicateType::EQ; }
3535
void evaluate_vec(const vectorized::IColumn& column, uint16_t size, bool* flags) const override;
36-
void evaluate(vectorized::IColumn& column, uint16_t* sel, uint16_t* size) const;
3736

3837
void evaluate(ColumnBlock* block, uint16_t* sel, uint16_t* size) const override;
3938

be/src/vec/common/hash_table/string_hash_table.h

+4-4
Original file line numberDiff line numberDiff line change
@@ -295,28 +295,28 @@ class StringHashTable : private boost::noncopyable {
295295
break;
296296
}
297297
case 1: {
298-
iterator1.template operator++();
298+
++iterator1;
299299
if (iterator1 == container->m1.end()) {
300300
need_switch_to_next = true;
301301
}
302302
break;
303303
}
304304
case 2: {
305-
iterator2.template operator++();
305+
++iterator2;
306306
if (iterator2 == container->m2.end()) {
307307
need_switch_to_next = true;
308308
}
309309
break;
310310
}
311311
case 3: {
312-
iterator3.template operator++();
312+
++iterator3;
313313
if (iterator3 == container->m3.end()) {
314314
need_switch_to_next = true;
315315
}
316316
break;
317317
}
318318
case 4: {
319-
iterator4.template operator++();
319+
++iterator4;
320320
break;
321321
}
322322
}

0 commit comments

Comments
 (0)