diff --git a/be/src/pipeline/exec/file_scan_operator.cpp b/be/src/pipeline/exec/file_scan_operator.cpp index e83a7c3ef9486e..b2cf9feebf9e84 100644 --- a/be/src/pipeline/exec/file_scan_operator.cpp +++ b/be/src/pipeline/exec/file_scan_operator.cpp @@ -52,7 +52,7 @@ Status FileScanLocalState::_init_scanners(std::list* sc for (int i = 0; i < _max_scanners; ++i) { std::unique_ptr scanner = vectorized::FileScanner::create_unique( state(), this, p._limit, _split_source, _scanner_profile.get(), _kv_cache.get(), - &_colname_to_value_range, &p._colname_to_slot_id); + &p._colname_to_slot_id); RETURN_IF_ERROR(scanner->init(state(), _conjuncts)); scanners->push_back(std::move(scanner)); } diff --git a/be/src/vec/exec/format/avro/avro_jni_reader.cpp b/be/src/vec/exec/format/avro/avro_jni_reader.cpp index 195b6cfc56d491..6c8d28bd6bc896 100644 --- a/be/src/vec/exec/format/avro/avro_jni_reader.cpp +++ b/be/src/vec/exec/format/avro/avro_jni_reader.cpp @@ -59,9 +59,7 @@ Status AvroJNIReader::get_columns(std::unordered_map* return Status::OK(); } -Status AvroJNIReader::init_reader( - const std::unordered_map* colname_to_value_range) { - _colname_to_value_range = colname_to_value_range; +Status AvroJNIReader::init_reader() { std::ostringstream required_fields; std::ostringstream columns_types; std::vector column_names; @@ -97,7 +95,7 @@ Status AvroJNIReader::init_reader( required_param.insert(std::make_pair("uri", _range.path)); _jni_connector = std::make_unique("org/apache/doris/avro/AvroJNIScanner", required_param, column_names); - RETURN_IF_ERROR(_jni_connector->init(_colname_to_value_range)); + RETURN_IF_ERROR(_jni_connector->init()); return _jni_connector->open(_state, _profile); } diff --git a/be/src/vec/exec/format/avro/avro_jni_reader.h b/be/src/vec/exec/format/avro/avro_jni_reader.h index 96bcd9cc7b8cdc..f94e41f6d8e546 100644 --- a/be/src/vec/exec/format/avro/avro_jni_reader.h +++ b/be/src/vec/exec/format/avro/avro_jni_reader.h @@ -66,8 +66,7 @@ class AvroJNIReader : public JniReader { Status get_columns(std::unordered_map* name_to_type, std::unordered_set* missing_cols) override; - Status init_reader( - const std::unordered_map* colname_to_value_range); + Status init_reader(); TFileType::type get_file_type() const; @@ -81,7 +80,6 @@ class AvroJNIReader : public JniReader { private: const TFileScanRangeParams _params; const TFileRangeDesc _range; - const std::unordered_map* _colname_to_value_range = nullptr; }; #include "common/compile_check_end.h" diff --git a/be/src/vec/exec/format/jni_reader.cpp b/be/src/vec/exec/format/jni_reader.cpp index 800f5fb389cebe..da1862ec48f335 100644 --- a/be/src/vec/exec/format/jni_reader.cpp +++ b/be/src/vec/exec/format/jni_reader.cpp @@ -63,10 +63,8 @@ MockJniReader::MockJniReader(const std::vector& file_slot_descs params, column_names); } -Status MockJniReader::init_reader( - const std::unordered_map* colname_to_value_range) { - _colname_to_value_range = colname_to_value_range; - RETURN_IF_ERROR(_jni_connector->init(colname_to_value_range)); +Status MockJniReader::init_reader() { + RETURN_IF_ERROR(_jni_connector->init()); return _jni_connector->open(_state, _profile); } #include "common/compile_check_end.h" diff --git a/be/src/vec/exec/format/jni_reader.h b/be/src/vec/exec/format/jni_reader.h index 1689fc28aed1d1..f51e68f1f4ef74 100644 --- a/be/src/vec/exec/format/jni_reader.h +++ b/be/src/vec/exec/format/jni_reader.h @@ -94,8 +94,7 @@ class MockJniReader : public JniReader { ~MockJniReader() override = default; - Status init_reader( - const std::unordered_map* colname_to_value_range); + Status init_reader(); Status close() override { if (_jni_connector) { @@ -110,9 +109,6 @@ class MockJniReader : public JniReader { _jni_connector->collect_profile_before_close(); } } - -private: - const std::unordered_map* _colname_to_value_range; }; #include "common/compile_check_end.h" diff --git a/be/src/vec/exec/format/table/hudi_jni_reader.cpp b/be/src/vec/exec/format/table/hudi_jni_reader.cpp index a211e6603921fa..f0f9b540d7dc43 100644 --- a/be/src/vec/exec/format/table/hudi_jni_reader.cpp +++ b/be/src/vec/exec/format/table/hudi_jni_reader.cpp @@ -76,10 +76,8 @@ HudiJniReader::HudiJniReader(const TFileScanRangeParams& scan_params, params, required_fields); } -Status HudiJniReader::init_reader( - const std::unordered_map* colname_to_value_range) { - _colname_to_value_range = colname_to_value_range; - RETURN_IF_ERROR(_jni_connector->init(colname_to_value_range)); +Status HudiJniReader::init_reader() { + RETURN_IF_ERROR(_jni_connector->init()); return _jni_connector->open(_state, _profile); } #include "common/compile_check_end.h" diff --git a/be/src/vec/exec/format/table/hudi_jni_reader.h b/be/src/vec/exec/format/table/hudi_jni_reader.h index c6b63659722c05..8bc7eb9d09cb73 100644 --- a/be/src/vec/exec/format/table/hudi_jni_reader.h +++ b/be/src/vec/exec/format/table/hudi_jni_reader.h @@ -51,13 +51,11 @@ class HudiJniReader : public JniReader { ~HudiJniReader() override = default; - Status init_reader( - const std::unordered_map* colname_to_value_range); + Status init_reader(); private: const TFileScanRangeParams& _scan_params; const THudiFileDesc& _hudi_params; - const std::unordered_map* _colname_to_value_range; }; #include "common/compile_check_end.h" diff --git a/be/src/vec/exec/format/table/iceberg_sys_table_jni_reader.cpp b/be/src/vec/exec/format/table/iceberg_sys_table_jni_reader.cpp index ffcae20df9dce2..d3c7ce82e4f822 100644 --- a/be/src/vec/exec/format/table/iceberg_sys_table_jni_reader.cpp +++ b/be/src/vec/exec/format/table/iceberg_sys_table_jni_reader.cpp @@ -30,8 +30,7 @@ IcebergSysTableJniReader::IcebergSysTableJniReader( RuntimeProfile* profile, const TMetaScanRange& meta_scan_range) : JniReader(file_slot_descs, state, profile), _meta_scan_range(meta_scan_range) {} -Status IcebergSysTableJniReader::init_reader( - const std::unordered_map* colname_to_value_range) { +Status IcebergSysTableJniReader::init_reader() { std::vector required_fields; std::vector required_types; for (const auto& desc : _file_slot_descs) { @@ -53,7 +52,7 @@ Status IcebergSysTableJniReader::init_reader( if (_jni_connector == nullptr) { return Status::InternalError("JniConnector failed to initialize"); } - RETURN_IF_ERROR(_jni_connector->init(colname_to_value_range)); + RETURN_IF_ERROR(_jni_connector->init()); return _jni_connector->open(_state, _profile); } diff --git a/be/src/vec/exec/format/table/iceberg_sys_table_jni_reader.h b/be/src/vec/exec/format/table/iceberg_sys_table_jni_reader.h index 982f4357343f58..ec78d9211f08f9 100644 --- a/be/src/vec/exec/format/table/iceberg_sys_table_jni_reader.h +++ b/be/src/vec/exec/format/table/iceberg_sys_table_jni_reader.h @@ -51,8 +51,7 @@ class IcebergSysTableJniReader : public JniReader { ~IcebergSysTableJniReader() override = default; - Status init_reader( - const std::unordered_map* colname_to_value_range); + Status init_reader(); private: const TMetaScanRange& _meta_scan_range; diff --git a/be/src/vec/exec/format/table/lakesoul_jni_reader.cpp b/be/src/vec/exec/format/table/lakesoul_jni_reader.cpp index 2fe821c49ead90..a3af8c5833de05 100644 --- a/be/src/vec/exec/format/table/lakesoul_jni_reader.cpp +++ b/be/src/vec/exec/format/table/lakesoul_jni_reader.cpp @@ -60,9 +60,8 @@ LakeSoulJniReader::LakeSoulJniReader(const TLakeSoulFileDesc& lakesoul_params, params, required_fields); } -Status LakeSoulJniReader::init_reader( - const std::unordered_map* colname_to_value_range) { - RETURN_IF_ERROR(_jni_connector->init(colname_to_value_range)); +Status LakeSoulJniReader::init_reader() { + RETURN_IF_ERROR(_jni_connector->init()); return _jni_connector->open(_state, _profile); } #include "common/compile_check_end.h" diff --git a/be/src/vec/exec/format/table/lakesoul_jni_reader.h b/be/src/vec/exec/format/table/lakesoul_jni_reader.h index 6a659cddc9e0d2..a0c1004208e8ea 100644 --- a/be/src/vec/exec/format/table/lakesoul_jni_reader.h +++ b/be/src/vec/exec/format/table/lakesoul_jni_reader.h @@ -51,8 +51,7 @@ class LakeSoulJniReader : public JniReader { ~LakeSoulJniReader() override = default; - Status init_reader( - const std::unordered_map* colname_to_value_range); + Status init_reader(); private: const TLakeSoulFileDesc& _lakesoul_params; diff --git a/be/src/vec/exec/format/table/max_compute_jni_reader.cpp b/be/src/vec/exec/format/table/max_compute_jni_reader.cpp index e98a7acd3796b8..81999f896173a9 100644 --- a/be/src/vec/exec/format/table/max_compute_jni_reader.cpp +++ b/be/src/vec/exec/format/table/max_compute_jni_reader.cpp @@ -85,10 +85,8 @@ MaxComputeJniReader::MaxComputeJniReader(const MaxComputeTableDescriptor* mc_des "org/apache/doris/maxcompute/MaxComputeJniScanner", params, column_names); } -Status MaxComputeJniReader::init_reader( - const std::unordered_map* colname_to_value_range) { - _colname_to_value_range = colname_to_value_range; - RETURN_IF_ERROR(_jni_connector->init(colname_to_value_range)); +Status MaxComputeJniReader::init_reader() { + RETURN_IF_ERROR(_jni_connector->init()); return _jni_connector->open(_state, _profile); } #include "common/compile_check_end.h" diff --git a/be/src/vec/exec/format/table/max_compute_jni_reader.h b/be/src/vec/exec/format/table/max_compute_jni_reader.h index 4af75a5ab71077..bc83d7d372462c 100644 --- a/be/src/vec/exec/format/table/max_compute_jni_reader.h +++ b/be/src/vec/exec/format/table/max_compute_jni_reader.h @@ -56,14 +56,12 @@ class MaxComputeJniReader : public JniReader { ~MaxComputeJniReader() override = default; - Status init_reader( - const std::unordered_map* colname_to_value_range); + Status init_reader(); private: const MaxComputeTableDescriptor* _table_desc = nullptr; const TMaxComputeFileDesc& _max_compute_params; const TFileRangeDesc& _range; - const std::unordered_map* _colname_to_value_range = nullptr; }; #include "common/compile_check_end.h" diff --git a/be/src/vec/exec/format/table/paimon_jni_reader.cpp b/be/src/vec/exec/format/table/paimon_jni_reader.cpp index 942f6a83971715..2ab76fd87094bc 100644 --- a/be/src/vec/exec/format/table/paimon_jni_reader.cpp +++ b/be/src/vec/exec/format/table/paimon_jni_reader.cpp @@ -109,10 +109,8 @@ Status PaimonJniReader::get_next_block(Block* block, size_t* read_rows, bool* eo return _jni_connector->get_next_block(block, read_rows, eof); } -Status PaimonJniReader::init_reader( - const std::unordered_map* colname_to_value_range) { - _colname_to_value_range = colname_to_value_range; - RETURN_IF_ERROR(_jni_connector->init(colname_to_value_range)); +Status PaimonJniReader::init_reader() { + RETURN_IF_ERROR(_jni_connector->init()); return _jni_connector->open(_state, _profile); } #include "common/compile_check_end.h" diff --git a/be/src/vec/exec/format/table/paimon_jni_reader.h b/be/src/vec/exec/format/table/paimon_jni_reader.h index 37b320f28cd720..81b5bd68d29a4d 100644 --- a/be/src/vec/exec/format/table/paimon_jni_reader.h +++ b/be/src/vec/exec/format/table/paimon_jni_reader.h @@ -58,11 +58,9 @@ class PaimonJniReader : public JniReader { Status get_next_block(Block* block, size_t* read_rows, bool* eof) override; - Status init_reader( - const std::unordered_map* colname_to_value_range); + Status init_reader(); private: - const std::unordered_map* _colname_to_value_range; int64_t _remaining_table_level_row_count; }; diff --git a/be/src/vec/exec/format/table/paimon_sys_table_jni_reader.cpp b/be/src/vec/exec/format/table/paimon_sys_table_jni_reader.cpp index 6e9c7f50c7e1c3..ae1088a9a5f799 100644 --- a/be/src/vec/exec/format/table/paimon_sys_table_jni_reader.cpp +++ b/be/src/vec/exec/format/table/paimon_sys_table_jni_reader.cpp @@ -51,10 +51,8 @@ PaimonSysTableJniReader::PaimonSysTableJniReader( "org/apache/doris/paimon/PaimonSysTableJniScanner", std::move(params), required_fields); } -Status PaimonSysTableJniReader::init_reader( - const std::unordered_map* colname_to_value_range) { - _colname_to_value_range = colname_to_value_range; - RETURN_IF_ERROR(_jni_connector->init(colname_to_value_range)); +Status PaimonSysTableJniReader::init_reader() { + RETURN_IF_ERROR(_jni_connector->init()); return _jni_connector->open(_state, _profile); } diff --git a/be/src/vec/exec/format/table/paimon_sys_table_jni_reader.h b/be/src/vec/exec/format/table/paimon_sys_table_jni_reader.h index a6f43899e2db96..c398c89e65155e 100644 --- a/be/src/vec/exec/format/table/paimon_sys_table_jni_reader.h +++ b/be/src/vec/exec/format/table/paimon_sys_table_jni_reader.h @@ -52,11 +52,9 @@ class PaimonSysTableJniReader : public JniReader { ~PaimonSysTableJniReader() override = default; - Status init_reader( - const std::unordered_map* colname_to_value_range); + Status init_reader(); private: - const std::unordered_map* _colname_to_value_range; const TMetaScanRange& _meta_scan_range; }; diff --git a/be/src/vec/exec/format/table/trino_connector_jni_reader.cpp b/be/src/vec/exec/format/table/trino_connector_jni_reader.cpp index c8cc08531121cc..b2b21fda33f352 100644 --- a/be/src/vec/exec/format/table/trino_connector_jni_reader.cpp +++ b/be/src/vec/exec/format/table/trino_connector_jni_reader.cpp @@ -76,9 +76,8 @@ TrinoConnectorJniReader::TrinoConnectorJniReader( "org/apache/doris/trinoconnector/TrinoConnectorJniScanner", params, column_names); } -Status TrinoConnectorJniReader::init_reader( - const std::unordered_map* colname_to_value_range) { - RETURN_IF_ERROR(_jni_connector->init(colname_to_value_range)); +Status TrinoConnectorJniReader::init_reader() { + RETURN_IF_ERROR(_jni_connector->init()); RETURN_IF_ERROR(_set_spi_plugins_dir()); return _jni_connector->open(_state, _profile); } diff --git a/be/src/vec/exec/format/table/trino_connector_jni_reader.h b/be/src/vec/exec/format/table/trino_connector_jni_reader.h index 4c6b1d2e57a67a..63610a38bba0a5 100644 --- a/be/src/vec/exec/format/table/trino_connector_jni_reader.h +++ b/be/src/vec/exec/format/table/trino_connector_jni_reader.h @@ -49,8 +49,7 @@ class TrinoConnectorJniReader : public JniReader { ~TrinoConnectorJniReader() override = default; - Status init_reader( - const std::unordered_map* colname_to_value_range); + Status init_reader(); private: Status _set_spi_plugins_dir(); diff --git a/be/src/vec/exec/jni_connector.cpp b/be/src/vec/exec/jni_connector.cpp index b03081dfb10b67..93c3b7a1c37cc2 100644 --- a/be/src/vec/exec/jni_connector.cpp +++ b/be/src/vec/exec/jni_connector.cpp @@ -101,18 +101,7 @@ Status JniConnector::open(RuntimeState* state, RuntimeProfile* profile) { return Status::OK(); } -Status JniConnector::init( - const std::unordered_map* colname_to_value_range) { - // TODO: This logic need to be changed. - // See the comment of "predicates" field in JniScanner.java - - // _generate_predicates(colname_to_value_range); - // if (_predicates_length != 0 && _predicates != nullptr) { - // int64_t predicates_address = (int64_t)_predicates.get(); - // // We can call org.apache.doris.common.jni.vec.ScanPredicate#parseScanPredicates to parse the - // // serialized predicates in java side. - // _scanner_params.emplace("push_down_predicates", std::to_string(predicates_address)); - // } +Status JniConnector::init() { return Status::OK(); } @@ -501,18 +490,6 @@ Status JniConnector::_fill_struct_column(TableMetaAddress& address, MutableColum return Status::OK(); } -void JniConnector::_generate_predicates( - const std::unordered_map* colname_to_value_range) { - if (colname_to_value_range == nullptr) { - return; - } - for (auto& kv : *colname_to_value_range) { - const std::string& column_name = kv.first; - const ColumnValueRangeType& col_val_range = kv.second; - std::visit([&](auto&& range) { _parse_value_range(range, column_name); }, col_val_range); - } -} - std::string JniConnector::get_jni_type(const DataTypePtr& data_type) { DataTypePtr type = remove_nullable(data_type); std::ostringstream buffer; diff --git a/be/src/vec/exec/jni_connector.h b/be/src/vec/exec/jni_connector.h index f55a7f243fe88a..25f5eacd9e5008 100644 --- a/be/src/vec/exec/jni_connector.h +++ b/be/src/vec/exec/jni_connector.h @@ -224,8 +224,7 @@ class JniConnector : public ProfileCollector { * number_filters(4) | length(4) | column_name | op(4) | scale(4) | num_values(4) | value_length(4) | value | ... * Then, pass the byte array address in configuration map, like "push_down_predicates=${address}" */ - Status init( - const std::unordered_map* colname_to_value_range); + Status init(); /** * Call java side function JniScanner.getNextBatchMeta. The columns information are stored as long array: @@ -364,9 +363,6 @@ class JniConnector : public ProfileCollector { return (long)assert_cast(doris_column).get_data().data(); } - void _generate_predicates( - const std::unordered_map* colname_to_value_range); - template void _parse_value_range(const ColumnValueRange& col_val_range, const std::string& column_name) { diff --git a/be/src/vec/exec/scan/file_scanner.cpp b/be/src/vec/exec/scan/file_scanner.cpp index 27f03a5e9e5244..2a1331c8200f40 100644 --- a/be/src/vec/exec/scan/file_scanner.cpp +++ b/be/src/vec/exec/scan/file_scanner.cpp @@ -101,17 +101,15 @@ using namespace ErrorCode; const std::string FileScanner::FileReadBytesProfile = "FileReadBytes"; const std::string FileScanner::FileReadTimeProfile = "FileReadTime"; -FileScanner::FileScanner( - RuntimeState* state, pipeline::FileScanLocalState* local_state, int64_t limit, - std::shared_ptr split_source, RuntimeProfile* profile, - ShardedKVCache* kv_cache, - const std::unordered_map* colname_to_value_range, - const std::unordered_map* colname_to_slot_id) +FileScanner::FileScanner(RuntimeState* state, pipeline::FileScanLocalState* local_state, + int64_t limit, + std::shared_ptr split_source, + RuntimeProfile* profile, ShardedKVCache* kv_cache, + const std::unordered_map* colname_to_slot_id) : Scanner(state, local_state, limit, profile), _split_source(split_source), _cur_reader(nullptr), _cur_reader_eof(false), - _colname_to_value_range(colname_to_value_range), _kv_cache(kv_cache), _strict_mode(false), _col_name_to_slot_id(colname_to_slot_id) { @@ -1015,34 +1013,30 @@ Status FileScanner::_get_next_reader() { std::unique_ptr mc_reader = MaxComputeJniReader::create_unique( mc_desc, range.table_format_params.max_compute_params, _file_slot_descs, range, _state, _profile); - init_status = mc_reader->init_reader(_colname_to_value_range); + init_status = mc_reader->init_reader(); _cur_reader = std::move(mc_reader); } else if (range.__isset.table_format_params && range.table_format_params.table_format_type == "paimon") { _cur_reader = PaimonJniReader::create_unique(_file_slot_descs, _state, _profile, range, _params); - init_status = ((PaimonJniReader*)(_cur_reader.get())) - ->init_reader(_colname_to_value_range); + init_status = ((PaimonJniReader*)(_cur_reader.get()))->init_reader(); } else if (range.__isset.table_format_params && range.table_format_params.table_format_type == "hudi") { _cur_reader = HudiJniReader::create_unique(*_params, range.table_format_params.hudi_params, _file_slot_descs, _state, _profile); - init_status = - ((HudiJniReader*)_cur_reader.get())->init_reader(_colname_to_value_range); + init_status = ((HudiJniReader*)_cur_reader.get())->init_reader(); } else if (range.__isset.table_format_params && range.table_format_params.table_format_type == "lakesoul") { _cur_reader = LakeSoulJniReader::create_unique(range.table_format_params.lakesoul_params, _file_slot_descs, _state, _profile); - init_status = ((LakeSoulJniReader*)_cur_reader.get()) - ->init_reader(_colname_to_value_range); + init_status = ((LakeSoulJniReader*)_cur_reader.get())->init_reader(); } else if (range.__isset.table_format_params && range.table_format_params.table_format_type == "trino_connector") { _cur_reader = TrinoConnectorJniReader::create_unique(_file_slot_descs, _state, _profile, range); - init_status = ((TrinoConnectorJniReader*)(_cur_reader.get())) - ->init_reader(_colname_to_value_range); + init_status = ((TrinoConnectorJniReader*)(_cur_reader.get()))->init_reader(); } break; } @@ -1127,8 +1121,7 @@ Status FileScanner::_get_next_reader() { case TFileFormatType::FORMAT_AVRO: { _cur_reader = AvroJNIReader::create_unique(_state, _profile, *_params, _file_slot_descs, range); - init_status = - ((AvroJNIReader*)(_cur_reader.get()))->init_reader(_colname_to_value_range); + init_status = ((AvroJNIReader*)(_cur_reader.get()))->init_reader(); break; } case TFileFormatType::FORMAT_WAL: { @@ -1482,8 +1475,6 @@ Status FileScanner::prepare_for_read_lines(const TFileRangeDesc& range) { RETURN_IF_ERROR(_init_expr_ctxes()); // Since only one column is read from the file, there is no need to filter, so set these variables to empty. - static std::unordered_map colname_to_value_range; - _colname_to_value_range = &colname_to_value_range; _push_down_conjuncts.clear(); _not_single_slot_filter_conjuncts.clear(); _slot_id_to_filter_conjuncts.clear(); diff --git a/be/src/vec/exec/scan/file_scanner.h b/be/src/vec/exec/scan/file_scanner.h index 1a44d06c77b6e8..263a0171aa36a5 100644 --- a/be/src/vec/exec/scan/file_scanner.h +++ b/be/src/vec/exec/scan/file_scanner.h @@ -69,7 +69,6 @@ class FileScanner : public Scanner { FileScanner(RuntimeState* state, pipeline::FileScanLocalState* parent, int64_t limit, std::shared_ptr split_source, RuntimeProfile* profile, ShardedKVCache* kv_cache, - const std::unordered_map* colname_to_value_range, const std::unordered_map* colname_to_slot_id); Status open(RuntimeState* state) override; @@ -125,7 +124,6 @@ class FileScanner : public Scanner { std::unique_ptr _cur_reader; bool _cur_reader_eof = false; - const std::unordered_map* _colname_to_value_range = nullptr; // File source slot descriptors std::vector _file_slot_descs; // col names from _file_slot_descs diff --git a/be/src/vec/exec/scan/meta_scanner.cpp b/be/src/vec/exec/scan/meta_scanner.cpp index 095221bdd05abd..6a399999ccaa02 100644 --- a/be/src/vec/exec/scan/meta_scanner.cpp +++ b/be/src/vec/exec/scan/meta_scanner.cpp @@ -71,14 +71,12 @@ Status MetaScanner::open(RuntimeState* state) { // TODO: refactor this code auto reader = IcebergSysTableJniReader::create_unique(_tuple_desc->slots(), state, _profile, _scan_range.meta_scan_range); - const std::unordered_map colname_to_value_range; - RETURN_IF_ERROR(reader->init_reader(&colname_to_value_range)); + RETURN_IF_ERROR(reader->init_reader()); _reader = std::move(reader); } else if (_scan_range.meta_scan_range.metadata_type == TMetadataType::PAIMON) { auto reader = PaimonSysTableJniReader::create_unique(_tuple_desc->slots(), state, _profile, _scan_range.meta_scan_range); - const std::unordered_map colname_to_value_range; - RETURN_IF_ERROR(reader->init_reader(&colname_to_value_range)); + RETURN_IF_ERROR(reader->init_reader()); _reader = std::move(reader); } else { RETURN_IF_ERROR(_fetch_metadata(_scan_range.meta_scan_range)); diff --git a/be/test/olap/wal/wal_manager_test.cpp b/be/test/olap/wal/wal_manager_test.cpp index 15c4a94bde6462..b2d3c9cc70c60e 100644 --- a/be/test/olap/wal/wal_manager_test.cpp +++ b/be/test/olap/wal/wal_manager_test.cpp @@ -323,13 +323,11 @@ void WalManagerTest::init() { void WalManagerTest::generate_scanner(std::shared_ptr& scanner) { auto split_source = std::make_shared(_scan_range); - std::unordered_map _colname_to_value_range; std::unordered_map _colname_to_slot_id; scanner = std::make_shared( &_runtime_state, &(_runtime_state.get_local_state(0)->cast()), -1, - split_source, _profile, _kv_cache.get(), &_colname_to_value_range, - &_colname_to_slot_id); + split_source, _profile, _kv_cache.get(), &_colname_to_slot_id); scanner->_is_load = false; vectorized::VExprContextSPtrs _conjuncts; WARN_IF_ERROR(scanner->init(&_runtime_state, _conjuncts), "fail to prepare scanner"); diff --git a/be/test/vec/exec/vfile_scanner_exception_test.cpp b/be/test/vec/exec/vfile_scanner_exception_test.cpp index 1a3ebd6e8986a5..db345bf05eab05 100644 --- a/be/test/vec/exec/vfile_scanner_exception_test.cpp +++ b/be/test/vec/exec/vfile_scanner_exception_test.cpp @@ -279,13 +279,11 @@ void VfileScannerExceptionTest::init() { void VfileScannerExceptionTest::generate_scanner(std::shared_ptr& scanner) { auto split_source = std::make_shared(_scan_range); - std::unordered_map _colname_to_value_range; std::unordered_map _colname_to_slot_id; scanner = std::make_shared( &_runtime_state, &(_runtime_state.get_local_state(0)->cast()), -1, - split_source, _profile, _kv_cache.get(), &_colname_to_value_range, - &_colname_to_slot_id); + split_source, _profile, _kv_cache.get(), &_colname_to_slot_id); scanner->_is_load = false; vectorized::VExprContextSPtrs _conjuncts; WARN_IF_ERROR(scanner->init(&_runtime_state, _conjuncts), "fail to prepare scanner");