From d4dae8127bffc2a3e01996cd2f17649ed06cae99 Mon Sep 17 00:00:00 2001 From: Xu Peng Date: Mon, 15 Apr 2019 14:07:05 +0800 Subject: [PATCH] fix(db): fix meta compile error Former-commit-id: dde5e3262cc177db2fad98d82ee129718936fa01 --- cpp/src/db/db_meta.cpp | 1 - cpp/src/db/db_meta.h | 11 +++++++---- cpp/src/db/db_meta_impl.cpp | 20 ++++++++++---------- cpp/src/db/db_meta_impl.h | 2 +- 4 files changed, 18 insertions(+), 16 deletions(-) diff --git a/cpp/src/db/db_meta.cpp b/cpp/src/db/db_meta.cpp index 42c1d9d78f..9274b8258e 100644 --- a/cpp/src/db/db_meta.cpp +++ b/cpp/src/db/db_meta.cpp @@ -4,7 +4,6 @@ namespace zilliz { namespace vecwise { namespace engine { -} } // namespace engine } // namespace vecwise diff --git a/cpp/src/db/db_meta.h b/cpp/src/db/db_meta.h index da2b40edf0..1eae4b95a6 100644 --- a/cpp/src/db/db_meta.h +++ b/cpp/src/db/db_meta.h @@ -1,5 +1,10 @@ -#ifndef VECENGINE_DB_META_H_ -#define VECENGINE_DB_META_H_ +#pragma once + +#include +#include +#include +#include "options.h" +#include "status.h" namespace zilliz { namespace vecwise { @@ -59,5 +64,3 @@ public: } // namespace engine } // namespace vecwise } // namespace zilliz - -#endif // VECENGINE_DB_META_H_ diff --git a/cpp/src/db/db_meta_impl.cpp b/cpp/src/db/db_meta_impl.cpp index 61562378f9..a4ba4e810e 100644 --- a/cpp/src/db/db_meta_impl.cpp +++ b/cpp/src/db/db_meta_impl.cpp @@ -4,63 +4,63 @@ namespace zilliz { namespace vecwise { namespace engine { -Status DBMetaImpl::DBMetaImpl(DBMetaOptions options_) +DBMetaImpl::DBMetaImpl(const DBMetaOptions& options_) : _options(options_) { initialize(); } Status DBMetaImpl::initialize() { // PXU TODO: Create DB Connection - return Status.OK(); + return Status::OK(); } Status DBMetaImpl::add_group(const GroupOptions& options_, const std::string& group_id_, GroupSchema& group_info_) { //PXU TODO - return Status.OK(); + return Status::OK(); } Status DBMetaImpl::get_group(const std::string& group_id_, GroupSchema& group_info_) { //PXU TODO - return Status.OK(); + return Status::OK(); } Status DBMetaImpl::has_group(const std::string& group_id_, bool& has_or_not_) { //PXU TODO - return Status.OK(); + return Status::OK(); } Status DBMetaImpl::add_group_file(const std::string& group_id_, GroupFileSchema& group_file_info_) { //PXU TODO - return Status.OK(); + return Status::OK(); } Status DBMetaImpl::has_group_file(const std::string& group_id_, const std::string& file_id_, bool& has_or_not_) { //PXU TODO - return Status.OK(); + return Status::OK(); } Status DBMetaImpl::get_group_file(const std::string& group_id_, const std::string& file_id_, GroupFileSchema& group_file_info_) { //PXU TODO - return Status.OK(); + return Status::OK(); } Status DBMetaImpl::get_group_files(const std::string& group_id_, const int date_delta_, GroupFilesSchema& group_files_info_) { // PXU TODO - return Status.OK(); + return Status::OK(); } Status DBMetaImpl::update_group_file(const GroupFileSchema& group_file_) { //PXU TODO - return Status.OK(); + return Status::OK(); } } // namespace engine diff --git a/cpp/src/db/db_meta_impl.h b/cpp/src/db/db_meta_impl.h index 690fadf92d..bf18b713d4 100644 --- a/cpp/src/db/db_meta_impl.h +++ b/cpp/src/db/db_meta_impl.h @@ -10,7 +10,7 @@ namespace engine { class DBMetaImpl : public Meta { public: - DBMetaImpl(DBMetaOptions& options_); + DBMetaImpl(const DBMetaOptions& options_); virtual Status add_group(const GroupOptions& options_, const std::string& group_id_,