Skip to content

Commit bfabfe4

Browse files
committed
move directory
1 parent 9ca04ae commit bfabfe4

32 files changed

+71
-42
lines changed

be/CMakeLists.txt

+2
Original file line numberDiff line numberDiff line change
@@ -501,6 +501,7 @@ set(DORIS_LINK_LIBS
501501
IO
502502
Olap
503503
Runtime
504+
RuntimeFilter
504505
Service
505506
Udf
506507
Util
@@ -766,6 +767,7 @@ add_subdirectory(${SRC_DIR}/http)
766767
add_subdirectory(${SRC_DIR}/io)
767768
add_subdirectory(${SRC_DIR}/olap)
768769
add_subdirectory(${SRC_DIR}/runtime)
770+
add_subdirectory(${SRC_DIR}/runtime_filter)
769771
add_subdirectory(${SRC_DIR}/service) # this include doris_be
770772
add_subdirectory(${SRC_DIR}/udf)
771773
add_subdirectory(${SRC_DIR}/cloud)

be/src/exprs/bitmapfilter_predicate.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -19,10 +19,10 @@
1919

2020
#include <algorithm>
2121

22-
#include "exprs/runtime_filter/runtime_filter_definitions.h"
2322
#include "gutil/integral_types.h"
2423
#include "runtime/define_primitive_type.h"
2524
#include "runtime/primitive_type.h"
25+
#include "runtime_filter/runtime_filter_definitions.h"
2626
#include "util/bitmap_value.h"
2727

2828
namespace doris {

be/src/exprs/bloom_filter_func.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -20,8 +20,8 @@
2020
#include "common/exception.h"
2121
#include "common/status.h"
2222
#include "exprs/block_bloom_filter.hpp"
23-
#include "exprs/runtime_filter/runtime_filter_definitions.h"
2423
#include "olap/rowset/segment_v2/bloom_filter.h" // IWYU pragma: keep
24+
#include "runtime_filter/runtime_filter_definitions.h"
2525
#include "vec/columns/column_dictionary.h"
2626
#include "vec/columns/column_nullable.h"
2727
#include "vec/common/string_ref.h"

be/src/exprs/hybrid_set.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -18,8 +18,8 @@
1818
#pragma once
1919

2020
#include "common/object_pool.h"
21-
#include "exprs/runtime_filter/utils.h"
2221
#include "runtime/primitive_type.h"
22+
#include "runtime_filter/utils.h"
2323
#include "vec/columns/column_nullable.h"
2424
#include "vec/columns/column_string.h"
2525
#include "vec/columns/column_vector.h"

be/src/exprs/minmax_predicate.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -17,8 +17,8 @@
1717

1818
#pragma once
1919

20-
#include "exprs/runtime_filter/utils.h"
2120
#include "runtime/type_limit.h"
21+
#include "runtime_filter/utils.h"
2222
#include "vec/columns/column_nullable.h"
2323
#include "vec/columns/column_string.h"
2424

be/src/pipeline/common/runtime_filter_consumer_operator.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -17,8 +17,8 @@
1717

1818
#include "pipeline/common/runtime_filter_consumer_operator.h"
1919

20-
#include "exprs/runtime_filter/runtime_filter_consumer.h"
2120
#include "pipeline/pipeline_task.h"
21+
#include "runtime_filter/runtime_filter_consumer.h"
2222

2323
namespace doris::pipeline {
2424

be/src/pipeline/dependency.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -21,12 +21,12 @@
2121
#include <mutex>
2222

2323
#include "common/logging.h"
24-
#include "exprs/runtime_filter/runtime_filter_consumer.h"
2524
#include "pipeline/exec/multi_cast_data_streamer.h"
2625
#include "pipeline/pipeline_fragment_context.h"
2726
#include "pipeline/pipeline_task.h"
2827
#include "runtime/exec_env.h"
2928
#include "runtime/memory/mem_tracker.h"
29+
#include "runtime_filter/runtime_filter_consumer.h"
3030
#include "vec/exprs/vectorized_agg_fn.h"
3131
#include "vec/exprs/vslot_ref.h"
3232
#include "vec/spill/spill_stream_manager.h"

be/src/pipeline/exec/datagen_operator.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -19,10 +19,10 @@
1919

2020
#include <memory>
2121

22-
#include "exprs/runtime_filter/runtime_filter_consumer.h"
2322
#include "pipeline/common/data_gen_functions/vdata_gen_function_inf.h"
2423
#include "pipeline/common/data_gen_functions/vnumbers_tvf.h"
2524
#include "pipeline/exec/operator.h"
25+
#include "runtime_filter/runtime_filter_consumer.h"
2626
#include "util/runtime_profile.h"
2727

2828
namespace doris {

be/src/pipeline/exec/hashjoin_build_sink.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -17,9 +17,9 @@
1717

1818
#pragma once
1919

20-
#include "exprs/runtime_filter/runtime_filter_slots.h"
2120
#include "join_build_sink_operator.h"
2221
#include "operator.h"
22+
#include "runtime_filter/runtime_filter_slots.h"
2323

2424
namespace doris::pipeline {
2525
#include "common/compile_check_begin.h"

be/src/pipeline/exec/nested_loop_join_build_operator.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -19,8 +19,8 @@
1919

2020
#include <memory>
2121

22-
#include "exprs/runtime_filter/runtime_filter_slots_cross.h"
2322
#include "pipeline/exec/operator.h"
23+
#include "runtime_filter/runtime_filter_slots_cross.h"
2424

2525
namespace doris::pipeline {
2626
#include "common/compile_check_begin.h"

be/src/pipeline/exec/nested_loop_join_build_operator.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -19,9 +19,9 @@
1919

2020
#include <stdint.h>
2121

22-
#include "exprs/runtime_filter/runtime_filter_slots_cross.h"
2322
#include "operator.h"
2423
#include "pipeline/exec/join_build_sink_operator.h"
24+
#include "runtime_filter/runtime_filter_slots_cross.h"
2525

2626
namespace doris::pipeline {
2727
#include "common/compile_check_begin.h"

be/src/runtime/fragment_mgr.cpp

+2-2
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,6 @@
1919

2020
#include <brpc/controller.h>
2121
#include <bvar/latency_recorder.h>
22-
#include <exprs/runtime_filter/runtime_filter_consumer.h>
2322
#include <fmt/format.h>
2423
#include <gen_cpp/DorisExternalService_types.h>
2524
#include <gen_cpp/FrontendService.h>
@@ -45,7 +44,6 @@
4544
#include <cstddef>
4645
#include <ctime>
4746

48-
#include "common/status.h"
4947
// IWYU pragma: no_include <bits/chrono.h>
5048
#include <chrono> // IWYU pragma: keep
5149
#include <cstdint>
@@ -60,6 +58,7 @@
6058
#include "common/config.h"
6159
#include "common/logging.h"
6260
#include "common/object_pool.h"
61+
#include "common/status.h"
6362
#include "common/utils.h"
6463
#include "io/fs/stream_load_pipe.h"
6564
#include "pipeline/pipeline_fragment_context.h"
@@ -80,6 +79,7 @@
8079
#include "runtime/workload_group/workload_group.h"
8180
#include "runtime/workload_group/workload_group_manager.h"
8281
#include "runtime/workload_management/workload_query_info.h"
82+
#include "runtime_filter/runtime_filter_consumer.h"
8383
#include "service/backend_options.h"
8484
#include "util/brpc_client_cache.h"
8585
#include "util/debug_points.h"

be/src/runtime/runtime_filter_mgr.cpp

+4-4
Original file line numberDiff line numberDiff line change
@@ -32,15 +32,15 @@
3232
#include "common/config.h"
3333
#include "common/logging.h"
3434
#include "common/status.h"
35-
#include "exprs/runtime_filter/runtime_filter.h"
36-
#include "exprs/runtime_filter/runtime_filter_consumer.h"
37-
#include "exprs/runtime_filter/runtime_filter_merger.h"
38-
#include "exprs/runtime_filter/runtime_filter_producer.h"
3935
#include "runtime/exec_env.h"
4036
#include "runtime/memory/mem_tracker.h"
4137
#include "runtime/query_context.h"
4238
#include "runtime/runtime_state.h"
4339
#include "runtime/thread_context.h"
40+
#include "runtime_filter/runtime_filter.h"
41+
#include "runtime_filter/runtime_filter_consumer.h"
42+
#include "runtime_filter/runtime_filter_merger.h"
43+
#include "runtime_filter/runtime_filter_producer.h"
4444
#include "util/brpc_client_cache.h"
4545
#include "util/ref_count_closure.h"
4646

be/src/runtime_filter/CMakeLists.txt

+27
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,27 @@
1+
# Licensed to the Apache Software Foundation (ASF) under one
2+
# or more contributor license agreements. See the NOTICE file
3+
# distributed with this work for additional information
4+
# regarding copyright ownership. The ASF licenses this file
5+
# to you under the Apache License, Version 2.0 (the
6+
# "License"); you may not use this file except in compliance
7+
# with the License. You may obtain a copy of the License at
8+
#
9+
# http://www.apache.org/licenses/LICENSE-2.0
10+
#
11+
# Unless required by applicable law or agreed to in writing,
12+
# software distributed under the License is distributed on an
13+
# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
14+
# KIND, either express or implied. See the License for the
15+
# specific language governing permissions and limitations
16+
# under the License.
17+
18+
# where to put generated libraries
19+
set(LIBRARY_OUTPUT_PATH "${BUILD_DIR}/src/runtime_filter")
20+
21+
# where to put generated binaries
22+
set(EXECUTABLE_OUTPUT_PATH "${BUILD_DIR}/src/runtime_filter")
23+
24+
file(GLOB_RECURSE SRC_FILES CONFIGURE_DEPENDS *.cpp *.cc)
25+
add_library(RuntimeFilter STATIC ${SRC_FILES})
26+
27+
pch_reuse(RuntimeFilter)

be/src/exprs/runtime_filter/runtime_filter.cpp be/src/runtime_filter/runtime_filter.cpp

+4-4
Original file line numberDiff line numberDiff line change
@@ -15,16 +15,16 @@
1515
// specific language governing permissions and limitations
1616
// under the License.
1717

18-
#include "exprs/runtime_filter/runtime_filter.h"
18+
#include "runtime_filter/runtime_filter.h"
1919

2020
#include "common/status.h"
2121
#include "exprs/bitmapfilter_predicate.h"
2222
#include "exprs/create_predicate_function.h"
2323
#include "exprs/hybrid_set.h"
2424
#include "exprs/minmax_predicate.h"
25-
#include "exprs/runtime_filter/runtime_filter_consumer.h"
26-
#include "exprs/runtime_filter/runtime_filter_merger.h"
27-
#include "exprs/runtime_filter/runtime_filter_producer.h"
25+
#include "runtime_filter/runtime_filter_consumer.h"
26+
#include "runtime_filter/runtime_filter_merger.h"
27+
#include "runtime_filter/runtime_filter_producer.h"
2828
#include "util/brpc_client_cache.h"
2929
#include "util/ref_count_closure.h"
3030
#include "vec/exprs/vbitmap_predicate.h"

be/src/exprs/runtime_filter/runtime_filter.h be/src/runtime_filter/runtime_filter.h

+3-3
Original file line numberDiff line numberDiff line change
@@ -20,11 +20,11 @@
2020
#include <gen_cpp/PaloInternalService_types.h>
2121

2222
#include "common/status.h"
23-
#include "exprs/runtime_filter/runtime_filter_definitions.h"
24-
#include "exprs/runtime_filter/runtime_filter_wrapper.h"
25-
#include "exprs/runtime_filter/utils.h"
2623
#include "pipeline/dependency.h"
2724
#include "runtime/query_context.h"
25+
#include "runtime_filter/runtime_filter_definitions.h"
26+
#include "runtime_filter/runtime_filter_wrapper.h"
27+
#include "runtime_filter/utils.h"
2828

2929
namespace doris {
3030
class RuntimePredicateWrapper;

be/src/exprs/runtime_filter/runtime_filter_consumer.cpp be/src/runtime_filter/runtime_filter_consumer.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
// specific language governing permissions and limitations
1616
// under the License.
1717

18-
#include "exprs/runtime_filter/runtime_filter_consumer.h"
18+
#include "runtime_filter/runtime_filter_consumer.h"
1919

2020
#include "exprs/bitmapfilter_predicate.h"
2121

be/src/exprs/runtime_filter/runtime_filter_consumer.h be/src/runtime_filter/runtime_filter_consumer.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717

1818
#pragma once
1919

20-
#include "exprs/runtime_filter/runtime_filter.h"
20+
#include "runtime_filter/runtime_filter.h"
2121

2222
namespace doris {
2323

be/src/exprs/runtime_filter/runtime_filter_merger.h be/src/runtime_filter/runtime_filter_merger.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717

1818
#pragma once
1919

20-
#include "exprs/runtime_filter/runtime_filter.h"
20+
#include "runtime_filter/runtime_filter.h"
2121

2222
namespace doris {
2323

be/src/exprs/runtime_filter/runtime_filter_producer.cpp be/src/runtime_filter/runtime_filter_producer.cpp

+3-3
Original file line numberDiff line numberDiff line change
@@ -15,10 +15,10 @@
1515
// specific language governing permissions and limitations
1616
// under the License.
1717

18-
#include "exprs/runtime_filter/runtime_filter_producer.h"
18+
#include "runtime_filter/runtime_filter_producer.h"
1919

20-
#include "exprs/runtime_filter/runtime_filter_consumer.h"
21-
#include "exprs/runtime_filter/runtime_filter_merger.h"
20+
#include "runtime_filter/runtime_filter_consumer.h"
21+
#include "runtime_filter/runtime_filter_merger.h"
2222
#include "util/brpc_client_cache.h"
2323
#include "util/ref_count_closure.h"
2424

be/src/exprs/runtime_filter/runtime_filter_producer.h be/src/runtime_filter/runtime_filter_producer.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717

1818
#pragma once
1919

20-
#include "exprs/runtime_filter/runtime_filter.h"
20+
#include "runtime_filter/runtime_filter.h"
2121

2222
namespace doris {
2323

be/src/exprs/runtime_filter/runtime_filter_slots.cpp be/src/runtime_filter/runtime_filter_slots.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
// specific language governing permissions and limitations
1616
// under the License.
1717

18-
#include "exprs/runtime_filter/runtime_filter_slots.h"
18+
#include "runtime_filter/runtime_filter_slots.h"
1919

2020
#include "pipeline/pipeline_task.h"
2121

be/src/exprs/runtime_filter/runtime_filter_slots.h be/src/runtime_filter/runtime_filter_slots.h

+2-2
Original file line numberDiff line numberDiff line change
@@ -18,10 +18,10 @@
1818
#pragma once
1919

2020
#include "common/status.h"
21-
#include "exprs/runtime_filter/runtime_filter.h"
22-
#include "exprs/runtime_filter/runtime_filter_producer.h"
2321
#include "runtime/runtime_filter_mgr.h"
2422
#include "runtime/runtime_state.h"
23+
#include "runtime_filter/runtime_filter.h"
24+
#include "runtime_filter/runtime_filter_producer.h"
2525
#include "vec/core/block.h" // IWYU pragma: keep
2626
#include "vec/exprs/vexpr_context.h"
2727
#include "vec/runtime/shared_hash_table_controller.h"

be/src/exprs/runtime_filter/runtime_filter_slots_cross.h be/src/runtime_filter/runtime_filter_slots_cross.h

+2-2
Original file line numberDiff line numberDiff line change
@@ -20,10 +20,10 @@
2020
#include <vector>
2121

2222
#include "common/status.h"
23-
#include "exprs/runtime_filter/runtime_filter.h"
24-
#include "exprs/runtime_filter/runtime_filter_slots.h"
2523
#include "runtime/runtime_filter_mgr.h"
2624
#include "runtime/runtime_state.h"
25+
#include "runtime_filter/runtime_filter.h"
26+
#include "runtime_filter/runtime_filter_slots.h"
2727
#include "vec/core/block.h"
2828
#include "vec/exprs/vexpr.h"
2929
#include "vec/exprs/vexpr_context.h"

be/src/exprs/runtime_filter/runtime_filter_wrapper.cpp be/src/runtime_filter/runtime_filter_wrapper.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
// specific language governing permissions and limitations
1616
// under the License.
1717

18-
#include "exprs/runtime_filter/runtime_filter_wrapper.h"
18+
#include "runtime_filter/runtime_filter_wrapper.h"
1919

2020
#include <gen_cpp/Opcodes_types.h>
2121
#include <gen_cpp/PaloInternalService_types.h>

be/src/exprs/runtime_filter/runtime_filter_wrapper.h be/src/runtime_filter/runtime_filter_wrapper.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -19,8 +19,8 @@
1919

2020
#include "common/status.h"
2121
#include "exprs/bloom_filter_func.h"
22-
#include "exprs/runtime_filter/runtime_filter_definitions.h"
2322
#include "runtime/runtime_state.h"
23+
#include "runtime_filter/runtime_filter_definitions.h"
2424
#include "vec/exprs/vexpr_fwd.h"
2525
#include "vec/exprs/vruntimefilter_wrapper.h"
2626

be/src/exprs/runtime_filter/utils.cpp be/src/runtime_filter/utils.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
// specific language governing permissions and limitations
1616
// under the License.
1717

18-
#include "exprs/runtime_filter/utils.h"
18+
#include "runtime_filter/utils.h"
1919

2020
#include "vec/exprs/vexpr.h"
2121
#include "vec/exprs/vliteral.h"

be/src/exprs/runtime_filter/utils.h be/src/runtime_filter/utils.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -21,9 +21,9 @@
2121
#include <gen_cpp/PlanNodes_types.h>
2222
#include <gen_cpp/internal_service.pb.h>
2323

24-
#include "exprs/runtime_filter/runtime_filter_definitions.h"
2524
#include "runtime/large_int_value.h"
2625
#include "runtime/types.h"
26+
#include "runtime_filter/runtime_filter_definitions.h"
2727
#include "vec/core/types.h"
2828
#include "vec/core/wide_integer.h"
2929
#include "vec/exprs/vexpr_fwd.h"

be/src/vec/runtime/shared_hash_table_controller.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@
2626
#include <vector>
2727

2828
#include "common/status.h"
29-
#include "exprs/runtime_filter/runtime_filter_definitions.h"
29+
#include "runtime_filter/runtime_filter_definitions.h"
3030
#include "vec/core/block.h"
3131

3232
namespace doris {

be/test/exprs/runtime_filter_test.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
// specific language governing permissions and limitations
1616
// under the License.
1717

18-
#include "exprs/runtime_filter/runtime_filter.h"
18+
#include "runtime_filter/runtime_filter.h"
1919

2020
#include <array>
2121
#include <memory>

0 commit comments

Comments
 (0)