rename flush_memtable and flush_single_memtable

kaijchen · Jul 6, 2023 · 949f180 · 949f180
1 parent c5c095c
commit 949f180
Show file tree

Hide file tree

Showing 5 changed files with 18 additions and 18 deletions.
diff --git a/be/src/olap/memtable_flush_executor.cpp b/be/src/olap/memtable_flush_executor.cpp
@@ -96,7 +96,7 @@ Status FlushToken::_do_flush_memtable(MemTable* memtable, int32_t segment_id, in
  int64_t duration_ns;
  SCOPED_RAW_TIMER(&duration_ns);
  std::unique_ptr<vectorized::Block> block = memtable->to_block();
- SKIP_MEMORY_CHECK(RETURN_IF_ERROR(_rowset_writer->flush_memtable(
+ SKIP_MEMORY_CHECK(RETURN_IF_ERROR(_rowset_writer->unfold_variant_column_and_flush_block(
  block.get(), segment_id, memtable->flush_mem_tracker(), flush_size)));
  _memtable_stat += memtable->stat();
  DorisMetrics::instance()->memtable_flush_total->increment(1);

diff --git a/be/src/olap/rowset/beta_rowset_writer.cpp b/be/src/olap/rowset/beta_rowset_writer.cpp
@@ -518,9 +518,9 @@ Status BetaRowsetWriter::flush() {
  return Status::OK();
 }
 
-Status BetaRowsetWriter::flush_memtable(vectorized::Block* block, int32_t segment_id,
-  const std::shared_ptr<MemTracker>& flush_mem_tracker,
-   int64_t* flush_size) {
+Status BetaRowsetWriter::unfold_variant_column_and_flush_block(
+ vectorized::Block* block, int32_t segment_id,
+ const std::shared_ptr<MemTracker>& flush_mem_tracker, int64_t* flush_size) {
  SCOPED_CONSUME_MEM_TRACKER(flush_mem_tracker);
 
  FlushContext ctx;
@@ -531,12 +531,12 @@ Status BetaRowsetWriter::flush_memtable(vectorized::Block* block, int32_t segmen
  }
  ctx.segment_id = std::optional<int32_t> {segment_id};
  SCOPED_RAW_TIMER(&_segment_writer_ns);
- RETURN_IF_ERROR(flush_single_memtable(block, flush_size, &ctx));
+ RETURN_IF_ERROR(flush_single_block(block, flush_size, &ctx));
  return Status::OK();
 }
 
-Status BetaRowsetWriter::flush_single_memtable(const vectorized::Block* block, int64* flush_size,
-  const FlushContext* ctx) {
+Status BetaRowsetWriter::flush_single_block(const vectorized::Block* block, int64* flush_size,
+ const FlushContext* ctx) {
  if (block->rows() == 0) {
  return Status::OK();
  }

diff --git a/be/src/olap/rowset/beta_rowset_writer.h b/be/src/olap/rowset/beta_rowset_writer.h
@@ -90,14 +90,14 @@ class BetaRowsetWriter : public RowsetWriter {
 
  Status flush() override;
 
- Status flush_memtable(vectorized::Block* block, int32_t segment_id,
-  const std::shared_ptr<MemTracker>& flush_mem_tracker,
-   int64_t* flush_size) override;
+ Status unfold_variant_column_and_flush_block(
+ vectorized::Block* block, int32_t segment_id,
+ const std::shared_ptr<MemTracker>& flush_mem_tracker, int64_t* flush_size) override;
 
  // Return the file size flushed to disk in "flush_size"
  // This method is thread-safe.
- Status flush_single_memtable(const vectorized::Block* block, int64_t* flush_size,
-  const FlushContext* ctx = nullptr) override;
+ Status flush_single_block(const vectorized::Block* block, int64_t* flush_size,
+ const FlushContext* ctx = nullptr) override;
 
  RowsetSharedPtr build() override;
 

diff --git a/be/src/olap/rowset/rowset_writer.h b/be/src/olap/rowset/rowset_writer.h
@@ -72,14 +72,14 @@ class RowsetWriter {
  }
  virtual Status final_flush() { return Status::Error<ErrorCode::NOT_IMPLEMENTED_ERROR>(); }
 
- virtual Status flush_memtable(vectorized::Block* block, int32_t segment_id,
-  const std::shared_ptr<MemTracker>& flush_mem_tracker,
-   int64_t* flush_size) {
+ virtual Status unfold_variant_column_and_flush_block(
+ vectorized::Block* block, int32_t segment_id,
+ const std::shared_ptr<MemTracker>& flush_mem_tracker, int64_t* flush_size) {
  return Status::Error<ErrorCode::NOT_IMPLEMENTED_ERROR>();
  }
 
- virtual Status flush_single_memtable(const vectorized::Block* block, int64_t* flush_size,
-  const FlushContext* ctx = nullptr) {
+ virtual Status flush_single_block(const vectorized::Block* block, int64_t* flush_size,
+ const FlushContext* ctx = nullptr) {
  return Status::Error<ErrorCode::NOT_IMPLEMENTED_ERROR>();
  }
 

diff --git a/be/src/olap/tablet.cpp b/be/src/olap/tablet.cpp
@@ -2955,7 +2955,7 @@ Status Tablet::calc_segment_delete_bitmap(RowsetSharedPtr rowset,
  rowset_schema, read_plan_ori, read_plan_update, rsid_to_rowset, &block));
  sort_block(block, ordered_block);
  int64_t size;
- RETURN_IF_ERROR(rowset_writer->flush_single_memtable(&ordered_block, &size));
+ RETURN_IF_ERROR(rowset_writer->flush_single_block(&ordered_block, &size));
  }
  LOG(INFO) << "calc segment delete bitmap, tablet: " << tablet_id() << " rowset: " << rowset_id
  << " seg_id: " << seg->id() << " dummy_version: " << end_version + 1