Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions be/src/index-tools/index_tool.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,7 @@ DEFINE_string(pred_type, "", "inverted index term query predicate, eq/lt/gt/le/g
DEFINE_bool(print_row_id, false, "print row id when query terms");
DEFINE_bool(print_doc_id, false, "print doc id when check terms stats");
// only for debug index compaction
DEFINE_int32(idx_id, -1, "inverted index id");
DEFINE_int64(idx_id, -1, "inverted index id");
DEFINE_string(src_idx_dirs_file, "", "source segment index files");
DEFINE_string(dest_idx_dirs_file, "", "destination segment index files");
DEFINE_string(dest_seg_num_rows_file, "", "destination segment number of rows");
Expand Down Expand Up @@ -276,7 +276,7 @@ int main(int argc, char** argv) {
return true;
};

int32_t index_id = FLAGS_idx_id;
int64_t index_id = FLAGS_idx_id;
std::string tablet_path = FLAGS_tablet_path;
std::string src_index_dirs_string;
std::string dest_index_dirs_string;
Expand Down
1 change: 1 addition & 0 deletions be/src/olap/rowset/rowset_writer_context.h
Original file line number Diff line number Diff line change
Expand Up @@ -83,6 +83,7 @@ struct RowsetWriterContext {

int64_t newest_write_timestamp;
bool enable_unique_key_merge_on_write = false;
// store column_unique_id to skip write inverted index
std::set<int32_t> skip_inverted_index;
DataWriteType write_type = DataWriteType::TYPE_DEFAULT;
std::shared_ptr<Tablet> tablet = nullptr;
Expand Down
6 changes: 3 additions & 3 deletions be/src/olap/rowset/segment_v2/inverted_index_desc.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -28,13 +28,13 @@ const std::string index_suffix = ".idx";
const std::string index_name_separator = "_";

std::string InvertedIndexDescriptor::get_temporary_index_path(const std::string& segment_path,
uint32_t uuid) {
uint64_t uuid) {
return StripSuffixString(segment_path, segment_suffix) + index_name_separator +
std::to_string(uuid);
}

std::string InvertedIndexDescriptor::get_index_file_name(const std::string& segment_path,
uint32_t uuid) {
uint64_t uuid) {
return StripSuffixString(segment_path, segment_suffix) + index_name_separator +
std::to_string(uuid) + index_suffix;
}
Expand All @@ -53,4 +53,4 @@ std::string InvertedIndexDescriptor::local_inverted_index_path_segcompacted(
return fmt::format("{}/{}_{}-{}_{}.idx", tablet_path, rowset_id.to_string(), begin, end,
index_id);
}
} // namespace doris::segment_v2
} // namespace doris::segment_v2
6 changes: 3 additions & 3 deletions be/src/olap/rowset/segment_v2/inverted_index_desc.h
Original file line number Diff line number Diff line change
Expand Up @@ -28,8 +28,8 @@ namespace segment_v2 {

class InvertedIndexDescriptor {
public:
static std::string get_temporary_index_path(const std::string& segment_path, uint32_t uuid);
static std::string get_index_file_name(const std::string& path, uint32_t uuid);
static std::string get_temporary_index_path(const std::string& segment_path, uint64_t uuid);
static std::string get_index_file_name(const std::string& path, uint64_t uuid);
static const std::string get_temporary_null_bitmap_file_name() { return "null_bitmap"; }
static const std::string get_temporary_bkd_index_data_file_name() { return "bkd"; }
static const std::string get_temporary_bkd_index_meta_file_name() { return "bkd_meta"; }
Expand All @@ -45,4 +45,4 @@ class InvertedIndexDescriptor {
};

} // namespace segment_v2
} // namespace doris
} // namespace doris
2 changes: 1 addition & 1 deletion be/src/olap/rowset/segment_v2/inverted_index_reader.h
Original file line number Diff line number Diff line change
Expand Up @@ -91,7 +91,7 @@ class InvertedIndexReader : public std::enable_shared_from_this<InvertedIndexRea
virtual InvertedIndexReaderType type() = 0;
bool indexExists(io::Path& index_file_path);

[[nodiscard]] uint32_t get_index_id() const { return _index_meta.index_id(); }
[[nodiscard]] uint64_t get_index_id() const { return _index_meta.index_id(); }

[[nodiscard]] const std::map<string, string>& get_index_properties() const {
return _index_meta.properties();
Expand Down