fix: Compose empty resultset for result count = 1

See also #725

Signed-off-by: Congqi Xia <[email protected]>

client/data.go

@@ -143,25 +143,20 @@ func (c *GrpcClient) handleSearchResult(schema *entity.Schema, outputFields []st
 			Scores:      results.GetScores()[offset : offset+rc],
 		}
 
-		// parse result set if current nq is not empty
-		if rc > 0 {
-			entry.IDs, entry.Err = entity.IDColumns(results.GetIds(), offset, offset+rc)
+		entry.IDs, entry.Err = entity.IDColumns(schema, results.GetIds(), offset, offset+rc)
+		if entry.Err != nil {
+			continue
+		}
+		// parse group-by values
+		if gb != nil {
+			entry.GroupByValue, entry.Err = entity.FieldDataColumn(gb, offset, offset+rc)
 			if entry.Err != nil {
 				offset += rc
 				continue
 			}
-			// parse group-by values
-			if gb != nil {
-				entry.GroupByValue, entry.Err = entity.FieldDataColumn(gb, offset, offset+rc)
-				if entry.Err != nil {
-					offset += rc
-					continue
-				}
-			}
-			// entry.GroupByValue, entry.Err = c.parseSearchResult()
-			entry.Fields, entry.Err = c.parseSearchResult(schema, outputFields, fieldDataList, i, offset, offset+rc)
-			sr = append(sr, entry)
 		}
+		entry.Fields, entry.Err = c.parseSearchResult(schema, outputFields, fieldDataList, i, offset, offset+rc)
+		sr = append(sr, entry)
 
 		offset += rc
 	}

client/insert.go

@@ -77,7 +77,7 @@ func (c *GrpcClient) Insert(ctx context.Context, collName string, partitionName
 	}
 	MetaCache.setSessionTs(collName, resp.Timestamp)
 	// 3. parse id column
-	return entity.IDColumns(resp.GetIDs(), 0, -1)
+	return entity.IDColumns(coll.Schema, resp.GetIDs(), 0, -1)
 }
 
 func (c *GrpcClient) processInsertColumns(colSchema *entity.Schema, columns ...entity.Column) ([]*schemapb.FieldData, int, error) {
@@ -392,7 +392,7 @@ func (c *GrpcClient) Upsert(ctx context.Context, collName string, partitionName
 	}
 	MetaCache.setSessionTs(collName, resp.Timestamp)
 	// 3. parse id column
-	return entity.IDColumns(resp.GetIDs(), 0, -1)
+	return entity.IDColumns(coll.Schema, resp.GetIDs(), 0, -1)
 }
 
 // BulkInsert data files(json, numpy, etc.) on MinIO/S3 storage, read and parse them into sealed segments

client/row.go

@@ -118,7 +118,7 @@ func (c *GrpcClient) InsertRows(ctx context.Context, collName string, partitionN
 	}
 	MetaCache.setSessionTs(collName, resp.Timestamp)
 	// 3. parse id column
-	return entity.IDColumns(resp.GetIDs(), 0, -1)
+	return entity.IDColumns(coll.Schema, resp.GetIDs(), 0, -1)
 }
 
 // SearchResultByRows search result for row-based Search