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.

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

Vendor latest badger #4200

Merged
merged 11 commits into from
Nov 21, 2019
Merged

Vendor latest badger #4200

merged 11 commits into from
Nov 21, 2019

Conversation

jarifibrahim
Copy link
Contributor

@jarifibrahim jarifibrahim commented Oct 21, 2019

This PR updates version of badger to v2.0.0 in Dgraph.
The cache size for Alpha WAL badger and Zero WAL badger instance is 10 MB.
For the Alpha posting badger, the default cache size is 1 GB.


This change is Reviewable

Copy link

@pullrequest pullrequest bot left a comment

Choose a reason for hiding this comment

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

✅ A review job has been created and sent to the PullRequest network.


@jarifibrahim you can click here to see the review status or cancel the code review job.

jarifibrahim pushed a commit to dgraph-io/badger that referenced this pull request Oct 21, 2019
The proto files in the current master are not compatible with the ones in dgraph.
See build for PR dgraph-io/dgraph#4200
```
	[Step 3/5] # github.com/dgraph-io/dgraph/protos/pb
[11:02:11]	[Step 3/5] ../protos/pb/pb.pb.go:7146:29: m.Kv[iNdEx].MarshalToSizedBuffer undefined (type *pb.KV has no field or method MarshalToSizedBuffer)
[11:02:11]	[Step 3/5] ../protos/pb/pb.pb.go:7209:29: m.Kv[iNdEx].MarshalToSizedBuffer undefined (type *pb.KV has no field or method MarshalToSizedBuffer)
[11:02:40]	[Step 3/5] Makefile:66: recipe for target 'install' failed
[11:02:40]	[Step 3/5] make[1]: *** [install] Error 2
[11:02:40]	[Step 3/5] make[1]: Leaving directory '/home/pawan0201/go/src/github.com/dgraph-io/dgraph/dgraph'
[11:02:40]	[Step 3/5] make: *** [install] Error 2
[11:02:40]	[Step 3/5] Makefile:43: recipe for target 'install' failed
[11:02:40]	[Step 3/5] Process exited with code 2
```

https://teamcity.dgraph.io/viewLog.html?buildId=29232&buildTypeId=Dgraph_Blockade&tab=buildLog

This PR updates the proto files in badger. I've run `./gen.sh` script to regenerate these.
worker/draft.go Show resolved Hide resolved
dgraph/cmd/bulk/reduce.go Outdated Show resolved Hide resolved
Copy link

@pullrequest pullrequest bot left a comment

Choose a reason for hiding this comment

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

✖️ This code review was cancelled. See Details

@jarifibrahim jarifibrahim changed the title [Do Not Review/Merge] Badger with cache Vendor latest badger Nov 20, 2019
@jarifibrahim jarifibrahim marked this pull request as ready for review November 20, 2019 14:29
Copy link
Contributor

@manishrjain manishrjain left a comment

Choose a reason for hiding this comment

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

:lgtm: Approved.

Reviewed 6 of 53 files at r1, 49 of 49 files at r2.
Reviewable status: all files reviewed, 2 unresolved discussions (waiting on @jarifibrahim and @martinmr)

@jarifibrahim jarifibrahim merged commit 51b4664 into master Nov 21, 2019
@jarifibrahim jarifibrahim deleted the ibrahim/badger-new branch November 21, 2019 09:04
manishrjain pushed a commit to outcaste-io/outserv that referenced this pull request Jul 6, 2022
The proto files in the current master are not compatible with the ones in dgraph.
See build for PR dgraph-io/dgraph#4200
```
	[Step 3/5] # github.com/dgraph-io/dgraph/protos/pb
[11:02:11]	[Step 3/5] ../protos/pb/pb.pb.go:7146:29: m.Kv[iNdEx].MarshalToSizedBuffer undefined (type *pb.KV has no field or method MarshalToSizedBuffer)
[11:02:11]	[Step 3/5] ../protos/pb/pb.pb.go:7209:29: m.Kv[iNdEx].MarshalToSizedBuffer undefined (type *pb.KV has no field or method MarshalToSizedBuffer)
[11:02:40]	[Step 3/5] Makefile:66: recipe for target 'install' failed
[11:02:40]	[Step 3/5] make[1]: *** [install] Error 2
[11:02:40]	[Step 3/5] make[1]: Leaving directory '/home/pawan0201/go/src/github.com/dgraph-io/dgraph/dgraph'
[11:02:40]	[Step 3/5] make: *** [install] Error 2
[11:02:40]	[Step 3/5] Makefile:43: recipe for target 'install' failed
[11:02:40]	[Step 3/5] Process exited with code 2
```

https://teamcity.dgraph.io/viewLog.html?buildId=29232&buildTypeId=Dgraph_Blockade&tab=buildLog

This PR updates the proto files in badger. I've run `./gen.sh` script to regenerate these.
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Development

Successfully merging this pull request may close these issues.

3 participants