Skip to content

Replace FarmHash with AESHash for Oracle conflicts #952

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Aug 1, 2019
Merged

Replace FarmHash with AESHash for Oracle conflicts #952

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions txn.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ import (
"sync/atomic"

"github.com/dgraph-io/badger/y"
farm "github.com/dgryski/go-farm"
"github.com/dgraph-io/ristretto/z"
"github.com/pkg/errors"
)

Expand Down Expand Up @@ -332,7 +332,7 @@ func (txn *Txn) modify(e *Entry) error {
if err := txn.checkSize(e); err != nil {
return err
}
fp := farm.Fingerprint64(e.Key) // Avoid dealing with byte arrays.
fp := z.AESHash(e.Key) // Avoid dealing with byte arrays.
txn.writes = append(txn.writes, fp)
txn.pendingWrites[string(e.Key)] = e
return nil
Expand Down Expand Up @@ -428,7 +428,7 @@ func (txn *Txn) Get(key []byte) (item *Item, rerr error) {

func (txn *Txn) addReadKey(key []byte) {
if txn.update {
fp := farm.Fingerprint64(key)
fp := z.AESHash(key)
txn.reads = append(txn.reads, fp)
}
}
Expand Down