From e1cfb6cc0650b5f08c8bc6e748730bd6c7273570 Mon Sep 17 00:00:00 2001 From: Heisenberg Date: Thu, 26 Sep 2019 11:27:27 +0800 Subject: [PATCH] MS-591 Rename source files in wrapper Former-commit-id: 1b864ef00ccdc0e524c2cf7cceb97428171077f8 --- cpp/src/cache/DataObj.h | 2 +- cpp/src/db/engine/ExecutionEngineImpl.cpp | 4 ++-- cpp/src/db/engine/ExecutionEngineImpl.h | 2 +- cpp/src/wrapper/{data_transfer.cpp => DataTransfer.cpp} | 2 +- cpp/src/wrapper/{data_transfer.h => DataTransfer.h} | 0 cpp/src/wrapper/{vec_impl.cpp => VecImpl.cpp} | 4 ++-- cpp/src/wrapper/{vec_impl.h => VecImpl.h} | 2 +- cpp/src/wrapper/{vec_index.cpp => VecIndex.cpp} | 4 ++-- cpp/src/wrapper/{vec_index.h => VecIndex.h} | 0 cpp/unittest/scheduler/scheduler_test.cpp | 2 +- cpp/unittest/server/cache_test.cpp | 2 +- cpp/unittest/wrapper/CMakeLists.txt | 6 +++--- cpp/unittest/wrapper/wrapper_test.cpp | 2 +- 13 files changed, 16 insertions(+), 16 deletions(-) rename cpp/src/wrapper/{data_transfer.cpp => DataTransfer.cpp} (98%) rename cpp/src/wrapper/{data_transfer.h => DataTransfer.h} (100%) rename cpp/src/wrapper/{vec_impl.cpp => VecImpl.cpp} (99%) rename cpp/src/wrapper/{vec_impl.h => VecImpl.h} (99%) rename cpp/src/wrapper/{vec_index.cpp => VecIndex.cpp} (99%) rename cpp/src/wrapper/{vec_index.h => VecIndex.h} (100%) diff --git a/cpp/src/cache/DataObj.h b/cpp/src/cache/DataObj.h index 12406301cb..f9215bc152 100644 --- a/cpp/src/cache/DataObj.h +++ b/cpp/src/cache/DataObj.h @@ -18,7 +18,7 @@ #pragma once -#include "src/wrapper/vec_index.h" +#include "src/wrapper/VecIndex.h" #include diff --git a/cpp/src/db/engine/ExecutionEngineImpl.cpp b/cpp/src/db/engine/ExecutionEngineImpl.cpp index 45a7699c10..b9d18b4a2f 100644 --- a/cpp/src/db/engine/ExecutionEngineImpl.cpp +++ b/cpp/src/db/engine/ExecutionEngineImpl.cpp @@ -23,8 +23,8 @@ #include "utils/CommonUtil.h" #include "utils/Exception.h" -#include "src/wrapper/vec_index.h" -#include "src/wrapper/vec_impl.h" +#include "src/wrapper/VecIndex.h" +#include "src/wrapper/VecImpl.h" #include "knowhere/common/Exception.h" #include "server/Config.h" diff --git a/cpp/src/db/engine/ExecutionEngineImpl.h b/cpp/src/db/engine/ExecutionEngineImpl.h index 44d59d83e8..1a3c6c83be 100644 --- a/cpp/src/db/engine/ExecutionEngineImpl.h +++ b/cpp/src/db/engine/ExecutionEngineImpl.h @@ -18,7 +18,7 @@ #pragma once #include "ExecutionEngine.h" -#include "src/wrapper/vec_index.h" +#include "src/wrapper/VecIndex.h" #include #include diff --git a/cpp/src/wrapper/data_transfer.cpp b/cpp/src/wrapper/DataTransfer.cpp similarity index 98% rename from cpp/src/wrapper/data_transfer.cpp rename to cpp/src/wrapper/DataTransfer.cpp index ad29e6cd7d..294a3c20ab 100644 --- a/cpp/src/wrapper/data_transfer.cpp +++ b/cpp/src/wrapper/DataTransfer.cpp @@ -16,7 +16,7 @@ // under the License. -#include "data_transfer.h" +#include "DataTransfer.h" namespace zilliz { diff --git a/cpp/src/wrapper/data_transfer.h b/cpp/src/wrapper/DataTransfer.h similarity index 100% rename from cpp/src/wrapper/data_transfer.h rename to cpp/src/wrapper/DataTransfer.h diff --git a/cpp/src/wrapper/vec_impl.cpp b/cpp/src/wrapper/VecImpl.cpp similarity index 99% rename from cpp/src/wrapper/vec_impl.cpp rename to cpp/src/wrapper/VecImpl.cpp index e909e611b2..24f6a2bb0e 100644 --- a/cpp/src/wrapper/vec_impl.cpp +++ b/cpp/src/wrapper/VecImpl.cpp @@ -21,8 +21,8 @@ #include "knowhere/index/vector_index/IndexGPUIVF.h" #include "knowhere/common/Exception.h" #include "knowhere/index/vector_index/helpers/Cloner.h" -#include "vec_impl.h" -#include "data_transfer.h" +#include "VecImpl.h" +#include "DataTransfer.h" namespace zilliz { diff --git a/cpp/src/wrapper/vec_impl.h b/cpp/src/wrapper/VecImpl.h similarity index 99% rename from cpp/src/wrapper/vec_impl.h rename to cpp/src/wrapper/VecImpl.h index b02ffd690b..c111eb75b4 100644 --- a/cpp/src/wrapper/vec_impl.h +++ b/cpp/src/wrapper/VecImpl.h @@ -19,7 +19,7 @@ #pragma once #include "knowhere/index/vector_index/VectorIndex.h" -#include "vec_index.h" +#include "VecIndex.h" namespace zilliz { diff --git a/cpp/src/wrapper/vec_index.cpp b/cpp/src/wrapper/VecIndex.cpp similarity index 99% rename from cpp/src/wrapper/vec_index.cpp rename to cpp/src/wrapper/VecIndex.cpp index 17a27caa74..cd8843e5ac 100644 --- a/cpp/src/wrapper/vec_index.cpp +++ b/cpp/src/wrapper/VecIndex.cpp @@ -25,8 +25,8 @@ #include "knowhere/index/vector_index/IndexKDT.h" #include "knowhere/index/vector_index/IndexNSG.h" #include "knowhere/common/Exception.h" -#include "vec_index.h" -#include "vec_impl.h" +#include "VecIndex.h" +#include "VecImpl.h" #include "utils/Log.h" #include diff --git a/cpp/src/wrapper/vec_index.h b/cpp/src/wrapper/VecIndex.h similarity index 100% rename from cpp/src/wrapper/vec_index.h rename to cpp/src/wrapper/VecIndex.h diff --git a/cpp/unittest/scheduler/scheduler_test.cpp b/cpp/unittest/scheduler/scheduler_test.cpp index dd2c8e8cb9..8fc65f7d3b 100644 --- a/cpp/unittest/scheduler/scheduler_test.cpp +++ b/cpp/unittest/scheduler/scheduler_test.cpp @@ -26,7 +26,7 @@ #include "cache/DataObj.h" #include "cache/GpuCacheMgr.h" #include "utils/Error.h" -#include "wrapper/vec_index.h" +#include "wrapper/VecIndex.h" namespace zilliz { diff --git a/cpp/unittest/server/cache_test.cpp b/cpp/unittest/server/cache_test.cpp index 3587846085..6c2160c9ab 100644 --- a/cpp/unittest/server/cache_test.cpp +++ b/cpp/unittest/server/cache_test.cpp @@ -20,7 +20,7 @@ #include "cache/GpuCacheMgr.h" #include "server/ServerConfig.h" #include "utils/Error.h" -#include "wrapper/vec_index.h" +#include "wrapper/VecIndex.h" using namespace zilliz::milvus; diff --git a/cpp/unittest/wrapper/CMakeLists.txt b/cpp/unittest/wrapper/CMakeLists.txt index d0eb3bfcfb..633cbaf053 100644 --- a/cpp/unittest/wrapper/CMakeLists.txt +++ b/cpp/unittest/wrapper/CMakeLists.txt @@ -21,9 +21,9 @@ include_directories("${CUDA_TOOLKIT_ROOT_DIR}/include") link_directories("${CUDA_TOOLKIT_ROOT_DIR}/lib64") set(wrapper_files - ${MILVUS_ENGINE_SRC}/wrapper/data_transfer.cpp - ${MILVUS_ENGINE_SRC}/wrapper/vec_impl.cpp - ${MILVUS_ENGINE_SRC}/wrapper/vec_index.cpp) + ${MILVUS_ENGINE_SRC}/wrapper/DataTransfer.cpp + ${MILVUS_ENGINE_SRC}/wrapper/VecImpl.cpp + ${MILVUS_ENGINE_SRC}/wrapper/VecIndex.cpp) set(util_files utils.cpp diff --git a/cpp/unittest/wrapper/wrapper_test.cpp b/cpp/unittest/wrapper/wrapper_test.cpp index b052758b6c..4c50201fb3 100644 --- a/cpp/unittest/wrapper/wrapper_test.cpp +++ b/cpp/unittest/wrapper/wrapper_test.cpp @@ -16,7 +16,7 @@ // under the License. #include "utils/easylogging++.h" -#include "src/wrapper/vec_index.h" +#include "src/wrapper/VecIndex.h" #include "knowhere/index/vector_index/helpers/FaissGpuResourceMgr.h" #include "utils.h"