sql: remove enterprise check for subzone rep ctrls

With the deprecation of the core license, we no longer need to
an enterprise license check for configuring replication controls
regarding subzones. This patch mainly just performs clean-up -- as
in real servers, we overwrite `base.CheckEnterpriseEnabled` with the
one in `ccl/utilccl/license_check.go`, which always returns true now.

Epic: None

Release note: None

pkg/ccl/partitionccl/zone_test.go

@@ -1067,9 +1067,7 @@ func TestGenerateSubzoneSpans(t *testing.T) {
 			if err != nil {
 				t.Fatalf("%+v", err)
 			}
-			hasNewSubzones := false
-			spans, err := sql.GenerateSubzoneSpans(
-				cluster.NoSettings, keys.SystemSQLCodec, parse.tableDesc, parse.subzones, hasNewSubzones)
+			spans, err := sql.GenerateSubzoneSpans(keys.SystemSQLCodec, parse.tableDesc, parse.subzones)
 			if err != nil {
 				t.Fatalf("generating subzone spans: %+v", err)
 			}

pkg/kv/kvserver/reports/constraint_stats_report_test.go

@@ -1048,9 +1048,7 @@ func generateTableZone(t table, tableDesc descpb.TableDescriptor) (*zonepb.ZoneC
 	// Fill in the SubzoneSpans.
 	if tableZone != nil {
 		var err error
-		tableZone.SubzoneSpans, err = sql.GenerateSubzoneSpans(
-			nil, keys.SystemSQLCodec,
-			tabledesc.NewBuilder(&tableDesc).BuildImmutableTable(), tableZone.Subzones, false /* hasNewSubzones */)
+		tableZone.SubzoneSpans, err = sql.GenerateSubzoneSpans(keys.SystemSQLCodec, tabledesc.NewBuilder(&tableDesc).BuildImmutableTable(), tableZone.Subzones)
 		if err != nil {
 			return nil, errors.Wrap(err, "error generating subzone spans")
 		}

pkg/sql/drop_index.go

@@ -355,13 +355,7 @@ func (p *planner) dropIndexByName(
 
 	for _, s := range zone.Subzones {
 		if s.IndexID != uint32(idx.GetID()) {
-			_, err = GenerateSubzoneSpans(
-				p.ExecCfg().Settings,
-				p.ExecCfg().Codec,
-				tableDesc,
-				zone.Subzones,
-				false, /* newSubzones */
-			)
+			_, err = GenerateSubzoneSpans(p.ExecCfg().Codec, tableDesc, zone.Subzones)
 			if sqlerrors.IsCCLRequiredError(err) {
 				return sqlerrors.NewCCLRequiredError(fmt.Errorf("schema change requires a CCL binary "+
 					"because table %q has at least one remaining index or partition with a zone config",

pkg/sql/partition_utils.go

@@ -8,11 +8,9 @@ package sql
 import (
 	"bytes"
 
-	"github.com/cockroachdb/cockroach/pkg/base"
 	"github.com/cockroachdb/cockroach/pkg/config/zonepb"
 	"github.com/cockroachdb/cockroach/pkg/keys"
 	"github.com/cockroachdb/cockroach/pkg/roachpb"
-	"github.com/cockroachdb/cockroach/pkg/settings/cluster"
 	"github.com/cockroachdb/cockroach/pkg/sql/catalog"
 	"github.com/cockroachdb/cockroach/pkg/sql/catalog/descpb"
 	"github.com/cockroachdb/cockroach/pkg/sql/covering"
@@ -64,20 +62,8 @@ import (
 // TODO(benesch): remove the hasNewSubzones parameter when a statement to clear
 // all subzones at once is introduced.
 func GenerateSubzoneSpans(
-	st *cluster.Settings,
-	codec keys.SQLCodec,
-	tableDesc catalog.TableDescriptor,
-	subzones []zonepb.Subzone,
-	hasNewSubzones bool,
+	codec keys.SQLCodec, tableDesc catalog.TableDescriptor, subzones []zonepb.Subzone,
 ) ([]zonepb.SubzoneSpan, error) {
-	// Removing zone configs does not require a valid license.
-	if hasNewSubzones {
-		if err := base.CheckEnterpriseEnabled(st,
-			"replication zones on indexes or partitions"); err != nil {
-			return nil, err
-		}
-	}
-
 	// We already completely avoid creating subzone spans for dropped indexes.
 	// Whether this was intentional is a different story, but it turns out to be
 	// pretty sane. Dropped elements may refer to dropped types and we aren't

pkg/sql/schemachanger/scbuild/internal/scbuildstmt/BUILD.bazel

@@ -44,7 +44,6 @@ go_library(
     importpath = "github.com/cockroachdb/cockroach/pkg/sql/schemachanger/scbuild/internal/scbuildstmt",
     visibility = ["//pkg/sql/schemachanger/scbuild:__subpackages__"],
     deps = [
-        "//pkg/base",
         "//pkg/build",
         "//pkg/clusterversion",
         "//pkg/config/zonepb",

pkg/sql/schemachanger/scbuild/internal/scbuildstmt/zone_config_helpers.go

@@ -10,7 +10,6 @@ import (
 	"context"
 	"fmt"
 
-	"github.com/cockroachdb/cockroach/pkg/base"
 	"github.com/cockroachdb/cockroach/pkg/config/zonepb"
 	"github.com/cockroachdb/cockroach/pkg/keys"
 	"github.com/cockroachdb/cockroach/pkg/roachpb"
@@ -652,10 +651,6 @@ func accumulateNewUniqueConstraints(currentZone, newZone *zonepb.ZoneConfig) []z
 func generateSubzoneSpans(
 	b BuildCtx, tableID catid.DescID, subzones []zonepb.Subzone,
 ) ([]zonepb.SubzoneSpan, error) {
-	if err := base.CheckEnterpriseEnabled(b.ClusterSettings(),
-		"replication zones on indexes or partitions"); err != nil {
-		return nil, err
-	}
 	// We already completely avoid creating subzone spans for dropped indexes.
 	// Whether this was intentional is a different story, but it turns out to be
 	// pretty sane. Dropped elements may refer to dropped types and we aren't

pkg/sql/set_zone_config.go

@@ -1009,9 +1009,7 @@ func prepareZoneConfigWrites(
 	hasNewSubzones bool,
 ) (_ *zoneConfigUpdate, err error) {
 	if len(z.Subzones) > 0 {
-		st := execCfg.Settings
-		z.SubzoneSpans, err = GenerateSubzoneSpans(
-			st, execCfg.Codec, table, z.Subzones, hasNewSubzones)
+		z.SubzoneSpans, err = GenerateSubzoneSpans(execCfg.Codec, table, z.Subzones)
 		if err != nil {
 			return nil, err
 		}

pkg/sql/sqlnoccltest/BUILD.bazel

@@ -2,25 +2,11 @@ load("@io_bazel_rules_go//go:def.bzl", "go_test")
 
 go_test(
     name = "sqlnoccltest_test",
-    srcs = [
-        "main_test.go",
-        "partition_test.go",
-    ],
+    srcs = ["main_test.go"],
     deps = [
-        "//pkg/base",
-        "//pkg/config/zonepb",
         "//pkg/security/securityassets",
         "//pkg/security/securitytest",
         "//pkg/server",
-        "//pkg/sql/catalog/catalogkeys",
-        "//pkg/sql/catalog/catpb",
-        "//pkg/sql/catalog/desctestutils",
-        "//pkg/sql/tests",
         "//pkg/testutils/serverutils",
-        "//pkg/testutils/sqlutils",
-        "//pkg/util/encoding",
-        "//pkg/util/leaktest",
-        "//pkg/util/log",
-        "//pkg/util/protoutil",
     ],
 )