Revert "feat(query): add feature flag list-in-normalize (#8845)"

This reverts commit d3ec3b9.
                and 6ed8b5c.

dgraph/cmd/alpha/run.go

@@ -260,12 +260,6 @@ they form a Raft group and provide synchronous replication.
 		Flag("size",
 			"The audit log max size in MB after which it will be rolled over.").
 		String())
-
-	flag.String("feature-flags", worker.FeatureFlagsDefaults, z.NewSuperFlagHelp(worker.FeatureFlagsDefaults).
-		Head("Feature flags to enable various experimental features").
-		Flag("list-in-normalize", "enables returning a list when there are multiple fields with same alias, "+
-			"see here for more details https://github.com/dgraph-io/dgraph/pull/7639").
-		String())
 }
 
 func setupCustomTokenizers() {
@@ -743,11 +737,6 @@ func run() {
 	}
 	edgraph.Init()
 
-	// feature flags
-	featureFlagsConf := z.NewSuperFlag(Alpha.Conf.GetString("feature-flags")).MergeAndCheckDefault(
-		worker.FeatureFlagsDefaults)
-	x.Config.ListInNormalize = featureFlagsConf.GetBool("list-in-normalize")
-
 	x.PrintVersion()
 	glog.Infof("x.Config: %+v", x.Config)
 	glog.Infof("x.WorkerConfig: %+v", x.WorkerConfig)

dgraphtest/config.go

@@ -83,8 +83,7 @@ type ClusterConfig struct {
 	refillInterval time.Duration
 	uidLease       int
 	// exposed port offset for grpc/http port for both alpha/zero
-	portOffset   int
-	featureFlags []string
+	portOffset int
 }
 
 func NewClusterConfig() ClusterConfig {
@@ -164,8 +163,3 @@ func (cc ClusterConfig) WithExposedPortOffset(offset uint64) ClusterConfig {
 	cc.portOffset = int(offset)
 	return cc
 }
-
-func (cc ClusterConfig) WithListInNormalize(toggle bool) ClusterConfig {
-	cc.featureFlags = append(cc.featureFlags, fmt.Sprintf("list-in-normalize=%v", toggle))
-	return cc
-}

dgraphtest/dgraph.go

@@ -22,7 +22,6 @@ import (
 	"os"
 	"path/filepath"
 	"strconv"
-	"strings"
 	"time"
 
 	"github.com/docker/docker/api/types/mount"
@@ -234,10 +233,6 @@ func (a *alpha) cmd(c *LocalCluster) []string {
 	}
 	acmd = append(acmd, zeroAddrsArg)
 
-	if len(c.conf.featureFlags) > 0 {
-		acmd = append(acmd, fmt.Sprintf("--feature-flags=%v", strings.Join(c.conf.featureFlags, ";")))
-	}
-
 	return acmd
 }
 

query/outputnode.go

@@ -978,12 +978,9 @@ func (enc *encoder) normalize(fj fastJsonNode) ([]fastJsonNode, error) {
 	}
 
 	for i, slice := range parentSlice {
-		if x.Config.ListInNormalize {
-			// sort the fastJson list. This will ensure that nodes
-			// with same attribute name comes together in response
-			enc.MergeSort(&parentSlice[i])
-		}
-
+		// sort the fastJson list
+		// This will ensure that nodes with same attribute name comes together in response
+		enc.MergeSort(&parentSlice[i])
 		// From every list we need to remove node with attribute "uid".
 		var prev, cur fastJsonNode
 		cur = slice

worker/server_state.go

@@ -52,8 +52,7 @@ const (
 	ZeroLimitsDefaults = `uid-lease=0; refill-interval=30s; disable-admin-http=false;`
 	GraphQLDefaults    = `introspection=true; debug=false; extensions=true; poll-interval=1s; ` +
 		`lambda-url=;`
-	CacheDefaults        = `size-mb=1024; percentage=0,65,35;`
-	FeatureFlagsDefaults = `list-in-normalize=true`
+	CacheDefaults = `size-mb=1024; percentage=0,65,35;`
 )
 
 // ServerState holds the state of the Dgraph server.

x/config.go

@@ -67,9 +67,6 @@ type Options struct {
 	// poll-interval duration - The polling interval for graphql subscription.
 	GraphQL      *z.SuperFlag
 	GraphQLDebug bool
-
-	// feature flags
-	ListInNormalize bool
 }
 
 // Config stores the global instance of this package's options.