You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@doris.apache.org by kx...@apache.org on 2023/08/18 10:31:57 UTC
[doris] 07/13: [fix](merge-on-write) Fix a typo and remove useless member rowset in CommitTabletTxnInfo (#23151)
This is an automated email from the ASF dual-hosted git repository.
kxiao pushed a commit to branch branch-2.0
in repository https://gitbox.apache.org/repos/asf/doris.git
commit 0c9252e327cedd35fc0d3964ff684318dd49f1a0
Author: bobhan1 <bh...@outlook.com>
AuthorDate: Fri Aug 18 14:14:34 2023 +0800
[fix](merge-on-write) Fix a typo and remove useless member rowset in CommitTabletTxnInfo (#23151)
Fix a typo in #23078
---
be/src/olap/compaction.cpp | 8 ++++----
be/src/olap/txn_manager.cpp | 2 +-
be/src/olap/txn_manager.h | 5 +----
3 files changed, 6 insertions(+), 9 deletions(-)
diff --git a/be/src/olap/compaction.cpp b/be/src/olap/compaction.cpp
index 128eb0471e..32c15a3bde 100644
--- a/be/src/olap/compaction.cpp
+++ b/be/src/olap/compaction.cpp
@@ -654,17 +654,17 @@ Status Compaction::modify_rowsets(const Merger::Statistics* stats) {
// all compaction input rowsets.
continue;
} else {
- DeleteBitmap output_delete_bitmap(_tablet->tablet_id());
+ DeleteBitmap txn_output_delete_bitmap(_tablet->tablet_id());
_tablet->calc_compaction_output_rowset_delete_bitmap(
_input_rowsets, _rowid_conversion, 0, UINT64_MAX, &missed_rows,
- &location_map, *it.delete_bitmap.get(), &output_delete_bitmap);
+ &location_map, *it.delete_bitmap.get(), &txn_output_delete_bitmap);
if (config::enable_merge_on_write_correctness_check) {
RowsetIdUnorderedSet rowsetids;
rowsetids.insert(_output_rowset->rowset_id());
- _tablet->add_sentinel_mark_to_delete_bitmap(&output_rowset_delete_bitmap,
+ _tablet->add_sentinel_mark_to_delete_bitmap(&txn_output_delete_bitmap,
rowsetids);
}
- it.delete_bitmap->merge(output_delete_bitmap);
+ it.delete_bitmap->merge(txn_output_delete_bitmap);
// Step3: write back updated delete bitmap and tablet info.
it.rowset_ids.insert(_output_rowset->rowset_id());
StorageEngine::instance()->txn_manager()->set_txn_related_delete_bitmap(
diff --git a/be/src/olap/txn_manager.cpp b/be/src/olap/txn_manager.cpp
index 7b69033b10..0d0504f9f8 100644
--- a/be/src/olap/txn_manager.cpp
+++ b/be/src/olap/txn_manager.cpp
@@ -639,7 +639,7 @@ void TxnManager::get_all_commit_tablet_txn_info_by_tablet(
continue;
}
commit_tablet_txn_info_vec->push_back(CommitTabletTxnInfo(
- partition_id, transaction_id, rowset, delete_bitmap, rowset_ids));
+ partition_id, transaction_id, delete_bitmap, rowset_ids));
}
}
}
diff --git a/be/src/olap/txn_manager.h b/be/src/olap/txn_manager.h
index d024e71e16..c7f781a58a 100644
--- a/be/src/olap/txn_manager.h
+++ b/be/src/olap/txn_manager.h
@@ -80,16 +80,13 @@ struct TabletTxnInfo {
struct CommitTabletTxnInfo {
CommitTabletTxnInfo(TPartitionId partition_id, TTransactionId transaction_id,
- RowsetSharedPtr rowset, DeleteBitmapPtr delete_bitmap,
- RowsetIdUnorderedSet rowset_ids)
+ DeleteBitmapPtr delete_bitmap, RowsetIdUnorderedSet rowset_ids)
: transaction_id(transaction_id),
partition_id(partition_id),
- rowset(rowset),
delete_bitmap(delete_bitmap),
rowset_ids(rowset_ids) {}
TTransactionId transaction_id;
TPartitionId partition_id;
- RowsetSharedPtr rowset;
DeleteBitmapPtr delete_bitmap;
RowsetIdUnorderedSet rowset_ids;
};
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@doris.apache.org
For additional commands, e-mail: commits-help@doris.apache.org