[GitHub] [incubator-doris] wangbo commented on a diff in pull request #9157: [Refactor] Refactor the code of vec stream load

[GitBox]

wangbo commented on code in PR #9157:
URL: https://github.com/apache/incubator-doris/pull/9157#discussion_r858282574


##########
be/src/olap/memtable.cpp:
##########
@@ -145,38 +126,33 @@ void MemTable::insert(const vectorized::Block* block, 
size_t row_pos, size_t num
     _mem_tracker->consume(newsize - oldsize);
 
     for(int i = 0; i < num_rows; i++){       
-        RowInBlock* row_in_block_ptr = new RowInBlock(cursor_in_mutableblock + 
i);
-        rowInBlocks.push_back(row_in_block_ptr);
-        insert_one_row_from_block(row_in_block_ptr);
+        _row_in_blocks.emplace_back(new RowInBlock{cursor_in_mutableblock + 
i});
+        _insert_one_row_from_block(_row_in_blocks.back());
     }   
 }
 
-void MemTable::insert_one_row_from_block(RowInBlock* row_in_block_ptr)
-{
+void MemTable::_insert_one_row_from_block(RowInBlock* row_in_block) {
     _rows++;
     bool overwritten = false;
-    if (_keys_type == KeysType::DUP_KEYS)
-    {
-        _vec_skip_list->Insert(row_in_block_ptr, &overwritten);
+    if (_keys_type == KeysType::DUP_KEYS) {
+        _vec_skip_list->Insert(row_in_block, &overwritten);
         DCHECK(!overwritten) << "Duplicate key model meet overwrite in 
SkipList";
         return;
     }
-    bool is_exist = _vec_skip_list->Find(row_in_block_ptr, &_vec_hint);
+
+    bool is_exist = _vec_skip_list->Find(row_in_block, &_vec_hint);
     if (is_exist){
-        _aggregate_two_rowInBlock(row_in_block_ptr, _vec_hint.curr->key);
-    }else{
-        row_in_block_ptr->init_agg_places(_agg_functions, 
_schema->num_key_columns());
-        for ( auto cid = _schema->num_key_columns(); cid < 
_schema->num_columns(); cid++){
+        _aggregate_two_row_in_block(row_in_block, _vec_hint.curr->key);
+    } else {
+        row_in_block->init_agg_places(_agg_functions, 
_schema->num_key_columns());
+        for (auto cid = _schema->num_key_columns(); cid < 
_schema->num_columns(); cid++){
             auto col_ptr = _input_mutable_block.mutable_columns()[cid].get();
-            auto place = row_in_block_ptr->_agg_places[cid];
-            _agg_functions[cid]->add(place, 
-                    const_cast<const doris::vectorized::IColumn**>( &col_ptr),
-                    row_in_block_ptr->_row_pos,
-                    nullptr
-                    );
+            auto place = row_in_block->_agg_places[cid];
+            _agg_functions[cid]->add(place, const_cast<const 
doris::vectorized::IColumn**>( &col_ptr),

Review Comment:
   ```suggestion
               _agg_functions[cid]->add(place, const_cast<const 
doris::vectorized::IColumn**>(&col_ptr),
   ```



-- 
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.

To unsubscribe, e-mail: commits-unsubscr...@doris.apache.org

For queries about this service, please contact Infrastructure at:
us...@infra.apache.org


---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscr...@doris.apache.org
For additional commands, e-mail: commits-h...@doris.apache.org