Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
milvus
milvus
提交
89f38e45
M
milvus
项目概览
milvus
/
milvus
大约 1 年 前同步成功
通知
261
Star
22476
Fork
2472
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
0
列表
看板
标记
里程碑
合并请求
0
DevOps
流水线
流水线任务
计划
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
M
milvus
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
0
Issue
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
Pages
DevOps
DevOps
流水线
流水线任务
计划
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
流水线任务
提交
Issue看板
体验新版 GitCode,发现更多精彩内容 >>
提交
89f38e45
编写于
1月 04, 2021
作者:
F
FluorineDog
提交者:
yefu.chen
1月 04, 2021
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Fix bool type
Signed-off-by:
N
FluorineDog
<
guilin.gou@zilliz.com
>
上级
6bd57024
变更
8
隐藏空白更改
内联
并排
Showing
8 changed file
with
15 addition
and
102 deletion
+15
-102
internal/core/src/query/ExprImpl.h
internal/core/src/query/ExprImpl.h
+2
-1
internal/core/src/query/visitors/ShowExprVisitor.cpp
internal/core/src/query/visitors/ShowExprVisitor.cpp
+2
-0
internal/core/src/segcore/ConcurrentVector.h
internal/core/src/segcore/ConcurrentVector.h
+0
-27
internal/core/src/segcore/IndexingEntry.cpp
internal/core/src/segcore/IndexingEntry.cpp
+2
-0
internal/core/src/segcore/InsertRecord.cpp
internal/core/src/segcore/InsertRecord.cpp
+4
-0
internal/master/param_table.go
internal/master/param_table.go
+0
-10
internal/master/param_table_test.go
internal/master/param_table_test.go
+0
-5
internal/util/paramtable/paramtable.go
internal/util/paramtable/paramtable.go
+5
-59
未找到文件。
internal/core/src/query/ExprImpl.h
浏览文件 @
89f38e45
...
...
@@ -13,11 +13,12 @@
#include "Expr.h"
#include <tuple>
#include <vector>
#include <boost/container/vector.hpp>
namespace
milvus
::
query
{
template
<
typename
T
>
struct
TermExprImpl
:
TermExpr
{
std
::
vector
<
T
>
terms_
;
boost
::
container
::
vector
<
T
>
terms_
;
};
template
<
typename
T
>
...
...
internal/core/src/query/visitors/ShowExprVisitor.cpp
浏览文件 @
89f38e45
...
...
@@ -115,6 +115,8 @@ ShowExprVisitor::visit(TermExpr& expr) {
Assert
(
field_is_vector
(
expr
.
data_type_
)
==
false
);
auto
terms
=
[
&
]
{
switch
(
expr
.
data_type_
)
{
case
DataType
::
BOOL
:
return
TermExtract
<
bool
>
(
expr
);
case
DataType
::
INT8
:
return
TermExtract
<
int8_t
>
(
expr
);
case
DataType
::
INT16
:
...
...
internal/core/src/segcore/ConcurrentVector.h
浏览文件 @
89f38e45
...
...
@@ -25,33 +25,6 @@
namespace
milvus
::
segcore
{
// we don't use std::array because capacity of concurrent_vector wastes too much memory
// template <typename Type>
// class FixedVector : public std::vector<Type> {
// public:
// // This is a stupid workaround for tbb API to avoid memory copy
// explicit FixedVector(int64_t size) : placeholder_size_(size) {
// }
// FixedVector(const FixedVector<Type>& placeholder_vec)
// : std::vector<Type>(placeholder_vec.placeholder_size_), is_placeholder_(false) {
// // Assert(placeholder_vec.is_placeholder_);
// }
// FixedVector(FixedVector<Type>&&) = delete;
//
// FixedVector&
// operator=(FixedVector<Type>&&) = delete;
//
// FixedVector&
// operator=(const FixedVector<Type>&) = delete;
//
// bool is_placeholder() {
// return is_placeholder_;
// }
// private:
// bool is_placeholder_ = true;
// int placeholder_size_ = 0;
//};
template
<
typename
Type
>
using
FixedVector
=
boost
::
container
::
vector
<
Type
>
;
...
...
internal/core/src/segcore/IndexingEntry.cpp
浏览文件 @
89f38e45
...
...
@@ -111,6 +111,8 @@ CreateIndex(const FieldMeta& field_meta, int64_t chunk_size) {
}
}
switch
(
field_meta
.
get_data_type
())
{
case
DataType
::
BOOL
:
return
std
::
make_unique
<
ScalarIndexingEntry
<
bool
>>
(
field_meta
,
chunk_size
);
case
DataType
::
INT8
:
return
std
::
make_unique
<
ScalarIndexingEntry
<
int8_t
>>
(
field_meta
,
chunk_size
);
case
DataType
::
INT16
:
...
...
internal/core/src/segcore/InsertRecord.cpp
浏览文件 @
89f38e45
...
...
@@ -27,6 +27,10 @@ InsertRecord::InsertRecord(const Schema& schema, int64_t chunk_size) : uids_(1),
}
}
switch
(
field
.
get_data_type
())
{
case
DataType
::
BOOL
:
{
entity_vec_
.
emplace_back
(
std
::
make_shared
<
ConcurrentVector
<
bool
>>
(
chunk_size
));
break
;
}
case
DataType
::
INT8
:
{
entity_vec_
.
emplace_back
(
std
::
make_shared
<
ConcurrentVector
<
int8_t
>>
(
chunk_size
));
break
;
...
...
internal/master/param_table.go
浏览文件 @
89f38e45
...
...
@@ -21,7 +21,6 @@ type ParamTable struct {
KvRootPath
string
WriteNodeSegKvSubPath
string
PulsarAddress
string
IndexBuilderAddress
string
// nodeID
ProxyIDList
[]
typeutil
.
UniqueID
...
...
@@ -72,7 +71,6 @@ func (p *ParamTable) Init() {
p
.
initKvRootPath
()
p
.
initWriteNodeSegKvSubPath
()
p
.
initPulsarAddress
()
p
.
initIndexBuilderAddress
()
p
.
initProxyIDList
()
p
.
initWriteNodeIDList
()
...
...
@@ -127,14 +125,6 @@ func (p *ParamTable) initPulsarAddress() {
p
.
PulsarAddress
=
addr
}
func
(
p
*
ParamTable
)
initIndexBuilderAddress
()
{
ret
,
err
:=
p
.
Load
(
"_IndexBuilderAddress"
)
if
err
!=
nil
{
panic
(
err
)
}
p
.
IndexBuilderAddress
=
ret
}
func
(
p
*
ParamTable
)
initMetaRootPath
()
{
rootPath
,
err
:=
p
.
Load
(
"etcd.rootPath"
)
if
err
!=
nil
{
...
...
internal/master/param_table_test.go
浏览文件 @
89f38e45
...
...
@@ -31,11 +31,6 @@ func TestParamTable_KVRootPath(t *testing.T) {
assert
.
Equal
(
t
,
path
,
"by-dev/kv"
)
}
func
TestParamTable_IndexBuilderAddress
(
t
*
testing
.
T
)
{
path
:=
Params
.
IndexBuilderAddress
assert
.
Equal
(
t
,
path
,
"localhost:31000"
)
}
func
TestParamTable_TopicNum
(
t
*
testing
.
T
)
{
num
:=
Params
.
TopicNum
fmt
.
Println
(
"TopicNum:"
,
num
)
...
...
internal/util/paramtable/paramtable.go
浏览文件 @
89f38e45
...
...
@@ -57,40 +57,19 @@ func (gp *BaseTable) Init() {
if
err
!=
nil
{
panic
(
err
)
}
gp
.
tryloadFromEnv
()
}
func
(
gp
*
BaseTable
)
tryloadFromEnv
()
{
minioAddress
:=
os
.
Getenv
(
"MINIO_ADDRESS"
)
if
minioAddress
==
""
{
minioHost
,
err
:=
gp
.
Load
(
"minio.address"
)
if
err
!=
nil
{
panic
(
err
)
}
port
,
err
:=
gp
.
Load
(
"minio.port"
)
if
err
!=
nil
{
panic
(
err
)
}
minioAddress
=
minioHost
+
":"
+
port
minioAddress
=
"localhost:9000"
}
err
:
=
gp
.
Save
(
"_MinioAddress"
,
minioAddress
)
err
=
gp
.
Save
(
"_MinioAddress"
,
minioAddress
)
if
err
!=
nil
{
panic
(
err
)
}
etcdAddress
:=
os
.
Getenv
(
"ETCD_ADDRESS"
)
if
etcdAddress
==
""
{
etcdHost
,
err
:=
gp
.
Load
(
"etcd.address"
)
if
err
!=
nil
{
panic
(
err
)
}
port
,
err
:=
gp
.
Load
(
"etcd.port"
)
if
err
!=
nil
{
panic
(
err
)
}
etcdAddress
=
etcdHost
+
":"
+
port
etcdAddress
=
"localhost:2379"
}
err
=
gp
.
Save
(
"_EtcdAddress"
,
etcdAddress
)
if
err
!=
nil
{
...
...
@@ -99,15 +78,7 @@ func (gp *BaseTable) tryloadFromEnv() {
pulsarAddress
:=
os
.
Getenv
(
"PULSAR_ADDRESS"
)
if
pulsarAddress
==
""
{
pulsarHost
,
err
:=
gp
.
Load
(
"pulsar.address"
)
if
err
!=
nil
{
panic
(
err
)
}
port
,
err
:=
gp
.
Load
(
"pulsar.port"
)
if
err
!=
nil
{
panic
(
err
)
}
pulsarAddress
=
"pulsar://"
+
pulsarHost
+
":"
+
port
pulsarAddress
=
"pulsar://localhost:6650"
}
err
=
gp
.
Save
(
"_PulsarAddress"
,
pulsarAddress
)
if
err
!=
nil
{
...
...
@@ -116,37 +87,12 @@ func (gp *BaseTable) tryloadFromEnv() {
masterAddress
:=
os
.
Getenv
(
"MASTER_ADDRESS"
)
if
masterAddress
==
""
{
masterHost
,
err
:=
gp
.
Load
(
"master.address"
)
if
err
!=
nil
{
panic
(
err
)
}
port
,
err
:=
gp
.
Load
(
"master.port"
)
if
err
!=
nil
{
panic
(
err
)
}
masterAddress
=
masterHost
+
":"
+
port
masterAddress
=
"localhost:53100"
}
err
=
gp
.
Save
(
"_MasterAddress"
,
masterAddress
)
if
err
!=
nil
{
panic
(
err
)
}
indexBuilderAddress
:=
os
.
Getenv
(
"INDEX_BUILDER_ADDRESS"
)
if
indexBuilderAddress
==
""
{
indexBuilderHost
,
err
:=
gp
.
Load
(
"indexBuilder.address"
)
if
err
!=
nil
{
panic
(
err
)
}
port
,
err
:=
gp
.
Load
(
"indexBuilder.port"
)
if
err
!=
nil
{
panic
(
err
)
}
indexBuilderAddress
=
indexBuilderHost
+
":"
+
port
}
err
=
gp
.
Save
(
"_IndexBuilderAddress"
,
indexBuilderAddress
)
if
err
!=
nil
{
panic
(
err
)
}
}
func
(
gp
*
BaseTable
)
Load
(
key
string
)
(
string
,
error
)
{
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录