Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
milvus
milvus
提交
1bd7938d
M
milvus
项目概览
milvus
/
milvus
11 个月 前同步成功
通知
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,发现更多精彩内容 >>
提交
1bd7938d
编写于
11月 04, 2020
作者:
N
neza2017
提交者:
yefu.chen
11月 04, 2020
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Modify logic of time tick
Signed-off-by:
N
neza2017
<
yefu.chen@zilliz.com
>
上级
9a9bc4ec
变更
4
隐藏空白更改
内联
并排
Showing
4 changed file
with
22 addition
and
22 deletion
+22
-22
Makefile
Makefile
+3
-3
internal/msgstream/marshaler.go
internal/msgstream/marshaler.go
+7
-7
internal/msgstream/msgstream_test.go
internal/msgstream/msgstream_test.go
+6
-6
internal/msgstream/task.go
internal/msgstream/task.go
+6
-6
未找到文件。
Makefile
浏览文件 @
1bd7938d
...
@@ -36,9 +36,9 @@ fmt:
...
@@ -36,9 +36,9 @@ fmt:
lint
:
lint
:
@
echo
"Running
$@
check"
@
echo
"Running
$@
check"
@
GO111MODULE
=
on
${GOPATH}
/bin/golangci-lint cache clean
@
GO111MODULE
=
on
${GOPATH}
/bin/golangci-lint cache clean
@
GO111MODULE
=
on
${GOPATH}
/bin/golangci-lint run
--timeout
=
1m
--config
./.golangci.yml ./internal/
||
true
@
GO111MODULE
=
on
${GOPATH}
/bin/golangci-lint run
--timeout
=
1m
--config
./.golangci.yml ./internal/
...
||
true
@
GO111MODULE
=
on
${GOPATH}
/bin/golangci-lint run
--timeout
=
1m
--config
./.golangci.yml ./cmd/
||
true
@
GO111MODULE
=
on
${GOPATH}
/bin/golangci-lint run
--timeout
=
1m
--config
./.golangci.yml ./cmd/
...
||
true
@
GO111MODULE
=
on
${GOPATH}
/bin/golangci-lint run
--timeout
=
1m
--config
./.golangci.yml ./test/
||
true
@
GO111MODULE
=
on
${GOPATH}
/bin/golangci-lint run
--timeout
=
1m
--config
./.golangci.yml ./test/
...
||
true
ruleguard
:
ruleguard
:
@
echo
"Running
$@
check"
@
echo
"Running
$@
check"
...
...
internal/msgstream/marshaler.go
浏览文件 @
1bd7938d
...
@@ -33,8 +33,8 @@ func GetMarshaler(MsgType MsgType) *TsMsgMarshaler {
...
@@ -33,8 +33,8 @@ func GetMarshaler(MsgType MsgType) *TsMsgMarshaler {
searchResultMarshler
:=
&
SearchResultMarshaler
{}
searchResultMarshler
:=
&
SearchResultMarshaler
{}
var
tsMsgMarshaller
TsMsgMarshaler
=
searchResultMarshler
var
tsMsgMarshaller
TsMsgMarshaler
=
searchResultMarshler
return
&
tsMsgMarshaller
return
&
tsMsgMarshaller
case
KTime
Sync
:
case
KTime
Tick
:
timeSyncMarshaler
:=
&
Time
Sync
Marshaler
{}
timeSyncMarshaler
:=
&
Time
Tick
Marshaler
{}
var
tsMsgMarshaller
TsMsgMarshaler
=
timeSyncMarshaler
var
tsMsgMarshaller
TsMsgMarshaler
=
timeSyncMarshaler
return
&
tsMsgMarshaller
return
&
tsMsgMarshaller
default
:
default
:
...
@@ -145,10 +145,10 @@ func (srm *SearchResultMarshaler) Unmarshal(input []byte) (*TsMsg, commonPb.Stat
...
@@ -145,10 +145,10 @@ func (srm *SearchResultMarshaler) Unmarshal(input []byte) (*TsMsg, commonPb.Stat
/////////////////////////////////////TimeSync///////////////////////////////////////////////
/////////////////////////////////////TimeSync///////////////////////////////////////////////
type
Time
Sync
Marshaler
struct
{}
type
Time
Tick
Marshaler
struct
{}
func
(
tm
*
Time
Sync
Marshaler
)
Marshal
(
input
*
TsMsg
)
([]
byte
,
commonPb
.
Status
)
{
func
(
tm
*
Time
Tick
Marshaler
)
Marshal
(
input
*
TsMsg
)
([]
byte
,
commonPb
.
Status
)
{
timeSyncTask
:=
(
*
input
)
.
(
Time
SyncTask
)
timeSyncTask
:=
(
*
input
)
.
(
Time
TickMsg
)
timeSyncMsg
:=
&
timeSyncTask
.
TimeTickMsg
timeSyncMsg
:=
&
timeSyncTask
.
TimeTickMsg
mb
,
err
:=
proto
.
Marshal
(
timeSyncMsg
)
mb
,
err
:=
proto
.
Marshal
(
timeSyncMsg
)
if
err
!=
nil
{
if
err
!=
nil
{
...
@@ -157,10 +157,10 @@ func (tm *TimeSyncMarshaler) Marshal(input *TsMsg) ([]byte, commonPb.Status) {
...
@@ -157,10 +157,10 @@ func (tm *TimeSyncMarshaler) Marshal(input *TsMsg) ([]byte, commonPb.Status) {
return
mb
,
commonPb
.
Status
{
ErrorCode
:
commonPb
.
ErrorCode_SUCCESS
}
return
mb
,
commonPb
.
Status
{
ErrorCode
:
commonPb
.
ErrorCode_SUCCESS
}
}
}
func
(
tm
*
Time
Sync
Marshaler
)
Unmarshal
(
input
[]
byte
)
(
*
TsMsg
,
commonPb
.
Status
)
{
func
(
tm
*
Time
Tick
Marshaler
)
Unmarshal
(
input
[]
byte
)
(
*
TsMsg
,
commonPb
.
Status
)
{
timeSyncMsg
:=
internalPb
.
TimeTickMsg
{}
timeSyncMsg
:=
internalPb
.
TimeTickMsg
{}
err
:=
proto
.
Unmarshal
(
input
,
&
timeSyncMsg
)
err
:=
proto
.
Unmarshal
(
input
,
&
timeSyncMsg
)
timeSyncTask
:=
Time
SyncTask
{
TimeTickMsg
:
timeSyncMsg
}
timeSyncTask
:=
Time
TickMsg
{
TimeTickMsg
:
timeSyncMsg
}
if
err
!=
nil
{
if
err
!=
nil
{
return
nil
,
commonPb
.
Status
{
ErrorCode
:
commonPb
.
ErrorCode_UNEXPECTED_ERROR
}
return
nil
,
commonPb
.
Status
{
ErrorCode
:
commonPb
.
ErrorCode_UNEXPECTED_ERROR
}
}
}
...
...
internal/msgstream/msgstream_test.go
浏览文件 @
1bd7938d
...
@@ -85,17 +85,17 @@ func getTsMsg(msgType MsgType, reqId int64, hashValue int32) *TsMsg {
...
@@ -85,17 +85,17 @@ func getTsMsg(msgType MsgType, reqId int64, hashValue int32) *TsMsg {
SearchResult
:
searchResult
,
SearchResult
:
searchResult
,
}
}
tsMsg
=
searchResultMsg
tsMsg
=
searchResultMsg
case
k
TimeSync
:
case
K
TimeSync
:
timeSyncResult
:=
internalPb
.
TimeTickMsg
{
timeSyncResult
:=
internalPb
.
TimeTickMsg
{
PeerId
:
reqId
,
PeerId
:
reqId
,
Timestamp
:
1
,
Timestamp
:
1
,
}
}
timeSyncMsg
:=
Time
SyncTask
{
timeSyncMsg
:=
Time
TickMsg
{
HashValues
:
[]
int32
{
hashValue
},
HashValues
:
[]
int32
{
hashValue
},
TimeTickMsg
:
timeSyncResult
,
TimeTickMsg
:
timeSyncResult
,
}
}
tsMsg
=
timeSyncMsg
tsMsg
=
timeSyncMsg
case
k
TimeTick
:
case
K
TimeTick
:
insertRequest
:=
internalPb
.
InsertRequest
{
insertRequest
:=
internalPb
.
InsertRequest
{
ReqType
:
internalPb
.
ReqType_kTimeTick
,
ReqType
:
internalPb
.
ReqType_kTimeTick
,
ReqId
:
reqId
,
ReqId
:
reqId
,
...
@@ -236,9 +236,9 @@ func TestStream_BroadCast(t *testing.T) {
...
@@ -236,9 +236,9 @@ func TestStream_BroadCast(t *testing.T) {
consumerSubName
:=
"subInsert"
consumerSubName
:=
"subInsert"
msgPack
:=
MsgPack
{}
msgPack
:=
MsgPack
{}
msgPack
.
Msgs
=
append
(
msgPack
.
Msgs
,
getTsMsg
(
k
TimeTick
,
0
,
0
))
msgPack
.
Msgs
=
append
(
msgPack
.
Msgs
,
getTsMsg
(
K
TimeTick
,
0
,
0
))
msgPack
.
Msgs
=
append
(
msgPack
.
Msgs
,
getTsMsg
(
k
TimeTick
,
3
,
3
))
msgPack
.
Msgs
=
append
(
msgPack
.
Msgs
,
getTsMsg
(
K
TimeTick
,
3
,
3
))
//run stream
//run stream
initStream
(
pulsarAddress
,
producerChannels
,
consumerChannels
,
consumerSubName
,
&
msgPack
,
kInsert
,
k
Insert
)
initStream
(
pulsarAddress
,
producerChannels
,
consumerChannels
,
consumerSubName
,
&
msgPack
,
KInsert
,
K
Insert
)
}
}
internal/msgstream/task.go
浏览文件 @
1bd7938d
...
@@ -184,28 +184,28 @@ func (srt SearchResultTask) HashKeys() []int32 {
...
@@ -184,28 +184,28 @@ func (srt SearchResultTask) HashKeys() []int32 {
}
}
/////////////////////////////////////////TimeSync//////////////////////////////////////////
/////////////////////////////////////////TimeSync//////////////////////////////////////////
type
Time
SyncTask
struct
{
type
Time
TickMsg
struct
{
HashValues
[]
int32
HashValues
[]
int32
internalPb
.
TimeTickMsg
internalPb
.
TimeTickMsg
}
}
func
(
tst
Time
SyncTask
)
SetTs
(
ts
Timestamp
)
{
func
(
tst
Time
TickMsg
)
SetTs
(
ts
Timestamp
)
{
tst
.
Timestamp
=
uint64
(
ts
)
tst
.
Timestamp
=
uint64
(
ts
)
}
}
func
(
tst
Time
SyncTask
)
BeginTs
()
Timestamp
{
func
(
tst
Time
TickMsg
)
BeginTs
()
Timestamp
{
return
Timestamp
(
tst
.
Timestamp
)
return
Timestamp
(
tst
.
Timestamp
)
}
}
func
(
tst
Time
SyncTask
)
EndTs
()
Timestamp
{
func
(
tst
Time
TickMsg
)
EndTs
()
Timestamp
{
return
Timestamp
(
tst
.
Timestamp
)
return
Timestamp
(
tst
.
Timestamp
)
}
}
func
(
tst
Time
SyncTask
)
Type
()
MsgType
{
func
(
tst
Time
TickMsg
)
Type
()
MsgType
{
return
KTimeSync
return
KTimeSync
}
}
func
(
tst
Time
SyncTask
)
HashKeys
()
[]
int32
{
func
(
tst
Time
TickMsg
)
HashKeys
()
[]
int32
{
return
tst
.
HashValues
return
tst
.
HashValues
}
}
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录