From 583157f710418f1c6c01e1eebb46b31e24d0a7d2 Mon Sep 17 00:00:00 2001 From: Praveen Rao Date: Tue, 22 Mar 2016 17:10:31 -0700 Subject: [PATCH] Avoid overloaded virtual function --- db/db_impl.cc | 2 +- db/db_test2.cc | 2 +- include/rocksdb/wal_filter.h | 3 ++- 3 files changed, 4 insertions(+), 3 deletions(-) diff --git a/db/db_impl.cc b/db/db_impl.cc index 338b31ba0..05051032e 100644 --- a/db/db_impl.cc +++ b/db/db_impl.cc @@ -1199,7 +1199,7 @@ Status DBImpl::RecoverLogFiles(const std::vector& log_numbers, bool batch_changed = false; WalFilter::WalProcessingOption wal_processing_option = - db_options_.wal_filter->LogRecord(log_number, fname, batch, + db_options_.wal_filter->LogRecordFound(log_number, fname, batch, &new_batch, &batch_changed); switch (wal_processing_option) { diff --git a/db/db_test2.cc b/db/db_test2.cc index 8067577e5..f7d18dae2 100644 --- a/db/db_test2.cc +++ b/db/db_test2.cc @@ -502,7 +502,7 @@ TEST_F(DBTest2, WalFilterTestWithColumnFamilies) { cf_name_id_map_ = cf_name_id_map; } - virtual WalProcessingOption LogRecord(unsigned long long log_number, + virtual WalProcessingOption LogRecordFound(unsigned long long log_number, const std::string& log_file_name, const WriteBatch& batch, WriteBatch* new_batch, diff --git a/include/rocksdb/wal_filter.h b/include/rocksdb/wal_filter.h index 867d2118b..131fe87e7 100644 --- a/include/rocksdb/wal_filter.h +++ b/include/rocksdb/wal_filter.h @@ -75,11 +75,12 @@ class WalFilter { // @returns Processing option for the current record. // Please see WalProcessingOption enum above for // details. - virtual WalProcessingOption LogRecord(unsigned long long log_number, + virtual WalProcessingOption LogRecordFound(unsigned long long log_number, const std::string& log_file_name, const WriteBatch& batch, WriteBatch* new_batch, bool* batch_changed) { + // Default implementation falls back to older function for compatibility return LogRecord(batch, new_batch, batch_changed); }