Refine the GC interface by PageEntriesEdit
#3879
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -19,6 +19,10 @@ extern const int PS_ENTRY_NO_VALID_VERSION; | |
| } // namespace ErrorCodes | ||
| namespace PS::V3 | ||
| { | ||
| /******************************** | ||
| * VersionedPageEntries methods * | ||
| ********************************/ | ||
|
|
||
| std::optional<PageEntryV3> VersionedPageEntries::getEntry(UInt64 seq) const | ||
| { | ||
| auto page_lock = acquireLock(); | ||
|
|
@@ -32,7 +36,6 @@ std::optional<PageEntryV3> VersionedPageEntries::getEntry(UInt64 seq) const | |
| return std::nullopt; | ||
| } | ||
|
|
||
| std::pair<VersionedEntries, PageSize> VersionedPageEntries::getEntriesByBlobId(BlobFileId blob_id) | ||
| { | ||
| PageSize single_page_size = 0; | ||
|
|
@@ -103,6 +106,10 @@ std::pair<PageEntriesV3, bool> VersionedPageEntries::deleteAndGC(UInt64 lowest_s | |
| return std::make_pair(std::move(del_entries), entries.empty() || (entries.size() == 1 && entries.begin()->second.is_delete)); | ||
| } | ||
|
|
||
| /************************** | ||
| * PageDirectory methods * | ||
| *************************/ | ||
|
|
||
| PageDirectory::PageDirectory() | ||
| : sequence(0) | ||
| , log(getLogWithPrefix(nullptr, "PageDirectory")) | ||
|
|
@@ -117,7 +124,10 @@ void PageDirectory::restore() | |
| PageDirectorySnapshotPtr PageDirectory::createSnapshot() const | ||
| { | ||
| auto snap = std::make_shared<PageDirectorySnapshot>(sequence.load()); | ||
| { | ||
| std::lock_guard snapshots_lock(snapshots_mutex); | ||
| snapshots.emplace_back(std::weak_ptr<PageDirectorySnapshot>(snap)); | ||
| } | ||
| return snap; | ||
| } | ||
|
|
||
|
|
@@ -179,10 +189,8 @@ void PageDirectory::apply(PageEntriesEdit && edit) | |
| std::unique_lock write_lock(table_rw_mutex); // TODO: It is totally serialized, make it a pipeline | ||
| UInt64 last_sequence = sequence.load(); | ||
|
|
||
| // stage 1, persisted the changes to WAL with version [seq=last_seq + 1, epoch=0] | ||
| // wal->apply(edit, PageVersionType(last_sequence + 1, 0)); | ||
|
There was a problem hiding this comment. so we do have There was a problem hiding this comment. We need to set a proper version for edits written from ... While in |
||
|
|
||
| // stage 2, create entry version list for pageId. nothing need to be rollback | ||
| std::unordered_map<PageId, std::pair<PageLock, int>> updating_locks; | ||
|
|
@@ -269,23 +277,28 @@ void PageDirectory::apply(PageEntriesEdit && edit) | |
| sequence.fetch_add(1); | ||
| } | ||
|
|
||
| void PageDirectory::gcApply(PageEntriesEdit && migrated_edit) | ||
| { | ||
| std::shared_lock read_lock(table_rw_mutex); | ||
| for (auto & record : migrated_edit.getMutRecords()) | ||
| { | ||
| auto iter = mvcc_table_directory.find(record.page_id); | ||
| if (unlikely(iter == mvcc_table_directory.end())) | ||
| { | ||
| throw Exception(fmt::format("Can't found [pageid={}] while doing gcApply", record.page_id), ErrorCodes::LOGICAL_ERROR); | ||
| } | ||
|
|
||
| // Increase the epoch for migrated record. | ||
| record.version.epoch += 1; | ||
|
|
||
| // Append the gc version to version list | ||
| auto & versioned_entries = iter->second; | ||
| auto page_lock = versioned_entries->acquireLock(); | ||
| versioned_entries->createNewVersion(record.version.sequence, record.version.epoch, record.entry); | ||
| } | ||
|
|
||
| // Apply migrate edit into WAL with the increased epoch version | ||
| // wal->apply(migrated_edit); | ||
| } | ||
|
|
||
| std::pair<std::map<BlobFileId, PageIdAndVersionedEntries>, PageSize> | ||
|
|
@@ -330,17 +343,21 @@ std::vector<PageEntriesV3> PageDirectory::gc() | |
| UInt64 lowest_seq = sequence.load(); | ||
| std::vector<PageEntriesV3> all_del_entries; | ||
|
|
||
| { | ||
| // Cleanup released snapshots | ||
| std::lock_guard lock(snapshots_mutex); | ||
| for (auto iter = snapshots.begin(); iter != snapshots.end(); /* empty */) | ||
| { | ||
| if (iter->expired()) | ||
| iter = snapshots.erase(iter); | ||
| else | ||
| { | ||
| lowest_seq = std::min(lowest_seq, iter->lock()->sequence); | ||
| ++iter; | ||
| } | ||
| } | ||
| } | ||
|
|
||
| { | ||
| std::unique_lock write_lock(table_rw_mutex); | ||
| for (auto iter = mvcc_table_directory.begin(); iter != mvcc_table_directory.end(); /*empty*/) | ||
|
|
||
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
why removed
UPSERT?There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
After digging into current gc routine implementation, we only use
PageEntriesEdit:: upsertPageinBlobStore::gc(with version set in the same time).WriteBatch::upsertis not a valid input.https://github.com/pingcap/tics/blob/ded8a062b9f777ccfd70087f6341feac725bcb08/dbms/src/Storages/Page/V3/BlobStore.cpp#L406