From d7364bbbaf0b8c50a20b394856451864b8e94e01 Mon Sep 17 00:00:00 2001 From: Zhongyi Xie Date: Fri, 13 Apr 2018 12:04:03 -0700 Subject: [PATCH 1/3] fix memory leak and unused param errors --- db/column_family_test.cc | 7 +++++++ db/compact_files_test.cc | 2 ++ db/compaction_job_stats_test.cc | 8 +++++++- db/compaction_job_test.cc | 2 ++ db/corruption_test.cc | 2 ++ db/cuckoo_table_db_test.cc | 2 ++ db/db_compaction_test.cc | 2 ++ db/db_dynamic_level_test.cc | 2 ++ db/db_log_iter_test.cc | 2 ++ db/db_tailing_iter_test.cc | 2 ++ db/db_universal_compaction_test.cc | 2 ++ db/deletefile_test.cc | 2 ++ db/external_sst_file_test.cc | 2 ++ db/obsolete_files_test.cc | 2 ++ db/options_file_test.cc | 2 ++ db/plain_table_db_test.cc | 2 ++ db/prefix_test.cc | 2 ++ db/repair_test.cc | 2 ++ db/wal_manager_test.cc | 2 ++ db/write_callback_test.cc | 2 ++ env/io_posix.cc | 6 ++++-- table/block_based_table_reader.cc | 2 +- table/cuckoo_table_builder_test.cc | 2 ++ table/cuckoo_table_reader_test.cc | 2 ++ table/two_level_iterator.cc | 6 +++++- tools/db_bench_tool.cc | 5 +++++ tools/db_stress.cc | 15 +++++++++------ tools/ldb_cmd_test.cc | 2 ++ tools/reduce_levels_test.cc | 2 ++ tools/sst_dump_test.cc | 2 ++ util/auto_roll_logger_test.cc | 2 ++ util/autovector_test.cc | 3 +++ util/delete_scheduler_test.cc | 2 ++ utilities/backupable/backupable_db_test.cc | 2 ++ utilities/blob_db/blob_db_test.cc | 2 ++ utilities/checkpoint/checkpoint_test.cc | 2 ++ utilities/column_aware_encoding_exp.cc | 2 ++ utilities/date_tiered/date_tiered_test.cc | 2 ++ utilities/document/document_db_test.cc | 2 ++ utilities/document/json_document_test.cc | 2 ++ utilities/env_timed_test.cc | 2 ++ utilities/lua/rocks_lua_test.cc | 2 ++ utilities/memory/memory_test.cc | 2 ++ utilities/object_registry_test.cc | 2 ++ utilities/options/options_util_test.cc | 2 ++ utilities/redis/redis_lists_test.cc | 2 ++ utilities/spatialdb/spatial_db_test.cc | 2 ++ .../compact_on_deletion_collector_test.cc | 2 ++ .../transactions/optimistic_transaction_test.cc | 2 ++ utilities/transactions/transaction_test.cc | 2 ++ .../write_prepared_transaction_test.cc | 2 ++ utilities/ttl/ttl_test.cc | 2 ++ 52 files changed, 129 insertions(+), 11 deletions(-) diff --git a/db/column_family_test.cc b/db/column_family_test.cc index c56ee1bb7b1..9382ff1cfe7 100644 --- a/db/column_family_test.cc +++ b/db/column_family_test.cc @@ -391,6 +391,9 @@ class ColumnFamilyTest : public testing::Test { void AssertFilesPerLevel(const std::string& value, int cf) { #ifndef ROCKSDB_LITE ASSERT_EQ(value, FilesPerLevel(cf)); +#else + (void) value; + (void) cf; #endif } @@ -405,6 +408,8 @@ class ColumnFamilyTest : public testing::Test { void AssertCountLiveFiles(int expected_value) { #ifndef ROCKSDB_LITE ASSERT_EQ(expected_value, CountLiveFiles()); +#else + (void) expected_value; #endif } @@ -453,6 +458,8 @@ class ColumnFamilyTest : public testing::Test { void AssertCountLiveLogFiles(int value) { #ifndef ROCKSDB_LITE // GetSortedWalFiles is not supported ASSERT_EQ(value, CountLiveLogFiles()); +#else + (void) value; #endif // !ROCKSDB_LITE } diff --git a/db/compact_files_test.cc b/db/compact_files_test.cc index 7f150453960..57ce898051b 100644 --- a/db/compact_files_test.cc +++ b/db/compact_files_test.cc @@ -319,6 +319,8 @@ int main(int argc, char** argv) { #include int main(int argc, char** argv) { + (void) argc; + (void) argv; fprintf(stderr, "SKIPPED as DBImpl::CompactFiles is not supported in ROCKSDB_LITE\n"); return 0; diff --git a/db/compaction_job_stats_test.cc b/db/compaction_job_stats_test.cc index c20c120e580..97a09778052 100644 --- a/db/compaction_job_stats_test.cc +++ b/db/compaction_job_stats_test.cc @@ -1035,6 +1035,8 @@ int main(int argc, char** argv) { #include int main(int argc, char** argv) { + (void) argc; + (void) argv; fprintf(stderr, "SKIPPED, not supported in ROCKSDB_LITE\n"); return 0; } @@ -1043,5 +1045,9 @@ int main(int argc, char** argv) { #else -int main(int argc, char** argv) { return 0; } +int main(int argc, char** argv) { + (void) argc; + (void) argv; + return 0; +} #endif // !defined(IOS_CROSS_COMPILE) diff --git a/db/compaction_job_test.cc b/db/compaction_job_test.cc index 3bafda9e164..eff7c5a722b 100644 --- a/db/compaction_job_test.cc +++ b/db/compaction_job_test.cc @@ -947,6 +947,8 @@ int main(int argc, char** argv) { #include int main(int argc, char** argv) { + (void) argc; + (void) argv; fprintf(stderr, "SKIPPED as CompactionJobStats is not supported in ROCKSDB_LITE\n"); return 0; diff --git a/db/corruption_test.cc b/db/corruption_test.cc index 56e157832c2..fa502ff3e00 100644 --- a/db/corruption_test.cc +++ b/db/corruption_test.cc @@ -511,6 +511,8 @@ int main(int argc, char** argv) { #include int main(int argc, char** argv) { + (void) argc; + (void) argv; fprintf(stderr, "SKIPPED as RepairDB() is not supported in ROCKSDB_LITE\n"); return 0; } diff --git a/db/cuckoo_table_db_test.cc b/db/cuckoo_table_db_test.cc index 41b3e3c6b18..2de3857fdc3 100644 --- a/db/cuckoo_table_db_test.cc +++ b/db/cuckoo_table_db_test.cc @@ -334,6 +334,8 @@ int main(int argc, char** argv) { #include int main(int argc, char** argv) { + (void) argc; + (void) argv; fprintf(stderr, "SKIPPED as Cuckoo table is not supported in ROCKSDB_LITE\n"); return 0; } diff --git a/db/db_compaction_test.cc b/db/db_compaction_test.cc index d5f98646b0d..19e2d21bd8d 100644 --- a/db/db_compaction_test.cc +++ b/db/db_compaction_test.cc @@ -3766,6 +3766,8 @@ int main(int argc, char** argv) { ::testing::InitGoogleTest(&argc, argv); return RUN_ALL_TESTS(); #else + (void) argc; + (void) argv; return 0; #endif } diff --git a/db/db_dynamic_level_test.cc b/db/db_dynamic_level_test.cc index 6542db18c02..3f33027d1cb 100644 --- a/db/db_dynamic_level_test.cc +++ b/db/db_dynamic_level_test.cc @@ -501,6 +501,8 @@ int main(int argc, char** argv) { ::testing::InitGoogleTest(&argc, argv); return RUN_ALL_TESTS(); #else + (void) argc; + (void) argv; return 0; #endif } diff --git a/db/db_log_iter_test.cc b/db/db_log_iter_test.cc index e7f94c4c423..1370c65ca6f 100644 --- a/db/db_log_iter_test.cc +++ b/db/db_log_iter_test.cc @@ -289,6 +289,8 @@ int main(int argc, char** argv) { ::testing::InitGoogleTest(&argc, argv); return RUN_ALL_TESTS(); #else + (void) argc; + (void) argv; return 0; #endif } diff --git a/db/db_tailing_iter_test.cc b/db/db_tailing_iter_test.cc index 0363a8072ff..91b0cda04ee 100644 --- a/db/db_tailing_iter_test.cc +++ b/db/db_tailing_iter_test.cc @@ -809,6 +809,8 @@ int main(int argc, char** argv) { ::testing::InitGoogleTest(&argc, argv); return RUN_ALL_TESTS(); #else + (void) argc; + (void) argv; return 0; #endif } diff --git a/db/db_universal_compaction_test.cc b/db/db_universal_compaction_test.cc index 6da85aa00d9..09727c690df 100644 --- a/db/db_universal_compaction_test.cc +++ b/db/db_universal_compaction_test.cc @@ -1899,6 +1899,8 @@ int main(int argc, char** argv) { ::testing::InitGoogleTest(&argc, argv); return RUN_ALL_TESTS(); #else + (void) argc; + (void) argv; return 0; #endif } diff --git a/db/deletefile_test.cc b/db/deletefile_test.cc index dbe77917400..ef5a0a946da 100644 --- a/db/deletefile_test.cc +++ b/db/deletefile_test.cc @@ -501,6 +501,8 @@ int main(int argc, char** argv) { #include int main(int argc, char** argv) { + (void) argc; + (void) argv; fprintf(stderr, "SKIPPED as DBImpl::DeleteFile is not supported in ROCKSDB_LITE\n"); return 0; diff --git a/db/external_sst_file_test.cc b/db/external_sst_file_test.cc index a026ba3fc7c..5dfae364a14 100644 --- a/db/external_sst_file_test.cc +++ b/db/external_sst_file_test.cc @@ -2007,6 +2007,8 @@ int main(int argc, char** argv) { #include int main(int argc, char** argv) { + (void) argc; + (void) argv; fprintf(stderr, "SKIPPED as External SST File Writer and Ingestion are not supported " "in ROCKSDB_LITE\n"); diff --git a/db/obsolete_files_test.cc b/db/obsolete_files_test.cc index 26bbf5639b3..094810f4683 100644 --- a/db/obsolete_files_test.cc +++ b/db/obsolete_files_test.cc @@ -209,6 +209,8 @@ int main(int argc, char** argv) { #include int main(int argc, char** argv) { + (void) argc; + (void) argv; fprintf(stderr, "SKIPPED as DBImpl::DeleteFile is not supported in ROCKSDB_LITE\n"); return 0; diff --git a/db/options_file_test.cc b/db/options_file_test.cc index fc62840eb47..e769293d63e 100644 --- a/db/options_file_test.cc +++ b/db/options_file_test.cc @@ -113,6 +113,8 @@ int main(int argc, char** argv) { #include int main(int argc, char** argv) { + (void) argc; + (void) argv; printf("Skipped as Options file is not supported in RocksDBLite.\n"); return 0; } diff --git a/db/plain_table_db_test.cc b/db/plain_table_db_test.cc index 8fae9746d84..8f087109fb4 100644 --- a/db/plain_table_db_test.cc +++ b/db/plain_table_db_test.cc @@ -1171,6 +1171,8 @@ int main(int argc, char** argv) { #include int main(int argc, char** argv) { + (void) argc; + (void) argv; fprintf(stderr, "SKIPPED as plain table is not supported in ROCKSDB_LITE\n"); return 0; } diff --git a/db/prefix_test.cc b/db/prefix_test.cc index 398d31893d5..09455d0c4b1 100644 --- a/db/prefix_test.cc +++ b/db/prefix_test.cc @@ -888,6 +888,8 @@ int main(int argc, char** argv) { #include int main(int argc, char** argv) { + (void) argc; + (void) argv; fprintf(stderr, "SKIPPED as HashSkipList and HashLinkList are not supported in " "ROCKSDB_LITE\n"); diff --git a/db/repair_test.cc b/db/repair_test.cc index ab00a96b4d1..dc9466cc6a4 100644 --- a/db/repair_test.cc +++ b/db/repair_test.cc @@ -357,6 +357,8 @@ int main(int argc, char** argv) { #include int main(int argc, char** argv) { + (void) argc; + (void) argv; fprintf(stderr, "SKIPPED as RepairDB is not supported in ROCKSDB_LITE\n"); return 0; } diff --git a/db/wal_manager_test.cc b/db/wal_manager_test.cc index 224defe261e..bdc250147ad 100644 --- a/db/wal_manager_test.cc +++ b/db/wal_manager_test.cc @@ -304,6 +304,8 @@ int main(int argc, char** argv) { #include int main(int argc, char** argv) { + (void) argc; + (void) argv; fprintf(stderr, "SKIPPED as WalManager is not supported in ROCKSDB_LITE\n"); return 0; } diff --git a/db/write_callback_test.cc b/db/write_callback_test.cc index a1b7f654178..76665f7d19a 100644 --- a/db/write_callback_test.cc +++ b/db/write_callback_test.cc @@ -433,6 +433,8 @@ int main(int argc, char** argv) { #include int main(int argc, char** argv) { + (void) argc; + (void) argv; fprintf(stderr, "SKIPPED as WriteWithCallback is not supported in ROCKSDB_LITE\n"); return 0; diff --git a/env/io_posix.cc b/env/io_posix.cc index 56b756e656b..da6b516c948 100644 --- a/env/io_posix.cc +++ b/env/io_posix.cc @@ -890,10 +890,12 @@ void PosixWritableFile::SetWriteLifeTimeHint(Env::WriteLifeTimeHint hint) { if (fcntl(fd_, F_SET_RW_HINT, &hint) == 0) { write_hint_ = hint; } -#endif #else (void)hint; -#endif +#endif // ROCKSDB_VALGRIND_RUN +#else + (void)hint; +#endif // OS_LINUX } Status PosixWritableFile::InvalidateCache(size_t offset, size_t length) { diff --git a/table/block_based_table_reader.cc b/table/block_based_table_reader.cc index 586f0888834..5b04cd4169f 100644 --- a/table/block_based_table_reader.cc +++ b/table/block_based_table_reader.cc @@ -120,7 +120,7 @@ void ReleaseCachedEntry(void* arg, void* h) { void ForceReleaseCachedEntry(void* arg, void* h) { Cache* cache = reinterpret_cast(arg); Cache::Handle* handle = reinterpret_cast(h); - cache->Release(handle, true); + cache->Release(handle, true /* force_erase */); } Slice GetCacheKeyFromOffset(const char* cache_key_prefix, diff --git a/table/cuckoo_table_builder_test.cc b/table/cuckoo_table_builder_test.cc index 8f77b515c45..440861b68da 100644 --- a/table/cuckoo_table_builder_test.cc +++ b/table/cuckoo_table_builder_test.cc @@ -626,6 +626,8 @@ int main(int argc, char** argv) { #include int main(int argc, char** argv) { + (void) argc; + (void) argv; fprintf(stderr, "SKIPPED as Cuckoo table is not supported in ROCKSDB_LITE\n"); return 0; } diff --git a/table/cuckoo_table_reader_test.cc b/table/cuckoo_table_reader_test.cc index aeb08a3087c..62cf93964a8 100644 --- a/table/cuckoo_table_reader_test.cc +++ b/table/cuckoo_table_reader_test.cc @@ -561,6 +561,8 @@ int main(int argc, char** argv) { #include int main(int argc, char** argv) { + (void) argc; + (void) argv; fprintf(stderr, "SKIPPED as Cuckoo table is not supported in ROCKSDB_LITE\n"); return 0; } diff --git a/table/two_level_iterator.cc b/table/two_level_iterator.cc index 0cb2855517b..ba1bde0a90e 100644 --- a/table/two_level_iterator.cc +++ b/table/two_level_iterator.cc @@ -24,7 +24,11 @@ class TwoLevelIterator : public InternalIterator { explicit TwoLevelIterator(TwoLevelIteratorState* state, InternalIterator* first_level_iter); - virtual ~TwoLevelIterator() { delete state_; } + virtual ~TwoLevelIterator() { + first_level_iter_.DeleteIter(false); + second_level_iter_.DeleteIter(false); + delete state_; + } virtual void Seek(const Slice& target) override; virtual void SeekForPrev(const Slice& target) override; diff --git a/tools/db_bench_tool.cc b/tools/db_bench_tool.cc index 10b3c364b5c..6bbd45c1262 100644 --- a/tools/db_bench_tool.cc +++ b/tools/db_bench_tool.cc @@ -2944,6 +2944,8 @@ void VerifyDBFromDB(std::string& truth_db_name) { FLAGS_options_file.c_str(), s.ToString().c_str()); exit(1); } +#else + (void)opts; #endif return false; } @@ -4000,6 +4002,9 @@ void VerifyDBFromDB(std::string& truth_db_name) { } return Status::OK(); #else + (void)thread; + (void)compaction_style; + (void)write_mode; fprintf(stderr, "Rocksdb Lite doesn't support filldeterministic\n"); return Status::NotSupported( "Rocksdb Lite doesn't support filldeterministic"); diff --git a/tools/db_stress.cc b/tools/db_stress.cc index c4d5418f153..0babddcfb3b 100644 --- a/tools/db_stress.cc +++ b/tools/db_stress.cc @@ -1023,9 +1023,7 @@ class DbStressListener : public EventListener { column_families_(column_families) {} virtual ~DbStressListener() {} #ifndef ROCKSDB_LITE - virtual void OnFlushCompleted(DB* db, const FlushJobInfo& info) override { - assert(db); - assert(db->GetName() == db_name_); + virtual void OnFlushCompleted(DB* /*db*/, const FlushJobInfo& info) override { assert(IsValidColumnFamilyName(info.cf_name)); VerifyFilePath(info.file_path); // pretending doing some work here @@ -1033,10 +1031,8 @@ class DbStressListener : public EventListener { std::chrono::microseconds(Random::GetTLSInstance()->Uniform(5000))); } - virtual void OnCompactionCompleted(DB* db, + virtual void OnCompactionCompleted(DB* /*db*/, const CompactionJobInfo& ci) override { - assert(db); - assert(db->GetName() == db_name_); assert(IsValidColumnFamilyName(ci.cf_name)); assert(ci.input_files.size() + ci.output_files.size() > 0U); for (const auto& file_path : ci.input_files) { @@ -1095,6 +1091,8 @@ class DbStressListener : public EventListener { } } assert(false); +#else + (void)file_dir; #endif // !NDEBUG } @@ -1105,6 +1103,8 @@ class DbStressListener : public EventListener { bool result = ParseFileName(file_name, &file_number, &file_type); assert(result); assert(file_type == kTableFile); +#else + (void)file_name; #endif // !NDEBUG } @@ -1119,6 +1119,8 @@ class DbStressListener : public EventListener { } VerifyFileName(file_path.substr(pos)); } +#else + (void)file_path; #endif // !NDEBUG } #endif // !ROCKSDB_LITE @@ -2299,6 +2301,7 @@ class StressTest { size_t value_sz = ((rand % kRandomValueMaxFactor) + 1) * FLAGS_value_size_mult; assert(value_sz <= max_sz && value_sz >= sizeof(uint32_t)); + (void) max_sz; *((uint32_t*)v) = rand; for (size_t i=sizeof(uint32_t); i < value_sz; i++) { v[i] = (char)(rand ^ i); diff --git a/tools/ldb_cmd_test.cc b/tools/ldb_cmd_test.cc index 16f9631dad8..cfd436d9fc7 100644 --- a/tools/ldb_cmd_test.cc +++ b/tools/ldb_cmd_test.cc @@ -55,6 +55,8 @@ int main(int argc, char** argv) { #include int main(int argc, char** argv) { + (void) argc; + (void) argv; fprintf(stderr, "SKIPPED as LDBCommand is not supported in ROCKSDB_LITE\n"); return 0; } diff --git a/tools/reduce_levels_test.cc b/tools/reduce_levels_test.cc index 7fe38bf7e8d..8cc15740348 100644 --- a/tools/reduce_levels_test.cc +++ b/tools/reduce_levels_test.cc @@ -211,6 +211,8 @@ int main(int argc, char** argv) { #include int main(int argc, char** argv) { + (void) argc; + (void) argv; fprintf(stderr, "SKIPPED as LDBCommand is not supported in ROCKSDB_LITE\n"); return 0; } diff --git a/tools/sst_dump_test.cc b/tools/sst_dump_test.cc index 460b5a2cc17..5a87d9bfa97 100644 --- a/tools/sst_dump_test.cc +++ b/tools/sst_dump_test.cc @@ -216,6 +216,8 @@ int main(int argc, char** argv) { #include int main(int argc, char** argv) { + (void) argc; + (void) argv; fprintf(stderr, "SKIPPED as SSTDumpTool is not supported in ROCKSDB_LITE\n"); return 0; } diff --git a/util/auto_roll_logger_test.cc b/util/auto_roll_logger_test.cc index 3bc3463ab02..ceaefd54f7a 100644 --- a/util/auto_roll_logger_test.cc +++ b/util/auto_roll_logger_test.cc @@ -521,6 +521,8 @@ int main(int argc, char** argv) { #include int main(int argc, char** argv) { + (void) argc; + (void) argv; fprintf(stderr, "SKIPPED as AutoRollLogger is not supported in ROCKSDB_LITE\n"); return 0; diff --git a/util/autovector_test.cc b/util/autovector_test.cc index 2d7bcea57d8..13299669cd4 100644 --- a/util/autovector_test.cc +++ b/util/autovector_test.cc @@ -27,6 +27,9 @@ template void AssertAutoVectorOnlyInStack(autovector* vec, bool result) { #ifndef ROCKSDB_LITE ASSERT_EQ(vec->only_in_stack(), result); +#else + (void) vec; + (void) result; #endif // !ROCKSDB_LITE } } // namespace diff --git a/util/delete_scheduler_test.cc b/util/delete_scheduler_test.cc index 2679b476907..c25b354741b 100644 --- a/util/delete_scheduler_test.cc +++ b/util/delete_scheduler_test.cc @@ -642,6 +642,8 @@ int main(int argc, char** argv) { #else int main(int argc, char** argv) { + (void) argc; + (void) argv; printf("DeleteScheduler is not supported in ROCKSDB_LITE\n"); return 0; } diff --git a/utilities/backupable/backupable_db_test.cc b/utilities/backupable/backupable_db_test.cc index 30ca5010ca9..c62d9e67597 100644 --- a/utilities/backupable/backupable_db_test.cc +++ b/utilities/backupable/backupable_db_test.cc @@ -1621,6 +1621,8 @@ int main(int argc, char** argv) { #include int main(int argc, char** argv) { + (void) argc; + (void) argv; fprintf(stderr, "SKIPPED as BackupableDB is not supported in ROCKSDB_LITE\n"); return 0; } diff --git a/utilities/blob_db/blob_db_test.cc b/utilities/blob_db/blob_db_test.cc index 420757a4667..8164b6a78ae 100644 --- a/utilities/blob_db/blob_db_test.cc +++ b/utilities/blob_db/blob_db_test.cc @@ -1545,6 +1545,8 @@ int main(int argc, char** argv) { #include int main(int argc, char** argv) { + (void) argc; + (void) argv; fprintf(stderr, "SKIPPED as BlobDB is not supported in ROCKSDB_LITE\n"); return 0; } diff --git a/utilities/checkpoint/checkpoint_test.cc b/utilities/checkpoint/checkpoint_test.cc index 603e7757c34..f1f0e23942c 100644 --- a/utilities/checkpoint/checkpoint_test.cc +++ b/utilities/checkpoint/checkpoint_test.cc @@ -597,6 +597,8 @@ int main(int argc, char** argv) { #include int main(int argc, char** argv) { + (void) argc; + (void) argv; fprintf(stderr, "SKIPPED as Checkpoint is not supported in ROCKSDB_LITE\n"); return 0; } diff --git a/utilities/column_aware_encoding_exp.cc b/utilities/column_aware_encoding_exp.cc index 38eaf9d2a09..487f1355917 100644 --- a/utilities/column_aware_encoding_exp.cc +++ b/utilities/column_aware_encoding_exp.cc @@ -170,6 +170,8 @@ int main() { #endif // GFLAGS #else int main(int argc, char** argv) { + (void) argc; + (void) argv; fprintf(stderr, "Not supported in lite mode.\n"); return 1; } diff --git a/utilities/date_tiered/date_tiered_test.cc b/utilities/date_tiered/date_tiered_test.cc index 55e3f622dcf..42724825cbc 100644 --- a/utilities/date_tiered/date_tiered_test.cc +++ b/utilities/date_tiered/date_tiered_test.cc @@ -461,6 +461,8 @@ int main(int argc, char** argv) { #include int main(int argc, char** argv) { + (void) argc; + (void) argv; fprintf(stderr, "SKIPPED as DateTieredDB is not supported in ROCKSDB_LITE\n"); return 0; } diff --git a/utilities/document/document_db_test.cc b/utilities/document/document_db_test.cc index e8f4138c0bc..bdd60e928ed 100644 --- a/utilities/document/document_db_test.cc +++ b/utilities/document/document_db_test.cc @@ -329,6 +329,8 @@ int main(int argc, char** argv) { #include int main(int argc, char** argv) { + (void) argc; + (void) argv; fprintf(stderr, "SKIPPED as DocumentDB is not supported in ROCKSDB_LITE\n"); return 0; } diff --git a/utilities/document/json_document_test.cc b/utilities/document/json_document_test.cc index c7bfb39f383..8b7a3d48dbe 100644 --- a/utilities/document/json_document_test.cc +++ b/utilities/document/json_document_test.cc @@ -334,6 +334,8 @@ int main(int argc, char** argv) { #include int main(int argc, char** argv) { + (void) argc; + (void) argv; fprintf(stderr, "SKIPPED as JSONDocument is not supported in ROCKSDB_LITE\n"); return 0; } diff --git a/utilities/env_timed_test.cc b/utilities/env_timed_test.cc index 41d05e14cc5..cb14223c57d 100644 --- a/utilities/env_timed_test.cc +++ b/utilities/env_timed_test.cc @@ -37,6 +37,8 @@ int main(int argc, char** argv) { #include int main(int argc, char** argv) { + (void) argc; + (void) argv; fprintf(stderr, "SKIPPED as TimedEnv is not supported in ROCKSDB_LITE\n"); return 0; } diff --git a/utilities/lua/rocks_lua_test.cc b/utilities/lua/rocks_lua_test.cc index cbd8a13bc73..7aba82f2b7a 100644 --- a/utilities/lua/rocks_lua_test.cc +++ b/utilities/lua/rocks_lua_test.cc @@ -492,6 +492,8 @@ int main(int /*argc*/, char** /*argv*/) { #else int main(int argc, char** argv) { + (void) argc; + (void) argv; printf("Lua is not supported in RocksDBLite. Ignoring the test.\n"); } diff --git a/utilities/memory/memory_test.cc b/utilities/memory/memory_test.cc index ee4f8740d6c..de019cd34f6 100644 --- a/utilities/memory/memory_test.cc +++ b/utilities/memory/memory_test.cc @@ -270,6 +270,8 @@ int main(int argc, char** argv) { #include int main(int argc, char** argv) { + (void) argc; + (void) argv; printf("Skipped in RocksDBLite as utilities are not supported.\n"); return 0; } diff --git a/utilities/object_registry_test.cc b/utilities/object_registry_test.cc index fe69d9a3959..54463bccac8 100644 --- a/utilities/object_registry_test.cc +++ b/utilities/object_registry_test.cc @@ -66,6 +66,8 @@ int main(int argc, char** argv) { #include int main(int argc, char** argv) { + (void) argc; + (void) argv; fprintf(stderr, "SKIPPED as EnvRegistry is not supported in ROCKSDB_LITE\n"); return 0; } diff --git a/utilities/options/options_util_test.cc b/utilities/options/options_util_test.cc index ef5bbdfe606..5ad4cb83cfa 100644 --- a/utilities/options/options_util_test.cc +++ b/utilities/options/options_util_test.cc @@ -312,6 +312,8 @@ int main(int argc, char** argv) { #include int main(int argc, char** argv) { + (void) argc; + (void) argv; printf("Skipped in RocksDBLite as utilities are not supported.\n"); return 0; } diff --git a/utilities/redis/redis_lists_test.cc b/utilities/redis/redis_lists_test.cc index efb4c027514..fe5ec272fa5 100644 --- a/utilities/redis/redis_lists_test.cc +++ b/utilities/redis/redis_lists_test.cc @@ -887,6 +887,8 @@ int main(int argc, char* argv[]) { #include int main(int argc, char* argv[]) { + (void) argc; + (void) argv; fprintf(stderr, "SKIPPED as redis is not supported in ROCKSDB_LITE\n"); return 0; } diff --git a/utilities/spatialdb/spatial_db_test.cc b/utilities/spatialdb/spatial_db_test.cc index 55de1d0db7b..7de8dd5930b 100644 --- a/utilities/spatialdb/spatial_db_test.cc +++ b/utilities/spatialdb/spatial_db_test.cc @@ -300,6 +300,8 @@ int main(int argc, char** argv) { #include int main(int argc, char** argv) { + (void) argc; + (void) argv; fprintf(stderr, "SKIPPED as SpatialDB is not supported in ROCKSDB_LITE\n"); return 0; } diff --git a/utilities/table_properties_collectors/compact_on_deletion_collector_test.cc b/utilities/table_properties_collectors/compact_on_deletion_collector_test.cc index c0768ec5bad..ac804a60ca9 100644 --- a/utilities/table_properties_collectors/compact_on_deletion_collector_test.cc +++ b/utilities/table_properties_collectors/compact_on_deletion_collector_test.cc @@ -172,6 +172,8 @@ int main(int /*argc*/, char** /*argv*/) { } #else int main(int argc, char** argv) { + (void) argc; + (void) argv; fprintf(stderr, "SKIPPED as RocksDBLite does not include utilities.\n"); return 0; } diff --git a/utilities/transactions/optimistic_transaction_test.cc b/utilities/transactions/optimistic_transaction_test.cc index e9fdc601940..6285bfc8e60 100644 --- a/utilities/transactions/optimistic_transaction_test.cc +++ b/utilities/transactions/optimistic_transaction_test.cc @@ -1389,6 +1389,8 @@ int main(int argc, char** argv) { #include int main(int argc, char** argv) { + (void) argc; + (void) argv; fprintf( stderr, "SKIPPED as optimistic_transaction is not supported in ROCKSDB_LITE\n"); diff --git a/utilities/transactions/transaction_test.cc b/utilities/transactions/transaction_test.cc index 6a6c57a0f79..ebe921a8cca 100644 --- a/utilities/transactions/transaction_test.cc +++ b/utilities/transactions/transaction_test.cc @@ -5557,6 +5557,8 @@ int main(int argc, char** argv) { #include int main(int argc, char** argv) { + (void) argc; + (void) argv; fprintf(stderr, "SKIPPED as Transactions are not supported in ROCKSDB_LITE\n"); return 0; diff --git a/utilities/transactions/write_prepared_transaction_test.cc b/utilities/transactions/write_prepared_transaction_test.cc index b77498eebcc..897c3681cca 100644 --- a/utilities/transactions/write_prepared_transaction_test.cc +++ b/utilities/transactions/write_prepared_transaction_test.cc @@ -2049,6 +2049,8 @@ int main(int argc, char** argv) { #include int main(int argc, char** argv) { + (void) argc; + (void) argv; fprintf(stderr, "SKIPPED as Transactions are not supported in ROCKSDB_LITE\n"); return 0; diff --git a/utilities/ttl/ttl_test.cc b/utilities/ttl/ttl_test.cc index 7462fbb816d..592c7c23387 100644 --- a/utilities/ttl/ttl_test.cc +++ b/utilities/ttl/ttl_test.cc @@ -656,6 +656,8 @@ int main(int argc, char** argv) { #include int main(int argc, char** argv) { + (void) argc; + (void) argv; fprintf(stderr, "SKIPPED as DBWithTTL is not supported in ROCKSDB_LITE\n"); return 0; } From 0632c728d48524cb3a1a45582ae1b8bdf791253c Mon Sep 17 00:00:00 2001 From: Zhongyi Xie Date: Fri, 13 Apr 2018 15:15:45 -0700 Subject: [PATCH 2/3] comment out unused variable, update comment for two_level_iterator --- db/compact_files_test.cc | 4 +--- db/compaction_job_stats_test.cc | 10 ++-------- db/compaction_job_test.cc | 4 +--- db/corruption_test.cc | 4 +--- db/cuckoo_table_db_test.cc | 4 +--- db/deletefile_test.cc | 4 +--- db/external_sst_file_test.cc | 4 +--- db/obsolete_files_test.cc | 4 +--- db/options_file_test.cc | 4 +--- db/plain_table_db_test.cc | 4 +--- db/prefix_test.cc | 4 +--- db/repair_test.cc | 4 +--- db/wal_manager_test.cc | 4 +--- db/write_callback_test.cc | 4 +--- table/cuckoo_table_builder_test.cc | 4 +--- table/cuckoo_table_reader_test.cc | 4 +--- table/two_level_iterator.cc | 4 ++-- table/two_level_iterator.h | 6 +----- tools/ldb_cmd_test.cc | 4 +--- tools/reduce_levels_test.cc | 4 +--- tools/sst_dump_test.cc | 4 +--- util/auto_roll_logger_test.cc | 4 +--- util/delete_scheduler_test.cc | 4 +--- utilities/backupable/backupable_db_test.cc | 4 +--- utilities/blob_db/blob_db_test.cc | 4 +--- utilities/checkpoint/checkpoint_test.cc | 4 +--- utilities/column_aware_encoding_exp.cc | 4 +--- utilities/date_tiered/date_tiered_test.cc | 4 +--- utilities/document/document_db_test.cc | 4 +--- utilities/document/json_document_test.cc | 4 +--- utilities/env_timed_test.cc | 4 +--- utilities/lua/rocks_lua_test.cc | 4 +--- utilities/memory/memory_test.cc | 4 +--- utilities/object_registry_test.cc | 4 +--- utilities/options/options_util_test.cc | 4 +--- utilities/redis/redis_lists_test.cc | 4 +--- utilities/spatialdb/spatial_db_test.cc | 4 +--- .../compact_on_deletion_collector_test.cc | 4 +--- utilities/transactions/optimistic_transaction_test.cc | 4 +--- utilities/transactions/transaction_test.cc | 4 +--- .../transactions/write_prepared_transaction_test.cc | 4 +--- utilities/ttl/ttl_test.cc | 4 +--- 42 files changed, 44 insertions(+), 132 deletions(-) diff --git a/db/compact_files_test.cc b/db/compact_files_test.cc index 57ce898051b..b594abc9046 100644 --- a/db/compact_files_test.cc +++ b/db/compact_files_test.cc @@ -318,9 +318,7 @@ int main(int argc, char** argv) { #else #include -int main(int argc, char** argv) { - (void) argc; - (void) argv; +int main(int /*argc*/, char** /*argv*/) { fprintf(stderr, "SKIPPED as DBImpl::CompactFiles is not supported in ROCKSDB_LITE\n"); return 0; diff --git a/db/compaction_job_stats_test.cc b/db/compaction_job_stats_test.cc index 97a09778052..056c381a9a4 100644 --- a/db/compaction_job_stats_test.cc +++ b/db/compaction_job_stats_test.cc @@ -1034,9 +1034,7 @@ int main(int argc, char** argv) { #else #include -int main(int argc, char** argv) { - (void) argc; - (void) argv; +int main(int /*argc*/, char** /*argv*/) { fprintf(stderr, "SKIPPED, not supported in ROCKSDB_LITE\n"); return 0; } @@ -1045,9 +1043,5 @@ int main(int argc, char** argv) { #else -int main(int argc, char** argv) { - (void) argc; - (void) argv; - return 0; -} +int main(int /*argc*/, char** /*argv*/) { return 0; } #endif // !defined(IOS_CROSS_COMPILE) diff --git a/db/compaction_job_test.cc b/db/compaction_job_test.cc index eff7c5a722b..08c018a081f 100644 --- a/db/compaction_job_test.cc +++ b/db/compaction_job_test.cc @@ -946,9 +946,7 @@ int main(int argc, char** argv) { #else #include -int main(int argc, char** argv) { - (void) argc; - (void) argv; +int main(int /*argc*/, char** /*argv*/) { fprintf(stderr, "SKIPPED as CompactionJobStats is not supported in ROCKSDB_LITE\n"); return 0; diff --git a/db/corruption_test.cc b/db/corruption_test.cc index fa502ff3e00..cbd125b98e0 100644 --- a/db/corruption_test.cc +++ b/db/corruption_test.cc @@ -510,9 +510,7 @@ int main(int argc, char** argv) { #else #include -int main(int argc, char** argv) { - (void) argc; - (void) argv; +int main(int /*argc*/, char** /*argv*/) { fprintf(stderr, "SKIPPED as RepairDB() is not supported in ROCKSDB_LITE\n"); return 0; } diff --git a/db/cuckoo_table_db_test.cc b/db/cuckoo_table_db_test.cc index 2de3857fdc3..fe1575890f7 100644 --- a/db/cuckoo_table_db_test.cc +++ b/db/cuckoo_table_db_test.cc @@ -333,9 +333,7 @@ int main(int argc, char** argv) { #else #include -int main(int argc, char** argv) { - (void) argc; - (void) argv; +int main(int /*argc*/, char** /*argv*/) { fprintf(stderr, "SKIPPED as Cuckoo table is not supported in ROCKSDB_LITE\n"); return 0; } diff --git a/db/deletefile_test.cc b/db/deletefile_test.cc index ef5a0a946da..5b150205a0b 100644 --- a/db/deletefile_test.cc +++ b/db/deletefile_test.cc @@ -500,9 +500,7 @@ int main(int argc, char** argv) { #else #include -int main(int argc, char** argv) { - (void) argc; - (void) argv; +int main(int /*argc*/, char** /*argv*/) { fprintf(stderr, "SKIPPED as DBImpl::DeleteFile is not supported in ROCKSDB_LITE\n"); return 0; diff --git a/db/external_sst_file_test.cc b/db/external_sst_file_test.cc index 5dfae364a14..4cbcf25d923 100644 --- a/db/external_sst_file_test.cc +++ b/db/external_sst_file_test.cc @@ -2006,9 +2006,7 @@ int main(int argc, char** argv) { #else #include -int main(int argc, char** argv) { - (void) argc; - (void) argv; +int main(int /*argc*/, char** /*argv*/) { fprintf(stderr, "SKIPPED as External SST File Writer and Ingestion are not supported " "in ROCKSDB_LITE\n"); diff --git a/db/obsolete_files_test.cc b/db/obsolete_files_test.cc index 094810f4683..553064f2fef 100644 --- a/db/obsolete_files_test.cc +++ b/db/obsolete_files_test.cc @@ -208,9 +208,7 @@ int main(int argc, char** argv) { #else #include -int main(int argc, char** argv) { - (void) argc; - (void) argv; +int main(int /*argc*/, char** /*argv*/) { fprintf(stderr, "SKIPPED as DBImpl::DeleteFile is not supported in ROCKSDB_LITE\n"); return 0; diff --git a/db/options_file_test.cc b/db/options_file_test.cc index e769293d63e..885698256cb 100644 --- a/db/options_file_test.cc +++ b/db/options_file_test.cc @@ -112,9 +112,7 @@ int main(int argc, char** argv) { #include -int main(int argc, char** argv) { - (void) argc; - (void) argv; +int main(int /*argc*/, char** /*argv*/) { printf("Skipped as Options file is not supported in RocksDBLite.\n"); return 0; } diff --git a/db/plain_table_db_test.cc b/db/plain_table_db_test.cc index 8f087109fb4..de1f67fe0b9 100644 --- a/db/plain_table_db_test.cc +++ b/db/plain_table_db_test.cc @@ -1170,9 +1170,7 @@ int main(int argc, char** argv) { #else #include -int main(int argc, char** argv) { - (void) argc; - (void) argv; +int main(int /*argc*/, char** /*argv*/) { fprintf(stderr, "SKIPPED as plain table is not supported in ROCKSDB_LITE\n"); return 0; } diff --git a/db/prefix_test.cc b/db/prefix_test.cc index 09455d0c4b1..274ad3ad4ce 100644 --- a/db/prefix_test.cc +++ b/db/prefix_test.cc @@ -887,9 +887,7 @@ int main(int argc, char** argv) { #else #include -int main(int argc, char** argv) { - (void) argc; - (void) argv; +int main(int /*argc*/, char** /*argv*/) { fprintf(stderr, "SKIPPED as HashSkipList and HashLinkList are not supported in " "ROCKSDB_LITE\n"); diff --git a/db/repair_test.cc b/db/repair_test.cc index dc9466cc6a4..93dcfc14d61 100644 --- a/db/repair_test.cc +++ b/db/repair_test.cc @@ -356,9 +356,7 @@ int main(int argc, char** argv) { #else #include -int main(int argc, char** argv) { - (void) argc; - (void) argv; +int main(int /*argc*/, char** /*argv*/) { fprintf(stderr, "SKIPPED as RepairDB is not supported in ROCKSDB_LITE\n"); return 0; } diff --git a/db/wal_manager_test.cc b/db/wal_manager_test.cc index bdc250147ad..ced28b87aad 100644 --- a/db/wal_manager_test.cc +++ b/db/wal_manager_test.cc @@ -303,9 +303,7 @@ int main(int argc, char** argv) { #else #include -int main(int argc, char** argv) { - (void) argc; - (void) argv; +int main(int /*argc*/, char** /*argv*/) { fprintf(stderr, "SKIPPED as WalManager is not supported in ROCKSDB_LITE\n"); return 0; } diff --git a/db/write_callback_test.cc b/db/write_callback_test.cc index 76665f7d19a..f62450f7703 100644 --- a/db/write_callback_test.cc +++ b/db/write_callback_test.cc @@ -432,9 +432,7 @@ int main(int argc, char** argv) { #else #include -int main(int argc, char** argv) { - (void) argc; - (void) argv; +int main(int /*argc*/, char** /*argv*/) { fprintf(stderr, "SKIPPED as WriteWithCallback is not supported in ROCKSDB_LITE\n"); return 0; diff --git a/table/cuckoo_table_builder_test.cc b/table/cuckoo_table_builder_test.cc index 440861b68da..38144c3f6a3 100644 --- a/table/cuckoo_table_builder_test.cc +++ b/table/cuckoo_table_builder_test.cc @@ -625,9 +625,7 @@ int main(int argc, char** argv) { #else #include -int main(int argc, char** argv) { - (void) argc; - (void) argv; +int main(int /*argc*/, char** /*argv*/) { fprintf(stderr, "SKIPPED as Cuckoo table is not supported in ROCKSDB_LITE\n"); return 0; } diff --git a/table/cuckoo_table_reader_test.cc b/table/cuckoo_table_reader_test.cc index 62cf93964a8..d831e02e43a 100644 --- a/table/cuckoo_table_reader_test.cc +++ b/table/cuckoo_table_reader_test.cc @@ -560,9 +560,7 @@ int main(int argc, char** argv) { #else #include -int main(int argc, char** argv) { - (void) argc; - (void) argv; +int main(int /*argc*/, char** /*argv*/) { fprintf(stderr, "SKIPPED as Cuckoo table is not supported in ROCKSDB_LITE\n"); return 0; } diff --git a/table/two_level_iterator.cc b/table/two_level_iterator.cc index ba1bde0a90e..97734b14687 100644 --- a/table/two_level_iterator.cc +++ b/table/two_level_iterator.cc @@ -25,8 +25,8 @@ class TwoLevelIterator : public InternalIterator { InternalIterator* first_level_iter); virtual ~TwoLevelIterator() { - first_level_iter_.DeleteIter(false); - second_level_iter_.DeleteIter(false); + first_level_iter_.DeleteIter(false /* is_arena_mode */); + second_level_iter_.DeleteIter(false /* is_arena_mode */); delete state_; } diff --git a/table/two_level_iterator.h b/table/two_level_iterator.h index e81c76d38b1..807d91cc30a 100644 --- a/table/two_level_iterator.h +++ b/table/two_level_iterator.h @@ -35,11 +35,7 @@ struct TwoLevelIteratorState { // // Uses a supplied function to convert an index_iter value into // an iterator over the contents of the corresponding block. -// arena: If not null, the arena is used to allocate the Iterator. -// When destroying the iterator, the destructor will destroy -// all the states but those allocated in arena. -// need_free_iter_and_state: free `state` and `first_level_iter` if -// true. Otherwise, just call destructor. +// Note: this function expects first_level_iter was not created using arena extern InternalIterator* NewTwoLevelIterator( TwoLevelIteratorState* state, InternalIterator* first_level_iter); diff --git a/tools/ldb_cmd_test.cc b/tools/ldb_cmd_test.cc index cfd436d9fc7..824b44c0811 100644 --- a/tools/ldb_cmd_test.cc +++ b/tools/ldb_cmd_test.cc @@ -54,9 +54,7 @@ int main(int argc, char** argv) { #else #include -int main(int argc, char** argv) { - (void) argc; - (void) argv; +int main(int /*argc*/, char** /*argv*/) { fprintf(stderr, "SKIPPED as LDBCommand is not supported in ROCKSDB_LITE\n"); return 0; } diff --git a/tools/reduce_levels_test.cc b/tools/reduce_levels_test.cc index 8cc15740348..7e1e1ac0087 100644 --- a/tools/reduce_levels_test.cc +++ b/tools/reduce_levels_test.cc @@ -210,9 +210,7 @@ int main(int argc, char** argv) { #else #include -int main(int argc, char** argv) { - (void) argc; - (void) argv; +int main(int /*argc*/, char** /*argv*/) { fprintf(stderr, "SKIPPED as LDBCommand is not supported in ROCKSDB_LITE\n"); return 0; } diff --git a/tools/sst_dump_test.cc b/tools/sst_dump_test.cc index 5a87d9bfa97..d7f4b5887b2 100644 --- a/tools/sst_dump_test.cc +++ b/tools/sst_dump_test.cc @@ -215,9 +215,7 @@ int main(int argc, char** argv) { #else #include -int main(int argc, char** argv) { - (void) argc; - (void) argv; +int main(int /*argc*/, char** /*argv*/) { fprintf(stderr, "SKIPPED as SSTDumpTool is not supported in ROCKSDB_LITE\n"); return 0; } diff --git a/util/auto_roll_logger_test.cc b/util/auto_roll_logger_test.cc index ceaefd54f7a..6c8357df9a7 100644 --- a/util/auto_roll_logger_test.cc +++ b/util/auto_roll_logger_test.cc @@ -520,9 +520,7 @@ int main(int argc, char** argv) { #else #include -int main(int argc, char** argv) { - (void) argc; - (void) argv; +int main(int /*argc*/, char** /*argv*/) { fprintf(stderr, "SKIPPED as AutoRollLogger is not supported in ROCKSDB_LITE\n"); return 0; diff --git a/util/delete_scheduler_test.cc b/util/delete_scheduler_test.cc index c25b354741b..f47469795b6 100644 --- a/util/delete_scheduler_test.cc +++ b/util/delete_scheduler_test.cc @@ -641,9 +641,7 @@ int main(int argc, char** argv) { } #else -int main(int argc, char** argv) { - (void) argc; - (void) argv; +int main(int /*argc*/, char** /*argv*/) { printf("DeleteScheduler is not supported in ROCKSDB_LITE\n"); return 0; } diff --git a/utilities/backupable/backupable_db_test.cc b/utilities/backupable/backupable_db_test.cc index c62d9e67597..8dfefc1c640 100644 --- a/utilities/backupable/backupable_db_test.cc +++ b/utilities/backupable/backupable_db_test.cc @@ -1620,9 +1620,7 @@ int main(int argc, char** argv) { #else #include -int main(int argc, char** argv) { - (void) argc; - (void) argv; +int main(int /*argc*/, char** /*argv*/) { fprintf(stderr, "SKIPPED as BackupableDB is not supported in ROCKSDB_LITE\n"); return 0; } diff --git a/utilities/blob_db/blob_db_test.cc b/utilities/blob_db/blob_db_test.cc index 8164b6a78ae..653b0accad6 100644 --- a/utilities/blob_db/blob_db_test.cc +++ b/utilities/blob_db/blob_db_test.cc @@ -1544,9 +1544,7 @@ int main(int argc, char** argv) { #else #include -int main(int argc, char** argv) { - (void) argc; - (void) argv; +int main(int /*argc*/, char** /*argv*/) { fprintf(stderr, "SKIPPED as BlobDB is not supported in ROCKSDB_LITE\n"); return 0; } diff --git a/utilities/checkpoint/checkpoint_test.cc b/utilities/checkpoint/checkpoint_test.cc index f1f0e23942c..520c0217675 100644 --- a/utilities/checkpoint/checkpoint_test.cc +++ b/utilities/checkpoint/checkpoint_test.cc @@ -596,9 +596,7 @@ int main(int argc, char** argv) { #else #include -int main(int argc, char** argv) { - (void) argc; - (void) argv; +int main(int /*argc*/, char** /*argv*/) { fprintf(stderr, "SKIPPED as Checkpoint is not supported in ROCKSDB_LITE\n"); return 0; } diff --git a/utilities/column_aware_encoding_exp.cc b/utilities/column_aware_encoding_exp.cc index 487f1355917..988a59b3c77 100644 --- a/utilities/column_aware_encoding_exp.cc +++ b/utilities/column_aware_encoding_exp.cc @@ -169,9 +169,7 @@ int main() { } #endif // GFLAGS #else -int main(int argc, char** argv) { - (void) argc; - (void) argv; +int main(int /*argc*/, char** /*argv*/) { fprintf(stderr, "Not supported in lite mode.\n"); return 1; } diff --git a/utilities/date_tiered/date_tiered_test.cc b/utilities/date_tiered/date_tiered_test.cc index 42724825cbc..fb0d5293046 100644 --- a/utilities/date_tiered/date_tiered_test.cc +++ b/utilities/date_tiered/date_tiered_test.cc @@ -460,9 +460,7 @@ int main(int argc, char** argv) { #else #include -int main(int argc, char** argv) { - (void) argc; - (void) argv; +int main(int /*argc*/, char** /*argv*/) { fprintf(stderr, "SKIPPED as DateTieredDB is not supported in ROCKSDB_LITE\n"); return 0; } diff --git a/utilities/document/document_db_test.cc b/utilities/document/document_db_test.cc index bdd60e928ed..ac73ae7e14e 100644 --- a/utilities/document/document_db_test.cc +++ b/utilities/document/document_db_test.cc @@ -328,9 +328,7 @@ int main(int argc, char** argv) { #else #include -int main(int argc, char** argv) { - (void) argc; - (void) argv; +int main(int /*argc*/, char** /*argv*/) { fprintf(stderr, "SKIPPED as DocumentDB is not supported in ROCKSDB_LITE\n"); return 0; } diff --git a/utilities/document/json_document_test.cc b/utilities/document/json_document_test.cc index 8b7a3d48dbe..977905b9156 100644 --- a/utilities/document/json_document_test.cc +++ b/utilities/document/json_document_test.cc @@ -333,9 +333,7 @@ int main(int argc, char** argv) { #else #include -int main(int argc, char** argv) { - (void) argc; - (void) argv; +int main(int /*argc*/, char** /*argv*/) { fprintf(stderr, "SKIPPED as JSONDocument is not supported in ROCKSDB_LITE\n"); return 0; } diff --git a/utilities/env_timed_test.cc b/utilities/env_timed_test.cc index cb14223c57d..8bdef6396e0 100644 --- a/utilities/env_timed_test.cc +++ b/utilities/env_timed_test.cc @@ -36,9 +36,7 @@ int main(int argc, char** argv) { #else // ROCKSDB_LITE #include -int main(int argc, char** argv) { - (void) argc; - (void) argv; +int main(int /*argc*/, char** /*argv*/) { fprintf(stderr, "SKIPPED as TimedEnv is not supported in ROCKSDB_LITE\n"); return 0; } diff --git a/utilities/lua/rocks_lua_test.cc b/utilities/lua/rocks_lua_test.cc index 7aba82f2b7a..a78d780a6ef 100644 --- a/utilities/lua/rocks_lua_test.cc +++ b/utilities/lua/rocks_lua_test.cc @@ -491,9 +491,7 @@ int main(int /*argc*/, char** /*argv*/) { #else -int main(int argc, char** argv) { - (void) argc; - (void) argv; +int main(int /*argc*/, char** /*argv*/) { printf("Lua is not supported in RocksDBLite. Ignoring the test.\n"); } diff --git a/utilities/memory/memory_test.cc b/utilities/memory/memory_test.cc index de019cd34f6..a6d4fbc5e2a 100644 --- a/utilities/memory/memory_test.cc +++ b/utilities/memory/memory_test.cc @@ -269,9 +269,7 @@ int main(int argc, char** argv) { #else #include -int main(int argc, char** argv) { - (void) argc; - (void) argv; +int main(int /*argc*/, char** /*argv*/) { printf("Skipped in RocksDBLite as utilities are not supported.\n"); return 0; } diff --git a/utilities/object_registry_test.cc b/utilities/object_registry_test.cc index 54463bccac8..4444d8712f9 100644 --- a/utilities/object_registry_test.cc +++ b/utilities/object_registry_test.cc @@ -65,9 +65,7 @@ int main(int argc, char** argv) { #else // ROCKSDB_LITE #include -int main(int argc, char** argv) { - (void) argc; - (void) argv; +int main(int /*argc*/, char** /*argv*/) { fprintf(stderr, "SKIPPED as EnvRegistry is not supported in ROCKSDB_LITE\n"); return 0; } diff --git a/utilities/options/options_util_test.cc b/utilities/options/options_util_test.cc index 5ad4cb83cfa..7809f202674 100644 --- a/utilities/options/options_util_test.cc +++ b/utilities/options/options_util_test.cc @@ -311,9 +311,7 @@ int main(int argc, char** argv) { #else #include -int main(int argc, char** argv) { - (void) argc; - (void) argv; +int main(int /*argc*/, char** /*argv*/) { printf("Skipped in RocksDBLite as utilities are not supported.\n"); return 0; } diff --git a/utilities/redis/redis_lists_test.cc b/utilities/redis/redis_lists_test.cc index fe5ec272fa5..5eec308e49f 100644 --- a/utilities/redis/redis_lists_test.cc +++ b/utilities/redis/redis_lists_test.cc @@ -886,9 +886,7 @@ int main(int argc, char* argv[]) { #else #include -int main(int argc, char* argv[]) { - (void) argc; - (void) argv; +int main(int /*argc*/, char** /*argv*/) { fprintf(stderr, "SKIPPED as redis is not supported in ROCKSDB_LITE\n"); return 0; } diff --git a/utilities/spatialdb/spatial_db_test.cc b/utilities/spatialdb/spatial_db_test.cc index 7de8dd5930b..e92c16f4880 100644 --- a/utilities/spatialdb/spatial_db_test.cc +++ b/utilities/spatialdb/spatial_db_test.cc @@ -299,9 +299,7 @@ int main(int argc, char** argv) { #else #include -int main(int argc, char** argv) { - (void) argc; - (void) argv; +int main(int /*argc*/, char** /*argv*/) { fprintf(stderr, "SKIPPED as SpatialDB is not supported in ROCKSDB_LITE\n"); return 0; } diff --git a/utilities/table_properties_collectors/compact_on_deletion_collector_test.cc b/utilities/table_properties_collectors/compact_on_deletion_collector_test.cc index ac804a60ca9..4edd2d6d633 100644 --- a/utilities/table_properties_collectors/compact_on_deletion_collector_test.cc +++ b/utilities/table_properties_collectors/compact_on_deletion_collector_test.cc @@ -171,9 +171,7 @@ int main(int /*argc*/, char** /*argv*/) { fprintf(stderr, "PASSED\n"); } #else -int main(int argc, char** argv) { - (void) argc; - (void) argv; +int main(int /*argc*/, char** /*argv*/) { fprintf(stderr, "SKIPPED as RocksDBLite does not include utilities.\n"); return 0; } diff --git a/utilities/transactions/optimistic_transaction_test.cc b/utilities/transactions/optimistic_transaction_test.cc index 6285bfc8e60..10632cfb21c 100644 --- a/utilities/transactions/optimistic_transaction_test.cc +++ b/utilities/transactions/optimistic_transaction_test.cc @@ -1388,9 +1388,7 @@ int main(int argc, char** argv) { #else #include -int main(int argc, char** argv) { - (void) argc; - (void) argv; +int main(int /*argc*/, char** /*argv*/) { fprintf( stderr, "SKIPPED as optimistic_transaction is not supported in ROCKSDB_LITE\n"); diff --git a/utilities/transactions/transaction_test.cc b/utilities/transactions/transaction_test.cc index ebe921a8cca..d6e19ec0da7 100644 --- a/utilities/transactions/transaction_test.cc +++ b/utilities/transactions/transaction_test.cc @@ -5556,9 +5556,7 @@ int main(int argc, char** argv) { #else #include -int main(int argc, char** argv) { - (void) argc; - (void) argv; +int main(int /*argc*/, char** /*argv*/) { fprintf(stderr, "SKIPPED as Transactions are not supported in ROCKSDB_LITE\n"); return 0; diff --git a/utilities/transactions/write_prepared_transaction_test.cc b/utilities/transactions/write_prepared_transaction_test.cc index 897c3681cca..fc6741d0297 100644 --- a/utilities/transactions/write_prepared_transaction_test.cc +++ b/utilities/transactions/write_prepared_transaction_test.cc @@ -2048,9 +2048,7 @@ int main(int argc, char** argv) { #else #include -int main(int argc, char** argv) { - (void) argc; - (void) argv; +int main(int /*argc*/, char** /*argv*/) { fprintf(stderr, "SKIPPED as Transactions are not supported in ROCKSDB_LITE\n"); return 0; diff --git a/utilities/ttl/ttl_test.cc b/utilities/ttl/ttl_test.cc index 592c7c23387..f507b1c0bcb 100644 --- a/utilities/ttl/ttl_test.cc +++ b/utilities/ttl/ttl_test.cc @@ -655,9 +655,7 @@ int main(int argc, char** argv) { #else #include -int main(int argc, char** argv) { - (void) argc; - (void) argv; +int main(int /*argc*/, char** /*argv*/) { fprintf(stderr, "SKIPPED as DBWithTTL is not supported in ROCKSDB_LITE\n"); return 0; } From 87aef57a4516aad2e0f819274ad0afd79536f767 Mon Sep 17 00:00:00 2001 From: Zhongyi Xie Date: Fri, 13 Apr 2018 16:28:04 -0700 Subject: [PATCH 3/3] comment update --- table/two_level_iterator.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/table/two_level_iterator.h b/table/two_level_iterator.h index 807d91cc30a..d1c8f91afac 100644 --- a/table/two_level_iterator.h +++ b/table/two_level_iterator.h @@ -16,8 +16,8 @@ namespace rocksdb { struct ReadOptions; class InternalKeyComparator; -class Arena; +// TwoLevelIteratorState expects iterators are not created using the arena struct TwoLevelIteratorState { TwoLevelIteratorState() {} @@ -35,7 +35,7 @@ struct TwoLevelIteratorState { // // Uses a supplied function to convert an index_iter value into // an iterator over the contents of the corresponding block. -// Note: this function expects first_level_iter was not created using arena +// Note: this function expects first_level_iter was not created using the arena extern InternalIterator* NewTwoLevelIterator( TwoLevelIteratorState* state, InternalIterator* first_level_iter);