From a5f318d33ea59838c21c9b7f8a7c484ad892b63f Mon Sep 17 00:00:00 2001 From: Xu Peng Date: Tue, 16 Apr 2019 17:39:15 +0800 Subject: [PATCH] refactor(db): file name refactor Former-commit-id: 8b42724cd45f62b6e65a1704d5c0f37cb50dd9ef --- cpp/src/db/{db.h => DB.h} | 6 +++--- cpp/src/db/{db_impl.cpp => DBImpl.cpp} | 6 +++--- cpp/src/db/{db_impl.h => DBImpl.h} | 4 ++-- cpp/src/db/{db_meta_impl.cpp => DBMetaImpl.cpp} | 4 ++-- cpp/src/db/{db_meta_impl.h => DBMetaImpl.h} | 4 ++-- cpp/src/db/{env.cpp => Env.cpp} | 2 +- cpp/src/db/{env.h => Env.h} | 0 cpp/src/db/{id_generators.cpp => IDGenerator.cpp} | 2 +- cpp/src/db/{id_generators.h => IDGenerator.h} | 0 cpp/src/db/{memvectors.cpp => MemManager.cpp} | 4 ++-- cpp/src/db/{memvectors.h => MemManager.h} | 4 ++-- cpp/src/db/{db_meta.cpp => Meta.cpp} | 2 +- cpp/src/db/{db_meta.h => Meta.h} | 4 ++-- cpp/src/db/{options.cpp => Options.cpp} | 4 ++-- cpp/src/db/{options.h => Options.h} | 0 cpp/src/db/{status.cpp => Status.cpp} | 2 +- cpp/src/db/{status.h => Status.h} | 0 cpp/src/db/serializers.h | 11 ----------- 18 files changed, 24 insertions(+), 35 deletions(-) rename cpp/src/db/{db.h => DB.h} (95%) rename cpp/src/db/{db_impl.cpp => DBImpl.cpp} (98%) rename cpp/src/db/{db_impl.h => DBImpl.h} (98%) rename cpp/src/db/{db_meta_impl.cpp => DBMetaImpl.cpp} (98%) rename cpp/src/db/{db_meta_impl.h => DBMetaImpl.h} (97%) rename cpp/src/db/{env.cpp => Env.cpp} (98%) rename cpp/src/db/{env.h => Env.h} (100%) rename cpp/src/db/{id_generators.cpp => IDGenerator.cpp} (97%) rename cpp/src/db/{id_generators.h => IDGenerator.h} (100%) rename cpp/src/db/{memvectors.cpp => MemManager.cpp} (98%) rename cpp/src/db/{memvectors.h => MemManager.h} (97%) rename cpp/src/db/{db_meta.cpp => Meta.cpp} (94%) rename cpp/src/db/{db_meta.h => Meta.h} (98%) rename cpp/src/db/{options.cpp => Options.cpp} (82%) rename cpp/src/db/{options.h => Options.h} (100%) rename cpp/src/db/{status.cpp => Status.cpp} (98%) rename cpp/src/db/{status.h => Status.h} (100%) delete mode 100644 cpp/src/db/serializers.h diff --git a/cpp/src/db/db.h b/cpp/src/db/DB.h similarity index 95% rename from cpp/src/db/db.h rename to cpp/src/db/DB.h index 5ff2af9809..39ddaa8f0f 100644 --- a/cpp/src/db/db.h +++ b/cpp/src/db/DB.h @@ -2,9 +2,9 @@ #define VECENGINE_DB_H_ #include -#include "options.h" -#include "db_meta.h" -#include "status.h" +#include "Options.h" +#include "Meta.h" +#include "Status.h" #include "Types.h" namespace zilliz { diff --git a/cpp/src/db/db_impl.cpp b/cpp/src/db/DBImpl.cpp similarity index 98% rename from cpp/src/db/db_impl.cpp rename to cpp/src/db/DBImpl.cpp index a1e36a2c8e..0c35c355d5 100644 --- a/cpp/src/db/db_impl.cpp +++ b/cpp/src/db/DBImpl.cpp @@ -5,9 +5,9 @@ #include #include #include -#include "db_impl.h" -#include "db_meta_impl.h" -#include "env.h" +#include "DBImpl.h" +#include "DBMetaImpl.h" +#include "Env.h" namespace zilliz { namespace vecwise { diff --git a/cpp/src/db/db_impl.h b/cpp/src/db/DBImpl.h similarity index 98% rename from cpp/src/db/db_impl.h rename to cpp/src/db/DBImpl.h index 5653777a33..2c2aa4b3c2 100644 --- a/cpp/src/db/db_impl.h +++ b/cpp/src/db/DBImpl.h @@ -4,8 +4,8 @@ #include #include #include -#include "db.h" -#include "memvectors.h" +#include "DB.h" +#include "MemManager.h" #include "Types.h" namespace zilliz { diff --git a/cpp/src/db/db_meta_impl.cpp b/cpp/src/db/DBMetaImpl.cpp similarity index 98% rename from cpp/src/db/db_meta_impl.cpp rename to cpp/src/db/DBMetaImpl.cpp index ef7ff7d04a..a9f7b1bf86 100644 --- a/cpp/src/db/db_meta_impl.cpp +++ b/cpp/src/db/DBMetaImpl.cpp @@ -1,8 +1,8 @@ #include #include #include -#include "db_meta_impl.h" -#include "id_generators.h" +#include "DBMetaImpl.h" +#include "IDGenerator.h" namespace zilliz { namespace vecwise { diff --git a/cpp/src/db/db_meta_impl.h b/cpp/src/db/DBMetaImpl.h similarity index 97% rename from cpp/src/db/db_meta_impl.h rename to cpp/src/db/DBMetaImpl.h index ee2c57ea3c..cd84d86db5 100644 --- a/cpp/src/db/db_meta_impl.h +++ b/cpp/src/db/DBMetaImpl.h @@ -1,8 +1,8 @@ #ifndef VECENGINE_DB_META_IMPL_H_ #define VECENGINE_DB_META_IMPL_H_ -#include "db_meta.h" -#include "options.h" +#include "Meta.h" +#include "Options.h" namespace zilliz { namespace vecwise { diff --git a/cpp/src/db/env.cpp b/cpp/src/db/Env.cpp similarity index 98% rename from cpp/src/db/env.cpp rename to cpp/src/db/Env.cpp index 7b97cc0146..75d796b63d 100644 --- a/cpp/src/db/env.cpp +++ b/cpp/src/db/Env.cpp @@ -1,5 +1,5 @@ #include -#include "env.h" +#include "Env.h" namespace zilliz { namespace vecwise { diff --git a/cpp/src/db/env.h b/cpp/src/db/Env.h similarity index 100% rename from cpp/src/db/env.h rename to cpp/src/db/Env.h diff --git a/cpp/src/db/id_generators.cpp b/cpp/src/db/IDGenerator.cpp similarity index 97% rename from cpp/src/db/id_generators.cpp rename to cpp/src/db/IDGenerator.cpp index bb7da2c70d..14a9c8fe86 100644 --- a/cpp/src/db/id_generators.cpp +++ b/cpp/src/db/IDGenerator.cpp @@ -2,7 +2,7 @@ #include #include -#include "id_generators.h" +#include "IDGenerator.h" namespace zilliz { diff --git a/cpp/src/db/id_generators.h b/cpp/src/db/IDGenerator.h similarity index 100% rename from cpp/src/db/id_generators.h rename to cpp/src/db/IDGenerator.h diff --git a/cpp/src/db/memvectors.cpp b/cpp/src/db/MemManager.cpp similarity index 98% rename from cpp/src/db/memvectors.cpp rename to cpp/src/db/MemManager.cpp index 384e69be3f..31d1ed0db3 100644 --- a/cpp/src/db/memvectors.cpp +++ b/cpp/src/db/MemManager.cpp @@ -5,8 +5,8 @@ #include #include -#include "memvectors.h" -#include "db_meta.h" +#include "MemManager.h" +#include "Meta.h" namespace zilliz { diff --git a/cpp/src/db/memvectors.h b/cpp/src/db/MemManager.h similarity index 97% rename from cpp/src/db/memvectors.h rename to cpp/src/db/MemManager.h index 5a6df87eae..86b3973d62 100644 --- a/cpp/src/db/memvectors.h +++ b/cpp/src/db/MemManager.h @@ -6,8 +6,8 @@ #include #include #include -#include "id_generators.h" -#include "status.h" +#include "IDGenerator.h" +#include "Status.h" namespace faiss { class IndexIDMap; diff --git a/cpp/src/db/db_meta.cpp b/cpp/src/db/Meta.cpp similarity index 94% rename from cpp/src/db/db_meta.cpp rename to cpp/src/db/Meta.cpp index 2ac0995962..82b650cf2a 100644 --- a/cpp/src/db/db_meta.cpp +++ b/cpp/src/db/Meta.cpp @@ -1,5 +1,5 @@ #include -#include "db_meta.h" +#include "Meta.h" namespace zilliz { namespace vecwise { diff --git a/cpp/src/db/db_meta.h b/cpp/src/db/Meta.h similarity index 98% rename from cpp/src/db/db_meta.h rename to cpp/src/db/Meta.h index 02b899ec0d..73f9ebeddf 100644 --- a/cpp/src/db/db_meta.h +++ b/cpp/src/db/Meta.h @@ -5,8 +5,8 @@ #include #include #include -#include "options.h" -#include "status.h" +#include "Options.h" +#include "Status.h" namespace zilliz { namespace vecwise { diff --git a/cpp/src/db/options.cpp b/cpp/src/db/Options.cpp similarity index 82% rename from cpp/src/db/options.cpp rename to cpp/src/db/Options.cpp index be572c232f..024f2aba5d 100644 --- a/cpp/src/db/options.cpp +++ b/cpp/src/db/Options.cpp @@ -1,5 +1,5 @@ -#include "options.h" -#include "env.h" +#include "Options.h" +#include "Env.h" namespace zilliz { namespace vecwise { diff --git a/cpp/src/db/options.h b/cpp/src/db/Options.h similarity index 100% rename from cpp/src/db/options.h rename to cpp/src/db/Options.h diff --git a/cpp/src/db/status.cpp b/cpp/src/db/Status.cpp similarity index 98% rename from cpp/src/db/status.cpp rename to cpp/src/db/Status.cpp index 457565d10c..019c72cf3a 100644 --- a/cpp/src/db/status.cpp +++ b/cpp/src/db/Status.cpp @@ -1,7 +1,7 @@ #include #include #include -#include "status.h" +#include "Status.h" namespace zilliz { namespace vecwise { diff --git a/cpp/src/db/status.h b/cpp/src/db/Status.h similarity index 100% rename from cpp/src/db/status.h rename to cpp/src/db/Status.h diff --git a/cpp/src/db/serializers.h b/cpp/src/db/serializers.h deleted file mode 100644 index 5356691530..0000000000 --- a/cpp/src/db/serializers.h +++ /dev/null @@ -1,11 +0,0 @@ -#ifndef STORAGE_SERIALIZERS_H_ -#define STORAGE_SERIALIZERS_H_ - -class Serializer { -public: - - -}; // Serializer - - -#endif // STORAGE_SERIALIZERS_H_