Skip to content
This repository has been archived by the owner on Aug 2, 2022. It is now read-only.

Move chainbase calls out of try-CATCH_AND_EXIT_DB_FAILURE block #9674

Merged
merged 3 commits into from
Nov 17, 2020
Merged

Move chainbase calls out of try-CATCH_AND_EXIT_DB_FAILURE block #9674

Changes from 1 commit
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
cc57cdc
Move chainbase calls out of try-CATCH_AND_EXIT_DB_FAILURE block
linhuang-blockone Nov 17, 2020
6908052
Move combined session out of try-CATCH_AND_EXIT_DB_FAILURE
linhuang-blockone Nov 17, 2020
8ac16aa
clean up duplicate code in undo, commit, and flush
linhuang-blockone Nov 17, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions libraries/chain/combined_database.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -274,9 +274,9 @@ namespace eosio { namespace chain {
db.set_revision(revision);
heifner marked this conversation as resolved.
Show resolved Hide resolved
break;
case backing_store_type::ROCKSDB:
db.set_revision(revision);
try {
try {
db.set_revision(revision);
kv_undo_stack->revision(revision);
}
FC_LOG_AND_RETHROW()
Expand All @@ -291,9 +291,9 @@ namespace eosio { namespace chain {
db.undo();
break;
case backing_store_type::ROCKSDB:
db.undo();
try {
try {
db.undo();
kv_undo_stack->undo();
}
FC_LOG_AND_RETHROW()
Expand All @@ -308,9 +308,9 @@ namespace eosio { namespace chain {
db.commit(revision);
break;
case backing_store_type::ROCKSDB:
db.commit(revision);
try {
try {
db.commit(revision);
kv_undo_stack->commit(revision);
heifner marked this conversation as resolved.
Show resolved Hide resolved
}
FC_LOG_AND_RETHROW()
Expand Down