update include headers

Signed-off-by: Yi Wu <yiwu@pingcap.com>

include/titan/db.h

 #pragma once
 
 #include "rocksdb/utilities/stackable_db.h"
-#include "utilities/titandb/options.h"
+#include "titan/options.h"
 
 namespace rocksdb {
 namespace titandb {

src/base_db_listener.h

 #pragma once
 
 #include "rocksdb/listener.h"
-#include "utilities/titandb/db_impl.h"
+#include "db_impl.h"
 
 namespace rocksdb {
 

src/blob_file_builder.cc

-#include "utilities/titandb/blob_file_builder.h"
+#include "blob_file_builder.h"
 
 namespace rocksdb {
 namespace titandb {

src/blob_file_builder.h

 #pragma once
 
 #include "util/file_reader_writer.h"
-#include "utilities/titandb/blob_format.h"
-#include "utilities/titandb/options.h"
+#include "blob_format.h"
+#include "titan/options.h"
 
 namespace rocksdb {
 namespace titandb {

src/blob_file_cache.cc

-#include "utilities/titandb/blob_file_cache.h"
+#include "blob_file_cache.h"
 
 #include "util/filename.h"
-#include "utilities/titandb/util.h"
+#include "util.h"
 
 namespace rocksdb {
 namespace titandb {

src/blob_file_cache.h

 #pragma once
 
 #include "rocksdb/options.h"
-#include "utilities/titandb/blob_file_reader.h"
-#include "utilities/titandb/blob_format.h"
-#include "utilities/titandb/options.h"
+#include "blob_file_reader.h"
+#include "blob_format.h"
+#include "titan/options.h"
 
 namespace rocksdb {
 namespace titandb {

src/blob_file_iterator.cc

-#include "utilities/titandb/blob_file_iterator.h"
+#include "blob_file_iterator.h"
 
 #include "util/crc32c.h"
-#include "utilities/titandb/util.h"
+#include "util.h"
 
 namespace rocksdb {
 namespace titandb {

src/blob_file_iterator.h

@@ -7,9 +7,9 @@
 #include "rocksdb/status.h"
 #include "table/internal_iterator.h"
 #include "util/file_reader_writer.h"
-#include "utilities/titandb/blob_format.h"
-#include "utilities/titandb/options.h"
-#include "utilities/titandb/util.h"
+#include "blob_format.h"
+#include "titan/options.h"
+#include "util.h"
 
 namespace rocksdb {
 namespace titandb {

src/blob_file_iterator_test.cc

-#include "utilities/titandb/blob_file_iterator.h"
+#include "blob_file_iterator.h"
 
 #include <cinttypes>
 
 #include "util/filename.h"
 #include "util/testharness.h"
-#include "utilities/titandb/blob_file_builder.h"
-#include "utilities/titandb/blob_file_cache.h"
-#include "utilities/titandb/blob_file_reader.h"
+#include "blob_file_builder.h"
+#include "blob_file_cache.h"
+#include "blob_file_reader.h"
 
 namespace rocksdb {
 namespace titandb {

src/blob_file_manager.h

 #pragma once
 
 #include "util/file_reader_writer.h"
-#include "utilities/titandb/blob_format.h"
+#include "blob_format.h"
 
 namespace rocksdb {
 namespace titandb {

src/blob_file_reader.cc

-#include "utilities/titandb/blob_file_reader.h"
+#include "blob_file_reader.h"
 
 #include "util/crc32c.h"
 #include "util/filename.h"

src/blob_file_reader.h

 #pragma once
 
 #include "util/file_reader_writer.h"
-#include "utilities/titandb/blob_format.h"
-#include "utilities/titandb/options.h"
+#include "blob_format.h"
+#include "titan/options.h"
 
 namespace rocksdb {
 namespace titandb {

src/blob_file_size_collector.cc

-#include "utilities/titandb/blob_file_size_collector.h"
+#include "blob_file_size_collector.h"
 #include "base_db_listener.h"
 
 namespace rocksdb {

src/blob_file_size_collector.h

@@ -3,8 +3,8 @@
 #include "rocksdb/listener.h"
 #include "rocksdb/table_properties.h"
 #include "util/coding.h"
-#include "utilities/titandb/db_impl.h"
-#include "utilities/titandb/version_set.h"
+#include "db_impl.h"
+#include "version_set.h"
 
 namespace rocksdb {
 namespace titandb {

src/blob_file_size_collector_test.cc

-#include "utilities/titandb/blob_file_size_collector.h"
+#include "blob_file_size_collector.h"
 #include "util/testharness.h"
 
 namespace rocksdb {

src/blob_file_test.cc

 #include "util/filename.h"
 #include "util/testharness.h"
-#include "utilities/titandb/blob_file_builder.h"
-#include "utilities/titandb/blob_file_cache.h"
-#include "utilities/titandb/blob_file_reader.h"
+#include "blob_file_builder.h"
+#include "blob_file_cache.h"
+#include "blob_file_reader.h"
 
 namespace rocksdb {
 namespace titandb {

src/blob_format.cc

-#include "utilities/titandb/blob_format.h"
+#include "blob_format.h"
 
 #include "util/crc32c.h"
 #include "util/sync_point.h"

src/blob_format.h

@@ -4,7 +4,7 @@
 #include "rocksdb/slice.h"
 #include "rocksdb/status.h"
 #include "table/format.h"
-#include "utilities/titandb/util.h"
+#include "util.h"
 
 namespace rocksdb {
 namespace titandb {

src/blob_format_test.cc

-#include "utilities/titandb/blob_format.h"
+#include "blob_format.h"
 #include "util/testharness.h"
-#include "utilities/titandb/testutil.h"
-#include "utilities/titandb/util.h"
+#include "testutil.h"
+#include "util.h"
 
 namespace rocksdb {
 namespace titandb {

src/blob_gc.cc

-#include "utilities/titandb/blob_gc.h"
+#include "blob_gc.h"
 
 namespace rocksdb {
 namespace titandb {

src/blob_gc.h

@@ -3,8 +3,8 @@
 #include <memory>
 
 #include "db/column_family.h"
-#include "utilities/titandb/blob_format.h"
-#include "utilities/titandb/options.h"
+#include "blob_format.h"
+#include "titan/options.h"
 
 namespace rocksdb {
 namespace titandb {

src/blob_gc_job.cc

-#include "utilities/titandb/blob_gc_job.h"
+#include "blob_gc_job.h"
 
 namespace rocksdb {
 namespace titandb {

src/blob_gc_job.h

@@ -2,12 +2,12 @@
 
 #include "db/db_impl.h"
 #include "rocksdb/status.h"
-#include "utilities/titandb/blob_file_builder.h"
-#include "utilities/titandb/blob_file_iterator.h"
-#include "utilities/titandb/blob_file_manager.h"
-#include "utilities/titandb/blob_gc.h"
-#include "utilities/titandb/options.h"
-#include "utilities/titandb/version_set.h"
+#include "blob_file_builder.h"
+#include "blob_file_iterator.h"
+#include "blob_file_manager.h"
+#include "blob_gc.h"
+#include "titan/options.h"
+#include "version_set.h"
 
 namespace rocksdb {
 namespace titandb {

src/blob_gc_job_test.cc

-#include "utilities/titandb/blob_gc_job.h"
+#include "blob_gc_job.h"
 
 #include "util/testharness.h"
-#include "utilities/titandb/blob_gc_picker.h"
-#include "utilities/titandb/db_impl.h"
+#include "blob_gc_picker.h"
+#include "db_impl.h"
 
 namespace rocksdb {
 namespace titandb {

src/blob_gc_picker.cc

-#include "utilities/titandb/blob_gc_picker.h"
+#include "blob_gc_picker.h"
 
 namespace rocksdb {
 namespace titandb {

src/blob_gc_picker.h

@@ -6,10 +6,10 @@
 #include "db/write_callback.h"
 #include "rocksdb/status.h"
 #include "util/filename.h"
-#include "utilities/titandb/blob_file_manager.h"
-#include "utilities/titandb/blob_format.h"
-#include "utilities/titandb/blob_gc.h"
-#include "utilities/titandb/version.h"
+#include "blob_file_manager.h"
+#include "blob_format.h"
+#include "blob_gc.h"
+#include "version.h"
 
 namespace rocksdb {
 namespace titandb {

src/blob_gc_picker_test.cc

-#include "utilities/titandb/blob_gc_picker.h"
+#include "blob_gc_picker.h"
 
 #include "util/filename.h"
 #include "util/testharness.h"
-#include "utilities/titandb/blob_file_builder.h"
-#include "utilities/titandb/blob_file_cache.h"
-#include "utilities/titandb/blob_file_iterator.h"
-#include "utilities/titandb/blob_file_reader.h"
+#include "blob_file_builder.h"
+#include "blob_file_cache.h"
+#include "blob_file_iterator.h"
+#include "blob_file_reader.h"
 
 namespace rocksdb {
 namespace titandb {

src/db.cc

-#include "rocksdb/utilities/titandb/db.h"
+#include "titan/db.h"
 
-#include "utilities/titandb/db_impl.h"
+#include "db_impl.h"
 
 namespace rocksdb {
 namespace titandb {

src/db_impl.cc

-#include "utilities/titandb/db_impl.h"
-
-#include "utilities/titandb/base_db_listener.h"
-#include "utilities/titandb/blob_file_builder.h"
-#include "utilities/titandb/blob_file_iterator.h"
-#include "utilities/titandb/blob_file_size_collector.h"
-#include "utilities/titandb/blob_gc.h"
-#include "utilities/titandb/db_iter.h"
-#include "utilities/titandb/table_factory.h"
+#include "db_impl.h"
+
+#include "base_db_listener.h"
+#include "blob_file_builder.h"
+#include "blob_file_iterator.h"
+#include "blob_file_size_collector.h"
+#include "blob_gc.h"
+#include "db_iter.h"
+#include "table_factory.h"
 
 #ifndef __STDC_FORMAT_MACROS
 #define __STDC_FORMAT_MACROS

src/db_impl.h

@@ -2,9 +2,9 @@
 
 #include "db/db_impl.h"
 #include "util/repeatable_thread.h"
-#include "rocksdb/utilities/titandb/db.h"
-#include "utilities/titandb/blob_file_manager.h"
-#include "utilities/titandb/version_set.h"
+#include "titan/db.h"
+#include "blob_file_manager.h"
+#include "version_set.h"
 
 namespace rocksdb {
 namespace titandb {

src/db_impl_files.cc

-#include "utilities/titandb/db_impl.h"
+#include "db_impl.h"
 
 namespace rocksdb {
 namespace titandb {

src/db_impl_gc.cc

-#include "utilities/titandb/db_impl.h"
+#include "db_impl.h"
 
-#include "utilities/titandb/blob_file_iterator.h"
-#include "utilities/titandb/blob_gc_job.h"
-#include "utilities/titandb/blob_gc_picker.h"
+#include "blob_file_iterator.h"
+#include "blob_gc_job.h"
+#include "blob_gc_picker.h"
 
 namespace rocksdb {
 namespace titandb {

src/options.cc

-#include "utilities/titandb/options.h"
+#include "titan/options.h"
 
 #ifndef __STDC_FORMAT_MACROS
 #define __STDC_FORMAT_MACROS

src/table_builder.cc

-#include "utilities/titandb/table_builder.h"
+#include "table_builder.h"
 
 namespace rocksdb {
 namespace titandb {

src/table_builder.h

 #pragma once
 
 #include "table/table_builder.h"
-#include "utilities/titandb/blob_file_builder.h"
-#include "utilities/titandb/blob_file_manager.h"
-#include "utilities/titandb/options.h"
+#include "blob_file_builder.h"
+#include "blob_file_manager.h"
+#include "titan/options.h"
 
 namespace rocksdb {
 namespace titandb {

src/table_builder_test.cc

@@ -2,9 +2,9 @@
 #include "table/table_reader.h"
 #include "util/filename.h"
 #include "util/testharness.h"
-#include "utilities/titandb/blob_file_manager.h"
-#include "utilities/titandb/blob_file_reader.h"
-#include "utilities/titandb/table_factory.h"
+#include "blob_file_manager.h"
+#include "blob_file_reader.h"
+#include "table_factory.h"
 
 namespace rocksdb {
 namespace titandb {

src/table_factory.cc

-#include "utilities/titandb/table_factory.h"
+#include "table_factory.h"
 
-#include "utilities/titandb/table_builder.h"
+#include "table_builder.h"
 
 namespace rocksdb {
 namespace titandb {

src/table_factory.h

 #pragma once
 
 #include "rocksdb/table.h"
-#include "utilities/titandb/blob_file_manager.h"
-#include "utilities/titandb/options.h"
+#include "blob_file_manager.h"
+#include "titan/options.h"
 
 namespace rocksdb {
 namespace titandb {

src/titan_c.cc

 #include "rocksdb/utilities/titan_c.h"
 #include "rocksdb/db.h"
-#include "rocksdb/utilities/titandb/db.h"
+#include "titan/db.h"
 
 using rocksdb::Cache;
 using rocksdb::CompressionType;

src/titan_db_test.cc

 #include <inttypes.h>
 #include <options/cf_options.h>
 
-#include "rocksdb/utilities/titandb/db.h"
-#include "utilities/titandb/db_impl.h"
-#include "utilities/titandb/titan_fault_injection_test_env.h"
+#include "titan/db.h"
+#include "db_impl.h"
+#include "titan_fault_injection_test_env.h"
 #include "util/filename.h"
 #include "util/random.h"
 #include "util/testharness.h"

src/util.cc

-#include "utilities/titandb/util.h"
+#include "util.h"
 
 namespace rocksdb {
 namespace titandb {

src/util_test.cc

-#include "utilities/titandb/util.h"
+#include "util.h"
 #include "util/testharness.h"
 
 namespace rocksdb {

src/version.cc

-#include "utilities/titandb/version.h"
-#include "utilities/titandb/version_set.h"
+#include "version.h"
+#include "version_set.h"
 
 namespace rocksdb {
 namespace titandb {

src/version.h

 #pragma once
 
 #include "rocksdb/options.h"
-#include "utilities/titandb/blob_file_cache.h"
-#include "utilities/titandb/blob_format.h"
-#include "utilities/titandb/blob_gc.h"
+#include "blob_file_cache.h"
+#include "blob_format.h"
+#include "blob_gc.h"
 
 namespace rocksdb {
 namespace titandb {

src/version_edit.cc

-#include "utilities/titandb/version_edit.h"
+#include "version_edit.h"
 
 #include "util/coding.h"
 

src/version_edit.h

@@ -3,7 +3,7 @@
 #include <set>
 
 #include "rocksdb/slice.h"
-#include "utilities/titandb/blob_format.h"
+#include "blob_format.h"
 
 namespace rocksdb {
 namespace titandb {

src/version_set.cc

-#include "utilities/titandb/version_set.h"
+#include "version_set.h"
 
 #include <inttypes.h>
 

src/version_set.h

@@ -11,10 +11,10 @@
 #include "rocksdb/options.h"
 #include "rocksdb/status.h"
 #include "util/mutexlock.h"
-#include "utilities/titandb/blob_file_cache.h"
-#include "utilities/titandb/options.h"
-#include "utilities/titandb/version_edit.h"
-#include "utilities/titandb/version.h"
+#include "blob_file_cache.h"
+#include "titan/options.h"
+#include "version_edit.h"
+#include "version.h"
 
 namespace rocksdb {
 namespace titandb {

src/version_test.cc

 #include "util/filename.h"
 #include "util/testharness.h"
-#include "utilities/titandb/testutil.h"
-#include "utilities/titandb/util.h"
-#include "utilities/titandb/version_edit.h"
-#include "utilities/titandb/version_set.h"
+#include "testutil.h"
+#include "util.h"
+#include "version_edit.h"
+#include "version_set.h"
 
 namespace rocksdb {
 namespace titandb {

tools/db_bench.cc

@@ -18,6 +18,6 @@ int main() {
   return 1;
 }
 #else
-#include <rocksdb/db_bench_tool.h>
+#include "db_bench_tool.h"
 int main(int argc, char** argv) { return rocksdb::db_bench_tool(argc, argv); }
 #endif  // GFLAGS

tools/db_bench_tool.cc

@@ -56,7 +56,6 @@
 #include "rocksdb/utilities/optimistic_transaction_db.h"
 #include "rocksdb/utilities/options_util.h"
 #include "rocksdb/utilities/sim_cache.h"
-#include "rocksdb/utilities/titandb/db.h"
 #include "rocksdb/utilities/transaction.h"
 #include "rocksdb/utilities/transaction_db.h"
 #include "rocksdb/write_batch.h"
@@ -76,6 +75,8 @@
 #include "utilities/merge_operators/bytesxor.h"
 #include "utilities/persistent_cache/block_cache_tier.h"
 
+#include "titan/db.h"
+
 #ifdef OS_WIN
 #include <io.h>  // open/close
 #endif

tools/titandb_stress.cc

@@ -58,7 +58,6 @@ int main() {
 #include "rocksdb/utilities/checkpoint.h"
 #include "rocksdb/utilities/db_ttl.h"
 #include "rocksdb/utilities/options_util.h"
-#include "rocksdb/utilities/titandb/db.h"
 #include "rocksdb/utilities/transaction.h"
 #include "rocksdb/utilities/transaction_db.h"
 #include "rocksdb/write_batch.h"
@@ -78,6 +77,8 @@ int main() {
 
 #include "utilities/merge_operators.h"
 
+#include "titan/db.h"
+
 using GFLAGS_NAMESPACE::ParseCommandLineFlags;
 using GFLAGS_NAMESPACE::RegisterFlagValidator;
 using GFLAGS_NAMESPACE::SetUsageMessage;