Use provided uuid

Author: Sicheng Pan

Diff for: go/pkg/sysdb/coordinator/model/collection.go

@@ -63,7 +63,8 @@ type UpdateCollection struct {
 
 type ForkCollection struct {
 	SourceCollectionID   types.UniqueID
-	TargetCollectionName *string
+	TargetCollectionID   types.UniqueID
+	TargetCollectionName string
 }
 
 type FlushCollectionCompaction struct {

Diff for: go/pkg/sysdb/coordinator/table_catalog.go

@@ -700,16 +700,13 @@ func (tc *Catalog) getLineageFile(ctx context.Context, collection *model.Collect
 }
 
 func (tc *Catalog) ForkCollection(ctx context.Context, forkCollection *model.ForkCollection) (*model.Collection, []*model.Segment, error) {
-	log.Info("Forking collection", zap.String("sourceCollectionId", forkCollection.SourceCollectionID.String()), zap.String("targetCollectionName", *forkCollection.TargetCollectionName))
-
-	var newCollectionID types.UniqueID
+	log.Info("Forking collection", zap.String("sourceCollectionId", forkCollection.SourceCollectionID.String()), zap.String("targetCollectionId", forkCollection.TargetCollectionID.String()), zap.String("targetCollectionName", forkCollection.TargetCollectionName))
 
 	err := tc.txImpl.Transaction(ctx, func(txCtx context.Context) error {
 		var err error
 		var rootCollection *model.Collection
 		var sourceCollection *model.Collection
 		var sourceSegments []*model.Segment
-		var newCollection *model.Collection
 		var newLineageFileFullName string
 
 		sourceCollectionIDStr := forkCollection.SourceCollectionID.String()
@@ -732,8 +729,8 @@ func (tc *Catalog) ForkCollection(ctx context.Context, forkCollection *model.For
 		ts := time.Now().UTC()
 
 		createCollection := &model.CreateCollection{
-			ID:                   types.NewUniqueID(),
-			Name:                 *forkCollection.TargetCollectionName,
+			ID:                   forkCollection.TargetCollectionID,
+			Name:                 forkCollection.TargetCollectionName,
 			ConfigurationJsonStr: sourceCollection.ConfigurationJsonStr,
 			Dimension:            sourceCollection.Dimension,
 			Metadata:             sourceCollection.Metadata,
@@ -749,18 +746,17 @@ func (tc *Catalog) ForkCollection(ctx context.Context, forkCollection *model.For
 				ID:           types.NewUniqueID(),
 				Type:         segment.Type,
 				Scope:        segment.Scope,
-				CollectionID: createCollection.ID,
+				CollectionID: forkCollection.TargetCollectionID,
 				Metadata:     segment.Metadata,
 				Ts:           ts.Unix(),
 			}
 			createSegments = append(createSegments, createSegment)
 		}
 
-		newCollection, _, err = tc.CreateCollectionAndSegments(ctx, createCollection, createSegments, ts.Unix())
+		_, _, err = tc.CreateCollectionAndSegments(ctx, createCollection, createSegments, ts.Unix())
 		if err != nil {
 			return err
 		}
-		newCollectionID = newCollection.ID
 
 		if rootCollectionID == nil {
 			rootCollection = sourceCollection
@@ -774,10 +770,10 @@ func (tc *Catalog) ForkCollection(ctx context.Context, forkCollection *model.For
 		lineageFile.Dependencies = append(lineageFile.Dependencies, &coordinatorpb.CollectionVersionDependency{
 			SourceCollectionId:      sourceCollectionIDStr,
 			SourceCollectionVersion: uint64(sourceCollection.Version),
-			TargetCollectionId:      newCollection.ID.String(),
+			TargetCollectionId:      forkCollection.TargetCollectionID.String(),
 		})
 
-		newLineageFileBaseName := fmt.Sprintf("%d/%d/%d/%d-%d-%d-%s-%d-%s.binpb", ts.Year(), ts.Month(), ts.Day(), ts.Hour(), ts.Minute(), ts.Second(), sourceCollectionIDStr, sourceCollection.Version, newCollectionID.String())
+		newLineageFileBaseName := fmt.Sprintf("%d/%d/%d/%d-%d-%d-%s-%d-%s.binpb", ts.Year(), ts.Month(), ts.Day(), ts.Hour(), ts.Minute(), ts.Second(), sourceCollectionIDStr, sourceCollection.Version, forkCollection.TargetCollectionID.String())
 		newLineageFileFullName, err = tc.s3Store.PutLineageFile(rootCollection.TenantID, rootCollection.DatabaseName, rootCollectionIDStr, newLineageFileBaseName, lineageFile)
 		if err != nil {
 			return err
@@ -789,7 +785,7 @@ func (tc *Catalog) ForkCollection(ctx context.Context, forkCollection *model.For
 		return nil, nil, err
 	}
 
-	return tc.GetCollectionWithSegments(ctx, newCollectionID)
+	return tc.GetCollectionWithSegments(ctx, forkCollection.TargetCollectionID)
 }
 
 func (tc *Catalog) CreateSegment(ctx context.Context, createSegment *model.CreateSegment, ts types.Timestamp) (*model.Segment, error) {

Diff for: go/pkg/sysdb/grpc/collection_service.go

@@ -343,23 +343,30 @@ func (s *Server) UpdateCollection(ctx context.Context, req *coordinatorpb.Update
 }
 
 func (s *Server) ForkCollection(ctx context.Context, req *coordinatorpb.ForkCollectionRequest) (*coordinatorpb.ForkCollectionResponse, error) {
-	collectionID := req.SourceCollectionId
-
 	res := &coordinatorpb.ForkCollectionResponse{}
 
-	parsedCollectionID, err := types.ToUniqueID(&collectionID)
+	sourceCollectionID := req.SourceCollectionId
+	parsedSourceCollectionID, err := types.ToUniqueID(&sourceCollectionID)
+	if err != nil {
+		log.Error("ForkCollection failed. Failed to parse source collection id", zap.Error(err), zap.String("collection_id", sourceCollectionID))
+		return res, grpcutils.BuildInternalGrpcError(err.Error())
+	}
+
+	targetCollectionID := req.TargetCollectionId
+	parsedTargetCollectionID, err := types.ToUniqueID(&targetCollectionID)
 	if err != nil {
-		log.Error("ForkCollection failed. Failed to parse source collection id", zap.Error(err), zap.String("collection_id", collectionID))
+		log.Error("ForkCollection failed. Failed to parse Target collection id", zap.Error(err), zap.String("collection_id", targetCollectionID))
 		return res, grpcutils.BuildInternalGrpcError(err.Error())
 	}
 
 	forkCollection := &model.ForkCollection{
-		SourceCollectionID:   parsedCollectionID,
-		TargetCollectionName: &req.TargetCollectionName,
+		SourceCollectionID:   parsedSourceCollectionID,
+		TargetCollectionID:   parsedTargetCollectionID,
+		TargetCollectionName: req.TargetCollectionName,
 	}
 	collection, segments, err := s.coordinator.ForkCollection(ctx, forkCollection)
 	if err != nil {
-		log.Error("ForkCollection failed. ", zap.Error(err), zap.String("collection_id", collectionID))
+		log.Error("ForkCollection failed. ", zap.Error(err), zap.String("collection_id", sourceCollectionID))
 		if err == common.ErrCollectionNotFound {
 			return res, grpcutils.BuildNotFoundGrpcError(err.Error())
 		}