[Fix](Variant) use uinque id to access column reader (#39841)#40269
[Fix](Variant) use uinque id to access column reader (#39841)#40269eldenmoon merged 4 commits intoapache:branch-2.1from
Conversation
|
Thank you for your contribution to Apache Doris. Since 2024-03-18, the Document has been moved to doris-website. |
|
run buildall |
eldenmoon
force-pushed
the
branch-2.1-p3
branch
from
7b1ced6 to
fc653a8
Compare
|
run buildall |
![github-actions[bot]](https://avatars.githubusercontent.com/in/15368?s=60&v=4){kind=small}
|
run buildall |
| @@ -523,22 +549,23 @@ Status Segment::_new_iterator_with_variant_root(const TabletColumn& tablet_colum | |||
| Status Segment::new_column_iterator_with_path(const TabletColumn& tablet_column, | |||
There was a problem hiding this comment.
warning: function 'new_column_iterator_with_path' has cognitive complexity of 77 (threshold 50) [readability-function-cognitive-complexity]
Status Segment::new_column_iterator_with_path(const TabletColumn& tablet_column,
^Additional context
be/src/olap/rowset/segment_v2/segment.cpp:552: +1, including nesting penalty of 0, nesting level increased to 1
int32_t unique_id = tablet_column.unique_id() > 0 ? tablet_column.unique_id()
^be/src/olap/rowset/segment_v2/segment.cpp:554: +1, including nesting penalty of 0, nesting level increased to 1
if (!_sub_column_tree.contains(unique_id)) {
^be/src/olap/rowset/segment_v2/segment.cpp:556: +2, including nesting penalty of 1, nesting level increased to 2
RETURN_IF_ERROR(new_default_iterator(tablet_column, iter));
^be/src/common/status.h:619: expanded from macro 'RETURN_IF_ERROR'
do { \
^be/src/olap/rowset/segment_v2/segment.cpp:556: +3, including nesting penalty of 2, nesting level increased to 3
RETURN_IF_ERROR(new_default_iterator(tablet_column, iter));
^be/src/common/status.h:621: expanded from macro 'RETURN_IF_ERROR'
if (UNLIKELY(!_status_.ok())) { \
^be/src/olap/rowset/segment_v2/segment.cpp:570: nesting level increased to 1
auto type_to_read_flat_leaves = [](ReaderType type) {
^be/src/olap/rowset/segment_v2/segment.cpp:575: +1
type == ReaderType::READER_FULL_COMPACTION || type == ReaderType::READER_CHECKSUM;
^be/src/olap/rowset/segment_v2/segment.cpp:578: +1, including nesting penalty of 0, nesting level increased to 1
if (opt != nullptr && type_to_read_flat_leaves(opt->io_ctx.reader_type)) {
^be/src/olap/rowset/segment_v2/segment.cpp:578: +1
if (opt != nullptr && type_to_read_flat_leaves(opt->io_ctx.reader_type)) {
^be/src/olap/rowset/segment_v2/segment.cpp:583: +2, including nesting penalty of 1, nesting level increased to 2
if (!node) {
^be/src/olap/rowset/segment_v2/segment.cpp:585: +3, including nesting penalty of 2, nesting level increased to 3
if (sparse_node != nullptr && sparse_node->is_leaf_node()) {
^be/src/olap/rowset/segment_v2/segment.cpp:585: +1
if (sparse_node != nullptr && sparse_node->is_leaf_node()) {
^be/src/olap/rowset/segment_v2/segment.cpp:586: +4, including nesting penalty of 3, nesting level increased to 4
RETURN_IF_ERROR(_new_iterator_with_variant_root(
^be/src/common/status.h:619: expanded from macro 'RETURN_IF_ERROR'
do { \
^be/src/olap/rowset/segment_v2/segment.cpp:586: +5, including nesting penalty of 4, nesting level increased to 5
RETURN_IF_ERROR(_new_iterator_with_variant_root(
^be/src/common/status.h:621: expanded from macro 'RETURN_IF_ERROR'
if (UNLIKELY(!_status_.ok())) { \
^be/src/olap/rowset/segment_v2/segment.cpp:588: +1, nesting level increased to 3
} else {
^be/src/olap/rowset/segment_v2/segment.cpp:589: +4, including nesting penalty of 3, nesting level increased to 4
RETURN_IF_ERROR(new_default_iterator(tablet_column, iter));
^be/src/common/status.h:619: expanded from macro 'RETURN_IF_ERROR'
do { \
^be/src/olap/rowset/segment_v2/segment.cpp:589: +5, including nesting penalty of 4, nesting level increased to 5
RETURN_IF_ERROR(new_default_iterator(tablet_column, iter));
^be/src/common/status.h:621: expanded from macro 'RETURN_IF_ERROR'
if (UNLIKELY(!_status_.ok())) { \
^be/src/olap/rowset/segment_v2/segment.cpp:594: +2, including nesting penalty of 1, nesting level increased to 2
RETURN_IF_ERROR(node->data.reader->new_iterator(&it));
^be/src/common/status.h:619: expanded from macro 'RETURN_IF_ERROR'
do { \
^be/src/olap/rowset/segment_v2/segment.cpp:594: +3, including nesting penalty of 2, nesting level increased to 3
RETURN_IF_ERROR(node->data.reader->new_iterator(&it));
^be/src/common/status.h:621: expanded from macro 'RETURN_IF_ERROR'
if (UNLIKELY(!_status_.ok())) { \
^be/src/olap/rowset/segment_v2/segment.cpp:599: +1, including nesting penalty of 0, nesting level increased to 1
if (node != nullptr) {
^be/src/olap/rowset/segment_v2/segment.cpp:600: +2, including nesting penalty of 1, nesting level increased to 2
if (node->is_leaf_node() && sparse_node == nullptr) {
^be/src/olap/rowset/segment_v2/segment.cpp:600: +1
if (node->is_leaf_node() && sparse_node == nullptr) {
^be/src/olap/rowset/segment_v2/segment.cpp:605: +3, including nesting penalty of 2, nesting level increased to 3
RETURN_IF_ERROR(node->data.reader->new_iterator(&it));
^be/src/common/status.h:619: expanded from macro 'RETURN_IF_ERROR'
do { \
^be/src/olap/rowset/segment_v2/segment.cpp:605: +4, including nesting penalty of 3, nesting level increased to 4
RETURN_IF_ERROR(node->data.reader->new_iterator(&it));
^be/src/common/status.h:621: expanded from macro 'RETURN_IF_ERROR'
if (UNLIKELY(!_status_.ok())) { \
^be/src/olap/rowset/segment_v2/segment.cpp:607: +1, nesting level increased to 2
} else {
^be/src/olap/rowset/segment_v2/segment.cpp:610: +3, including nesting penalty of 2, nesting level increased to 3
RETURN_IF_ERROR(HierarchicalDataReader::create(iter, relative_path, node, root));
^be/src/common/status.h:619: expanded from macro 'RETURN_IF_ERROR'
do { \
^be/src/olap/rowset/segment_v2/segment.cpp:610: +4, including nesting penalty of 3, nesting level increased to 4
RETURN_IF_ERROR(HierarchicalDataReader::create(iter, relative_path, node, root));
^be/src/common/status.h:621: expanded from macro 'RETURN_IF_ERROR'
if (UNLIKELY(!_status_.ok())) { \
^be/src/olap/rowset/segment_v2/segment.cpp:612: +1, nesting level increased to 1
} else {
^be/src/olap/rowset/segment_v2/segment.cpp:614: +2, including nesting penalty of 1, nesting level increased to 2
if (sparse_node != nullptr) {
^be/src/olap/rowset/segment_v2/segment.cpp:616: +3, including nesting penalty of 2, nesting level increased to 3
RETURN_IF_ERROR(_new_iterator_with_variant_root(tablet_column, iter, root,
^be/src/common/status.h:619: expanded from macro 'RETURN_IF_ERROR'
do { \
^be/src/olap/rowset/segment_v2/segment.cpp:616: +4, including nesting penalty of 3, nesting level increased to 4
RETURN_IF_ERROR(_new_iterator_with_variant_root(tablet_column, iter, root,
^be/src/common/status.h:621: expanded from macro 'RETURN_IF_ERROR'
if (UNLIKELY(!_status_.ok())) { \
^be/src/olap/rowset/segment_v2/segment.cpp:618: +1, nesting level increased to 2
} else {
^be/src/olap/rowset/segment_v2/segment.cpp:620: +3, including nesting penalty of 2, nesting level increased to 3
RETURN_IF_ERROR(new_default_iterator(tablet_column, iter));
^be/src/common/status.h:619: expanded from macro 'RETURN_IF_ERROR'
do { \
^be/src/olap/rowset/segment_v2/segment.cpp:620: +4, including nesting penalty of 3, nesting level increased to 4
RETURN_IF_ERROR(new_default_iterator(tablet_column, iter));
^be/src/common/status.h:621: expanded from macro 'RETURN_IF_ERROR'
if (UNLIKELY(!_status_.ok())) { \
^
Currently, the variant type is not supported rename column because its column reader accesses columns by path rather than by unique ID. If the name is modified, the column reader may not locate the column correctly.So we should access by unique id
eldenmoon
force-pushed
the
branch-2.1-p3
branch
from
76bb27d to
2a389cd
Compare
|
run buildall |
|
run buildall |
|
run buildall |
2 participants
#39841
#40295