optimize some code

errors.go

@@ -2,7 +2,6 @@ package nutsdb
 
 import (
 	"errors"
-	"fmt"
 )
 
 // IsDBClosed is true if the error indicates the db was closed.
@@ -39,7 +38,3 @@ func IsPrefixScan(err error) bool {
 func IsPrefixSearchScan(err error) bool {
 	return errors.Is(err, ErrPrefixSearchScan)
 }
-
-func GetMergeReadEntryError(err error) error {
-	return fmt.Errorf("when merge operation build hintIndex readAt err: %s", err)
-}

errors_test.go

@@ -220,27 +220,3 @@ func TestIsPrefixSearchScan(t *testing.T) {
 		})
 	})
 }
-
-func TestGetMergeReadEntryError(t *testing.T) {
-	type args struct {
-		err error
-	}
-	tests := []struct {
-		name    string
-		args    args
-		wantErr error
-	}{
-		{
-			name: "test error",
-			args: args{
-				err: errors.New("test error"),
-			},
-			wantErr: fmt.Errorf("when merge operation build hintIndex readAt err: %s", errors.New("test error")),
-		},
-	}
-	for _, tt := range tests {
-		t.Run(tt.name, func(t *testing.T) {
-			require.Equal(t, tt.wantErr, GetMergeReadEntryError(tt.args.err))
-		})
-	}
-}

merge.go

@@ -127,10 +127,11 @@ func (db *DB) merge() error {
 				err := db.Update(func(tx *Tx) error {
 					// check if we have a new entry with same key and bucket
 					if ok := db.isPendingMergeEntry(entry); ok {
-						switch entry.Meta.Flag {
-						case DataLPushFlag:
+						if entry.Meta.Flag == DataLPushFlag {
 							return tx.LPushRaw(string(entry.Bucket), entry.Key, entry.Value)
-						case DataRPushFlag:
+						}
+
+						if entry.Meta.Flag == DataRPushFlag {
 							return tx.RPushRaw(string(entry.Bucket), entry.Key, entry.Value)
 						}
 
@@ -167,7 +168,7 @@ func (db *DB) merge() error {
 				if err == io.ErrUnexpectedEOF {
 					break
 				}
-				return GetMergeReadEntryError(err)
+				return fmt.Errorf("when merge operation build hintIndex readAt err: %s", err)
 			}
 		}
 

tx_list_test.go

@@ -65,6 +65,8 @@ func TestTx_LPush(t *testing.T) {
 		pushDataByStartEnd(t, db, bucket, 1, 10, 19, true)
 		pushDataByStartEnd(t, db, bucket, 2, 20, 29, true)
 
+		txPush(t, db, bucket, []byte("012|sas"), GetTestBytes(0), true, ErrSeparatorForListKey, nil)
+
 		for i := 0; i < 10; i++ {
 			txPop(t, db, bucket, GetTestBytes(0), GetTestBytes(9-i), nil, true)
 		}
@@ -104,6 +106,8 @@ func TestTx_RPushRaw(t *testing.T) {
 			txPushRaw(t, db, bucket, key, GetTestBytes(i), false, nil, nil)
 		}
 
+		txPush(t, db, bucket, []byte("012|sas"), GetTestBytes(0), false, ErrSeparatorForListKey, nil)
+
 		for i := 0; i <= 100; i++ {
 			v := GetTestBytes(100 - i)
 			txPop(t, db, bucket, []byte("0"), v, nil, false)