From 202ded96b9e75c3567cec83aacc29c99c25d5aa6 Mon Sep 17 00:00:00 2001 From: neza2017 Date: Mon, 9 Nov 2020 14:09:10 +0800 Subject: [PATCH] Update time tick Signed-off-by: neza2017 --- docs/developer_guides/developer_guides.md | 9 +++++++-- internal/master/timesync/timesync.go | 5 ----- internal/master/timesync/timetick.go | 11 +++++++++++ 3 files changed, 18 insertions(+), 7 deletions(-) create mode 100644 internal/master/timesync/timetick.go diff --git a/docs/developer_guides/developer_guides.md b/docs/developer_guides/developer_guides.md index f79aa11129..b28d507181 100644 --- a/docs/developer_guides/developer_guides.md +++ b/docs/developer_guides/developer_guides.md @@ -1207,9 +1207,14 @@ func newHardTimeTickBarrier(ctx context.Context, ttStream *MsgStream, peerIds [] ```go +type TimeTickBarrier interface { + GetTimeTick() (Timestamp,error) + Start() error +} + type timeSyncMsgProducer struct { - proxyTtBarrier *softTimeTickBarrier - WriteNodeTtBarrier *hardTimeTickBarrier + proxyTtBarrier TimeTickBarrier // softTimeTickBarrier + WriteNodeTtBarrier TimeTickBarrier //hardTimeTickBarrier dmSyncStream *MsgStream // insert & delete k2sSyncStream *MsgStream diff --git a/internal/master/timesync/timesync.go b/internal/master/timesync/timesync.go index baadb1bd4b..ce11cd1955 100644 --- a/internal/master/timesync/timesync.go +++ b/internal/master/timesync/timesync.go @@ -8,8 +8,6 @@ import ( "sync" "time" - "github.com/zilliztech/milvus-distributed/internal/util/typeutil" - "github.com/zilliztech/milvus-distributed/internal/conf" "github.com/apache/pulsar-client-go/pulsar" @@ -17,9 +15,6 @@ import ( "github.com/zilliztech/milvus-distributed/internal/proto/internalpb" ) -type UniqueID = typeutil.UniqueID -type Timestamp = typeutil.Timestamp - const stopReadFlagId int64 = -1 type TimeTickReader struct { diff --git a/internal/master/timesync/timetick.go b/internal/master/timesync/timetick.go new file mode 100644 index 0000000000..68ec760ca5 --- /dev/null +++ b/internal/master/timesync/timetick.go @@ -0,0 +1,11 @@ +package timesync + +import "github.com/zilliztech/milvus-distributed/internal/util/typeutil" + +type UniqueID = typeutil.UniqueID +type Timestamp = typeutil.Timestamp + +type TimeTickBarrier interface { + GetTimeTick() (Timestamp,error) + Start() error +}