From bd4977b64f5dbcfc647c6e7c6fbab6cf87118c8a Mon Sep 17 00:00:00 2001
From: zhiru <zhiru.zhu@zilliz.com>
Date: Thu, 27 Jun 2019 14:52:21 +0800
Subject: [PATCH] update

Former-commit-id: 23e7315c4445705a07cac462f4fa6ffae337d133
---
 cpp/src/db/DBImpl.cpp         | 8 +++++++-
 cpp/src/db/Factories.cpp      | 2 ++
 cpp/src/db/Options.h          | 1 +
 cpp/src/server/DBWrapper.cpp  | 1 +
 cpp/src/server/ServerConfig.h | 1 +
 5 files changed, 12 insertions(+), 1 deletion(-)

diff --git a/cpp/src/db/DBImpl.cpp b/cpp/src/db/DBImpl.cpp
index 17280b37..e39942d3 100644
--- a/cpp/src/db/DBImpl.cpp
+++ b/cpp/src/db/DBImpl.cpp
@@ -13,6 +13,7 @@
 #include "scheduler/context/SearchContext.h"
 #include "scheduler/context/DeleteContext.h"
 #include "utils/TimeRecorder.h"
+#include "MetaConsts.h"
 
 #include <assert.h>
 #include <chrono>
@@ -595,7 +596,12 @@ void DBImpl::BackgroundCompaction(std::set<std::string> table_ids) {
     }
 
     meta_ptr_->Archive();
-    meta_ptr_->CleanUpFilesWithTTL(1);
+
+    int ttl = 1;
+    if (options_.mode == "cluster") {
+        ttl = meta::D_SEC;
+    }
+    meta_ptr_->CleanUpFilesWithTTL(ttl);
 }
 
 void DBImpl::StartBuildIndexTask() {
diff --git a/cpp/src/db/Factories.cpp b/cpp/src/db/Factories.cpp
index fd005d1f..a6998d10 100644
--- a/cpp/src/db/Factories.cpp
+++ b/cpp/src/db/Factories.cpp
@@ -81,9 +81,11 @@ std::shared_ptr<meta::Meta> DBMetaImplFactory::Build(const DBMetaOptions& metaOp
         std::string dialect = pieces_match[1].str();
         std::transform(dialect.begin(), dialect.end(), dialect.begin(), ::tolower);
         if (dialect.find("mysql") != std::string::npos) {
+            ENGINE_LOG_DEBUG << "Using MySQL";
             return std::make_shared<meta::MySQLMetaImpl>(meta::MySQLMetaImpl(metaOptions));
         }
         else if (dialect.find("sqlite") != std::string::npos) {
+            ENGINE_LOG_DEBUG << "Using SQLite";
             return std::make_shared<meta::DBMetaImpl>(meta::DBMetaImpl(metaOptions));
         }
         else {
diff --git a/cpp/src/db/Options.h b/cpp/src/db/Options.h
index ddb7d1bf..039134eb 100644
--- a/cpp/src/db/Options.h
+++ b/cpp/src/db/Options.h
@@ -47,6 +47,7 @@ struct Options {
     uint16_t  merge_trigger_number = 2;
     size_t  index_trigger_size = ONE_GB;            //unit: byte
     DBMetaOptions meta;
+    std::string mode;
 }; // Options
 
 
diff --git a/cpp/src/server/DBWrapper.cpp b/cpp/src/server/DBWrapper.cpp
index 0721de13..c38c5d88 100644
--- a/cpp/src/server/DBWrapper.cpp
+++ b/cpp/src/server/DBWrapper.cpp
@@ -23,6 +23,7 @@ DBWrapper::DBWrapper() {
     if(index_size > 0) {//ensure larger than zero, unit is MB
         opt.index_trigger_size = (size_t)index_size * engine::ONE_MB;
     }
+    opt.mode = config.GetValue(CONFIG_CLUSTER_MODE, "single");
 
     CommonUtil::CreateDirectory(opt.meta.path);
 
diff --git a/cpp/src/server/ServerConfig.h b/cpp/src/server/ServerConfig.h
index dd7c9d29..aa77b081 100644
--- a/cpp/src/server/ServerConfig.h
+++ b/cpp/src/server/ServerConfig.h
@@ -19,6 +19,7 @@ static const std::string CONFIG_SERVER_ADDRESS = "address";
 static const std::string CONFIG_SERVER_PORT = "port";
 static const std::string CONFIG_SERVER_PROTOCOL = "transfer_protocol";
 static const std::string CONFIG_SERVER_MODE = "server_mode";
+static const std::string CONFIG_CLUSTER_MODE = "mode";
 
 static const std::string CONFIG_DB = "db_config";
 static const std::string CONFIG_DB_URL = "db_backend_url";
-- 
GitLab