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

release/v1.2: Update badger to commit cddf7c03451c (#5216) #5273

Merged
merged 4 commits into from
Apr 22, 2020
Merged

release/v1.2: Update badger to commit cddf7c03451c (#5216) #5273

merged 4 commits into from
Apr 22, 2020

Conversation

jarifibrahim
Copy link
Contributor

@jarifibrahim jarifibrahim commented Apr 22, 2020 •
edited by dgraph-bot
Loading

This PR updates badger to latest version
dgraph-io/badger@cddf7c03451c .

This PR also changes the following things.

  1. Removes the second argument from watermark.Init() function. The
    second parameter was removed Init() function by commit
    dgraph-io/badger@09dd2e1
  2. go.mod and go.sum updates
  3. Change pb.KV in pb.proto to use badgerpb2.KV instead of
    badgerpb2.KV. The protobuf package was renamed from pb to
    badgr.pb2 dgraph-io/badger@cddf7c0.

NOTE - I've updated badger using go get -u ... command. All the
changes in go.mod file except badger are a side effect of badger update.

Following new commits are being added from badger

git log 91c31ebe8c22...cddf7c03451c --oneline

cddf7c0 Proto: Rename dgraph.badger.v2.pb to badgerpb2 (#1314)
fd693e4 Support entry version in Write batch (#1310)
f9332eb Disable go 1.11 builds on travis (#1306)
09dd2e1 Replace EventLog with Logger (#1203)
4f6763c Add leveled logging (#1249)
30eeec2 Update issue template (#1295)
8097259 Proto: make badger/v2 compatible with v1 (#1293)
2e708d9 Fail fast if cgo is disabled and compression is ZSTD (#1284)
6e032c0 Fix race condition in DoesNotHave (#1287)
fa94030 Fix Sequence generates duplicate values (#1281)
69f35b3 Add go_package in .proto (#1282)
5f48d42 Disable eventlogging by default (#1285)
4b539b9 Update Project Status in readme.md (#1274)
91c31eb Disable cache by default (#1257)
eaf64c0 Add separate cache for bloomfilters (#1260)
1bcbefc Add BypassDirLock option (#1243)
c6c1e5e Add support for watching nil prefix in subscribe API (#1246)
b13b927 Compress/Encrypt Blocks in the background (#1227)
bdb2b13 fix changelog for v2.0.2 (#1244)
8dbc982 Add Dkron to README (#1241)
3d95b94 Remove coveralls from Travis Build(#1219)
5b4c0a6 Fix ValueThreshold for in-memory mode (#1235)
617ed7c Initialize vlog before starting compactions in db.Open (#1226)
e908818 Update CHANGELOG for Badger 2.0.2 release. (#1230)
bce069c Fix int overflow for 32bit (#1216)
e029e93 Remove ExampleDB_Subscribe Test (#1214)
8734e3a Add missing package to README for badger.NewEntry (#1223)
78d405a Replace t.Fatal with require.NoError in tests (#1213)
c51748e Fix flaky TestPageBufferReader2 test (#1210)
eee1602 Change else-if statements to idiomatic switch statements. (#1207)
3e25d77 Rework concurrency semantics of valueLog.maxFid (#1184) (#1187)
4676ca9 Add support for caching bloomfilters (#1204)
c3333a5 Disable compression and set ZSTD Compression Level to 1 (#1191)
0acb3f6 Fix L0/L1 stall test (#1201)
7e5a956 Support disabling the cache completely. (#1183) (#1185)
82381ac Update ristretto to version  8f368f2 (#1195)
3747be5 Improve write stalling on level 0 and 1
5870b7b Run all tests on CI (#1189)
01a00cb Add Jaegar to list of projects (#1192)
9d6512b Use fastRand instead of locked-rand in skiplist (#1173)
2698bfc Avoid sync in inmemory mode (#1190)
2a90c66 Remove the 'this entry should've caught' log from value.go (#1170)
0a06173 Fix checkOverlap in compaction (#1166)
0f2e629 Fix windows build (#1177)
03af216 Fix commit sha for WithInMemory in CHANGELOG. (#1172)
23a73cd Update CHANGELOG for v2.0.1 release. (#1181)
465f28a Cast sz to uint32 to fix compilation on 32 bit (#1175)
ea01d38 Rename option builder from WithInmemory to WithInMemory. (#1169)
df99253 Remove ErrGCInMemoryMode in CHANGELOG. (#1171)
8dfdd6d Adding changes for 2.0.1 so far (#1168)

(cherry picked from commit 7b37ddb)

This change is Reviewable

Docs Preview: Dgraph Preview

Ibrahim Jarif added 3 commits April 22, 2020 17:58
Update badger to commit cddf7c03451c (#5216)
a580d02 
This PR updates badger to latest version
dgraph-io/badger@cddf7c03451c .

This PR also changes the following things.
1. Removes the second argument from `watermark.Init()` function. The
second parameter was removed Init() function by commit
dgraph-io/badger@09dd2e1
2. go.mod and go.sum updates
3. Change `pb.KV` in `pb.proto` to use `badgerpb2.KV` instead of
`badgerpb2.KV`. The protobuf package was renamed from `pb` to
`badgr.pb2` dgraph-io/badger@cddf7c0.

NOTE - I've updated badger using `go get -u ... ` command. All the
changes in go.mod file except badger are a side effect of badger update.

Following new commits are being added from badger
```
git log 91c31ebe8c22...cddf7c03451c --oneline
```
```
cddf7c0 Proto: Rename dgraph.badger.v2.pb to badgerpb2 (#1314)
fd693e4 Support entry version in Write batch (#1310)
f9332eb Disable go 1.11 builds on travis (#1306)
09dd2e1 Replace EventLog with Logger (#1203)
4f6763c Add leveled logging (#1249)
30eeec2 Update issue template (#1295)
8097259 Proto: make badger/v2 compatible with v1 (#1293)
2e708d9 Fail fast if cgo is disabled and compression is ZSTD (#1284)
6e032c0 Fix race condition in DoesNotHave (#1287)
fa94030 Fix Sequence generates duplicate values (#1281)
69f35b3 Add go_package in .proto (#1282)
5f48d42 Disable eventlogging by default (#1285)
4b539b9 Update Project Status in readme.md (#1274)
```

(cherry picked from commit 7b37ddb)
Run go mod tidy
a3ebe7b
Fix badger options
f6329b1
danielmai
danielmai suggested changes Apr 22, 2020
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.

Reviewed 10 of 10 files at r1.
Reviewable status: all files reviewed, 2 unresolved discussions (waiting on @jarifibrahim, @manishrjain, @martinmr, and @MichaelJCompton)

worker/server_state.go, line 163 at r1 (raw file):

		opt.EncryptionKey = key

		opt.ZSTDCompressionLevel = 3

Is the compression level supposed to change from 1 to 3?

worker/server_state.go, line 186 at r1 (raw file):

		opt.EncryptionKey = key

		opt.ZSTDCompressionLevel = 3

Again, is the compression level supposed to change from 1 to 3?

jarifibrahim
jarifibrahim commented Apr 22, 2020
View reviewed changes
Copy link
Contributor Author

@jarifibrahim jarifibrahim left a comment

Choose a reason for hiding this comment

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

Reviewable status: all files reviewed, 2 unresolved discussions (waiting on @danielmai, @manishrjain, @martinmr, and @MichaelJCompton)

worker/server_state.go, line 163 at r1 (raw file):

Previously, danielmai (Daniel Mai) wrote…

Is the compression level supposed to change from 1 to 3?

Master uses compress level 3. That's why I changed it for release/v1.2 branch as well.

worker/server_state.go, line 186 at r1 (raw file):

Previously, danielmai (Daniel Mai) wrote…

Again, is the compression level supposed to change from 1 to 3?

Master uses compress level 3. That's why I changed it for release/v1.2 branch as well.

@danielmai danielmai merged commit 49a8bd3 into release/v1.2 Apr 22, 2020
@danielmai danielmai deleted the ibrahim/release-v1.2-update-badger branch April 22, 2020 17:53
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@danielmai danielmai danielmai requested changes

@manishrjain manishrjain Awaiting requested review from manishrjain

@martinmr martinmr Awaiting requested review from martinmr

@MichaelJCompton MichaelJCompton Awaiting requested review from MichaelJCompton

Assignees
No one assigned
Labels
None yet
Milestone
No milestone
Development

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