f

yiguolei · Jan 15, 2025 · 5e9c30c · 5e9c30c
1 parent f8b6a8f
commit 5e9c30c
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 7 deletions.
diff --git a/be/src/olap/memtable.cpp b/be/src/olap/memtable.cpp
@@ -401,7 +401,7 @@ Status MemTable::_sort_by_cluster_keys() {
                                           row_pos_vec.data() + in_block.rows(), &column_offset);
 }
 
-void MemTable::_sort_one_column(DorisVector<RowInBlock*>& row_in_blocks, Tie& tie,
+void MemTable::_sort_one_column(std::vector<RowInBlock*>& row_in_blocks, Tie& tie,
                                 std::function<int(const RowInBlock*, const RowInBlock*)> cmp) {
     auto iter = tie.iter();
     while (iter.next()) {
@@ -473,7 +473,7 @@ void MemTable::_aggregate() {
             vectorized::MutableBlock::build_mutable_block(&in_block);
     _vec_row_comparator->set_block(&mutable_block);
     auto& block_data = in_block.get_columns_with_type_and_name();
-    DorisVector<RowInBlock*> temp_row_in_blocks;
+    std::vector<RowInBlock*> temp_row_in_blocks;
     temp_row_in_blocks.reserve(_last_sorted_pos);
     RowInBlock* prev_row = nullptr;
     int row_pos = -1;

diff --git a/be/src/olap/memtable.h b/be/src/olap/memtable.h
@@ -183,7 +183,7 @@ class MemTable {
     size_t memory_usage() const { return _mem_tracker->consumption(); }
     size_t get_flush_reserve_memory_size() const;
     // insert tuple from (row_pos) to (row_pos+num_rows)
-    Status insert(const vectorized::Block* block, const DorisVector<uint32_t>& row_idxs);
+    Status insert(const vectorized::Block* block, const std::vector<uint32_t>& row_idxs);
 
     void shrink_memtable_by_agg();
 
@@ -252,7 +252,7 @@ class MemTable {
     //return number of same keys
     size_t _sort();
     Status _sort_by_cluster_keys();
-    void _sort_one_column(DorisVector<RowInBlock*>& row_in_blocks, Tie& tie,
+    void _sort_one_column(std::vector<RowInBlock*>& row_in_blocks, Tie& tie,
                           std::function<int(const RowInBlock*, const RowInBlock*)> cmp);
     template <bool is_final>
     void _finalize_one_row(RowInBlock* row, const vectorized::ColumnsWithTypeAndName& block_data,
@@ -263,10 +263,10 @@ class MemTable {
     bool _is_first_insertion;
 
     void _init_agg_functions(const vectorized::Block* block);
-    DorisVector<vectorized::AggregateFunctionPtr> _agg_functions;
-    DorisVector<size_t> _offsets_of_aggregate_states;
+    std::vector<vectorized::AggregateFunctionPtr> _agg_functions;
+    std::vector<size_t> _offsets_of_aggregate_states;
     size_t _total_size_of_aggregate_states;
-    DorisVector<RowInBlock*> _row_in_blocks;
+    std::vector<RowInBlock*> _row_in_blocks;
 
     size_t _num_columns;
     int32_t _seq_col_idx_in_block = -1;