From fcd32e687b713e172f8a2cec07e30165393fda73 Mon Sep 17 00:00:00 2001 From: yaphet <4414314+darionyaphet@users.noreply.github.com> Date: Sat, 2 Apr 2022 09:51:53 -0700 Subject: [PATCH] remove some break line (#9716) Summary: Pull Request resolved: https://github.com/facebook/rocksdb/pull/9716 Reviewed By: mrambacher Differential Revision: D35026096 Pulled By: jay-zhuang fbshipit-source-id: 296c38418e2bb7948d7802e439a08c6621bdb49b --- include/rocksdb/utilities/transaction_db.h | 6 ++---- include/rocksdb/utilities/transaction_db_mutex.h | 1 - 2 files changed, 2 insertions(+), 5 deletions(-) diff --git a/include/rocksdb/utilities/transaction_db.h b/include/rocksdb/utilities/transaction_db.h index 2a60b9707..b81745fba 100644 --- a/include/rocksdb/utilities/transaction_db.h +++ b/include/rocksdb/utilities/transaction_db.h @@ -160,8 +160,7 @@ struct TransactionDBOptions { // Increasing this value will increase the concurrency by dividing the lock // table (per column family) into more sub-tables, each with their own - // separate - // mutex. + // separate mutex. size_t num_stripes = 16; // If positive, specifies the default wait timeout in milliseconds when @@ -171,8 +170,7 @@ struct TransactionDBOptions { // If 0, no waiting is done if a lock cannot instantly be acquired. // If negative, there is no timeout. Not using a timeout is not recommended // as it can lead to deadlocks. Currently, there is no deadlock-detection to - // recover - // from a deadlock. + // recover from a deadlock. int64_t transaction_lock_timeout = 1000; // 1 second // If positive, specifies the wait timeout in milliseconds when writing a key diff --git a/include/rocksdb/utilities/transaction_db_mutex.h b/include/rocksdb/utilities/transaction_db_mutex.h index 13d899c32..e352f325a 100644 --- a/include/rocksdb/utilities/transaction_db_mutex.h +++ b/include/rocksdb/utilities/transaction_db_mutex.h @@ -18,7 +18,6 @@ namespace ROCKSDB_NAMESPACE { // // To open a TransactionDB with a custom TransactionDBMutexFactory, set // TransactionDBOptions.custom_mutex_factory. - class TransactionDBMutex { public: virtual ~TransactionDBMutex() {}