This is an automated email from the ASF dual-hosted git repository.
yiguolei pushed a commit to branch vector-index-dev
in repository https://gitbox.apache.org/repos/asf/doris.git
commit 1623dd074a3559d5fd2a788d8c4ec0757055206c
Author: hezhiqiang <hezhiqi...@selectdb.com>
AuthorDate: Wed May 21 18:43:41 2025 +0800
fix rebase master
---
be/src/index-tools/ann_tool.cpp | 1 -
be/src/olap/rowset/beta_rowset_writer.h | 1 -
be/src/olap/rowset/segment_v2/index_writer.cpp | 1 -
be/src/olap/rowset/segment_v2/index_writer.h | 1 -
.../segment_v2/inverted_index/util/term_iterator.h | 4 +-
.../inverted_index/util/term_position_iterator.h | 6 ++-
.../olap/rowset/segment_v2/inverted_index_writer.h | 2 -
be/src/olap/tablet.cpp | 12 ++---
be/src/olap/tablet_schema.h | 4 +-
be/src/pipeline/exec/olap_scan_operator.cpp | 2 +-
be/src/pipeline/exec/scan_operator.cpp | 2 +-
be/src/runtime/descriptors.cpp | 5 +-
be/src/vec/exprs/vectorized_fn_call.cpp | 2 +-
be/src/vec/exprs/virtual_slot_ref.cpp | 5 +-
be/src/vec/functions/is_not_null.h | 2 +-
be/src/vec/functions/is_null.h | 2 +-
.../inverted_index/empty_index_file_test.cpp | 4 +-
.../segment_v2/inverted_index_reader_test.cpp | 63 +++++++++++-----------
be/test/olap/vector_search/vector_search_utils.h | 2 +-
.../exprs/vexpr_evalute_inverted_index_test.cpp | 2 +-
be/test/vec/function/function_is_null_test.cpp | 8 +--
21 files changed, 62 insertions(+), 69 deletions(-)
diff --git a/be/src/index-tools/ann_tool.cpp b/be/src/index-tools/ann_tool.cpp
index eaf18ca7713..0df4835f798 100644
--- a/be/src/index-tools/ann_tool.cpp
+++ b/be/src/index-tools/ann_tool.cpp
@@ -41,7 +41,6 @@
#pragma clang diagnostic pop
#endif
#include "common/signal_handler.h"
-#include "gutil/strings/strip.h"
#include "io/fs/file_system.h"
#include "io/fs/file_writer.h"
#include "io/fs/local_file_system.h"
diff --git a/be/src/olap/rowset/beta_rowset_writer.h
b/be/src/olap/rowset/beta_rowset_writer.h
index c741c6e5363..c875a42d78f 100644
--- a/be/src/olap/rowset/beta_rowset_writer.h
+++ b/be/src/olap/rowset/beta_rowset_writer.h
@@ -42,7 +42,6 @@
#include "olap/rowset/segment_creator.h"
#include "segment_v2/index_file_writer.h"
#include "segment_v2/segment.h"
-#include "segment_v2/x_index_file_writer.h"
namespace doris {
namespace vectorized {
diff --git a/be/src/olap/rowset/segment_v2/index_writer.cpp
b/be/src/olap/rowset/segment_v2/index_writer.cpp
index c2c41a5f990..5912479fc03 100644
--- a/be/src/olap/rowset/segment_v2/index_writer.cpp
+++ b/be/src/olap/rowset/segment_v2/index_writer.cpp
@@ -43,7 +43,6 @@
#endif
#include "common/config.h"
-#include "gutil/strings/strip.h"
#include "olap/field.h"
#include "olap/inverted_index_parser.h"
#include "olap/key_coder.h"
diff --git a/be/src/olap/rowset/segment_v2/index_writer.h
b/be/src/olap/rowset/segment_v2/index_writer.h
index d13f340dc70..d56f1881246 100644
--- a/be/src/olap/rowset/segment_v2/index_writer.h
+++ b/be/src/olap/rowset/segment_v2/index_writer.h
@@ -28,7 +28,6 @@
#include "common/config.h"
#include "common/status.h"
-#include "gutil/strings/split.h"
#include "io/fs/file_system.h"
#include "io/fs/local_file_system.h"
#include "olap/olap_common.h"
diff --git a/be/src/olap/rowset/segment_v2/inverted_index/util/term_iterator.h
b/be/src/olap/rowset/segment_v2/inverted_index/util/term_iterator.h
index d07b448fa71..f79dd6492b8 100644
--- a/be/src/olap/rowset/segment_v2/inverted_index/util/term_iterator.h
+++ b/be/src/olap/rowset/segment_v2/inverted_index/util/term_iterator.h
@@ -64,13 +64,13 @@ public:
bool read_range(DocRange* docRange) const { return
term_docs_->readRange(docRange); }
- static TermDocs* ensure_term_doc(const io::IOContext* io_ctx, IndexReader*
reader,
+ static TermDocs* ensure_term_doc(const io::IOContext* io_ctx,
lucene::index::IndexReader* reader,
const std::wstring& field_name, const
std::string& term) {
std::wstring ws_term = StringUtil::string_to_wstring(term);
return ensure_term_doc(io_ctx, reader, field_name, ws_term);
}
- static TermDocs* ensure_term_doc(const io::IOContext* io_ctx, IndexReader*
reader,
+ static TermDocs* ensure_term_doc(const io::IOContext* io_ctx,
lucene::index::IndexReader* reader,
const std::wstring& field_name, const
std::wstring& ws_term) {
auto* t = _CLNEW Term(field_name.c_str(), ws_term.c_str());
auto* term_pos = reader->termDocs(t, io_ctx);
diff --git
a/be/src/olap/rowset/segment_v2/inverted_index/util/term_position_iterator.h
b/be/src/olap/rowset/segment_v2/inverted_index/util/term_position_iterator.h
index 67f5d09dea3..02bdf0c12ad 100644
--- a/be/src/olap/rowset/segment_v2/inverted_index/util/term_position_iterator.h
+++ b/be/src/olap/rowset/segment_v2/inverted_index/util/term_position_iterator.h
@@ -36,14 +36,16 @@ public:
int32_t next_position() const { return _term_pos->nextPosition(); }
- static TermPositions* ensure_term_position(const io::IOContext* io_ctx,
IndexReader* reader,
+ static TermPositions* ensure_term_position(const io::IOContext* io_ctx,
+ lucene::index::IndexReader*
reader,
const std::wstring& field_name,
const std::string& term) {
std::wstring ws_term = StringUtil::string_to_wstring(term);
return ensure_term_position(io_ctx, reader, field_name, ws_term);
}
- static TermPositions* ensure_term_position(const io::IOContext* io_ctx,
IndexReader* reader,
+ static TermPositions* ensure_term_position(const io::IOContext* io_ctx,
+ lucene::index::IndexReader*
reader,
const std::wstring& field_name,
const std::wstring& ws_term) {
auto* t = _CLNEW Term(field_name.c_str(), ws_term.c_str());
diff --git a/be/src/olap/rowset/segment_v2/inverted_index_writer.h
b/be/src/olap/rowset/segment_v2/inverted_index_writer.h
index aba5772343f..1a40fe77b98 100644
--- a/be/src/olap/rowset/segment_v2/inverted_index_writer.h
+++ b/be/src/olap/rowset/segment_v2/inverted_index_writer.h
@@ -32,7 +32,6 @@
#include "common/config.h"
#include "common/status.h"
#include "io/fs/file_system.h"
-
#include "io/fs/local_file_system.h"
#include "olap/rowset/segment_v2/index_writer.h"
@@ -48,7 +47,6 @@
#endif
#include "common/config.h"
-#include "gutil/strings/strip.h"
#include "olap/field.h"
#include "olap/inverted_index_parser.h"
#include "olap/key_coder.h"
diff --git a/be/src/olap/tablet.cpp b/be/src/olap/tablet.cpp
index 3454f62e461..37024be4620 100644
--- a/be/src/olap/tablet.cpp
+++ b/be/src/olap/tablet.cpp
@@ -1802,12 +1802,12 @@ Status Tablet::prepare_compaction_and_calculate_permits(
// return OK if OLAP_ERR_CUMULATIVE_NO_SUITABLE_VERSION, so that
we don't need to
// print too much useless logs.
// And because we set permits to 0, so even if we return OK here,
nothing will be done.
- VLOG_DEBUG << fmt::format(
- "cumulative compaction meet delete rowset, increase cumu
point without other "
- "operation.")
- .tag("tablet id:", tablet->tablet_id())
- .tag("after cumulative compaction, cumu point:",
- tablet->cumulative_layer_point());
+ // VLOG_DEBUG << fmt::format(
+ // "cumulative compaction meet delete rowset, increase
cumu point without other "
+ // "operation.")
+ // .tag("tablet id:", tablet->tablet_id())
+ // .tag("after cumulative compaction, cumu point:",
+ // tablet->cumulative_layer_point());
return Status::OK();
}
} else if (compaction_type == CompactionType::BASE_COMPACTION) {
diff --git a/be/src/olap/tablet_schema.h b/be/src/olap/tablet_schema.h
index 5b5168ad979..b2b2653bd31 100644
--- a/be/src/olap/tablet_schema.h
+++ b/be/src/olap/tablet_schema.h
@@ -269,7 +269,9 @@ public:
const std::string& index_name() const { return _index_name; }
MOCK_FUNCTION IndexType index_type() const { return _index_type; }
const std::vector<int32_t>& col_unique_ids() const { return
_col_unique_ids; }
- MOCK_FUNCTION const std::map<std::string, std::string>& properties() const
{ return _properties; }
+ MOCK_FUNCTION const std::map<std::string, std::string>& properties() const
{
+ return _properties;
+ }
int32_t get_gram_size() const {
if (_properties.contains("gram_size")) {
return std::stoi(_properties.at("gram_size"));
diff --git a/be/src/pipeline/exec/olap_scan_operator.cpp
b/be/src/pipeline/exec/olap_scan_operator.cpp
index 8ae9b2dd5ef..2fb49ea739e 100644
--- a/be/src/pipeline/exec/olap_scan_operator.cpp
+++ b/be/src/pipeline/exec/olap_scan_operator.cpp
@@ -32,10 +32,10 @@
#include "olap/storage_engine.h"
#include "pipeline/exec/scan_operator.h"
#include "pipeline/query_cache/query_cache.h"
+#include "runtime/runtime_state.h"
#include "runtime_filter/runtime_filter_consumer_helper.h"
#include "service/backend_options.h"
#include "util/runtime_profile.h"
-#include "runtime/runtime_state.h"
#include "util/to_string.h"
#include "vec/exec/scan/olap_scanner.h"
#include "vec/exprs/vann_topn_predicate.h"
diff --git a/be/src/pipeline/exec/scan_operator.cpp
b/be/src/pipeline/exec/scan_operator.cpp
index a46df9bd4d3..9986c7fcf01 100644
--- a/be/src/pipeline/exec/scan_operator.cpp
+++ b/be/src/pipeline/exec/scan_operator.cpp
@@ -18,8 +18,8 @@
#include "scan_operator.h"
#include <fmt/format.h>
-#include <gen_cpp/Metrics_types.h>
#include <gen_cpp/Exprs_types.h>
+#include <gen_cpp/Metrics_types.h>
#include <cstdint>
#include <memory>
diff --git a/be/src/runtime/descriptors.cpp b/be/src/runtime/descriptors.cpp
index 92b40deeec4..b65ea76d52e 100644
--- a/be/src/runtime/descriptors.cpp
+++ b/be/src/runtime/descriptors.cpp
@@ -34,16 +34,15 @@
#include "common/object_pool.h"
#include "util/string_util.h"
#include "vec/aggregate_functions/aggregate_function.h"
+#include "vec/columns/column_nothing.h"
#include "vec/core/types.h"
#include "vec/data_types/data_type_array.h"
#include "vec/data_types/data_type_decimal.h"
#include "vec/data_types/data_type_factory.hpp"
#include "vec/data_types/data_type_map.h"
#include "vec/data_types/data_type_struct.h"
-#include "vec/functions/function_helpers.h"
-#include "vec/columns/column_nothing.h"
-#include "vec/data_types/data_type_factory.hpp"
#include "vec/exprs/vexpr.h"
+#include "vec/functions/function_helpers.h"
#include "vec/utils/util.hpp"
namespace doris {
diff --git a/be/src/vec/exprs/vectorized_fn_call.cpp
b/be/src/vec/exprs/vectorized_fn_call.cpp
index 6fdfeb2a95f..e3408aac960 100644
--- a/be/src/vec/exprs/vectorized_fn_call.cpp
+++ b/be/src/vec/exprs/vectorized_fn_call.cpp
@@ -352,7 +352,7 @@ Status VectorizedFnCall::prepare_ann_range_search() {
auto right_col =
right_literal->get_column_ptr()->convert_to_full_column_if_const();
auto right_type = right_literal->get_data_type();
- if (right_type->get_type_id() != vectorized::TypeIndex::Float64) {
+ if (right_type->get_primitive_type() != PrimitiveType::TYPE_DOUBLE) {
LOG_INFO("Right child is not a Float64Literal.");
return Status::OK();
}
diff --git a/be/src/vec/exprs/virtual_slot_ref.cpp
b/be/src/vec/exprs/virtual_slot_ref.cpp
index d7c56b4735f..2455ef40bfa 100644
--- a/be/src/vec/exprs/virtual_slot_ref.cpp
+++ b/be/src/vec/exprs/virtual_slot_ref.cpp
@@ -47,10 +47,7 @@ VirtualSlotRef::VirtualSlotRef(const doris::TExprNode& node)
_column_label(node.label) {}
VirtualSlotRef::VirtualSlotRef(const SlotDescriptor* desc)
- : VExpr(desc->type(), true, desc->is_nullable()),
- _column_id(-1),
- _slot_id(desc->id()),
- _column_name(nullptr) {}
+ : VExpr(desc->type(), false), _column_id(-1), _slot_id(desc->id()),
_column_name(nullptr) {}
Status VirtualSlotRef::prepare(doris::RuntimeState* state, const
doris::RowDescriptor& desc,
VExprContext* context) {
diff --git a/be/src/vec/functions/is_not_null.h
b/be/src/vec/functions/is_not_null.h
index 9956540e173..3fa462d66f2 100644
--- a/be/src/vec/functions/is_not_null.h
+++ b/be/src/vec/functions/is_not_null.h
@@ -86,7 +86,7 @@ public:
Status evaluate_inverted_index(
const ColumnsWithTypeAndName& arguments,
const std::vector<vectorized::IndexFieldNameAndTypePair>&
data_type_with_names,
- std::vector<segment_v2::InvertedIndexIterator*> iterators,
uint32_t num_rows,
+ std::vector<segment_v2::IndexIterator*> iterators, uint32_t
num_rows,
segment_v2::InvertedIndexResultBitmap& bitmap_result) const
override {
if (iterators.empty() || iterators[0] == nullptr) {
return Status::OK();
diff --git a/be/src/vec/functions/is_null.h b/be/src/vec/functions/is_null.h
index dfa4e42b4db..cd31d094875 100644
--- a/be/src/vec/functions/is_null.h
+++ b/be/src/vec/functions/is_null.h
@@ -77,7 +77,7 @@ public:
Status evaluate_inverted_index(
const ColumnsWithTypeAndName& arguments,
const std::vector<vectorized::IndexFieldNameAndTypePair>&
data_type_with_names,
- std::vector<segment_v2::InvertedIndexIterator*> iterators,
uint32_t num_rows,
+ std::vector<segment_v2::IndexIterator*> iterators, uint32_t
num_rows,
segment_v2::InvertedIndexResultBitmap& bitmap_result) const
override {
if (iterators.empty() || iterators[0] == nullptr) {
return Status::OK();
diff --git
a/be/test/olap/rowset/segment_v2/inverted_index/empty_index_file_test.cpp
b/be/test/olap/rowset/segment_v2/inverted_index/empty_index_file_test.cpp
index ed48e3226d4..dbfe8a9e028 100644
--- a/be/test/olap/rowset/segment_v2/inverted_index/empty_index_file_test.cpp
+++ b/be/test/olap/rowset/segment_v2/inverted_index/empty_index_file_test.cpp
@@ -21,7 +21,7 @@
#include "gtest/gtest_pred_impl.h"
#include "io/fs/stream_sink_file_writer.h"
#include "olap/olap_common.h"
-#include "olap/rowset/segment_v2/inverted_index_file_writer.h"
+#include "olap/rowset/segment_v2/index_file_writer.h"
#include "vec/sink/load_stream_stub.h"
namespace doris {
@@ -83,7 +83,7 @@ TEST_F(EmptyIndexFileTest, test_empty_index_file) {
std::string index_path = "/tmp/empty_index_file_test";
std::string rowset_id = "1234567890";
int64_t seg_id = 1234567890;
- auto index_file_writer =
std::make_unique<segment_v2::InvertedIndexFileWriter>(
+ auto index_file_writer = std::make_unique<segment_v2::IndexFileWriter>(
fs, index_path, rowset_id, seg_id,
InvertedIndexStorageFormatPB::V2,
std::move(file_writer), false);
EXPECT_TRUE(index_file_writer->close().ok());
diff --git a/be/test/olap/rowset/segment_v2/inverted_index_reader_test.cpp
b/be/test/olap/rowset/segment_v2/inverted_index_reader_test.cpp
index 19623d0dfc5..375d75072fd 100644
--- a/be/test/olap/rowset/segment_v2/inverted_index_reader_test.cpp
+++ b/be/test/olap/rowset/segment_v2/inverted_index_reader_test.cpp
@@ -30,9 +30,8 @@
#include <vector>
#include "olap/field.h"
+#include "olap/rowset/segment_v2/index_file_reader.h"
#include "olap/rowset/segment_v2/inverted_index_desc.h"
-#include "olap/rowset/segment_v2/inverted_index_file_reader.h"
-#include "olap/rowset/segment_v2/inverted_index_file_writer.h"
#include "olap/rowset/segment_v2/inverted_index_writer.h"
#include "olap/tablet_schema.h"
#include "olap/tablet_schema_helper.h"
@@ -129,9 +128,9 @@ public:
auto fs = io::global_local_filesystem();
Status sts = fs->create_file(index_path, &file_writer, &opts);
ASSERT_TRUE(sts.ok()) << sts;
- auto index_file_writer = std::make_unique<InvertedIndexFileWriter>(
- fs, *index_path_prefix, std::string {rowset_id}, seg_id,
format,
- std::move(file_writer));
+ auto index_file_writer =
+ std::make_unique<IndexFileWriter>(fs, *index_path_prefix,
std::string {rowset_id},
+ seg_id, format,
std::move(file_writer));
// Get c2 column Field
const TabletColumn& column = tablet_schema->column(1);
@@ -140,9 +139,9 @@ public:
ASSERT_NE(field.get(), nullptr);
// Create column writer
- std::unique_ptr<InvertedIndexColumnWriter> column_writer;
- auto status = InvertedIndexColumnWriter::create(field.get(),
&column_writer,
-
index_file_writer.get(), idx_meta);
+ std::unique_ptr<IndexColumnWriter> column_writer;
+ auto status = IndexColumnWriter::create(field.get(), &column_writer,
+ index_file_writer.get(),
idx_meta);
EXPECT_TRUE(status.ok()) << status;
// Write string values
@@ -181,7 +180,7 @@ public:
auto fs = io::global_local_filesystem();
Status sts = fs->create_file(index_path, &file_writer, &opts);
ASSERT_TRUE(sts.ok()) << sts;
- auto index_file_writer = std::make_unique<InvertedIndexFileWriter>(
+ auto index_file_writer = std::make_unique<IndexFileWriter>(
fs, *index_path_prefix, std::string {rowset_id}, seg_id,
InvertedIndexStorageFormatPB::V2, std::move(file_writer));
@@ -192,9 +191,9 @@ public:
ASSERT_NE(field.get(), nullptr);
// Create column writer
- std::unique_ptr<InvertedIndexColumnWriter> column_writer;
- auto status = InvertedIndexColumnWriter::create(field.get(),
&column_writer,
-
index_file_writer.get(), idx_meta);
+ std::unique_ptr<IndexColumnWriter> column_writer;
+ auto status = IndexColumnWriter::create(field.get(), &column_writer,
+ index_file_writer.get(),
idx_meta);
EXPECT_TRUE(status.ok()) << status;
// Add NULL values
@@ -247,7 +246,7 @@ public:
auto fs = io::global_local_filesystem();
Status sts = fs->create_file(index_path, &file_writer, &opts);
ASSERT_TRUE(sts.ok()) << sts;
- auto index_file_writer = std::make_unique<InvertedIndexFileWriter>(
+ auto index_file_writer = std::make_unique<IndexFileWriter>(
fs, *index_path_prefix, std::string {rowset_id}, seg_id,
InvertedIndexStorageFormatPB::V2, std::move(file_writer));
@@ -258,9 +257,9 @@ public:
ASSERT_NE(field.get(), nullptr);
// Create column writer
- std::unique_ptr<InvertedIndexColumnWriter> column_writer;
- auto status = InvertedIndexColumnWriter::create(field.get(),
&column_writer,
-
index_file_writer.get(), idx_meta);
+ std::unique_ptr<IndexColumnWriter> column_writer;
+ auto status = IndexColumnWriter::create(field.get(), &column_writer,
+ index_file_writer.get(),
idx_meta);
EXPECT_TRUE(status.ok()) << status;
// Add integer values
@@ -304,7 +303,7 @@ public:
query_options.enable_inverted_index_searcher_cache = false;
runtime_state.set_query_options(query_options);
- auto reader = std::make_shared<InvertedIndexFileReader>(
+ auto reader = std::make_shared<IndexFileReader>(
io::global_local_filesystem(), index_path_prefix,
InvertedIndexStorageFormatPB::V2);
auto status = reader->init();
@@ -356,7 +355,7 @@ public:
RuntimeState runtime_state;
io::IOContext io_ctx;
- auto reader = std::make_shared<InvertedIndexFileReader>(
+ auto reader = std::make_shared<IndexFileReader>(
io::global_local_filesystem(), index_path_prefix,
InvertedIndexStorageFormatPB::V2);
auto status = reader->init();
@@ -402,7 +401,7 @@ public:
query_options.enable_inverted_index_searcher_cache = false;
runtime_state.set_query_options(query_options);
- auto reader = std::make_shared<InvertedIndexFileReader>(
+ auto reader = std::make_shared<IndexFileReader>(
io::global_local_filesystem(), index_path_prefix,
InvertedIndexStorageFormatPB::V2);
auto status = reader->init();
@@ -483,7 +482,7 @@ public:
query_options.enable_inverted_index_searcher_cache = true;
runtime_state.set_query_options(query_options);
- auto reader = std::make_shared<InvertedIndexFileReader>(
+ auto reader = std::make_shared<IndexFileReader>(
io::global_local_filesystem(), index_path_prefix,
InvertedIndexStorageFormatPB::V2);
auto status = reader->init();
@@ -546,7 +545,7 @@ public:
query_options.enable_inverted_index_searcher_cache = true;
runtime_state.set_query_options(query_options);
- auto reader = std::make_shared<InvertedIndexFileReader>(
+ auto reader = std::make_shared<IndexFileReader>(
io::global_local_filesystem(), index_path_prefix,
InvertedIndexStorageFormatPB::V2);
auto status = reader->init();
@@ -628,7 +627,7 @@ public:
query_options.enable_inverted_index_searcher_cache = false;
runtime_state.set_query_options(query_options);
- auto reader = std::make_shared<InvertedIndexFileReader>(
+ auto reader = std::make_shared<IndexFileReader>(
io::global_local_filesystem(), index_path_prefix,
InvertedIndexStorageFormatPB::V2);
auto status = reader->init();
@@ -717,9 +716,9 @@ public:
query_options.enable_inverted_index_searcher_cache = false;
runtime_state.set_query_options(query_options);
- auto reader = std::make_shared<InvertedIndexFileReader>(
- io::global_local_filesystem(), index_path_prefix,
- InvertedIndexStorageFormatPB::V3);
+ auto reader =
std::make_shared<IndexFileReader>(io::global_local_filesystem(),
+ index_path_prefix,
+
InvertedIndexStorageFormatPB::V3);
auto status = reader->init();
EXPECT_EQ(status, Status::OK());
@@ -796,9 +795,9 @@ public:
query_options.enable_inverted_index_searcher_cache = false;
runtime_state.set_query_options(query_options);
- auto reader = std::make_shared<InvertedIndexFileReader>(
- io::global_local_filesystem(), index_path_prefix,
- InvertedIndexStorageFormatPB::V3);
+ auto reader =
std::make_shared<IndexFileReader>(io::global_local_filesystem(),
+ index_path_prefix,
+
InvertedIndexStorageFormatPB::V3);
auto status = reader->init();
EXPECT_EQ(status, Status::OK());
@@ -894,12 +893,12 @@ public:
query_options.inverted_index_compatible_read = enable_compatible_read;
runtime_state.set_query_options(query_options);
- auto reader =
std::make_shared<InvertedIndexFileReader>(io::global_local_filesystem(),
-
index_path_prefix, storage_format);
+ auto reader =
std::make_shared<IndexFileReader>(io::global_local_filesystem(),
+ index_path_prefix,
storage_format);
auto status = reader->init();
- ASSERT_TRUE(status.ok()) << "Failed to initialize
InvertedIndexFileReader for "
- << index_file << ": " << status.to_string();
+ ASSERT_TRUE(status.ok()) << "Failed to initialize IndexFileReader for
" << index_file
+ << ": " << status.to_string();
auto index_reader = FullTextIndexReader::create_shared(&idx_meta,
reader);
ASSERT_NE(index_reader, nullptr)
diff --git a/be/test/olap/vector_search/vector_search_utils.h
b/be/test/olap/vector_search/vector_search_utils.h
index bf84e5d7739..b22e01b63b5 100644
--- a/be/test/olap/vector_search/vector_search_utils.h
+++ b/be/test/olap/vector_search/vector_search_utils.h
@@ -63,7 +63,7 @@ class MockTabletColumn : public doris::TabletColumn {
class MockTabletIndex : public doris::TabletIndex {
MOCK_METHOD(doris::IndexType, index_type, (), (const));
- MOCK_METHOD((const std::map<string, string>&), properties, (), (const));
+ MOCK_METHOD((const std::map<std::string, std::string>&), properties, (),
(const));
};
class MockIndexFileWriter : public doris::segment_v2::IndexFileWriter {
diff --git a/be/test/vec/exprs/vexpr_evalute_inverted_index_test.cpp
b/be/test/vec/exprs/vexpr_evalute_inverted_index_test.cpp
index ad8f7cc61cc..82aa6de59b7 100644
--- a/be/test/vec/exprs/vexpr_evalute_inverted_index_test.cpp
+++ b/be/test/vec/exprs/vexpr_evalute_inverted_index_test.cpp
@@ -160,7 +160,7 @@ TEST(TExprInvertedIndexTest,
test_expr_evaluate_inverted_index) {
common_expr_inverted_index_status;
auto inverted_index_context =
std::make_shared<doris::vectorized::InvertedIndexContext>(
std::vector<doris::ColumnId>(),
-
std::vector<std::unique_ptr<doris::segment_v2::InvertedIndexIterator>>(),
+ std::vector<std::unique_ptr<doris::segment_v2::IndexIterator>>(),
std::vector<doris::vectorized::IndexFieldNameAndTypePair>(),
common_expr_inverted_index_status);
expr_ctx.set_inverted_index_context(inverted_index_context);
diff --git a/be/test/vec/function/function_is_null_test.cpp
b/be/test/vec/function/function_is_null_test.cpp
index 9cc999d1097..d8b91161d77 100644
--- a/be/test/vec/function/function_is_null_test.cpp
+++ b/be/test/vec/function/function_is_null_test.cpp
@@ -18,7 +18,7 @@
#include <gtest/gtest.h>
#include "olap/rowset/rowset_factory.h"
-#include "olap/rowset/segment_v2/inverted_index_file_reader.h"
+#include "olap/rowset/segment_v2/index_file_reader.h"
#include "olap/storage_engine.h"
#include "vec/functions/is_not_null.h"
#include "vec/functions/is_null.h"
@@ -180,14 +180,14 @@ TEST_F(FunctionIsNullTest, gc_binlogs_test) {
read_options.stats = &stats;
RuntimeState runtime_state;
read_options.runtime_state = &runtime_state;
- std::unique_ptr<InvertedIndexIterator> iter;
+ std::unique_ptr<IndexIterator> iter;
EXPECT_TRUE(reader->new_iterator(read_options.io_ctx,
read_options.stats,
read_options.runtime_state, &iter)
.ok());
EXPECT_TRUE(iter);
ColumnsWithTypeAndName arguments;
std::vector<vectorized::IndexFieldNameAndTypePair>
data_type_with_names;
- std::vector<segment_v2::InvertedIndexIterator*> iterators;
+ std::vector<segment_v2::IndexIterator*> iterators;
iterators.push_back(iter.get());
segment_v2::InvertedIndexResultBitmap bitmap_result;
@@ -215,7 +215,7 @@ TEST_F(FunctionIsNullTest, gc_binlogs_test) {
EXPECT_TRUE(segment_path.has_value());
std::string index_prefix = std::string(
InvertedIndexDescriptor::get_index_file_path_prefix(segment_path.value()));
- auto index_file_reader = std::make_shared<InvertedIndexFileReader>(
+ auto index_file_reader = std::make_shared<IndexFileReader>(
io::global_local_filesystem(), index_prefix,
InvertedIndexStorageFormatPB::V2);
EXPECT_TRUE(index_file_reader->init().ok());
auto index_meta = _tablet_schema->inverted_index(0);
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscr...@doris.apache.org
For additional commands, e-mail: commits-h...@doris.apache.org
