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

Remove ignore index conflict from various places #3854

Merged
merged 1 commit into from
Aug 23, 2019
Merged

Remove ignore index conflict from various places #3854

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
10 changes: 5 additions & 5 deletions dgraph/cmd/alpha/http_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -158,8 +158,8 @@ func queryWithTs(queryText, contentType, debug string, ts uint64) (string, uint6
return string(output), startTs, err
}

func mutationWithTs(m, t string, isJson bool, commitNow bool, ignoreIndexConflict bool,
ts uint64) ([]string, []string, uint64, error) {
func mutationWithTs(m, t string, isJson bool, commitNow bool, ts uint64) (
[]string, []string, uint64, error) {

params := make([]string, 2)
if ts != 0 {
Expand Down Expand Up @@ -313,7 +313,7 @@ func TestTransactionBasic(t *testing.T) {
}
`

keys, preds, mts, err := mutationWithTs(m1, "application/rdf", false, false, true, ts)
keys, preds, mts, err := mutationWithTs(m1, "application/rdf", false, false, ts)
require.NoError(t, err)
require.Equal(t, mts, ts)
require.Equal(t, 4, len(keys))
Expand Down Expand Up @@ -367,7 +367,7 @@ func TestTransactionBasicNoPreds(t *testing.T) {
}
`

keys, _, mts, err := mutationWithTs(m1, "application/rdf", false, false, true, ts)
keys, _, mts, err := mutationWithTs(m1, "application/rdf", false, false, ts)
require.NoError(t, err)
require.Equal(t, mts, ts)
require.Equal(t, 4, len(keys))
Expand Down Expand Up @@ -413,7 +413,7 @@ func TestTransactionBasicOldCommitFormat(t *testing.T) {
}
`

keys, _, mts, err := mutationWithTs(m1, "application/rdf", false, false, true, ts)
keys, _, mts, err := mutationWithTs(m1, "application/rdf", false, false, ts)
require.NoError(t, err)
require.Equal(t, mts, ts)
require.Equal(t, 4, len(keys))
Expand Down
4 changes: 2 additions & 2 deletions dgraph/cmd/alpha/run_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -133,12 +133,12 @@ func runJSONQuery(q string) (string, error) {
}

func runMutation(m string) error {
_, _, _, err := mutationWithTs(m, "application/rdf", false, true, false, 0)
_, _, _, err := mutationWithTs(m, "application/rdf", false, true, 0)
return err
}

func runJSONMutation(m string) error {
_, _, _, err := mutationWithTs(m, "application/json", true, true, false, 0)
_, _, _, err := mutationWithTs(m, "application/json", true, true, 0)
return err
}

Expand Down
Loading