Skip to content

Commit f534ac5

Browse files
zzzxl1993zzzxl1993
authored
[fix](inverted index) Fix compilation error (#50286)
1 parent 003f8e6 commit f534ac5

File tree

8 files changed

+1526
-1529
lines changed

8 files changed

+1526
-1529
lines changed

‎be/src/pipeline/exec/operator.h

+2-2
Original file line numberDiff line numberDiff line change
@@ -76,9 +76,9 @@ struct LocalStateInfo {
7676

7777
// This struct is used only for initializing local sink state.
7878
struct LocalSinkStateInfo {
79-
const int task_idx;
79+
const int task_idx = 0;
8080
RuntimeProfile* parent_profile = nullptr;
81-
const int sender_id;
81+
const int sender_id = 0;
8282
BasicSharedState* shared_state;
8383
const std::map<int, std::pair<std::shared_ptr<BasicSharedState>,
8484
std::vector<std::shared_ptr<Dependency>>>>& shared_state_map;

‎be/test/io/fs/s3_obj_storage_client_test.cpp

+1
Original file line numberDiff line numberDiff line change
@@ -44,6 +44,7 @@ class S3ObjStorageClientTest : public testing::Test {
4444
.region = "dummy-region",
4545
.ak = access_key,
4646
.sk = secret_key,
47+
.token = "",
4748
.bucket = bucket,
4849
.provider = io::ObjStorageType::AWS,
4950
.use_virtual_addressing = false});

‎be/test/olap/rowset/segment_v2/inverted_index/compaction/util/index_compaction_utils.cpp

+2-2
Original file line numberDiff line numberDiff line change
@@ -242,7 +242,7 @@ class IndexCompactionUtils {
242242
}
243243

244244
static void check_terms_stats(lucene::store::Directory* dir, std::ostream& os = std::cout) {
245-
IndexReader* r = IndexReader::open(dir);
245+
lucene::index::IndexReader* r = lucene::index::IndexReader::open(dir);
246246

247247
os << "Max Docs: " << r->maxDoc() << "\n";
248248
os << "Num Docs: " << r->numDocs() << "\n";
@@ -459,7 +459,7 @@ class IndexCompactionUtils {
459459
}
460460

461461
static void check_idx_file_writer_closed(BaseBetaRowsetWriter* writer, bool closed) {
462-
for (const auto& [seg_id, idx_file_writer] : writer->inverted_index_file_writers()) {
462+
for (const auto& [seg_id, idx_file_writer] : writer->x_index_file_writers()) {
463463
EXPECT_EQ(idx_file_writer->_closed, closed);
464464
}
465465
}

‎be/test/olap/rowset/segment_v2/inverted_index_array_test.cpp

+33-33
Original file line numberDiff line numberDiff line change
@@ -33,10 +33,10 @@
3333
#include "io/fs/local_file_system.h"
3434
#include "olap/rowset/segment_v2/inverted_index_compound_reader.h"
3535
#include "olap/rowset/segment_v2/inverted_index_desc.h"
36-
#include "olap/rowset/segment_v2/inverted_index_file_writer.h"
3736
#include "olap/rowset/segment_v2/inverted_index_fs_directory.h"
3837
#include "olap/rowset/segment_v2/inverted_index_writer.h"
3938
#include "olap/rowset/segment_v2/x_index_file_reader.h"
39+
#include "olap/rowset/segment_v2/x_index_file_writer.h"
4040
#include "olap/rowset/segment_v2/zone_map_index.h"
4141
#include "olap/tablet_schema.h"
4242
#include "olap/tablet_schema_helper.h"
@@ -54,7 +54,7 @@
5454
#include "vec/olap/olap_data_convertor.h"
5555

5656
using namespace lucene::index;
57-
using doris::segment_v2::InvertedIndexFileWriter;
57+
using doris::segment_v2::XIndexFileWriter;
5858

5959
namespace doris {
6060
namespace segment_v2 {
@@ -119,7 +119,7 @@ class InvertedIndexArrayTest : public testing::Test {
119119
std::cout << "==================================" << std::endl;
120120
lucene::store::Directory* dir = compound_reader.get();
121121

122-
IndexReader* r = IndexReader::open(dir);
122+
lucene::index::IndexReader* r = lucene::index::IndexReader::open(dir);
123123

124124
printf("Max Docs: %d\n", r->maxDoc());
125125
printf("Num Docs: %d\n", r->numDocs());
@@ -220,12 +220,12 @@ class InvertedIndexArrayTest : public testing::Test {
220220
TabletIndex idx_meta;
221221
idx_meta.index_type();
222222
idx_meta.init_from_pb(*index_meta_pb.get());
223-
auto index_file_writer = std::make_unique<InvertedIndexFileWriter>(
224-
fs, index_path_prefix, std::string {rowset_id}, seg_id,
225-
InvertedIndexStorageFormatPB::V1);
226-
std::unique_ptr<segment_v2::InvertedIndexColumnWriter> _inverted_index_builder = nullptr;
227-
EXPECT_EQ(InvertedIndexColumnWriter::create(field, &_inverted_index_builder,
228-
index_file_writer.get(), &idx_meta),
223+
auto index_file_writer =
224+
std::make_unique<XIndexFileWriter>(fs, index_path_prefix, std::string {rowset_id},
225+
seg_id, InvertedIndexStorageFormatPB::V1);
226+
std::unique_ptr<segment_v2::IndexColumnWriter> _inverted_index_builder = nullptr;
227+
EXPECT_EQ(IndexColumnWriter::create(field, &_inverted_index_builder, index_file_writer.get(),
228+
&idx_meta),
229229
Status::OK());
230230

231231
// Construct two arrays: The first row is ["amory","doris"], and the second row is ["amory", "commiter"]
@@ -305,12 +305,12 @@ class InvertedIndexArrayTest : public testing::Test {
305305
TabletIndex idx_meta;
306306
idx_meta.index_type();
307307
idx_meta.init_from_pb(*index_meta_pb.get());
308-
auto index_file_writer = std::make_unique<InvertedIndexFileWriter>(
308+
auto index_file_writer = std::make_unique<XIndexFileWriter>(
309309
fs, index_path_prefix, std::string {rowset_id}, seg_id,
310310
InvertedIndexStorageFormatPB::V1);
311-
std::unique_ptr<segment_v2::InvertedIndexColumnWriter> _inverted_index_builder = nullptr;
312-
EXPECT_EQ(InvertedIndexColumnWriter::create(field, &_inverted_index_builder,
313-
index_file_writer.get(), &idx_meta),
311+
std::unique_ptr<segment_v2::IndexColumnWriter> _inverted_index_builder = nullptr;
312+
EXPECT_EQ(IndexColumnWriter::create(field, &_inverted_index_builder, index_file_writer.get(),
313+
&idx_meta),
314314
Status::OK());
315315

316316
// Construct two arrays: The first row is ["amory","doris"], and the second row is [NULL, "amory", "commiter"]
@@ -394,12 +394,12 @@ class InvertedIndexArrayTest : public testing::Test {
394394
io::FileWriterOptions opts;
395395
Status sts = fs->create_file(index_path, &file_writer, &opts);
396396
ASSERT_TRUE(sts.ok());
397-
auto index_file_writer = std::make_unique<InvertedIndexFileWriter>(
397+
auto index_file_writer = std::make_unique<XIndexFileWriter>(
398398
fs, index_path_prefix, std::string {rowset_id}, seg_id,
399399
InvertedIndexStorageFormatPB::V2, std::move(file_writer));
400-
std::unique_ptr<segment_v2::InvertedIndexColumnWriter> _inverted_index_builder = nullptr;
401-
EXPECT_EQ(InvertedIndexColumnWriter::create(field, &_inverted_index_builder,
402-
index_file_writer.get(), &idx_meta),
400+
std::unique_ptr<segment_v2::IndexColumnWriter> _inverted_index_builder = nullptr;
401+
EXPECT_EQ(IndexColumnWriter::create(field, &_inverted_index_builder, index_file_writer.get(),
402+
&idx_meta),
403403
Status::OK());
404404

405405
// Simulate outer null cases: 5 rows, outer null map = {1, 0, 0, 1, 0}, i.e., rows 0 and 3 are null
@@ -508,12 +508,12 @@ class InvertedIndexArrayTest : public testing::Test {
508508
TabletIndex idx_meta;
509509
idx_meta.index_type();
510510
idx_meta.init_from_pb(*index_meta_pb.get());
511-
auto index_file_writer = std::make_unique<InvertedIndexFileWriter>(
511+
auto index_file_writer = std::make_unique<XIndexFileWriter>(
512512
fs, index_path_prefix, std::string {rowset_id}, seg_id,
513513
InvertedIndexStorageFormatPB::V1);
514-
std::unique_ptr<segment_v2::InvertedIndexColumnWriter> _inverted_index_builder = nullptr;
515-
EXPECT_EQ(InvertedIndexColumnWriter::create(field, &_inverted_index_builder,
516-
index_file_writer.get(), &idx_meta),
514+
std::unique_ptr<segment_v2::IndexColumnWriter> _inverted_index_builder = nullptr;
515+
EXPECT_EQ(IndexColumnWriter::create(field, &_inverted_index_builder, index_file_writer.get(),
516+
&idx_meta),
517517
Status::OK());
518518

519519
// Simulate outer null cases: 5 rows, outer null map = {1, 0, 0, 1, 0}, i.e., rows 0 and 3 are null
@@ -621,11 +621,11 @@ class InvertedIndexArrayTest : public testing::Test {
621621

622622
TabletIndex idx_meta;
623623
idx_meta.init_from_pb(*index_meta_pb.get());
624-
auto index_file_writer = std::make_unique<InvertedIndexFileWriter>(
624+
auto index_file_writer = std::make_unique<XIndexFileWriter>(
625625
fs, index_path_prefix, "multi_block", 0, InvertedIndexStorageFormatPB::V1);
626-
std::unique_ptr<segment_v2::InvertedIndexColumnWriter> _inverted_index_builder = nullptr;
627-
EXPECT_EQ(InvertedIndexColumnWriter::create(field, &_inverted_index_builder,
628-
index_file_writer.get(), &idx_meta),
626+
std::unique_ptr<segment_v2::IndexColumnWriter> _inverted_index_builder = nullptr;
627+
EXPECT_EQ(IndexColumnWriter::create(field, &_inverted_index_builder, index_file_writer.get(),
628+
&idx_meta),
629629
Status::OK());
630630

631631
ExpectedDocMap merged_expected;
@@ -818,12 +818,12 @@ class InvertedIndexArrayTest : public testing::Test {
818818

819819
TabletIndex idx_meta;
820820
idx_meta.init_from_pb(*index_meta_pb.get());
821-
auto index_file_writer = std::make_unique<InvertedIndexFileWriter>(
821+
auto index_file_writer = std::make_unique<XIndexFileWriter>(
822822
fs, index_path_prefix, std::string {rowset_id}, seg_id,
823823
InvertedIndexStorageFormatPB::V1);
824-
std::unique_ptr<segment_v2::InvertedIndexColumnWriter> _inverted_index_builder = nullptr;
825-
EXPECT_EQ(InvertedIndexColumnWriter::create(field, &_inverted_index_builder,
826-
index_file_writer.get(), &idx_meta),
824+
std::unique_ptr<segment_v2::IndexColumnWriter> _inverted_index_builder = nullptr;
825+
EXPECT_EQ(IndexColumnWriter::create(field, &_inverted_index_builder, index_file_writer.get(),
826+
&idx_meta),
827827
Status::OK());
828828

829829
vectorized::DataTypePtr inner_int = std::make_shared<vectorized::DataTypeInt32>();
@@ -960,12 +960,12 @@ class InvertedIndexArrayTest : public testing::Test {
960960

961961
TabletIndex idx_meta;
962962
idx_meta.init_from_pb(*index_meta_pb.get());
963-
auto index_file_writer = std::make_unique<InvertedIndexFileWriter>(
963+
auto index_file_writer = std::make_unique<XIndexFileWriter>(
964964
fs, index_path_prefix, std::string {rowset_id}, seg_id,
965965
InvertedIndexStorageFormatPB::V1);
966-
std::unique_ptr<segment_v2::InvertedIndexColumnWriter> _inverted_index_builder = nullptr;
967-
EXPECT_EQ(InvertedIndexColumnWriter::create(field, &_inverted_index_builder,
968-
index_file_writer.get(), &idx_meta),
966+
std::unique_ptr<segment_v2::IndexColumnWriter> _inverted_index_builder = nullptr;
967+
EXPECT_EQ(IndexColumnWriter::create(field, &_inverted_index_builder, index_file_writer.get(),
968+
&idx_meta),
969969
Status::OK());
970970

971971
// Construct inner array type: DataTypeArray(DataTypeNullable(DataTypeString))

‎be/test/olap/rowset/segment_v2/inverted_index_compound_reader_test.cpp

+4-4
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@
3636
#include "gtest/gtest_pred_impl.h"
3737
#include "io/fs/local_file_system.h"
3838
#include "olap/rowset/segment_v2/inverted_index_desc.h"
39-
#include "olap/rowset/segment_v2/inverted_index_file_writer.h"
39+
#include "olap/rowset/segment_v2/x_index_file_writer.h"
4040
#include "olap/rowset/segment_v2/inverted_index_fs_directory.h"
4141
#include "olap/rowset/segment_v2/x_index_file_reader.h"
4242
#include "olap/tablet_schema.h"
@@ -45,7 +45,7 @@
4545
#include "util/slice.h"
4646

4747
using namespace lucene::index;
48-
using doris::segment_v2::InvertedIndexFileWriter;
48+
using doris::segment_v2::XIndexFileWriter;
4949

5050
namespace doris::segment_v2 {
5151

@@ -364,7 +364,7 @@ TEST_F(DorisCompoundReaderTest, IntegrationWithFileWriter) {
364364
std::string index_path =
365365
InvertedIndexDescriptor::get_index_file_path_v1(index_path_prefix, index_id, "");
366366

367-
auto index_file_writer = std::make_unique<InvertedIndexFileWriter>(
367+
auto index_file_writer = std::make_unique<XIndexFileWriter>(
368368
io::global_local_filesystem(), index_path_prefix, rowset_id, seg_id,
369369
InvertedIndexStorageFormatPB::V1);
370370

@@ -411,7 +411,7 @@ TEST_F(DorisCompoundReaderTest, IntegrationWithFileWriter) {
411411
Status st = io::global_local_filesystem()->create_file(index_path, &file_writer, &opts);
412412
ASSERT_TRUE(st.ok()) << st;
413413

414-
auto index_file_writer = std::make_unique<InvertedIndexFileWriter>(
414+
auto index_file_writer = std::make_unique<XIndexFileWriter>(
415415
io::global_local_filesystem(), index_path_prefix, rowset_id, seg_id,
416416
InvertedIndexStorageFormatPB::V2, std::move(file_writer));
417417

0 commit comments

Comments
 (0)