From 21a1311f664e83da2e8b18bc088786cb5131f6c0 Mon Sep 17 00:00:00 2001
From: Cai Yudong <yudong.cai@zilliz.com>
Date: Tue, 3 May 2022 12:05:50 +0800
Subject: [PATCH] Merge utils/Utils.h into common/Utils.h (#16762)

Signed-off-by: yudong.cai <yudong.cai@zilliz.com>
---
 internal/core/src/common/Utils.h              | 16 +++++++++
 internal/core/src/segcore/ConcurrentVector.h  |  8 ++---
 .../core/src/segcore/SegmentGrowingImpl.cpp   |  1 -
 internal/core/src/utils/Utils.h               | 33 -------------------
 internal/core/unittest/test_expr.cpp          |  3 --
 internal/core/unittest/test_span.cpp          |  1 -
 6 files changed, 20 insertions(+), 42 deletions(-)
 delete mode 100644 internal/core/src/utils/Utils.h

diff --git a/internal/core/src/common/Utils.h b/internal/core/src/common/Utils.h
index 316ec7fa66..bb7b548c4b 100644
--- a/internal/core/src/common/Utils.h
+++ b/internal/core/src/common/Utils.h
@@ -12,6 +12,7 @@
 #pragma once
 
 #include <string>
+#include "exceptions/EasyAssert.h"
 
 namespace milvus {
 inline bool
@@ -45,4 +46,19 @@ PostfixMatch(const std::string& str, const std::string& postfix) {
     //    }
     return true;
 }
+
+inline int64_t
+upper_align(int64_t value, int64_t align) {
+    Assert(align > 0);
+    auto groups = (value + align - 1) / align;
+    return groups * align;
+}
+
+inline int64_t
+upper_div(int64_t value, int64_t align) {
+    Assert(align > 0);
+    auto groups = (value + align - 1) / align;
+    return groups;
+}
+
 }  // namespace milvus
diff --git a/internal/core/src/segcore/ConcurrentVector.h b/internal/core/src/segcore/ConcurrentVector.h
index 20b8d530c6..b824aa21df 100644
--- a/internal/core/src/segcore/ConcurrentVector.h
+++ b/internal/core/src/segcore/ConcurrentVector.h
@@ -23,11 +23,11 @@
 
 #include <tbb/concurrent_vector.h>
 
-#include "common/Types.h"
-#include "common/Span.h"
-#include "exceptions/EasyAssert.h"
-#include "utils/Utils.h"
 #include "common/FieldMeta.h"
+#include "common/Span.h"
+#include "common/Types.h"
+#include "common/Utils.h"
+#include "exceptions/EasyAssert.h"
 
 namespace milvus::segcore {
 
diff --git a/internal/core/src/segcore/SegmentGrowingImpl.cpp b/internal/core/src/segcore/SegmentGrowingImpl.cpp
index 59ba66cda7..a2d2f16e50 100644
--- a/internal/core/src/segcore/SegmentGrowingImpl.cpp
+++ b/internal/core/src/segcore/SegmentGrowingImpl.cpp
@@ -22,7 +22,6 @@
 #include "query/generated/ExecPlanNodeVisitor.h"
 #include "segcore/Reduce.h"
 #include "segcore/SegmentGrowingImpl.h"
-#include "utils/Utils.h"
 #include "segcore/Utils.h"
 
 namespace milvus::segcore {
diff --git a/internal/core/src/utils/Utils.h b/internal/core/src/utils/Utils.h
deleted file mode 100644
index 63f50c6b1c..0000000000
--- a/internal/core/src/utils/Utils.h
+++ /dev/null
@@ -1,33 +0,0 @@
-// Copyright (C) 2019-2020 Zilliz. All rights reserved.
-//
-// Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance
-// with the License. You may obtain a copy of the License at
-//
-// http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software distributed under the License
-// is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express
-// or implied. See the License for the specific language governing permissions and limitations under the License
-
-#pragma once
-
-#include <cstdint>
-#include "exceptions/EasyAssert.h"
-
-namespace milvus {
-
-inline int64_t
-upper_align(int64_t value, int64_t align) {
-    Assert(align > 0);
-    auto groups = (value + align - 1) / align;
-    return groups * align;
-}
-
-inline int64_t
-upper_div(int64_t value, int64_t align) {
-    Assert(align > 0);
-    auto groups = (value + align - 1) / align;
-    return groups;
-}
-
-}  // namespace milvus
diff --git a/internal/core/unittest/test_expr.cpp b/internal/core/unittest/test_expr.cpp
index 379cbf93bb..8882f98093 100644
--- a/internal/core/unittest/test_expr.cpp
+++ b/internal/core/unittest/test_expr.cpp
@@ -16,13 +16,10 @@
 #include "query/Expr.h"
 #include "query/Plan.h"
 #include "query/PlanNode.h"
-#include "query/generated/ExprVisitor.h"
-#include "query/generated/PlanNodeVisitor.h"
 #include "query/generated/ShowPlanNodeVisitor.h"
 #include "query/generated/ExecExprVisitor.h"
 #include "segcore/SegmentGrowingImpl.h"
 #include "test_utils/DataGen.h"
-#include "utils/Utils.h"
 
 using namespace milvus;
 
diff --git a/internal/core/unittest/test_span.cpp b/internal/core/unittest/test_span.cpp
index 1cf1ec7f0a..94a35ffee5 100644
--- a/internal/core/unittest/test_span.cpp
+++ b/internal/core/unittest/test_span.cpp
@@ -13,7 +13,6 @@
 
 #include "segcore/SegmentGrowing.h"
 #include "test_utils/DataGen.h"
-#include "utils/Utils.h"
 
 const int64_t ROW_COUNT = 100 * 1000;