Simplified the original list structure, removed a large amount of red…

…undant code, and fixed bugs related to file counting.
bug-superman · Oct 11, 2023 · a1fa728 · a1fa728
1 parent fb2176b
commit a1fa728
Show file tree

Hide file tree

Showing 3 changed files with 67 additions and 374 deletions.
diff --git a/internal/aof/aof.go b/internal/aof/aof.go
@@ -51,7 +51,7 @@ func ReadCompleteLine(reader *bufio.Reader) ([]byte, error) {
 	return line, err
 }
 
-func (ld *Loader) LoadSingleAppendOnlyFile(LastFile bool, AOFTimeStamp int64) int {
+func (ld *Loader) LoadSingleAppendOnlyFile(AOFTimeStamp int64) int {
 	ret := AOFOK
 	AOFFilepath := ld.filPath
 	fp, err := os.Open(AOFFilepath)
@@ -103,9 +103,9 @@ func (ld *Loader) LoadSingleAppendOnlyFile(LastFile bool, AOFTimeStamp int64) in
 						log.Panicf("Invalid timestamp annotation")
 					}
 
-					if ts > AOFTimeStamp && LastFile {
+					if ts > AOFTimeStamp {
 						ret = AOFTruncated
-						log.Infof("AOFTruncated%s", line)
+						log.Infof("AOFTruncated %s", line)
 						return ret
 					}
 				}
@@ -125,7 +125,6 @@ func (ld *Loader) LoadSingleAppendOnlyFile(LastFile bool, AOFTimeStamp int64) in
 			var argv []string
 
 			for j := 0; j < int(argc); j++ {
-				//line, err := reader.ReadString('\n')
 				line, err := ReadCompleteLine(reader)
 				if err != nil || line[0] != '$' {
 					log.Infof("Bad File format reading the append only File %v:make a backup of your AOF File, then use ./redis-check-AOF --fix <FileName.manifest>", AOFFilepath)

diff --git a/internal/reader/aof_reader.go b/internal/reader/aof_reader.go
@@ -87,11 +87,11 @@ func (r *aofReader) StartRead() chan *entry.Entry {
 			}
 			log.Infof("the file stat:%v", fi)
 			aofLoader := aof.NewLoader(r.path, r.ch)
-			ret := aofLoader.LoadSingleAppendOnlyFile(true, r.stat.AOFTimestamp)
+			ret := aofLoader.LoadSingleAppendOnlyFile(r.stat.AOFTimestamp)
 			if ret == AOFOK || ret == AOFTruncated {
-				log.Infof("The AOF File was successfully loaded\n")
+				log.Infof("The AOF File was successfully loaded")
 			} else {
-				log.Infof("There was an error opening the AOF File.\n")
+				log.Infof("There was an error opening the AOF File.")
 			}
 			log.Infof("Send single AOF finished. path=[%s]", r.path)
 			close(r.ch)
@@ -104,9 +104,9 @@ func (r *aofReader) StartRead() chan *entry.Entry {
 			aofLoader := NewAOFFileInfo(r.path, r.ch)
 			ret := aofLoader.LoadAppendOnlyFile(manifestInfo, r.ch, r.stat.AOFTimestamp, r.stat.FilterDangerousCommands)
 			if ret == AOFOK || ret == AOFTruncated {
-				log.Infof("The AOF File was successfully loaded\n")
+				log.Infof("The AOF File was successfully loaded")
 			} else {
-				log.Infof("There was an error opening the AOF File.\n")
+				log.Infof("There was an error opening the AOF File.")
 			}
 			log.Infof("Send multi-part AOF finished. path=[%s]", r.path)
 			close(r.ch)