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 5248b21a01 [fix UT] for pr10249 evaluate interface changed (#10269)
5248b21a01 is described below
commit 5248b21a01aefb441ad93907a5246583030d2829
Author: camby <104178...@qq.com>
AuthorDate: Wed Jun 22 08:49:53 2022 +0800
[fix UT] for pr10249 evaluate interface changed (#10269)
* UT fix for pr10249, evaluate interface changed, but UT do not change.
* fix be code format
Co-authored-by: cambyzju <zhuxiaol...@baidu.com>
---
be/test/olap/block_column_predicate_test.cpp | 12 ++---
.../olap/bloom_filter_column_predicate_test.cpp | 4 +-
be/test/olap/null_predicate_test.cpp | 56 +++++++++++-----------
3 files changed, 36 insertions(+), 36 deletions(-)
diff --git a/be/test/olap/block_column_predicate_test.cpp
b/be/test/olap/block_column_predicate_test.cpp
index d4ec71834d..c2b3a6cdce 100644
--- a/be/test/olap/block_column_predicate_test.cpp
+++ b/be/test/olap/block_column_predicate_test.cpp
@@ -116,7 +116,7 @@ TEST_F(BlockColumnPredicateTest, SINGLE_COLUMN_VEC) {
sel_idx[i] = i;
}
- single_column_block_pred.evaluate(block, sel_idx, &selected_size);
+ selected_size = single_column_block_pred.evaluate(block, sel_idx,
selected_size);
EXPECT_EQ(selected_size, 1);
auto* pred_col =
reinterpret_cast<vectorized::PredicateColumnType<int>*>(block[col_idx].get());
EXPECT_EQ(pred_col->get_data()[sel_idx[0]], value);
@@ -181,7 +181,7 @@ TEST_F(BlockColumnPredicateTest, AND_MUTI_COLUMN_VEC) {
sel_idx[i] = i;
}
- and_block_column_pred.evaluate(block, sel_idx, &selected_size);
+ selected_size = and_block_column_pred.evaluate(block, sel_idx,
selected_size);
EXPECT_EQ(selected_size, 1);
auto* pred_col =
reinterpret_cast<vectorized::PredicateColumnType<int>*>(block[col_idx].get());
EXPECT_EQ(pred_col->get_data()[sel_idx[0]], 4);
@@ -246,7 +246,7 @@ TEST_F(BlockColumnPredicateTest, OR_MUTI_COLUMN_VEC) {
sel_idx[i] = i;
}
- or_block_column_pred.evaluate(block, sel_idx, &selected_size);
+ selected_size = or_block_column_pred.evaluate(block, sel_idx,
selected_size);
EXPECT_EQ(selected_size, 10);
auto* pred_col =
reinterpret_cast<vectorized::PredicateColumnType<int>*>(block[col_idx].get());
EXPECT_EQ(pred_col->get_data()[sel_idx[0]], 0);
@@ -344,7 +344,7 @@ TEST_F(BlockColumnPredicateTest, OR_AND_MUTI_COLUMN_VEC) {
sel_idx[i] = i;
}
- or_block_column_pred.evaluate(block, sel_idx, &selected_size);
+ selected_size = or_block_column_pred.evaluate(block, sel_idx,
selected_size);
EXPECT_EQ(selected_size, 4);
auto* pred_col =
reinterpret_cast<vectorized::PredicateColumnType<int>*>(block[col_idx].get());
EXPECT_EQ(pred_col->get_data()[sel_idx[0]], 0);
@@ -362,7 +362,7 @@ TEST_F(BlockColumnPredicateTest, OR_AND_MUTI_COLUMN_VEC) {
or_block_column_pred1.add_column_predicate(new
SingleColumnBlockPredicate(less_pred1.get()));
or_block_column_pred1.add_column_predicate(and_block_column_pred1);
- or_block_column_pred1.evaluate(block, sel_idx, &selected_size);
+ selected_size = or_block_column_pred1.evaluate(block, sel_idx,
selected_size);
EXPECT_EQ(selected_size, 4);
EXPECT_EQ(pred_col->get_data()[sel_idx[0]], 0);
EXPECT_EQ(pred_col->get_data()[sel_idx[1]], 1);
@@ -456,7 +456,7 @@ TEST_F(BlockColumnPredicateTest, AND_OR_MUTI_COLUMN_VEC) {
sel_idx[i] = i;
}
- and_block_column_pred.evaluate(block, sel_idx, &selected_size);
+ selected_size = and_block_column_pred.evaluate(block, sel_idx,
selected_size);
auto* pred_col =
reinterpret_cast<vectorized::PredicateColumnType<int>*>(block[col_idx].get());
EXPECT_EQ(selected_size, 1);
diff --git a/be/test/olap/bloom_filter_column_predicate_test.cpp
b/be/test/olap/bloom_filter_column_predicate_test.cpp
index 1043e58c44..ffc100684b 100644
--- a/be/test/olap/bloom_filter_column_predicate_test.cpp
+++ b/be/test/olap/bloom_filter_column_predicate_test.cpp
@@ -185,7 +185,7 @@ TEST_F(TestBloomFilterColumnPredicate, FLOAT_COLUMN) {
}
_row_block->clear();
select_size = _row_block->selected_size();
- pred->evaluate(*pred_col, _row_block->selection_vector(), &select_size);
+ select_size = pred->evaluate(*pred_col, _row_block->selection_vector(),
select_size);
EXPECT_EQ(select_size, 3);
EXPECT_FLOAT_EQ((float)pred_col->get_data()[_row_block->selection_vector()[0]],
4.1);
EXPECT_FLOAT_EQ((float)pred_col->get_data()[_row_block->selection_vector()[1]],
5.1);
@@ -201,7 +201,7 @@ TEST_F(TestBloomFilterColumnPredicate, FLOAT_COLUMN) {
select_size = _row_block->selected_size();
auto nullable_col =
vectorized::ColumnNullable::create(std::move(pred_col),
std::move(null_map));
- pred->evaluate(*nullable_col, _row_block->selection_vector(),
&select_size);
+ select_size = pred->evaluate(*nullable_col,
_row_block->selection_vector(), select_size);
EXPECT_EQ(select_size, 1);
auto nested_col =
check_and_get_column<PredicateColumnType<vectorized::Float32>>(
nullable_col->get_nested_column());
diff --git a/be/test/olap/null_predicate_test.cpp
b/be/test/olap/null_predicate_test.cpp
index 51c7abb48f..47bf02306f 100644
--- a/be/test/olap/null_predicate_test.cpp
+++ b/be/test/olap/null_predicate_test.cpp
@@ -153,8 +153,8 @@ public:
vectorized::Block vec_block =
tablet_schema.create_block(return_columns); \
_row_block->convert_to_vec_block(&vec_block);
\
ColumnPtr vec_col = vec_block.get_columns()[0];
\
- pred->evaluate(const_cast<doris::vectorized::IColumn&>(*vec_col),
\
- _row_block->selection_vector(), &select_size);
\
+ select_size =
pred->evaluate(const_cast<doris::vectorized::IColumn&>(*vec_col), \
+ _row_block->selection_vector(),
select_size); \
EXPECT_EQ(select_size, 0);
\
\
/* for has nulls */
\
@@ -195,8 +195,8 @@ public:
vec_block = tablet_schema.create_block(return_columns);
\
_row_block->convert_to_vec_block(&vec_block);
\
vec_col = vec_block.get_columns()[0];
\
- pred->evaluate(const_cast<doris::vectorized::IColumn&>(*vec_col),
\
- _row_block->selection_vector(), &select_size);
\
+ select_size =
pred->evaluate(const_cast<doris::vectorized::IColumn&>(*vec_col), \
+ _row_block->selection_vector(),
select_size); \
EXPECT_EQ(select_size, 5);
\
pred.reset();
\
}
@@ -247,8 +247,8 @@ TEST_F(TestNullPredicate, FLOAT_COLUMN) {
vectorized::Block vec_block = tablet_schema.create_block(return_columns);
_row_block->convert_to_vec_block(&vec_block);
ColumnPtr vec_col = vec_block.get_columns()[0];
- pred->evaluate(const_cast<doris::vectorized::IColumn&>(*vec_col),
- _row_block->selection_vector(), &select_size);
+ select_size =
pred->evaluate(const_cast<doris::vectorized::IColumn&>(*vec_col),
+ _row_block->selection_vector(), select_size);
EXPECT_EQ(select_size, 0);
// for VectorizedBatch has nulls
@@ -289,8 +289,8 @@ TEST_F(TestNullPredicate, FLOAT_COLUMN) {
vec_block = tablet_schema.create_block(return_columns);
_row_block->convert_to_vec_block(&vec_block);
vec_col = vec_block.get_columns()[0];
- pred->evaluate(const_cast<doris::vectorized::IColumn&>(*vec_col),
- _row_block->selection_vector(), &select_size);
+ select_size =
pred->evaluate(const_cast<doris::vectorized::IColumn&>(*vec_col),
+ _row_block->selection_vector(), select_size);
EXPECT_EQ(select_size, 5);
}
@@ -335,8 +335,8 @@ TEST_F(TestNullPredicate, DOUBLE_COLUMN) {
vectorized::Block vec_block = tablet_schema.create_block(return_columns);
_row_block->convert_to_vec_block(&vec_block);
ColumnPtr vec_col = vec_block.get_columns()[0];
- pred->evaluate(const_cast<doris::vectorized::IColumn&>(*vec_col),
- _row_block->selection_vector(), &select_size);
+ select_size =
pred->evaluate(const_cast<doris::vectorized::IColumn&>(*vec_col),
+ _row_block->selection_vector(), select_size);
EXPECT_EQ(select_size, 0);
// for VectorizedBatch has nulls
@@ -377,8 +377,8 @@ TEST_F(TestNullPredicate, DOUBLE_COLUMN) {
vec_block = tablet_schema.create_block(return_columns);
_row_block->convert_to_vec_block(&vec_block);
vec_col = vec_block.get_columns()[0];
- pred->evaluate(const_cast<doris::vectorized::IColumn&>(*vec_col),
- _row_block->selection_vector(), &select_size);
+ select_size =
pred->evaluate(const_cast<doris::vectorized::IColumn&>(*vec_col),
+ _row_block->selection_vector(), select_size);
EXPECT_EQ(select_size, 5);
}
@@ -426,8 +426,8 @@ TEST_F(TestNullPredicate, DECIMAL_COLUMN) {
vectorized::Block vec_block = tablet_schema.create_block(return_columns);
_row_block->convert_to_vec_block(&vec_block);
ColumnPtr vec_col = vec_block.get_columns()[0];
- pred->evaluate(const_cast<doris::vectorized::IColumn&>(*vec_col),
- _row_block->selection_vector(), &select_size);
+ select_size =
pred->evaluate(const_cast<doris::vectorized::IColumn&>(*vec_col),
+ _row_block->selection_vector(), select_size);
EXPECT_EQ(select_size, 0);
// for VectorizedBatch has nulls
@@ -470,8 +470,8 @@ TEST_F(TestNullPredicate, DECIMAL_COLUMN) {
vec_block = tablet_schema.create_block(return_columns);
_row_block->convert_to_vec_block(&vec_block);
vec_col = vec_block.get_columns()[0];
- pred->evaluate(const_cast<doris::vectorized::IColumn&>(*vec_col),
- _row_block->selection_vector(), &select_size);
+ select_size =
pred->evaluate(const_cast<doris::vectorized::IColumn&>(*vec_col),
+ _row_block->selection_vector(), select_size);
EXPECT_EQ(select_size, 4);
}
@@ -531,8 +531,8 @@ TEST_F(TestNullPredicate, STRING_COLUMN) {
vectorized::Block vec_block = tablet_schema.create_block(return_columns);
_row_block->convert_to_vec_block(&vec_block);
ColumnPtr vec_col = vec_block.get_columns()[0];
- pred->evaluate(const_cast<doris::vectorized::IColumn&>(*vec_col),
- _row_block->selection_vector(), &select_size);
+ select_size =
pred->evaluate(const_cast<doris::vectorized::IColumn&>(*vec_col),
+ _row_block->selection_vector(), select_size);
EXPECT_EQ(select_size, 0);
// for VectorizedBatch has nulls
@@ -585,8 +585,8 @@ TEST_F(TestNullPredicate, STRING_COLUMN) {
vec_block = tablet_schema.create_block(return_columns);
_row_block->convert_to_vec_block(&vec_block);
vec_col = vec_block.get_columns()[0];
- pred->evaluate(const_cast<doris::vectorized::IColumn&>(*vec_col),
- _row_block->selection_vector(), &select_size);
+ select_size =
pred->evaluate(const_cast<doris::vectorized::IColumn&>(*vec_col),
+ _row_block->selection_vector(), select_size);
EXPECT_EQ(select_size, 4);
}
@@ -640,8 +640,8 @@ TEST_F(TestNullPredicate, DATE_COLUMN) {
vectorized::Block vec_block = tablet_schema.create_block(return_columns);
_row_block->convert_to_vec_block(&vec_block);
ColumnPtr vec_col = vec_block.get_columns()[0];
- pred->evaluate(const_cast<doris::vectorized::IColumn&>(*vec_col),
- _row_block->selection_vector(), &select_size);
+ select_size =
pred->evaluate(const_cast<doris::vectorized::IColumn&>(*vec_col),
+ _row_block->selection_vector(), select_size);
EXPECT_EQ(select_size, 0);
// for VectorizedBatch has nulls
@@ -684,8 +684,8 @@ TEST_F(TestNullPredicate, DATE_COLUMN) {
vec_block = tablet_schema.create_block(return_columns);
_row_block->convert_to_vec_block(&vec_block);
vec_col = vec_block.get_columns()[0];
- pred->evaluate(const_cast<doris::vectorized::IColumn&>(*vec_col),
- _row_block->selection_vector(), &select_size);
+ select_size =
pred->evaluate(const_cast<doris::vectorized::IColumn&>(*vec_col),
+ _row_block->selection_vector(), select_size);
EXPECT_EQ(select_size, 2);
}
@@ -739,8 +739,8 @@ TEST_F(TestNullPredicate, DATETIME_COLUMN) {
vectorized::Block vec_block = tablet_schema.create_block(return_columns);
_row_block->convert_to_vec_block(&vec_block);
ColumnPtr vec_col = vec_block.get_columns()[0];
- pred->evaluate(const_cast<doris::vectorized::IColumn&>(*vec_col),
- _row_block->selection_vector(), &select_size);
+ select_size =
pred->evaluate(const_cast<doris::vectorized::IColumn&>(*vec_col),
+ _row_block->selection_vector(), select_size);
EXPECT_EQ(select_size, 0);
// for VectorizedBatch has nulls
@@ -783,8 +783,8 @@ TEST_F(TestNullPredicate, DATETIME_COLUMN) {
vec_block = tablet_schema.create_block(return_columns);
_row_block->convert_to_vec_block(&vec_block);
vec_col = vec_block.get_columns()[0];
- pred->evaluate(const_cast<doris::vectorized::IColumn&>(*vec_col),
- _row_block->selection_vector(), &select_size);
+ select_size =
pred->evaluate(const_cast<doris::vectorized::IColumn&>(*vec_col),
+ _row_block->selection_vector(), select_size);
EXPECT_EQ(select_size, 2);
}
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscr...@doris.apache.org
For additional commands, e-mail: commits-h...@doris.apache.org
