move group by validation to before filters get pushed down

Author: angelamayxie

enginetest/queries/queries.go

@@ -9366,6 +9366,14 @@ from typestable`,
 		Query:    "select y + 1 as z from xy group by (z) having AVG(z) > 1",
 		Expected: []sql.Row{{2}, {3}, {4}},
 	},
+	{
+		Query:    "select c1, c2 from one_pk where pk = 0 group by c1",
+		Expected: []sql.Row{{0, 1}},
+	},
+	{
+		Query:    "select c1, c2 from one_pk where c2 = 1 group by c1",
+		Expected: []sql.Row{{0, 1}},
+	},
 }
 
 var KeylessQueries = []QueryTest{

sql/analyzer/rule_ids.go

@@ -25,6 +25,7 @@ const (
 	validateReadOnlyTransactionId               // validateReadOnlyTransaction
 	validateDatabaseSetId                       // validateDatabaseSet
 	validatePrivilegesId                        // validatePrivileges
+	validateGroupById                           // validateGroupBy
 
 	// default
 	flattenTableAliasesId          // flattenTableAliases
@@ -70,7 +71,6 @@ const (
 	// validate
 	validateResolvedId          // validateResolved
 	validateOrderById           // validateOrderBy
-	validateGroupById           // validateGroupBy
 	validateSchemaSourceId      // validateSchemaSource
 	validateIndexCreationId     // validateIndexCreation
 	ValidateOperandsId          // validateOperands

sql/analyzer/ruleid_string.go

@@ -52,6 +52,7 @@ var OnceBeforeDefault = []Rule{
 	{simplifyFiltersId, simplifyFilters}, //TODO inline?
 	{pushNotFiltersId, pushNotFilters},   //TODO inline?
 	{hoistOutOfScopeFiltersId, hoistOutOfScopeFilters},
+	{validateGroupById, validateGroupBy},
 }
 
 // AlwaysBeforeDefault contains the rules to be applied just once before the
@@ -99,7 +100,6 @@ var OnceAfterDefault = []Rule{
 var DefaultValidationRules = []Rule{
 	{validateResolvedId, validateResolved},
 	{validateOrderById, validateOrderBy},
-	{validateGroupById, validateGroupBy},
 	{validateSchemaSourceId, validateSchemaSource},
 	{validateIndexCreationId, validateIndexCreation},
 	{ValidateOperandsId, validateOperands},