Merge branch 'main' into james/ctx

Author: James Cor

enginetest/enginetests.go

@@ -4773,12 +4773,11 @@ func TestTracing(t *testing.T, harness Harness) {
 	require.NoError(t, err)
 
 	spans := tracer.Spans
-	// TODO restore TopN
 	var expectedSpans = []string{
-		"plan.Limit",
+		"plan.Limit", // why Limit if there's already TopN?
+		"plan.TopN",
 		"plan.Distinct",
 		"plan.Project",
-		"plan.Sort",
 		"plan.IndexedTableAccess",
 	}
 

enginetest/queries/imdb_plans.go

@@ -10019,6 +10019,103 @@ from typestable`,
 			{uint32(1000)},
 		},
 	},
+
+	{
+		Query: `select distinct pk1 from two_pk order by pk1`,
+		Expected: []sql.Row{
+			{0},
+			{1},
+		},
+	},
+	{
+		Query: `select distinct pk2 from two_pk order by pk2`,
+		Expected: []sql.Row{
+			{0},
+			{1},
+		},
+	},
+	{
+		Query: `select distinct pk1 from two_pk order by pk2`,
+		Expected: []sql.Row{
+			{0},
+			{1},
+		},
+	},
+	{
+		Query: `select distinct pk2 from two_pk order by pk1`,
+		Expected: []sql.Row{
+			{0},
+			{1},
+		},
+	},
+	{
+		Query: `select distinct pk1, pk2 from two_pk order by pk1`,
+		Expected: []sql.Row{
+			{0, 0},
+			{0, 1},
+			{1, 0},
+			{1, 1},
+		},
+	},
+	{
+		Query: `select distinct pk1, pk2 from two_pk order by pk2`,
+		Expected: []sql.Row{
+			{0, 0},
+			{1, 0},
+			{0, 1},
+			{1, 1},
+		},
+	},
+	{
+		Query: `select distinct pk1, pk2 from two_pk order by pk1, pk2`,
+		Expected: []sql.Row{
+			{0, 0},
+			{0, 1},
+			{1, 0},
+			{1, 1},
+		},
+	},
+	{
+		Query: `select distinct pk1, pk2 from two_pk order by pk2, pk1`,
+		Expected: []sql.Row{
+			{0, 0},
+			{1, 0},
+			{0, 1},
+			{1, 1},
+		},
+	},
+	{
+		Query: `select distinct pk2, pk1 from two_pk order by pk1, pk2`,
+		Expected: []sql.Row{
+			{0, 0},
+			{1, 0},
+			{0, 1},
+			{1, 1},
+		},
+	},
+	{
+		Query: `select distinct pk2, pk1 from two_pk order by pk2, pk1`,
+		Expected: []sql.Row{
+			{0, 0},
+			{0, 1},
+			{1, 0},
+			{1, 1},
+		},
+	},
+	{
+		Query: `select distinct pk1 + 1 from two_pk order by pk1 + 1`,
+		Expected: []sql.Row{
+			{1},
+			{2},
+		},
+	},
+	{
+		Query: `select distinct pk2 + 1 from two_pk order by pk2 + 1`,
+		Expected: []sql.Row{
+			{1},
+			{2},
+		},
+	},
 }
 
 var KeylessQueries = []QueryTest{