cmd/dev: add generate parser subcommand

This commit separates out the generated files needed for the parser into a
separate genbzl target and then add a reference to that target from dev.

You can now run `./dev generate parser` to regenerate the parser files.

Release note: None

dev

@@ -3,7 +3,7 @@
 set -euo pipefail
 
 # Bump this counter to force rebuilding `dev` on all machines.
-DEV_VERSION=38
+DEV_VERSION=39
 
 THIS_DIR=$(cd "$(dirname "$0")" && pwd)
 BINARY_DIR=$THIS_DIR/bin/dev-versions

pkg/cmd/dev/generate.go

@@ -40,6 +40,7 @@ func makeGenerateCmd(runE func(cmd *cobra.Command, args []string) error) *cobra.
         dev generate go        # generates go code (execgen, stringer, protobufs, etc.), plus everything 'cgo' generates
         dev generate go_nocgo  # generates go code (execgen, stringer, protobufs, etc.)
         dev generate protobuf  # *.pb.go files (subset of 'dev generate go')
+        dev generate parser    # sql.go and parser dependencies (subset of 'dev generate go')
 `,
 		Args: cobra.MinimumNArgs(0),
 		// TODO(irfansharif): Errors but default just eaten up. Let's wrap these
@@ -65,6 +66,7 @@ func (d *dev) generate(cmd *cobra.Command, targets []string) error {
 		"go":       d.generateGo,
 		"go_nocgo": d.generateGoNoCgo,
 		"protobuf": d.generateProtobuf,
+		"parser":   d.generateParser,
 	}
 
 	if len(targets) == 0 {
@@ -175,6 +177,10 @@ func (d *dev) generateProtobuf(cmd *cobra.Command) error {
 	return d.generateTarget(cmd.Context(), "//pkg/gen:go_proto")
 }
 
+func (d *dev) generateParser(cmd *cobra.Command) error {
+	return d.generateTarget(cmd.Context(), "//pkg/gen:parser")
+}
+
 func (d *dev) generateTarget(ctx context.Context, target string) error {
 	if err := d.exec.CommandContextInheritingStdStreams(
 		ctx, "bazel", "run", target,

pkg/gen/BUILD.bazel

@@ -1,4 +1,4 @@
-load(":gen.bzl", "bindata", "docs", "execgen", "gen", "go_proto", "gomock", "misc", "optgen", "stringer")
+load(":gen.bzl", "bindata", "docs", "execgen", "gen", "go_proto", "gomock", "misc", "optgen", "parser", "stringer")
 
 bindata()
 
@@ -16,6 +16,8 @@ misc()
 
 docs()
 
+parser()
+
 gen(
     name = "gen",
     srcs = [
@@ -33,6 +35,7 @@ gen(
         ":gomock",
         ":misc",
         ":optgen",
+        ":parser",
         ":stringer",
     ],
 )

pkg/gen/gen.bzl

@@ -27,6 +27,7 @@ load(":misc.bzl", "MISC_SRCS")
 load(":optgen.bzl", "OPTGEN_SRCS")
 load(":protobuf.bzl", "PROTOBUF_SRCS")
 load(":stringer.bzl", "STRINGER_SRCS")
+load(":parser.bzl", "PARSER_SRCS")
 
 # GeneratedFileInfo provides two pieces of information to the _hoist_files
 # rule. It provides the set of files to be hoisted via the generated_files
@@ -281,5 +282,11 @@ def bindata():
     srcs = BINDATA_SRCS,
   )
 
+def parser():
+  _hoist_no_prefix(
+    name = "parser",
+    srcs = PARSER_SRCS,
+  )
+
 def gen(name, srcs):
   _hoist_files(name = name, data = srcs, tags = ["no-remote-exec"])

pkg/gen/genbzl/targets.go

@@ -59,6 +59,10 @@ in $og - filter(".*:.*(-gen|gen-).*", $og)`,
 kind("generated file", //docs/...:*)
   - labels("outs", //docs/generated/sql/bnf:svg)`,
 	},
+	{
+		target: "parser",
+		query:  `labels("outs", kind("genrule rule", //pkg/sql/sem/... + //pkg/sql/parser/... + //pkg/sql/lexbase/...))`,
+	},
 	{
 		target: "excluded",
 		query: `
@@ -88,6 +92,7 @@ kind("generated file", {{ .All }}) - (
   + {{ template "optgen" $ }}
   + {{ template "docs" $ }}
   + {{ template "excluded" $ }}
+  + {{ template "parser" $ }}
 )`,
 	},
 }

pkg/gen/misc.bzl

@@ -9,19 +9,11 @@ MISC_SRCS = [
   "//pkg/roachprod/vm/aws:terraform/main.tf",
   "//pkg/spanconfig/spanconfigstore:entry_interval_btree.go",
   "//pkg/spanconfig/spanconfigstore:entry_interval_btree_test.go",
-  "//pkg/sql/lexbase:keywords.go",
-  "//pkg/sql/lexbase:reserved_keywords.go",
-  "//pkg/sql/lexbase:tokens.go",
-  "//pkg/sql/parser:help_messages.go",
-  "//pkg/sql/parser:helpmap_test.go",
-  "//pkg/sql/parser:sql.go",
   "//pkg/sql/schemachanger/scop:backfill_visitor_generated.go",
   "//pkg/sql/schemachanger/scop:mutation_visitor_generated.go",
   "//pkg/sql/schemachanger/scop:validation_visitor_generated.go",
   "//pkg/sql/schemachanger/scpb:elements_generated.go",
   "//pkg/sql/schemachanger/scpb:uml/table.puml",
-  "//pkg/sql/sem/tree:eval_expr_generated.go",
-  "//pkg/sql/sem/tree:eval_op_generated.go",
   "//pkg/sql:txnstatetransitions_diagram.gv",
   "//pkg/sql:txnstatetransitions_report.txt",
   "//pkg/util/interval/generic:example_interval_btree.go",

pkg/gen/parser.bzl

@@ -0,0 +1,15 @@
+# Generated by genbzl
+
+PARSER_SRCS = [
+  "//pkg/sql/lexbase:keywords.go",
+  "//pkg/sql/lexbase:reserved_keywords.go",
+  "//pkg/sql/lexbase:tokens.go",
+  "//pkg/sql/parser:help_messages.go",
+  "//pkg/sql/parser:helpmap_test.go",
+  "//pkg/sql/parser:sql.go",
+  "//pkg/sql/sem/tree:createtypevariety_string.go",
+  "//pkg/sql/sem/tree:eval_expr_generated.go",
+  "//pkg/sql/sem/tree:eval_op_generated.go",
+  "//pkg/sql/sem/tree:statementreturntype_string.go",
+  "//pkg/sql/sem/tree:statementtype_string.go",
+]