-
Notifications
You must be signed in to change notification settings - Fork 3.8k
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
partitionccl,sql: add license checks
Move partition-related code behind a license check. Creating partitioned tables and indices, repartitioning tables and indices, and installing or modifying zone configs on indexes or partitions now requires a valid enterprise license. Removing a partitioning scheme or a zone config on an index or partition does not require a valid license, but it does require a CCL binary. Release note: None
- Loading branch information
Showing
11 changed files
with
282 additions
and
12 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,143 @@ | ||
| // Copyright 2018 The Cockroach Authors. | ||
| // | ||
| // Licensed under the Apache License, Version 2.0 (the "License"); | ||
| // you may not use this file except in compliance with the License. | ||
| // You may obtain a copy of the License at | ||
| // | ||
| // http://www.apache.org/licenses/LICENSE-2.0 | ||
| // | ||
| // Unless required by applicable law or agreed to in writing, software | ||
| // distributed under the License is distributed on an "AS IS" BASIS, | ||
| // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or | ||
| // implied. See the License for the specific language governing | ||
| // permissions and limitations under the License. | ||
|
|
||
| package sql_test | ||
|
|
||
| import ( | ||
| "context" | ||
| "testing" | ||
|
|
||
| "github.com/cockroachdb/cockroach/pkg/config" | ||
| "github.com/cockroachdb/cockroach/pkg/sql/sqlbase" | ||
| "github.com/cockroachdb/cockroach/pkg/sql/tests" | ||
| "github.com/cockroachdb/cockroach/pkg/testutils" | ||
| "github.com/cockroachdb/cockroach/pkg/testutils/serverutils" | ||
| "github.com/cockroachdb/cockroach/pkg/testutils/sqlutils" | ||
| "github.com/cockroachdb/cockroach/pkg/util/encoding" | ||
| "github.com/cockroachdb/cockroach/pkg/util/leaktest" | ||
| "github.com/cockroachdb/cockroach/pkg/util/protoutil" | ||
| ) | ||
|
|
||
| func TestRemovePartitioningOSS(t *testing.T) { | ||
| defer leaktest.AfterTest(t)() | ||
|
|
||
| ctx := context.Background() | ||
| params, _ := tests.CreateTestServerParams() | ||
| s, sqlDBRaw, kvDB := serverutils.StartServer(t, params) | ||
| sqlDB := sqlutils.MakeSQLRunner(sqlDBRaw) | ||
| defer s.Stopper().Stop(ctx) | ||
|
|
||
| const numRows = 100 | ||
| if err := tests.CreateKVTable(sqlDB.DB, numRows); err != nil { | ||
| t.Fatal(err) | ||
| } | ||
| tableDesc := sqlbase.GetTableDescriptor(kvDB, "t", "kv") | ||
| tableKey := sqlbase.MakeDescMetadataKey(tableDesc.ID) | ||
|
|
||
| // Hack in partitions. Doing this properly requires a CCL binary. | ||
| tableDesc.PrimaryIndex.Partitioning = sqlbase.PartitioningDescriptor{ | ||
| NumColumns: 1, | ||
| Range: []sqlbase.PartitioningDescriptor_Range{{ | ||
| Name: "p1", | ||
| FromInclusive: encoding.EncodeIntValue(nil /* appendTo */, encoding.NoColumnID, 1), | ||
| ToExclusive: encoding.EncodeIntValue(nil /* appendTo */, encoding.NoColumnID, 2), | ||
| }}, | ||
| } | ||
| tableDesc.Indexes[0].Partitioning = sqlbase.PartitioningDescriptor{ | ||
| NumColumns: 1, | ||
| Range: []sqlbase.PartitioningDescriptor_Range{{ | ||
| Name: "p2", | ||
| FromInclusive: encoding.EncodeIntValue(nil /* appendTo */, encoding.NoColumnID, 1), | ||
| ToExclusive: encoding.EncodeIntValue(nil /* appendTo */, encoding.NoColumnID, 2), | ||
| }}, | ||
| } | ||
| if err := kvDB.Put(ctx, tableKey, sqlbase.WrapDescriptor(tableDesc)); err != nil { | ||
| t.Fatal(err) | ||
| } | ||
| exp := `CREATE TABLE kv ( | ||
| k INT NOT NULL, | ||
| v INT NULL, | ||
| CONSTRAINT "primary" PRIMARY KEY (k ASC), | ||
| INDEX foo (v ASC) PARTITION BY RANGE (v) ( | ||
| PARTITION p2 VALUES FROM (1) TO (2) | ||
| ), | ||
| FAMILY fam_0_k (k), | ||
| FAMILY fam_1_v (v) | ||
| ) PARTITION BY RANGE (k) ( | ||
| PARTITION p1 VALUES FROM (1) TO (2) | ||
| )` | ||
| if a := sqlDB.QueryStr(t, "SHOW CREATE TABLE t.kv")[0][1]; exp != a { | ||
| t.Fatalf("expected:\n%s\n\ngot:\n%s\n\n", exp, a) | ||
| } | ||
|
|
||
| // Hack in partition zone configs. This also requires a CCL binary to do | ||
| // properly. | ||
| zoneConfig := config.ZoneConfig{ | ||
| Subzones: []config.Subzone{ | ||
| { | ||
| IndexID: uint32(tableDesc.PrimaryIndex.ID), | ||
| PartitionName: "p1", | ||
| Config: config.DefaultZoneConfig(), | ||
| }, | ||
| { | ||
| IndexID: uint32(tableDesc.Indexes[0].ID), | ||
| PartitionName: "p2", | ||
| Config: config.DefaultZoneConfig(), | ||
| }, | ||
| }, | ||
| } | ||
| zoneConfigBytes, err := protoutil.Marshal(&zoneConfig) | ||
| if err != nil { | ||
| t.Fatal(err) | ||
| } | ||
| sqlDB.Exec(t, `INSERT INTO system.zones VALUES ($1, $2)`, tableDesc.ID, zoneConfigBytes) | ||
| for _, p := range []string{"p1", "p2"} { | ||
| if exists := sqlutils.ZoneConfigExists(t, sqlDB, "t.kv."+p); !exists { | ||
| t.Fatalf("zone config for %s does not exist", p) | ||
| } | ||
| } | ||
|
|
||
| expectCCLRequired := func(q string) { | ||
| t.Helper() | ||
| const expErr = "requires a CCL binary" | ||
| if _, err := sqlDB.DB.Exec(q); !testutils.IsError(err, expErr) { | ||
| t.Fatalf("expected %q error, but got %+v", expErr, err) | ||
| } | ||
| } | ||
|
|
||
| // TODO(benesch): introduce a "STRIP CCL" command to make it possible to | ||
| // remove CCL features from a table using an OSS binary. | ||
| expectCCLRequired(`ALTER TABLE t.kv PARTITION BY NOTHING`) | ||
| expectCCLRequired(`ALTER INDEX t.kv@foo PARTITION BY NOTHING`) | ||
| expectCCLRequired(`ALTER PARTITION p1 OF TABLE t.kv EXPERIMENTAL CONFIGURE ZONE ''`) | ||
| expectCCLRequired(`ALTER PARTITION p2 OF TABLE t.kv EXPERIMENTAL CONFIGURE ZONE ''`) | ||
|
|
||
| // Odd exception: removing partitioning is, in fact, possible when there are | ||
| // no zone configs for the table's indices or partitions. | ||
| sqlDB.Exec(t, `DELETE FROM system.zones WHERE id = $1`, tableDesc.ID) | ||
| sqlDB.Exec(t, `ALTER TABLE t.kv PARTITION BY NOTHING`) | ||
| sqlDB.Exec(t, `ALTER INDEX t.kv@foo PARTITION BY NOTHING`) | ||
|
|
||
| exp = `CREATE TABLE kv ( | ||
| k INT NOT NULL, | ||
| v INT NULL, | ||
| CONSTRAINT "primary" PRIMARY KEY (k ASC), | ||
| INDEX foo (v ASC), | ||
| FAMILY fam_0_k (k), | ||
| FAMILY fam_1_v (v) | ||
| )` | ||
| if a := sqlDB.QueryStr(t, "SHOW CREATE TABLE t.kv")[0][1]; exp != a { | ||
| t.Fatalf("expected:\n%s\n\ngot:\n%s\n\n", exp, a) | ||
| } | ||
| } |
Oops, something went wrong.