From 296fa9c0730899d632c35b07e02cf6198288750b Mon Sep 17 00:00:00 2001 From: Bingyi Sun Date: Fri, 8 Sep 2023 06:35:10 +0800 Subject: [PATCH] Move header files to include dir (#51) Signed-off-by: sunby --- cpp/CMakeLists.txt | 8 +- cpp/conanfile.py | 2 +- .../milvus-storage}/common/arrow_util.h | 0 .../milvus-storage}/common/constants.h | 0 .../milvus-storage}/common/fs_util.h | 0 .../milvus-storage}/common/log.h | 0 .../milvus-storage}/common/macro.h | 0 .../milvus-storage}/common/result.h | 0 .../milvus-storage}/common/status.h | 0 .../milvus-storage}/common/utils.h | 2 +- .../milvus-storage}/file/blob.h | 0 .../milvus-storage}/file/delete_fragment.h | 0 .../milvus-storage}/file/file.h | 0 .../milvus-storage}/file/fragment.h | 0 .../filter/conjunction_filter.h | 0 .../milvus-storage}/filter/constant_filter.h | 0 .../milvus-storage}/filter/filter.h | 0 .../milvus-storage}/filter/value.h | 0 .../format/parquet/file_reader.h | 0 .../format/parquet/file_writer.h | 0 .../milvus-storage}/format/reader.h | 0 .../milvus-storage}/format/writer.h | 0 .../reader/common/combine_offset_reader.h | 0 .../reader/common/combine_reader.h | 0 .../reader/common/delete_reader.h | 0 .../reader/common/filter_reader.h | 0 .../reader/common/projection_reader.h | 0 .../reader/filter_query_record_reader.h | 0 .../reader/merge_record_reader.h | 0 .../reader/multi_files_sequential_reader.h | 0 .../milvus-storage}/reader/record_reader.h | 0 .../reader/scan_record_reader.h | 0 .../milvus-storage}/storage/manifest.h | 2 +- .../milvus-storage}/storage/options.h | 0 .../milvus-storage}/storage/schema.h | 2 +- .../milvus-storage}/storage/space.h | 0 cpp/src/common/fs_util.cpp | 2 +- cpp/src/common/log.cpp | 36 ++-- cpp/src/common/result.cpp | 2 +- cpp/src/common/status.cpp | 2 +- cpp/src/common/utils.cpp | 6 +- cpp/src/file/blob.cpp | 2 +- cpp/src/filter/conjunction_filter.cpp | 2 +- cpp/src/filter/constant_filter.cpp | 2 +- cpp/src/filter/value.cpp | 2 +- cpp/src/format/parquet/file_reader.cpp | 1 - cpp/src/format/parquet/file_writer.cpp | 2 +- cpp/src/proto/manifest.pb.cc | 28 +-- cpp/src/proto/manifest.pb.h | 4 +- cpp/src/proto/manifest.proto | 4 +- .../{schema.pb.cc => schema_arrow.pb.cc} | 160 +++++++++--------- .../proto/{schema.pb.h => schema_arrow.pb.h} | 36 ++-- .../{schema.proto => schema_arrow.proto} | 0 cpp/src/reader/common/filter_reader.cpp | 2 +- cpp/src/reader/common/projection_reader.cpp | 2 +- .../reader/multi_files_sequential_reader.cpp | 2 +- cpp/src/reader/scan_record_reader.cpp | 2 +- cpp/test/CMakeLists.txt | 2 +- 58 files changed, 152 insertions(+), 165 deletions(-) rename cpp/{src => include/milvus-storage}/common/arrow_util.h (100%) rename cpp/{src => include/milvus-storage}/common/constants.h (100%) rename cpp/{src => include/milvus-storage}/common/fs_util.h (100%) rename cpp/{src => include/milvus-storage}/common/log.h (100%) rename cpp/{src => include/milvus-storage}/common/macro.h (100%) rename cpp/{src => include/milvus-storage}/common/result.h (100%) rename cpp/{src => include/milvus-storage}/common/status.h (100%) rename cpp/{src => include/milvus-storage}/common/utils.h (97%) rename cpp/{src => include/milvus-storage}/file/blob.h (100%) rename cpp/{src => include/milvus-storage}/file/delete_fragment.h (100%) rename cpp/{src => include/milvus-storage}/file/file.h (100%) rename cpp/{src => include/milvus-storage}/file/fragment.h (100%) rename cpp/{src => include/milvus-storage}/filter/conjunction_filter.h (100%) rename cpp/{src => include/milvus-storage}/filter/constant_filter.h (100%) rename cpp/{src => include/milvus-storage}/filter/filter.h (100%) rename cpp/{src => include/milvus-storage}/filter/value.h (100%) rename cpp/{src => include/milvus-storage}/format/parquet/file_reader.h (100%) rename cpp/{src => include/milvus-storage}/format/parquet/file_writer.h (100%) rename cpp/{src => include/milvus-storage}/format/reader.h (100%) rename cpp/{src => include/milvus-storage}/format/writer.h (100%) rename cpp/{src => include/milvus-storage}/reader/common/combine_offset_reader.h (100%) rename cpp/{src => include/milvus-storage}/reader/common/combine_reader.h (100%) rename cpp/{src => include/milvus-storage}/reader/common/delete_reader.h (100%) rename cpp/{src => include/milvus-storage}/reader/common/filter_reader.h (100%) rename cpp/{src => include/milvus-storage}/reader/common/projection_reader.h (100%) rename cpp/{src => include/milvus-storage}/reader/filter_query_record_reader.h (100%) rename cpp/{src => include/milvus-storage}/reader/merge_record_reader.h (100%) rename cpp/{src => include/milvus-storage}/reader/multi_files_sequential_reader.h (100%) rename cpp/{src => include/milvus-storage}/reader/record_reader.h (100%) rename cpp/{src => include/milvus-storage}/reader/scan_record_reader.h (100%) rename cpp/{src => include/milvus-storage}/storage/manifest.h (98%) rename cpp/{src => include/milvus-storage}/storage/options.h (100%) rename cpp/{src => include/milvus-storage}/storage/schema.h (97%) rename cpp/{src => include/milvus-storage}/storage/space.h (100%) rename cpp/src/proto/{schema.pb.cc => schema_arrow.pb.cc} (95%) rename cpp/src/proto/{schema.pb.h => schema_arrow.pb.h} (99%) rename cpp/src/proto/{schema.proto => schema_arrow.proto} (100%) diff --git a/cpp/CMakeLists.txt b/cpp/CMakeLists.txt index 334549a1..b5a7d668 100644 --- a/cpp/CMakeLists.txt +++ b/cpp/CMakeLists.txt @@ -15,10 +15,10 @@ find_package(glog REQUIRED) file(GLOB_RECURSE SRC_FILES src/*.cpp src/*.cc) message(STATUS "SRC_FILES: ${SRC_FILES}") -add_library(storage ${SRC_FILES}) -target_include_directories(storage PUBLIC ${CMAKE_CURRENT_SOURCE_DIR}/src) -target_link_libraries(storage PUBLIC arrow::libarrow arrow::libparquet Boost::boost protobuf::protobuf) -target_link_libraries(storage PUBLIC glog::glog) +add_library(milvus-storage ${SRC_FILES}) +target_include_directories(milvus-storage PUBLIC ${CMAKE_CURRENT_SOURCE_DIR}/include/milvus-storage ${CMAKE_CURRENT_SOURCE_DIR}/src) +target_link_libraries(milvus-storage PUBLIC arrow::libarrow arrow::libparquet Boost::boost protobuf::protobuf) +target_link_libraries(milvus-storage PUBLIC glog::glog) if (WITH_UT) enable_testing() diff --git a/cpp/conanfile.py b/cpp/conanfile.py index 5aa56e77..43c95238 100644 --- a/cpp/conanfile.py +++ b/cpp/conanfile.py @@ -81,7 +81,7 @@ def configure(self): def requirements(self): self.requires("boost/1.81.0") self.requires("arrow/12.0.0") - self.requires("protobuf/3.21.9") + self.requires("protobuf/3.21.4") self.requires("glog/0.6.0") if self.options.with_ut: self.requires("gtest/1.13.0") diff --git a/cpp/src/common/arrow_util.h b/cpp/include/milvus-storage/common/arrow_util.h similarity index 100% rename from cpp/src/common/arrow_util.h rename to cpp/include/milvus-storage/common/arrow_util.h diff --git a/cpp/src/common/constants.h b/cpp/include/milvus-storage/common/constants.h similarity index 100% rename from cpp/src/common/constants.h rename to cpp/include/milvus-storage/common/constants.h diff --git a/cpp/src/common/fs_util.h b/cpp/include/milvus-storage/common/fs_util.h similarity index 100% rename from cpp/src/common/fs_util.h rename to cpp/include/milvus-storage/common/fs_util.h diff --git a/cpp/src/common/log.h b/cpp/include/milvus-storage/common/log.h similarity index 100% rename from cpp/src/common/log.h rename to cpp/include/milvus-storage/common/log.h diff --git a/cpp/src/common/macro.h b/cpp/include/milvus-storage/common/macro.h similarity index 100% rename from cpp/src/common/macro.h rename to cpp/include/milvus-storage/common/macro.h diff --git a/cpp/src/common/result.h b/cpp/include/milvus-storage/common/result.h similarity index 100% rename from cpp/src/common/result.h rename to cpp/include/milvus-storage/common/result.h diff --git a/cpp/src/common/status.h b/cpp/include/milvus-storage/common/status.h similarity index 100% rename from cpp/src/common/status.h rename to cpp/include/milvus-storage/common/status.h diff --git a/cpp/src/common/utils.h b/cpp/include/milvus-storage/common/utils.h similarity index 97% rename from cpp/src/common/utils.h rename to cpp/include/milvus-storage/common/utils.h index e6d60916..21b04aaa 100644 --- a/cpp/src/common/utils.h +++ b/cpp/include/milvus-storage/common/utils.h @@ -3,7 +3,7 @@ #include #include #include -#include "proto/schema.pb.h" +#include "proto/schema_arrow.pb.h" #include "result.h" namespace milvus_storage { diff --git a/cpp/src/file/blob.h b/cpp/include/milvus-storage/file/blob.h similarity index 100% rename from cpp/src/file/blob.h rename to cpp/include/milvus-storage/file/blob.h diff --git a/cpp/src/file/delete_fragment.h b/cpp/include/milvus-storage/file/delete_fragment.h similarity index 100% rename from cpp/src/file/delete_fragment.h rename to cpp/include/milvus-storage/file/delete_fragment.h diff --git a/cpp/src/file/file.h b/cpp/include/milvus-storage/file/file.h similarity index 100% rename from cpp/src/file/file.h rename to cpp/include/milvus-storage/file/file.h diff --git a/cpp/src/file/fragment.h b/cpp/include/milvus-storage/file/fragment.h similarity index 100% rename from cpp/src/file/fragment.h rename to cpp/include/milvus-storage/file/fragment.h diff --git a/cpp/src/filter/conjunction_filter.h b/cpp/include/milvus-storage/filter/conjunction_filter.h similarity index 100% rename from cpp/src/filter/conjunction_filter.h rename to cpp/include/milvus-storage/filter/conjunction_filter.h diff --git a/cpp/src/filter/constant_filter.h b/cpp/include/milvus-storage/filter/constant_filter.h similarity index 100% rename from cpp/src/filter/constant_filter.h rename to cpp/include/milvus-storage/filter/constant_filter.h diff --git a/cpp/src/filter/filter.h b/cpp/include/milvus-storage/filter/filter.h similarity index 100% rename from cpp/src/filter/filter.h rename to cpp/include/milvus-storage/filter/filter.h diff --git a/cpp/src/filter/value.h b/cpp/include/milvus-storage/filter/value.h similarity index 100% rename from cpp/src/filter/value.h rename to cpp/include/milvus-storage/filter/value.h diff --git a/cpp/src/format/parquet/file_reader.h b/cpp/include/milvus-storage/format/parquet/file_reader.h similarity index 100% rename from cpp/src/format/parquet/file_reader.h rename to cpp/include/milvus-storage/format/parquet/file_reader.h diff --git a/cpp/src/format/parquet/file_writer.h b/cpp/include/milvus-storage/format/parquet/file_writer.h similarity index 100% rename from cpp/src/format/parquet/file_writer.h rename to cpp/include/milvus-storage/format/parquet/file_writer.h diff --git a/cpp/src/format/reader.h b/cpp/include/milvus-storage/format/reader.h similarity index 100% rename from cpp/src/format/reader.h rename to cpp/include/milvus-storage/format/reader.h diff --git a/cpp/src/format/writer.h b/cpp/include/milvus-storage/format/writer.h similarity index 100% rename from cpp/src/format/writer.h rename to cpp/include/milvus-storage/format/writer.h diff --git a/cpp/src/reader/common/combine_offset_reader.h b/cpp/include/milvus-storage/reader/common/combine_offset_reader.h similarity index 100% rename from cpp/src/reader/common/combine_offset_reader.h rename to cpp/include/milvus-storage/reader/common/combine_offset_reader.h diff --git a/cpp/src/reader/common/combine_reader.h b/cpp/include/milvus-storage/reader/common/combine_reader.h similarity index 100% rename from cpp/src/reader/common/combine_reader.h rename to cpp/include/milvus-storage/reader/common/combine_reader.h diff --git a/cpp/src/reader/common/delete_reader.h b/cpp/include/milvus-storage/reader/common/delete_reader.h similarity index 100% rename from cpp/src/reader/common/delete_reader.h rename to cpp/include/milvus-storage/reader/common/delete_reader.h diff --git a/cpp/src/reader/common/filter_reader.h b/cpp/include/milvus-storage/reader/common/filter_reader.h similarity index 100% rename from cpp/src/reader/common/filter_reader.h rename to cpp/include/milvus-storage/reader/common/filter_reader.h diff --git a/cpp/src/reader/common/projection_reader.h b/cpp/include/milvus-storage/reader/common/projection_reader.h similarity index 100% rename from cpp/src/reader/common/projection_reader.h rename to cpp/include/milvus-storage/reader/common/projection_reader.h diff --git a/cpp/src/reader/filter_query_record_reader.h b/cpp/include/milvus-storage/reader/filter_query_record_reader.h similarity index 100% rename from cpp/src/reader/filter_query_record_reader.h rename to cpp/include/milvus-storage/reader/filter_query_record_reader.h diff --git a/cpp/src/reader/merge_record_reader.h b/cpp/include/milvus-storage/reader/merge_record_reader.h similarity index 100% rename from cpp/src/reader/merge_record_reader.h rename to cpp/include/milvus-storage/reader/merge_record_reader.h diff --git a/cpp/src/reader/multi_files_sequential_reader.h b/cpp/include/milvus-storage/reader/multi_files_sequential_reader.h similarity index 100% rename from cpp/src/reader/multi_files_sequential_reader.h rename to cpp/include/milvus-storage/reader/multi_files_sequential_reader.h diff --git a/cpp/src/reader/record_reader.h b/cpp/include/milvus-storage/reader/record_reader.h similarity index 100% rename from cpp/src/reader/record_reader.h rename to cpp/include/milvus-storage/reader/record_reader.h diff --git a/cpp/src/reader/scan_record_reader.h b/cpp/include/milvus-storage/reader/scan_record_reader.h similarity index 100% rename from cpp/src/reader/scan_record_reader.h rename to cpp/include/milvus-storage/reader/scan_record_reader.h diff --git a/cpp/src/storage/manifest.h b/cpp/include/milvus-storage/storage/manifest.h similarity index 98% rename from cpp/src/storage/manifest.h rename to cpp/include/milvus-storage/storage/manifest.h index e052b208..46ae7c19 100644 --- a/cpp/src/storage/manifest.h +++ b/cpp/include/milvus-storage/storage/manifest.h @@ -1,6 +1,6 @@ #pragma once -#include "storage/schema.h" +#include "schema.h" #include "file/fragment.h" #include "arrow/filesystem/filesystem.h" #include "file/blob.h" diff --git a/cpp/src/storage/options.h b/cpp/include/milvus-storage/storage/options.h similarity index 100% rename from cpp/src/storage/options.h rename to cpp/include/milvus-storage/storage/options.h diff --git a/cpp/src/storage/schema.h b/cpp/include/milvus-storage/storage/schema.h similarity index 97% rename from cpp/src/storage/schema.h rename to cpp/include/milvus-storage/storage/schema.h index 09295881..248b5a95 100644 --- a/cpp/src/storage/schema.h +++ b/cpp/include/milvus-storage/storage/schema.h @@ -1,5 +1,5 @@ #pragma once -#include "storage/options.h" +#include "options.h" #include "common/result.h" namespace milvus_storage { diff --git a/cpp/src/storage/space.h b/cpp/include/milvus-storage/storage/space.h similarity index 100% rename from cpp/src/storage/space.h rename to cpp/include/milvus-storage/storage/space.h diff --git a/cpp/src/common/fs_util.cpp b/cpp/src/common/fs_util.cpp index 81d1f1e7..acefd120 100644 --- a/cpp/src/common/fs_util.cpp +++ b/cpp/src/common/fs_util.cpp @@ -1,4 +1,4 @@ -#include "fs_util.h" +#include "common/fs_util.h" #include #include #include diff --git a/cpp/src/common/log.cpp b/cpp/src/common/log.cpp index 3e1138c0..88a925a8 100644 --- a/cpp/src/common/log.cpp +++ b/cpp/src/common/log.cpp @@ -14,7 +14,7 @@ // See the License for the specific language governing permissions and // limitations under the License. -#include "log.h" +#include "common/log.h" /* * INITIALIZE_EASYLOGGINGPP will create a global variable whose name is same to that already created in knowhere, @@ -36,8 +36,7 @@ // namespace milvus { -std::string -LogOut(const char* pattern, ...) { +std::string LogOut(const char* pattern, ...) { size_t len = strnlen(pattern, 1024) + 256; auto str_p = std::make_unique(len); memset(str_p.get(), 0, len); @@ -50,8 +49,7 @@ LogOut(const char* pattern, ...) { return std::string(str_p.get()); } -void -SetThreadName(const std::string_view name) { +void SetThreadName(const std::string_view name) { // Note: the name cannot exceed 16 bytes #ifdef __APPLE__ pthread_setname_np(name.data()); @@ -62,8 +60,7 @@ SetThreadName(const std::string_view name) { #endif } -std::string -GetThreadName() { +std::string GetThreadName() { std::string thread_name = "unnamed"; char name[16]; size_t len = 16; @@ -75,16 +72,14 @@ GetThreadName() { return thread_name; } -int64_t -get_now_timestamp() { +int64_t get_now_timestamp() { auto now = std::chrono::system_clock::now().time_since_epoch(); return std::chrono::duration_cast(now).count(); } #ifndef WIN32 -int64_t -get_system_boottime() { +int64_t get_system_boottime() { FILE* uptime = fopen("/proc/uptime", "r"); float since_sys_boot, _; auto ret = fscanf(uptime, "%f %f", &since_sys_boot, &_); @@ -95,8 +90,7 @@ get_system_boottime() { return static_cast(since_sys_boot); } -int64_t -get_thread_starttime() { +int64_t get_thread_starttime() { #ifdef __APPLE__ uint64_t tid; pthread_threadid_np(nullptr, &tid); @@ -108,17 +102,14 @@ get_thread_starttime() { int64_t pid = getpid(); char filename[256]; - snprintf(filename, - sizeof(filename), - "/proc/%lld/task/%lld/stat", + snprintf(filename, sizeof(filename), "/proc/%lld/task/%lld/stat", (long long)pid, // NOLINT, TODO: How to solve this? (long long)tid); // NOLINT int64_t val = 0; char comm[16], state; FILE* thread_stat = fopen(filename, "r"); - auto ret = fscanf( - thread_stat, "%lld %s %s ", (long long*)&val, comm, &state); // NOLINT + auto ret = fscanf(thread_stat, "%lld %s %s ", (long long*)&val, comm, &state); // NOLINT for (auto i = 4; i < 23; i++) { ret = fscanf(thread_stat, "%lld ", (long long*)&val); // NOLINT @@ -133,11 +124,9 @@ get_thread_starttime() { return val / sysconf(_SC_CLK_TCK); } -int64_t -get_thread_start_timestamp() { +int64_t get_thread_start_timestamp() { try { - return get_now_timestamp() - get_system_boottime() + - get_thread_starttime(); + return get_now_timestamp() - get_system_boottime() + get_thread_starttime(); } catch (...) { return 0; } @@ -148,8 +137,7 @@ get_thread_start_timestamp() { #define WINDOWS_TICK 10000000 #define SEC_TO_UNIX_EPOCH 11644473600LL -int64_t -get_thread_start_timestamp() { +int64_t get_thread_start_timestamp() { FILETIME dummy; FILETIME ret; diff --git a/cpp/src/common/result.cpp b/cpp/src/common/result.cpp index 86c672a2..bb9df4be 100644 --- a/cpp/src/common/result.cpp +++ b/cpp/src/common/result.cpp @@ -1,3 +1,3 @@ -#include "result.h" +#include "common/result.h" namespace milvus_storage {} // namespace milvus_storage diff --git a/cpp/src/common/status.cpp b/cpp/src/common/status.cpp index 6c20612b..c20cb158 100644 --- a/cpp/src/common/status.cpp +++ b/cpp/src/common/status.cpp @@ -1,4 +1,4 @@ -#include "status.h" +#include "common/status.h" #include #include namespace milvus_storage { diff --git a/cpp/src/common/utils.cpp b/cpp/src/common/utils.cpp index 5c0df1f6..6b511b99 100644 --- a/cpp/src/common/utils.cpp +++ b/cpp/src/common/utils.cpp @@ -1,4 +1,4 @@ -#include "utils.h" +#include "common/utils.h" #include #include #include @@ -7,8 +7,8 @@ #include #include #include -#include "constants.h" -#include "macro.h" +#include "common/constants.h" +#include "common/macro.h" #include "arrow/filesystem/path_util.h" #include namespace milvus_storage { diff --git a/cpp/src/file/blob.cpp b/cpp/src/file/blob.cpp index 1db00258..15bb9a02 100644 --- a/cpp/src/file/blob.cpp +++ b/cpp/src/file/blob.cpp @@ -1,4 +1,4 @@ -#include "blob.h" +#include "file/blob.h" #include #include "proto/manifest.pb.h" diff --git a/cpp/src/filter/conjunction_filter.cpp b/cpp/src/filter/conjunction_filter.cpp index 09ab8c12..1afa403d 100644 --- a/cpp/src/filter/conjunction_filter.cpp +++ b/cpp/src/filter/conjunction_filter.cpp @@ -1,4 +1,4 @@ -#include "conjunction_filter.h" +#include "filter/conjunction_filter.h" #include "common/macro.h" namespace milvus_storage { diff --git a/cpp/src/filter/constant_filter.cpp b/cpp/src/filter/constant_filter.cpp index 0400fad1..d54bd06a 100644 --- a/cpp/src/filter/constant_filter.cpp +++ b/cpp/src/filter/constant_filter.cpp @@ -1,4 +1,4 @@ -#include "constant_filter.h" +#include "filter/constant_filter.h" #include #include diff --git a/cpp/src/filter/value.cpp b/cpp/src/filter/value.cpp index 9cb2b79e..f4a399ed 100644 --- a/cpp/src/filter/value.cpp +++ b/cpp/src/filter/value.cpp @@ -1,4 +1,4 @@ -#include "value.h" +#include "filter/value.h" #include diff --git a/cpp/src/format/parquet/file_reader.cpp b/cpp/src/format/parquet/file_reader.cpp index 71f6047a..99a32f00 100644 --- a/cpp/src/format/parquet/file_reader.cpp +++ b/cpp/src/format/parquet/file_reader.cpp @@ -1,6 +1,5 @@ #include "format/parquet/file_reader.h" -#include #include #include #include diff --git a/cpp/src/format/parquet/file_writer.cpp b/cpp/src/format/parquet/file_writer.cpp index 721c82ee..24f482c4 100644 --- a/cpp/src/format/parquet/file_writer.cpp +++ b/cpp/src/format/parquet/file_writer.cpp @@ -1,5 +1,5 @@ #include "common/macro.h" -#include "file_writer.h" +#include "format/parquet/file_writer.h" namespace milvus_storage { ParquetFileWriter::ParquetFileWriter(std::shared_ptr schema, diff --git a/cpp/src/proto/manifest.pb.cc b/cpp/src/proto/manifest.pb.cc index 4bf1b33d..e0dade0d 100644 --- a/cpp/src/proto/manifest.pb.cc +++ b/cpp/src/proto/manifest.pb.cc @@ -141,25 +141,25 @@ static const ::_pb::Message* const file_default_instances[] = { }; const char descriptor_table_protodef_manifest_2eproto[] PROTOBUF_SECTION_VARIABLE(protodesc_cold) = - "\n\016manifest.proto\022\016manifest_proto\032\014schema" - ".proto\"\026\n\007Options\022\013\n\003uri\030\001 \001(\t\"\254\002\n\010Manif" - "est\022\017\n\007version\030\001 \001(\003\022(\n\007options\030\002 \001(\0132\027." - "manifest_proto.Options\022$\n\006schema\030\003 \001(\0132\024" - ".schema_proto.Schema\0222\n\020scalar_fragments" - "\030\004 \003(\0132\030.manifest_proto.Fragment\0222\n\020vect" - "or_fragments\030\005 \003(\0132\030.manifest_proto.Frag" - "ment\0222\n\020delete_fragments\030\006 \003(\0132\030.manifes" - "t_proto.Fragment\022#\n\005blobs\030\007 \003(\0132\024.manife" - "st_proto.Blob\"%\n\010Fragment\022\n\n\002id\030\001 \001(\003\022\r\n" - "\005files\030\002 \003(\t\"0\n\004Blob\022\014\n\004name\030\001 \001(\t\022\014\n\004si" - "ze\030\002 \001(\003\022\014\n\004file\030\003 \001(\tb\006proto3" + "\n\016manifest.proto\022\016manifest_proto\032\022schema" + "_arrow.proto\"\026\n\007Options\022\013\n\003uri\030\001 \001(\t\"\254\002\n" + "\010Manifest\022\017\n\007version\030\001 \001(\003\022(\n\007options\030\002 " + "\001(\0132\027.manifest_proto.Options\022$\n\006schema\030\003" + " \001(\0132\024.schema_proto.Schema\0222\n\020scalar_fra" + "gments\030\004 \003(\0132\030.manifest_proto.Fragment\0222" + "\n\020vector_fragments\030\005 \003(\0132\030.manifest_prot" + "o.Fragment\0222\n\020delete_fragments\030\006 \003(\0132\030.m" + "anifest_proto.Fragment\022#\n\005blobs\030\007 \003(\0132\024." + "manifest_proto.Blob\"%\n\010Fragment\022\n\n\002id\030\001 " + "\001(\003\022\r\n\005files\030\002 \003(\t\"0\n\004Blob\022\014\n\004name\030\001 \001(\t" + "\022\014\n\004size\030\002 \001(\003\022\014\n\004file\030\003 \001(\tb\006proto3" ; static const ::_pbi::DescriptorTable* const descriptor_table_manifest_2eproto_deps[1] = { - &::descriptor_table_schema_2eproto, + &::descriptor_table_schema_5farrow_2eproto, }; static ::_pbi::once_flag descriptor_table_manifest_2eproto_once; const ::_pbi::DescriptorTable descriptor_table_manifest_2eproto = { - false, false, 470, descriptor_table_protodef_manifest_2eproto, + false, false, 476, descriptor_table_protodef_manifest_2eproto, "manifest.proto", &descriptor_table_manifest_2eproto_once, descriptor_table_manifest_2eproto_deps, 1, 4, schemas, file_default_instances, TableStruct_manifest_2eproto::offsets, diff --git a/cpp/src/proto/manifest.pb.h b/cpp/src/proto/manifest.pb.h index 2872b08a..bb357ab4 100644 --- a/cpp/src/proto/manifest.pb.h +++ b/cpp/src/proto/manifest.pb.h @@ -13,7 +13,7 @@ #error incompatible with your Protocol Buffer headers. Please update #error your headers. #endif -#if 3021009 < PROTOBUF_MIN_PROTOC_VERSION +#if 3021004 < PROTOBUF_MIN_PROTOC_VERSION #error This file was generated by an older version of protoc which is #error incompatible with your Protocol Buffer headers. Please #error regenerate this file with a newer version of protoc. @@ -30,7 +30,7 @@ #include // IWYU pragma: export #include // IWYU pragma: export #include -#include "schema.pb.h" +#include "schema_arrow.pb.h" // @@protoc_insertion_point(includes) #include #define PROTOBUF_INTERNAL_EXPORT_manifest_2eproto diff --git a/cpp/src/proto/manifest.proto b/cpp/src/proto/manifest.proto index 823af278..d9c423f2 100644 --- a/cpp/src/proto/manifest.proto +++ b/cpp/src/proto/manifest.proto @@ -1,7 +1,7 @@ syntax = "proto3"; -import "schema.proto"; - package manifest_proto; +import "schema_arrow.proto"; + message Options { string uri = 1; } message Manifest { diff --git a/cpp/src/proto/schema.pb.cc b/cpp/src/proto/schema_arrow.pb.cc similarity index 95% rename from cpp/src/proto/schema.pb.cc rename to cpp/src/proto/schema_arrow.pb.cc index d17fb8e6..a5f699d7 100644 --- a/cpp/src/proto/schema.pb.cc +++ b/cpp/src/proto/schema_arrow.pb.cc @@ -1,7 +1,7 @@ // Generated by the protocol buffer compiler. DO NOT EDIT! -// source: schema.proto +// source: schema_arrow.proto -#include "schema.pb.h" +#include "schema_arrow.pb.h" #include @@ -166,11 +166,11 @@ struct SchemaDefaultTypeInternal { }; PROTOBUF_ATTRIBUTE_NO_DESTROY PROTOBUF_CONSTINIT PROTOBUF_ATTRIBUTE_INIT_PRIORITY1 SchemaDefaultTypeInternal _Schema_default_instance_; } // namespace schema_proto -static ::_pb::Metadata file_level_metadata_schema_2eproto[10]; -static const ::_pb::EnumDescriptor* file_level_enum_descriptors_schema_2eproto[2]; -static constexpr ::_pb::ServiceDescriptor const** file_level_service_descriptors_schema_2eproto = nullptr; +static ::_pb::Metadata file_level_metadata_schema_5farrow_2eproto[10]; +static const ::_pb::EnumDescriptor* file_level_enum_descriptors_schema_5farrow_2eproto[2]; +static constexpr ::_pb::ServiceDescriptor const** file_level_service_descriptors_schema_5farrow_2eproto = nullptr; -const uint32_t TableStruct_schema_2eproto::offsets[] PROTOBUF_SECTION_VARIABLE(protodesc_cold) = { +const uint32_t TableStruct_schema_5farrow_2eproto::offsets[] PROTOBUF_SECTION_VARIABLE(protodesc_cold) = { ~0u, // no _has_bits_ PROTOBUF_FIELD_OFFSET(::schema_proto::FixedSizeBinaryType, _internal_metadata_), ~0u, // no _extensions_ @@ -285,65 +285,65 @@ static const ::_pb::Message* const file_default_instances[] = { &::schema_proto::_Schema_default_instance_._instance, }; -const char descriptor_table_protodef_schema_2eproto[] PROTOBUF_SECTION_VARIABLE(protodesc_cold) = - "\n\014schema.proto\022\014schema_proto\")\n\023FixedSiz" - "eBinaryType\022\022\n\nbyte_width\030\001 \001(\005\"&\n\021Fixed" - "SizeListType\022\021\n\tlist_size\030\001 \001(\005\"y\n\016Dicti" - "onaryType\022*\n\nindex_type\030\001 \001(\0132\026.schema_p" - "roto.DataType\022*\n\nvalue_type\030\002 \001(\0132\026.sche" - "ma_proto.DataType\022\017\n\007ordered\030\003 \001(\010\"\036\n\007Ma" - "pType\022\023\n\013keys_sorted\030\001 \001(\010\"\337\002\n\010DataType\022" - "C\n\026fixed_size_binary_type\030\001 \001(\0132!.schema" - "_proto.FixedSizeBinaryTypeH\000\022\?\n\024fixed_si" - "ze_list_type\030\002 \001(\0132\037.schema_proto.FixedS" - "izeListTypeH\000\0227\n\017dictionary_type\030\003 \001(\0132\034" - ".schema_proto.DictionaryTypeH\000\022)\n\010map_ty" - "pe\030\004 \001(\0132\025.schema_proto.MapTypeH\000\022+\n\nlog" - "ic_type\030d \001(\0162\027.schema_proto.LogicType\022%" - "\n\010children\030e \003(\0132\023.schema_proto.FieldB\025\n" - "\023type_related_values\"0\n\020KeyValueMetadata" - "\022\014\n\004keys\030\001 \003(\t\022\016\n\006values\030\002 \003(\t\"\204\001\n\005Field" - "\022\014\n\004name\030\001 \001(\t\022\020\n\010nullable\030\002 \001(\010\022)\n\tdata" - "_type\030\003 \001(\0132\026.schema_proto.DataType\0220\n\010m" - "etadata\030\004 \001(\0132\036.schema_proto.KeyValueMet" - "adata\"V\n\rSchemaOptions\022\026\n\016primary_column" - "\030\001 \001(\t\022\026\n\016version_column\030\002 \001(\t\022\025\n\rvector" - "_column\030\003 \001(\t\"\222\001\n\013ArrowSchema\022#\n\006fields\030" - "\001 \003(\0132\023.schema_proto.Field\022,\n\nendianness" - "\030\002 \001(\0162\030.schema_proto.Endianness\0220\n\010meta" - "data\030\003 \001(\0132\036.schema_proto.KeyValueMetada" - "ta\"n\n\006Schema\022/\n\014arrow_schema\030\001 \001(\0132\031.sch" - "ema_proto.ArrowSchema\0223\n\016schema_options\030" - "\002 \001(\0132\033.schema_proto.SchemaOptions*\235\002\n\tL" - "ogicType\022\006\n\002NA\020\000\022\010\n\004BOOL\020\001\022\t\n\005UINT8\020\002\022\010\n" - "\004INT8\020\003\022\n\n\006UINT16\020\004\022\t\n\005INT16\020\005\022\n\n\006UINT32" - "\020\006\022\t\n\005INT32\020\007\022\n\n\006UINT64\020\010\022\t\n\005INT64\020\t\022\016\n\n" - "HALF_FLOAT\020\n\022\t\n\005FLOAT\020\013\022\n\n\006DOUBLE\020\014\022\n\n\006S" - "TRING\020\r\022\n\n\006BINARY\020\016\022\025\n\021FIXED_SIZE_BINARY" - "\020\017\022\010\n\004LIST\020\031\022\n\n\006STRUCT\020\032\022\016\n\nDICTIONARY\020\035" - "\022\007\n\003MAP\020\036\022\023\n\017FIXED_SIZE_LIST\020 \022\n\n\006MAX_ID" - "\020\'*!\n\nEndianness\022\n\n\006Little\020\000\022\007\n\003Big\020\001b\006p" - "roto3" +const char descriptor_table_protodef_schema_5farrow_2eproto[] PROTOBUF_SECTION_VARIABLE(protodesc_cold) = + "\n\022schema_arrow.proto\022\014schema_proto\")\n\023Fi" + "xedSizeBinaryType\022\022\n\nbyte_width\030\001 \001(\005\"&\n" + "\021FixedSizeListType\022\021\n\tlist_size\030\001 \001(\005\"y\n" + "\016DictionaryType\022*\n\nindex_type\030\001 \001(\0132\026.sc" + "hema_proto.DataType\022*\n\nvalue_type\030\002 \001(\0132" + "\026.schema_proto.DataType\022\017\n\007ordered\030\003 \001(\010" + "\"\036\n\007MapType\022\023\n\013keys_sorted\030\001 \001(\010\"\337\002\n\010Dat" + "aType\022C\n\026fixed_size_binary_type\030\001 \001(\0132!." + "schema_proto.FixedSizeBinaryTypeH\000\022\?\n\024fi" + "xed_size_list_type\030\002 \001(\0132\037.schema_proto." + "FixedSizeListTypeH\000\0227\n\017dictionary_type\030\003" + " \001(\0132\034.schema_proto.DictionaryTypeH\000\022)\n\010" + "map_type\030\004 \001(\0132\025.schema_proto.MapTypeH\000\022" + "+\n\nlogic_type\030d \001(\0162\027.schema_proto.Logic" + "Type\022%\n\010children\030e \003(\0132\023.schema_proto.Fi" + "eldB\025\n\023type_related_values\"0\n\020KeyValueMe" + "tadata\022\014\n\004keys\030\001 \003(\t\022\016\n\006values\030\002 \003(\t\"\204\001\n" + "\005Field\022\014\n\004name\030\001 \001(\t\022\020\n\010nullable\030\002 \001(\010\022)" + "\n\tdata_type\030\003 \001(\0132\026.schema_proto.DataTyp" + "e\0220\n\010metadata\030\004 \001(\0132\036.schema_proto.KeyVa" + "lueMetadata\"V\n\rSchemaOptions\022\026\n\016primary_" + "column\030\001 \001(\t\022\026\n\016version_column\030\002 \001(\t\022\025\n\r" + "vector_column\030\003 \001(\t\"\222\001\n\013ArrowSchema\022#\n\006f" + "ields\030\001 \003(\0132\023.schema_proto.Field\022,\n\nendi" + "anness\030\002 \001(\0162\030.schema_proto.Endianness\0220" + "\n\010metadata\030\003 \001(\0132\036.schema_proto.KeyValue" + "Metadata\"n\n\006Schema\022/\n\014arrow_schema\030\001 \001(\013" + "2\031.schema_proto.ArrowSchema\0223\n\016schema_op" + "tions\030\002 \001(\0132\033.schema_proto.SchemaOptions" + "*\235\002\n\tLogicType\022\006\n\002NA\020\000\022\010\n\004BOOL\020\001\022\t\n\005UINT" + "8\020\002\022\010\n\004INT8\020\003\022\n\n\006UINT16\020\004\022\t\n\005INT16\020\005\022\n\n\006" + "UINT32\020\006\022\t\n\005INT32\020\007\022\n\n\006UINT64\020\010\022\t\n\005INT64" + "\020\t\022\016\n\nHALF_FLOAT\020\n\022\t\n\005FLOAT\020\013\022\n\n\006DOUBLE\020" + "\014\022\n\n\006STRING\020\r\022\n\n\006BINARY\020\016\022\025\n\021FIXED_SIZE_" + "BINARY\020\017\022\010\n\004LIST\020\031\022\n\n\006STRUCT\020\032\022\016\n\nDICTIO" + "NARY\020\035\022\007\n\003MAP\020\036\022\023\n\017FIXED_SIZE_LIST\020 \022\n\n\006" + "MAX_ID\020\'*!\n\nEndianness\022\n\n\006Little\020\000\022\007\n\003Bi" + "g\020\001b\006proto3" ; -static ::_pbi::once_flag descriptor_table_schema_2eproto_once; -const ::_pbi::DescriptorTable descriptor_table_schema_2eproto = { - false, false, 1485, descriptor_table_protodef_schema_2eproto, - "schema.proto", - &descriptor_table_schema_2eproto_once, nullptr, 0, 10, - schemas, file_default_instances, TableStruct_schema_2eproto::offsets, - file_level_metadata_schema_2eproto, file_level_enum_descriptors_schema_2eproto, - file_level_service_descriptors_schema_2eproto, +static ::_pbi::once_flag descriptor_table_schema_5farrow_2eproto_once; +const ::_pbi::DescriptorTable descriptor_table_schema_5farrow_2eproto = { + false, false, 1491, descriptor_table_protodef_schema_5farrow_2eproto, + "schema_arrow.proto", + &descriptor_table_schema_5farrow_2eproto_once, nullptr, 0, 10, + schemas, file_default_instances, TableStruct_schema_5farrow_2eproto::offsets, + file_level_metadata_schema_5farrow_2eproto, file_level_enum_descriptors_schema_5farrow_2eproto, + file_level_service_descriptors_schema_5farrow_2eproto, }; -PROTOBUF_ATTRIBUTE_WEAK const ::_pbi::DescriptorTable* descriptor_table_schema_2eproto_getter() { - return &descriptor_table_schema_2eproto; +PROTOBUF_ATTRIBUTE_WEAK const ::_pbi::DescriptorTable* descriptor_table_schema_5farrow_2eproto_getter() { + return &descriptor_table_schema_5farrow_2eproto; } // Force running AddDescriptors() at dynamic initialization time. -PROTOBUF_ATTRIBUTE_INIT_PRIORITY2 static ::_pbi::AddDescriptorsRunner dynamic_init_dummy_schema_2eproto(&descriptor_table_schema_2eproto); +PROTOBUF_ATTRIBUTE_INIT_PRIORITY2 static ::_pbi::AddDescriptorsRunner dynamic_init_dummy_schema_5farrow_2eproto(&descriptor_table_schema_5farrow_2eproto); namespace schema_proto { const ::PROTOBUF_NAMESPACE_ID::EnumDescriptor* LogicType_descriptor() { - ::PROTOBUF_NAMESPACE_ID::internal::AssignDescriptors(&descriptor_table_schema_2eproto); - return file_level_enum_descriptors_schema_2eproto[0]; + ::PROTOBUF_NAMESPACE_ID::internal::AssignDescriptors(&descriptor_table_schema_5farrow_2eproto); + return file_level_enum_descriptors_schema_5farrow_2eproto[0]; } bool LogicType_IsValid(int value) { switch (value) { @@ -376,8 +376,8 @@ bool LogicType_IsValid(int value) { } const ::PROTOBUF_NAMESPACE_ID::EnumDescriptor* Endianness_descriptor() { - ::PROTOBUF_NAMESPACE_ID::internal::AssignDescriptors(&descriptor_table_schema_2eproto); - return file_level_enum_descriptors_schema_2eproto[1]; + ::PROTOBUF_NAMESPACE_ID::internal::AssignDescriptors(&descriptor_table_schema_5farrow_2eproto); + return file_level_enum_descriptors_schema_5farrow_2eproto[1]; } bool Endianness_IsValid(int value) { switch (value) { @@ -564,8 +564,8 @@ void FixedSizeBinaryType::InternalSwap(FixedSizeBinaryType* other) { ::PROTOBUF_NAMESPACE_ID::Metadata FixedSizeBinaryType::GetMetadata() const { return ::_pbi::AssignDescriptors( - &descriptor_table_schema_2eproto_getter, &descriptor_table_schema_2eproto_once, - file_level_metadata_schema_2eproto[0]); + &descriptor_table_schema_5farrow_2eproto_getter, &descriptor_table_schema_5farrow_2eproto_once, + file_level_metadata_schema_5farrow_2eproto[0]); } // =================================================================== @@ -742,8 +742,8 @@ void FixedSizeListType::InternalSwap(FixedSizeListType* other) { ::PROTOBUF_NAMESPACE_ID::Metadata FixedSizeListType::GetMetadata() const { return ::_pbi::AssignDescriptors( - &descriptor_table_schema_2eproto_getter, &descriptor_table_schema_2eproto_once, - file_level_metadata_schema_2eproto[1]); + &descriptor_table_schema_5farrow_2eproto_getter, &descriptor_table_schema_5farrow_2eproto_once, + file_level_metadata_schema_5farrow_2eproto[1]); } // =================================================================== @@ -1007,8 +1007,8 @@ void DictionaryType::InternalSwap(DictionaryType* other) { ::PROTOBUF_NAMESPACE_ID::Metadata DictionaryType::GetMetadata() const { return ::_pbi::AssignDescriptors( - &descriptor_table_schema_2eproto_getter, &descriptor_table_schema_2eproto_once, - file_level_metadata_schema_2eproto[2]); + &descriptor_table_schema_5farrow_2eproto_getter, &descriptor_table_schema_5farrow_2eproto_once, + file_level_metadata_schema_5farrow_2eproto[2]); } // =================================================================== @@ -1185,8 +1185,8 @@ void MapType::InternalSwap(MapType* other) { ::PROTOBUF_NAMESPACE_ID::Metadata MapType::GetMetadata() const { return ::_pbi::AssignDescriptors( - &descriptor_table_schema_2eproto_getter, &descriptor_table_schema_2eproto_once, - file_level_metadata_schema_2eproto[3]); + &descriptor_table_schema_5farrow_2eproto_getter, &descriptor_table_schema_5farrow_2eproto_once, + file_level_metadata_schema_5farrow_2eproto[3]); } // =================================================================== @@ -1670,8 +1670,8 @@ void DataType::InternalSwap(DataType* other) { ::PROTOBUF_NAMESPACE_ID::Metadata DataType::GetMetadata() const { return ::_pbi::AssignDescriptors( - &descriptor_table_schema_2eproto_getter, &descriptor_table_schema_2eproto_once, - file_level_metadata_schema_2eproto[4]); + &descriptor_table_schema_5farrow_2eproto_getter, &descriptor_table_schema_5farrow_2eproto_once, + file_level_metadata_schema_5farrow_2eproto[4]); } // =================================================================== @@ -1899,8 +1899,8 @@ void KeyValueMetadata::InternalSwap(KeyValueMetadata* other) { ::PROTOBUF_NAMESPACE_ID::Metadata KeyValueMetadata::GetMetadata() const { return ::_pbi::AssignDescriptors( - &descriptor_table_schema_2eproto_getter, &descriptor_table_schema_2eproto_once, - file_level_metadata_schema_2eproto[5]); + &descriptor_table_schema_5farrow_2eproto_getter, &descriptor_table_schema_5farrow_2eproto_once, + file_level_metadata_schema_5farrow_2eproto[5]); } // =================================================================== @@ -2216,8 +2216,8 @@ void Field::InternalSwap(Field* other) { ::PROTOBUF_NAMESPACE_ID::Metadata Field::GetMetadata() const { return ::_pbi::AssignDescriptors( - &descriptor_table_schema_2eproto_getter, &descriptor_table_schema_2eproto_once, - file_level_metadata_schema_2eproto[6]); + &descriptor_table_schema_5farrow_2eproto_getter, &descriptor_table_schema_5farrow_2eproto_once, + file_level_metadata_schema_5farrow_2eproto[6]); } // =================================================================== @@ -2519,8 +2519,8 @@ void SchemaOptions::InternalSwap(SchemaOptions* other) { ::PROTOBUF_NAMESPACE_ID::Metadata SchemaOptions::GetMetadata() const { return ::_pbi::AssignDescriptors( - &descriptor_table_schema_2eproto_getter, &descriptor_table_schema_2eproto_once, - file_level_metadata_schema_2eproto[7]); + &descriptor_table_schema_5farrow_2eproto_getter, &descriptor_table_schema_5farrow_2eproto_once, + file_level_metadata_schema_5farrow_2eproto[7]); } // =================================================================== @@ -2780,8 +2780,8 @@ void ArrowSchema::InternalSwap(ArrowSchema* other) { ::PROTOBUF_NAMESPACE_ID::Metadata ArrowSchema::GetMetadata() const { return ::_pbi::AssignDescriptors( - &descriptor_table_schema_2eproto_getter, &descriptor_table_schema_2eproto_once, - file_level_metadata_schema_2eproto[8]); + &descriptor_table_schema_5farrow_2eproto_getter, &descriptor_table_schema_5farrow_2eproto_once, + file_level_metadata_schema_5farrow_2eproto[8]); } // =================================================================== @@ -3019,8 +3019,8 @@ void Schema::InternalSwap(Schema* other) { ::PROTOBUF_NAMESPACE_ID::Metadata Schema::GetMetadata() const { return ::_pbi::AssignDescriptors( - &descriptor_table_schema_2eproto_getter, &descriptor_table_schema_2eproto_once, - file_level_metadata_schema_2eproto[9]); + &descriptor_table_schema_5farrow_2eproto_getter, &descriptor_table_schema_5farrow_2eproto_once, + file_level_metadata_schema_5farrow_2eproto[9]); } // @@protoc_insertion_point(namespace_scope) diff --git a/cpp/src/proto/schema.pb.h b/cpp/src/proto/schema_arrow.pb.h similarity index 99% rename from cpp/src/proto/schema.pb.h rename to cpp/src/proto/schema_arrow.pb.h index d5a88125..83575463 100644 --- a/cpp/src/proto/schema.pb.h +++ b/cpp/src/proto/schema_arrow.pb.h @@ -1,8 +1,8 @@ // Generated by the protocol buffer compiler. DO NOT EDIT! -// source: schema.proto +// source: schema_arrow.proto -#ifndef GOOGLE_PROTOBUF_INCLUDED_schema_2eproto -#define GOOGLE_PROTOBUF_INCLUDED_schema_2eproto +#ifndef GOOGLE_PROTOBUF_INCLUDED_schema_5farrow_2eproto +#define GOOGLE_PROTOBUF_INCLUDED_schema_5farrow_2eproto #include #include @@ -13,7 +13,7 @@ #error incompatible with your Protocol Buffer headers. Please update #error your headers. #endif -#if 3021009 < PROTOBUF_MIN_PROTOC_VERSION +#if 3021004 < PROTOBUF_MIN_PROTOC_VERSION #error This file was generated by an older version of protoc which is #error incompatible with your Protocol Buffer headers. Please #error regenerate this file with a newer version of protoc. @@ -33,7 +33,7 @@ #include // @@protoc_insertion_point(includes) #include -#define PROTOBUF_INTERNAL_EXPORT_schema_2eproto +#define PROTOBUF_INTERNAL_EXPORT_schema_5farrow_2eproto PROTOBUF_NAMESPACE_OPEN namespace internal { class AnyMetadata; @@ -41,10 +41,10 @@ class AnyMetadata; PROTOBUF_NAMESPACE_CLOSE // Internal implementation detail -- do not use these members. -struct TableStruct_schema_2eproto { +struct TableStruct_schema_5farrow_2eproto { static const uint32_t offsets[]; }; -extern const ::PROTOBUF_NAMESPACE_ID::internal::DescriptorTable descriptor_table_schema_2eproto; +extern const ::PROTOBUF_NAMESPACE_ID::internal::DescriptorTable descriptor_table_schema_5farrow_2eproto; namespace schema_proto { class ArrowSchema; struct ArrowSchemaDefaultTypeInternal; @@ -307,7 +307,7 @@ class FixedSizeBinaryType final : mutable ::PROTOBUF_NAMESPACE_ID::internal::CachedSize _cached_size_; }; union { Impl_ _impl_; }; - friend struct ::TableStruct_schema_2eproto; + friend struct ::TableStruct_schema_5farrow_2eproto; }; // ------------------------------------------------------------------- @@ -455,7 +455,7 @@ class FixedSizeListType final : mutable ::PROTOBUF_NAMESPACE_ID::internal::CachedSize _cached_size_; }; union { Impl_ _impl_; }; - friend struct ::TableStruct_schema_2eproto; + friend struct ::TableStruct_schema_5farrow_2eproto; }; // ------------------------------------------------------------------- @@ -643,7 +643,7 @@ class DictionaryType final : mutable ::PROTOBUF_NAMESPACE_ID::internal::CachedSize _cached_size_; }; union { Impl_ _impl_; }; - friend struct ::TableStruct_schema_2eproto; + friend struct ::TableStruct_schema_5farrow_2eproto; }; // ------------------------------------------------------------------- @@ -791,7 +791,7 @@ class MapType final : mutable ::PROTOBUF_NAMESPACE_ID::internal::CachedSize _cached_size_; }; union { Impl_ _impl_; }; - friend struct ::TableStruct_schema_2eproto; + friend struct ::TableStruct_schema_5farrow_2eproto; }; // ------------------------------------------------------------------- @@ -1062,7 +1062,7 @@ class DataType final : }; union { Impl_ _impl_; }; - friend struct ::TableStruct_schema_2eproto; + friend struct ::TableStruct_schema_5farrow_2eproto; }; // ------------------------------------------------------------------- @@ -1251,7 +1251,7 @@ class KeyValueMetadata final : mutable ::PROTOBUF_NAMESPACE_ID::internal::CachedSize _cached_size_; }; union { Impl_ _impl_; }; - friend struct ::TableStruct_schema_2eproto; + friend struct ::TableStruct_schema_5farrow_2eproto; }; // ------------------------------------------------------------------- @@ -1455,7 +1455,7 @@ class Field final : mutable ::PROTOBUF_NAMESPACE_ID::internal::CachedSize _cached_size_; }; union { Impl_ _impl_; }; - friend struct ::TableStruct_schema_2eproto; + friend struct ::TableStruct_schema_5farrow_2eproto; }; // ------------------------------------------------------------------- @@ -1640,7 +1640,7 @@ class SchemaOptions final : mutable ::PROTOBUF_NAMESPACE_ID::internal::CachedSize _cached_size_; }; union { Impl_ _impl_; }; - friend struct ::TableStruct_schema_2eproto; + friend struct ::TableStruct_schema_5farrow_2eproto; }; // ------------------------------------------------------------------- @@ -1828,7 +1828,7 @@ class ArrowSchema final : mutable ::PROTOBUF_NAMESPACE_ID::internal::CachedSize _cached_size_; }; union { Impl_ _impl_; }; - friend struct ::TableStruct_schema_2eproto; + friend struct ::TableStruct_schema_5farrow_2eproto; }; // ------------------------------------------------------------------- @@ -2005,7 +2005,7 @@ class Schema final : mutable ::PROTOBUF_NAMESPACE_ID::internal::CachedSize _cached_size_; }; union { Impl_ _impl_; }; - friend struct ::TableStruct_schema_2eproto; + friend struct ::TableStruct_schema_5farrow_2eproto; }; // =================================================================== @@ -3603,4 +3603,4 @@ PROTOBUF_NAMESPACE_CLOSE // @@protoc_insertion_point(global_scope) #include -#endif // GOOGLE_PROTOBUF_INCLUDED_GOOGLE_PROTOBUF_INCLUDED_schema_2eproto +#endif // GOOGLE_PROTOBUF_INCLUDED_GOOGLE_PROTOBUF_INCLUDED_schema_5farrow_2eproto diff --git a/cpp/src/proto/schema.proto b/cpp/src/proto/schema_arrow.proto similarity index 100% rename from cpp/src/proto/schema.proto rename to cpp/src/proto/schema_arrow.proto diff --git a/cpp/src/reader/common/filter_reader.cpp b/cpp/src/reader/common/filter_reader.cpp index f220e986..9ce8f130 100644 --- a/cpp/src/reader/common/filter_reader.cpp +++ b/cpp/src/reader/common/filter_reader.cpp @@ -1,4 +1,4 @@ -#include "filter_reader.h" +#include "reader/common/filter_reader.h" #include #include "arrow/record_batch.h" #include "arrow/table.h" diff --git a/cpp/src/reader/common/projection_reader.cpp b/cpp/src/reader/common/projection_reader.cpp index 48697247..c96f7286 100644 --- a/cpp/src/reader/common/projection_reader.cpp +++ b/cpp/src/reader/common/projection_reader.cpp @@ -1,4 +1,4 @@ -#include "projection_reader.h" +#include "reader/common/projection_reader.h" #include #include #include diff --git a/cpp/src/reader/multi_files_sequential_reader.cpp b/cpp/src/reader/multi_files_sequential_reader.cpp index 5734c450..84404746 100644 --- a/cpp/src/reader/multi_files_sequential_reader.cpp +++ b/cpp/src/reader/multi_files_sequential_reader.cpp @@ -1,4 +1,4 @@ -#include "multi_files_sequential_reader.h" +#include "reader/multi_files_sequential_reader.h" #include #include #include diff --git a/cpp/src/reader/scan_record_reader.cpp b/cpp/src/reader/scan_record_reader.cpp index 34742ffb..0971a8ad 100644 --- a/cpp/src/reader/scan_record_reader.cpp +++ b/cpp/src/reader/scan_record_reader.cpp @@ -1,4 +1,4 @@ -#include "scan_record_reader.h" +#include "reader/scan_record_reader.h" #include #include "common/macro.h" #include "common/utils.h" diff --git a/cpp/test/CMakeLists.txt b/cpp/test/CMakeLists.txt index 462864df..98b2dece 100644 --- a/cpp/test/CMakeLists.txt +++ b/cpp/test/CMakeLists.txt @@ -11,7 +11,7 @@ add_executable( ) target_link_libraries( - milvus_test storage GTest::gtest_main + milvus_test milvus-storage GTest::gtest_main ) include(GoogleTest)