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

[Breaking] Remove shorthand for store_xids in bulk loader. #5148

Merged
merged 9 commits into from
Apr 9, 2020
Merged

[Breaking] Remove shorthand for store_xids in bulk loader. #5148

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
f4c8af0
Added support for xidmap in bulkloader
all-seeing-code Apr 3, 2020
86d1c97
Removed options as per review
all-seeing-code Apr 6, 2020
da87074
Remove unnecessary conditional block
all-seeing-code Apr 6, 2020
2ac0e04
Close the db
all-seeing-code Apr 7, 2020
e784930
Minor formatting
all-seeing-code Apr 7, 2020
0853225
Do not close a nil db
all-seeing-code Apr 7, 2020
dcf1590
Remove shorthand for store_xids to avoid confusion with xidmap
all-seeing-code Apr 9, 2020
d8e482f
Merge remote-tracking branch 'origin/master' into anurags92/xidmap_Bu…
all-seeing-code Apr 9, 2020
c00b04c
Changed flag in the test file since it is no longer supported
all-seeing-code Apr 9, 2020
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 dgraph/cmd/bulk/run.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -79,7 +79,7 @@ func init() {
"Number of reducers to run concurrently. Increasing this can improve performance, and "+
"must be less than or equal to the number of reduce shards.")
flag.Bool("version", false, "Prints the version of Dgraph Bulk Loader.")
flag.BoolP("store_xids", "x", false, "Generate an xid edge for each node.")
flag.Bool("store_xids", false, "Generate an xid edge for each node.")
flag.StringP("zero", "z", "localhost:5080", "gRPC address for Dgraph zero")
flag.String("xidmap", "", "Directory to store xid to uid mapping")
// TODO: Potentially move http server to main.
Expand Down
2 changes: 1 addition & 1 deletion systest/bulk_live_fixture_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -139,7 +139,7 @@ func (s *suite) setup(schemaFile, rdfFile string) {
"-s", schemaFile,
"--http", "localhost:"+strconv.Itoa(freePort(0)),
"-j=1",
"-x=true",
"--store_xids=true",
"-z", "localhost:"+s.bulkCluster.zeroPort,
)
bulkCmd.Dir = bulkDir
Expand Down