Sort moved into RemoveDumplicates

gql/parser.go

@@ -582,7 +582,6 @@ func Parse(r Request) (res Result, rerr error) {
 			for _, v := range res.MutationVars {
 				varNames = append(varNames, v)
 			}
-			sort.Strings(varNames)
 			varNames = x.RemoveDuplicates(varNames)
 
 			allVars = append(allVars, &Vars{Needs: varNames})
@@ -608,9 +607,6 @@ func flatten(vl []*Vars) (needs []string, defines []string) {
 func checkDependency(vl []*Vars) error {
 	needs, defines := flatten(vl)
 
-	sort.Strings(needs)
-	sort.Strings(defines)
-
 	needs = x.RemoveDuplicates(needs)
 
 	if len(defines) != len(x.RemoveDuplicates(defines)) {

gql/parser_test.go

@@ -23,7 +23,6 @@ import (
 
 	"github.com/dgraph-io/dgraph/protos"
 	"github.com/dgraph-io/dgraph/schema"
-	"github.com/dgraph-io/dgraph/x"
 	"github.com/stretchr/testify/require"
 )
 
@@ -3590,16 +3589,6 @@ func TestFilterUid(t *testing.T) {
 	require.Equal(t, []uint64{3, 7}, gql.Query[0].Filter.Func.UID)
 }
 
-func TestRemoveDuplicates(t *testing.T) {
-	set := x.RemoveDuplicates([]string{"a", "a", "a", "b", "b", "c", "c"})
-	require.EqualValues(t, []string{"a", "b", "c"}, set)
-}
-
-func TestRemoveDuplicatesWithoutDuplicates(t *testing.T) {
-	set := x.RemoveDuplicates([]string{"a", "b", "c", "d"})
-	require.EqualValues(t, []string{"a", "b", "c", "d"}, set)
-}
-
 func TestMultipleSetBlocks(t *testing.T) {
 	query := `
 	mutation {

tok/tok.go

@@ -19,7 +19,6 @@ package tok
 
 import (
 	"encoding/binary"
-	"sort"
 	"time"
 
 	farm "github.com/dgryski/go-farm"
@@ -273,7 +272,6 @@ func getBleveTokens(name string, identifier byte, sv types.Val) ([]string, error
 	for i, token := range tokenStream {
 		terms[i] = encodeToken(string(token.Term), identifier)
 	}
-	sort.Strings(terms)
 	terms = x.RemoveDuplicates(terms)
 	return terms, nil
 }
@@ -336,7 +334,6 @@ func (t TrigramTokenizer) Tokens(sv types.Val) ([]string, error) {
 			trigram := value[i : i+3]
 			tokens[i] = encodeToken(trigram, t.Identifier())
 		}
-		sort.Strings(tokens)
 		x.RemoveDuplicates(tokens)
 		return tokens, nil
 	}

x/x.go

@@ -24,6 +24,7 @@ import (
 	"net"
 	"net/http"
 	"regexp"
+	"sort"
 	"strconv"
 	"strings"
 	"time"
@@ -194,8 +195,9 @@ func ValidateAddress(addr string) bool {
 	return regExpHostName.MatchString(host)
 }
 
-// removes duplicates from a sorted slice of strings. Changes underylying array.
+// sorts the slice of strings and removes duplicates. Changes underylying array.
 func RemoveDuplicates(s []string) (out []string) {
+	sort.Strings(s)
 	out = s[:0]
 	for i := range s {
 		if i > 0 && s[i] == s[i-1] {

x/x_test.go

@@ -0,0 +1,32 @@
+/*
+ * Copyright (C) 2017 Dgraph Labs, Inc. and Contributors
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *    http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package x
+
+import (
+	"testing"
+
+	"github.com/stretchr/testify/require"
+)
+
+func TestRemoveDuplicates(t *testing.T) {
+	set := RemoveDuplicates([]string{"a", "a", "a", "b", "b", "c", "c"})
+	require.EqualValues(t, []string{"a", "b", "c"}, set)
+}
+
+func TestRemoveDuplicatesWithoutDuplicates(t *testing.T) {
+	set := RemoveDuplicates([]string{"a", "b", "c", "d"})
+	require.EqualValues(t, []string{"a", "b", "c", "d"}, set)
+}