Refactoring inspired by the code review

arenadata · Oct 3, 2024 · 247d924 · 247d924
1 parent e45e70a
commit 247d924
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 3 deletions.
diff --git a/helper/helper.go b/helper/helper.go
@@ -257,7 +257,7 @@ func DoCleanup() {
 			logVerbose("Encountered error closing error file: %v", err)
 		}
 	}
-	err := new(RestoreHelper).flushAndCloseRestoreWriter("Current writer pipe on cleanup", 0)
+	err := Restorer.flushAndCloseRestoreWriter("Current writer pipe on cleanup", 0)
 	if err != nil {
 		logVerbose("Encountered error during cleanup: %v", err)
 	}

diff --git a/helper/restore_helper.go b/helper/restore_helper.go
@@ -35,6 +35,8 @@ const (
 )
 
 var (
+	Restorer IRestoreHelper = new(RestoreHelper)
+
 	writeHandle *os.File
 	writer      *bufio.Writer
 	contentRE   *regexp.Regexp
@@ -171,8 +173,7 @@ func (RestoreHelper) checkForSkipFile(pipeFile string, tableOid int) bool {
 
 func doRestoreAgent() error {
 	helper := new(Helper)
-	restorer := new(RestoreHelper)
-	return doRestoreAgentInternal(helper, restorer)
+	return doRestoreAgentInternal(helper, Restorer)
 }
 
 func doRestoreAgentInternal(h IHelper, rh IRestoreHelper) error {