Skip to content

use stream writer for full snapshot transfer #3442

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 8 commits into from
May 21, 2019
Merged

use stream writer for full snapshot transfer #3442

Show file tree
Hide file tree
Changes from 5 commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
c23fc7a
Taking in the stream writer from badger and Manish's change to add st…
May 17, 2019
ba2fe88
Renaming the TxnWriter Send to Write to be consistent with the stream…
May 17, 2019
2b80ceb
Changing the TxnWriter method signature to take in a pb.KVList define…
May 17, 2019
2859269
Bring in the updated badger API change
May 17, 2019
86f6751
Bring back the logic to flaten the pstore
May 17, 2019
55f42b7
Merge branch 'master' into gitlw/use-swriter
May 20, 2019
d0b5356
Addressed Manish's comments
May 20, 2019
fa44316
Removing the dropAll, since Prepare does the DropAll operation
May 21, 2019
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 ee/backup/run.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -241,7 +241,7 @@ func runRestore(pdir, location string) (uint64, error) {
fmt.Println("Creating new db:", bo.Dir)
}
}
return db.Load(r)
return db.Load(r, 16)
})
}

Expand Down
4 changes: 2 additions & 2 deletions posting/writer.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ import (
"sync"

"github.com/dgraph-io/badger"
"github.com/dgraph-io/dgraph/protos/pb"
"github.com/dgraph-io/badger/pb"
"github.com/golang/glog"
)

Expand Down Expand Up @@ -51,7 +51,7 @@ func (w *TxnWriter) cb(err error) {
}
}

func (w *TxnWriter) Send(kvs *pb.KVS) error {
func (w *TxnWriter) Write(kvs *pb.KVList) error {
for _, kv := range kvs.Kv {
var meta byte
if len(kv.UserMeta) > 0 {
Expand Down
139 changes: 75 additions & 64 deletions vendor/github.com/dgraph-io/badger/backup.go
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

41 changes: 29 additions & 12 deletions vendor/github.com/dgraph-io/badger/batch.go
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Loading