This is an automated email from the ASF dual-hosted git repository.
dataroaring pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/doris.git
The following commit(s) were added to refs/heads/master by this push:
new dd02ea09072 [feature](merge-cloud) Init calc delete bitmap executor
for cloud storage engine (#30740)
dd02ea09072 is described below
commit dd02ea090722b3bc08d293973f8767175e51d758
Author: walter <[email protected]>
AuthorDate: Fri Feb 2 21:33:51 2024 +0800
[feature](merge-cloud) Init calc delete bitmap executor for cloud storage
engine (#30740)
---
be/src/cloud/cloud_rowset_builder.cpp | 3 +--
be/src/cloud/cloud_storage_engine.cpp | 3 +++
be/src/olap/storage_engine.cpp | 1 -
be/src/olap/storage_engine.h | 10 ++++------
be/src/vec/core/block.cpp | 2 +-
5 files changed, 9 insertions(+), 10 deletions(-)
diff --git a/be/src/cloud/cloud_rowset_builder.cpp
b/be/src/cloud/cloud_rowset_builder.cpp
index 74e65627746..2ac7f2e3337 100644
--- a/be/src/cloud/cloud_rowset_builder.cpp
+++ b/be/src/cloud/cloud_rowset_builder.cpp
@@ -64,8 +64,7 @@ Status CloudRowsetBuilder::init() {
context.rowset_dir = _tablet->tablet_path();
_rowset_writer = DORIS_TRY(_tablet->create_rowset_writer(context, false));
- // TODO(plat1ko):
- //_calc_delete_bitmap_token =
_engine.calc_delete_bitmap_executor()->create_token();
+ _calc_delete_bitmap_token =
_engine.calc_delete_bitmap_executor()->create_token();
RETURN_IF_ERROR(_engine.meta_mgr().prepare_rowset(*_rowset_writer->rowset_meta(),
true));
diff --git a/be/src/cloud/cloud_storage_engine.cpp
b/be/src/cloud/cloud_storage_engine.cpp
index 284c0c0127a..8ca0d503e74 100644
--- a/be/src/cloud/cloud_storage_engine.cpp
+++ b/be/src/cloud/cloud_storage_engine.cpp
@@ -67,6 +67,9 @@ Status CloudStorageEngine::open() {
// TODO(plat1ko): Use file cache disks number?
_memtable_flush_executor->init(1);
+ _calc_delete_bitmap_executor =
std::make_unique<CalcDeleteBitmapExecutor>();
+ _calc_delete_bitmap_executor->init();
+
return Status::OK();
}
diff --git a/be/src/olap/storage_engine.cpp b/be/src/olap/storage_engine.cpp
index c02cb48f820..7323b955383 100644
--- a/be/src/olap/storage_engine.cpp
+++ b/be/src/olap/storage_engine.cpp
@@ -148,7 +148,6 @@ StorageEngine::StorageEngine(const EngineOptions& options)
_stop_background_threads_latch(1),
_tablet_manager(new TabletManager(*this,
config::tablet_map_shard_size)),
_txn_manager(new TxnManager(*this, config::txn_map_shard_size,
config::txn_shard_size)),
- _calc_delete_bitmap_executor(nullptr),
_default_rowset_type(BETA_ROWSET),
_stream_load_recorder(nullptr),
_create_tablet_idx_lru_cache(
diff --git a/be/src/olap/storage_engine.h b/be/src/olap/storage_engine.h
index b8e778ae750..8e24e5cddfc 100644
--- a/be/src/olap/storage_engine.h
+++ b/be/src/olap/storage_engine.h
@@ -121,6 +121,9 @@ public:
RowsetId next_rowset_id();
MemTableFlushExecutor* memtable_flush_executor() { return
_memtable_flush_executor.get(); }
+ CalcDeleteBitmapExecutor* calc_delete_bitmap_executor() {
+ return _calc_delete_bitmap_executor.get();
+ }
const std::shared_ptr<MemTracker>& segment_meta_mem_tracker() {
return _segment_meta_mem_tracker;
@@ -136,6 +139,7 @@ protected:
std::unique_ptr<RowsetIdGenerator> _rowset_id_generator;
std::unique_ptr<MemTableFlushExecutor> _memtable_flush_executor;
+ std::unique_ptr<CalcDeleteBitmapExecutor> _calc_delete_bitmap_executor;
// This mem tracker is only for tracking memory use by segment meta data
such as footer or index page.
// The memory consumed by querying is tracked in segment iterator.
@@ -203,10 +207,6 @@ public:
TxnManager* txn_manager() { return _txn_manager.get(); }
SnapshotManager* snapshot_mgr() { return _snapshot_mgr.get(); }
MemTableFlushExecutor* memtable_flush_executor() { return
_memtable_flush_executor.get(); }
- CalcDeleteBitmapExecutor* calc_delete_bitmap_executor() {
- return _calc_delete_bitmap_executor.get();
- }
-
// Rowset garbage collection helpers
bool check_rowset_id_in_unused_rowsets(const RowsetId& rowset_id);
PendingRowsetSet& pending_local_rowsets() { return _pending_local_rowsets;
}
@@ -439,8 +439,6 @@ private:
std::unique_ptr<TabletManager> _tablet_manager;
std::unique_ptr<TxnManager> _txn_manager;
- std::unique_ptr<CalcDeleteBitmapExecutor> _calc_delete_bitmap_executor;
-
// Used to control the migration from segment_v1 to segment_v2, can be
deleted in futrue.
// Type of new loaded data
RowsetTypePB _default_rowset_type;
diff --git a/be/src/vec/core/block.cpp b/be/src/vec/core/block.cpp
index dc9c90a3397..f4eddb65f57 100644
--- a/be/src/vec/core/block.cpp
+++ b/be/src/vec/core/block.cpp
@@ -742,7 +742,7 @@ void Block::filter_block_internal(Block* block, const
std::vector<uint32_t>& col
const auto result_size =
column->assume_mutable()->filter(filter);
if (result_size != count) {
throw Exception(ErrorCode::INTERNAL_ERROR,
- "result_size not euqal with
filter_size, result_size={}, "
+ "result_size not equal with
filter_size, result_size={}, "
"filter_size={}",
result_size, count);
}
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
