sem/builtins: break dependency on sql/parser

This is achieved by injecting a couple of functions when initializing
the sql package.

Release note: None

Author: yuzefovich

pkg/sql/exec_util.go

@@ -151,7 +151,10 @@ func init() {
 // DoParserInjection performs all the necessary sql/parser injections within the
 // sql directory.
 func DoParserInjection() {
+	parserutils.Parse = parser.Parse
+	parserutils.ParseExpr = parser.ParseExpr
 	parserutils.ParseOne = parser.ParseOne
+	parserutils.ParseQualifiedTableName = parser.ParseQualifiedTableName
 }
 
 // ClusterOrganization is the organization name.

pkg/sql/opt/workloadindexrec/BUILD.bazel

@@ -9,7 +9,7 @@ go_library(
     importpath = "github.com/cockroachdb/cockroach/pkg/sql/opt/workloadindexrec",
     visibility = ["//visibility:public"],
     deps = [
-        "//pkg/sql/parser",
+        "//pkg/sql/parserutils",
         "//pkg/sql/sem/eval",
         "//pkg/sql/sem/idxtype",
         "//pkg/sql/sem/tree",

pkg/sql/opt/workloadindexrec/workload_indexrecs.go

@@ -9,7 +9,7 @@ import (
 	"context"
 	"regexp"
 
-	"github.com/cockroachdb/cockroach/pkg/sql/parser"
+	"github.com/cockroachdb/cockroach/pkg/sql/parserutils"
 	"github.com/cockroachdb/cockroach/pkg/sql/sem/eval"
 	"github.com/cockroachdb/cockroach/pkg/sql/sem/idxtype"
 	"github.com/cockroachdb/cockroach/pkg/sql/sem/tree"
@@ -72,7 +72,6 @@ func collectIndexRecs(
 		return nil, nil, err
 	}
 
-	var p parser.Parser
 	var cis []createIndex
 	var dis []dropIndex
 	var ok bool
@@ -118,7 +117,7 @@ func collectIndexRecs(
 				continue
 			}
 
-			stmts, err := p.Parse(indexStrArr[2])
+			stmts, err := parserutils.Parse(indexStrArr[2])
 			if err != nil {
 				err = errors.CombineErrors(errors.Newf("%s is not a valid index operation!", indexStrArr[2]), indexRecs.Close())
 				indexRecs = nil

pkg/sql/parserutils/utils.go

@@ -57,8 +57,26 @@ func PopulateErrorDetails(
 	return errors.WithDetail(retErr, buf.String())
 }
 
+// Parse is the same as sql/parser.Parse but is injected to avoid a dependency
+// on the parser package.
+var Parse = func(sql string) (statements.Statements, error) {
+	return statements.Statements{}, errors.AssertionFailedf("sql.DoParserInjection hasn't been called")
+}
+
+// ParseExpr is the same as sql/parser.ParseExpr but is injected to avoid a
+// dependency on the parser package.
+var ParseExpr = func(sql string) (tree.Expr, error) {
+	return nil, errors.AssertionFailedf("sql.DoParserInjection hasn't been called")
+}
+
 // ParseOne is the same as sql/parser.ParseOne but is injected to avoid a
 // dependency on the parser package.
 var ParseOne = func(sql string) (statements.Statement[tree.Statement], error) {
 	return statements.Statement[tree.Statement]{}, errors.AssertionFailedf("sql.DoParserInjection hasn't been called")
 }
+
+// ParseQualifiedTableName is the same as sql/parser.ParseQualifiedTableName but
+// is injected to avoid a dependency on the parser package.
+var ParseQualifiedTableName = func(sql string) (*tree.TableName, error) {
+	return nil, errors.AssertionFailedf("sql.DoParserInjection hasn't been called")
+}

pkg/sql/rowenc/BUILD.bazel

@@ -25,7 +25,7 @@ go_library(
         "//pkg/sql/catalog/descpb",
         "//pkg/sql/catalog/fetchpb",
         "//pkg/sql/inverted",
-        "//pkg/sql/parser",
+        "//pkg/sql/parserutils",
         "//pkg/sql/rowenc/keyside",
         "//pkg/sql/rowenc/rowencpb",
         "//pkg/sql/rowenc/valueside",

pkg/sql/rowenc/roundtrip_format.go

@@ -8,7 +8,7 @@ package rowenc
 import (
 	"context"
 
-	"github.com/cockroachdb/cockroach/pkg/sql/parser"
+	"github.com/cockroachdb/cockroach/pkg/sql/parserutils"
 	"github.com/cockroachdb/cockroach/pkg/sql/sem/eval"
 	"github.com/cockroachdb/cockroach/pkg/sql/sem/tree"
 	"github.com/cockroachdb/cockroach/pkg/sql/types"
@@ -37,7 +37,7 @@ func ParseDatumStringAs(
 func parseAsTyp(
 	ctx context.Context, evalCtx *eval.Context, semaCtx *tree.SemaContext, typ *types.T, s string,
 ) (tree.Datum, error) {
-	expr, err := parser.ParseExpr(s)
+	expr, err := parserutils.ParseExpr(s)
 	if err != nil {
 		return nil, err
 	}

pkg/sql/sem/builtins/BUILD.bazel

@@ -71,7 +71,7 @@ go_library(
         "//pkg/sql/memsize",
         "//pkg/sql/oidext",
         "//pkg/sql/opt/workloadindexrec",
-        "//pkg/sql/parser",
+        "//pkg/sql/parserutils",
         "//pkg/sql/pgwire/pgcode",
         "//pkg/sql/pgwire/pgerror",
         "//pkg/sql/pgwire/pgnotice",
@@ -242,5 +242,6 @@ disallowed_imports_test(
         "//pkg/sql/catalog/schemadesc",
         "//pkg/sql/catalog/dbdesc",
         "//pkg/sql/catalog/typedesc",
+        "//pkg/sql/parser",
     ],
 )

pkg/sql/sem/builtins/builtins.go

@@ -48,7 +48,7 @@ import (
 	"github.com/cockroachdb/cockroach/pkg/sql/colexecerror"
 	"github.com/cockroachdb/cockroach/pkg/sql/lex"
 	"github.com/cockroachdb/cockroach/pkg/sql/lexbase"
-	"github.com/cockroachdb/cockroach/pkg/sql/parser"
+	"github.com/cockroachdb/cockroach/pkg/sql/parserutils"
 	"github.com/cockroachdb/cockroach/pkg/sql/pgwire/pgcode"
 	"github.com/cockroachdb/cockroach/pkg/sql/pgwire/pgerror"
 	"github.com/cockroachdb/cockroach/pkg/sql/pgwire/pgnotice"
@@ -7820,7 +7820,7 @@ enabled.`,
 		},
 		stringOverload1(
 			func(_ context.Context, _ *eval.Context, s string) (tree.Datum, error) {
-				stmt, err := parser.ParseOne(s)
+				stmt, err := parserutils.ParseOne(s)
 				if err != nil {
 					// Return the same statement if it does not parse.
 					// This can happen for invalid zone config state, in which case
@@ -8659,7 +8659,7 @@ specified store on the node it's run from. One of 'mvccGC', 'merge', 'split',
 					return tree.NewDString(""), nil
 				}
 
-				parsed, err := parser.ParseOne(sql)
+				parsed, err := parserutils.ParseOne(sql)
 				if err != nil {
 					// If parsing is unsuccessful, we shouldn't return an error, however
 					// we can't return the original stmt since this function is used to
@@ -8693,7 +8693,7 @@ specified store on the node it's run from. One of 'mvccGC', 'merge', 'split',
 					sqlNoConstants := ""
 
 					if len(sql) != 0 {
-						parsed, err := parser.ParseOne(sql)
+						parsed, err := parserutils.ParseOne(sql)
 						// Leave result as empty string on parsing error.
 						if err == nil {
 							sqlNoConstants = tree.AsStringWithFlags(parsed.AST, tree.FmtHideConstants)
@@ -8788,7 +8788,7 @@ specified store on the node it's run from. One of 'mvccGC', 'merge', 'split',
 	},
 		stringOverload1(
 			func(_ context.Context, _ *eval.Context, sql string) (tree.Datum, error) {
-				parsed, err := parser.ParseOne(sql)
+				parsed, err := parserutils.ParseOne(sql)
 				if err != nil {
 					// If parsing was unsuccessful, mark the entire string as redactable.
 					return tree.NewDString(string(redact.Sprintf("%s", sql))), nil //nolint:returnerrcheck
@@ -8821,7 +8821,7 @@ specified store on the node it's run from. One of 'mvccGC', 'merge', 'split',
 					sql := string(tree.MustBeDString(sqlDatum))
 					sqlRedactable := ""
 
-					parsed, err := parser.ParseOne(sql)
+					parsed, err := parserutils.ParseOne(sql)
 					if err != nil {
 						// If parsing was unsuccessful, mark the entire string as redactable.
 						sqlRedactable = string(redact.Sprintf("%s", sql))
@@ -12416,7 +12416,7 @@ func prettyStatementCustomConfig(
 }
 
 func prettyStatement(p tree.PrettyCfg, stmt string) (string, error) {
-	stmts, err := parser.Parse(stmt)
+	stmts, err := parserutils.Parse(stmt)
 	if err != nil {
 		return "", err
 	}
@@ -12748,7 +12748,7 @@ func makeBackupASTFromStmt(
 	backupStmt tree.Datum,
 ) (*tree.Backup, jobspb.BackupEncryptionOptions, error) {
 	stmt := string(tree.MustBeDString(backupStmt))
-	ast, err := parser.ParseOne(stmt)
+	ast, err := parserutils.ParseOne(stmt)
 	if err != nil {
 		return nil, jobspb.BackupEncryptionOptions{}, err
 	}

pkg/sql/sem/builtins/generator_builtins.go

@@ -24,7 +24,7 @@ import (
 	"github.com/cockroachdb/cockroach/pkg/settings"
 	"github.com/cockroachdb/cockroach/pkg/sql/lexbase"
 	"github.com/cockroachdb/cockroach/pkg/sql/opt/workloadindexrec"
-	"github.com/cockroachdb/cockroach/pkg/sql/parser"
+	"github.com/cockroachdb/cockroach/pkg/sql/parserutils"
 	"github.com/cockroachdb/cockroach/pkg/sql/pgwire/pgcode"
 	"github.com/cockroachdb/cockroach/pkg/sql/pgwire/pgerror"
 	"github.com/cockroachdb/cockroach/pkg/sql/privilege"
@@ -4060,7 +4060,7 @@ func makeInternallyExecutedQueryGeneratorOverload(
 			// internal executor will parse the query too, but we'd get an
 			// assertion failure error if we gave it more than one statement -
 			// we catch those cases here.
-			stmts, err := parser.Parse(query)
+			stmts, err := parserutils.Parse(query)
 			if err != nil {
 				return nil, err
 			}

pkg/sql/sem/builtins/geo_builtins.go

@@ -23,7 +23,7 @@ import (
 	"github.com/cockroachdb/cockroach/pkg/geo/twkb"
 	"github.com/cockroachdb/cockroach/pkg/kv"
 	"github.com/cockroachdb/cockroach/pkg/sql/catalog/descpb"
-	"github.com/cockroachdb/cockroach/pkg/sql/parser"
+	"github.com/cockroachdb/cockroach/pkg/sql/parserutils"
 	"github.com/cockroachdb/cockroach/pkg/sql/pgwire/pgcode"
 	"github.com/cockroachdb/cockroach/pkg/sql/pgwire/pgerror"
 	"github.com/cockroachdb/cockroach/pkg/sql/sem/builtins/builtinconstants"
@@ -7988,7 +7988,7 @@ func applyGeoindexConfigStorageParams(
 	ctx context.Context, evalCtx *eval.Context, cfg geopb.Config, params string,
 ) (geopb.Config, error) {
 	indexDesc := &descpb.IndexDescriptor{GeoConfig: cfg}
-	stmt, err := parser.ParseOne(
+	stmt, err := parserutils.ParseOne(
 		fmt.Sprintf("CREATE INDEX t_idx ON t USING GIST(geom) WITH (%s)", params),
 	)
 	if err != nil {