Merge pull request #172 from wayblink/fix-com

Fix compatibility to old backup without database info
zilliztech · Jul 26, 2023 · f276c61 · f276c61
2 parents 7937451 + e37711e
commit f276c61
Show file tree

Hide file tree

Showing 2 changed files with 25 additions and 4 deletions.
diff --git a/core/backup_context_test.go b/core/backup_context_test.go
@@ -224,6 +224,22 @@ func TestGetBackupUnexistBackupName(t *testing.T) {
 }
 
 func TestRestoreBackup(t *testing.T) {
+	var params paramtable.BackupParams
+	params.Init()
+	context := context.Background()
+	backup := CreateBackupContext(context, params)
+	backup.Start()
+	backupName := "demo"
+	//fmt.Sprintf("test_%d", rand.Int())
+
+	restoreResp := backup.RestoreBackup(context, &backuppb.RestoreBackupRequest{
+		BackupName:    backupName,
+		DbCollections: utils.WrapDBCollections("{\"default\":[]}"),
+	})
+	log.Info("restore backup", zap.Any("resp", restoreResp))
+}
+
+func TestCreateAndRestoreBackup(t *testing.T) {
 	var params paramtable.BackupParams
 	params.Init()
 	context := context.Background()

diff --git a/core/backup_impl_restore_backup.go b/core/backup_impl_restore_backup.go
@@ -117,13 +117,19 @@ func (b *BackupContext) RestoreBackup(ctx context.Context, request *backuppb.Res
 		for db, collections := range dbCollections {
 			if len(collections) == 0 {
 				for _, collectionBackup := range backup.GetCollectionBackups() {
+					if collectionBackup.GetDbName() == "" {
+						collectionBackup.DbName = "default"
+					}
 					if collectionBackup.GetDbName() == db {
 						toRestoreCollectionBackups = append(toRestoreCollectionBackups, collectionBackup)
 					}
 				}
 			} else {
 				for _, coll := range collections {
 					for _, collectionBackup := range backup.GetCollectionBackups() {
+						if collectionBackup.GetDbName() == "" {
+							collectionBackup.DbName = "default"
+						}
 						if collectionBackup.GetDbName() == db && collectionBackup.CollectionName == coll {
 							toRestoreCollectionBackups = append(toRestoreCollectionBackups, collectionBackup)
 						}
@@ -145,11 +151,10 @@ func (b *BackupContext) RestoreBackup(ctx context.Context, request *backuppb.Res
 			collectionNameDict[fullCollectionName] = true
 		}
 		for _, collectionBackup := range backup.GetCollectionBackups() {
-			dbName := "default"
-			if collectionBackup.GetDbName() != "" {
-				dbName = collectionBackup.GetDbName()
+			if collectionBackup.GetDbName() == "" {
+				collectionBackup.DbName = "default"
 			}
-			fullCollectionName := dbName + "." + collectionBackup.GetCollectionName()
+			fullCollectionName := collectionBackup.GetDbName() + "." + collectionBackup.GetCollectionName()
 			collectionBackup.GetCollectionName()
 			if collectionNameDict[fullCollectionName] {
 				toRestoreCollectionBackups = append(toRestoreCollectionBackups, collectionBackup)