diff --git a/cache/lru_cache.cc b/cache/lru_cache.cc index 04e612bdb..5a4a2729d 100644 --- a/cache/lru_cache.cc +++ b/cache/lru_cache.cc @@ -11,7 +11,6 @@ #include #include -#include #include #include "util/mutexlock.h" diff --git a/db/c.cc b/db/c.cc index cb09e9d0e..e9f520e25 100644 --- a/db/c.cc +++ b/db/c.cc @@ -60,7 +60,6 @@ using ROCKSDB_NAMESPACE::ColumnFamilyDescriptor; using ROCKSDB_NAMESPACE::ColumnFamilyHandle; using ROCKSDB_NAMESPACE::ColumnFamilyOptions; using ROCKSDB_NAMESPACE::CompactionFilter; -using ROCKSDB_NAMESPACE::CompactionFilterContext; using ROCKSDB_NAMESPACE::CompactionFilterFactory; using ROCKSDB_NAMESPACE::CompactionOptionsFIFO; using ROCKSDB_NAMESPACE::CompactRangeOptions; @@ -82,7 +81,6 @@ using ROCKSDB_NAMESPACE::LiveFileMetaData; using ROCKSDB_NAMESPACE::Logger; using ROCKSDB_NAMESPACE::MemoryUtil; using ROCKSDB_NAMESPACE::MergeOperator; -using ROCKSDB_NAMESPACE::MergeOperators; using ROCKSDB_NAMESPACE::NewBloomFilterPolicy; using ROCKSDB_NAMESPACE::NewGenericRateLimiter; using ROCKSDB_NAMESPACE::NewLRUCache; @@ -115,10 +113,8 @@ using ROCKSDB_NAMESPACE::WriteBatch; using ROCKSDB_NAMESPACE::WriteBatchWithIndex; using ROCKSDB_NAMESPACE::WriteOptions; -using std::shared_ptr; using std::vector; using std::unordered_set; -using std::map; extern "C" { diff --git a/db/compaction/compaction_job_stats_test.cc b/db/compaction/compaction_job_stats_test.cc index 9c640a591..1edb270fe 100644 --- a/db/compaction/compaction_job_stats_test.cc +++ b/db/compaction/compaction_job_stats_test.cc @@ -24,7 +24,6 @@ #include "db/write_batch_internal.h" #include "env/mock_env.h" #include "file/filename.h" -#include "logging/logging.h" #include "memtable/hash_linklist_rep.h" #include "monitoring/statistics.h" #include "monitoring/thread_status_util.h" diff --git a/db/compaction/compaction_picker_test.cc b/db/compaction/compaction_picker_test.cc index d5580cc8a..c415fd811 100644 --- a/db/compaction/compaction_picker_test.cc +++ b/db/compaction/compaction_picker_test.cc @@ -12,7 +12,6 @@ #include "db/compaction/compaction_picker_level.h" #include "db/compaction/compaction_picker_universal.h" -#include "logging/logging.h" #include "test_util/testharness.h" #include "test_util/testutil.h" #include "util/string_util.h" diff --git a/db/comparator_db_test.cc b/db/comparator_db_test.cc index 4eac91e2a..876cf07fa 100644 --- a/db/comparator_db_test.cc +++ b/db/comparator_db_test.cc @@ -17,7 +17,6 @@ #include "util/string_util.h" #include "utilities/merge_operators.h" -using std::unique_ptr; namespace ROCKSDB_NAMESPACE { namespace { diff --git a/db/corruption_test.cc b/db/corruption_test.cc index ef5dbba48..cb7cfef34 100644 --- a/db/corruption_test.cc +++ b/db/corruption_test.cc @@ -9,7 +9,6 @@ #ifndef ROCKSDB_LITE -#include #include #include #include diff --git a/db/dbformat_test.cc b/db/dbformat_test.cc index a6e633fb1..06c5bb202 100644 --- a/db/dbformat_test.cc +++ b/db/dbformat_test.cc @@ -8,7 +8,6 @@ // found in the LICENSE file. See the AUTHORS file for names of contributors. #include "db/dbformat.h" -#include "logging/logging.h" #include "test_util/testharness.h" namespace ROCKSDB_NAMESPACE { diff --git a/db/fault_injection_test.cc b/db/fault_injection_test.cc index 7e208bbf9..db6da3613 100644 --- a/db/fault_injection_test.cc +++ b/db/fault_injection_test.cc @@ -16,7 +16,6 @@ #include "db/version_set.h" #include "env/mock_env.h" #include "file/filename.h" -#include "logging/logging.h" #include "rocksdb/cache.h" #include "rocksdb/db.h" #include "rocksdb/env.h" diff --git a/db/filename_test.cc b/db/filename_test.cc index 10d85e6ab..d166876ba 100644 --- a/db/filename_test.cc +++ b/db/filename_test.cc @@ -10,7 +10,6 @@ #include "file/filename.h" #include "db/dbformat.h" -#include "logging/logging.h" #include "port/port.h" #include "test_util/testharness.h" diff --git a/db/listener_test.cc b/db/listener_test.cc index 92f879a13..1712a5be8 100644 --- a/db/listener_test.cc +++ b/db/listener_test.cc @@ -10,7 +10,6 @@ #include "db/version_set.h" #include "db/write_batch_internal.h" #include "file/filename.h" -#include "logging/logging.h" #include "memtable/hash_linklist_rep.h" #include "monitoring/statistics.h" #include "rocksdb/cache.h" diff --git a/db/obsolete_files_test.cc b/db/obsolete_files_test.cc index 7694b5955..d198e3676 100644 --- a/db/obsolete_files_test.cc +++ b/db/obsolete_files_test.cc @@ -28,10 +28,6 @@ #include "test_util/testutil.h" #include "util/string_util.h" -using std::cerr; -using std::cout; -using std::endl; -using std::flush; namespace ROCKSDB_NAMESPACE { diff --git a/db/periodic_work_scheduler.cc b/db/periodic_work_scheduler.cc index 89303ca0f..cc6f714d9 100644 --- a/db/periodic_work_scheduler.cc +++ b/db/periodic_work_scheduler.cc @@ -6,7 +6,6 @@ #include "db/periodic_work_scheduler.h" #include "db/db_impl/db_impl.h" -#include "util/cast_util.h" #ifndef ROCKSDB_LITE namespace ROCKSDB_NAMESPACE { diff --git a/db/plain_table_db_test.cc b/db/plain_table_db_test.cc index 0f422a2d6..0ea7e9900 100644 --- a/db/plain_table_db_test.cc +++ b/db/plain_table_db_test.cc @@ -16,7 +16,6 @@ #include "db/version_set.h" #include "db/write_batch_internal.h" #include "file/filename.h" -#include "logging/logging.h" #include "rocksdb/cache.h" #include "rocksdb/compaction_filter.h" #include "rocksdb/db.h" @@ -39,7 +38,6 @@ #include "util/string_util.h" #include "utilities/merge_operators.h" -using std::unique_ptr; namespace ROCKSDB_NAMESPACE { class PlainTableKeyDecoderTest : public testing::Test {}; diff --git a/db/version_builder_test.cc b/db/version_builder_test.cc index 513900de5..9dca9ec2a 100644 --- a/db/version_builder_test.cc +++ b/db/version_builder_test.cc @@ -11,7 +11,6 @@ #include "db/version_edit.h" #include "db/version_set.h" -#include "logging/logging.h" #include "test_util/testharness.h" #include "test_util/testutil.h" #include "util/string_util.h" diff --git a/db/version_set_test.cc b/db/version_set_test.cc index 57eae6f36..fce8e025f 100644 --- a/db/version_set_test.cc +++ b/db/version_set_test.cc @@ -11,7 +11,6 @@ #include "db/db_impl/db_impl.h" #include "db/log_writer.h" -#include "logging/logging.h" #include "table/block_based/block_based_table_factory.h" #include "table/mock_table.h" #include "test_util/testharness.h" diff --git a/env/env.cc b/env/env.cc index 9dcdd3421..06dffce1c 100644 --- a/env/env.cc +++ b/env/env.cc @@ -15,7 +15,6 @@ #include "memory/arena.h" #include "options/db_options.h" #include "port/port.h" -#include "port/sys_time.h" #include "rocksdb/options.h" #include "rocksdb/utilities/object_registry.h" #include "util/autovector.h" diff --git a/env/env_posix.cc b/env/env_posix.cc index fd7cbec22..78d5e251b 100644 --- a/env/env_posix.cc +++ b/env/env_posix.cc @@ -16,9 +16,6 @@ #include #include -#if defined(OS_LINUX) -#include -#endif #if defined(ROCKSDB_IOURING_PRESENT) #include #endif @@ -27,13 +24,10 @@ #include #include #include -#include #include #include #if defined(OS_LINUX) || defined(OS_SOLARIS) || defined(OS_ANDROID) #include -#include -#include #endif #include #include @@ -58,7 +52,6 @@ #include "env/composite_env_wrapper.h" #include "env/io_posix.h" -#include "logging/logging.h" #include "logging/posix_logger.h" #include "monitoring/iostats_context_imp.h" #include "monitoring/thread_status_updater.h" diff --git a/env/fs_posix.cc b/env/fs_posix.cc index 5fa3d8224..92133eb22 100644 --- a/env/fs_posix.cc +++ b/env/fs_posix.cc @@ -16,9 +16,6 @@ #include #include -#if defined(OS_LINUX) -#include -#endif #include #include #include @@ -29,7 +26,6 @@ #include #if defined(OS_LINUX) || defined(OS_SOLARIS) || defined(OS_ANDROID) #include -#include #include #endif #include @@ -52,7 +48,6 @@ #include "env/composite_env_wrapper.h" #include "env/io_posix.h" -#include "logging/logging.h" #include "logging/posix_logger.h" #include "monitoring/iostats_context_imp.h" #include "monitoring/thread_status_updater.h" diff --git a/env/io_posix.cc b/env/io_posix.cc index 689d89812..97770d256 100644 --- a/env/io_posix.cc +++ b/env/io_posix.cc @@ -27,7 +27,6 @@ #include #ifdef OS_LINUX #include -#include #include #endif #include "monitoring/iostats_context_imp.h" diff --git a/file/filename.cc b/file/filename.cc index 9836971f4..a581b466f 100644 --- a/file/filename.cc +++ b/file/filename.cc @@ -13,7 +13,6 @@ #include #include #include "file/writable_file_writer.h" -#include "logging/logging.h" #include "rocksdb/env.h" #include "test_util/sync_point.h" #include "util/stop_watch.h" diff --git a/logging/auto_roll_logger_test.cc b/logging/auto_roll_logger_test.cc index 520d9de23..e5d384800 100644 --- a/logging/auto_roll_logger_test.cc +++ b/logging/auto_roll_logger_test.cc @@ -7,7 +7,6 @@ #ifndef ROCKSDB_LITE #include "logging/auto_roll_logger.h" -#include #include #include #include diff --git a/logging/event_logger.cc b/logging/event_logger.cc index f1747ad25..78bf4f8ff 100644 --- a/logging/event_logger.cc +++ b/logging/event_logger.cc @@ -10,7 +10,6 @@ #include #include -#include "logging/logging.h" #include "util/string_util.h" namespace ROCKSDB_NAMESPACE { diff --git a/monitoring/persistent_stats_history.cc b/monitoring/persistent_stats_history.cc index 7cc869cf2..86fe98f1f 100644 --- a/monitoring/persistent_stats_history.cc +++ b/monitoring/persistent_stats_history.cc @@ -12,7 +12,6 @@ #include #include #include "db/db_impl/db_impl.h" -#include "port/likely.h" #include "util/string_util.h" namespace ROCKSDB_NAMESPACE { diff --git a/monitoring/statistics.cc b/monitoring/statistics.cc index 2c7f65a89..1723827cf 100644 --- a/monitoring/statistics.cc +++ b/monitoring/statistics.cc @@ -8,7 +8,6 @@ #include #include #include -#include "port/likely.h" #include "rocksdb/statistics.h" namespace ROCKSDB_NAMESPACE { diff --git a/port/port_posix.cc b/port/port_posix.cc index 8610c6e0d..59fa6b89b 100644 --- a/port/port_posix.cc +++ b/port/port_posix.cc @@ -21,11 +21,9 @@ #include #include #include -#include #include #include #include -#include "logging/logging.h" namespace ROCKSDB_NAMESPACE { diff --git a/table/block_based/block.cc b/table/block_based/block.cc index bc481d57e..2d32ebcb4 100644 --- a/table/block_based/block.cc +++ b/table/block_based/block.cc @@ -15,7 +15,6 @@ #include #include -#include "logging/logging.h" #include "monitoring/perf_context_imp.h" #include "port/port.h" #include "port/stack_trace.h" diff --git a/table/block_based/block_based_table_builder.cc b/table/block_based/block_based_table_builder.cc index 8ee047347..8ab775c1d 100644 --- a/table/block_based/block_based_table_builder.cc +++ b/table/block_based/block_based_table_builder.cc @@ -21,7 +21,6 @@ #include "db/dbformat.h" #include "index_builder.h" -#include "port/lang.h" #include "rocksdb/cache.h" #include "rocksdb/comparator.h" @@ -56,7 +55,6 @@ namespace ROCKSDB_NAMESPACE { extern const std::string kHashIndexPrefixesBlock; extern const std::string kHashIndexPrefixesMetadataBlock; -typedef BlockBasedTableOptions::IndexType IndexType; // Without anonymous namespace here, we fail the warning -Wmissing-prototypes namespace { diff --git a/table/block_based/block_based_table_reader.cc b/table/block_based/block_based_table_reader.cc index 8c02c33f5..049a14d8c 100644 --- a/table/block_based/block_based_table_reader.cc +++ b/table/block_based/block_based_table_reader.cc @@ -62,7 +62,6 @@ #include "util/crc32c.h" #include "util/stop_watch.h" #include "util/string_util.h" -#include "util/xxhash.h" namespace ROCKSDB_NAMESPACE { @@ -70,7 +69,6 @@ extern const uint64_t kBlockBasedTableMagicNumber; extern const std::string kHashIndexPrefixesBlock; extern const std::string kHashIndexPrefixesMetadataBlock; -typedef BlockBasedTable::IndexReader IndexReader; // Found that 256 KB readahead size provides the best performance, based on // experiments, for auto readahead. Experiment data is in PR #3282. diff --git a/table/block_based/partitioned_filter_block_test.cc b/table/block_based/partitioned_filter_block_test.cc index e23f910b5..e06a38da7 100644 --- a/table/block_based/partitioned_filter_block_test.cc +++ b/table/block_based/partitioned_filter_block_test.cc @@ -12,7 +12,6 @@ #include "table/block_based/filter_policy_internal.h" #include "index_builder.h" -#include "logging/logging.h" #include "test_util/testharness.h" #include "test_util/testutil.h" #include "util/coding.h" diff --git a/table/cuckoo/cuckoo_table_reader_test.cc b/table/cuckoo/cuckoo_table_reader_test.cc index 5795de80d..56a0b2393 100644 --- a/table/cuckoo/cuckoo_table_reader_test.cc +++ b/table/cuckoo/cuckoo_table_reader_test.cc @@ -31,7 +31,6 @@ int main() { #include "util/string_util.h" using GFLAGS_NAMESPACE::ParseCommandLineFlags; -using GFLAGS_NAMESPACE::SetUsageMessage; DEFINE_string(file_dir, "", "Directory where the files will be created" " for benchmark. Added for using tmpfs."); diff --git a/table/format.cc b/table/format.cc index 41235a1b5..8af4d35e5 100644 --- a/table/format.cc +++ b/table/format.cc @@ -14,7 +14,6 @@ #include "block_fetcher.h" #include "file/random_access_file_reader.h" -#include "logging/logging.h" #include "memory/memory_allocator.h" #include "monitoring/perf_context_imp.h" #include "monitoring/statistics.h" diff --git a/test_util/sync_point.cc b/test_util/sync_point.cc index 16eb4e553..c8dda57f5 100644 --- a/test_util/sync_point.cc +++ b/test_util/sync_point.cc @@ -6,7 +6,6 @@ #include "test_util/sync_point.h" #include -#include #include "test_util/sync_point_impl.h" diff --git a/tools/db_bench_tool.cc b/tools/db_bench_tool.cc index b81cae6ce..322535aef 100644 --- a/tools/db_bench_tool.cc +++ b/tools/db_bench_tool.cc @@ -10,7 +10,6 @@ #ifdef GFLAGS #ifdef NUMA #include -#include #endif #ifndef OS_WIN #include diff --git a/tools/ldb_cmd.cc b/tools/ldb_cmd.cc index ae66d65f2..8ff980025 100644 --- a/tools/ldb_cmd.cc +++ b/tools/ldb_cmd.cc @@ -24,7 +24,6 @@ #include "db/write_batch_internal.h" #include "env/composite_env_wrapper.h" #include "file/filename.h" -#include "port/port_dirent.h" #include "rocksdb/cache.h" #include "rocksdb/file_checksum.h" #include "rocksdb/table_properties.h" diff --git a/tools/trace_analyzer_tool.cc b/tools/trace_analyzer_tool.cc index 2951af13f..c861225b1 100644 --- a/tools/trace_analyzer_tool.cc +++ b/tools/trace_analyzer_tool.cc @@ -9,7 +9,6 @@ #ifdef GFLAGS #ifdef NUMA #include -#include #endif #ifndef OS_WIN #include @@ -50,8 +49,6 @@ #include "util/string_util.h" using GFLAGS_NAMESPACE::ParseCommandLineFlags; -using GFLAGS_NAMESPACE::RegisterFlagValidator; -using GFLAGS_NAMESPACE::SetUsageMessage; DEFINE_string(trace_path, "", "The trace file path."); DEFINE_string(output_dir, "", "The directory to store the output files."); diff --git a/util/bloom_test.cc b/util/bloom_test.cc index 0fea9c662..2c671794a 100644 --- a/util/bloom_test.cc +++ b/util/bloom_test.cc @@ -19,7 +19,6 @@ int main() { #include #include -#include "logging/logging.h" #include "memory/arena.h" #include "port/jemalloc_helper.h" #include "rocksdb/filter_policy.h" diff --git a/util/comparator.cc b/util/comparator.cc index 44d45732a..96e770489 100644 --- a/util/comparator.cc +++ b/util/comparator.cc @@ -11,7 +11,6 @@ #include #include #include -#include "logging/logging.h" #include "port/port.h" #include "rocksdb/slice.h" diff --git a/util/dynamic_bloom_test.cc b/util/dynamic_bloom_test.cc index 47d04a36c..d8bee265b 100644 --- a/util/dynamic_bloom_test.cc +++ b/util/dynamic_bloom_test.cc @@ -20,7 +20,6 @@ int main() { #include #include "dynamic_bloom.h" -#include "logging/logging.h" #include "memory/arena.h" #include "port/port.h" #include "test_util/testharness.h" diff --git a/util/string_util.cc b/util/string_util.cc index d098ecb0b..c44992f88 100644 --- a/util/string_util.cc +++ b/util/string_util.cc @@ -6,7 +6,6 @@ #include "util/string_util.h" #include -#include #include #include #include diff --git a/util/xxhash.cc b/util/xxhash.cc index d1b1395ab..9b0d12389 100644 --- a/util/xxhash.cc +++ b/util/xxhash.cc @@ -218,7 +218,6 @@ static xxh_u32 XXH_read32(const void* memPtr) /* === Endianess === */ -typedef enum { XXH_bigEndian=0, XXH_littleEndian=1 } XXH_endianess; /* XXH_CPU_LITTLE_ENDIAN can be defined externally, for example on the compiler command line */ #ifndef XXH_CPU_LITTLE_ENDIAN @@ -1154,7 +1153,6 @@ XXH_PUBLIC_API XXH64_hash_t XXH64_hashFromCanonical(const XXH64_canonical_t* src #include "xxh3p.h" /* XXH3 preview for RocksDB */ - #endif /* XXH_NO_LONG_LONG */ #endif /* XXHASH_C_01393879 */ diff --git a/utilities/blob_db/blob_db_test.cc b/utilities/blob_db/blob_db_test.cc index 0190f7632..f6d834790 100644 --- a/utilities/blob_db/blob_db_test.cc +++ b/utilities/blob_db/blob_db_test.cc @@ -26,7 +26,6 @@ #include "rocksdb/utilities/debug.h" #include "test_util/sync_point.h" #include "test_util/testharness.h" -#include "util/cast_util.h" #include "util/random.h" #include "util/string_util.h" #include "utilities/blob_db/blob_db_impl.h" diff --git a/utilities/cassandra/cassandra_format_test.cc b/utilities/cassandra/cassandra_format_test.cc index 32d4d907c..9805d35d7 100644 --- a/utilities/cassandra/cassandra_format_test.cc +++ b/utilities/cassandra/cassandra_format_test.cc @@ -10,7 +10,6 @@ #include "utilities/cassandra/serialize.h" #include "utilities/cassandra/test_utils.h" -using namespace ROCKSDB_NAMESPACE::cassandra; namespace ROCKSDB_NAMESPACE { namespace cassandra { diff --git a/utilities/cassandra/cassandra_functional_test.cc b/utilities/cassandra/cassandra_functional_test.cc index 5c614b48f..d53a07907 100644 --- a/utilities/cassandra/cassandra_functional_test.cc +++ b/utilities/cassandra/cassandra_functional_test.cc @@ -17,7 +17,6 @@ #include "utilities/cassandra/test_utils.h" #include "utilities/merge_operators.h" -using namespace ROCKSDB_NAMESPACE; namespace ROCKSDB_NAMESPACE { namespace cassandra { diff --git a/utilities/cassandra/cassandra_serialize_test.cc b/utilities/cassandra/cassandra_serialize_test.cc index 491540bfe..8d0cf6667 100644 --- a/utilities/cassandra/cassandra_serialize_test.cc +++ b/utilities/cassandra/cassandra_serialize_test.cc @@ -6,7 +6,6 @@ #include "test_util/testharness.h" #include "utilities/cassandra/serialize.h" -using namespace ROCKSDB_NAMESPACE::cassandra; namespace ROCKSDB_NAMESPACE { namespace cassandra { diff --git a/utilities/merge_operators/sortlist.cc b/utilities/merge_operators/sortlist.cc index b6bd65b36..078b83e19 100644 --- a/utilities/merge_operators/sortlist.cc +++ b/utilities/merge_operators/sortlist.cc @@ -7,9 +7,6 @@ #include "rocksdb/slice.h" #include "utilities/merge_operators.h" -using ROCKSDB_NAMESPACE::Logger; -using ROCKSDB_NAMESPACE::MergeOperator; -using ROCKSDB_NAMESPACE::Slice; namespace ROCKSDB_NAMESPACE { diff --git a/utilities/merge_operators/string_append/stringappend_test.cc b/utilities/merge_operators/string_append/stringappend_test.cc index 675c4b2af..fdc890407 100644 --- a/utilities/merge_operators/string_append/stringappend_test.cc +++ b/utilities/merge_operators/string_append/stringappend_test.cc @@ -27,7 +27,6 @@ #include "utilities/merge_operators.h" #include "utilities/merge_operators/string_append/stringappend2.h" -using namespace ROCKSDB_NAMESPACE; namespace ROCKSDB_NAMESPACE { diff --git a/utilities/transactions/optimistic_transaction_test.cc b/utilities/transactions/optimistic_transaction_test.cc index 63c1a255c..21c8cdac4 100644 --- a/utilities/transactions/optimistic_transaction_test.cc +++ b/utilities/transactions/optimistic_transaction_test.cc @@ -10,7 +10,6 @@ #include #include "db/db_impl/db_impl.h" -#include "logging/logging.h" #include "port/port.h" #include "rocksdb/db.h" #include "rocksdb/perf_context.h"