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

Fix search timestamp error 

Signed-off-by: bigsheeper <yihao.dai@zilliz.com>
pull/4973/head^2
bigsheeper 2020-09-24 14:19:29 +08:00 committed by yefu.chen
parent 32157159a2
commit f4d29c97ed
6 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
conf/config.yaml
View File

@ -14,7 +14,7 @@ master:
port: 53100
pulsarmoniterinterval: 1
pulsartopic: "monitor-topic"
segmentthreshole: 10000
segmentthreshole: 104857600
proxyidlist: [0]
querynodenum: 1
writenodenum: 1

2
core/unittest/test_c_api.cpp
View File

@ -322,7 +322,7 @@ TEST(CApiTest, GetMemoryUsageInBytesTest) {
std::cout << "new_memory_usage_size = " << memory_usage_size << std::endl;
assert(memory_usage_size == 1898459);
assert(memory_usage_size == 2785280);
DeleteCollection(collection);
DeletePartition(partition);

1
pkg/master/server.go
View File

@ -75,6 +75,7 @@ func ComputeCloseTime(ss mock.SegmentStats, kvbase kv.Base) error {
return err
}
seg.CloseTimeStamp = uint64(currentTime.Add(time.Duration(sec) * time.Second).Unix())
fmt.Println("memRate = ", memRate, ",sec = ", sec ,",Close time = ", seg.CloseTimeStamp)
updateData, err := mock.Segment2JSON(*seg)
if err != nil {
return err

2
proxy/src/server/delivery/ReqScheduler.cpp
View File

@ -121,7 +121,7 @@ ReqScheduler::TakeToExecute(ReqQueuePtr req_queue) {
}
try {
if (req->type() == ReqType::kInsert || req->type() == ReqType::kDeleteEntityByID){
if (req->type() == ReqType::kInsert || req->type() == ReqType::kDeleteEntityByID || req->type() == ReqType::kSearch) {
std::lock_guard lock(time_syc_mtx_);
sending_ = true;
req->SetTimestamp(TSOracle::GetInstance().GetTimeStamp());

1
reader/read_node/query_node.go
View File

@ -259,6 +259,7 @@ func (node *QueryNode) RunInsertDelete(wg *sync.WaitGroup) {
assert.NotEqual(nil, 0, timeRange.timestampMax)
if msgLen[0] == 0 && len(node.buffer.InsertDeleteBuffer) <= 0 {
node.queryNodeTimeSync.UpdateSearchTimeSync(timeRange)
continue
}

4
reader/read_node/segment_service.go
View File

@ -33,7 +33,7 @@ func (node *QueryNode) SegmentsManagement() {
}
func (node *QueryNode) SegmentManagementService() {
sleepMillisecondTime := 3000
sleepMillisecondTime := 1000
fmt.Println("do segments management in ", strconv.Itoa(sleepMillisecondTime), "ms")
for {
time.Sleep(time.Duration(sleepMillisecondTime) * time.Millisecond)
@ -89,7 +89,7 @@ func (node *QueryNode) SegmentStatistic(sleepMillisecondTime int) {
}
func (node *QueryNode) SegmentStatisticService() {
sleepMillisecondTime := 3000
sleepMillisecondTime := 1000
fmt.Println("do segments statistic in ", strconv.Itoa(sleepMillisecondTime), "ms")
for {
time.Sleep(time.Duration(sleepMillisecondTime) * time.Millisecond)