From fcc679e61c805a80c165c5e6403e45c4b78c74c4 Mon Sep 17 00:00:00 2001
From: groot <yhmo@zeronedata.com>
Date: Tue, 1 Sep 2020 18:19:12 +0800
Subject: [PATCH] fix layer merge bug (#3542)

Signed-off-by: groot <yihua.mo@zilliz.com>
---
 core/src/db/merge/MergeLayerStrategy.cpp | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/core/src/db/merge/MergeLayerStrategy.cpp b/core/src/db/merge/MergeLayerStrategy.cpp
index f107280e..8c88a785 100644
--- a/core/src/db/merge/MergeLayerStrategy.cpp
+++ b/core/src/db/merge/MergeLayerStrategy.cpp
@@ -20,7 +20,7 @@ namespace milvus {
 namespace engine {
 
 namespace {
-const int64_t FORCE_MERGE_THREASHOLD = 30;  // force merge files older this time(in second)
+const int64_t FORCE_MERGE_THREASHOLD = 30 * 1000 * 1000;  // force merge files older this time(in microsecond)
 
 using LayerGroups = std::map<int64_t, SegmentInfoList>;
 
@@ -80,7 +80,7 @@ MergeLayerStrategy::RegroupSegments(const Partition2SegmentsMap& part2segment, i
             }
 
             if (segments.size() == 1) {
-                if (now - segments[0].create_on_ > static_cast<int64_t>(FORCE_MERGE_THREASHOLD * 1000)) {
+                if (now - segments[0].create_on_ > FORCE_MERGE_THREASHOLD) {
                     force_list.swap(segments);
                 }
             }
-- 
GitLab