From 29e24434fec91cbeae1deb6cd96319af1b308716 Mon Sep 17 00:00:00 2001 From: wolfkdy Date: Thu, 13 Feb 2020 18:50:04 -0800 Subject: [PATCH] refine code (#6420) Summary: I create a new branch from the branch new upsteram/master and "git merge --squash". Maybe it will fix everything. Pull Request resolved: https://github.com/facebook/rocksdb/pull/6420 Differential Revision: D19897152 Pulled By: zhichao-cao fbshipit-source-id: 6575d9e3b23e360f42ee1480b43028b5fcc20136 --- utilities/transactions/optimistic_transaction.cc | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/utilities/transactions/optimistic_transaction.cc b/utilities/transactions/optimistic_transaction.cc index de1655203..357d06801 100644 --- a/utilities/transactions/optimistic_transaction.cc +++ b/utilities/transactions/optimistic_transaction.cc @@ -59,13 +59,13 @@ Status OptimisticTransaction::Commit() { auto txn_db_impl = static_cast_with_check(txn_db_); assert(txn_db_impl); - OccValidationPolicy policy = txn_db_impl->GetValidatePolicy(); - if (policy == OccValidationPolicy::kValidateParallel) { - return CommitWithParallelValidate(); - } else if (policy == OccValidationPolicy::kValidateSerial) { - return CommitWithSerialValidate(); - } else { - assert(0); + switch (txn_db_impl->GetValidatePolicy()) { + case OccValidationPolicy::kValidateParallel: + return CommitWithParallelValidate(); + case OccValidationPolicy::kValidateSerial: + return CommitWithSerialValidate(); + default: + assert(0); } // unreachable, just void compiler complain return Status::OK();