Skip to content

Commit 38eddb1

Browse files
BiteTheDDDDtBiteTheDDDDt
committed
fix ut
1 parent 1c44839 commit 38eddb1

File tree

6 files changed

+21
-17
lines changed

6 files changed

+21
-17
lines changed

‎be/test/runtime_filter/runtime_filter_consumer_helper_test.cpp‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -90,7 +90,7 @@ TEST_F(RuntimeFilterConsumerHelperTest, basic) {
9090

9191
std::shared_ptr<RuntimeFilterProducer> producer;
9292
FAIL_IF_ERROR_OR_CATCH_EXCEPTION(RuntimeFilterProducer::create(
93-
_query_ctx.get(), runtime_filter_descs.data(), &producer));
93+
_query_options, runtime_filter_descs.data(), &producer));
9494
producer->set_wrapper_state_and_ready_to_publish(RuntimeFilterWrapper::State::READY);
9595
helper._consumers[0]->signal(producer.get());
9696

‎be/test/runtime_filter/runtime_filter_consumer_test.cpp‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ class RuntimeFilterConsumerTest : public RuntimeFilterTest {
3535

3636
std::shared_ptr<RuntimeFilterProducer> producer;
3737
FAIL_IF_ERROR_OR_CATCH_EXCEPTION(
38-
RuntimeFilterProducer::create(_query_ctx.get(), &desc, &producer));
38+
RuntimeFilterProducer::create(_query_options, &desc, &producer));
3939
FAIL_IF_ERROR_OR_CATCH_EXCEPTION(producer->init(123));
4040
producer->set_wrapper_state_and_ready_to_publish(RuntimeFilterWrapper::State::READY);
4141

@@ -120,7 +120,7 @@ TEST_F(RuntimeFilterConsumerTest, timeout_aquire) {
120120

121121
std::shared_ptr<RuntimeFilterProducer> producer;
122122
FAIL_IF_ERROR_OR_CATCH_EXCEPTION(
123-
RuntimeFilterProducer::create(_query_ctx.get(), &desc, &producer));
123+
RuntimeFilterProducer::create(_query_options, &desc, &producer));
124124
producer->set_wrapper_state_and_ready_to_publish(RuntimeFilterWrapper::State::READY);
125125

126126
std::vector<vectorized::VRuntimeFilterPtr> push_exprs;
@@ -156,7 +156,7 @@ TEST_F(RuntimeFilterConsumerTest, aquire_disabled) {
156156

157157
std::shared_ptr<RuntimeFilterProducer> producer;
158158
FAIL_IF_ERROR_OR_CATCH_EXCEPTION(
159-
RuntimeFilterProducer::create(_query_ctx.get(), &desc, &producer));
159+
RuntimeFilterProducer::create(_query_options, &desc, &producer));
160160
producer->set_wrapper_state_and_ready_to_publish(RuntimeFilterWrapper::State::DISABLED);
161161

162162
std::vector<vectorized::VRuntimeFilterPtr> push_exprs;
@@ -221,7 +221,7 @@ TEST_F(RuntimeFilterConsumerTest, aquire_signal_at_same_time) {
221221

222222
std::shared_ptr<RuntimeFilterProducer> producer;
223223
FAIL_IF_ERROR_OR_CATCH_EXCEPTION(
224-
RuntimeFilterProducer::create(_query_ctx.get(), &desc, &producer));
224+
RuntimeFilterProducer::create(_query_options, &desc, &producer));
225225
producer->set_wrapper_state_and_ready_to_publish(RuntimeFilterWrapper::State::READY);
226226

227227
std::vector<vectorized::VRuntimeFilterPtr> push_exprs;

‎be/test/runtime_filter/runtime_filter_merger_test.cpp‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ class RuntimeFilterMergerTest : public RuntimeFilterTest {
3434
std::shared_ptr<RuntimeFilterMerger> merger;
3535
auto desc = TRuntimeFilterDescBuilder().build();
3636
FAIL_IF_ERROR_OR_CATCH_EXCEPTION(
37-
RuntimeFilterMerger::create(_query_ctx.get(), &desc, &merger));
37+
RuntimeFilterMerger::create(&desc, &merger));
3838
merger->set_expected_producer_num(2);
3939
ASSERT_FALSE(merger->ready());
4040
ASSERT_EQ(merger->_wrapper->_state, RuntimeFilterWrapper::State::UNINITED);
@@ -62,7 +62,7 @@ class RuntimeFilterMergerTest : public RuntimeFilterTest {
6262
.build()) {
6363
std::shared_ptr<RuntimeFilterMerger> merger;
6464
FAIL_IF_ERROR_OR_CATCH_EXCEPTION(
65-
RuntimeFilterMerger::create(_query_ctx.get(), &desc, &merger));
65+
RuntimeFilterMerger::create(&desc, &merger));
6666
merger->set_expected_producer_num(1);
6767
ASSERT_FALSE(merger->ready());
6868

@@ -81,7 +81,7 @@ class RuntimeFilterMergerTest : public RuntimeFilterTest {
8181

8282
std::shared_ptr<RuntimeFilterProducer> deserialized_producer;
8383
FAIL_IF_ERROR_OR_CATCH_EXCEPTION(
84-
RuntimeFilterProducer::create(_query_ctx.get(), &desc, &deserialized_producer));
84+
RuntimeFilterProducer::create(_query_options, &desc, &deserialized_producer));
8585
butil::IOBuf buf;
8686
buf.append(data, len);
8787
butil::IOBufAsZeroCopyInputStream stream(buf);
@@ -98,7 +98,7 @@ TEST_F(RuntimeFilterMergerTest, basic) {
9898
TEST_F(RuntimeFilterMergerTest, add_rf_size) {
9999
std::shared_ptr<RuntimeFilterMerger> merger;
100100
auto desc = TRuntimeFilterDescBuilder().build();
101-
FAIL_IF_ERROR_OR_CATCH_EXCEPTION(RuntimeFilterMerger::create(_query_ctx.get(), &desc, &merger));
101+
FAIL_IF_ERROR_OR_CATCH_EXCEPTION(RuntimeFilterMerger::create(&desc, &merger));
102102
merger->set_expected_producer_num(2);
103103

104104
ASSERT_FALSE(merger->add_rf_size(123));
@@ -117,7 +117,7 @@ TEST_F(RuntimeFilterMergerTest, add_rf_size) {
117117
TEST_F(RuntimeFilterMergerTest, invalid_merge) {
118118
std::shared_ptr<RuntimeFilterMerger> merger;
119119
auto desc = TRuntimeFilterDescBuilder().build();
120-
FAIL_IF_ERROR_OR_CATCH_EXCEPTION(RuntimeFilterMerger::create(_query_ctx.get(), &desc, &merger));
120+
FAIL_IF_ERROR_OR_CATCH_EXCEPTION(RuntimeFilterMerger::create(&desc, &merger));
121121
merger->set_expected_producer_num(1);
122122
ASSERT_FALSE(merger->ready());
123123
ASSERT_EQ(merger->_wrapper->_state, RuntimeFilterWrapper::State::UNINITED);

‎be/test/runtime_filter/runtime_filter_mgr_test.cpp‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -168,7 +168,7 @@ TEST_F(RuntimeFilterMgrTest, TestRuntimeFilterMergeControllerEntity) {
168168
TRuntimeFilterDescBuilder().add_planId_to_target_expr(0).build())
169169
.add_rid_to_target_paramv2(rid, {TRuntimeFilterTargetParamsV2()})
170170
.build();
171-
EXPECT_FALSE(entity->init(ctx, param).ok());
171+
EXPECT_FALSE(entity->init(param).ok());
172172

173173
param = TRuntimeFilterParamsBuilder()
174174
.add_rid_to_runtime_filter(
@@ -177,7 +177,7 @@ TEST_F(RuntimeFilterMgrTest, TestRuntimeFilterMergeControllerEntity) {
177177
.add_runtime_filter_builder_num(rid, 1)
178178
.add_rid_to_target_paramv2(rid, {TRuntimeFilterTargetParamsV2()})
179179
.build();
180-
EXPECT_TRUE(entity->init(ctx, param).ok());
180+
EXPECT_TRUE(entity->init(param).ok());
181181
}
182182
}
183183

‎be/test/runtime_filter/runtime_filter_producer_test.cpp‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ TEST_F(RuntimeFilterProducerTest, basic) {
3131
std::shared_ptr<RuntimeFilterProducer> producer;
3232
auto desc = TRuntimeFilterDescBuilder().build();
3333
FAIL_IF_ERROR_OR_CATCH_EXCEPTION(
34-
RuntimeFilterProducer::create(_query_ctx.get(), &desc, &producer));
34+
RuntimeFilterProducer::create(_query_options, &desc, &producer));
3535
}
3636

3737
TEST_F(RuntimeFilterProducerTest, no_sync_filter_size) {
@@ -42,7 +42,7 @@ TEST_F(RuntimeFilterProducerTest, no_sync_filter_size) {
4242
.set_is_broadcast_join(true)
4343
.build();
4444
FAIL_IF_ERROR_OR_CATCH_EXCEPTION(
45-
RuntimeFilterProducer::create(_query_ctx.get(), &desc, &producer));
45+
RuntimeFilterProducer::create(_query_options, &desc, &producer));
4646
ASSERT_EQ(producer->_need_sync_filter_size, false);
4747
ASSERT_EQ(producer->_rf_state, RuntimeFilterProducer::State::WAITING_FOR_DATA);
4848
}
@@ -53,7 +53,7 @@ TEST_F(RuntimeFilterProducerTest, no_sync_filter_size) {
5353
.set_is_broadcast_join(false)
5454
.build();
5555
FAIL_IF_ERROR_OR_CATCH_EXCEPTION(
56-
RuntimeFilterProducer::create(_query_ctx.get(), &desc, &producer));
56+
RuntimeFilterProducer::create(_query_options, &desc, &producer));
5757
ASSERT_EQ(producer->_need_sync_filter_size, false);
5858
ASSERT_EQ(producer->_rf_state, RuntimeFilterProducer::State::WAITING_FOR_DATA);
5959
}
@@ -66,7 +66,7 @@ TEST_F(RuntimeFilterProducerTest, sync_filter_size) {
6666
.set_is_broadcast_join(false)
6767
.build();
6868
FAIL_IF_ERROR_OR_CATCH_EXCEPTION(
69-
RuntimeFilterProducer::create(_query_ctx.get(), &desc, &producer));
69+
RuntimeFilterProducer::create(_query_options, &desc, &producer));
7070
ASSERT_EQ(producer->_need_sync_filter_size, true);
7171
ASSERT_EQ(producer->_rf_state, RuntimeFilterProducer::State::WAITING_FOR_SEND_SIZE);
7272

@@ -85,7 +85,7 @@ TEST_F(RuntimeFilterProducerTest, sync_filter_size_local_no_merge) {
8585
.set_is_broadcast_join(false)
8686
.build();
8787
FAIL_IF_ERROR_OR_CATCH_EXCEPTION(
88-
RuntimeFilterProducer::create(_query_ctx.get(), &desc, &producer));
88+
RuntimeFilterProducer::create(_query_options, &desc, &producer));
8989
ASSERT_EQ(producer->_need_sync_filter_size, true);
9090
ASSERT_EQ(producer->_rf_state, RuntimeFilterProducer::State::WAITING_FOR_SEND_SIZE);
9191

‎be/test/runtime_filter/runtime_filter_test_utils.h‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -38,6 +38,9 @@ class RuntimeFilterTest : public testing::Test {
3838
_query_ctx =
3939
QueryContext::create(TUniqueId(), ExecEnv::GetInstance(), _query_options,
4040
fe_address, true, fe_address, QuerySource::INTERNAL_FRONTEND);
41+
_query_handle =
42+
std::make_shared<QueryHandle>(_query_ctx->query_id(), _query_options, _query_ctx);
43+
_query_ctx->set_query_handle(_query_handle);
4144
_query_ctx->runtime_filter_mgr()->set_runtime_filter_params(
4245
TRuntimeFilterParamsBuilder().build());
4346

@@ -58,6 +61,7 @@ class RuntimeFilterTest : public testing::Test {
5861
protected:
5962
RuntimeProfile _profile = RuntimeProfile("");
6063
std::shared_ptr<QueryContext> _query_ctx;
64+
std::shared_ptr<QueryHandle> _query_handle;
6165
TQueryOptions _query_options;
6266
const std::string LOCALHOST = BackendOptions::get_localhost();
6367
const int DUMMY_PORT = config::brpc_port;

0 commit comments

Comments
 (0)