diff --git a/conf/config.yaml b/conf/config.yaml index 5549c90bf0..f8bc5117a1 100644 --- a/conf/config.yaml +++ b/conf/config.yaml @@ -14,7 +14,7 @@ master: port: 53100 pulsarmoniterinterval: 1 pulsartopic: "monitor-topic" - segmentthreshole: 10000 + segmentthreshole: 104857600 proxyidlist: [0] querynodenum: 1 writenodenum: 1 diff --git a/core/unittest/test_c_api.cpp b/core/unittest/test_c_api.cpp index 60419237af..adecd0b612 100644 --- a/core/unittest/test_c_api.cpp +++ b/core/unittest/test_c_api.cpp @@ -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); diff --git a/pkg/master/server.go b/pkg/master/server.go index 0c2b266696..0910df24cd 100644 --- a/pkg/master/server.go +++ b/pkg/master/server.go @@ -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 diff --git a/proxy/src/server/delivery/ReqScheduler.cpp b/proxy/src/server/delivery/ReqScheduler.cpp index ddeaea006a..84fca9100b 100644 --- a/proxy/src/server/delivery/ReqScheduler.cpp +++ b/proxy/src/server/delivery/ReqScheduler.cpp @@ -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()); diff --git a/reader/read_node/query_node.go b/reader/read_node/query_node.go index 72a01f2ed8..3ca1ad8c20 100644 --- a/reader/read_node/query_node.go +++ b/reader/read_node/query_node.go @@ -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 } diff --git a/reader/read_node/segment_service.go b/reader/read_node/segment_service.go index ea821a04fb..f4e8e8efac 100644 --- a/reader/read_node/segment_service.go +++ b/reader/read_node/segment_service.go @@ -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)