Skip to content

Commit

Permalink
fix typo
Browse files Browse the repository at this point in the history
  • Loading branch information
yinheli committed Jun 5, 2024
1 parent a89ea82 commit 1430370
Show file tree
Hide file tree
Showing 3 changed files with 9 additions and 9 deletions.
10 changes: 5 additions & 5 deletions db.go
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand Down Expand Up @@ -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)
}
}

Expand Down
6 changes: 3 additions & 3 deletions merge.go
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand Down Expand Up @@ -293,15 +293,15 @@ 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
}

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.
Expand Down
2 changes: 1 addition & 1 deletion utils/rand_kv.go
Original file line number Diff line number Diff line change
Expand Up @@ -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))
}
Expand Down

0 comments on commit 1430370

Please sign in to comment.