From 219952586c4d46b8b616bba6d6c34d51008c4c65 Mon Sep 17 00:00:00 2001 From: Kang Date: Sat, 18 Feb 2023 11:01:48 +0800 Subject: [PATCH 1/3] fix topn read_orderby_key_columns nullptr --- be/src/olap/reader.cpp | 4 ---- be/src/vec/olap/vcollect_iterator.cpp | 4 ++++ 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/be/src/olap/reader.cpp b/be/src/olap/reader.cpp index ba828b01beea70..ecda9380525ac9 100644 --- a/be/src/olap/reader.cpp +++ b/be/src/olap/reader.cpp @@ -412,10 +412,6 @@ Status TabletReader::_init_keys_param(const ReaderParams& read_params) { } Status TabletReader::_init_orderby_keys_param(const ReaderParams& read_params) { - if (read_params.start_key.empty()) { - return Status::OK(); - } - // UNIQUE_KEYS will compare all keys as before if (_tablet_schema->keys_type() == DUP_KEYS || (_tablet_schema->keys_type() == UNIQUE_KEYS && _tablet->enable_unique_key_merge_on_write())) { diff --git a/be/src/vec/olap/vcollect_iterator.cpp b/be/src/vec/olap/vcollect_iterator.cpp index 7231ad1453f3da..a0a8b3136bb86d 100644 --- a/be/src/vec/olap/vcollect_iterator.cpp +++ b/be/src/vec/olap/vcollect_iterator.cpp @@ -245,6 +245,10 @@ Status VCollectIterator::_topn_next(Block* block) { auto cloneBlock = block->clone_empty(); MutableBlock mutable_block = vectorized::MutableBlock::build_mutable_block(&cloneBlock); + if (!_reader->_reader_context.read_orderby_key_columns) { + return Status::Error("read_orderby_key_columns should not be nullptr"); + } + size_t first_sort_column_idx = (*_reader->_reader_context.read_orderby_key_columns)[0]; const std::vector* sort_columns = _reader->_reader_context.read_orderby_key_columns; From c2d291f8ff7be2f5961f6478bb13f2608ab81b49 Mon Sep 17 00:00:00 2001 From: Kang Date: Sat, 18 Feb 2023 11:15:57 +0800 Subject: [PATCH 2/3] fix INTERNAL_ERROR --- be/src/vec/olap/vcollect_iterator.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/be/src/vec/olap/vcollect_iterator.cpp b/be/src/vec/olap/vcollect_iterator.cpp index a0a8b3136bb86d..bf14dfe5b7f7f8 100644 --- a/be/src/vec/olap/vcollect_iterator.cpp +++ b/be/src/vec/olap/vcollect_iterator.cpp @@ -246,7 +246,7 @@ Status VCollectIterator::_topn_next(Block* block) { MutableBlock mutable_block = vectorized::MutableBlock::build_mutable_block(&cloneBlock); if (!_reader->_reader_context.read_orderby_key_columns) { - return Status::Error("read_orderby_key_columns should not be nullptr"); + return Status::Error("read_orderby_key_columns should not be nullptr"); } size_t first_sort_column_idx = (*_reader->_reader_context.read_orderby_key_columns)[0]; From 67d710a12cb4bfebcc7d95f3c0bce37ccf045cfe Mon Sep 17 00:00:00 2001 From: Kang Date: Sat, 18 Feb 2023 16:20:59 +0800 Subject: [PATCH 3/3] clang format --- be/src/vec/olap/vcollect_iterator.cpp | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/be/src/vec/olap/vcollect_iterator.cpp b/be/src/vec/olap/vcollect_iterator.cpp index bf14dfe5b7f7f8..714c2ffd99bc07 100644 --- a/be/src/vec/olap/vcollect_iterator.cpp +++ b/be/src/vec/olap/vcollect_iterator.cpp @@ -246,7 +246,8 @@ Status VCollectIterator::_topn_next(Block* block) { MutableBlock mutable_block = vectorized::MutableBlock::build_mutable_block(&cloneBlock); if (!_reader->_reader_context.read_orderby_key_columns) { - return Status::Error("read_orderby_key_columns should not be nullptr"); + return Status::Error( + "read_orderby_key_columns should not be nullptr"); } size_t first_sort_column_idx = (*_reader->_reader_context.read_orderby_key_columns)[0];