Merge pull request #3326 from dolthub/nicktobey/describe

Skip expected estimates and analysis for keyless table plan tests

Author: nicktobey

enginetest/enginetests.go

@@ -724,12 +724,12 @@ func TestQueryPlan(t *testing.T, harness Harness, e QueryEngine, tt queries.Quer
 		runTestWithDescribeOptions(t, tt.Query, tt.ExpectedPlan, sql.DescribeOptions{
 			Debug: true,
 		})
-		if tt.ExpectedEstimates != "" {
+		if tt.ExpectedEstimates != "" && tt.ExpectedEstimates != "skip" {
 			runTestWithDescribeOptions(t, tt.Query, tt.ExpectedEstimates, sql.DescribeOptions{
 				Estimates: true,
 			})
 		}
-		if tt.ExpectedAnalysis != "" {
+		if tt.ExpectedAnalysis != "" && tt.ExpectedAnalysis != "skip" {
 			runTestWithDescribeOptions(t, tt.Query, tt.ExpectedAnalysis, sql.DescribeOptions{
 				Estimates: true,
 				Analyze:   true,

enginetest/plangen/cmd/plangen/main.go

@@ -209,19 +209,28 @@ func generatePlansForSuite(spec PlanSpec, w *bytes.Buffer) error {
 
 			if node.IsReadOnly() {
 				_, _ = w.WriteString(`ExpectedEstimates: `)
-				planString = sql.Describe(enginetest.ExtractQueryNode(node), sql.DescribeOptions{
-					Estimates: true,
-				})
+				var planString string
+				if tt.ExpectedEstimates != "skip" {
+					planString = sql.Describe(enginetest.ExtractQueryNode(node), sql.DescribeOptions{
+						Estimates: true,
+					})
+				} else {
+					planString = "skip"
+				}
 				writePlanString(w, planString)
-				err = enginetest.ExecuteNode(ctx, engine, node)
-				if err != nil {
-					exit(fmt.Errorf("%w\nfailed to execute query: %s", err, tt.Query))
+				if tt.ExpectedAnalysis != "skip" {
+					err = enginetest.ExecuteNode(ctx, engine, node)
+					if err != nil {
+						exit(fmt.Errorf("%w\nfailed to execute query: %s", err, tt.Query))
+					}
+					_, _ = w.WriteString(`ExpectedAnalysis: `)
+					planString = sql.Describe(enginetest.ExtractQueryNode(node), sql.DescribeOptions{
+						Analyze:   true,
+						Estimates: true,
+					})
+				} else {
+					planString = "skip"
 				}
-				_, _ = w.WriteString(`ExpectedAnalysis: `)
-				planString = sql.Describe(enginetest.ExtractQueryNode(node), sql.DescribeOptions{
-					Analyze:   true,
-					Estimates: true,
-				})
 				writePlanString(w, planString)
 			}
 		} else {