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

Jump to bottom

Update badger to commit 7c5e6d7f6e8b #4394

Merged
merged 1 commit into from
Dec 10, 2019
Merged

Update badger to commit 7c5e6d7f6e8b #4394

merged 1 commit into from
Dec 10, 2019

Conversation

jarifibrahim
Copy link
Contributor

@jarifibrahim jarifibrahim commented Dec 10, 2019 •
edited by manishrjain
Loading

This change brings the following commits from badger

git log --oneline 8b99eb433aa7...7c5e6d7f6e8b

7c5e6d7 Fix segmentation fault in vlog.Read (header.Decode) (#1150)
f46f8ea Store total key-value size in table footer (#1137)
7a90951 rotate tool added for encryption (#1125)

PS - I don't know why ristretto version got updated in the go.mod file. I've ran go get -u -v github.com/dgraph-io/badger/v2@master

This change is Reviewable

@jarifibrahim jarifibrahim requested review from manishrjain and a team as code owners December 10, 2019 17:53
martinmr
martinmr approved these changes Dec 10, 2019
View reviewed changes
Copy link
Contributor

@martinmr martinmr left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

:lgtm:

Reviewed 2 of 2 files at r1.
Reviewable status: :shipit: complete! all files reviewed, all discussions resolved (waiting on @manishrjain)

danielmai
danielmai approved these changes Dec 10, 2019
View reviewed changes
Copy link
Contributor

@danielmai danielmai left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

:lgtm:

This PR fixes #4288.

The ristretto go.mod update looks fine. The ristretto version "changed" in the go.mod file, but it's actually the same. https://github.com/dgraph-io/ristretto/releases/tag/v0.0.1 The v0.0.1 tag is commit dgraph-io/ristretto@99d1bbb, which is what it was in Dgraph's go.mod before this PR.

Reviewable status: :shipit: complete! all files reviewed, all discussions resolved (waiting on @manishrjain)

@jarifibrahim jarifibrahim merged commit 36da9d1 into master Dec 10, 2019
@jarifibrahim jarifibrahim deleted the ibrahim/badger-update branch December 10, 2019 20:21
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@danielmai danielmai danielmai approved these changes

@martinmr martinmr martinmr approved these changes

@manishrjain manishrjain Awaiting requested review from manishrjain

Assignees
No one assigned
Labels
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
3 participants
@jarifibrahim @martinmr @danielmai