test/milvus
1
0
Fork 0
mirror of https://gitee.com/milvus-io/milvus.git synced 2024-12-03 04:19:18 +08:00
Code Issues Actions 13 Packages Projects Releases Wiki Activity

Merge utils/Utils.h into common/Utils.h (#16762)

Browse Source 
Signed-off-by: yudong.cai <yudong.cai@zilliz.com>
This commit is contained in:
Cai Yudong 2022-05-03 12:05:50 +08:00 committed by GitHub
parent 6a62ff18bf
commit 21a1311f66
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
6 changed files with 20 additions and 42 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
internal/core/src/common/Utils.h
View File

@ -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

8
internal/core/src/segcore/ConcurrentVector.h
View File

@ -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 {

1
internal/core/src/segcore/SegmentGrowingImpl.cpp
View File

@ -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 {

33
internal/core/src/utils/Utils.h
View File

@ -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

3
internal/core/unittest/test_expr.cpp
View File

@ -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;

1
internal/core/unittest/test_span.cpp
View File

@ -13,7 +13,6 @@
#include "segcore/SegmentGrowing.h"
#include "test_utils/DataGen.h"
#include "utils/Utils.h"
const int64_t ROW_COUNT = 100 * 1000;