diff --git a/proxy/src/message_client/ClientV2.cpp b/proxy/src/message_client/ClientV2.cpp index d2cb29d825..df07ef6f01 100644 --- a/proxy/src/message_client/ClientV2.cpp +++ b/proxy/src/message_client/ClientV2.cpp @@ -178,7 +178,6 @@ Status MsgClientV2::SendMutMessage(const milvus::grpc::InsertParam &request, auto channel_id = makeHash(&uid, sizeof(uint64_t)) % topic_num; try { mut_msg.set_segment_id(segment_id(request.collection_name(), channel_id, timestamp)); - printf("%ld \n", mut_msg.segment_id()); mut_msg.mutable_rows_data()->CopyFrom(request.rows_data(i)); mut_msg.mutable_extra_params()->CopyFrom(request.extra_params()); diff --git a/reader/read_node/query_node.go b/reader/read_node/query_node.go index dbd75ca0e4..0c163ec55e 100644 --- a/reader/read_node/query_node.go +++ b/reader/read_node/query_node.go @@ -248,17 +248,11 @@ func (node *QueryNode) RunInsertDelete(wg *sync.WaitGroup) { const CountMsgNum = 1000 * 1000 if Debug { - var start = time.Now() var printFlag = true + var startTime = true + var start time.Time for { - // Test insert time - if printFlag && node.msgCounter.InsertCounter >= CountMsgNum { - printFlag = false - timeSince := time.Since(start) - fmt.Println("============> Do", node.msgCounter.InsertCounter, "Insert in", timeSince, "<============") - } - var msgLen = node.PrepareBatchMsg() var timeRange = TimeRange{node.messageClient.TimeSyncStart(), node.messageClient.TimeSyncEnd()} assert.NotEqual(nil, 0, timeRange.timestampMin) @@ -268,6 +262,12 @@ func (node *QueryNode) RunInsertDelete(wg *sync.WaitGroup) { continue } + if startTime { + fmt.Println("============> Start Test <============") + startTime = false + start = time.Now() + } + node.QueryNodeDataInit() node.MessagesPreprocess(node.messageClient.InsertOrDeleteMsg, timeRange) //fmt.Println("MessagesPreprocess Done") @@ -277,6 +277,13 @@ func (node *QueryNode) RunInsertDelete(wg *sync.WaitGroup) { node.DoInsertAndDelete() //fmt.Println("DoInsertAndDelete Done") node.queryNodeTimeSync.UpdateSearchTimeSync(timeRange) + + // Test insert time + if printFlag && node.msgCounter.InsertCounter >= CountMsgNum { + printFlag = false + timeSince := time.Since(start) + fmt.Println("============> Do", node.msgCounter.InsertCounter, "Insert in", timeSince, "<============") + } } } @@ -582,7 +589,7 @@ func (node *QueryNode) Search(searchMessages []*msgPb.SearchMsg) msgPb.Status { fmt.Println(err.Error()) return msgPb.Status{ErrorCode: 1} } - fmt.Println(res.ResultIds) + for i := 0; i < len(res.ResultIds); i++ { resultsTmp = append(resultsTmp, SearchResultTmp{ResultId: res.ResultIds[i], ResultDistance: res.ResultDistances[i]}) } diff --git a/writer/main.go b/writer/main.go index 0074fae5de..f862775c8d 100644 --- a/writer/main.go +++ b/writer/main.go @@ -32,35 +32,48 @@ func main() { log.Fatal(err) } + msgCounter := write_node.MsgCounter{ + InsertCounter: 0, + DeleteCounter: 0, + } + wn := write_node.WriteNode{ KvStore: &kv, MessageClient: &mc, TimeSync: 100, + MsgCounter: &msgCounter, } const Debug = true const CountMsgNum = 1000 * 1000 if Debug { - var start = time.Now() var printFlag = true + var startTime = true + var start time.Time for { - // Test insert time - if printFlag && wn.MsgCounter.InsertCounter >= CountMsgNum { - printFlag = false - timeSince := time.Since(start) - fmt.Println("============> Do", wn.MsgCounter.InsertCounter, "Insert in", timeSince, "<============") - } - if ctx.Err() != nil { break } msgLength := wn.MessageClient.PrepareBatchMsg() if msgLength > 0 { + if startTime { + fmt.Println("============> Start Test <============") + startTime = false + start = time.Now() + } + wn.DoWriteNode(ctx, &wg) fmt.Println("write node do a batch message, storage len: ", msgLength) } + + // Test insert time + if printFlag && wn.MsgCounter.InsertCounter >= CountMsgNum { + printFlag = false + timeSince := time.Since(start) + fmt.Println("============> Do", wn.MsgCounter.InsertCounter, "Insert in", timeSince, "<============") + } } }