You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@doris.apache.org by yi...@apache.org on 2023/04/03 01:14:11 UTC
[doris] branch master updated: [fix](load) handle null map right in OlapDataConvertor (#18236)
This is an automated email from the ASF dual-hosted git repository.
yiguolei 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 b66e9f8906 [fix](load) handle null map right in OlapDataConvertor (#18236)
b66e9f8906 is described below
commit b66e9f89061e1e141393a0faf90c1495f73eccf9
Author: Xin Liao <li...@126.com>
AuthorDate: Mon Apr 3 09:14:05 2023 +0800
[fix](load) handle null map right in OlapDataConvertor (#18236)
The offset of _nullmap and _value are inconsistent in OlapDataConvertor, so the obtained null flag is incorrect when calling get_ data_ at function. When the key column or sequence column has null values, the encoding of the short key index or primary key index may be wrong.
This was introduced by #10883 #10925.
---
be/src/vec/olap/olap_data_convertor.cpp | 17 +++++++++--------
be/src/vec/olap/olap_data_convertor.h | 16 ++++++++--------
2 files changed, 17 insertions(+), 16 deletions(-)
diff --git a/be/src/vec/olap/olap_data_convertor.cpp b/be/src/vec/olap/olap_data_convertor.cpp
index df29202eb7..c45014da8b 100644
--- a/be/src/vec/olap/olap_data_convertor.cpp
+++ b/be/src/vec/olap/olap_data_convertor.cpp
@@ -195,8 +195,9 @@ void OlapBlockDataConvertor::OlapColumnDataConvertorBase::clear_source_column()
_nullmap = nullptr;
}
-// This should be called only in SegmentWriter. If you want to access nullmap in Convertor,
-// use `_nullmap` directly.
+// Obtain the converted nullmap with an offset of _row_pos.
+// This should be called only in SegmentWriter and `get_data_at` in Convertor.
+// If you want to access origin nullmap without offset, use `_nullmap` directly.
const UInt8* OlapBlockDataConvertor::OlapColumnDataConvertorBase::get_nullmap() const {
assert(_typed_column.column);
return _nullmap ? _nullmap + _row_pos : nullptr;
@@ -218,8 +219,8 @@ const void* OlapBlockDataConvertor::OlapColumnDataConvertorObject::get_data() co
const void* OlapBlockDataConvertor::OlapColumnDataConvertorObject::get_data_at(
size_t offset) const {
UInt8 null_flag = 0;
- if (_nullmap) {
- null_flag = _nullmap[offset];
+ if (get_nullmap()) {
+ null_flag = get_nullmap()[offset];
}
return null_flag ? nullptr : _slice.data() + offset;
}
@@ -474,8 +475,8 @@ const void* OlapBlockDataConvertor::OlapColumnDataConvertorChar::get_data() cons
const void* OlapBlockDataConvertor::OlapColumnDataConvertorChar::get_data_at(size_t offset) const {
UInt8 null_flag = 0;
- if (_nullmap) {
- null_flag = _nullmap[offset];
+ if (get_nullmap()) {
+ null_flag = get_nullmap()[offset];
}
return null_flag ? nullptr : _slice.data() + offset;
}
@@ -530,8 +531,8 @@ const void* OlapBlockDataConvertor::OlapColumnDataConvertorVarChar::get_data_at(
size_t offset) const {
assert(offset < _slice.size());
UInt8 null_flag = 0;
- if (_nullmap) {
- null_flag = _nullmap[offset];
+ if (get_nullmap()) {
+ null_flag = get_nullmap()[offset];
}
return null_flag ? nullptr : _slice.data() + offset;
}
diff --git a/be/src/vec/olap/olap_data_convertor.h b/be/src/vec/olap/olap_data_convertor.h
index 98801700de..05f202f8dd 100644
--- a/be/src/vec/olap/olap_data_convertor.h
+++ b/be/src/vec/olap/olap_data_convertor.h
@@ -191,8 +191,8 @@ private:
const void* get_data() const override { return _values.data(); }
const void* get_data_at(size_t offset) const override {
UInt8 null_flag = 0;
- if (_nullmap) {
- null_flag = _nullmap[offset];
+ if (get_nullmap()) {
+ null_flag = get_nullmap()[offset];
}
return null_flag ? nullptr : _values.data() + offset;
}
@@ -233,8 +233,8 @@ private:
const void* get_data_at(size_t offset) const override {
assert(offset < _num_rows);
UInt8 null_flag = 0;
- if (_nullmap) {
- null_flag = _nullmap[offset];
+ if (get_nullmap()) {
+ null_flag = get_nullmap()[offset];
}
return null_flag ? nullptr : _values + offset;
}
@@ -275,8 +275,8 @@ private:
const void* get_data_at(size_t offset) const override {
assert(offset < _num_rows);
UInt8 null_flag = 0;
- if (_nullmap) {
- null_flag = _nullmap[offset];
+ if (get_nullmap()) {
+ null_flag = get_nullmap()[offset];
}
return null_flag ? nullptr : values_ + offset;
}
@@ -317,8 +317,8 @@ private:
const void* get_data_at(size_t offset) const override {
assert(offset < _num_rows);
UInt8 null_flag = 0;
- if (_nullmap) {
- null_flag = _nullmap[offset];
+ if (get_nullmap()) {
+ null_flag = get_nullmap()[offset];
}
return null_flag ? nullptr : values_ + offset;
}
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@doris.apache.org
For additional commands, e-mail: commits-help@doris.apache.org