noth/surrealpatch
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Don’t re-encode the key if we have already encoded it

Browse source
This commit is contained in:
Tobie Morgan Hitchcock 2019-06-17 07:00:56 +01:00
parent 304c0458e8
commit 4e3b3682a6
1 changed files with 10 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
db/document.go
View file

@ -29,6 +29,7 @@ import (
type document struct { type document struct {
i *iterator i *iterator
id *sql.Thing id *sql.Thing
enc []byte
key *keys.Thing key *keys.Thing
val kvs.KV val kvs.KV
lck bool lck bool
@ -44,6 +45,7 @@ func newDocument(i *iterator, key *keys.Thing, val kvs.KV, doc *data.Doc) (d *do
d.i = i d.i = i
d.id = nil d.id = nil
d.enc = nil
d.key = key d.key = key
d.val = val d.val = val
d.doc = doc d.doc = doc
@ -108,8 +110,9 @@ func (d *document) init(ctx context.Context) (err error) {
// store key into a Thing key. // store key into a Thing key.
if d.key == nil && d.val != nil { if d.key == nil && d.val != nil {
d.enc = d.val.Key()
d.key = &keys.Thing{} d.key = &keys.Thing{}
d.key.Decode(d.val.Key()) d.key.Decode(d.enc)
} }
return return
@ -146,7 +149,8 @@ func (d *document) setup(ctx context.Context) (err error) {
// to be loaded from the KV store. // to be loaded from the KV store.
if d.key != nil && d.val == nil { if d.key != nil && d.val == nil {
d.val, err = d.i.e.dbo.Get(ctx, d.i.versn, d.key.Encode()) d.enc = d.key.Encode()
d.val, err = d.i.e.dbo.Get(ctx, d.i.versn, d.enc)
if err != nil { if err != nil {
return return
} }
@ -263,9 +267,9 @@ func (d *document) storeThing(ctx context.Context) (err error) {
if ok, err := d.shouldVersn(ctx); err != nil { if ok, err := d.shouldVersn(ctx); err != nil {
return err return err
} else if ok == true { } else if ok == true {
_, err = d.i.e.dbo.Put(ctx, d.i.e.time, d.key.Encode(), d.current.Encode()) _, err = d.i.e.dbo.Put(ctx, d.i.e.time, d.enc, d.current.Encode())
} else if ok == false { } else if ok == false {
_, err = d.i.e.dbo.Put(ctx, 0, d.key.Encode(), d.current.Encode()) _, err = d.i.e.dbo.Put(ctx, 0, d.enc, d.current.Encode())
} }
return return
@ -289,9 +293,9 @@ func (d *document) purgeThing(ctx context.Context) (err error) {
if ok, err := d.shouldVersn(ctx); err != nil { if ok, err := d.shouldVersn(ctx); err != nil {
return err return err
} else if ok == true { } else if ok == true {
_, err = d.i.e.dbo.Put(ctx, d.i.e.time, d.key.Encode(), nil) _, err = d.i.e.dbo.Put(ctx, d.i.e.time, d.enc, nil)
} else if ok == false { } else if ok == false {
_, err = d.i.e.dbo.Clr(ctx, d.key.Encode()) _, err = d.i.e.dbo.Clr(ctx, d.enc)
} }
return return