ctlv3: default sort order on missing sort target

Address etcd-io#6671.
gyuho · Oct 18, 2016 · 1531a5d · 1531a5d
1 parent 20bdb31
commit 1531a5d
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 0 deletions.
diff --git a/e2e/ctl_v3_kv_test.go b/e2e/ctl_v3_kv_test.go
@@ -85,6 +85,7 @@ func getTest(cx ctlCtx) {
 		{[]string{"key", "--prefix", "--limit=2"}, kvs[:2]},
 		{[]string{"key", "--prefix", "--order=ASCEND", "--sort-by=MODIFY"}, kvs},
 		{[]string{"key", "--prefix", "--order=ASCEND", "--sort-by=VERSION"}, kvs},
+		{[]string{"key", "--prefix", "--sort-by=CREATE"}, kvs}, // ASCEND by default
 		{[]string{"key", "--prefix", "--order=DESCEND", "--sort-by=CREATE"}, revkvs},
 		{[]string{"key", "--prefix", "--order=DESCEND", "--sort-by=KEY"}, revkvs},
 	}

diff --git a/etcdctl/ctlv3/command/get_command.go b/etcdctl/ctlv3/command/get_command.go
@@ -137,6 +137,13 @@ func getGetOp(cmd *cobra.Command, args []string) (string, []clientv3.OpOption) {
 		ExitWithError(ExitBadFeature, fmt.Errorf("bad sort target %v", getSortTarget))
 	}
 
+	if sortByTarget != clientv3.SortByKey && sortByOrder == clientv3.SortNone {
+		// Since current mvcc.Range implementation returns results
+		// sorted by keys in lexiographically ascending order,
+		// set the default sort order when target is not 'KEY'
+		sortByOrder = clientv3.SortAscend
+	}
+
 	opts = append(opts, clientv3.WithSort(sortByTarget, sortByOrder))
 
 	if getPrefix {