Skip to content
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

chore(script): fix local test script #210

Merged
merged 1 commit into from
Oct 27, 2020
Merged

chore(script): fix local test script #210

Show file tree
Hide file tree
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
2 changes: 1 addition & 1 deletion test.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,10 +7,10 @@ starttest() {

if [ -z "${TEAMCITY_VERSION}" ]; then
# running locally, so start test in a container
# TEAMCITY_VERSION=local will avoid recursive calls, when it would be running in container
docker run --rm --name ristretto-test -ti \
-v `pwd`:/go/src/github.com/dgraph-io/ristretto \
--workdir /go/src/github.com/dgraph-io/ristretto \
# TEAMCITY_VERSION=local will avoid recursive calls, when it would be running in container
--env TEAMCITY_VERSION=local \
golang:1.13 \
sh test.sh
Expand Down
4 changes: 2 additions & 2 deletions z/btree.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@ type Tree struct {
// Release the memory allocated to tree.
func (t *Tree) Release() {
if t != nil && t.mf != nil {
t.mf.Delete()
check(t.mf.Delete())
}
}

Expand Down Expand Up @@ -126,7 +126,7 @@ func (t *Tree) Set(k, v uint64) {

// For internal nodes, they contain <key, ptr>.
// where all entries <= key are stored in the corresponding ptr.
func (t *Tree) set(offset uint64, k, v uint64) node {
func (t *Tree) set(offset, k, v uint64) node {
n := t.node(offset)
if n.isLeaf() {
return n.set(k, v)
Expand Down