From 9fd4048cf4cf4ccc50c97a4ca02230b517ea1494 Mon Sep 17 00:00:00 2001 From: "peng.xu" Date: Tue, 9 Jul 2019 19:09:42 +0800 Subject: [PATCH] feat(db): fix build bug Former-commit-id: 6d069d07a84897e05317143442e3d3b2d55949a4 --- cpp/src/db/DBImpl.cpp | 4 ++-- cpp/src/db/DBImpl.h | 2 +- cpp/src/db/MySQLMetaImpl.cpp | 5 +++++ cpp/src/db/MySQLMetaImpl.h | 2 ++ 4 files changed, 10 insertions(+), 3 deletions(-) diff --git a/cpp/src/db/DBImpl.cpp b/cpp/src/db/DBImpl.cpp index d0363d3f3c..94a2e76c94 100644 --- a/cpp/src/db/DBImpl.cpp +++ b/cpp/src/db/DBImpl.cpp @@ -497,7 +497,7 @@ Status DBImpl::BuildIndex(const meta::TableFileSchema& file) { } Status DBImpl::BuildIndexByTable(const std::string& table_id) { - std::unique_ptr lock(build_index_mutex_); + std::unique_lock lock(build_index_mutex_); meta::TableFilesSchema to_index_files; meta_ptr_->FilesToIndex(to_index_files); @@ -516,7 +516,7 @@ Status DBImpl::BuildIndexByTable(const std::string& table_id) { } void DBImpl::BackgroundBuildIndex() { - std::unique_ptr lock(build_index_mutex_); + std::unique_lock lock(build_index_mutex_); meta::TableFilesSchema to_index_files; meta_ptr_->FilesToIndex(to_index_files); Status status; diff --git a/cpp/src/db/DBImpl.h b/cpp/src/db/DBImpl.h index 356c7afa64..e5042354ea 100644 --- a/cpp/src/db/DBImpl.h +++ b/cpp/src/db/DBImpl.h @@ -113,7 +113,7 @@ class DBImpl : public DB { void BackgroundBuildIndex(); Status - BuildIndexByTable(const std::string& table_id) { + BuildIndexByTable(const std::string& table_id); Status BuildIndex(const meta::TableFileSchema &); diff --git a/cpp/src/db/MySQLMetaImpl.cpp b/cpp/src/db/MySQLMetaImpl.cpp index 8ba7f1d3b6..4d4b858dea 100644 --- a/cpp/src/db/MySQLMetaImpl.cpp +++ b/cpp/src/db/MySQLMetaImpl.cpp @@ -1479,6 +1479,11 @@ namespace meta { return Status::OK(); } + Status MySQLMetaImpl::UpdateTableFilesToIndex(const std::string& table_id) { + // TODO + return Status::OK(); + } + Status MySQLMetaImpl::UpdateTableFiles(TableFilesSchema &files) { // std::lock_guard lock(mysql_mutex); diff --git a/cpp/src/db/MySQLMetaImpl.h b/cpp/src/db/MySQLMetaImpl.h index 9ff8254b60..f8591c25b9 100644 --- a/cpp/src/db/MySQLMetaImpl.h +++ b/cpp/src/db/MySQLMetaImpl.h @@ -42,6 +42,8 @@ namespace meta { virtual Status UpdateTableFile(TableFileSchema& file_schema) override; + virtual Status UpdateTableFilesToIndex(const std::string& table_id) override; + virtual Status UpdateTableFiles(TableFilesSchema& files) override; virtual Status FilesToSearch(const std::string& table_id,