Make format

Summary: Pull Request resolved: facebook#5395 Differential Revision: D15581698 Pulled By: vjnadimpalli fbshipit-source-id: f415972f16e784b1361714c202b97defcab46767
dmitrip · May 31, 2019 · cae22c5 · cae22c5
1 parent 49c5a12
commit cae22c5
Show file tree

Hide file tree

Showing 16 changed files with 19 additions and 22 deletions.
diff --git a/db/column_family_test.cc b/db/column_family_test.cc
@@ -12,8 +12,8 @@
 #include <string>
 #include <thread>
 
-#include "db/db_test_util.h"
 #include "db/db_impl/db_impl.h"
+#include "db/db_test_util.h"
 #include "memtable/hash_skiplist_rep.h"
 #include "options/options_parser.h"
 #include "port/port.h"

diff --git a/db/compacted_db_impl.h b/db/compacted_db_impl.h
@@ -5,9 +5,9 @@
 
 #pragma once
 #ifndef ROCKSDB_LITE
-#include "db/db_impl/db_impl.h"
-#include <vector>
 #include <string>
+#include <vector>
+#include "db/db_impl/db_impl.h"
 
 namespace rocksdb {
 

diff --git a/db/compaction/compaction_iterator.h b/db/compaction/compaction_iterator.h
@@ -10,8 +10,8 @@
 #include <unordered_set>
 #include <vector>
 
-#include "db/compaction/compaction_iteration_stats.h"
 #include "db/compaction/compaction.h"
+#include "db/compaction/compaction_iteration_stats.h"
 #include "db/merge_helper.h"
 #include "db/pinned_iterators_manager.h"
 #include "db/range_del_aggregator.h"

diff --git a/db/compaction/compaction_job.cc b/db/compaction/compaction_job.cc
@@ -23,8 +23,8 @@
 #include <utility>
 #include <vector>
 
-#include "db/compaction/compaction_job.h"
 #include "db/builder.h"
+#include "db/compaction/compaction_job.h"
 #include "db/db_impl/db_impl.h"
 #include "db/db_iter.h"
 #include "db/dbformat.h"

diff --git a/db/db_impl/db_impl.h b/db/db_impl/db_impl.h
@@ -30,6 +30,7 @@
 #include "db/internal_stats.h"
 #include "db/log_writer.h"
 #include "db/logs_with_prep_tracker.h"
+#include "db/memtable_list.h"
 #include "db/pre_release_callback.h"
 #include "db/range_del_aggregator.h"
 #include "db/read_callback.h"
@@ -39,7 +40,6 @@
 #include "db/wal_manager.h"
 #include "db/write_controller.h"
 #include "db/write_thread.h"
-#include "db/memtable_list.h"
 #include "monitoring/instrumented_mutex.h"
 #include "options/db_options.h"
 #include "port/port.h"

diff --git a/db/db_impl/db_impl_readonly.cc b/db/db_impl/db_impl_readonly.cc
@@ -6,9 +6,9 @@
 #include "db/db_impl/db_impl_readonly.h"
 
 #include "db/compacted_db_impl.h"
+#include "db/db_impl/db_impl.h"
 #include "db/db_iter.h"
 #include "db/merge_context.h"
-#include "db/db_impl/db_impl.h"
 #include "monitoring/perf_context_imp.h"
 
 namespace rocksdb {

diff --git a/db/db_impl/db_secondary_test.cc b/db/db_impl/db_secondary_test.cc
@@ -7,8 +7,8 @@
 // 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 "db/db_test_util.h"
 #include "db/db_impl/db_impl_secondary.h"
+#include "db/db_test_util.h"
 #include "port/stack_trace.h"
 #include "test_util/fault_injection_test_env.h"
 #include "test_util/sync_point.h"

diff --git a/db/db_iter.h b/db/db_iter.h
@@ -10,10 +10,10 @@
 #pragma once
 #include <stdint.h>
 #include <string>
+#include "db/db_impl/db_impl.h"
 #include "db/dbformat.h"
 #include "db/range_del_aggregator.h"
 #include "memory/arena.h"
-#include "db/db_impl/db_impl.h"
 #include "options/cf_options.h"
 #include "rocksdb/db.h"
 #include "rocksdb/iterator.h"

diff --git a/db/db_options_test.cc b/db/db_options_test.cc
@@ -11,8 +11,8 @@
 #include <unordered_map>
 
 #include "db/column_family.h"
-#include "db/db_test_util.h"
 #include "db/db_impl/db_impl.h"
+#include "db/db_test_util.h"
 #include "options/options_helper.h"
 #include "port/stack_trace.h"
 #include "rocksdb/cache.h"

diff --git a/db/error_handler.cc b/db/error_handler.cc
@@ -4,8 +4,8 @@
 //  (found in the LICENSE.Apache file in the root directory).
 //
 #include "db/error_handler.h"
-#include "db/event_helpers.h"
 #include "db/db_impl/db_impl.h"
+#include "db/event_helpers.h"
 #include "file/sst_file_manager_impl.h"
 
 namespace rocksdb {

diff --git a/db/fault_injection_test.cc b/db/fault_injection_test.cc
@@ -11,9 +11,9 @@
 // the last "sync". It then checks for data loss errors by purposely dropping
 // file data (or entire files) not protected by a "sync".
 
+#include "db/db_impl/db_impl.h"
 #include "db/log_format.h"
 #include "db/version_set.h"
-#include "db/db_impl/db_impl.h"
 #include "env/mock_env.h"
 #include "file/filename.h"
 #include "rocksdb/cache.h"

diff --git a/db/listener_test.cc b/db/listener_test.cc
@@ -3,11 +3,11 @@
 //  COPYING file in the root directory) and Apache 2.0 License
 //  (found in the LICENSE.Apache file in the root directory).
 
+#include "db/db_impl/db_impl.h"
 #include "db/db_test_util.h"
 #include "db/dbformat.h"
 #include "db/version_set.h"
 #include "db/write_batch_internal.h"
-#include "db/db_impl/db_impl.h"
 #include "file/filename.h"
 #include "memtable/hash_linklist_rep.h"
 #include "monitoring/statistics.h"

diff --git a/db/merge_test.cc b/db/merge_test.cc
@@ -7,8 +7,8 @@
 #include <memory>
 #include <iostream>
 
-#include "db/dbformat.h"
 #include "db/db_impl/db_impl.h"
+#include "db/dbformat.h"
 #include "db/write_batch_internal.h"
 #include "port/stack_trace.h"
 #include "rocksdb/cache.h"
@@ -18,9 +18,6 @@
 #include "rocksdb/merge_operator.h"
 #include "rocksdb/utilities/db_ttl.h"
 #include "test_util/testharness.h"
-#include "db/dbformat.h"
-#include "db/write_batch_internal.h"
-#include "db/db_impl/db_impl.h"
 #include "utilities/merge_operators.h"
 
 namespace rocksdb {

diff --git a/db/write_batch.cc b/db/write_batch.cc
@@ -42,13 +42,13 @@
 #include <vector>
 
 #include "db/column_family.h"
+#include "db/db_impl/db_impl.h"
 #include "db/dbformat.h"
 #include "db/flush_scheduler.h"
 #include "db/memtable.h"
 #include "db/merge_context.h"
 #include "db/snapshot_impl.h"
 #include "db/write_batch_internal.h"
-#include "db/db_impl/db_impl.h"
 #include "monitoring/perf_context_imp.h"
 #include "monitoring/statistics.h"
 #include "rocksdb/merge_operator.h"

diff --git a/utilities/transactions/transaction_base.cc b/utilities/transactions/transaction_base.cc
@@ -13,8 +13,8 @@
 
 #include <inttypes.h>
 
-#include "db/db_impl/db_impl.h"
 #include "db/column_family.h"
+#include "db/db_impl/db_impl.h"
 #include "rocksdb/comparator.h"
 #include "rocksdb/db.h"
 #include "rocksdb/status.h"

diff --git a/utilities/ttl/db_ttl_impl.h b/utilities/ttl/db_ttl_impl.h
@@ -10,13 +10,13 @@
 #include <string>
 #include <vector>
 
+#include "db/db_impl/db_impl.h"
+#include "rocksdb/compaction_filter.h"
 #include "rocksdb/db.h"
 #include "rocksdb/env.h"
-#include "rocksdb/compaction_filter.h"
 #include "rocksdb/merge_operator.h"
-#include "rocksdb/utilities/utility_db.h"
 #include "rocksdb/utilities/db_ttl.h"
-#include "db/db_impl/db_impl.h"
+#include "rocksdb/utilities/utility_db.h"
 
 #ifdef _WIN32
 // Windows API macro interference