refractor for improve performance

apache · Oct 20, 2022 · 4de58b0 · 4de58b0
1 parent 7896f60
commit 4de58b0
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 12 deletions.
diff --git a/be/src/olap/rowset/segment_v2/segment_iterator.cpp b/be/src/olap/rowset/segment_v2/segment_iterator.cpp
@@ -1080,13 +1080,9 @@ Status SegmentIterator::next_batch(vectorized::Block* block) {
         for (size_t i = 0; i < _schema.num_column_ids(); i++) {
             auto cid = _schema.column_id(i);
             auto column_desc = _schema.column(cid);
-            if (column_desc->type() == OLAP_FIELD_TYPE_ARRAY) {
+            if (_is_pred_column[cid]) {
                 _current_return_columns[cid] =
-                        Schema::get_data_type_ptr(*column_desc)->create_column();
-                _current_return_columns[cid]->reserve(_opts.block_row_max);
-            } else if (_is_pred_column[cid]) {
-                _current_return_columns[cid] = Schema::get_predicate_column_nullable_ptr(
-                        column_desc->type(), column_desc->is_nullable());
+                        Schema::get_predicate_column_nullable_ptr(*column_desc);
                 _current_return_columns[cid]->reserve(_opts.block_row_max);
             } else if (i >= block->columns()) {
                 // if i >= block->columns means the column and not the pred_column means `column i` is

diff --git a/be/src/olap/schema.cpp b/be/src/olap/schema.cpp
@@ -114,10 +114,13 @@ vectorized::DataTypePtr Schema::get_data_type_ptr(const Field& field) {
     return vectorized::DataTypeFactory::instance().create_data_type(field);
 }
 
-vectorized::IColumn::MutablePtr Schema::get_predicate_column_nullable_ptr(FieldType type,
-                                                                          bool is_null) {
-    vectorized::IColumn::MutablePtr ptr = Schema::get_predicate_column_ptr(type);
-    if (is_null) {
+vectorized::IColumn::MutablePtr Schema::get_predicate_column_nullable_ptr(const Field& field) {
+    if (UNLIKELY(field.type() == OLAP_FIELD_TYPE_ARRAY)) {
+        return get_data_type_ptr(field)->create_column();
+    }
+
+    vectorized::IColumn::MutablePtr ptr = Schema::get_predicate_column_ptr(field.type());
+    if (field.is_nullable()) {
         return doris::vectorized::ColumnNullable::create(std::move(ptr),
                                                          doris::vectorized::ColumnUInt8::create());
     }

diff --git a/be/src/olap/schema.h b/be/src/olap/schema.h
@@ -112,8 +112,7 @@ class Schema {
 
     static vectorized::IColumn::MutablePtr get_predicate_column_ptr(FieldType type);
 
-    static vectorized::IColumn::MutablePtr get_predicate_column_nullable_ptr(FieldType type,
-                                                                             bool is_null = false);
+    static vectorized::IColumn::MutablePtr get_predicate_column_nullable_ptr(const Field& field);
 
     const std::vector<Field*>& columns() const { return _cols; }