[chore] Unify include path

dingodb · Jan 8, 2025 · a2b40ea · a2b40ea
1 parent e713359
commit a2b40ea
Show file tree

Hide file tree

Showing 696 changed files with 2,299 additions and 2,294 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -58,7 +58,6 @@ link_directories(BEFORE ${THIRD_PARTY_INSTALL_PATH}/lib)
 link_directories(BEFORE ${PROJECT_SOURCE_DIR}/thirdparties/etcdclient)
 
 # include dir
-include_directories(${PROJECT_SOURCE_DIR})
 include_directories(${THIRD_PARTY_INSTALL_PATH}/include)
 include_directories(${PROJECT_SOURCE_DIR}/thirdparties/etcdclient)
 

diff --git a/dingofs/CMakeLists.txt b/dingofs/CMakeLists.txt
@@ -12,11 +12,10 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-
-
+include_directories(${CMAKE_CURRENT_SOURCE_DIR}/src)
 include_directories(${CMAKE_BINARY_DIR}/protos)
 
-set(PROTO_OUTPUT_DIR ${CMAKE_BINARY_DIR}/protos/dingofs/proto)
+set(PROTO_OUTPUT_DIR ${CMAKE_BINARY_DIR}/protos/proto)
 add_custom_target(create_proto_output_dir ALL
   COMMAND ${CMAKE_COMMAND} -E make_directory ${PROTO_OUTPUT_DIR}
 )

diff --git a/dingofs/src/aws/s3_adapter.cpp b/dingofs/src/aws/s3_adapter.cpp
@@ -20,7 +20,7 @@
 > Created Time: Wed Dec 19 15:19:40 2018
  ************************************************************************/
 
-#include "dingofs/src/aws/s3_adapter.h"
+#include "aws/s3_adapter.h"
 
 #include <aws/core/utils/stream/PreallocatedStreamBuf.h>
 #include <glog/logging.h>
@@ -30,8 +30,8 @@
 #include <string>
 #include <utility>
 
-#include "dingofs/src/utils/dingo_define.h"
-#include "dingofs/src/utils/macros.h"
+#include "utils/dingo_define.h"
+#include "utils/macros.h"
 #include "opentelemetry/exporters/otlp/otlp_http_exporter_factory.h"
 #include "opentelemetry/exporters/otlp/otlp_http_metric_exporter_factory.h"
 #include "opentelemetry/exporters/otlp/otlp_http_metric_exporter_options.h"

diff --git a/dingofs/src/aws/s3_adapter.h b/dingofs/src/aws/s3_adapter.h
@@ -59,8 +59,8 @@
 #include <string>
 
 #include "bvar/reducer.h"
-#include "dingofs/src/utils/configuration.h"
-#include "dingofs/src/utils/throttle.h"
+#include "utils/configuration.h"
+#include "utils/throttle.h"
 
 namespace dingofs {
 namespace aws {

diff --git a/dingofs/src/base/cache/cache.cpp b/dingofs/src/base/cache/cache.cpp
@@ -16,7 +16,7 @@
 // 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 "dingofs/src/base/cache/cache.h"
+#include "base/cache/cache.h"
 
 #include <cassert>
 #include <cstdio>

diff --git a/dingofs/src/base/file/file.cpp b/dingofs/src/base/file/file.cpp
@@ -20,7 +20,7 @@
  * Author: Jingli Chen (Wine93)
  */
 
-#include "dingofs/src/base/file/file.h"
+#include "base/file/file.h"
 
 #include <unordered_map>
 

diff --git a/dingofs/src/base/filepath/filepath.cpp b/dingofs/src/base/filepath/filepath.cpp
@@ -20,7 +20,7 @@
  * Author: Jingli Chen (Wine93)
  */
 
-#include "dingofs/src/base/filepath/filepath.h"
+#include "base/filepath/filepath.h"
 
 #include <algorithm>
 

diff --git a/dingofs/src/base/hash/ketama_con_hash.cpp b/dingofs/src/base/hash/ketama_con_hash.cpp
@@ -12,7 +12,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-#include "dingofs/src/base/hash/ketama_con_hash.h"
+#include "base/hash/ketama_con_hash.h"
 
 #include <fcntl.h>
 

diff --git a/dingofs/src/base/hash/ketama_con_hash.h b/dingofs/src/base/hash/ketama_con_hash.h
@@ -18,7 +18,7 @@
 #include <cstdint>
 #include <unordered_map>
 
-#include "dingofs/src/base/hash/con_hash.h"
+#include "base/hash/con_hash.h"
 
 namespace dingofs {
 namespace base {

diff --git a/dingofs/src/base/queue/message_queue.h b/dingofs/src/base/queue/message_queue.h
@@ -29,8 +29,8 @@
 #include <string>
 #include <thread>
 
-#include "dingofs/src/common/threading.h"
-#include "dingofs/src/utils/concurrent/task_queue.h"
+#include "common/threading.h"
+#include "utils/concurrent/task_queue.h"
 
 namespace dingofs {
 namespace base {

diff --git a/dingofs/src/base/string/string.h b/dingofs/src/base/string/string.h
@@ -31,7 +31,7 @@
 #include "absl/strings/str_format.h"
 #include "absl/strings/str_join.h"
 #include "absl/strings/str_split.h"
-#include "dingofs/src/utils/uuid.h"
+#include "utils/uuid.h"
 
 namespace dingofs {
 namespace base {

diff --git a/dingofs/src/base/timer/timer_impl.cpp b/dingofs/src/base/timer/timer_impl.cpp
@@ -13,7 +13,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-#include "dingofs/src/base/timer/timer_impl.h"
+#include "base/timer/timer_impl.h"
 
 #include <sys/stat.h>
 

diff --git a/dingofs/src/base/timer/timer_impl.h b/dingofs/src/base/timer/timer_impl.h
@@ -20,7 +20,7 @@
 #include <queue>
 #include <thread>
 
-#include "dingofs/src/base/timer/timer.h"
+#include "base/timer/timer.h"
 #include "gflags/gflags_declare.h"
 
 DECLARE_int32(timer_bg_bthread_default_num);

diff --git a/dingofs/src/client/blockcache/block_cache.cpp b/dingofs/src/client/blockcache/block_cache.cpp
@@ -20,23 +20,23 @@
  * Author: Jingli Chen (Wine93)
  */
 
-#include "dingofs/src/client/blockcache/block_cache.h"
+#include "client/blockcache/block_cache.h"
 
 #include <glog/logging.h>
 
 #include <cassert>
 #include <memory>
 
 #include "absl/cleanup/cleanup.h"
-#include "dingofs/src/client/blockcache/block_cache_metric.h"
-#include "dingofs/src/client/blockcache/block_cache_throttle.h"
-#include "dingofs/src/client/blockcache/cache_store.h"
-#include "dingofs/src/client/blockcache/disk_cache_group.h"
-#include "dingofs/src/client/blockcache/error.h"
-#include "dingofs/src/client/blockcache/local_filesystem.h"
-#include "dingofs/src/client/blockcache/log.h"
-#include "dingofs/src/client/blockcache/mem_cache.h"
-#include "dingofs/src/client/blockcache/phase_timer.h"
+#include "client/blockcache/block_cache_metric.h"
+#include "client/blockcache/block_cache_throttle.h"
+#include "client/blockcache/cache_store.h"
+#include "client/blockcache/disk_cache_group.h"
+#include "client/blockcache/error.h"
+#include "client/blockcache/local_filesystem.h"
+#include "client/blockcache/log.h"
+#include "client/blockcache/mem_cache.h"
+#include "client/blockcache/phase_timer.h"
 
 namespace dingofs {
 namespace client {

diff --git a/dingofs/src/client/blockcache/block_cache.h b/dingofs/src/client/blockcache/block_cache.h
@@ -29,15 +29,15 @@
 #include <mutex>
 #include <string>
 
-#include "dingofs/src/client/blockcache/block_cache_metric.h"
-#include "dingofs/src/client/blockcache/block_cache_throttle.h"
-#include "dingofs/src/client/blockcache/block_cache_uploader.h"
-#include "dingofs/src/client/blockcache/cache_store.h"
-#include "dingofs/src/client/blockcache/countdown.h"
-#include "dingofs/src/client/blockcache/error.h"
-#include "dingofs/src/client/blockcache/s3_client.h"
-#include "dingofs/src/client/common/config.h"
-#include "dingofs/src/utils/concurrent/task_thread_pool.h"
+#include "client/blockcache/block_cache_metric.h"
+#include "client/blockcache/block_cache_throttle.h"
+#include "client/blockcache/block_cache_uploader.h"
+#include "client/blockcache/cache_store.h"
+#include "client/blockcache/countdown.h"
+#include "client/blockcache/error.h"
+#include "client/blockcache/s3_client.h"
+#include "client/common/config.h"
+#include "utils/concurrent/task_thread_pool.h"
 
 namespace dingofs {
 namespace client {

diff --git a/dingofs/src/client/blockcache/block_cache_metric.h b/dingofs/src/client/blockcache/block_cache_metric.h
@@ -28,12 +28,12 @@
 #include <memory>
 #include <string>
 
-#include "dingofs/src/client/blockcache/block_cache_throttle.h"
-#include "dingofs/src/client/blockcache/block_cache_uploader.h"
-#include "dingofs/src/client/blockcache/cache_store.h"
-#include "dingofs/src/client/common/config.h"
-#include "dingofs/src/client/common/dynamic_config.h"
-#include "dingofs/src/utils/concurrent/task_thread_pool.h"
+#include "client/blockcache/block_cache_throttle.h"
+#include "client/blockcache/block_cache_uploader.h"
+#include "client/blockcache/cache_store.h"
+#include "client/common/config.h"
+#include "client/common/dynamic_config.h"
+#include "utils/concurrent/task_thread_pool.h"
 
 namespace dingofs {
 namespace client {

diff --git a/dingofs/src/client/blockcache/block_cache_throttle.cpp b/dingofs/src/client/blockcache/block_cache_throttle.cpp
@@ -20,14 +20,14 @@
  * Author: Jingli Chen (Wine93)
  */
 
-#include "dingofs/src/client/blockcache/block_cache_throttle.h"
+#include "client/blockcache/block_cache_throttle.h"
 
 #include <memory>
 #include <mutex>
 
-#include "dingofs/src/base/math/math.h"
-#include "dingofs/src/client/common/dynamic_config.h"
-#include "dingofs/src/utils/leaky_bucket.h"
+#include "base/math/math.h"
+#include "client/common/dynamic_config.h"
+#include "utils/leaky_bucket.h"
 
 namespace dingofs {
 namespace client {

diff --git a/dingofs/src/client/blockcache/block_cache_throttle.h b/dingofs/src/client/blockcache/block_cache_throttle.h
@@ -25,9 +25,9 @@
 
 #include <memory>
 
-#include "dingofs/src/base/timer/timer_impl.h"
-#include "dingofs/src/utils/leaky_bucket.h"
-#include "dingofs/src/utils/throttle.h"
+#include "base/timer/timer_impl.h"
+#include "utils/leaky_bucket.h"
+#include "utils/throttle.h"
 
 namespace dingofs {
 namespace client {

diff --git a/dingofs/src/client/blockcache/block_cache_uploader.cpp b/dingofs/src/client/blockcache/block_cache_uploader.cpp
@@ -20,7 +20,7 @@
  * Author: Jingli Chen (Wine93)
  */
 
-#include "dingofs/src/client/blockcache/block_cache_uploader.h"
+#include "client/blockcache/block_cache_uploader.h"
 
 #include <chrono>
 #include <memory>
@@ -29,14 +29,14 @@
 #include <utility>
 
 #include "absl/cleanup/cleanup.h"
-#include "dingofs/src/client/blockcache/block_cache_uploader_cmmon.h"
-#include "dingofs/src/client/blockcache/cache_store.h"
-#include "dingofs/src/client/blockcache/error.h"
-#include "dingofs/src/client/blockcache/local_filesystem.h"
-#include "dingofs/src/client/blockcache/log.h"
-#include "dingofs/src/client/blockcache/phase_timer.h"
-#include "dingofs/src/client/blockcache/segments.h"
-#include "dingofs/src/client/common/dynamic_config.h"
+#include "client/blockcache/block_cache_uploader_cmmon.h"
+#include "client/blockcache/cache_store.h"
+#include "client/blockcache/error.h"
+#include "client/blockcache/local_filesystem.h"
+#include "client/blockcache/log.h"
+#include "client/blockcache/phase_timer.h"
+#include "client/blockcache/segments.h"
+#include "client/common/dynamic_config.h"
 
 namespace dingofs {
 namespace client {

diff --git a/dingofs/src/client/blockcache/block_cache_uploader.h b/dingofs/src/client/blockcache/block_cache_uploader.h
@@ -27,13 +27,13 @@
 #include <memory>
 #include <mutex>
 
-#include "dingofs/src/client/blockcache/block_cache_uploader_cmmon.h"
-#include "dingofs/src/client/blockcache/cache_store.h"
-#include "dingofs/src/client/blockcache/countdown.h"
-#include "dingofs/src/client/blockcache/error.h"
-#include "dingofs/src/client/blockcache/phase_timer.h"
-#include "dingofs/src/client/blockcache/s3_client.h"
-#include "dingofs/src/utils/concurrent/task_thread_pool.h"
+#include "client/blockcache/block_cache_uploader_cmmon.h"
+#include "client/blockcache/cache_store.h"
+#include "client/blockcache/countdown.h"
+#include "client/blockcache/error.h"
+#include "client/blockcache/phase_timer.h"
+#include "client/blockcache/s3_client.h"
+#include "utils/concurrent/task_thread_pool.h"
 
 namespace dingofs {
 namespace client {

diff --git a/dingofs/src/client/blockcache/block_cache_uploader_cmmon.h b/dingofs/src/client/blockcache/block_cache_uploader_cmmon.h
@@ -28,9 +28,9 @@
 #include <mutex>
 #include <unordered_map>
 
-#include "dingofs/src/client/blockcache/cache_store.h"
-#include "dingofs/src/client/blockcache/countdown.h"
-#include "dingofs/src/client/blockcache/segments.h"
+#include "client/blockcache/cache_store.h"
+#include "client/blockcache/countdown.h"
+#include "client/blockcache/segments.h"
 
 namespace dingofs {
 namespace client {

diff --git a/dingofs/src/client/blockcache/block_cache_uploader_common.cpp b/dingofs/src/client/blockcache/block_cache_uploader_common.cpp
@@ -22,8 +22,8 @@
 
 #include <glog/logging.h>
 
-#include "dingofs/src/client/blockcache/block_cache_uploader_cmmon.h"
-#include "dingofs/src/client/common/dynamic_config.h"
+#include "client/blockcache/block_cache_uploader_cmmon.h"
+#include "client/common/dynamic_config.h"
 
 namespace dingofs {
 namespace client {

diff --git a/dingofs/src/client/blockcache/cache_store.h b/dingofs/src/client/blockcache/cache_store.h
@@ -28,8 +28,8 @@
 #include <functional>
 #include <string>
 
-#include "dingofs/src/base/string/string.h"
-#include "dingofs/src/client/blockcache/error.h"
+#include "base/string/string.h"
+#include "client/blockcache/error.h"
 
 namespace dingofs {
 namespace client {

diff --git a/dingofs/src/client/blockcache/countdown.cpp b/dingofs/src/client/blockcache/countdown.cpp
@@ -20,13 +20,13 @@
  * Author: Jingli Chen (Wine93)
  */
 
-#include "dingofs/src/client/blockcache/countdown.h"
+#include "client/blockcache/countdown.h"
 
 #include <glog/logging.h>
 
 #include <cassert>
 
-#include "dingofs/src/client/blockcache/error.h"
+#include "client/blockcache/error.h"
 
 namespace dingofs {
 namespace client {

diff --git a/dingofs/src/client/blockcache/countdown.h b/dingofs/src/client/blockcache/countdown.h
@@ -28,7 +28,7 @@
 #include <mutex>
 #include <unordered_map>
 
-#include "dingofs/src/client/blockcache/error.h"
+#include "client/blockcache/error.h"
 
 namespace dingofs {
 namespace client {

diff --git a/dingofs/src/client/blockcache/disk_cache.cpp b/dingofs/src/client/blockcache/disk_cache.cpp
@@ -20,23 +20,23 @@
  * Author: Jingli Chen (Wine93)
  */
 
-#include "dingofs/src/client/blockcache/disk_cache.h"
+#include "client/blockcache/disk_cache.h"
 
 #include <glog/logging.h>
 
 #include <memory>
 
 #include "absl/cleanup/cleanup.h"
-#include "dingofs/src/base/string/string.h"
-#include "dingofs/src/base/time/time.h"
-#include "dingofs/src/client/blockcache/cache_store.h"
-#include "dingofs/src/client/blockcache/disk_cache_layout.h"
-#include "dingofs/src/client/blockcache/disk_cache_manager.h"
-#include "dingofs/src/client/blockcache/disk_cache_metric.h"
-#include "dingofs/src/client/blockcache/error.h"
-#include "dingofs/src/client/blockcache/log.h"
-#include "dingofs/src/client/blockcache/phase_timer.h"
-#include "dingofs/src/stub/metric/metric.h"
+#include "base/string/string.h"
+#include "base/time/time.h"
+#include "client/blockcache/cache_store.h"
+#include "client/blockcache/disk_cache_layout.h"
+#include "client/blockcache/disk_cache_manager.h"
+#include "client/blockcache/disk_cache_metric.h"
+#include "client/blockcache/error.h"
+#include "client/blockcache/log.h"
+#include "client/blockcache/phase_timer.h"
+#include "stub/metric/metric.h"
 
 namespace dingofs {
 namespace client {