This is an automated email from the ASF dual-hosted git repository.
airborne pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/doris.git
The following commit(s) were added to refs/heads/master by this push:
new 81ff2a081cc [Fix](inverted index) fix missed array inverted index null
bitmap (#38907)
81ff2a081cc is described below
commit 81ff2a081cc766f0f5ffff9850064f18d611d77d
Author: airborne12 <[email protected]>
AuthorDate: Tue Aug 6 14:05:58 2024 +0800
[Fix](inverted index) fix missed array inverted index null bitmap (#38907)
## Proposed changes
We forgot to set null bitmap in inverted index for array values.
In this PR, we added it.
---
be/src/olap/rowset/segment_v2/column_writer.cpp | 9 +++++++++
be/src/olap/rowset/segment_v2/inverted_index_writer.cpp | 5 +++++
be/src/olap/rowset/segment_v2/inverted_index_writer.h | 1 +
3 files changed, 15 insertions(+)
diff --git a/be/src/olap/rowset/segment_v2/column_writer.cpp
b/be/src/olap/rowset/segment_v2/column_writer.cpp
index 798cbe08261..9e748a01db2 100644
--- a/be/src/olap/rowset/segment_v2/column_writer.cpp
+++ b/be/src/olap/rowset/segment_v2/column_writer.cpp
@@ -468,6 +468,7 @@ Status ScalarColumnWriter::init() {
return Status::OK();
}
Status add_nulls(uint32_t count) override { return
Status::OK(); }
+ Status add_array_nulls(uint32_t row_id) override { return
Status::OK(); }
Status finish() override { return Status::OK(); }
int64_t size() const override { return 0; }
void close_on_error() override {}
@@ -946,10 +947,18 @@ Status ArrayColumnWriter::append_nullable(const uint8_t*
null_map, const uint8_t
size_t num_rows) {
RETURN_IF_ERROR(append_data(ptr, num_rows));
if (is_nullable()) {
+ if (_opts.need_inverted_index) {
+ for (int row_id = 0; row_id < num_rows; row_id++) {
+ if (null_map[row_id] == 1) {
+
RETURN_IF_ERROR(_inverted_index_builder->add_array_nulls(row_id));
+ }
+ }
+ }
RETURN_IF_ERROR(_null_writer->append_data(&null_map, num_rows));
}
return Status::OK();
}
+
Status ArrayColumnWriter::finish() {
RETURN_IF_ERROR(_offset_writer->finish());
if (is_nullable()) {
diff --git a/be/src/olap/rowset/segment_v2/inverted_index_writer.cpp
b/be/src/olap/rowset/segment_v2/inverted_index_writer.cpp
index eea9179a2cf..f40bcb38c13 100644
--- a/be/src/olap/rowset/segment_v2/inverted_index_writer.cpp
+++ b/be/src/olap/rowset/segment_v2/inverted_index_writer.cpp
@@ -309,6 +309,11 @@ public:
return Status::OK();
}
+ Status add_array_nulls(uint32_t row_id) override {
+ _null_bitmap.add(row_id);
+ return Status::OK();
+ }
+
void new_inverted_index_field(const char* field_value_data, size_t
field_value_size) {
if (_parser_type != InvertedIndexParserType::PARSER_UNKNOWN &&
_parser_type != InvertedIndexParserType::PARSER_NONE) {
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 9a071f5bfdd..63c1e219e64 100644
--- a/be/src/olap/rowset/segment_v2/inverted_index_writer.h
+++ b/be/src/olap/rowset/segment_v2/inverted_index_writer.h
@@ -64,6 +64,7 @@ public:
size_t count) = 0;
virtual Status add_nulls(uint32_t count) = 0;
+ virtual Status add_array_nulls(uint32_t row_id) = 0;
virtual Status finish() = 0;
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
