nit

yugabyte · Feb 6, 2025 · 56b8b72 · 56b8b72
1 parent 5c597cf
commit 56b8b72
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 6 deletions.
diff --git a/yb-voyager/cmd/importDataFileCommand.go b/yb-voyager/cmd/importDataFileCommand.go
@@ -106,8 +106,8 @@ var importDataFileCmd = &cobra.Command{
 
 func storeFileTableMapAndDataDirInMSR() {
 	err := metaDB.UpdateMigrationStatusRecord(func(msr *metadb.MigrationStatusRecord) {
-		msr.FileTableMapping = fileTableMapping
-		msr.DataDir = dataDir
+		msr.ImportDataFileFlagFileTableMapping = fileTableMapping
+		msr.ImportDataFileFlagDataDir = dataDir
 	})
 	if err != nil {
 		utils.ErrExit("failed updating migration status record for file-table-mapping and data-dir: %v", err)

diff --git a/yb-voyager/cmd/importDataStatusCommand.go b/yb-voyager/cmd/importDataStatusCommand.go
@@ -143,8 +143,8 @@ func prepareDummyDescriptor(state *ImportDataState) (*datafile.Descriptor, error
 	if err != nil {
 		return nil, fmt.Errorf("getting migration status record: %v", err)
 	}
-	dataStore = datastore.NewDataStore(msr.DataDir)
-	importFileTasksForFTM := getImportFileTasks(msr.FileTableMapping)
+	dataStore = datastore.NewDataStore(msr.ImportDataFileFlagDataDir)
+	importFileTasksForFTM := getImportFileTasks(msr.ImportDataFileFlagFileTableMapping)
 	for _, task := range importFileTasksForFTM {
 		dataFileDescriptor.DataFileList = append(dataFileDescriptor.DataFileList, &datafile.FileEntry{
 			FilePath:  task.FilePath,

diff --git a/yb-voyager/src/metadb/migrationStatus.go b/yb-voyager/src/metadb/migrationStatus.go
@@ -54,8 +54,8 @@ type MigrationStatusRecord struct {
 	MigrationAssessmentDone          bool              `json:"MigrationAssessmentDone"`
 	AssessmentRecommendationsApplied bool              `json:"AssessmentRecommendationsApplied"`
 
-	FileTableMapping string `json:"FileTableMapping"` // Import data file command's file_table_mapping flag
-	DataDir          string `json:"DataDir"`          // Import data file command's data-dir flag
+	ImportDataFileFlagFileTableMapping string `json:"ImportDataFileFlagFileTableMapping"` // Import data file command's file_table_mapping flag
+	ImportDataFileFlagDataDir          string `json:"ImportDataFileFlagDataDir"`          // Import data file command's data-dir flag
 }
 
 const MIGRATION_STATUS_KEY = "migration_status"