taigrr/bitcask
1
0
Fork 0
mirror of https://github.com/taigrr/bitcask synced 2025-01-18 04:03:17 -08:00
Code Issues Projects Releases Wiki Activity

Revert "Use []byte byte slices as keys directly avoiding serialing string(s) (#46)" (#50)

Browse Source 
This reverts commit 3c1808cad3.
This commit is contained in:
James Mills
2019-08-08 08:06:38 +10:00
committed by GitHub
parent 6b372d8334
commit d0c913ccee
13 changed files with 97 additions and 145 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
cmd/bitcask/del.go
View File

@@ -37,7 +37,7 @@ func del(path, key string) int {
}
defer db.Close()
err = db.Delete([]byte(key))
err = db.Delete(key)
if err != nil {
log.WithError(err).Error("error deleting key")
return 1

2
cmd/bitcask/get.go
View File

@@ -38,7 +38,7 @@ func get(path, key string) int {
}
defer db.Close()
value, err := db.Get([]byte(key))
value, err := db.Get(key)
if err != nil {
log.WithError(err).Error("error reading key")
return 1

4
cmd/bitcask/keys.go
View File

@@ -36,8 +36,8 @@ func keys(path string) int {
}
defer db.Close()
err = db.Fold(func(key []byte) error {
fmt.Printf("%s\n", string(key))
err = db.Fold(func(key string) error {
fmt.Printf("%s\n", key)
return nil
})
if err != nil {

2
cmd/bitcask/put.go
View File

@@ -55,7 +55,7 @@ func put(path, key string, value io.Reader) int {
return 1
}
err = db.Put([]byte(key), data)
err = db.Put(key, data)
if err != nil {
log.WithError(err).Error("error writing key")
return 1

2
cmd/bitcask/scan.go
View File

@@ -40,7 +40,7 @@ func scan(path, prefix string) int {
}
defer db.Close()
err = db.Scan([]byte(prefix), func(key []byte) error {
err = db.Scan(prefix, func(key string) error {
value, err := db.Get(key)
if err != nil {
log.WithError(err).Error("error reading key")

8
cmd/bitcaskd/main.go
View File

@@ -76,7 +76,7 @@ func main() {
conn.WriteError("ERR wrong number of arguments for '" + string(cmd.Args[0]) + "' command")
return
}
key := cmd.Args[1]
key := string(cmd.Args[1])
value := cmd.Args[2]
err = db.Put(key, value)
if err != nil {
@@ -89,7 +89,7 @@ func main() {
conn.WriteError("ERR wrong number of arguments for '" + string(cmd.Args[0]) + "' command")
return
}
key := cmd.Args[1]
key := string(cmd.Args[1])
value, err := db.Get(key)
if err != nil {
conn.WriteNull()
@@ -106,7 +106,7 @@ func main() {
conn.WriteError("ERR wrong number of arguments for '" + string(cmd.Args[0]) + "' command")
return
}
key := cmd.Args[1]
key := string(cmd.Args[1])
if db.Has(key) {
conn.WriteInt(1)
} else {
@@ -117,7 +117,7 @@ func main() {
conn.WriteError("ERR wrong number of arguments for '" + string(cmd.Args[0]) + "' command")
return
}
key := cmd.Args[1]
key := string(cmd.Args[1])
err := db.Delete(key)
if err != nil {
conn.WriteInt(0)