Merge 9d2da5a6a3 into ac691084fd

benchmarks/db_bench.cc

@@ -2,8 +2,6 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file. See the AUTHORS file for names of contributors.
 
-#include <sys/types.h>
-
 #include <atomic>
 #include <cstdio>
 #include <cstdlib>
@@ -14,7 +12,7 @@
 #include "leveldb/env.h"
 #include "leveldb/filter_policy.h"
 #include "leveldb/write_batch.h"
-#include "port/port.h"
+#include "leveldb/options.h"
 #include "util/crc32c.h"
 #include "util/histogram.h"
 #include "util/mutexlock.h"

db/builder.cc

@@ -8,9 +8,9 @@
 #include "db/filename.h"
 #include "db/table_cache.h"
 #include "db/version_edit.h"
-#include "leveldb/db.h"
 #include "leveldb/env.h"
 #include "leveldb/iterator.h"
+#include "leveldb/table_builder.h"
 
 namespace leveldb {
 

db/corruption_test.cc

@@ -8,10 +8,8 @@
 #include "db/db_impl.h"
 #include "db/filename.h"
 #include "db/log_format.h"
-#include "db/version_set.h"
 #include "leveldb/cache.h"
 #include "leveldb/db.h"
-#include "leveldb/table.h"
 #include "leveldb/write_batch.h"
 #include "util/logging.h"
 #include "util/testutil.h"

db/db_impl.cc

@@ -25,13 +25,8 @@
 #include "leveldb/db.h"
 #include "leveldb/env.h"
 #include "leveldb/status.h"
-#include "leveldb/table.h"
 #include "leveldb/table_builder.h"
-#include "port/port.h"
-#include "table/block.h"
 #include "table/merger.h"
-#include "table/two_level_iterator.h"
-#include "util/coding.h"
 #include "util/logging.h"
 #include "util/mutexlock.h"
 

db/db_impl.h

@@ -15,6 +15,7 @@
 #include "db/snapshot.h"
 #include "leveldb/db.h"
 #include "leveldb/env.h"
+#include "leveldb/options.h"
 #include "port/port.h"
 #include "port/thread_annotations.h"
 

db/db_iter.cc

@@ -6,12 +6,7 @@
 
 #include "db/db_impl.h"
 #include "db/dbformat.h"
-#include "db/filename.h"
-#include "leveldb/env.h"
 #include "leveldb/iterator.h"
-#include "port/port.h"
-#include "util/logging.h"
-#include "util/mutexlock.h"
 #include "util/random.h"
 
 namespace leveldb {

db/db_iter.h

@@ -8,7 +8,7 @@
 #include <cstdint>
 
 #include "db/dbformat.h"
-#include "leveldb/db.h"
+#include "leveldb/iterator.h"
 
 namespace leveldb {
 

db/db_test.cc

@@ -5,21 +5,16 @@
 #include "leveldb/db.h"
 
 #include <atomic>
-#include <cinttypes>
 #include <string>
 
 #include "gtest/gtest.h"
 #include "db/db_impl.h"
 #include "db/filename.h"
-#include "db/version_set.h"
-#include "db/write_batch_internal.h"
 #include "leveldb/cache.h"
 #include "leveldb/env.h"
 #include "leveldb/filter_policy.h"
-#include "leveldb/table.h"
-#include "port/port.h"
+#include "leveldb/write_batch.h"
 #include "port/thread_annotations.h"
-#include "util/hash.h"
 #include "util/logging.h"
 #include "util/mutexlock.h"
 #include "util/testutil.h"

db/dbformat.cc

@@ -4,11 +4,10 @@
 
 #include "db/dbformat.h"
 
-#include <cstdio>
 #include <sstream>
 
-#include "port/port.h"
 #include "util/coding.h"
+#include "util/logging.h"
 
 namespace leveldb {
 

db/dbformat.h

@@ -10,12 +10,9 @@
 #include <string>
 
 #include "leveldb/comparator.h"
-#include "leveldb/db.h"
 #include "leveldb/filter_policy.h"
 #include "leveldb/slice.h"
-#include "leveldb/table_builder.h"
 #include "util/coding.h"
-#include "util/logging.h"
 
 namespace leveldb {
 

db/dbformat_test.cc

@@ -5,7 +5,6 @@
 #include "db/dbformat.h"
 
 #include "gtest/gtest.h"
-#include "util/logging.h"
 
 namespace leveldb {
 

db/dumpfile.cc

@@ -4,8 +4,6 @@
 
 #include "leveldb/dumpfile.h"
 
-#include <cstdio>
-
 #include "db/dbformat.h"
 #include "db/filename.h"
 #include "db/log_reader.h"

db/filename.cc

@@ -7,7 +7,6 @@
 #include <cassert>
 #include <cstdio>
 
-#include "db/dbformat.h"
 #include "leveldb/env.h"
 #include "util/logging.h"
 

db/filename.h

@@ -10,9 +10,7 @@
 #include <cstdint>
 #include <string>
 
-#include "leveldb/slice.h"
 #include "leveldb/status.h"
-#include "port/port.h"
 
 namespace leveldb {
 

db/filename_test.cc

@@ -5,9 +5,6 @@
 #include "db/filename.h"
 
 #include "gtest/gtest.h"
-#include "db/dbformat.h"
-#include "port/port.h"
-#include "util/logging.h"
 
 namespace leveldb {
 

db/memtable.cc

@@ -5,7 +5,6 @@
 #include "db/memtable.h"
 #include "db/dbformat.h"
 #include "leveldb/comparator.h"
-#include "leveldb/env.h"
 #include "leveldb/iterator.h"
 #include "util/coding.h"
 

db/memtable.h

@@ -9,7 +9,7 @@
 
 #include "db/dbformat.h"
 #include "db/skiplist.h"
-#include "leveldb/db.h"
+#include "leveldb/iterator.h"
 #include "util/arena.h"
 
 namespace leveldb {

db/recovery_test.cc

@@ -5,12 +5,10 @@
 #include "gtest/gtest.h"
 #include "db/db_impl.h"
 #include "db/filename.h"
-#include "db/version_set.h"
 #include "db/write_batch_internal.h"
 #include "leveldb/db.h"
 #include "leveldb/env.h"
 #include "leveldb/write_batch.h"
-#include "util/logging.h"
 #include "util/testutil.h"
 
 namespace leveldb {

db/repair.cc

@@ -34,9 +34,10 @@
 #include "db/table_cache.h"
 #include "db/version_edit.h"
 #include "db/write_batch_internal.h"
+#include "util/logging.h"
 #include "leveldb/comparator.h"
-#include "leveldb/db.h"
 #include "leveldb/env.h"
+#include "leveldb/table_builder.h"
 
 namespace leveldb {
 

db/skiplist.h

@@ -29,7 +29,6 @@
 
 #include <atomic>
 #include <cassert>
-#include <cstdlib>
 
 #include "util/arena.h"
 #include "util/random.h"

db/table_cache.h

@@ -10,10 +10,9 @@
 #include <cstdint>
 #include <string>
 
-#include "db/dbformat.h"
 #include "leveldb/cache.h"
 #include "leveldb/table.h"
-#include "port/port.h"
+#include "leveldb/options.h"
 
 namespace leveldb {
 

db/version_edit.cc

@@ -4,8 +4,8 @@
 
 #include "db/version_edit.h"
 
-#include "db/version_set.h"
 #include "util/coding.h"
+#include "util/logging.h"
 
 namespace leveldb {
 

db/version_edit.h

@@ -10,6 +10,7 @@
 #include <vector>
 
 #include "db/dbformat.h"
+#include "leveldb/status.h"
 
 namespace leveldb {
 

db/version_set.cc

@@ -10,10 +10,8 @@
 #include "db/filename.h"
 #include "db/log_reader.h"
 #include "db/log_writer.h"
-#include "db/memtable.h"
 #include "db/table_cache.h"
 #include "leveldb/env.h"
-#include "leveldb/table_builder.h"
 #include "table/merger.h"
 #include "table/two_level_iterator.h"
 #include "util/coding.h"

db/version_set.h

@@ -21,6 +21,7 @@
 
 #include "db/dbformat.h"
 #include "db/version_edit.h"
+#include "leveldb/options.h"
 #include "port/port.h"
 #include "port/thread_annotations.h"
 

db/version_set_test.cc

@@ -6,7 +6,6 @@
 
 #include "gtest/gtest.h"
 #include "util/logging.h"
-#include "util/testutil.h"
 
 namespace leveldb {
 

db/write_batch.cc

@@ -18,7 +18,6 @@
 #include "db/dbformat.h"
 #include "db/memtable.h"
 #include "db/write_batch_internal.h"
-#include "leveldb/db.h"
 #include "util/coding.h"
 
 namespace leveldb {

db/write_batch_test.cc

@@ -5,8 +5,6 @@
 #include "gtest/gtest.h"
 #include "db/memtable.h"
 #include "db/write_batch_internal.h"
-#include "leveldb/db.h"
-#include "leveldb/env.h"
 #include "util/logging.h"
 
 namespace leveldb {

helpers/memenv/memenv.cc

@@ -5,14 +5,12 @@
 #include "helpers/memenv/memenv.h"
 
 #include <cstring>
-#include <limits>
 #include <map>
 #include <string>
 #include <vector>
 
 #include "leveldb/env.h"
 #include "leveldb/status.h"
-#include "port/port.h"
 #include "port/thread_annotations.h"
 #include "util/mutexlock.h"
 

include/leveldb/db.h

@@ -6,11 +6,9 @@
 #define STORAGE_LEVELDB_INCLUDE_DB_H_
 
 #include <cstdint>
-#include <cstdio>
 
 #include "leveldb/export.h"
 #include "leveldb/iterator.h"
-#include "leveldb/options.h"
 
 namespace leveldb {
 

include/leveldb/status.h

@@ -13,7 +13,6 @@
 #ifndef STORAGE_LEVELDB_INCLUDE_STATUS_H_
 #define STORAGE_LEVELDB_INCLUDE_STATUS_H_
 
-#include <algorithm>
 #include <string>
 
 #include "leveldb/export.h"

port/port.h

@@ -5,8 +5,6 @@
 #ifndef STORAGE_LEVELDB_PORT_PORT_H_
 #define STORAGE_LEVELDB_PORT_PORT_H_
 
-#include <string.h>
-
 // Include the appropriate platform specific file below.  If you are
 // porting to a new platform, see "port_example.h" for documentation
 // of what the new port_<platform>.h file must provide.

table/block.cc

@@ -6,14 +6,12 @@
 
 #include "table/block.h"
 
-#include <algorithm>
 #include <cstdint>
 #include <vector>
 
 #include "leveldb/comparator.h"
 #include "table/format.h"
 #include "util/coding.h"
-#include "util/logging.h"
 
 namespace leveldb {
 

table/filter_block.h

@@ -15,7 +15,6 @@
 #include <vector>
 
 #include "leveldb/slice.h"
-#include "util/hash.h"
 
 namespace leveldb {
 

table/filter_block_test.cc

@@ -9,7 +9,6 @@
 #include "util/coding.h"
 #include "util/hash.h"
 #include "util/logging.h"
-#include "util/testutil.h"
 
 namespace leveldb {
 

table/format.cc

@@ -7,7 +7,6 @@
 #include "leveldb/env.h"
 #include "leveldb/options.h"
 #include "port/port.h"
-#include "table/block.h"
 #include "util/coding.h"
 #include "util/crc32c.h"
 

table/format.h

@@ -10,7 +10,6 @@
 
 #include "leveldb/slice.h"
 #include "leveldb/status.h"
-#include "leveldb/table_builder.h"
 
 namespace leveldb {
 

table/table_builder.cc

@@ -15,6 +15,7 @@
 #include "table/format.h"
 #include "util/coding.h"
 #include "util/crc32c.h"
+#include "port/port.h"
 
 namespace leveldb {
 

table/table_test.cc

@@ -21,6 +21,8 @@
 #include "table/format.h"
 #include "util/random.h"
 #include "util/testutil.h"
+#include "util/logging.h"
+#include "port/port.h"
 
 namespace leveldb {
 

table/two_level_iterator.cc

@@ -4,9 +4,7 @@
 
 #include "table/two_level_iterator.h"
 
-#include "leveldb/table.h"
-#include "table/block.h"
-#include "table/format.h"
+#include "leveldb/options.h"
 #include "table/iterator_wrapper.h"
 
 namespace leveldb {

util/arena.h

@@ -8,7 +8,6 @@
 #include <atomic>
 #include <cassert>
 #include <cstddef>
-#include <cstdint>
 #include <vector>
 
 namespace leveldb {

util/bloom_test.cc

@@ -5,8 +5,6 @@
 #include "gtest/gtest.h"
 #include "leveldb/filter_policy.h"
 #include "util/coding.h"
-#include "util/logging.h"
-#include "util/testutil.h"
 
 namespace leveldb {
 

util/cache.cc

@@ -5,10 +5,8 @@
 #include "leveldb/cache.h"
 
 #include <cassert>
-#include <cstdio>
 #include <cstdlib>
 
-#include "port/port.h"
 #include "port/thread_annotations.h"
 #include "util/hash.h"
 #include "util/mutexlock.h"

util/coding.h

@@ -11,11 +11,9 @@
 #define STORAGE_LEVELDB_UTIL_CODING_H_
 
 #include <cstdint>
-#include <cstring>
 #include <string>
 
 #include "leveldb/slice.h"
-#include "port/port.h"
 
 namespace leveldb {
 

util/comparator.cc

@@ -10,7 +10,6 @@
 #include <type_traits>
 
 #include "leveldb/slice.h"
-#include "util/logging.h"
 #include "util/no_destructor.h"
 
 namespace leveldb {

util/hash.cc

@@ -4,8 +4,6 @@
 
 #include "util/hash.h"
 
-#include <cstring>
-
 #include "util/coding.h"
 
 // The FALLTHROUGH_INTENDED macro can be used to annotate implicit fall-through

util/histogram.cc

@@ -7,8 +7,6 @@
 #include <cmath>
 #include <cstdio>
 
-#include "port/port.h"
-
 namespace leveldb {
 
 const double Histogram::kBucketLimit[kNumBuckets] = {

util/logging.cc

@@ -6,10 +6,8 @@
 
 #include <cstdarg>
 #include <cstdio>
-#include <cstdlib>
 #include <limits>
 
-#include "leveldb/env.h"
 #include "leveldb/slice.h"
 
 namespace leveldb {

util/logging.h

@@ -9,11 +9,8 @@
 #define STORAGE_LEVELDB_UTIL_LOGGING_H_
 
 #include <cstdint>
-#include <cstdio>
 #include <string>
 
-#include "port/port.h"
-
 namespace leveldb {
 
 class Slice;

util/no_destructor_test.cc

@@ -6,7 +6,6 @@
 
 #include <cstdint>
 #include <cstdlib>
-#include <utility>
 
 #include "gtest/gtest.h"
 

util/status.cc

@@ -6,8 +6,6 @@
 
 #include <cstdio>
 
-#include "port/port.h"
-
 namespace leveldb {
 
 const char* Status::CopyState(const char* state) {

util/testutil.cc

@@ -7,6 +7,7 @@
 #include <string>
 
 #include "util/random.h"
+#include "leveldb/slice.h"
 
 namespace leveldb {
 namespace test {