milvus-io
/
milvus
mirror of https://github.com/milvus-io/milvus.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Remove service time check in streaming search (#7253) 

Signed-off-by: bigsheeper <yihao.dai@zilliz.com>
pull/7263/head
bigsheeper 2021-08-24 15:07:52 +08:00 committed by GitHub
parent 801d52c02e
commit 653ec6cedb
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 18 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

37
internal/querynode/streaming.go
View File

@ -22,7 +22,6 @@ import (
"github.com/milvus-io/milvus/internal/log"
"github.com/milvus-io/milvus/internal/msgstream"
"github.com/milvus-io/milvus/internal/proto/segcorepb"
"github.com/milvus-io/milvus/internal/util/tsoutil"
)
type streaming struct {
@ -190,24 +189,24 @@ func (s *streaming) search(searchReqs []*searchRequest, collID UniqueID, partIDs
}
// TSafe less than searchTs means this vChannel is not available
ts := s.tSafeReplica.getTSafe(seg.vChannelID)
gracefulTimeInMilliSecond := Params.GracefulTime
if gracefulTimeInMilliSecond > 0 {
gracefulTime := tsoutil.ComposeTS(gracefulTimeInMilliSecond, 0)
ts += gracefulTime
}
tsp, _ := tsoutil.ParseTS(ts)
stp, _ := tsoutil.ParseTS(searchTs)
log.Debug("timestamp check in streaming search",
zap.Any("collectionID", collID),
zap.Any("serviceTime_l", ts),
zap.Any("searchTime_l", searchTs),
zap.Any("serviceTime_p", tsp),
zap.Any("searchTime_p", stp),
)
if ts < searchTs {
continue
}
//ts := s.tSafeReplica.getTSafe(seg.vChannelID)
//gracefulTimeInMilliSecond := Params.GracefulTime
//if gracefulTimeInMilliSecond > 0 {
// gracefulTime := tsoutil.ComposeTS(gracefulTimeInMilliSecond, 0)
// ts += gracefulTime
//}
//tsp, _ := tsoutil.ParseTS(ts)
//stp, _ := tsoutil.ParseTS(searchTs)
//log.Debug("timestamp check in streaming search",
// zap.Any("collectionID", collID),
// zap.Any("serviceTime_l", ts),
// zap.Any("searchTime_l", searchTs),
// zap.Any("serviceTime_p", tsp),
// zap.Any("searchTime_p", stp),
//)
//if ts < searchTs {
// continue
//}
searchResult, err := seg.search(plan, searchReqs, []Timestamp{searchTs})
if err != nil {