This is an automated email from the ASF dual-hosted git repository.
morningman 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 14e44244716 [fix](typo) typo fix for 'delete bimap' changing to
'delete bitmap' (#32341)
14e44244716 is described below
commit 14e442447166bb94598c00154c020f2beeac1609
Author: DuRipeng <[email protected]>
AuthorDate: Sun Mar 31 17:58:10 2024 +0800
[fix](typo) typo fix for 'delete bimap' changing to 'delete bitmap' (#32341)
---
be/src/cloud/cloud_tablet.cpp | 2 +-
be/src/olap/tablet_meta.h | 8 ++++----
be/src/olap/tablet_meta_manager.cpp | 6 +++---
be/src/olap/tablet_meta_manager.h | 2 +-
be/src/olap/task/index_builder.cpp | 2 +-
be/test/olap/tablet_meta_manager_test.cpp | 4 ++--
6 files changed, 12 insertions(+), 12 deletions(-)
diff --git a/be/src/cloud/cloud_tablet.cpp b/be/src/cloud/cloud_tablet.cpp
index 7d3d8d3ecc7..099b31a9afd 100644
--- a/be/src/cloud/cloud_tablet.cpp
+++ b/be/src/cloud/cloud_tablet.cpp
@@ -593,7 +593,7 @@ Status CloudTablet::calc_delete_bitmap_for_compaciton(
}
location_map.clear();
- // 2. calc delete bimap for incremental data
+ // 2. calc delete bitmap for incremental data
RETURN_IF_ERROR(_engine.meta_mgr().get_delete_bitmap_update_lock(
*this, COMPACTION_DELETE_BITMAP_LOCK_ID, initiator));
RETURN_IF_ERROR(_engine.meta_mgr().sync_tablet_rowsets(this));
diff --git a/be/src/olap/tablet_meta.h b/be/src/olap/tablet_meta.h
index 6c5233eac53..3055effd1a7 100644
--- a/be/src/olap/tablet_meta.h
+++ b/be/src/olap/tablet_meta.h
@@ -397,13 +397,13 @@ public:
DeleteBitmap& operator=(DeleteBitmap&& r);
/**
- * Makes a snapshot of delete bimap, read lock will be acquired in this
+ * Makes a snapshot of delete bitmap, read lock will be acquired in this
* process
*/
DeleteBitmap snapshot() const;
/**
- * Makes a snapshot of delete bimap on given version, read lock will be
+ * Makes a snapshot of delete bitmap on given version, read lock will be
* acquired temporary in this process
*/
DeleteBitmap snapshot(Version version) const;
@@ -416,7 +416,7 @@ public:
/**
* Clears the deletetion mark specific row
*
- * @return non-zero if the associated delete bimap does not exist
+ * @return non-zero if the associated delete bitmap does not exist
*/
int remove(const BitmapKey& bmk, uint32_t row_id);
@@ -450,7 +450,7 @@ public:
* Gets a copy of specific delete bmk
*
* @param segment_delete_bitmap output param
- * @return non-zero if the associated delete bimap does not exist
+ * @return non-zero if the associated delete bitmap does not exist
*/
int get(const BitmapKey& bmk, roaring::Roaring* segment_delete_bitmap)
const;
diff --git a/be/src/olap/tablet_meta_manager.cpp
b/be/src/olap/tablet_meta_manager.cpp
index 3678bea0481..48fb9a9a41b 100644
--- a/be/src/olap/tablet_meta_manager.cpp
+++ b/be/src/olap/tablet_meta_manager.cpp
@@ -234,14 +234,14 @@ void TabletMetaManager::decode_delete_bitmap_key(const
string& enc_key, TTabletI
}
Status TabletMetaManager::save_delete_bitmap(DataDir* store, TTabletId
tablet_id,
- DeleteBitmapPtr delete_bimap,
int64_t version) {
+ DeleteBitmapPtr delete_bitmap,
int64_t version) {
VLOG_NOTICE << "save delete bitmap, tablet_id:" << tablet_id << ",
version: " << version;
- if (delete_bimap->delete_bitmap.empty()) {
+ if (delete_bitmap->delete_bitmap.empty()) {
return Status::OK();
}
OlapMeta* meta = store->get_meta();
DeleteBitmapPB delete_bitmap_pb;
- for (auto& [id, bitmap] : delete_bimap->delete_bitmap) {
+ for (auto& [id, bitmap] : delete_bitmap->delete_bitmap) {
auto& rowset_id = std::get<0>(id);
int64_t segment_id = std::get<1>(id);
delete_bitmap_pb.add_rowset_ids(rowset_id.to_string());
diff --git a/be/src/olap/tablet_meta_manager.h
b/be/src/olap/tablet_meta_manager.h
index 9c0b733888e..8079a7ee5e8 100644
--- a/be/src/olap/tablet_meta_manager.h
+++ b/be/src/olap/tablet_meta_manager.h
@@ -73,7 +73,7 @@ public:
OlapMeta* meta, std::function<bool(int64_t, int64_t, const
std::string&)> const& func);
static Status save_delete_bitmap(DataDir* store, TTabletId tablet_id,
- DeleteBitmapPtr delete_bimap, int64_t
version);
+ DeleteBitmapPtr delete_bitmap, int64_t
version);
static Status traverse_delete_bitmap(
OlapMeta* meta, std::function<bool(int64_t, int64_t, const
std::string&)> const& func);
diff --git a/be/src/olap/task/index_builder.cpp
b/be/src/olap/task/index_builder.cpp
index ab881c7a842..85ba65820eb 100644
--- a/be/src/olap/task/index_builder.cpp
+++ b/be/src/olap/task/index_builder.cpp
@@ -704,7 +704,7 @@ Status IndexBuilder::modify_rowsets(const
Merger::Statistics* stats) {
}
_tablet->tablet_meta()->delete_bitmap().merge(*delete_bitmap);
- // modify_rowsets will remove the delete_bimap for input rowsets,
+ // modify_rowsets will remove the delete_bitmap for input rowsets,
// should call it after merge delete_bitmap
RETURN_IF_ERROR(_tablet->modify_rowsets(_output_rowsets,
_input_rowsets, true));
} else {
diff --git a/be/test/olap/tablet_meta_manager_test.cpp
b/be/test/olap/tablet_meta_manager_test.cpp
index ef43fdfed4c..cb734780e67 100644
--- a/be/test/olap/tablet_meta_manager_test.cpp
+++ b/be/test/olap/tablet_meta_manager_test.cpp
@@ -113,7 +113,7 @@ TEST_F(TabletMetaManagerTest, TestLoad) {
// EXPECT_EQ(_json_header, json_meta_read);
}
-TEST_F(TabletMetaManagerTest, TestDeleteBimapEncode) {
+TEST_F(TabletMetaManagerTest, TestDeleteBitmapEncode) {
TTabletId tablet_id = 1234;
int64_t version = 456;
std::string key = TabletMetaManager::encode_delete_bitmap_key(tablet_id,
version);
@@ -125,7 +125,7 @@ TEST_F(TabletMetaManagerTest, TestDeleteBimapEncode) {
EXPECT_EQ(version, de_version);
}
-TEST_F(TabletMetaManagerTest, TestSaveDeleteBimap) {
+TEST_F(TabletMetaManagerTest, TestSaveDeleteBitmap) {
int64_t test_tablet_id = 10086;
std::shared_ptr<DeleteBitmap> dbmp =
std::make_shared<DeleteBitmap>(test_tablet_id);
auto gen1 = [&dbmp](int64_t max_rst_id, uint32_t max_seg_id, uint32_t
max_row) {
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
