This is an automated email from the ASF dual-hosted git repository. airborne pushed a commit to branch fix-build-index-multi-analyzer-order in repository https://gitbox.apache.org/repos/asf/doris.git
commit 4bfa7c5cffc38c4f23f5b8ed3dce047a54e14fda Author: airborne12 <[email protected]> AuthorDate: Sun Mar 22 11:59:19 2026 +0800 [fix](inverted index) Remove vectorized:: namespace prefix for CI compatibility Master merged #61142 which removed the vectorized namespace. Update references in inverted_index_iterator to use DataTypePtr/DataTypeString directly to fix BE UT compilation failure on CI. --- be/src/storage/index/inverted/inverted_index_iterator.cpp | 2 +- be/src/storage/index/inverted/inverted_index_iterator.h | 4 ++-- be/test/storage/segment/inverted_index_iterator_test.cpp | 8 ++++---- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/be/src/storage/index/inverted/inverted_index_iterator.cpp b/be/src/storage/index/inverted/inverted_index_iterator.cpp index d5c7e0c7394..fbe06c054e5 100644 --- a/be/src/storage/index/inverted/inverted_index_iterator.cpp +++ b/be/src/storage/index/inverted/inverted_index_iterator.cpp @@ -240,7 +240,7 @@ Result<InvertedIndexReaderPtr> InvertedIndexIterator::select_for_numeric( } Result<InvertedIndexReaderPtr> InvertedIndexIterator::select_best_reader( - const vectorized::DataTypePtr& column_type, InvertedIndexQueryType query_type, + const DataTypePtr& column_type, InvertedIndexQueryType query_type, const std::string& analyzer_key) { if (_reader_entries.empty()) { return ResultError(Status::Error<ErrorCode::INVERTED_INDEX_NO_TERMS>( diff --git a/be/src/storage/index/inverted/inverted_index_iterator.h b/be/src/storage/index/inverted/inverted_index_iterator.h index 717261e4ca7..e7418535d3c 100644 --- a/be/src/storage/index/inverted/inverted_index_iterator.h +++ b/be/src/storage/index/inverted/inverted_index_iterator.h @@ -28,7 +28,7 @@ namespace doris::segment_v2 { struct InvertedIndexParam { std::string column_name; - vectorized::DataTypePtr column_type; + DataTypePtr column_type; const void* query_value; InvertedIndexQueryType query_type; uint32_t num_rows; @@ -64,7 +64,7 @@ public: IndexReaderPtr get_reader(IndexReaderType reader_type) const override; [[nodiscard]] Result<InvertedIndexReaderPtr> select_best_reader( - const vectorized::DataTypePtr& column_type, InvertedIndexQueryType query_type, + const DataTypePtr& column_type, InvertedIndexQueryType query_type, const std::string& analyzer_key); [[nodiscard]] Result<InvertedIndexReaderPtr> select_best_reader( const std::string& analyzer_key); diff --git a/be/test/storage/segment/inverted_index_iterator_test.cpp b/be/test/storage/segment/inverted_index_iterator_test.cpp index 18ed45ca72b..7deffc0fdbd 100644 --- a/be/test/storage/segment/inverted_index_iterator_test.cpp +++ b/be/test/storage/segment/inverted_index_iterator_test.cpp @@ -257,7 +257,7 @@ TEST_F(InvertedIndexIteratorTest, SelectBestReader_MatchQuerySelectsFulltext) { iterator.add_reader(InvertedIndexReaderType::FULLTEXT, fulltext_reader); iterator.add_reader(InvertedIndexReaderType::STRING_TYPE, string_reader); - auto string_type = std::make_shared<vectorized::DataTypeString>(); + auto string_type = std::make_shared<DataTypeString>(); auto result = iterator.select_best_reader(string_type, InvertedIndexQueryType::MATCH_ANY_QUERY, "chinese"); EXPECT_TRUE(result.has_value()); @@ -272,7 +272,7 @@ TEST_F(InvertedIndexIteratorTest, SelectBestReader_EqualQuerySelectsStringType) iterator.add_reader(InvertedIndexReaderType::FULLTEXT, fulltext_reader); iterator.add_reader(InvertedIndexReaderType::STRING_TYPE, string_reader); - auto string_type = std::make_shared<vectorized::DataTypeString>(); + auto string_type = std::make_shared<DataTypeString>(); auto result = iterator.select_best_reader(string_type, InvertedIndexQueryType::EQUAL_QUERY, "chinese"); EXPECT_TRUE(result.has_value()); @@ -357,7 +357,7 @@ TEST_F(InvertedIndexIteratorTest, SelectBestReader_DeterministicByIndexId) { iter.add_reader(InvertedIndexReaderType::FULLTEXT, reader_id_100); iter.add_reader(InvertedIndexReaderType::FULLTEXT, reader_id_50); - auto col_type = std::make_shared<vectorized::DataTypeString>(); + auto col_type = std::make_shared<DataTypeString>(); auto result = iter.select_best_reader(col_type, InvertedIndexQueryType::MATCH_REGEXP_QUERY, ""); ASSERT_TRUE(result.has_value()); @@ -370,7 +370,7 @@ TEST_F(InvertedIndexIteratorTest, SelectBestReader_DeterministicByIndexId) { iter.add_reader(InvertedIndexReaderType::FULLTEXT, reader_id_50); iter.add_reader(InvertedIndexReaderType::FULLTEXT, reader_id_100); - auto col_type = std::make_shared<vectorized::DataTypeString>(); + auto col_type = std::make_shared<DataTypeString>(); auto result = iter.select_best_reader(col_type, InvertedIndexQueryType::MATCH_REGEXP_QUERY, ""); ASSERT_TRUE(result.has_value()); --------------------------------------------------------------------- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
