diff --git a/db.go b/db.go index 9db7c767..6da4e1b8 100644 --- a/db.go +++ b/db.go @@ -20,10 +20,10 @@ import ( ) const ( - fileLockName = "FLOCK" - dataFileNameSuffix = ".SEG" - hintFileNameSuffix = ".HINT" - mergeFinNameSuffix = ".MERGEFIN" + fileLockName = "FLOCK" + dataFileNameSuffix = ".SEG" + hintFileNameSuffix = ".HINT" + mergeFileNameSuffix = ".MERGEFIN" ) // DB represents a ROSEDB database instance. @@ -582,7 +582,7 @@ func checkOptions(options Options) error { if len(options.AutoMergeCronExpr) > 0 { if _, err := cron.NewParser(cron.SecondOptional | cron.Minute | cron.Hour | cron.Dom | cron.Month | cron.Dow | cron.Descriptor). Parse(options.AutoMergeCronExpr); err != nil { - return fmt.Errorf("databse auto merge cron expression is invalid, err: %s", err) + return fmt.Errorf("database auto merge cron expression is invalid, err: %s", err) } } diff --git a/merge.go b/merge.go index 85c72712..6b1626b0 100644 --- a/merge.go +++ b/merge.go @@ -215,7 +215,7 @@ func (db *DB) openMergeFinishedFile() (*wal.WAL, error) { return wal.Open(wal.Options{ DirPath: db.options.DirPath, SegmentSize: GB, - SegmentFileExt: mergeFinNameSuffix, + SegmentFileExt: mergeFileNameSuffix, Sync: false, BytesPerSync: 0, BlockCache: 0, @@ -293,7 +293,7 @@ func loadMergeFiles(dirPath string) error { // copy MERGEFINISHED and HINT files to the original data directory // there is only one merge finished file, so the file id is always 1, // the same as the hint file. - copyFile(mergeFinNameSuffix, 1, true) + copyFile(mergeFileNameSuffix, 1, true) copyFile(hintFileNameSuffix, 1, true) return nil @@ -301,7 +301,7 @@ func loadMergeFiles(dirPath string) error { func getMergeFinSegmentId(mergePath string) (wal.SegmentID, error) { // check if the merge operation is completed - mergeFinFile, err := os.Open(wal.SegmentFileName(mergePath, mergeFinNameSuffix, 1)) + mergeFinFile, err := os.Open(wal.SegmentFileName(mergePath, mergeFileNameSuffix, 1)) if err != nil { // if the merge finished file does not exist, it means that the merge operation is not completed. // so we should remove the merge directory and return nil. diff --git a/utils/rand_kv.go b/utils/rand_kv.go index 264e16e3..e4f36bba 100644 --- a/utils/rand_kv.go +++ b/utils/rand_kv.go @@ -13,7 +13,7 @@ var ( letters = []byte("abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789") ) -// GetTestKey get formated key, for test only +// GetTestKey get formatted key, for test only func GetTestKey(i int) []byte { return []byte(fmt.Sprintf("rosedb-test-key-%09d", i)) }