diff --git a/docs/generated/settings/settings-for-tenants.txt b/docs/generated/settings/settings-for-tenants.txt
index 7c24361ae39e..2574ca609b7d 100644
--- a/docs/generated/settings/settings-for-tenants.txt
+++ b/docs/generated/settings/settings-for-tenants.txt
@@ -79,7 +79,6 @@ sql.cross_db_fks.enabled boolean false if true, creating foreign key references
sql.cross_db_sequence_owners.enabled boolean false if true, creating sequences owned by tables from other databases is allowed
sql.cross_db_sequence_references.enabled boolean false if true, sequences referenced by tables from other databases are allowed
sql.cross_db_views.enabled boolean false if true, creating views that refer to other databases is allowed
-sql.defaults.copy_partitioning_when_deinterleaving_table.enabled boolean false default value for enable_copying_partitioning_when_deinterleaving_table session variable
sql.defaults.datestyle enumeration iso, mdy default value for DateStyle session setting [iso, mdy = 0, iso, dmy = 1, iso, ymd = 2]
sql.defaults.datestyle.enabled boolean false default value for datestyle_enabled session setting
sql.defaults.default_int_size integer 8 the size, in bytes, of an INT type
diff --git a/docs/generated/settings/settings.html b/docs/generated/settings/settings.html
index 8924c5c2b7f6..f79e16ccfbf4 100644
--- a/docs/generated/settings/settings.html
+++ b/docs/generated/settings/settings.html
@@ -84,7 +84,6 @@
sql.cross_db_sequence_owners.enabledboolean falseif true, creating sequences owned by tables from other databases is allowed sql.cross_db_sequence_references.enabledboolean falseif true, sequences referenced by tables from other databases are allowed sql.cross_db_views.enabledboolean falseif true, creating views that refer to other databases is allowed sql.defaults.copy_partitioning_when_deinterleaving_table.enabledboolean falsedefault value for enable_copying_partitioning_when_deinterleaving_table session variable sql.defaults.datestyleenumeration iso, mdydefault value for DateStyle session setting [iso, mdy = 0, iso, dmy = 1, iso, ymd = 2] sql.defaults.datestyle.enabledboolean falsedefault value for datestyle_enabled session setting sql.defaults.default_int_sizeinteger 8the size, in bytes, of an INT type HAVING HASH HIGH HISTOGRAM HOUR
%token IDENTITY
-%token IF IFERROR IFNULL IGNORE_FOREIGN_KEYS ILIKE IMMEDIATE IMPORT IN INCLUDE INCLUDE_DEPRECATED_INTERLEAVES INCLUDING INCREMENT INCREMENTAL
+%token IF IFERROR IFNULL IGNORE_FOREIGN_KEYS ILIKE IMMEDIATE IMPORT IN INCLUDE INCLUDING INCREMENT INCREMENTAL
%token INET INET_CONTAINED_BY_OR_EQUALS
-%token INET_CONTAINS_OR_EQUALS INDEX INDEXES INHERITS INJECT INTERLEAVE INITIALLY
+%token INET_CONTAINS_OR_EQUALS INDEX INDEXES INHERITS INJECT INITIALLY
%token INNER INSERT INT INTEGER
%token INTERSECT INTERVAL INTO INTO_DB INVERTED IS ISERROR ISNULL ISOLATION
@@ -1140,7 +1137,6 @@ func (u *sqlSymUnion) setVar() *tree.SetVar {
%type alter_index_cmds
%type opt_drop_behavior
-%type opt_interleave_drop_behavior
%type opt_validate_behavior
@@ -1189,7 +1185,6 @@ func (u *sqlSymUnion) setVar() *tree.SetVar {
%type <[]tree.LikeTableOption> like_table_option_list
%type like_table_option
%type opt_create_table_on_commit
-%type <*tree.InterleaveDef> opt_interleave
%type <*tree.PartitionBy> opt_partition_by partition_by partition_by_inner
%type <*tree.PartitionByTable> opt_partition_by_table partition_by_table
%type <*tree.PartitionByIndex> opt_partition_by_index partition_by_index
@@ -2239,12 +2234,11 @@ alter_table_cmd:
}
// ALTER TABLE VALIDATE CONSTRAINT ...
// ALTER TABLE ALTER PRIMARY KEY USING INDEX
-| ALTER PRIMARY KEY USING COLUMNS '(' index_params ')' opt_hash_sharded opt_interleave
+| ALTER PRIMARY KEY USING COLUMNS '(' index_params ')' opt_hash_sharded
{
$$.val = &tree.AlterTableAlterPrimaryKey{
Columns: $7.idxElems(),
Sharded: $9.shardedIndexDef(),
- Interleave: $10.interleave(),
}
}
| VALIDATE CONSTRAINT constraint_name
@@ -2596,7 +2590,6 @@ opt_clear_data:
// encryption_passphrase="secret": encrypt backups
// kms="[kms_provider]://[kms_host]/[master_key_identifier]?[parameters]" : encrypt backups using KMS
// detached: execute backup job asynchronously, without waiting for its completion
-// include_deprecated_interleaves: allow backing up interleaved tables, even if future versions will be unable to restore.
//
// %SeeAlso: RESTORE, WEBDOCS/backup.html
backup_stmt:
@@ -2702,10 +2695,6 @@ backup_options:
{
$$.val = &tree.BackupOptions{EncryptionKMSURI: $3.stringOrPlaceholderOptList()}
}
-| INCLUDE_DEPRECATED_INTERLEAVES
- {
- $$.val = &tree.BackupOptions{IncludeDeprecatedInterleaves: true}
- }
// %Help: CREATE SCHEDULE FOR BACKUP - backup data periodically
@@ -6326,20 +6315,20 @@ alter_schema_stmt:
// %Help: CREATE TABLE - create a new table
// %Category: DDL
// %Text:
-// CREATE [[GLOBAL | LOCAL] {TEMPORARY | TEMP}] TABLE [IF NOT EXISTS] ( ) [] []
-// CREATE [[GLOBAL | LOCAL] {TEMPORARY | TEMP}] TABLE [IF NOT EXISTS] [( )] AS [] []
+// CREATE [[GLOBAL | LOCAL] {TEMPORARY | TEMP}] TABLE [IF NOT EXISTS] ( ) []
+// CREATE [[GLOBAL | LOCAL] {TEMPORARY | TEMP}] TABLE [IF NOT EXISTS] [( )] AS []
//
// Table elements:
// []
// [UNIQUE | INVERTED] INDEX [] ( [ASC | DESC] [, ...] )
-// [USING HASH WITH BUCKET_COUNT = ] [{STORING | INCLUDE | COVERING} ( )] []
+// [USING HASH WITH BUCKET_COUNT = ] [{STORING | INCLUDE | COVERING} ( )]
// FAMILY [] ( )
// [CONSTRAINT ]
//
// Table constraints:
// PRIMARY KEY ( ) [USING HASH WITH BUCKET_COUNT = ]
// FOREIGN KEY ( ) REFERENCES [( )] [ON DELETE {NO ACTION | RESTRICT}] [ON UPDATE {NO ACTION | RESTRICT}]
-// UNIQUE ( ) [{STORING | INCLUDE | COVERING} ( )] []
+// UNIQUE ( ) [{STORING | INCLUDE | COVERING} ( )]
// CHECK ( )
//
// Column qualifiers:
@@ -6349,9 +6338,6 @@ alter_schema_stmt:
// COLLATE
// AS ( ) { STORED | VIRTUAL }
//
-// Interleave clause:
-// INTERLEAVE IN PARENT ( ) [CASCADE | RESTRICT]
-//
// On commit clause:
// ON COMMIT {PRESERVE ROWS | DROP | DELETE ROWS}
//
@@ -6359,36 +6345,34 @@ alter_schema_stmt:
// WEBDOCS/create-table.html
// WEBDOCS/create-table-as.html
create_table_stmt:
- CREATE opt_persistence_temp_table TABLE table_name '(' opt_table_elem_list ')' opt_create_table_inherits opt_interleave opt_partition_by_table opt_table_with opt_create_table_on_commit opt_locality
+ CREATE opt_persistence_temp_table TABLE table_name '(' opt_table_elem_list ')' opt_create_table_inherits opt_partition_by_table opt_table_with opt_create_table_on_commit opt_locality
{
name := $4.unresolvedObjectName().ToTableName()
$$.val = &tree.CreateTable{
Table: name,
IfNotExists: false,
- Interleave: $9.interleave(),
Defs: $6.tblDefs(),
AsSource: nil,
- PartitionByTable: $10.partitionByTable(),
+ PartitionByTable: $9.partitionByTable(),
Persistence: $2.persistence(),
- StorageParams: $11.storageParams(),
- OnCommit: $12.createTableOnCommitSetting(),
- Locality: $13.locality(),
+ StorageParams: $10.storageParams(),
+ OnCommit: $11.createTableOnCommitSetting(),
+ Locality: $12.locality(),
}
}
-| CREATE opt_persistence_temp_table TABLE IF NOT EXISTS table_name '(' opt_table_elem_list ')' opt_create_table_inherits opt_interleave opt_partition_by_table opt_table_with opt_create_table_on_commit opt_locality
+| CREATE opt_persistence_temp_table TABLE IF NOT EXISTS table_name '(' opt_table_elem_list ')' opt_create_table_inherits opt_partition_by_table opt_table_with opt_create_table_on_commit opt_locality
{
name := $7.unresolvedObjectName().ToTableName()
$$.val = &tree.CreateTable{
Table: name,
IfNotExists: true,
- Interleave: $12.interleave(),
Defs: $9.tblDefs(),
AsSource: nil,
- PartitionByTable: $13.partitionByTable(),
+ PartitionByTable: $12.partitionByTable(),
Persistence: $2.persistence(),
- StorageParams: $14.storageParams(),
- OnCommit: $15.createTableOnCommitSetting(),
- Locality: $16.locality(),
+ StorageParams: $13.storageParams(),
+ OnCommit: $14.createTableOnCommitSetting(),
+ Locality: $15.locality(),
}
}
@@ -6479,7 +6463,6 @@ create_table_as_stmt:
$$.val = &tree.CreateTable{
Table: name,
IfNotExists: false,
- Interleave: nil,
Defs: $5.tblDefs(),
AsSource: $8.slct(),
StorageParams: $6.storageParams(),
@@ -6493,7 +6476,6 @@ create_table_as_stmt:
$$.val = &tree.CreateTable{
Table: name,
IfNotExists: true,
- Interleave: nil,
Defs: $8.tblDefs(),
AsSource: $11.slct(),
StorageParams: $9.storageParams(),
@@ -6608,38 +6590,6 @@ like_table_option:
| ALL { $$.val = tree.LikeTableOption{Opt: tree.LikeTableOptAll} }
-opt_interleave:
- INTERLEAVE IN PARENT table_name '(' name_list ')' opt_interleave_drop_behavior
- {
- name := $4.unresolvedObjectName().ToTableName()
- $$.val = &tree.InterleaveDef{
- Parent: name,
- Fields: $6.nameList(),
- DropBehavior: $8.dropBehavior(),
- }
- }
-| /* EMPTY */
- {
- $$.val = (*tree.InterleaveDef)(nil)
- }
-
-// TODO(dan): This can be removed in favor of opt_drop_behavior when #7854 is fixed.
-opt_interleave_drop_behavior:
- CASCADE
- {
- /* SKIP DOC */
- $$.val = tree.DropCascade
- }
-| RESTRICT
- {
- /* SKIP DOC */
- $$.val = tree.DropRestrict
- }
-| /* EMPTY */
- {
- $$.val = tree.DropDefault
- }
-
partition:
PARTITION partition_name
{
@@ -6943,20 +6893,19 @@ generated_by_default_as:
GENERATED_BY_DEFAULT BY DEFAULT AS {}
index_def:
- INDEX opt_index_name '(' index_params ')' opt_hash_sharded opt_storing opt_interleave opt_partition_by_index opt_with_storage_parameter_list opt_where_clause
+ INDEX opt_index_name '(' index_params ')' opt_hash_sharded opt_storing opt_partition_by_index opt_with_storage_parameter_list opt_where_clause
{
$$.val = &tree.IndexTableDef{
Name: tree.Name($2),
Columns: $4.idxElems(),
Sharded: $6.shardedIndexDef(),
Storing: $7.nameList(),
- Interleave: $8.interleave(),
- PartitionByIndex: $9.partitionByIndex(),
- StorageParams: $10.storageParams(),
- Predicate: $11.expr(),
+ PartitionByIndex: $8.partitionByIndex(),
+ StorageParams: $9.storageParams(),
+ Predicate: $10.expr(),
}
}
-| UNIQUE INDEX opt_index_name '(' index_params ')' opt_hash_sharded opt_storing opt_interleave opt_partition_by_index opt_with_storage_parameter_list opt_where_clause
+| UNIQUE INDEX opt_index_name '(' index_params ')' opt_hash_sharded opt_storing opt_partition_by_index opt_with_storage_parameter_list opt_where_clause
{
$$.val = &tree.UniqueConstraintTableDef{
IndexTableDef: tree.IndexTableDef {
@@ -6964,10 +6913,9 @@ index_def:
Columns: $5.idxElems(),
Sharded: $7.shardedIndexDef(),
Storing: $8.nameList(),
- Interleave: $9.interleave(),
- PartitionByIndex: $10.partitionByIndex(),
- StorageParams: $11.storageParams(),
- Predicate: $12.expr(),
+ PartitionByIndex: $9.partitionByIndex(),
+ StorageParams: $10.storageParams(),
+ Predicate: $11.expr(),
},
}
}
@@ -7014,26 +6962,24 @@ constraint_elem:
}
}
| UNIQUE opt_without_index '(' index_params ')'
- opt_storing opt_interleave opt_partition_by_index opt_deferrable opt_where_clause
+ opt_storing opt_partition_by_index opt_deferrable opt_where_clause
{
$$.val = &tree.UniqueConstraintTableDef{
WithoutIndex: $2.bool(),
IndexTableDef: tree.IndexTableDef{
Columns: $4.idxElems(),
Storing: $6.nameList(),
- Interleave: $7.interleave(),
- PartitionByIndex: $8.partitionByIndex(),
- Predicate: $10.expr(),
+ PartitionByIndex: $7.partitionByIndex(),
+ Predicate: $9.expr(),
},
}
}
-| PRIMARY KEY '(' index_params ')' opt_hash_sharded opt_interleave
+| PRIMARY KEY '(' index_params ')' opt_hash_sharded
{
$$.val = &tree.UniqueConstraintTableDef{
IndexTableDef: tree.IndexTableDef{
Columns: $4.idxElems(),
Sharded: $6.shardedIndexDef(),
- Interleave: $7.interleave(),
},
PrimaryKey: true,
}
@@ -7728,17 +7674,14 @@ enum_val_list:
// %Text:
// CREATE [UNIQUE | INVERTED] INDEX [CONCURRENTLY] [IF NOT EXISTS] []
// ON ( [ASC | DESC] [, ...] )
-// [USING HASH WITH BUCKET_COUNT = ] [STORING ( )] []
+// [USING HASH WITH BUCKET_COUNT = ] [STORING ( )]
// [PARTITION BY ]
// [WITH ]
//
-// Interleave clause:
-// INTERLEAVE IN PARENT ( ) [CASCADE | RESTRICT]
-//
// %SeeAlso: CREATE TABLE, SHOW INDEXES, SHOW CREATE,
// WEBDOCS/create-index.html
create_index_stmt:
- CREATE opt_unique INDEX opt_concurrently opt_index_name ON table_name opt_index_access_method '(' index_params ')' opt_hash_sharded opt_storing opt_interleave opt_partition_by_index opt_with_storage_parameter_list opt_where_clause
+ CREATE opt_unique INDEX opt_concurrently opt_index_name ON table_name opt_index_access_method '(' index_params ')' opt_hash_sharded opt_storing opt_partition_by_index opt_with_storage_parameter_list opt_where_clause
{
table := $7.unresolvedObjectName().ToTableName()
$$.val = &tree.CreateIndex{
@@ -7748,15 +7691,14 @@ create_index_stmt:
Columns: $10.idxElems(),
Sharded: $12.shardedIndexDef(),
Storing: $13.nameList(),
- Interleave: $14.interleave(),
- PartitionByIndex: $15.partitionByIndex(),
- StorageParams: $16.storageParams(),
- Predicate: $17.expr(),
+ PartitionByIndex: $14.partitionByIndex(),
+ StorageParams: $15.storageParams(),
+ Predicate: $16.expr(),
Inverted: $8.bool(),
Concurrently: $4.bool(),
}
}
-| CREATE opt_unique INDEX opt_concurrently IF NOT EXISTS index_name ON table_name opt_index_access_method '(' index_params ')' opt_hash_sharded opt_storing opt_interleave opt_partition_by_index opt_with_storage_parameter_list opt_where_clause
+| CREATE opt_unique INDEX opt_concurrently IF NOT EXISTS index_name ON table_name opt_index_access_method '(' index_params ')' opt_hash_sharded opt_storing opt_partition_by_index opt_with_storage_parameter_list opt_where_clause
{
table := $10.unresolvedObjectName().ToTableName()
$$.val = &tree.CreateIndex{
@@ -7767,15 +7709,14 @@ create_index_stmt:
Columns: $13.idxElems(),
Sharded: $15.shardedIndexDef(),
Storing: $16.nameList(),
- Interleave: $17.interleave(),
- PartitionByIndex: $18.partitionByIndex(),
+ PartitionByIndex: $17.partitionByIndex(),
Inverted: $11.bool(),
- StorageParams: $19.storageParams(),
- Predicate: $20.expr(),
+ StorageParams: $18.storageParams(),
+ Predicate: $19.expr(),
Concurrently: $4.bool(),
}
}
-| CREATE opt_unique INVERTED INDEX opt_concurrently opt_index_name ON table_name '(' index_params ')' opt_storing opt_interleave opt_partition_by_index opt_with_storage_parameter_list opt_where_clause
+| CREATE opt_unique INVERTED INDEX opt_concurrently opt_index_name ON table_name '(' index_params ')' opt_storing opt_partition_by_index opt_with_storage_parameter_list opt_where_clause
{
table := $8.unresolvedObjectName().ToTableName()
$$.val = &tree.CreateIndex{
@@ -7785,14 +7726,13 @@ create_index_stmt:
Inverted: true,
Columns: $10.idxElems(),
Storing: $12.nameList(),
- Interleave: $13.interleave(),
- PartitionByIndex: $14.partitionByIndex(),
- StorageParams: $15.storageParams(),
- Predicate: $16.expr(),
+ PartitionByIndex: $13.partitionByIndex(),
+ StorageParams: $14.storageParams(),
+ Predicate: $15.expr(),
Concurrently: $5.bool(),
}
}
-| CREATE opt_unique INVERTED INDEX opt_concurrently IF NOT EXISTS index_name ON table_name '(' index_params ')' opt_storing opt_interleave opt_partition_by_index opt_with_storage_parameter_list opt_where_clause
+| CREATE opt_unique INVERTED INDEX opt_concurrently IF NOT EXISTS index_name ON table_name '(' index_params ')' opt_storing opt_partition_by_index opt_with_storage_parameter_list opt_where_clause
{
table := $11.unresolvedObjectName().ToTableName()
$$.val = &tree.CreateIndex{
@@ -7803,10 +7743,9 @@ create_index_stmt:
IfNotExists: true,
Columns: $13.idxElems(),
Storing: $15.nameList(),
- Interleave: $16.interleave(),
- PartitionByIndex: $17.partitionByIndex(),
- StorageParams: $18.storageParams(),
- Predicate: $19.expr(),
+ PartitionByIndex: $16.partitionByIndex(),
+ StorageParams: $17.storageParams(),
+ Predicate: $18.expr(),
Concurrently: $5.bool(),
}
}
@@ -13254,7 +13193,6 @@ unreserved_keyword:
| IMMEDIATE
| IMPORT
| INCLUDE
-| INCLUDE_DEPRECATED_INTERLEAVES
| INCLUDING
| INCREMENT
| INCREMENTAL
@@ -13262,7 +13200,6 @@ unreserved_keyword:
| INHERITS
| INJECT
| INSERT
-| INTERLEAVE
| INTO_DB
| INVERTED
| ISOLATION
diff --git a/pkg/sql/parser/testdata/alter_table b/pkg/sql/parser/testdata/alter_table
index 1a8fc2e60437..d99b30854284 100644
--- a/pkg/sql/parser/testdata/alter_table
+++ b/pkg/sql/parser/testdata/alter_table
@@ -449,14 +449,6 @@ ALTER TABLE a ADD PRIMARY KEY (x, y, z) -- fully parenthesized
ALTER TABLE a ADD PRIMARY KEY (x, y, z) -- literals removed
ALTER TABLE _ ADD PRIMARY KEY (_, _, _) -- identifiers removed
-parse
-ALTER TABLE a ADD PRIMARY KEY (x, y, z) USING HASH WITH BUCKET_COUNT = 10 INTERLEAVE IN PARENT b (x, y)
-----
-ALTER TABLE a ADD PRIMARY KEY (x, y, z) USING HASH WITH BUCKET_COUNT = 10 INTERLEAVE IN PARENT b (x, y)
-ALTER TABLE a ADD PRIMARY KEY (x, y, z) USING HASH WITH BUCKET_COUNT = (10) INTERLEAVE IN PARENT b (x, y) -- fully parenthesized
-ALTER TABLE a ADD PRIMARY KEY (x, y, z) USING HASH WITH BUCKET_COUNT = _ INTERLEAVE IN PARENT b (x, y) -- literals removed
-ALTER TABLE _ ADD PRIMARY KEY (_, _, _) USING HASH WITH BUCKET_COUNT = 10 INTERLEAVE IN PARENT _ (_, _) -- identifiers removed
-
parse
ALTER TABLE a ADD CONSTRAINT "primary" PRIMARY KEY (x, y, z)
----
@@ -465,14 +457,6 @@ ALTER TABLE a ADD CONSTRAINT "primary" PRIMARY KEY (x, y, z) -- fully parenthesi
ALTER TABLE a ADD CONSTRAINT "primary" PRIMARY KEY (x, y, z) -- literals removed
ALTER TABLE _ ADD CONSTRAINT _ PRIMARY KEY (_, _, _) -- identifiers removed
-parse
-ALTER TABLE a ADD CONSTRAINT "primary" PRIMARY KEY (x, y, z) USING HASH WITH BUCKET_COUNT = 10 INTERLEAVE IN PARENT b (x, y)
-----
-ALTER TABLE a ADD CONSTRAINT "primary" PRIMARY KEY (x, y, z) USING HASH WITH BUCKET_COUNT = 10 INTERLEAVE IN PARENT b (x, y)
-ALTER TABLE a ADD CONSTRAINT "primary" PRIMARY KEY (x, y, z) USING HASH WITH BUCKET_COUNT = (10) INTERLEAVE IN PARENT b (x, y) -- fully parenthesized
-ALTER TABLE a ADD CONSTRAINT "primary" PRIMARY KEY (x, y, z) USING HASH WITH BUCKET_COUNT = _ INTERLEAVE IN PARENT b (x, y) -- literals removed
-ALTER TABLE _ ADD CONSTRAINT _ PRIMARY KEY (_, _, _) USING HASH WITH BUCKET_COUNT = 10 INTERLEAVE IN PARENT _ (_, _) -- identifiers removed
-
parse
ALTER TABLE a ALTER COLUMN b SET DEFAULT 42
----
diff --git a/pkg/sql/parser/testdata/backup_restore b/pkg/sql/parser/testdata/backup_restore
index de734d0e1646..6bd44dbcc447 100644
--- a/pkg/sql/parser/testdata/backup_restore
+++ b/pkg/sql/parser/testdata/backup_restore
@@ -281,14 +281,6 @@ BACKUP TABLE foo TO '_' WITH revision_history, encryption_passphrase = '*****' -
BACKUP TABLE _ TO 'bar' WITH revision_history, encryption_passphrase = '*****' -- identifiers removed
BACKUP TABLE foo TO 'bar' WITH revision_history, encryption_passphrase = 'secret' -- passwords exposed
-parse
-BACKUP foo TO 'bar' WITH KMS = 'foo', revision_history, include_deprecated_interleaves
-----
-BACKUP TABLE foo TO 'bar' WITH revision_history, kms = 'foo', include_deprecated_interleaves -- normalized!
-BACKUP TABLE (foo) TO ('bar') WITH revision_history, kms = ('foo'), include_deprecated_interleaves -- fully parenthesized
-BACKUP TABLE foo TO '_' WITH revision_history, kms = '_', include_deprecated_interleaves -- literals removed
-BACKUP TABLE _ TO 'bar' WITH revision_history, kms = 'foo', include_deprecated_interleaves -- identifiers removed
-
parse
BACKUP foo TO 'bar' WITH KMS = ('foo', 'bar'), revision_history
----
diff --git a/pkg/sql/parser/testdata/create_index b/pkg/sql/parser/testdata/create_index
index 23cacbaf0e81..9d66f02fa74f 100644
--- a/pkg/sql/parser/testdata/create_index
+++ b/pkg/sql/parser/testdata/create_index
@@ -80,22 +80,6 @@ CREATE INDEX ON a (b) WHERE ((c) > (3)) -- fully parenthesized
CREATE INDEX ON a (b) WHERE c > _ -- literals removed
CREATE INDEX ON _ (_) WHERE _ > 3 -- identifiers removed
-parse
-CREATE INDEX ON a (b) INTERLEAVE IN PARENT c (d)
-----
-CREATE INDEX ON a (b) INTERLEAVE IN PARENT c (d)
-CREATE INDEX ON a (b) INTERLEAVE IN PARENT c (d) -- fully parenthesized
-CREATE INDEX ON a (b) INTERLEAVE IN PARENT c (d) -- literals removed
-CREATE INDEX ON _ (_) INTERLEAVE IN PARENT _ (_) -- identifiers removed
-
-parse
-CREATE INDEX ON a (b) INTERLEAVE IN PARENT c.d (e)
-----
-CREATE INDEX ON a (b) INTERLEAVE IN PARENT c.d (e)
-CREATE INDEX ON a (b) INTERLEAVE IN PARENT c.d (e) -- fully parenthesized
-CREATE INDEX ON a (b) INTERLEAVE IN PARENT c.d (e) -- literals removed
-CREATE INDEX ON _ (_) INTERLEAVE IN PARENT _._ (_) -- identifiers removed
-
parse
CREATE INDEX ON a (b ASC, c DESC)
----
@@ -144,22 +128,6 @@ CREATE UNIQUE INDEX a ON b (c) WHERE ((d) > (3)) -- fully parenthesized
CREATE UNIQUE INDEX a ON b (c) WHERE d > _ -- literals removed
CREATE UNIQUE INDEX _ ON _ (_) WHERE _ > 3 -- identifiers removed
-parse
-CREATE UNIQUE INDEX a ON b (c) INTERLEAVE IN PARENT d (e, f)
-----
-CREATE UNIQUE INDEX a ON b (c) INTERLEAVE IN PARENT d (e, f)
-CREATE UNIQUE INDEX a ON b (c) INTERLEAVE IN PARENT d (e, f) -- fully parenthesized
-CREATE UNIQUE INDEX a ON b (c) INTERLEAVE IN PARENT d (e, f) -- literals removed
-CREATE UNIQUE INDEX _ ON _ (_) INTERLEAVE IN PARENT _ (_, _) -- identifiers removed
-
-parse
-CREATE UNIQUE INDEX a ON b (c) INTERLEAVE IN PARENT d.e (f, g)
-----
-CREATE UNIQUE INDEX a ON b (c) INTERLEAVE IN PARENT d.e (f, g)
-CREATE UNIQUE INDEX a ON b (c) INTERLEAVE IN PARENT d.e (f, g) -- fully parenthesized
-CREATE UNIQUE INDEX a ON b (c) INTERLEAVE IN PARENT d.e (f, g) -- literals removed
-CREATE UNIQUE INDEX _ ON _ (_) INTERLEAVE IN PARENT _._ (_, _) -- identifiers removed
-
parse
CREATE UNIQUE INDEX a ON b.c (d)
----
@@ -201,14 +169,6 @@ CREATE INVERTED INDEX a ON b (c) WHERE ((d) > (3)) -- fully parenthesized
CREATE INVERTED INDEX a ON b (c) WHERE d > _ -- literals removed
CREATE INVERTED INDEX _ ON _ (_) WHERE _ > 3 -- identifiers removed
-parse
-CREATE INVERTED INDEX a ON b (c) INTERLEAVE IN PARENT d (e)
-----
-CREATE INVERTED INDEX a ON b (c) INTERLEAVE IN PARENT d (e)
-CREATE INVERTED INDEX a ON b (c) INTERLEAVE IN PARENT d (e) -- fully parenthesized
-CREATE INVERTED INDEX a ON b (c) INTERLEAVE IN PARENT d (e) -- literals removed
-CREATE INVERTED INDEX _ ON _ (_) INTERLEAVE IN PARENT _ (_) -- identifiers removed
-
parse
CREATE INVERTED INDEX IF NOT EXISTS a ON b (c) WHERE d > 3
----
diff --git a/pkg/sql/parser/testdata/create_table b/pkg/sql/parser/testdata/create_table
index 57ffac6f8f70..83e9d4daa3ea 100644
--- a/pkg/sql/parser/testdata/create_table
+++ b/pkg/sql/parser/testdata/create_table
@@ -558,14 +558,6 @@ CREATE TABLE a (b INT8, CONSTRAINT foo UNIQUE (b) WHERE ((c) > (3))) -- fully pa
CREATE TABLE a (b INT8, CONSTRAINT foo UNIQUE (b) WHERE c > _) -- literals removed
CREATE TABLE _ (_ INT8, CONSTRAINT _ UNIQUE (_) WHERE _ > 3) -- identifiers removed
-parse
-CREATE TABLE a (b INT, UNIQUE INDEX foo (b) INTERLEAVE IN PARENT c (d))
-----
-CREATE TABLE a (b INT8, CONSTRAINT foo UNIQUE (b) INTERLEAVE IN PARENT c (d)) -- normalized!
-CREATE TABLE a (b INT8, CONSTRAINT foo UNIQUE (b) INTERLEAVE IN PARENT c (d)) -- fully parenthesized
-CREATE TABLE a (b INT8, CONSTRAINT foo UNIQUE (b) INTERLEAVE IN PARENT c (d)) -- literals removed
-CREATE TABLE _ (_ INT8, CONSTRAINT _ UNIQUE (_) INTERLEAVE IN PARENT _ (_)) -- identifiers removed
-
parse
CREATE TABLE a (UNIQUE INDEX (b) PARTITION BY LIST (c) (PARTITION d VALUES IN (1)))
----
@@ -1321,14 +1313,6 @@ CREATE TABLE a (b INT8, c STRING, CONSTRAINT d UNIQUE WITHOUT INDEX (b, c)) -- f
CREATE TABLE a (b INT8, c STRING, CONSTRAINT d UNIQUE WITHOUT INDEX (b, c)) -- literals removed
CREATE TABLE _ (_ INT8, _ STRING, CONSTRAINT _ UNIQUE WITHOUT INDEX (_, _)) -- identifiers removed
-parse
-CREATE TABLE a (b INT8, c STRING, CONSTRAINT d UNIQUE (b, c) INTERLEAVE IN PARENT d (e, f))
-----
-CREATE TABLE a (b INT8, c STRING, CONSTRAINT d UNIQUE (b, c) INTERLEAVE IN PARENT d (e, f))
-CREATE TABLE a (b INT8, c STRING, CONSTRAINT d UNIQUE (b, c) INTERLEAVE IN PARENT d (e, f)) -- fully parenthesized
-CREATE TABLE a (b INT8, c STRING, CONSTRAINT d UNIQUE (b, c) INTERLEAVE IN PARENT d (e, f)) -- literals removed
-CREATE TABLE _ (_ INT8, _ STRING, CONSTRAINT _ UNIQUE (_, _) INTERLEAVE IN PARENT _ (_, _)) -- identifiers removed
-
error
CREATE TABLE test (
CONSTRAINT foo INDEX (bar)
@@ -1613,14 +1597,6 @@ CREATE TABLE a (b INT8, c STRING, INDEX (b ASC, c DESC) STORING (c)) -- fully pa
CREATE TABLE a (b INT8, c STRING, INDEX (b ASC, c DESC) STORING (c)) -- literals removed
CREATE TABLE _ (_ INT8, _ STRING, INDEX (_ ASC, _ DESC) STORING (_)) -- identifiers removed
-parse
-CREATE TABLE a (b INT8, INDEX (b) INTERLEAVE IN PARENT c (d, e))
-----
-CREATE TABLE a (b INT8, INDEX (b) INTERLEAVE IN PARENT c (d, e))
-CREATE TABLE a (b INT8, INDEX (b) INTERLEAVE IN PARENT c (d, e)) -- fully parenthesized
-CREATE TABLE a (b INT8, INDEX (b) INTERLEAVE IN PARENT c (d, e)) -- literals removed
-CREATE TABLE _ (_ INT8, INDEX (_) INTERLEAVE IN PARENT _ (_, _)) -- identifiers removed
-
parse
CREATE TABLE a (b INT8, FAMILY (b))
----
@@ -1637,22 +1613,6 @@ CREATE TABLE a (b INT8, c STRING, FAMILY foo (b), FAMILY (c)) -- fully parenthes
CREATE TABLE a (b INT8, c STRING, FAMILY foo (b), FAMILY (c)) -- literals removed
CREATE TABLE _ (_ INT8, _ STRING, FAMILY _ (_), FAMILY (_)) -- identifiers removed
-parse
-CREATE TABLE a (b INT8) INTERLEAVE IN PARENT foo (c, d)
-----
-CREATE TABLE a (b INT8) INTERLEAVE IN PARENT foo (c, d)
-CREATE TABLE a (b INT8) INTERLEAVE IN PARENT foo (c, d) -- fully parenthesized
-CREATE TABLE a (b INT8) INTERLEAVE IN PARENT foo (c, d) -- literals removed
-CREATE TABLE _ (_ INT8) INTERLEAVE IN PARENT _ (_, _) -- identifiers removed
-
-parse
-CREATE TABLE a (b INT8) INTERLEAVE IN PARENT foo (c) CASCADE
-----
-CREATE TABLE a (b INT8) INTERLEAVE IN PARENT foo (c) CASCADE
-CREATE TABLE a (b INT8) INTERLEAVE IN PARENT foo (c) CASCADE -- fully parenthesized
-CREATE TABLE a (b INT8) INTERLEAVE IN PARENT foo (c) CASCADE -- literals removed
-CREATE TABLE _ (_ INT8) INTERLEAVE IN PARENT _ (_) CASCADE -- identifiers removed
-
parse
CREATE TABLE a.b (b INT8)
----
@@ -1835,15 +1795,6 @@ CREATE TABLE a (b INT8) PARTITION ALL BY RANGE (b) (PARTITION p1 VALUES FROM ((m
CREATE TABLE a (b INT8) PARTITION ALL BY RANGE (b) (PARTITION p1 VALUES FROM (minvalue) TO (_), PARTITION p2 VALUES FROM (_, maxvalue) TO (_, _), PARTITION p3 VALUES FROM (_, _) TO (maxvalue)) -- literals removed
CREATE TABLE _ (_ INT8) PARTITION ALL BY RANGE (_) (PARTITION _ VALUES FROM (_) TO (1), PARTITION _ VALUES FROM (2, _) TO (4, 4), PARTITION _ VALUES FROM (4, 4) TO (_)) -- identifiers removed
-
-parse
-CREATE TABLE a () INTERLEAVE IN PARENT b (c) PARTITION BY LIST (d) (PARTITION e VALUES IN (1))
-----
-CREATE TABLE a () INTERLEAVE IN PARENT b (c) PARTITION BY LIST (d) (PARTITION e VALUES IN (1))
-CREATE TABLE a () INTERLEAVE IN PARENT b (c) PARTITION BY LIST (d) (PARTITION e VALUES IN ((1))) -- fully parenthesized
-CREATE TABLE a () INTERLEAVE IN PARENT b (c) PARTITION BY LIST (d) (PARTITION e VALUES IN (_)) -- literals removed
-CREATE TABLE _ () INTERLEAVE IN PARENT _ (_) PARTITION BY LIST (_) (PARTITION _ VALUES IN (1)) -- identifiers removed
-
parse
CREATE TABLE IF NOT EXISTS a () PARTITION BY LIST (b) (PARTITION c VALUES IN (1))
----
diff --git a/pkg/sql/pg_catalog.go b/pkg/sql/pg_catalog.go
index 85c925d7a312..888c82925ac9 100644
--- a/pkg/sql/pg_catalog.go
+++ b/pkg/sql/pg_catalog.go
@@ -1807,11 +1807,11 @@ https://www.postgresql.org/docs/9.5/view-pg-indexes.html`,
populate: func(ctx context.Context, p *planner, dbContext catalog.DatabaseDescriptor, addRow func(...tree.Datum) error) error {
h := makeOidHasher()
return forEachTableDescWithTableLookup(ctx, p, dbContext, hideVirtual, /* virtual tables do not have indexes */
- func(db catalog.DatabaseDescriptor, scName string, table catalog.TableDescriptor, tableLookup tableLookupFn) error {
+ func(db catalog.DatabaseDescriptor, scName string, table catalog.TableDescriptor, _ tableLookupFn) error {
scNameName := tree.NewDName(scName)
tblName := tree.NewDName(table.GetName())
return catalog.ForEachIndex(table, catalog.IndexOpts{}, func(index catalog.Index) error {
- def, err := indexDefFromDescriptor(ctx, p, db, scName, table, index, tableLookup)
+ def, err := indexDefFromDescriptor(ctx, p, db, scName, table, index)
if err != nil {
return err
}
@@ -1838,7 +1838,6 @@ func indexDefFromDescriptor(
schemaName string,
table catalog.TableDescriptor,
index catalog.Index,
- tableLookup tableLookupFn,
) (string, error) {
colNames := index.IndexDesc().KeyColumnNames[index.ExplicitColumnStartIdx():]
indexDef := tree.CreateIndex{
@@ -1884,34 +1883,6 @@ func indexDefFromDescriptor(
name := index.GetStoredColumnName(i)
indexDef.Storing[i] = tree.Name(name)
}
- if index.NumInterleaveAncestors() > 0 {
- intl := index.IndexDesc().Interleave
- parentTable, err := tableLookup.getTableByID(intl.Ancestors[len(intl.Ancestors)-1].TableID)
- if err != nil {
- return "", err
- }
- parentSchemaName := tableLookup.getSchemaName(parentTable)
- parentDb, err := tableLookup.getDatabaseByID(parentTable.GetParentID())
- if err != nil {
- return "", err
- }
- var sharedPrefixLen int
- for _, ancestor := range intl.Ancestors {
- sharedPrefixLen += int(ancestor.SharedPrefixLen)
- }
- fields := colNames[:sharedPrefixLen]
- intlDef := &tree.InterleaveDef{
- Parent: tree.MakeTableNameWithSchema(
- tree.Name(parentDb.GetName()),
- tree.Name(parentSchemaName),
- tree.Name(parentTable.GetName())),
- Fields: make(tree.NameList, len(fields)),
- }
- for i, field := range fields {
- intlDef.Fields[i] = tree.Name(field)
- }
- indexDef.Interleave = intlDef
- }
if index.IsPartial() {
// Format the raw predicate for display in order to resolve user-defined
// types to a human readable form.
diff --git a/pkg/sql/pgwire/testdata/pgtest/notice b/pkg/sql/pgwire/testdata/pgtest/notice
index d6a9ee5c8925..906613ce9ed2 100644
--- a/pkg/sql/pgwire/testdata/pgtest/notice
+++ b/pkg/sql/pgwire/testdata/pgtest/notice
@@ -55,7 +55,7 @@ Query {"String": "DROP INDEX t_x_idx"}
until crdb_only
CommandComplete
----
-{"Severity":"NOTICE","SeverityUnlocalized":"","Code":"00000","Message":"the data for dropped indexes is reclaimed asynchronously","Detail":"","Hint":"The reclamation delay can be customized in the zone configuration for the table.","Position":0,"InternalPosition":0,"InternalQuery":"","Where":"","SchemaName":"","TableName":"","ColumnName":"","DataTypeName":"","ConstraintName":"","File":"drop_index.go","Line":547,"Routine":"dropIndexByName","UnknownFields":null}
+{"Severity":"NOTICE","SeverityUnlocalized":"","Code":"00000","Message":"the data for dropped indexes is reclaimed asynchronously","Detail":"","Hint":"The reclamation delay can be customized in the zone configuration for the table.","Position":0,"InternalPosition":0,"InternalQuery":"","Where":"","SchemaName":"","TableName":"","ColumnName":"","DataTypeName":"","ConstraintName":"","File":"drop_index.go","Line":536,"Routine":"dropIndexByName","UnknownFields":null}
{"Type":"CommandComplete","CommandTag":"DROP INDEX"}
until noncrdb_only
diff --git a/pkg/sql/randgen/mutator.go b/pkg/sql/randgen/mutator.go
index 0ff53b1a3f43..467d04192d7a 100644
--- a/pkg/sql/randgen/mutator.go
+++ b/pkg/sql/randgen/mutator.go
@@ -643,10 +643,6 @@ var postgresStatementMutator MultiStatementMutation = func(rng *rand.Rand, stmts
case *tree.SetClusterSetting, *tree.SetVar:
continue
case *tree.CreateTable:
- if stmt.Interleave != nil {
- stmt.Interleave = nil
- changed = true
- }
if stmt.PartitionByTable != nil {
stmt.PartitionByTable = nil
changed = true
@@ -674,10 +670,6 @@ var postgresStatementMutator MultiStatementMutation = func(rng *rand.Rand, stmts
changed = true
}
case *tree.UniqueConstraintTableDef:
- if def.Interleave != nil {
- def.Interleave = nil
- changed = true
- }
if def.PartitionByIndex != nil {
def.PartitionByIndex = nil
changed = true
@@ -714,10 +706,6 @@ func postgresCreateTableMutator(
mutated = append(mutated, stmt)
switch stmt := stmt.(type) {
case *tree.CreateTable:
- if stmt.Interleave != nil {
- stmt.Interleave = nil
- changed = true
- }
// Get all the column types first.
colTypes := make(map[string]*types.T)
for _, def := range stmt.Defs {
diff --git a/pkg/sql/randgen/schema.go b/pkg/sql/randgen/schema.go
index 6db9ad36feb6..49e95d8062da 100644
--- a/pkg/sql/randgen/schema.go
+++ b/pkg/sql/randgen/schema.go
@@ -77,8 +77,7 @@ func RandCreateTables(
// Make some random tables.
tables := make([]tree.Statement, num)
for i := 0; i < num; i++ {
- var interleave *tree.CreateTable
- t := RandCreateTableWithInterleave(rng, prefix, i+1, interleave, nil)
+ t := RandCreateTable(rng, prefix, i+1)
tables[i] = t
}
@@ -91,25 +90,13 @@ func RandCreateTables(
// RandCreateTable creates a random CreateTable definition.
func RandCreateTable(rng *rand.Rand, prefix string, tableIdx int) *tree.CreateTable {
- return RandCreateTableWithInterleave(rng, prefix, tableIdx, nil, nil)
+ return RandCreateTableWithColumnIndexNumberGenerator(rng, prefix, tableIdx, nil /* generateColumnIndexNumber */)
}
// RandCreateTableWithColumnIndexNumberGenerator creates a random CreateTable definition
// using the passed function to generate column index numbers for column names.
func RandCreateTableWithColumnIndexNumberGenerator(
rng *rand.Rand, prefix string, tableIdx int, generateColumnIndexNumber func() int64,
-) *tree.CreateTable {
- return RandCreateTableWithInterleave(rng, prefix, tableIdx, nil, generateColumnIndexNumber)
-}
-
-// RandCreateTableWithInterleave creates a random CreateTable definition,
-// interleaved into the given other CreateTable definition.
-func RandCreateTableWithInterleave(
- rng *rand.Rand,
- prefix string,
- tableIdx int,
- interleaveInto *tree.CreateTable,
- generateColumnIndexNumber func() int64,
) *tree.CreateTable {
// columnDefs contains the list of Columns we'll add to our table.
nColumns := randutil.RandIntInRange(rng, 1, 20)
@@ -118,22 +105,6 @@ func RandCreateTableWithInterleave(
// families, etc) we'll add to our table.
defs := make(tree.TableDefs, 0, len(columnDefs))
- // Find columnDefs from previous create table.
- interleaveIntoColumnDefs := make(map[tree.Name]*tree.ColumnTableDef)
- var interleaveIntoPK *tree.UniqueConstraintTableDef
- if interleaveInto != nil {
- for i := range interleaveInto.Defs {
- switch d := interleaveInto.Defs[i].(type) {
- case *tree.ColumnTableDef:
- interleaveIntoColumnDefs[d.Name] = d
- case *tree.UniqueConstraintTableDef:
- if d.PrimaryKey {
- interleaveIntoPK = d
- }
- }
- }
- }
-
// colIdx generates numbers that are incorporated into column names.
colIdx := func(ordinal int) int {
if generateColumnIndexNumber != nil {
@@ -142,98 +113,43 @@ func RandCreateTableWithInterleave(
return ordinal
}
- var interleaveDef *tree.InterleaveDef
- if interleaveIntoPK != nil && len(interleaveIntoPK.Columns) > 0 {
- // Make the interleave prefix, which has to be exactly the columns in the
- // parent's primary index.
- prefixLength := len(interleaveIntoPK.Columns)
- fields := make(tree.NameList, prefixLength)
- for i := range interleaveIntoPK.Columns[:prefixLength] {
- def := interleaveIntoColumnDefs[interleaveIntoPK.Columns[i].Column]
- columnDefs = append(columnDefs, def)
- defs = append(defs, def)
- fields[i] = def.Name
- }
-
- extraCols := make([]*tree.ColumnTableDef, nColumns)
- // Add more columns to the table.
- for i := range extraCols {
- // Loop until we generate an indexable column type.
- var extraCol *tree.ColumnTableDef
- for {
- extraCol = randColumnTableDef(rng, tableIdx, colIdx(i+prefixLength))
- extraColType := tree.MustBeStaticallyKnownType(extraCol.Type)
- if colinfo.ColumnTypeIsIndexable(extraColType) {
- break
- }
- }
- extraCols[i] = extraCol
- columnDefs = append(columnDefs, extraCol)
- defs = append(defs, extraCol)
- }
+ // Make new defs from scratch.
+ nComputedColumns := randutil.RandIntInRange(rng, 0, (nColumns+1)/2)
+ nNormalColumns := nColumns - nComputedColumns
+ for i := 0; i < nNormalColumns; i++ {
+ columnDef := randColumnTableDef(rng, tableIdx, colIdx(i))
+ columnDefs = append(columnDefs, columnDef)
+ defs = append(defs, columnDef)
+ }
- rng.Shuffle(nColumns, func(i, j int) {
- extraCols[i], extraCols[j] = extraCols[j], extraCols[i]
- })
-
- // Create the primary key to interleave, maybe add some new columns to the
- // one we're interleaving.
- pk := &tree.UniqueConstraintTableDef{
- PrimaryKey: true,
- IndexTableDef: tree.IndexTableDef{
- Columns: interleaveIntoPK.Columns[:prefixLength:prefixLength],
- },
- }
- for i := range extraCols[:rng.Intn(len(extraCols))] {
- pk.Columns = append(pk.Columns, tree.IndexElem{
- Column: extraCols[i].Name,
- Direction: tree.Direction(rng.Intn(int(tree.Descending) + 1)),
+ // Make a random primary key with high likelihood.
+ if rng.Intn(8) != 0 {
+ indexDef, ok := randIndexTableDefFromCols(rng, columnDefs, false /* allowExpressions */)
+ if ok && !indexDef.Inverted {
+ defs = append(defs, &tree.UniqueConstraintTableDef{
+ PrimaryKey: true,
+ IndexTableDef: indexDef,
})
}
- defs = append(defs, pk)
- interleaveDef = &tree.InterleaveDef{
- Parent: interleaveInto.Table,
- Fields: fields,
- }
- } else {
- // Make new defs from scratch.
- nComputedColumns := randutil.RandIntInRange(rng, 0, (nColumns+1)/2)
- nNormalColumns := nColumns - nComputedColumns
- for i := 0; i < nNormalColumns; i++ {
- columnDef := randColumnTableDef(rng, tableIdx, colIdx(i))
- columnDefs = append(columnDefs, columnDef)
- defs = append(defs, columnDef)
- }
-
- // Make a random primary key with high likelihood.
- if rng.Intn(8) != 0 {
- indexDef, ok := randIndexTableDefFromCols(rng, columnDefs, false /* allowExpressions */)
- if ok && !indexDef.Inverted {
- defs = append(defs, &tree.UniqueConstraintTableDef{
- PrimaryKey: true,
- IndexTableDef: indexDef,
- })
- }
- // Although not necessary for Cockroach to function correctly,
- // but for ease of use for any code that introspects on the
- // AST data structure (instead of the descriptor which doesn't
- // exist yet), explicitly set all PK cols as NOT NULL.
- for _, col := range columnDefs {
- for _, elem := range indexDef.Columns {
- if col.Name == elem.Column {
- col.Nullable.Nullability = tree.NotNull
- }
+ // Although not necessary for Cockroach to function correctly,
+ // but for ease of use for any code that introspects on the
+ // AST data structure (instead of the descriptor which doesn't
+ // exist yet), explicitly set all PK cols as NOT NULL.
+ for _, col := range columnDefs {
+ for _, elem := range indexDef.Columns {
+ if col.Name == elem.Column {
+ col.Nullable.Nullability = tree.NotNull
}
}
}
+ }
- // Make defs for computed columns.
- normalColDefs := columnDefs
- for i := nNormalColumns; i < nColumns; i++ {
- columnDef := randComputedColumnTableDef(rng, normalColDefs, tableIdx, colIdx(i))
- columnDefs = append(columnDefs, columnDef)
- defs = append(defs, columnDef)
- }
+ // Make defs for computed columns.
+ normalColDefs := columnDefs
+ for i := nNormalColumns; i < nColumns; i++ {
+ columnDef := randComputedColumnTableDef(rng, normalColDefs, tableIdx, colIdx(i))
+ columnDefs = append(columnDefs, columnDef)
+ defs = append(defs, columnDef)
}
// Make indexes.
@@ -256,9 +172,8 @@ func RandCreateTableWithInterleave(
}
ret := &tree.CreateTable{
- Table: tree.MakeUnqualifiedTableName(tree.Name(fmt.Sprintf("%s%d", prefix, tableIdx))),
- Defs: defs,
- Interleave: interleaveDef,
+ Table: tree.MakeUnqualifiedTableName(tree.Name(fmt.Sprintf("%s%d", prefix, tableIdx))),
+ Defs: defs,
}
// Create some random column families.
diff --git a/pkg/sql/resolver.go b/pkg/sql/resolver.go
index 8e3e194db4a9..9dc0df193f76 100644
--- a/pkg/sql/resolver.go
+++ b/pkg/sql/resolver.go
@@ -1232,37 +1232,6 @@ func (l *internalLookupCtx) getSchemaName(table catalog.TableDescriptor) string
return schemaName
}
-// getParentAsTableName returns a TreeTable object of the parent table for a
-// given table ID. Used to get the parent table of a table with interleaved
-// indexes.
-func getParentAsTableName(
- l simpleSchemaResolver, parentTableID descpb.ID, dbPrefix string,
-) (tree.TableName, error) {
- var parentName tree.TableName
- parentTable, err := l.getTableByID(parentTableID)
- if err != nil {
- return tree.TableName{}, err
- }
- var parentSchemaName tree.Name
- if parentTable.GetParentSchemaID() == keys.PublicSchemaID {
- parentSchemaName = tree.PublicSchemaName
- } else {
- parentSchema, err := l.getSchemaByID(parentTable.GetParentSchemaID())
- if err != nil {
- return tree.TableName{}, err
- }
- parentSchemaName = tree.Name(parentSchema.GetName())
- }
- parentDbDesc, err := l.getDatabaseByID(parentTable.GetParentID())
- if err != nil {
- return tree.TableName{}, err
- }
- parentName = tree.MakeTableNameWithSchema(tree.Name(parentDbDesc.GetName()),
- parentSchemaName, tree.Name(parentTable.GetName()))
- parentName.ExplicitCatalog = parentDbDesc.GetName() != dbPrefix
- return parentName, nil
-}
-
// getTableNameFromTableDescriptor returns a TableName object for a given
// TableDescriptor.
func getTableNameFromTableDescriptor(
diff --git a/pkg/sql/revert.go b/pkg/sql/revert.go
index a13c4ae913b8..97a8e701fdb0 100644
--- a/pkg/sql/revert.go
+++ b/pkg/sql/revert.go
@@ -56,8 +56,7 @@ func RevertTables(
spans := make([]roachpb.Span, 0, len(tables))
- // Check that all the tables are revertable -- i.e. offline and that their
- // full interleave hierarchy is being reverted.
+ // Check that all the tables are revertable -- i.e. offline.
for i := range tables {
if tables[i].GetState() != descpb.DescriptorState_OFFLINE {
return errors.New("only offline tables can be reverted")
@@ -66,20 +65,6 @@ func RevertTables(
if !tables[i].IsPhysicalTable() {
return errors.Errorf("cannot revert virtual table %s", tables[i].GetName())
}
- for _, idx := range tables[i].NonDropIndexes() {
- for j := 0; j < idx.NumInterleaveAncestors(); j++ {
- parent := idx.GetInterleaveAncestor(j)
- if !reverting[parent.TableID] {
- return errors.New("cannot revert table without reverting all interleaved tables and indexes")
- }
- }
- for j := 0; j < idx.NumInterleavedBy(); j++ {
- child := idx.GetInterleavedBy(j)
- if !reverting[child.Table] {
- return errors.New("cannot revert table without reverting all interleaved tables and indexes")
- }
- }
- }
spans = append(spans, tables[i].TableSpan(execCfg.Codec))
}
diff --git a/pkg/sql/row/deleter.go b/pkg/sql/row/deleter.go
index cbe770340fcf..b6f6d6165a47 100644
--- a/pkg/sql/row/deleter.go
+++ b/pkg/sql/row/deleter.go
@@ -162,33 +162,3 @@ func (rd *Deleter) DeleteRow(
return nil
})
}
-
-// DeleteIndexRow adds to the batch the kv operations necessary to delete a
-// table row from the given index.
-func (rd *Deleter) DeleteIndexRow(
- ctx context.Context, b *kv.Batch, idx catalog.Index, values []tree.Datum, traceKV bool,
-) error {
- // We want to include empty k/v pairs because we want
- // to delete all k/v's for this row. By setting includeEmpty
- // to true, we will get a k/v pair for each family in the row,
- // which will guarantee that we delete all the k/v's in this row.
- secondaryIndexEntry, err := rowenc.EncodeSecondaryIndex(
- rd.Helper.Codec,
- rd.Helper.TableDesc,
- idx,
- rd.FetchColIDtoRowIndex,
- values,
- true, /* includeEmpty */
- )
- if err != nil {
- return err
- }
-
- for _, entry := range secondaryIndexEntry {
- if traceKV {
- log.VEventf(ctx, 2, "Del %s", entry.Key)
- }
- b.Del(entry.Key)
- }
- return nil
-}
diff --git a/pkg/sql/row/fetcher.go b/pkg/sql/row/fetcher.go
index c0e7fc2004a4..a8897eaa3b62 100644
--- a/pkg/sql/row/fetcher.go
+++ b/pkg/sql/row/fetcher.go
@@ -786,14 +786,16 @@ func (rf *Fetcher) prettyEncDatums(types []*types.T, vals []rowenc.EncDatum) str
func (rf *Fetcher) ReadIndexKey(
key roachpb.Key,
) (remaining []byte, ok bool, foundNull bool, err error) {
- return rowenc.DecodeIndexKeyWithoutTableIDIndexIDPrefix(
- rf.table.desc,
- rf.table.index,
+ remaining, foundNull, err = rowenc.DecodeKeyVals(
rf.table.keyValTypes,
rf.table.keyVals,
rf.table.indexColumnDirs,
key[rf.table.knownPrefixLength:],
)
+ if err != nil {
+ return nil, false, false, err
+ }
+ return remaining, true, foundNull, nil
}
// KeyToDesc implements the KeyToDescTranslator interface. The implementation is
diff --git a/pkg/sql/rowenc/index_encoding.go b/pkg/sql/rowenc/index_encoding.go
index cbc2fbf8fd8a..196b17b672a3 100644
--- a/pkg/sql/rowenc/index_encoding.go
+++ b/pkg/sql/rowenc/index_encoding.go
@@ -43,10 +43,6 @@ import (
func MakeIndexKeyPrefix(
codec keys.SQLCodec, desc catalog.TableDescriptor, indexID descpb.IndexID,
) []byte {
- if i, err := desc.FindIndexWithID(indexID); err == nil && i.NumInterleaveAncestors() > 0 {
- ancestor := i.GetInterleaveAncestor(0)
- return codec.IndexPrefix(uint32(ancestor.TableID), uint32(ancestor.IndexID))
- }
return codec.IndexPrefix(uint32(desc.GetID()), uint32(indexID))
}
@@ -148,45 +144,11 @@ func EncodePartialIndexKey(
// We know we will append to the key which will cause the capacity to grow so
// make it bigger from the get-go.
// Add the length of the key prefix as an initial guess.
- // Add 3 bytes for every ancestor: table,index id + interleave sentinel.
// Add 2 bytes for every column value. An underestimate for all but low integers.
- key = growKey(keyPrefix, len(keyPrefix)+3*index.NumInterleaveAncestors()+2*len(values))
+ key = growKey(keyPrefix, len(keyPrefix)+2*len(values))
dirs := directions(index.IndexDesc().KeyColumnDirections)
- if index.NumInterleaveAncestors() > 0 {
- for i := 0; i < index.NumInterleaveAncestors(); i++ {
- ancestor := index.GetInterleaveAncestor(i)
- // The first ancestor is assumed to already be encoded in keyPrefix.
- if i != 0 {
- key = EncodePartialTableIDIndexID(key, ancestor.TableID, ancestor.IndexID)
- }
-
- partial := false
- length := int(ancestor.SharedPrefixLen)
- if length > len(colIDs) {
- length = len(colIDs)
- partial = true
- }
- key, colIDWithNullVal, err = EncodeColumns(colIDs[:length], dirs[:length], colMap, values, key)
- if err != nil {
- return nil, colIDWithNullVal, err
- }
- if partial {
- // Early stop. Note that if we had exactly SharedPrefixLen columns
- // remaining, we want to append the next tableID/indexID pair because
- // that results in a more specific key.
- return key, colIDWithNullVal, nil
- }
- colIDs, dirs = colIDs[length:], dirs[length:]
- // Each ancestor is separated by an interleaved
- // sentinel (0xfe).
- key = encoding.EncodeInterleavedSentinel(key)
- }
-
- key = EncodePartialTableIDIndexID(key, tableDesc.GetID(), index.GetID())
- }
-
var keyColIDWithNullVal, keySuffixColIDWithNullVal descpb.ColumnID
key, keyColIDWithNullVal, err = EncodeColumns(colIDs, dirs, colMap, values, key)
if colIDWithNullVal == 0 {
@@ -462,43 +424,6 @@ func MakeKeyFromEncDatums(
key := make(roachpb.Key, len(keyPrefix), len(keyPrefix)*2)
copy(key, keyPrefix)
- if index.NumInterleaveAncestors() > 0 {
- for i := 0; i < index.NumInterleaveAncestors(); i++ {
- ancestor := index.GetInterleaveAncestor(i)
- // The first ancestor is assumed to already be encoded in keyPrefix.
- if i != 0 {
- key = EncodePartialTableIDIndexID(key, ancestor.TableID, ancestor.IndexID)
- }
-
- partial := false
- length := int(ancestor.SharedPrefixLen)
- if length > len(types) {
- length = len(types)
- partial = true
- }
- var (
- err error
- n bool
- )
- key, n, err = appendEncDatumsToKey(key, types[:length], values[:length], dirs[:length], alloc)
- if err != nil {
- return nil, false, false, err
- }
- containsNull = containsNull || n
- if partial {
- // Early stop - the number of desired columns was fewer than the number
- // left in the current interleave.
- return key, false, false, nil
- }
- types, values, dirs = types[length:], values[length:], dirs[length:]
-
- // Each ancestor is separated by an interleaved
- // sentinel (0xfe).
- key = encoding.EncodeInterleavedSentinel(key)
- }
-
- key = EncodePartialTableIDIndexID(key, tableDesc.GetID(), index.GetID())
- }
var (
err error
n bool
@@ -550,12 +475,6 @@ func appendEncDatumsToKey(
return key, containsNull, nil
}
-// EncodePartialTableIDIndexID encodes a table id followed by an index id to an
-// existing key. The key must already contain a tenant id.
-func EncodePartialTableIDIndexID(key []byte, tableID descpb.ID, indexID descpb.IndexID) []byte {
- return keys.MakeTableIDIndexID(key, uint32(tableID), uint32(indexID))
-}
-
// DecodePartialTableIDIndexID decodes a table id followed by an index id. The
// input key must already have its tenant id removed.
func DecodePartialTableIDIndexID(key []byte) ([]byte, descpb.ID, descpb.IndexID, error) {
@@ -574,58 +493,15 @@ func DecodeIndexKeyPrefix(
if err != nil {
return 0, nil, err
}
-
- // TODO(dan): This whole operation is n^2 because of the interleaves
- // bookkeeping. We could improve it to n with a prefix tree of components.
-
- interleaves := append(make([]catalog.Index, 0, len(desc.ActiveIndexes())), desc.ActiveIndexes()...)
-
- for component := 0; ; component++ {
- var tableID descpb.ID
- key, tableID, indexID, err = DecodePartialTableIDIndexID(key)
- if err != nil {
- return 0, nil, err
- }
- if tableID == desc.GetID() {
- // Once desc's table id has been decoded, there can be no more
- // interleaves.
- break
- }
-
- for i := len(interleaves) - 1; i >= 0; i-- {
- if interleaves[i].NumInterleaveAncestors() <= component ||
- interleaves[i].GetInterleaveAncestor(component).TableID != tableID ||
- interleaves[i].GetInterleaveAncestor(component).IndexID != indexID {
-
- // This component, and thus this interleave, doesn't match what was
- // decoded, remove it.
- copy(interleaves[i:], interleaves[i+1:])
- interleaves = interleaves[:len(interleaves)-1]
- }
- }
- // The decoded key doesn't many any known interleaves
- if len(interleaves) == 0 {
- return 0, nil, errors.Errorf("no known interleaves for key")
- }
-
- // Anything left has the same SharedPrefixLen at index `component`, so just
- // use the first one.
- for i := uint32(0); i < interleaves[0].GetInterleaveAncestor(component).SharedPrefixLen; i++ {
- l, err := encoding.PeekLength(key)
- if err != nil {
- return 0, nil, err
- }
- key = key[l:]
- }
-
- // Consume the interleaved sentinel.
- var ok bool
- key, ok = encoding.DecodeIfInterleavedSentinel(key)
- if !ok {
- return 0, nil, errors.Errorf("invalid interleave key")
- }
+ var tableID descpb.ID
+ key, tableID, indexID, err = DecodePartialTableIDIndexID(key)
+ if err != nil {
+ return 0, nil, err
+ }
+ if tableID != desc.GetID() {
+ return 0, nil, errors.Errorf(
+ "unexpected table ID %d, expected %d instead", tableID, desc.GetID())
}
-
return indexID, key, err
}
@@ -639,8 +515,6 @@ func DecodeIndexKeyPrefix(
// no error.
func DecodeIndexKey(
codec keys.SQLCodec,
- desc catalog.TableDescriptor,
- index catalog.Index,
types []*types.T,
vals []EncDatum,
colDirs []descpb.IndexDescriptor_Direction,
@@ -654,80 +528,11 @@ func DecodeIndexKey(
if err != nil {
return nil, false, false, err
}
- return DecodeIndexKeyWithoutTableIDIndexIDPrefix(desc, index, types, vals, colDirs, key)
-}
-
-// DecodeIndexKeyWithoutTableIDIndexIDPrefix is the same as DecodeIndexKey,
-// except it expects its index key is missing in its tenant id and first table
-// id / index id key prefix.
-func DecodeIndexKeyWithoutTableIDIndexIDPrefix(
- desc catalog.TableDescriptor,
- index catalog.Index,
- types []*types.T,
- vals []EncDatum,
- colDirs []descpb.IndexDescriptor_Direction,
- key []byte,
-) (remainingKey []byte, matches bool, foundNull bool, _ error) {
- var decodedTableID descpb.ID
- var decodedIndexID descpb.IndexID
- var err error
-
- if index.NumInterleaveAncestors() > 0 {
- for i := 0; i < index.NumInterleaveAncestors(); i++ {
- ancestor := index.GetInterleaveAncestor(i)
- // Our input key had its first table id / index id chopped off, so
- // don't try to decode those for the first ancestor.
- if i != 0 {
- key, decodedTableID, decodedIndexID, err = DecodePartialTableIDIndexID(key)
- if err != nil {
- return nil, false, false, err
- }
- if decodedTableID != ancestor.TableID || decodedIndexID != ancestor.IndexID {
- return nil, false, false, nil
- }
- }
-
- length := int(ancestor.SharedPrefixLen)
- var isNull bool
- key, isNull, err = DecodeKeyVals(types[:length], vals[:length], colDirs[:length], key)
- if err != nil {
- return nil, false, false, err
- }
- types, vals, colDirs = types[length:], vals[length:], colDirs[length:]
- foundNull = foundNull || isNull
-
- // Consume the interleaved sentinel.
- var ok bool
- key, ok = encoding.DecodeIfInterleavedSentinel(key)
- if !ok {
- return nil, false, false, nil
- }
- }
-
- key, decodedTableID, decodedIndexID, err = DecodePartialTableIDIndexID(key)
- if err != nil {
- return nil, false, false, err
- }
- if decodedTableID != desc.GetID() || decodedIndexID != index.GetID() {
- return nil, false, false, nil
- }
- }
-
- var isNull bool
- key, isNull, err = DecodeKeyVals(types, vals, colDirs, key)
+ remainingKey, foundNull, err = DecodeKeyVals(types, vals, colDirs, key)
if err != nil {
return nil, false, false, err
}
- foundNull = foundNull || isNull
-
- // We're expecting a column family id next (a varint). If
- // interleavedSentinel is actually next, then this key is for a child
- // table.
- if _, ok := encoding.DecodeIfInterleavedSentinel(key); ok {
- return nil, false, false, nil
- }
-
- return key, true, foundNull, nil
+ return remainingKey, true, foundNull, nil
}
// DecodeKeyVals decodes the values that are part of the key. The decoded
@@ -1528,177 +1333,14 @@ func EncodeSecondaryIndexes(
return secondaryIndexEntries, memUsedEncodingSecondaryIdxs, nil
}
-// IndexKeyEquivSignature parses an index key if and only if the index key
-// belongs to a table where its equivalence signature and all its interleave
-// ancestors' signatures can be found in validEquivSignatures. Any tenant ID
-// prefix should be removed before calling this function.
-//
-// Its validEquivSignatures argument is a map containing equivalence signatures
-// of valid ancestors of the desired table and of the desired table itself.
-//
-// IndexKeyEquivSignature returns whether or not the index key satisfies the
-// above condition, the value mapped to by the desired table (could be a table
-// index), and the rest of the key that's not part of the signature.
-//
-// It also requires two []byte buffers: one for the signature (signatureBuf) and
-// one for the rest of the key (keyRestBuf).
-//
-// The equivalence signature defines the equivalence classes for the signature
-// of potentially interleaved tables. For example, the equivalence signatures
-// for the following interleaved indexes:
-//
-//
-//
-//
-// and index keys
-// : ////
-// : /////#//child index id>//
-//
-// correspond to the equivalence signatures
-// : //
-// : ///#//
-//
-// Equivalence signatures allow us to associate an index key with its table
-// without having to invoke DecodeIndexKey multiple times.
-//
-// IndexKeyEquivSignature will return false if the a table's ancestor'ssignature
-// or the table's signature (table which the index key belongs to) is not mapped
-// in validEquivSignatures.
-//
-// For example, suppose the given key is
-//
-// ////#///
-//
-// and validEquivSignatures contains
-//
-// //t1 index id>
-// //t1 index id>/#//
-//
-// IndexKeyEquivSignature will short-circuit and return false once
-//
-// //
-//
-// is processed since t2's signature is not specified in validEquivSignatures.
-func IndexKeyEquivSignature(
- key []byte, validEquivSignatures map[string]int, signatureBuf []byte, restBuf []byte,
-) (tableIdx int, restResult []byte, success bool, err error) {
- signatureBuf = signatureBuf[:0]
- restResult = restBuf[:0]
- for {
- // Well-formed key is guaranteed to to have 2 varints for every
- // ancestor: the TableID and descpb.IndexID.
- // We extract these out and add them to our buffer.
- for i := 0; i < 2; i++ {
- idLen, err := encoding.PeekLength(key)
- if err != nil {
- return 0, nil, false, err
- }
- signatureBuf = append(signatureBuf, key[:idLen]...)
- key = key[idLen:]
- }
-
- // The current signature (either an ancestor table's or the key's)
- // is not one of the validEquivSignatures.
- // We can short-circuit and return false.
- recentTableIdx, found := validEquivSignatures[string(signatureBuf)]
- if !found {
- return 0, nil, false, nil
- }
-
- var isSentinel bool
- // Peek and discard encoded index values.
- for {
- key, isSentinel = encoding.DecodeIfInterleavedSentinel(key)
- // We stop once the key is empty or if we encounter a
- // sentinel for the next TableID-descpb.IndexID pair.
- if len(key) == 0 || isSentinel {
- break
- }
- len, err := encoding.PeekLength(key)
- if err != nil {
- return 0, nil, false, err
- }
- // Append any other bytes (column values initially,
- // then family ID and timestamp) to return.
- restResult = append(restResult, key[:len]...)
- key = key[len:]
- }
-
- if !isSentinel {
- // The key has been fully decomposed and is valid up to
- // this point.
- // Return the most recent table index from
- // validEquivSignatures.
- return recentTableIdx, restResult, true, nil
- }
- // If there was a sentinel, we know there are more
- // descendant(s).
- // We insert an interleave sentinel and continue extracting the
- // next descendant's IDs.
- signatureBuf = encoding.EncodeInterleavedSentinel(signatureBuf)
- }
-}
-
-// TableEquivSignatures returns the equivalence signatures for each interleave
-// ancestor and itself. See IndexKeyEquivSignature for more info.
-func TableEquivSignatures(
- desc catalog.TableDescriptor, index catalog.Index,
-) (signatures [][]byte, err error) {
- // signatures contains the slice reference to the signature of every
- // ancestor of the current table-index.
- // The last slice reference is the given table-index's signature.
- signatures = make([][]byte, index.NumInterleaveAncestors()+1)
- // fullSignature is the backing byte slice for each individual signature
- // as it buffers each block of table and index IDs.
- // We eagerly allocate 4 bytes for each of the two IDs per ancestor
- // (which can fit Uvarint IDs up to 2^17-1 without another allocation),
- // 1 byte for each interleave sentinel, and 4 bytes each for the given
- // table's and index's ID.
- fullSignature := make([]byte, 0, index.NumInterleaveAncestors()*9+8)
-
- // Encode the table's ancestors' TableIDs and descpb.IndexIDs.
- for i := 0; i < index.NumInterleaveAncestors(); i++ {
- ancestor := index.GetInterleaveAncestor(i)
- fullSignature = EncodePartialTableIDIndexID(fullSignature, ancestor.TableID, ancestor.IndexID)
- // Create a reference up to this point for the ancestor's
- // signature.
- signatures[i] = fullSignature
- // Append Interleave sentinel after every ancestor.
- fullSignature = encoding.EncodeInterleavedSentinel(fullSignature)
- }
-
- // Encode the table's table and index IDs.
- fullSignature = EncodePartialTableIDIndexID(fullSignature, desc.GetID(), index.GetID())
- // Create a reference for the given table's signature as the last
- // element of signatures.
- signatures[len(signatures)-1] = fullSignature
-
- return signatures, nil
-}
-
// maxKeyTokens returns the maximum number of key tokens in an index's key,
// including the table ID, index ID, and index column values (including extra
// columns that may be stored in the key).
// It requires knowledge of whether the key will or might contain a NULL value:
// if uncertain, pass in true to 'overestimate' the maxKeyTokens.
//
-// In general, a key belonging to an interleaved index grandchild is encoded as:
-//
-// /table/index//...//#/table/index//...//#/table/index//.../
-//
-// The part of the key with respect to the grandchild index would be
-// the entire key since there are no grand-grandchild table/index IDs or
-// . The maximal prefix of the key that belongs to child is
-//
-// /table/index//...//#/table/index//.../
-//
-// and the maximal prefix of the key that belongs to parent is
-//
-// /table/index//.../
-//
// This returns the maximum number of in this prefix.
func maxKeyTokens(index catalog.Index, containsNull bool) int {
- nTables := index.NumInterleaveAncestors() + 1
nKeyCols := index.NumKeyColumns()
// Non-unique secondary indexes or unique secondary indexes with a NULL
@@ -1709,20 +1351,7 @@ func maxKeyTokens(index catalog.Index, containsNull bool) int {
nKeyCols += index.NumKeySuffixColumns()
}
- // To illustrate how we compute max # of key tokens, take the
- // key in the example above and let the respective index be child.
- // We'd like to return the number of bytes in
- //
- // /table/index//...//#/table/index//.../
- // For each table-index, there is
- // 1. table ID
- // 2. index ID
- // 3. interleave sentinel
- // or 3 * nTables.
- // Each must be a part of the index's columns (nKeys).
- // Finally, we do not want to include the interleave sentinel for the
- // current index (-1).
- return 3*nTables + nKeyCols - 1
+ return 2 + nKeyCols
}
// AdjustEndKeyForInterleave returns an exclusive end key. It does two things:
diff --git a/pkg/sql/rowenc/index_encoding_test.go b/pkg/sql/rowenc/index_encoding_test.go
index 3872f7dadfeb..c777d72c3cb5 100644
--- a/pkg/sql/rowenc/index_encoding_test.go
+++ b/pkg/sql/rowenc/index_encoding_test.go
@@ -33,7 +33,6 @@ import (
"github.com/cockroachdb/cockroach/pkg/sql/sem/tree"
"github.com/cockroachdb/cockroach/pkg/sql/types"
"github.com/cockroachdb/cockroach/pkg/testutils"
- "github.com/cockroachdb/cockroach/pkg/util/encoding"
"github.com/cockroachdb/cockroach/pkg/util/json"
"github.com/cockroachdb/cockroach/pkg/util/leaktest"
"github.com/cockroachdb/cockroach/pkg/util/randutil"
@@ -119,7 +118,7 @@ func decodeIndex(
}
values := make([]EncDatum, index.NumKeyColumns())
colDirs := index.IndexDesc().KeyColumnDirections
- _, ok, _, err := DecodeIndexKey(codec, tableDesc, index, types, values, colDirs, key)
+ _, ok, _, err := DecodeIndexKey(codec, types, values, colDirs, key)
if err != nil {
return nil, err
}
@@ -950,320 +949,6 @@ func TestMarshalColumnValue(t *testing.T) {
}
}
-type interleaveTableArgs struct {
- indexKeyArgs indexKeyTest
- values []tree.Datum
-}
-
-type interleaveInfo struct {
- tableID uint64
- values []tree.Datum
- equivSig []byte
- children map[string]*interleaveInfo
-}
-
-func createHierarchy() map[string]*interleaveInfo {
- return map[string]*interleaveInfo{
- "t1": {
- tableID: 50,
- values: []tree.Datum{tree.NewDInt(10)},
- children: map[string]*interleaveInfo{
- "t2": {
- tableID: 100,
- values: []tree.Datum{tree.NewDInt(10), tree.NewDInt(15)},
- },
- "t3": {
- tableID: 150,
- values: []tree.Datum{tree.NewDInt(10), tree.NewDInt(20)},
- children: map[string]*interleaveInfo{
- "t4": {
- tableID: 20,
- values: []tree.Datum{tree.NewDInt(10), tree.NewDInt(30)},
- },
- },
- },
- },
- },
- }
-}
-
-type equivSigTestCases struct {
- name string
- table interleaveTableArgs
- expected [][]byte
-}
-
-func createEquivTCs(hierarchy map[string]*interleaveInfo) []equivSigTestCases {
- return []equivSigTestCases{
- {
- name: "NoAncestors",
- table: interleaveTableArgs{
- indexKeyArgs: indexKeyTest{tableID: 50},
- values: []tree.Datum{tree.NewDInt(10)},
- },
- expected: [][]byte{hierarchy["t1"].equivSig},
- },
-
- {
- name: "OneAncestor",
- table: interleaveTableArgs{
- indexKeyArgs: indexKeyTest{tableID: 100, primaryInterleaves: []descpb.ID{50}},
- values: []tree.Datum{tree.NewDInt(10), tree.NewDInt(20)},
- },
- expected: [][]byte{hierarchy["t1"].equivSig, hierarchy["t1"].children["t2"].equivSig},
- },
-
- {
- name: "TwoAncestors",
- table: interleaveTableArgs{
- indexKeyArgs: indexKeyTest{tableID: 20, primaryInterleaves: []descpb.ID{50, 150}},
- values: []tree.Datum{tree.NewDInt(10), tree.NewDInt(20), tree.NewDInt(30)},
- },
- expected: [][]byte{hierarchy["t1"].equivSig, hierarchy["t1"].children["t3"].equivSig, hierarchy["t1"].children["t3"].children["t4"].equivSig},
- },
- }
-}
-
-// equivSignatures annotates the hierarchy with the equivalence signatures
-// for each table and returns an in-order depth-first traversal of the
-// equivalence signatures.
-func equivSignatures(
- hierarchy map[string]*interleaveInfo, parent []byte, signatures [][]byte,
-) [][]byte {
- for _, info := range hierarchy {
- // Reset the reference to the parent for every child.
- curParent := parent
- curParent = encoding.EncodeUvarintAscending(curParent, info.tableID)
- // Primary ID is always 1
- curParent = encoding.EncodeUvarintAscending(curParent, 1)
- info.equivSig = make([]byte, len(curParent))
- copy(info.equivSig, curParent)
- signatures = append(signatures, info.equivSig)
- if len(info.children) > 0 {
- curParent = encoding.EncodeInterleavedSentinel(curParent)
- signatures = equivSignatures(info.children, curParent, signatures)
- }
- }
- return signatures
-}
-
-func TestIndexKeyEquivSignature(t *testing.T) {
- hierarchy := createHierarchy()
- hierarchySigs := equivSignatures(hierarchy, nil /*parent*/, nil /*signatures*/)
- // validEquivSigs is necessary for IndexKeyEquivSignatures.
- validEquivSigs := make(map[string]int)
- for i, sig := range hierarchySigs {
- validEquivSigs[string(sig)] = i
- }
-
- // Required buffers when extracting the index key's equivalence signature.
- var keySigBuf, keyRestBuf []byte
-
- for _, tc := range createEquivTCs(hierarchy) {
- t.Run(tc.name, func(t *testing.T) {
- // We need to initialize this for makeTableDescForTest.
- tc.table.indexKeyArgs.primaryValues = tc.table.values
- // Setup descriptors and form an index key.
- desc, colMap := makeTableDescForTest(tc.table.indexKeyArgs)
- primaryKeyPrefix := MakeIndexKeyPrefix(keys.SystemSQLCodec, desc, desc.GetPrimaryIndexID())
- primaryKey, _, err := EncodeIndexKey(
- desc, desc.GetPrimaryIndex(), colMap, tc.table.values, primaryKeyPrefix)
- if err != nil {
- t.Fatal(err)
- }
-
- tableIdx, restKey, match, err := IndexKeyEquivSignature(primaryKey, validEquivSigs, keySigBuf, keyRestBuf)
- if err != nil {
- t.Fatal(err)
- }
- if !match {
- t.Fatalf("expected to extract equivalence signature from index key, instead false returned")
- }
-
- tableSig := tc.expected[len(tc.expected)-1]
- expectedTableIdx := validEquivSigs[string(tableSig)]
- if expectedTableIdx != tableIdx {
- t.Fatalf("table index returned does not match table index from validEquivSigs.\nexpected %d\nactual %d", expectedTableIdx, tableIdx)
- }
-
- // Column values should be at the beginning of the
- // remaining bytes of the key.
- pkIndexDesc := desc.GetPrimaryIndex().IndexDesc()
- colVals, nullColID, err := EncodeColumns(
- pkIndexDesc.KeyColumnIDs,
- pkIndexDesc.KeyColumnDirections,
- colMap,
- tc.table.values,
- nil, /* keyPrefix */
- )
- if err != nil {
- t.Fatal(err)
- }
- if nullColID != 0 {
- t.Fatalf("unexpected null values when encoding expected column values")
- }
-
- if !bytes.Equal(colVals, restKey[:len(colVals)]) {
- t.Fatalf("missing column values from rest of key.\nexpected %v\nactual %v", colVals, restKey[:len(colVals)])
- }
-
- // The remaining bytes of the key should be the same
- // length as the primary key minus the equivalence
- // signature bytes.
- if len(primaryKey)-len(tableSig) != len(restKey) {
- t.Fatalf("unexpected rest of key length, expected %d, actual %d", len(primaryKey)-len(tableSig), len(restKey))
- }
- })
- }
-}
-
-// TestTableEquivSignatures verifies that TableEquivSignatures returns a slice
-// of slice references to a table's interleave ancestors' equivalence
-// signatures.
-func TestTableEquivSignatures(t *testing.T) {
- hierarchy := createHierarchy()
- equivSignatures(hierarchy, nil /*parent*/, nil /*signatures*/)
-
- for _, tc := range createEquivTCs(hierarchy) {
- t.Run(tc.name, func(t *testing.T) {
- // We need to initialize this for makeTableDescForTest.
- tc.table.indexKeyArgs.primaryValues = tc.table.values
- // Setup descriptors and form an index key.
- desc, _ := makeTableDescForTest(tc.table.indexKeyArgs)
- equivSigs, err := TableEquivSignatures(desc, desc.GetPrimaryIndex())
- if err != nil {
- t.Fatal(err)
- }
-
- if len(equivSigs) != len(tc.expected) {
- t.Fatalf("expected %d equivalence signatures from TableEquivSignatures, actual %d", len(tc.expected), len(equivSigs))
- }
- for i, sig := range equivSigs {
- if !bytes.Equal(sig, tc.expected[i]) {
- t.Fatalf("equivalence signatures at index %d do not match.\nexpected\t%v\nactual\t%v", i, tc.expected[i], sig)
- }
- }
- })
- }
-}
-
-// TestEquivSignature verifies that invoking IndexKeyEquivSignature for an encoded index key
-// for a given table-index pair returns the equivalent equivalence signature as
-// that of the table-index from invoking TableEquivSignatures.
-// It also checks that the equivalence signature is not equivalent to any other
-// tables' equivalence signatures.
-func TestEquivSignature(t *testing.T) {
- for _, tc := range []struct {
- name string
- tables []interleaveTableArgs
- }{
- {
- name: "Simple",
- tables: []interleaveTableArgs{
- {
- indexKeyArgs: indexKeyTest{tableID: 50},
- values: []tree.Datum{tree.NewDInt(10)},
- },
- {
- indexKeyArgs: indexKeyTest{tableID: 51},
- values: []tree.Datum{tree.NewDInt(20)},
- },
- },
- },
-
- {
- name: "ParentAndChild",
- tables: []interleaveTableArgs{
- {
- indexKeyArgs: indexKeyTest{tableID: 50},
- values: []tree.Datum{tree.NewDInt(10)},
- },
- {
- indexKeyArgs: indexKeyTest{tableID: 51, primaryInterleaves: []descpb.ID{50}},
- values: []tree.Datum{tree.NewDInt(10), tree.NewDInt(20)},
- },
- },
- },
-
- {
- name: "Siblings",
- tables: []interleaveTableArgs{
- {
- indexKeyArgs: indexKeyTest{tableID: 50},
- values: []tree.Datum{tree.NewDInt(10)},
- },
- {
- indexKeyArgs: indexKeyTest{tableID: 51, primaryInterleaves: []descpb.ID{50}},
- values: []tree.Datum{tree.NewDInt(10), tree.NewDInt(20)},
- },
- {
- indexKeyArgs: indexKeyTest{tableID: 52, primaryInterleaves: []descpb.ID{50}},
- values: []tree.Datum{tree.NewDInt(30), tree.NewDInt(40)},
- },
- },
- },
- } {
- t.Run(tc.name, func(t *testing.T) {
- keyEquivSigs := make([][]byte, len(tc.tables))
- tableEquivSigs := make([][]byte, len(tc.tables))
-
- for i, table := range tc.tables {
- // We need to initialize this for makeTableDescForTest.
- table.indexKeyArgs.primaryValues = table.values
-
- // Setup descriptors and form an index key.
- desc, colMap := makeTableDescForTest(table.indexKeyArgs)
- primaryKeyPrefix := MakeIndexKeyPrefix(keys.SystemSQLCodec, desc, desc.GetPrimaryIndexID())
- primaryKey, _, err := EncodeIndexKey(
- desc, desc.GetPrimaryIndex(), colMap, table.values, primaryKeyPrefix)
- if err != nil {
- t.Fatal(err)
- }
-
- // Extract out the table's equivalence signature.
- tempEquivSigs, err := TableEquivSignatures(desc, desc.GetPrimaryIndex())
- if err != nil {
- t.Fatal(err)
- }
- // The last signature is this table's.
- tableEquivSigs[i] = tempEquivSigs[len(tempEquivSigs)-1]
-
- validEquivSigs := make(map[string]int)
- for i, sig := range tempEquivSigs {
- validEquivSigs[string(sig)] = i
- }
- // Extract out the corresponding table index
- // of the index key's signature.
- tableIdx, _, _, err := IndexKeyEquivSignature(primaryKey, validEquivSigs, nil /*keySigBuf*/, nil /*keyRestBuf*/)
- if err != nil {
- t.Fatal(err)
- }
- // Map the table index back to the signature.
- keyEquivSigs[i] = tempEquivSigs[tableIdx]
- }
-
- for i, keySig := range keyEquivSigs {
- for j, tableSig := range tableEquivSigs {
- if i == j {
- // The corresponding table should have the same
- // equivalence signature as the one derived from the key.
- if !bytes.Equal(keySig, tableSig) {
- t.Fatalf("IndexKeyEquivSignature differs from equivalence signature for its table.\nKeySignature: %v\nTableSignature: %v", keySig, tableSig)
- }
- } else {
- // A different table should not have
- // the same equivalence signature.
- if bytes.Equal(keySig, tableSig) {
- t.Fatalf("IndexKeyEquivSignature produces equivalent signature for a different table.\nKeySignature: %v\nTableSignature: %v", keySig, tableSig)
- }
- }
- }
- }
-
- })
- }
-}
-
func TestDecodeTableValue(t *testing.T) {
a := &DatumAlloc{}
for _, tc := range []struct {
@@ -1299,10 +984,6 @@ func TestDecodeTableValue(t *testing.T) {
}
}
-// See CreateTestInterleavedHierarchy for the longest chain used for the short
-// format.
-var shortFormTables = [3]string{"parent1", "child1", "grandchild1"}
-
// ExtractIndexKey constructs the index (primary) key for a row from any index
// key/value entry, including secondary indexes.
//
@@ -1330,23 +1011,9 @@ func ExtractIndexKey(
}
values := make([]EncDatum, index.NumKeyColumns())
dirs := index.IndexDesc().KeyColumnDirections
- if index.NumInterleaveAncestors() > 0 {
- // TODO(dan): In the interleaved index case, we parse the key twice; once to
- // find the index id so we can look up the descriptor, and once to extract
- // the values. Only parse once.
- var ok bool
- _, ok, _, err = DecodeIndexKey(codec, tableDesc, index, indexTypes, values, dirs, entry.Key)
- if err != nil {
- return nil, err
- }
- if !ok {
- return nil, errors.Errorf("descriptor did not match key")
- }
- } else {
- key, _, err = DecodeKeyVals(indexTypes, values, dirs, key)
- if err != nil {
- return nil, err
- }
+ key, _, err = DecodeKeyVals(indexTypes, values, dirs, key)
+ if err != nil {
+ return nil, err
}
// Extract the values for index.KeySuffixColumnIDs
diff --git a/pkg/sql/schema_changer.go b/pkg/sql/schema_changer.go
index 49169c4e6b64..bd46f85ae355 100644
--- a/pkg/sql/schema_changer.go
+++ b/pkg/sql/schema_changer.go
@@ -1082,25 +1082,24 @@ func (sc *SchemaChanger) done(ctx context.Context) error {
}
isRollback = m.IsRollback()
if idx := m.AsIndex(); m.Dropped() && idx != nil {
- if canClearRangeForDrop(idx) {
- // how we keep track of dropped index names (for, e.g., zone config
- // lookups), even though in the absence of a GC job there's nothing to
- // clean them up.
- scTable.GCMutations = append(
- scTable.GCMutations,
- descpb.TableDescriptor_GCDescriptorMutation{
- IndexID: idx.GetID(),
- })
+ // how we keep track of dropped index names (for, e.g., zone config
+ // lookups), even though in the absence of a GC job there's nothing to
+ // clean them up.
+ scTable.GCMutations = append(
+ scTable.GCMutations,
+ descpb.TableDescriptor_GCDescriptorMutation{
+ IndexID: idx.GetID(),
+ })
- description := sc.job.Payload().Description
- if isRollback {
- description = "ROLLBACK of " + description
- }
+ description := sc.job.Payload().Description
+ if isRollback {
+ description = "ROLLBACK of " + description
+ }
- if err := sc.createIndexGCJob(ctx, idx.GetID(), txn, description); err != nil {
- return err
- }
+ if err := sc.createIndexGCJob(ctx, idx.GetID(), txn, description); err != nil {
+ return err
}
+
}
if constraint := m.AsConstraint(); constraint != nil && constraint.Adding() {
if constraint.IsForeignKey() && constraint.ForeignKey().Validity == descpb.ConstraintValidity_Unvalidated {
@@ -1221,14 +1220,6 @@ func (sc *SchemaChanger) done(ctx context.Context) error {
}
}
- if err := maybeRemoveInterleaveBackreference(ctx, txn, descsCol, m, scTable, func(
- ctx context.Context, ancestor *tabledesc.Mutable,
- ) error {
- return descsCol.WriteDescToBatch(ctx, kvTrace, ancestor, b)
- }); err != nil {
- return err
- }
-
// If we performed MakeMutationComplete on a PrimaryKeySwap mutation, then we need to start
// a job for the index deletion mutations that the primary key swap mutation added, if any.
if err := sc.queueCleanupJobs(ctx, scTable, txn); err != nil {
@@ -1354,61 +1345,6 @@ func (sc *SchemaChanger) done(ctx context.Context) error {
return nil
}
-// If this mutation is a primary key swap that is not being rolled back,
-// and the old index had an interleaved parent, remove the backreference
-// from the parent.
-func maybeRemoveInterleaveBackreference(
- ctx context.Context,
- txn *kv.Txn,
- descsCol *descs.Collection,
- mutation catalog.Mutation,
- scTable *tabledesc.Mutable,
- writeFunc func(ctx context.Context, ancestor *tabledesc.Mutable) error,
-) error {
- if !mutation.Adding() {
- return nil
- }
- pkSwap := mutation.AsPrimaryKeySwap()
- if pkSwap == nil {
- return nil
- }
- return pkSwap.ForEachOldIndexIDs(func(id descpb.IndexID) error {
- oldIndex, err := scTable.FindIndexWithID(id)
- if err != nil {
- return err
- }
- if oldIndex.NumInterleaveAncestors() != 0 {
- ancestorInfo := oldIndex.GetInterleaveAncestor(oldIndex.NumInterleaveAncestors() - 1)
- ancestor, err := descsCol.GetMutableTableVersionByID(ctx, ancestorInfo.TableID, txn)
- if err != nil {
- return err
- }
- ancestorIdxI, err := ancestor.FindIndexWithID(ancestorInfo.IndexID)
- if err != nil {
- return err
- }
- ancestorIdx := ancestorIdxI.IndexDesc()
- foundAncestor := false
- for k, ref := range ancestorIdx.InterleavedBy {
- if ref.Table == scTable.ID && ref.Index == oldIndex.GetID() {
- if foundAncestor {
- return errors.AssertionFailedf(
- "ancestor entry in %s for %s@%s found more than once",
- ancestor.Name, scTable.Name, oldIndex.GetName())
- }
- ancestorIdx.InterleavedBy = append(
- ancestorIdx.InterleavedBy[:k], ancestorIdx.InterleavedBy[k+1:]...)
- foundAncestor = true
- if err := writeFunc(ctx, ancestor); err != nil {
- return err
- }
- }
- }
- }
- return nil
- })
-}
-
// maybeUpdateZoneConfigsForPKChange moves zone configs for any rewritten
// indexes from the old index over to the new index. Noop if run on behalf of a
// tenant.
diff --git a/pkg/sql/schemachanger/scbuild/table.go b/pkg/sql/schemachanger/scbuild/table.go
index bc2c31a99878..48942e3d6c4a 100644
--- a/pkg/sql/schemachanger/scbuild/table.go
+++ b/pkg/sql/schemachanger/scbuild/table.go
@@ -683,16 +683,6 @@ func (b *buildContext) maybeCleanTableFKs(
func (b *buildContext) dropTableDesc(
ctx context.Context, table catalog.TableDescriptor, behavior tree.DropBehavior,
) {
- // Interleaved tables not supported in new schema changer.
- if table.IsInterleaved() {
- panic(¬ImplementedError{
- n: &tree.DropTable{
- Names: []tree.TableName{
- tree.MakeUnqualifiedTableName(tree.Name(table.GetName())),
- },
- },
- detail: "drop on interleaved table"})
- }
// Drop dependent views
onErrPanic(table.ForeachDependedOnBy(func(dep *descpb.TableDescriptor_Reference) error {
diff --git a/pkg/sql/sem/tree/alter_table.go b/pkg/sql/sem/tree/alter_table.go
index 34458cbc87a1..f08b9ad6ac41 100644
--- a/pkg/sql/sem/tree/alter_table.go
+++ b/pkg/sql/sem/tree/alter_table.go
@@ -255,10 +255,9 @@ func (node *AlterTableAlterColumnType) GetColumn() Name {
// AlterTableAlterPrimaryKey represents an ALTER TABLE ALTER PRIMARY KEY command.
type AlterTableAlterPrimaryKey struct {
- Columns IndexElemList
- Interleave *InterleaveDef
- Sharded *ShardedIndexDef
- Name Name
+ Columns IndexElemList
+ Sharded *ShardedIndexDef
+ Name Name
}
// TelemetryCounter implements the AlterTableCmd interface.
@@ -274,9 +273,6 @@ func (node *AlterTableAlterPrimaryKey) Format(ctx *FmtCtx) {
if node.Sharded != nil {
ctx.FormatNode(node.Sharded)
}
- if node.Interleave != nil {
- ctx.FormatNode(node.Interleave)
- }
}
// AlterTableDropColumn represents a DROP COLUMN command.
diff --git a/pkg/sql/sem/tree/backup.go b/pkg/sql/sem/tree/backup.go
index ba6c4ed8f40f..6ec8925fa606 100644
--- a/pkg/sql/sem/tree/backup.go
+++ b/pkg/sql/sem/tree/backup.go
@@ -36,11 +36,10 @@ const (
// BackupOptions describes options for the BACKUP execution.
type BackupOptions struct {
- CaptureRevisionHistory bool
- EncryptionPassphrase Expr
- Detached bool
- EncryptionKMSURI StringOrPlaceholderOptList
- IncludeDeprecatedInterleaves bool
+ CaptureRevisionHistory bool
+ EncryptionPassphrase Expr
+ Detached bool
+ EncryptionKMSURI StringOrPlaceholderOptList
}
var _ NodeFormatter = &BackupOptions{}
@@ -238,11 +237,6 @@ func (o *BackupOptions) Format(ctx *FmtCtx) {
ctx.WriteString("kms = ")
ctx.FormatNode(&o.EncryptionKMSURI)
}
-
- if o.IncludeDeprecatedInterleaves {
- maybeAddSep()
- ctx.WriteString("include_deprecated_interleaves")
- }
}
// CombineWith merges other backup options into this backup options struct.
@@ -276,14 +270,6 @@ func (o *BackupOptions) CombineWith(other *BackupOptions) error {
return errors.New("kms specified multiple times")
}
- if o.IncludeDeprecatedInterleaves {
- if other.IncludeDeprecatedInterleaves {
- return errors.New("include_deprecated_interleaves option specified multiple times")
- }
- } else {
- o.IncludeDeprecatedInterleaves = other.IncludeDeprecatedInterleaves
- }
-
return nil
}
diff --git a/pkg/sql/sem/tree/create.go b/pkg/sql/sem/tree/create.go
index a15721a8a6d9..8082b99273bf 100644
--- a/pkg/sql/sem/tree/create.go
+++ b/pkg/sql/sem/tree/create.go
@@ -213,7 +213,6 @@ type CreateIndex struct {
// Extra columns to be stored together with the indexed ones as an optimization
// for improved reading performance.
Storing NameList
- Interleave *InterleaveDef
PartitionByIndex *PartitionByIndex
StorageParams StorageParams
Predicate Expr
@@ -261,9 +260,6 @@ func (node *CreateIndex) Format(ctx *FmtCtx) {
ctx.FormatNode(&node.Storing)
ctx.WriteByte(')')
}
- if node.Interleave != nil {
- ctx.FormatNode(node.Interleave)
- }
if node.PartitionByIndex != nil {
ctx.FormatNode(node.PartitionByIndex)
}
@@ -937,7 +933,6 @@ type IndexTableDef struct {
Columns IndexElemList
Sharded *ShardedIndexDef
Storing NameList
- Interleave *InterleaveDef
Inverted bool
PartitionByIndex *PartitionByIndex
StorageParams StorageParams
@@ -965,9 +960,6 @@ func (node *IndexTableDef) Format(ctx *FmtCtx) {
ctx.FormatNode(&node.Storing)
ctx.WriteByte(')')
}
- if node.Interleave != nil {
- ctx.FormatNode(node.Interleave)
- }
if node.PartitionByIndex != nil {
ctx.FormatNode(node.PartitionByIndex)
}
@@ -1037,9 +1029,6 @@ func (node *UniqueConstraintTableDef) Format(ctx *FmtCtx) {
ctx.FormatNode(&node.Storing)
ctx.WriteByte(')')
}
- if node.Interleave != nil {
- ctx.FormatNode(node.Interleave)
- }
if node.PartitionByIndex != nil {
ctx.FormatNode(node.PartitionByIndex)
}
@@ -1214,32 +1203,6 @@ func (node *ShardedIndexDef) Format(ctx *FmtCtx) {
ctx.FormatNode(node.ShardBuckets)
}
-// InterleaveDef represents an interleave definition within a CREATE TABLE
-// or CREATE INDEX statement.
-type InterleaveDef struct {
- Parent TableName
- Fields NameList
- DropBehavior DropBehavior
-}
-
-// Format implements the NodeFormatter interface.
-func (node *InterleaveDef) Format(ctx *FmtCtx) {
- ctx.WriteString(" INTERLEAVE IN PARENT ")
- ctx.FormatNode(&node.Parent)
- ctx.WriteString(" (")
- for i := range node.Fields {
- if i > 0 {
- ctx.WriteString(", ")
- }
- ctx.FormatNode(&node.Fields[i])
- }
- ctx.WriteString(")")
- if node.DropBehavior != DropDefault {
- ctx.WriteString(" ")
- ctx.WriteString(node.DropBehavior.String())
- }
-}
-
// PartitionByType is an enum of each type of partitioning (LIST/RANGE).
type PartitionByType string
@@ -1429,7 +1392,6 @@ const (
type CreateTable struct {
IfNotExists bool
Table TableName
- Interleave *InterleaveDef
PartitionByTable *PartitionByTable
Persistence Persistence
StorageParams StorageParams
@@ -1495,9 +1457,6 @@ func (node *CreateTable) FormatBody(ctx *FmtCtx) {
ctx.WriteString(" (")
ctx.FormatNode(&node.Defs)
ctx.WriteByte(')')
- if node.Interleave != nil {
- ctx.FormatNode(node.Interleave)
- }
if node.PartitionByTable != nil {
ctx.FormatNode(node.PartitionByTable)
}
diff --git a/pkg/sql/sem/tree/pretty.go b/pkg/sql/sem/tree/pretty.go
index 0b95a6fd27b8..75bf11a7a900 100644
--- a/pkg/sql/sem/tree/pretty.go
+++ b/pkg/sql/sem/tree/pretty.go
@@ -1239,9 +1239,6 @@ func (node *CreateTable) doc(p *PrettyCfg) pretty.Doc {
if node.As() {
clauses = append(clauses, p.Doc(node.AsSource))
}
- if node.Interleave != nil {
- clauses = append(clauses, p.Doc(node.Interleave))
- }
if node.PartitionByTable != nil {
clauses = append(clauses, p.Doc(node.PartitionByTable))
}
@@ -1559,22 +1556,6 @@ func (node *ShardedIndexDef) doc(p *PrettyCfg) pretty.Doc {
return pretty.Fold(pretty.ConcatSpace, parts...)
}
-func (node *InterleaveDef) doc(p *PrettyCfg) pretty.Doc {
- // Final layout:
- //
- // INTERLEAVE IN PARENT tbl (...) [RESTRICT|CASCADE]
- //
- parts := []pretty.Doc{
- pretty.Keyword("INTERLEAVE IN PARENT"),
- p.Doc(&node.Parent),
- p.bracket("(", p.Doc(&node.Fields), ")"),
- }
- if node.DropBehavior != DropDefault {
- parts = append(parts, pretty.Keyword(node.DropBehavior.String()))
- }
- return pretty.Fold(pretty.ConcatSpace, parts...)
-}
-
func (node *CreateIndex) doc(p *PrettyCfg) pretty.Doc {
// Final layout:
// CREATE [UNIQUE] [INVERTED] INDEX [name]
@@ -1620,9 +1601,6 @@ func (node *CreateIndex) doc(p *PrettyCfg) pretty.Doc {
")", "",
))
}
- if node.Interleave != nil {
- clauses = append(clauses, p.Doc(node.Interleave))
- }
if node.PartitionByIndex != nil {
clauses = append(clauses, p.Doc(node.PartitionByIndex))
}
@@ -1693,9 +1671,6 @@ func (node *IndexTableDef) doc(p *PrettyCfg) pretty.Doc {
p.Doc(&node.Storing),
")", ""))
}
- if node.Interleave != nil {
- clauses = append(clauses, p.Doc(node.Interleave))
- }
if node.PartitionByIndex != nil {
clauses = append(clauses, p.Doc(node.PartitionByIndex))
}
@@ -1756,9 +1731,7 @@ func (node *UniqueConstraintTableDef) doc(p *PrettyCfg) pretty.Doc {
p.Doc(&node.Storing),
")", ""))
}
- if node.Interleave != nil {
- clauses = append(clauses, p.Doc(node.Interleave))
- }
+
if node.PartitionByIndex != nil {
clauses = append(clauses, p.Doc(node.PartitionByIndex))
}
diff --git a/pkg/sql/sem/tree/testdata/pretty/20.align-deindent.golden.short b/pkg/sql/sem/tree/testdata/pretty/20.align-deindent.golden.short
index c8c04fab861b..ca469c5031b9 100644
--- a/pkg/sql/sem/tree/testdata/pretty/20.align-deindent.golden.short
+++ b/pkg/sql/sem/tree/testdata/pretty/20.align-deindent.golden.short
@@ -5,8 +5,7 @@
CREATE TABLE t (
a INT8, b INT8, c INT8,
PRIMARY KEY (a, b)
-) INTERLEAVE IN PARENT p2 (i)
- PARTITION BY LIST (a) (
+) PARTITION BY LIST (a) (
PARTITION p1
VALUES IN (
1
diff --git a/pkg/sql/sem/tree/testdata/pretty/20.align-only.golden.short b/pkg/sql/sem/tree/testdata/pretty/20.align-only.golden.short
index c8c04fab861b..ca469c5031b9 100644
--- a/pkg/sql/sem/tree/testdata/pretty/20.align-only.golden.short
+++ b/pkg/sql/sem/tree/testdata/pretty/20.align-only.golden.short
@@ -5,8 +5,7 @@
CREATE TABLE t (
a INT8, b INT8, c INT8,
PRIMARY KEY (a, b)
-) INTERLEAVE IN PARENT p2 (i)
- PARTITION BY LIST (a) (
+) PARTITION BY LIST (a) (
PARTITION p1
VALUES IN (
1
diff --git a/pkg/sql/sem/tree/testdata/pretty/20.ref.golden.short b/pkg/sql/sem/tree/testdata/pretty/20.ref.golden.short
index feb7008e0a42..15a169ca3cd3 100644
--- a/pkg/sql/sem/tree/testdata/pretty/20.ref.golden.short
+++ b/pkg/sql/sem/tree/testdata/pretty/20.ref.golden.short
@@ -6,7 +6,6 @@ CREATE TABLE t (
a INT8, b INT8, c INT8,
PRIMARY KEY (a, b)
)
- INTERLEAVE IN PARENT p2 (i)
PARTITION BY LIST (a)
(
PARTITION p1 VALUES IN (1),
diff --git a/pkg/sql/sem/tree/testdata/pretty/20.sql b/pkg/sql/sem/tree/testdata/pretty/20.sql
index 581e4f51ce31..dc6740fd3eb3 100644
--- a/pkg/sql/sem/tree/testdata/pretty/20.sql
+++ b/pkg/sql/sem/tree/testdata/pretty/20.sql
@@ -1,4 +1,4 @@
-CREATE TABLE t (a INT, b INT, c INT, PRIMARY KEY (a, b)) INTERLEAVE IN PARENT p2 (i) PARTITION BY LIST (a) (
+CREATE TABLE t (a INT, b INT, c INT, PRIMARY KEY (a, b)) PARTITION BY LIST (a) (
PARTITION p1 VALUES IN (1),
PARTITION p2 VALUES IN (2)
)
diff --git a/pkg/sql/sem/tree/testdata/pretty/create_interleaved_drop.align-deindent.golden b/pkg/sql/sem/tree/testdata/pretty/create_interleaved_drop.align-deindent.golden
deleted file mode 100644
index b690994cdea9..000000000000
--- a/pkg/sql/sem/tree/testdata/pretty/create_interleaved_drop.align-deindent.golden
+++ /dev/null
@@ -1,50 +0,0 @@
-// Code generated by TestPretty. DO NOT EDIT.
-// GENERATED FILE DO NOT EDIT
-1:
--
-CREATE TABLE t (
- a
- INT8
-)
- INTERLEAVE IN PARENT p2 (
- i,
- test
- ) RESTRICT
-
-10:
-----------
-CREATE TABLE t (
- a INT8
-)
- INTERLEAVE IN PARENT p2 (
- i,
- test
- ) RESTRICT
-
-16:
-----------------
-CREATE TABLE t (
- a INT8
-) INTERLEAVE IN PARENT p2 (
- i,
- test
- ) RESTRICT
-
-44:
---------------------------------------------
-CREATE TABLE t (
- a INT8
-) INTERLEAVE IN PARENT p2 (i, test) RESTRICT
-
-49:
--------------------------------------------------
-CREATE TABLE t (a INT8) INTERLEAVE IN PARENT p2 (
- i,
- test
- ) RESTRICT
-
-66:
-------------------------------------------------------------------
-CREATE TABLE t (a INT8) INTERLEAVE IN PARENT p2 (i, test) RESTRICT
-
-
diff --git a/pkg/sql/sem/tree/testdata/pretty/create_interleaved_drop.align-deindent.golden.short b/pkg/sql/sem/tree/testdata/pretty/create_interleaved_drop.align-deindent.golden.short
deleted file mode 100644
index dd789f37978e..000000000000
--- a/pkg/sql/sem/tree/testdata/pretty/create_interleaved_drop.align-deindent.golden.short
+++ /dev/null
@@ -1,12 +0,0 @@
-// Code generated by TestPretty. DO NOT EDIT.
-// GENERATED FILE DO NOT EDIT
-1:
--
-CREATE TABLE t (
- a INT8
-) INTERLEAVE IN PARENT p2 (
- i,
- test
- ) RESTRICT
-
-
diff --git a/pkg/sql/sem/tree/testdata/pretty/create_interleaved_drop.align-only.golden b/pkg/sql/sem/tree/testdata/pretty/create_interleaved_drop.align-only.golden
deleted file mode 100644
index b690994cdea9..000000000000
--- a/pkg/sql/sem/tree/testdata/pretty/create_interleaved_drop.align-only.golden
+++ /dev/null
@@ -1,50 +0,0 @@
-// Code generated by TestPretty. DO NOT EDIT.
-// GENERATED FILE DO NOT EDIT
-1:
--
-CREATE TABLE t (
- a
- INT8
-)
- INTERLEAVE IN PARENT p2 (
- i,
- test
- ) RESTRICT
-
-10:
-----------
-CREATE TABLE t (
- a INT8
-)
- INTERLEAVE IN PARENT p2 (
- i,
- test
- ) RESTRICT
-
-16:
-----------------
-CREATE TABLE t (
- a INT8
-) INTERLEAVE IN PARENT p2 (
- i,
- test
- ) RESTRICT
-
-44:
---------------------------------------------
-CREATE TABLE t (
- a INT8
-) INTERLEAVE IN PARENT p2 (i, test) RESTRICT
-
-49:
--------------------------------------------------
-CREATE TABLE t (a INT8) INTERLEAVE IN PARENT p2 (
- i,
- test
- ) RESTRICT
-
-66:
-------------------------------------------------------------------
-CREATE TABLE t (a INT8) INTERLEAVE IN PARENT p2 (i, test) RESTRICT
-
-
diff --git a/pkg/sql/sem/tree/testdata/pretty/create_interleaved_drop.align-only.golden.short b/pkg/sql/sem/tree/testdata/pretty/create_interleaved_drop.align-only.golden.short
deleted file mode 100644
index dd789f37978e..000000000000
--- a/pkg/sql/sem/tree/testdata/pretty/create_interleaved_drop.align-only.golden.short
+++ /dev/null
@@ -1,12 +0,0 @@
-// Code generated by TestPretty. DO NOT EDIT.
-// GENERATED FILE DO NOT EDIT
-1:
--
-CREATE TABLE t (
- a INT8
-) INTERLEAVE IN PARENT p2 (
- i,
- test
- ) RESTRICT
-
-
diff --git a/pkg/sql/sem/tree/testdata/pretty/create_interleaved_drop.ref.golden b/pkg/sql/sem/tree/testdata/pretty/create_interleaved_drop.ref.golden
deleted file mode 100644
index 599ae2cfa805..000000000000
--- a/pkg/sql/sem/tree/testdata/pretty/create_interleaved_drop.ref.golden
+++ /dev/null
@@ -1,41 +0,0 @@
-// Code generated by TestPretty. DO NOT EDIT.
-// GENERATED FILE DO NOT EDIT
-1:
--
-CREATE TABLE t (
- a
- INT8
-)
- INTERLEAVE IN PARENT p2 (
- i,
- test
- ) RESTRICT
-
-10:
-----------
-CREATE TABLE t (
- a INT8
-)
- INTERLEAVE IN PARENT p2 (
- i,
- test
- ) RESTRICT
-
-23:
------------------------
-CREATE TABLE t (a INT8)
- INTERLEAVE IN PARENT p2 (
- i,
- test
- ) RESTRICT
-
-46:
-----------------------------------------------
-CREATE TABLE t (a INT8)
- INTERLEAVE IN PARENT p2 (i, test) RESTRICT
-
-66:
-------------------------------------------------------------------
-CREATE TABLE t (a INT8) INTERLEAVE IN PARENT p2 (i, test) RESTRICT
-
-
diff --git a/pkg/sql/sem/tree/testdata/pretty/create_interleaved_drop.ref.golden.short b/pkg/sql/sem/tree/testdata/pretty/create_interleaved_drop.ref.golden.short
deleted file mode 100644
index c59ef4ae2328..000000000000
--- a/pkg/sql/sem/tree/testdata/pretty/create_interleaved_drop.ref.golden.short
+++ /dev/null
@@ -1,11 +0,0 @@
-// Code generated by TestPretty. DO NOT EDIT.
-// GENERATED FILE DO NOT EDIT
-1:
--
-CREATE TABLE t (a INT8)
- INTERLEAVE IN PARENT p2 (
- i,
- test
- ) RESTRICT
-
-
diff --git a/pkg/sql/sem/tree/testdata/pretty/create_interleaved_drop.sql b/pkg/sql/sem/tree/testdata/pretty/create_interleaved_drop.sql
deleted file mode 100644
index 25cd20bf1d4d..000000000000
--- a/pkg/sql/sem/tree/testdata/pretty/create_interleaved_drop.sql
+++ /dev/null
@@ -1 +0,0 @@
-create table t (a int) interleave in parent p2 (i, "test") restrict
diff --git a/pkg/sql/sessiondatapb/local_only_session_data.pb.go b/pkg/sql/sessiondatapb/local_only_session_data.pb.go
index 7fc6b2e79ef1..7db16611bd8a 100644
--- a/pkg/sql/sessiondatapb/local_only_session_data.pb.go
+++ b/pkg/sql/sessiondatapb/local_only_session_data.pb.go
@@ -145,11 +145,6 @@ type LocalOnlySessionData struct {
// experimentalComputedColumnRewrites cluster setting for a description of the
// format.
ExperimentalComputedColumnRewrites string `protobuf:"bytes,35,opt,name=experimental_computed_column_rewrites,json=experimentalComputedColumnRewrites,proto3" json:"experimental_computed_column_rewrites,omitempty"`
- // CopyPartitioningWhenDeinterleavingTable indicates that when running an
- // ALTER PRIMARY KEY that retains the same columns but removes any
- // interleaving that zone configurations and partitioning from the root
- // of that interleave should be applied to the new primary index.
- CopyPartitioningWhenDeinterleavingTable bool `protobuf:"varint,36,opt,name=copy_partitioning_when_deinterleaving_table,json=copyPartitioningWhenDeinterleavingTable,proto3" json:"copy_partitioning_when_deinterleaving_table,omitempty"`
// EnableStreamReplication indicates whether to allow setting up a replication
// stream.
EnableStreamReplication bool `protobuf:"varint,37,opt,name=enable_stream_replication,json=enableStreamReplication,proto3" json:"enable_stream_replication,omitempty"`
@@ -310,131 +305,129 @@ func init() {
}
var fileDescriptor_21ead158cf36da28 = []byte{
- // 1981 bytes of a gzipped FileDescriptorProto
- 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x9c, 0x57, 0x5f, 0x53, 0x1c, 0xc7,
- 0x11, 0xd7, 0x59, 0xb6, 0x23, 0x06, 0x81, 0x60, 0x8d, 0xcc, 0x02, 0x82, 0x03, 0xfd, 0xb1, 0x90,
- 0x65, 0x83, 0x2d, 0x3b, 0x8e, 0xec, 0x54, 0x12, 0x9b, 0x03, 0xac, 0x3f, 0xd8, 0xa0, 0x3d, 0x64,
- 0x55, 0x9c, 0x54, 0x4d, 0x0d, 0xbb, 0x7d, 0x77, 0x63, 0x76, 0x67, 0xf6, 0x66, 0x66, 0x81, 0xe3,
- 0x21, 0x9f, 0x21, 0x55, 0x79, 0xce, 0xf7, 0xf1, 0xa3, 0x1f, 0xfd, 0x44, 0x25, 0xe8, 0x43, 0xa4,
- 0x4a, 0x4f, 0xa9, 0xee, 0xd9, 0xbd, 0x3b, 0x04, 0x76, 0xaa, 0xf2, 0x76, 0xd7, 0xbf, 0x5f, 0xff,
- 0xa6, 0xa7, 0xa7, 0xbb, 0x67, 0x96, 0xad, 0xda, 0x6e, 0xba, 0x6a, 0xc1, 0x5a, 0xa9, 0x55, 0x22,
- 0x9c, 0xc8, 0xf7, 0x56, 0x53, 0x1d, 0x8b, 0x94, 0x6b, 0x95, 0xf6, 0x78, 0x09, 0x70, 0x44, 0x56,
- 0x72, 0xa3, 0x9d, 0x0e, 0xe6, 0x62, 0x1d, 0xef, 0x1b, 0x2d, 0xe2, 0xce, 0x8a, 0xed, 0xa6, 0x2b,
- 0x67, 0x5c, 0x67, 0xa7, 0xda, 0xba, 0xad, 0x89, 0xb7, 0x8a, 0xbf, 0xbc, 0xcb, 0xcd, 0xff, 0xcc,
- 0xb3, 0xa9, 0x2d, 0x14, 0xdd, 0x56, 0x69, 0xaf, 0xe9, 0x1d, 0xd6, 0x85, 0x13, 0xc1, 0x07, 0x2c,
- 0xb0, 0xe2, 0x00, 0xb8, 0x13, 0x7b, 0x29, 0x58, 0x9e, 0x1b, 0x68, 0xc9, 0xa3, 0xb0, 0xb6, 0x58,
- 0x5b, 0x1e, 0x89, 0x26, 0x10, 0xd9, 0x25, 0x60, 0x87, 0xec, 0xc1, 0x5f, 0xd8, 0x9c, 0xce, 0x9d,
- 0xcc, 0xe4, 0x31, 0x18, 0xde, 0xda, 0xe7, 0xb1, 0xb0, 0xb1, 0x48, 0xc0, 0xf2, 0x54, 0x66, 0xd2,
- 0x85, 0x6f, 0x2c, 0xd6, 0x96, 0x2f, 0xaf, 0xdd, 0x38, 0x3d, 0xa9, 0x87, 0xdb, 0x15, 0x6d, 0xf3,
- 0x69, 0xa3, 0x24, 0x6d, 0x21, 0x27, 0x0a, 0xfb, 0x02, 0x9b, 0xfb, 0x67, 0x90, 0xe0, 0x53, 0x76,
- 0xd5, 0xba, 0xcc, 0x71, 0x27, 0x33, 0xd0, 0x85, 0x0b, 0x2f, 0x93, 0xda, 0xe4, 0xab, 0x93, 0xfa,
- 0x18, 0x9a, 0x56, 0xd6, 0x0b, 0x23, 0x9c, 0xd4, 0x2a, 0x1a, 0x45, 0xda, 0xae, 0x67, 0x05, 0x8f,
- 0xd8, 0xb4, 0x4c, 0x52, 0xe0, 0x52, 0xf5, 0x53, 0x55, 0x09, 0xbc, 0xf9, 0x4b, 0x02, 0x53, 0xe8,
- 0xf1, 0x58, 0x95, 0x79, 0xa8, 0x94, 0x38, 0xbb, 0x55, 0x29, 0x39, 0x23, 0x94, 0x15, 0x31, 0x92,
- 0xcf, 0xa9, 0xbe, 0xf5, 0x4b, 0xaa, 0x75, 0xaf, 0xba, 0x3b, 0xf0, 0x7d, 0x6d, 0x81, 0xcf, 0xd8,
- 0xb4, 0xd2, 0x4e, 0xc6, 0xc0, 0x13, 0x69, 0xf3, 0x54, 0xe0, 0xe1, 0x1e, 0x80, 0x91, 0xae, 0x17,
- 0xbe, 0xbd, 0x58, 0x5b, 0x1e, 0x8b, 0xae, 0x7b, 0x78, 0xdd, 0xa3, 0xcd, 0x12, 0x0c, 0x56, 0xd8,
- 0x3b, 0x06, 0xb4, 0x49, 0xc0, 0xf0, 0x1f, 0xb4, 0x54, 0x55, 0xb6, 0x7f, 0x83, 0x81, 0x44, 0x93,
- 0x25, 0xf4, 0x04, 0x11, 0x9f, 0xc8, 0x8f, 0xd8, 0x54, 0x02, 0x2d, 0x51, 0xa4, 0x8e, 0xbb, 0x23,
- 0xc5, 0x73, 0x23, 0x35, 0x2d, 0x72, 0x85, 0x1c, 0x82, 0x12, 0xdb, 0x3d, 0x52, 0x3b, 0x25, 0x12,
- 0x7c, 0xcc, 0xae, 0x0f, 0x7b, 0x18, 0x10, 0x09, 0x55, 0x5f, 0x38, 0xb2, 0x58, 0x5b, 0xbe, 0x32,
- 0xec, 0x12, 0x81, 0x48, 0xb0, 0x86, 0x82, 0x35, 0xb6, 0x30, 0xec, 0x52, 0x58, 0xe0, 0x2d, 0x9d,
- 0xa6, 0xfa, 0x10, 0x0c, 0xf9, 0xdb, 0x90, 0x91, 0xef, 0xec, 0xc0, 0xf7, 0xb9, 0x85, 0xcd, 0x92,
- 0x82, 0x32, 0x36, 0xd8, 0x66, 0xb7, 0x73, 0x61, 0x9c, 0x14, 0x69, 0xda, 0xc3, 0x9c, 0x38, 0x23,
- 0xf7, 0x0a, 0x07, 0x09, 0xcf, 0x53, 0xa1, 0x2c, 0x5a, 0xb0, 0xf8, 0x92, 0x70, 0x94, 0x94, 0x96,
- 0xfa, 0xdc, 0xf5, 0x01, 0x75, 0x07, 0x99, 0xeb, 0x25, 0x31, 0x78, 0xc8, 0x06, 0xe5, 0x45, 0x21,
- 0x75, 0xa4, 0x75, 0xba, 0x6d, 0x44, 0x66, 0xc3, 0xab, 0x24, 0xf2, 0x6e, 0x1f, 0x7f, 0x6e, 0xe1,
- 0x51, 0x1f, 0x0d, 0xbe, 0x64, 0xf3, 0x67, 0x3d, 0xb3, 0x22, 0x75, 0x92, 0xc7, 0x3a, 0xe5, 0xd6,
- 0x09, 0x67, 0xc3, 0x31, 0x72, 0x9f, 0x19, 0x76, 0xff, 0x06, 0x29, 0x0d, 0x9d, 0x36, 0x91, 0x10,
- 0x7c, 0xc1, 0x66, 0xa8, 0x6d, 0xa5, 0xeb, 0xf1, 0x8a, 0x95, 0x70, 0x0b, 0xc2, 0xc4, 0x9d, 0x70,
- 0x9c, 0xbc, 0xa7, 0x2b, 0x42, 0xd5, 0x1d, 0x49, 0x93, 0xe0, 0x60, 0x89, 0x5d, 0xb5, 0xa2, 0x05,
- 0xbc, 0xc8, 0x13, 0xe1, 0xc0, 0x86, 0xd7, 0x88, 0x3e, 0x8a, 0xb6, 0xe7, 0xde, 0x14, 0xfc, 0x99,
- 0xcd, 0x61, 0x73, 0x82, 0xe1, 0xa9, 0xd6, 0xfb, 0x45, 0x5e, 0x96, 0x42, 0x4b, 0x63, 0x23, 0xda,
- 0x70, 0x02, 0x3d, 0xd6, 0xe6, 0x4e, 0x4f, 0xea, 0xd3, 0x3b, 0x44, 0xdb, 0x22, 0x16, 0x55, 0xc5,
- 0xa6, 0x36, 0x9b, 0x4f, 0x6d, 0x34, 0x9d, 0x5f, 0x04, 0xec, 0x5b, 0xac, 0xaf, 0x63, 0xd9, 0x3e,
- 0x16, 0x6d, 0xd2, 0xe4, 0xa0, 0x7c, 0xd6, 0x27, 0x29, 0x88, 0x49, 0x0f, 0x21, 0x7f, 0xc3, 0x03,
- 0xc1, 0x57, 0x6c, 0xde, 0x40, 0xb7, 0x90, 0x06, 0x38, 0x1c, 0xe5, 0xa9, 0x8c, 0xa5, 0xc3, 0x22,
- 0xcb, 0x84, 0xe9, 0xf1, 0x7d, 0xe8, 0xd9, 0x30, 0xf0, 0x27, 0x5f, 0x92, 0x36, 0x4a, 0xce, 0x8e,
- 0xa7, 0x3c, 0x85, 0x9e, 0xc5, 0x56, 0x68, 0x69, 0x13, 0x03, 0xc7, 0x11, 0x93, 0x6b, 0xa9, 0x1c,
- 0x37, 0x60, 0x9d, 0x30, 0x2e, 0x7c, 0x87, 0x9c, 0xaf, 0x13, 0xdc, 0xac, 0xd0, 0xc8, 0x83, 0xc1,
- 0x43, 0x36, 0x23, 0xb0, 0x82, 0x70, 0x50, 0xe5, 0xc2, 0x00, 0x17, 0x16, 0x93, 0x4d, 0x05, 0x13,
- 0x4e, 0x79, 0x4f, 0x22, 0xec, 0x78, 0xfc, 0x2b, 0xbb, 0x9d, 0x3b, 0xac, 0x11, 0xdc, 0xa4, 0x83,
- 0x2c, 0xaf, 0x06, 0x5d, 0xb5, 0xc9, 0xeb, 0x7e, 0x93, 0x08, 0xf9, 0x49, 0x57, 0x6d, 0x72, 0x9b,
- 0xdd, 0x96, 0x59, 0xb9, 0xb9, 0x58, 0xa7, 0x45, 0xa6, 0x38, 0xd5, 0x1f, 0xf6, 0xb5, 0x54, 0xed,
- 0xbe, 0xc0, 0xbb, 0xbe, 0x36, 0x2b, 0x6e, 0x83, 0xa8, 0x3b, 0x43, 0xcc, 0x4a, 0xf0, 0x05, 0xbb,
- 0xa7, 0x0f, 0xc0, 0x18, 0x99, 0x54, 0xc5, 0x65, 0xa0, 0x8d, 0x83, 0xe5, 0x58, 0x2b, 0xe0, 0xb1,
- 0x56, 0x2d, 0x39, 0x50, 0x0d, 0x49, 0xf5, 0x76, 0xe5, 0x40, 0x95, 0x16, 0x11, 0xfd, 0x7b, 0xad,
- 0xa0, 0x41, 0xe4, 0x4a, 0xf8, 0x4f, 0xec, 0x46, 0x47, 0xd8, 0x0e, 0xb7, 0x1d, 0x61, 0x12, 0x48,
- 0xb8, 0x54, 0x09, 0x1c, 0x0d, 0x6d, 0x71, 0xc6, 0x57, 0x2e, 0x72, 0x9a, 0x9e, 0xf2, 0xd8, 0x33,
- 0x2a, 0x81, 0xcf, 0xd9, 0x0c, 0xb6, 0x1a, 0xe5, 0xb5, 0x55, 0xa4, 0xa9, 0xcf, 0x11, 0xb7, 0xb1,
- 0x50, 0x36, 0x9c, 0xf5, 0x6d, 0x53, 0x11, 0x36, 0x8b, 0x34, 0xa5, 0x44, 0x35, 0x11, 0x0d, 0x7e,
- 0xcf, 0x66, 0xfb, 0x59, 0xb2, 0x90, 0x42, 0xec, 0xa8, 0x22, 0x7d, 0x1d, 0x87, 0x73, 0xbe, 0xea,
- 0x2b, 0x46, 0x93, 0x08, 0x9b, 0xda, 0xf8, 0x9a, 0x0e, 0x96, 0xd9, 0x84, 0x54, 0x16, 0x8c, 0xe3,
- 0x2d, 0x61, 0x1d, 0xcf, 0x85, 0xeb, 0x84, 0x37, 0xc8, 0x65, 0xdc, 0xdb, 0x37, 0x85, 0x75, 0x3b,
- 0xc2, 0x75, 0x82, 0x47, 0x6c, 0x49, 0xa4, 0x0e, 0x4c, 0x75, 0x12, 0xae, 0x97, 0x03, 0x6f, 0x83,
- 0x02, 0x23, 0xd2, 0xfe, 0x3e, 0xe7, 0xc9, 0x75, 0x9e, 0x88, 0xfe, 0x18, 0x76, 0x7b, 0x39, 0x7c,
- 0xed, 0x59, 0xd5, 0x5e, 0x3f, 0x64, 0x81, 0xed, 0xa9, 0xb8, 0x63, 0xb4, 0xd2, 0x85, 0xe5, 0xb1,
- 0xce, 0x70, 0x94, 0x2e, 0xf8, 0x2a, 0x18, 0x42, 0x1a, 0x04, 0x04, 0xef, 0xb1, 0x6b, 0x5e, 0x9e,
- 0x5b, 0xe8, 0x52, 0x46, 0xc2, 0x3a, 0x71, 0xc7, 0xbc, 0xb9, 0x09, 0x5d, 0x4c, 0x44, 0xb0, 0xcb,
- 0xee, 0x96, 0xbc, 0x42, 0xc9, 0x6e, 0x01, 0xfc, 0x50, 0xba, 0x8e, 0x2e, 0x9c, 0x3f, 0x0c, 0x3c,
- 0x5d, 0xeb, 0x8c, 0x90, 0xca, 0xd9, 0x70, 0x89, 0xfc, 0x6f, 0x79, 0xfa, 0x73, 0x62, 0xbf, 0xf0,
- 0x64, 0x3a, 0x96, 0xc6, 0x80, 0x1a, 0xfc, 0x81, 0xcd, 0x59, 0x57, 0xec, 0xf1, 0x58, 0x38, 0x91,
- 0xea, 0xf6, 0xeb, 0xb5, 0x7b, 0x93, 0x94, 0x42, 0xa4, 0x34, 0x3c, 0xe3, 0x6c, 0x09, 0x3f, 0x63,
- 0x77, 0xe0, 0x28, 0x07, 0x23, 0x33, 0x50, 0x4e, 0xa4, 0xb8, 0xd9, 0x9c, 0xc6, 0x6b, 0x99, 0x45,
- 0x03, 0x87, 0x46, 0xe2, 0xb8, 0xb9, 0x45, 0xd7, 0xfd, 0xcd, 0x61, 0x72, 0xa3, 0xe4, 0xfa, 0x44,
- 0x46, 0x25, 0x33, 0xf8, 0x2b, 0xbb, 0x1f, 0xeb, 0xbc, 0x77, 0xb6, 0x15, 0x0e, 0x3b, 0xa0, 0x78,
- 0x02, 0x52, 0x39, 0x30, 0x29, 0x88, 0x03, 0xb4, 0x51, 0xa8, 0xe1, 0x6d, 0x8a, 0xf0, 0x2e, 0xba,
- 0x0c, 0xb7, 0xc4, 0x8b, 0x0e, 0xa8, 0xf5, 0x33, 0x7c, 0x0a, 0x1c, 0x47, 0x68, 0x95, 0x6d, 0x67,
- 0x40, 0x64, 0xdc, 0x00, 0x56, 0x0e, 0x5d, 0xaf, 0xe1, 0x1d, 0x5f, 0x4c, 0x65, 0xde, 0x09, 0x8f,
- 0x06, 0xb0, 0xbf, 0x24, 0x6d, 0x91, 0x3a, 0xcb, 0xf7, 0x8a, 0x16, 0xce, 0x49, 0x2b, 0x8f, 0x21,
- 0x7c, 0xaf, 0xba, 0x24, 0x09, 0x5a, 0x23, 0xa4, 0x29, 0x8f, 0x01, 0xaf, 0x8a, 0xdc, 0xe8, 0x5c,
- 0xb4, 0x85, 0xc3, 0x2b, 0x3f, 0x2f, 0x1c, 0xa7, 0x7b, 0x54, 0xaa, 0x76, 0x78, 0xd7, 0xd7, 0x7c,
- 0x1f, 0x7f, 0x8c, 0xf0, 0x76, 0x89, 0x06, 0xff, 0xa8, 0xb1, 0x33, 0xa9, 0xa2, 0x9b, 0xcb, 0x76,
- 0x53, 0x1a, 0x42, 0x94, 0x90, 0x4c, 0x27, 0x10, 0x2e, 0xd3, 0x3b, 0x61, 0xf3, 0xf4, 0xa4, 0x5e,
- 0xdf, 0x18, 0x62, 0xe3, 0xdd, 0xd5, 0x7c, 0xb6, 0xb5, 0x53, 0x72, 0xbf, 0xd1, 0x09, 0xbc, 0xfa,
- 0xdf, 0x94, 0xa8, 0x0e, 0xaf, 0x11, 0x6c, 0x37, 0x1d, 0x26, 0x04, 0x9b, 0x6c, 0x0c, 0xe3, 0xe0,
- 0x18, 0x08, 0xad, 0x7f, 0x8f, 0xd6, 0xbf, 0x79, 0x7a, 0x52, 0x1f, 0x2d, 0x05, 0xcb, 0xb5, 0xae,
- 0x95, 0x7f, 0x37, 0x8e, 0x20, 0x26, 0xed, 0x51, 0x74, 0x6c, 0x76, 0x53, 0xd2, 0x79, 0xc1, 0x66,
- 0x2c, 0x18, 0x29, 0x52, 0xae, 0xb4, 0xc9, 0x44, 0x2a, 0x8f, 0x29, 0xbf, 0x5e, 0xf3, 0x7d, 0xd2,
- 0x9c, 0x7b, 0x75, 0x52, 0x9f, 0x6e, 0x12, 0xe9, 0xdb, 0x61, 0x0e, 0x89, 0x4d, 0xdb, 0x8b, 0x81,
- 0x60, 0x9b, 0x4d, 0x2b, 0x38, 0xe4, 0x36, 0xee, 0x40, 0x26, 0x78, 0xdc, 0x11, 0xaa, 0x0d, 0xc6,
- 0xcb, 0xde, 0x27, 0xd9, 0xf0, 0xd5, 0x49, 0x7d, 0xea, 0x5b, 0x38, 0x6c, 0x12, 0xa3, 0xe1, 0x09,
- 0xa4, 0x39, 0xa5, 0x2e, 0xb0, 0x06, 0x7f, 0x63, 0xe3, 0x16, 0xba, 0x05, 0xa8, 0x18, 0x78, 0x2c,
- 0xe2, 0x0e, 0x84, 0x1f, 0x2c, 0x5e, 0x5e, 0x1e, 0x7d, 0xb0, 0xbe, 0xf2, 0x2b, 0xef, 0xe3, 0x95,
- 0x8b, 0x5e, 0xc1, 0x2b, 0xcd, 0x52, 0xa7, 0x81, 0x32, 0x1b, 0xca, 0x99, 0x9e, 0x7f, 0xe0, 0x9d,
- 0xb1, 0x47, 0x63, 0x76, 0xf8, 0x6f, 0x70, 0x9f, 0x4d, 0xe6, 0xa9, 0x88, 0x01, 0xcf, 0xa4, 0xdf,
- 0x93, 0x1f, 0x52, 0xe9, 0x4c, 0xf4, 0x81, 0xaa, 0x17, 0x73, 0x16, 0x54, 0x0f, 0xc9, 0xc2, 0x82,
- 0xe1, 0xf4, 0x2c, 0x0f, 0x57, 0xb0, 0xf1, 0xd6, 0xd6, 0x5e, 0x9d, 0xd4, 0xff, 0xd8, 0x96, 0xae,
- 0x53, 0xec, 0xad, 0xc4, 0x3a, 0x5b, 0xed, 0x87, 0x9f, 0xec, 0x0d, 0x7e, 0xaf, 0xe6, 0xfb, 0xed,
- 0x55, 0x0b, 0x71, 0x81, 0x0f, 0xb6, 0x95, 0xe6, 0xb3, 0xad, 0xe7, 0x16, 0x8c, 0x12, 0x19, 0xec,
- 0xa0, 0x52, 0x34, 0x51, 0xaa, 0xa3, 0x95, 0x2c, 0xc1, 0x2a, 0x9b, 0xa2, 0xb7, 0x9c, 0x3e, 0xb4,
- 0x1c, 0xbb, 0xd7, 0x81, 0xe2, 0xa9, 0x6e, 0x87, 0xab, 0xbe, 0x23, 0xdc, 0x91, 0x8a, 0xf4, 0xa1,
- 0x7d, 0xe1, 0x91, 0x2d, 0xdd, 0xbe, 0xd0, 0x01, 0x8c, 0x09, 0x3f, 0xba, 0xc8, 0x61, 0xc3, 0x98,
- 0xe0, 0x1e, 0x9b, 0xec, 0x3b, 0xd0, 0x93, 0x11, 0xe5, 0x3f, 0x26, 0xf6, 0x78, 0xc9, 0xc6, 0x77,
- 0x1e, 0x6a, 0x9f, 0xa3, 0xa2, 0xf0, 0x83, 0x73, 0x54, 0x54, 0x7d, 0xc0, 0xae, 0x8b, 0xc2, 0x69,
- 0x6e, 0xa0, 0xa3, 0xb3, 0xe1, 0x9b, 0xf6, 0x13, 0x4a, 0xed, 0x3b, 0x08, 0x46, 0x25, 0x56, 0x65,
- 0x77, 0x89, 0x5d, 0x95, 0x96, 0xdb, 0x22, 0x07, 0x83, 0xd9, 0x0d, 0x3f, 0xf5, 0xef, 0x27, 0x69,
- 0x9b, 0x95, 0x09, 0x77, 0x97, 0x0a, 0xd3, 0x06, 0x7f, 0xc3, 0xe1, 0x24, 0xa7, 0x68, 0xc2, 0xdf,
- 0x2e, 0xd6, 0x96, 0x6b, 0xd1, 0x24, 0x61, 0x78, 0xb9, 0xe1, 0x38, 0xc7, 0x70, 0x70, 0xf8, 0x4a,
- 0xf5, 0x03, 0xde, 0x68, 0x06, 0x9c, 0xe9, 0x61, 0xc4, 0xda, 0x0c, 0x86, 0xef, 0x67, 0x7e, 0xf8,
- 0x7a, 0x4a, 0x84, 0x8c, 0x0d, 0x22, 0x54, 0x21, 0xbd, 0xcf, 0x26, 0x15, 0xae, 0x44, 0x43, 0x05,
- 0x12, 0x9e, 0x0a, 0xeb, 0xc2, 0xdf, 0x91, 0xd3, 0x35, 0x04, 0xb6, 0xbd, 0x7d, 0x4b, 0x58, 0x87,
- 0x1f, 0x61, 0xe5, 0x5b, 0x97, 0x66, 0x08, 0x6f, 0x63, 0x7f, 0x87, 0x0f, 0x7d, 0x29, 0x95, 0x08,
- 0x36, 0xfb, 0xd7, 0x68, 0x0f, 0xf6, 0xd9, 0x78, 0x5c, 0x58, 0xa7, 0x33, 0x7a, 0x66, 0x6a, 0x65,
- 0xc3, 0xcf, 0xff, 0xdf, 0xba, 0x6f, 0x90, 0xce, 0xb6, 0x97, 0xa1, 0xba, 0x8f, 0xc6, 0xe2, 0x61,
- 0xdb, 0x6c, 0x97, 0x05, 0xe7, 0x9b, 0x23, 0x98, 0x60, 0x97, 0xf7, 0xa1, 0x47, 0x9f, 0x89, 0x63,
- 0x11, 0xfe, 0x0c, 0x36, 0xd8, 0x5b, 0x07, 0x22, 0x2d, 0x80, 0xbe, 0x01, 0x47, 0x1f, 0xac, 0xfe,
- 0x6a, 0x2c, 0xe7, 0x15, 0x23, 0xef, 0xfd, 0xc5, 0x1b, 0x0f, 0x6b, 0xb3, 0x5f, 0xb2, 0xe0, 0x7c,
- 0x5c, 0xc3, 0x4b, 0x8e, 0xf8, 0x25, 0xa7, 0x86, 0x97, 0x1c, 0x19, 0x52, 0x78, 0xf2, 0xe6, 0x95,
- 0xe9, 0x89, 0xf0, 0xc9, 0x9b, 0x57, 0x16, 0x27, 0x96, 0x6e, 0xfe, 0xb3, 0x76, 0xe1, 0x0e, 0xee,
- 0xb0, 0x71, 0x9a, 0x19, 0x09, 0x3f, 0x00, 0x83, 0xa1, 0x95, 0x9b, 0x19, 0xf3, 0xd6, 0xef, 0xbc,
- 0x31, 0xb8, 0xc5, 0xc6, 0xe2, 0xc2, 0x18, 0xec, 0xf0, 0xc1, 0x5a, 0x97, 0xa3, 0xab, 0xa5, 0xf1,
- 0x3b, 0xb4, 0x05, 0x37, 0xd8, 0x88, 0x54, 0xb1, 0xa1, 0x7e, 0xf7, 0x5f, 0xad, 0xd1, 0xc0, 0x10,
- 0xcc, 0x33, 0xa6, 0x8a, 0xcc, 0xbb, 0x5b, 0xff, 0x4d, 0x1a, 0x8d, 0xa8, 0x22, 0x23, 0x5f, 0xbb,
- 0xb6, 0xfa, 0xe3, 0xbf, 0x17, 0x2e, 0xfd, 0x78, 0xba, 0x50, 0xfb, 0xe9, 0x74, 0xa1, 0xf6, 0xf3,
- 0xe9, 0x42, 0xed, 0x5f, 0xa7, 0x0b, 0xb5, 0xbf, 0xbf, 0x5c, 0xb8, 0xf4, 0xd3, 0xcb, 0x85, 0x4b,
- 0x3f, 0xbf, 0x5c, 0xb8, 0xf4, 0xfd, 0xd8, 0x99, 0xe4, 0xed, 0xbd, 0x4d, 0xa3, 0xe3, 0x93, 0xff,
- 0x06, 0x00, 0x00, 0xff, 0xff, 0xdd, 0xa0, 0xca, 0x9c, 0x37, 0x10, 0x00, 0x00,
+ // 1947 bytes of a gzipped FileDescriptorProto
+ 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x9c, 0x57, 0x5d, 0x53, 0x1c, 0xc7,
+ 0xd5, 0xd6, 0x5a, 0xb2, 0x5f, 0xd1, 0x08, 0x04, 0x63, 0x64, 0x06, 0x10, 0x2c, 0xe8, 0xc3, 0x46,
+ 0xfe, 0x60, 0x6d, 0xd9, 0xaf, 0x23, 0x3b, 0x95, 0xc4, 0x66, 0x01, 0xeb, 0x03, 0x1b, 0x34, 0x8b,
+ 0xac, 0x8a, 0x73, 0xd1, 0xd5, 0xcc, 0x9c, 0xdd, 0x6d, 0x33, 0xd3, 0x3d, 0xdb, 0xdd, 0x23, 0x58,
+ 0x2e, 0xf2, 0x1b, 0x52, 0x95, 0xeb, 0x54, 0xfe, 0x8e, 0x2f, 0x7d, 0xe9, 0x2b, 0x2a, 0x41, 0xff,
+ 0x42, 0x57, 0xa9, 0x73, 0x7a, 0x66, 0x77, 0x11, 0xd8, 0xa9, 0xca, 0xdd, 0xee, 0x79, 0x9e, 0xf3,
+ 0x74, 0xf7, 0xe9, 0xf3, 0xd1, 0xc3, 0x1a, 0xb6, 0x97, 0x36, 0x2c, 0x58, 0x2b, 0xb5, 0x4a, 0x84,
+ 0x13, 0xf9, 0x7e, 0x23, 0xd5, 0xb1, 0x48, 0xb9, 0x56, 0x69, 0x9f, 0x97, 0x00, 0x47, 0x64, 0x2d,
+ 0x37, 0xda, 0xe9, 0x60, 0x21, 0xd6, 0xf1, 0x81, 0xd1, 0x22, 0xee, 0xae, 0xd9, 0x5e, 0xba, 0x76,
+ 0xc6, 0x75, 0x7e, 0xa6, 0xa3, 0x3b, 0x9a, 0x78, 0x0d, 0xfc, 0xe5, 0x5d, 0x6e, 0xfd, 0x73, 0x91,
+ 0xcd, 0x6c, 0xa3, 0xe8, 0x8e, 0x4a, 0xfb, 0x2d, 0xef, 0xb0, 0x21, 0x9c, 0x08, 0x3e, 0x64, 0x81,
+ 0x15, 0x2f, 0x80, 0x3b, 0xb1, 0x9f, 0x82, 0xe5, 0xb9, 0x81, 0xb6, 0x3c, 0x0a, 0x6b, 0xcb, 0xb5,
+ 0xd5, 0xb1, 0x68, 0x0a, 0x91, 0x3d, 0x02, 0x76, 0xc9, 0x1e, 0xfc, 0x85, 0x2d, 0xe8, 0xdc, 0xc9,
+ 0x4c, 0x1e, 0x83, 0xe1, 0xed, 0x03, 0x1e, 0x0b, 0x1b, 0x8b, 0x04, 0x2c, 0x4f, 0x65, 0x26, 0x5d,
+ 0xf8, 0xc6, 0x72, 0x6d, 0xf5, 0xf2, 0xfa, 0xcd, 0xd3, 0x93, 0x7a, 0xb8, 0x53, 0xd1, 0xb6, 0x9e,
+ 0x34, 0x4b, 0xd2, 0x36, 0x72, 0xa2, 0x70, 0x20, 0xb0, 0x75, 0x70, 0x06, 0x09, 0x3e, 0x63, 0xd7,
+ 0xac, 0xcb, 0x1c, 0x77, 0x32, 0x03, 0x5d, 0xb8, 0xf0, 0x32, 0xa9, 0x4d, 0xbf, 0x3a, 0xa9, 0x4f,
+ 0xa0, 0x69, 0x6d, 0xa3, 0x30, 0xc2, 0x49, 0xad, 0xa2, 0x71, 0xa4, 0xed, 0x79, 0x56, 0xf0, 0x90,
+ 0xcd, 0xca, 0x24, 0x05, 0x2e, 0xd5, 0x20, 0x54, 0x95, 0xc0, 0x95, 0x5f, 0x13, 0x98, 0x41, 0x8f,
+ 0x47, 0xaa, 0x8c, 0x43, 0xa5, 0xc4, 0xd9, 0xed, 0x4a, 0xc9, 0x19, 0xa1, 0xac, 0x88, 0x91, 0x7c,
+ 0x4e, 0xf5, 0xcd, 0x5f, 0x53, 0xad, 0x7b, 0xd5, 0xbd, 0xa1, 0xef, 0x6b, 0x0b, 0x7c, 0xce, 0x66,
+ 0x95, 0x76, 0x32, 0x06, 0x9e, 0x48, 0x9b, 0xa7, 0x02, 0x2f, 0xf7, 0x05, 0x18, 0xe9, 0xfa, 0xe1,
+ 0x5b, 0xcb, 0xb5, 0xd5, 0x89, 0xe8, 0x86, 0x87, 0x37, 0x3c, 0xda, 0x2a, 0xc1, 0x60, 0x8d, 0xbd,
+ 0x6d, 0x40, 0x9b, 0x04, 0x0c, 0xff, 0x51, 0x4b, 0x55, 0x45, 0xfb, 0xff, 0x70, 0x23, 0xd1, 0x74,
+ 0x09, 0x3d, 0x46, 0xc4, 0x07, 0xf2, 0x63, 0x36, 0x93, 0x40, 0x5b, 0x14, 0xa9, 0xe3, 0xee, 0x48,
+ 0xf1, 0xdc, 0x48, 0x4d, 0x8b, 0x5c, 0x25, 0x87, 0xa0, 0xc4, 0xf6, 0x8e, 0xd4, 0x6e, 0x89, 0x04,
+ 0x9f, 0xb0, 0x1b, 0xa3, 0x1e, 0x06, 0x44, 0x42, 0xd9, 0x17, 0x8e, 0x2d, 0xd7, 0x56, 0xaf, 0x8e,
+ 0xba, 0x44, 0x20, 0x12, 0xcc, 0xa1, 0x60, 0x9d, 0x2d, 0x8d, 0xba, 0x14, 0x16, 0x78, 0x5b, 0xa7,
+ 0xa9, 0x3e, 0x04, 0x43, 0xfe, 0x36, 0x64, 0xe4, 0x3b, 0x3f, 0xf4, 0x7d, 0x66, 0x61, 0xab, 0xa4,
+ 0xa0, 0x8c, 0x0d, 0x76, 0xd8, 0x9d, 0x5c, 0x18, 0x27, 0x45, 0x9a, 0xf6, 0x31, 0x26, 0xce, 0xc8,
+ 0xfd, 0xc2, 0x41, 0xc2, 0xf3, 0x54, 0x28, 0x8b, 0x16, 0x4c, 0xbe, 0x24, 0x1c, 0x27, 0xa5, 0x95,
+ 0x01, 0x77, 0x63, 0x48, 0xdd, 0x45, 0xe6, 0x46, 0x49, 0x0c, 0x1e, 0xb0, 0x61, 0x7a, 0xd1, 0x96,
+ 0xba, 0xd2, 0x3a, 0xdd, 0x31, 0x22, 0xb3, 0xe1, 0x35, 0x12, 0x79, 0x67, 0x80, 0x3f, 0xb3, 0xf0,
+ 0x70, 0x80, 0x06, 0x5f, 0xb1, 0xc5, 0xb3, 0x9e, 0x59, 0x91, 0x3a, 0xc9, 0x63, 0x9d, 0x72, 0xeb,
+ 0x84, 0xb3, 0xe1, 0x04, 0xb9, 0xcf, 0x8d, 0xba, 0x7f, 0x8b, 0x94, 0xa6, 0x4e, 0x5b, 0x48, 0x08,
+ 0xbe, 0x64, 0x73, 0x54, 0xb6, 0xd2, 0xf5, 0x79, 0xc5, 0x4a, 0xb8, 0x05, 0x61, 0xe2, 0x6e, 0x38,
+ 0x49, 0xde, 0xb3, 0x15, 0xa1, 0xaa, 0x8e, 0xa4, 0x45, 0x70, 0xb0, 0xc2, 0xae, 0x59, 0xd1, 0x06,
+ 0x5e, 0xe4, 0x89, 0x70, 0x60, 0xc3, 0xeb, 0x44, 0x1f, 0x47, 0xdb, 0x33, 0x6f, 0x0a, 0xfe, 0xcc,
+ 0x16, 0xb0, 0x38, 0xc1, 0xf0, 0x54, 0xeb, 0x83, 0x22, 0x2f, 0x53, 0xa1, 0xad, 0xb1, 0x10, 0x6d,
+ 0x38, 0x85, 0x1e, 0xeb, 0x0b, 0xa7, 0x27, 0xf5, 0xd9, 0x5d, 0xa2, 0x6d, 0x13, 0x8b, 0xb2, 0x62,
+ 0x4b, 0x9b, 0xad, 0x27, 0x36, 0x9a, 0xcd, 0x2f, 0x02, 0x0e, 0x2c, 0xe6, 0xd7, 0xb1, 0xec, 0x1c,
+ 0x8b, 0x0e, 0x69, 0x72, 0x50, 0x3e, 0xea, 0xd3, 0xb4, 0x89, 0x69, 0x0f, 0x21, 0x7f, 0xd3, 0x03,
+ 0xc1, 0xd7, 0x6c, 0xd1, 0x40, 0xaf, 0x90, 0x06, 0x38, 0x1c, 0xe5, 0xa9, 0x8c, 0xa5, 0xc3, 0x24,
+ 0xcb, 0x84, 0xe9, 0xf3, 0x03, 0xe8, 0xdb, 0x30, 0xf0, 0x37, 0x5f, 0x92, 0x36, 0x4b, 0xce, 0xae,
+ 0xa7, 0x3c, 0x81, 0xbe, 0xc5, 0x52, 0x68, 0x6b, 0x13, 0x03, 0xc7, 0x16, 0x93, 0x6b, 0xa9, 0x1c,
+ 0x37, 0x60, 0x9d, 0x30, 0x2e, 0x7c, 0x9b, 0x9c, 0x6f, 0x10, 0xdc, 0xaa, 0xd0, 0xc8, 0x83, 0xc1,
+ 0x03, 0x36, 0x27, 0x30, 0x83, 0xb0, 0x51, 0xe5, 0xc2, 0x00, 0x17, 0x16, 0x83, 0x4d, 0x09, 0x13,
+ 0xce, 0x78, 0x4f, 0x22, 0xec, 0x7a, 0xfc, 0x6b, 0xbb, 0x93, 0x3b, 0xcc, 0x11, 0x3c, 0xa4, 0x83,
+ 0x2c, 0xaf, 0x1a, 0x5d, 0x75, 0xc8, 0x1b, 0xfe, 0x90, 0x08, 0xf9, 0x4e, 0x57, 0x1d, 0x72, 0x87,
+ 0xdd, 0x91, 0x59, 0x79, 0xb8, 0x58, 0xa7, 0x45, 0xa6, 0x38, 0xe5, 0x1f, 0xd6, 0xb5, 0x54, 0x9d,
+ 0x81, 0xc0, 0x3b, 0x3e, 0x37, 0x2b, 0x6e, 0x93, 0xa8, 0xbb, 0x23, 0xcc, 0x4a, 0xf0, 0x39, 0xbb,
+ 0xa7, 0x5f, 0x80, 0x31, 0x32, 0xa9, 0x92, 0xcb, 0x40, 0x07, 0x1b, 0xcb, 0xb1, 0x56, 0xc0, 0x63,
+ 0xad, 0xda, 0x72, 0xa8, 0x1a, 0x92, 0xea, 0x9d, 0xca, 0x81, 0x32, 0x2d, 0x22, 0xfa, 0x0f, 0x5a,
+ 0x41, 0x93, 0xc8, 0x95, 0xf0, 0x9f, 0xd8, 0xcd, 0xae, 0xb0, 0x5d, 0x6e, 0xbb, 0xc2, 0x24, 0x90,
+ 0x70, 0xa9, 0x12, 0x38, 0x1a, 0x39, 0xe2, 0x9c, 0xcf, 0x5c, 0xe4, 0xb4, 0x3c, 0xe5, 0x91, 0x67,
+ 0x54, 0x02, 0x5f, 0xb0, 0x39, 0x2c, 0x35, 0x8a, 0x6b, 0xbb, 0x48, 0x53, 0x1f, 0x23, 0x6e, 0x63,
+ 0xa1, 0x6c, 0x38, 0xef, 0xcb, 0xa6, 0x22, 0x6c, 0x15, 0x69, 0x4a, 0x81, 0x6a, 0x21, 0x1a, 0xfc,
+ 0x9e, 0xcd, 0x0f, 0xa2, 0x64, 0x21, 0x85, 0xd8, 0x51, 0x46, 0xfa, 0x3c, 0x0e, 0x17, 0x7c, 0xd6,
+ 0x57, 0x8c, 0x16, 0x11, 0xb6, 0xb4, 0xf1, 0x39, 0x1d, 0xac, 0xb2, 0x29, 0xa9, 0x2c, 0x18, 0xc7,
+ 0xdb, 0xc2, 0x3a, 0x9e, 0x0b, 0xd7, 0x0d, 0x6f, 0x92, 0xcb, 0xa4, 0xb7, 0x6f, 0x09, 0xeb, 0x76,
+ 0x85, 0xeb, 0x06, 0x0f, 0xd9, 0x8a, 0x48, 0x1d, 0x98, 0xea, 0x26, 0x5c, 0x3f, 0x07, 0xde, 0x01,
+ 0x05, 0x46, 0xa4, 0x83, 0x73, 0x2e, 0x92, 0xeb, 0x22, 0x11, 0xfd, 0x35, 0xec, 0xf5, 0x73, 0xf8,
+ 0xc6, 0xb3, 0xaa, 0xb3, 0x7e, 0xc4, 0x02, 0xdb, 0x57, 0x71, 0xd7, 0x68, 0xa5, 0x0b, 0xcb, 0x63,
+ 0x9d, 0x61, 0x2b, 0x5d, 0xf2, 0x59, 0x30, 0x82, 0x34, 0x09, 0x08, 0xde, 0x65, 0xd7, 0xbd, 0x3c,
+ 0xb7, 0xd0, 0xa3, 0x88, 0x84, 0x75, 0xe2, 0x4e, 0x78, 0x73, 0x0b, 0x7a, 0x18, 0x88, 0x60, 0x8f,
+ 0xbd, 0x57, 0xf2, 0x0a, 0x25, 0x7b, 0x05, 0xf0, 0x43, 0xe9, 0xba, 0xba, 0x70, 0xfe, 0x32, 0xf0,
+ 0x76, 0xad, 0x33, 0x42, 0x2a, 0x67, 0xc3, 0x15, 0xf2, 0xbf, 0xed, 0xe9, 0xcf, 0x88, 0xfd, 0xdc,
+ 0x93, 0xe9, 0x5a, 0x9a, 0x43, 0x6a, 0xf0, 0x07, 0xb6, 0x60, 0x5d, 0xb1, 0xcf, 0x63, 0xe1, 0x44,
+ 0xaa, 0x3b, 0xaf, 0xe7, 0xee, 0x2d, 0x52, 0x0a, 0x91, 0xd2, 0xf4, 0x8c, 0xb3, 0x29, 0xfc, 0x94,
+ 0xdd, 0x85, 0xa3, 0x1c, 0x8c, 0xcc, 0x40, 0x39, 0x91, 0xe2, 0x61, 0x73, 0x6a, 0xaf, 0x65, 0x14,
+ 0x0d, 0x1c, 0x1a, 0x89, 0xed, 0xe6, 0x36, 0x8d, 0xfb, 0x5b, 0xa3, 0xe4, 0x66, 0xc9, 0xf5, 0x81,
+ 0x8c, 0x4a, 0x26, 0x36, 0xb9, 0x2a, 0x1e, 0xce, 0x80, 0xc8, 0xb8, 0x01, 0xbc, 0x5b, 0x1a, 0x80,
+ 0xe1, 0x5d, 0x7f, 0xdd, 0x65, 0x64, 0x08, 0x8f, 0x86, 0xb0, 0x1f, 0x63, 0xb6, 0x48, 0x9d, 0xe5,
+ 0xfb, 0x45, 0x1b, 0x3b, 0x99, 0x95, 0xc7, 0x10, 0xbe, 0x5b, 0x8d, 0x31, 0x82, 0xd6, 0x09, 0x69,
+ 0xc9, 0x63, 0xc0, 0x66, 0x9e, 0x1b, 0x9d, 0x8b, 0x8e, 0x70, 0x38, 0x94, 0xf3, 0xc2, 0x71, 0x9a,
+ 0x74, 0x52, 0x75, 0xc2, 0xf7, 0x7c, 0x56, 0x0e, 0xf0, 0x47, 0x08, 0xef, 0x94, 0x68, 0xf0, 0xf7,
+ 0x1a, 0x3b, 0x73, 0x18, 0x9a, 0x2d, 0xb6, 0x97, 0x52, 0x9b, 0xa0, 0xea, 0xcd, 0x74, 0x02, 0xe1,
+ 0x2a, 0x4d, 0xf2, 0xad, 0xd3, 0x93, 0x7a, 0x7d, 0x73, 0x84, 0x8d, 0xd3, 0xa5, 0xf5, 0x74, 0x7b,
+ 0xb7, 0xe4, 0x7e, 0xab, 0x13, 0x78, 0xf5, 0xdf, 0x29, 0x51, 0x1d, 0x5e, 0x23, 0xd8, 0x5e, 0x3a,
+ 0x4a, 0x08, 0xb6, 0xd8, 0x04, 0xee, 0x83, 0xe3, 0x46, 0x68, 0xfd, 0x7b, 0xb4, 0xfe, 0xad, 0xd3,
+ 0x93, 0xfa, 0x78, 0x29, 0x58, 0xae, 0x75, 0xbd, 0xfc, 0xbb, 0x79, 0x04, 0x31, 0x69, 0x8f, 0xa3,
+ 0x63, 0xab, 0x97, 0x92, 0xce, 0x73, 0x36, 0x67, 0xc1, 0x48, 0x91, 0x72, 0xa5, 0x4d, 0x26, 0x52,
+ 0x79, 0x4c, 0xf1, 0xf5, 0x9a, 0xef, 0x93, 0xe6, 0xc2, 0xab, 0x93, 0xfa, 0x6c, 0x8b, 0x48, 0xdf,
+ 0x8d, 0x72, 0x48, 0x6c, 0xd6, 0x5e, 0x0c, 0x04, 0x3b, 0x6c, 0x56, 0xc1, 0x21, 0xb7, 0x71, 0x17,
+ 0x32, 0xc1, 0xe3, 0xae, 0x50, 0x1d, 0x30, 0x5e, 0xf6, 0x03, 0x92, 0x0d, 0x5f, 0x9d, 0xd4, 0x67,
+ 0xbe, 0x83, 0xc3, 0x16, 0x31, 0x9a, 0x9e, 0x40, 0x9a, 0x33, 0xea, 0x02, 0x6b, 0xf0, 0x57, 0x36,
+ 0x69, 0xa1, 0x57, 0x80, 0x8a, 0x81, 0xc7, 0x22, 0xee, 0x42, 0xf8, 0xe1, 0xf2, 0xe5, 0xd5, 0xf1,
+ 0xfb, 0x1b, 0x6b, 0xbf, 0xf1, 0x82, 0x5d, 0xbb, 0xe8, 0x9d, 0xba, 0xd6, 0x2a, 0x75, 0x9a, 0x28,
+ 0xb3, 0xa9, 0x9c, 0xe9, 0xfb, 0x27, 0xd8, 0x19, 0x7b, 0x34, 0x61, 0x47, 0xff, 0x06, 0x1f, 0xb0,
+ 0xe9, 0x3c, 0x15, 0x31, 0xe0, 0x9d, 0x0c, 0xaa, 0xe6, 0x23, 0x4a, 0x9d, 0xa9, 0x01, 0x50, 0x55,
+ 0x4b, 0xce, 0x82, 0xea, 0xa9, 0x57, 0x58, 0x30, 0x9c, 0x1e, 0xce, 0xe1, 0x1a, 0x96, 0xc6, 0xfa,
+ 0xfa, 0xab, 0x93, 0xfa, 0x1f, 0x3b, 0xd2, 0x75, 0x8b, 0xfd, 0xb5, 0x58, 0x67, 0x8d, 0xc1, 0xf6,
+ 0x93, 0xfd, 0xe1, 0xef, 0x46, 0x7e, 0xd0, 0x69, 0x58, 0x88, 0x0b, 0x7c, 0x52, 0xad, 0xb5, 0x9e,
+ 0x6e, 0x3f, 0xb3, 0x60, 0x94, 0xc8, 0x60, 0x17, 0x95, 0xa2, 0xa9, 0x52, 0x1d, 0xad, 0x64, 0x09,
+ 0x1a, 0x6c, 0x86, 0x5e, 0x5b, 0xfa, 0xd0, 0x72, 0xac, 0x2f, 0x07, 0x8a, 0xa7, 0xba, 0x13, 0x36,
+ 0x7c, 0x45, 0xb8, 0x23, 0x15, 0xe9, 0x43, 0xfb, 0xdc, 0x23, 0xdb, 0xba, 0x73, 0xa1, 0x03, 0x18,
+ 0x13, 0x7e, 0x7c, 0x91, 0xc3, 0xa6, 0x31, 0xc1, 0x3d, 0x36, 0x3d, 0x70, 0xa0, 0x47, 0x1d, 0xca,
+ 0x7f, 0x42, 0xec, 0xc9, 0x92, 0x8d, 0x2f, 0x31, 0xd4, 0x3e, 0x47, 0x45, 0xe1, 0xfb, 0xe7, 0xa8,
+ 0xa8, 0x7a, 0x9f, 0xdd, 0x10, 0x85, 0xd3, 0xdc, 0x40, 0x57, 0x67, 0xa3, 0xb3, 0xf0, 0x53, 0x0a,
+ 0xed, 0xdb, 0x08, 0x46, 0x25, 0x56, 0x45, 0x77, 0x85, 0x5d, 0x93, 0x96, 0xdb, 0x22, 0x07, 0x83,
+ 0xd1, 0x0d, 0x3f, 0xf3, 0x2f, 0x1c, 0x69, 0x5b, 0x95, 0x09, 0x4f, 0x97, 0x0a, 0xd3, 0x01, 0x3f,
+ 0x83, 0xb0, 0xd7, 0xd2, 0x6e, 0xc2, 0xff, 0x5f, 0xae, 0xad, 0xd6, 0xa2, 0x69, 0xc2, 0x70, 0xfc,
+ 0x60, 0xc3, 0xc5, 0xed, 0x60, 0x7b, 0x94, 0xea, 0x47, 0x9c, 0x39, 0x06, 0x9c, 0xe9, 0xe3, 0x8e,
+ 0xb5, 0x19, 0xb6, 0xc7, 0xcf, 0x7d, 0x7b, 0xf4, 0x94, 0x08, 0x19, 0x9b, 0x44, 0xa8, 0xb6, 0xf4,
+ 0x3e, 0x9b, 0x56, 0xb8, 0x12, 0x35, 0x15, 0x48, 0x78, 0x2a, 0xac, 0x0b, 0x7f, 0x47, 0x4e, 0xd7,
+ 0x11, 0xd8, 0xf1, 0xf6, 0x6d, 0x61, 0x1d, 0x7e, 0x26, 0x95, 0xaf, 0x51, 0xea, 0x21, 0xbc, 0x83,
+ 0xf5, 0x1d, 0x3e, 0xf0, 0xa9, 0x54, 0x22, 0x58, 0xec, 0xdf, 0xa0, 0x3d, 0x38, 0x60, 0x93, 0x71,
+ 0x61, 0x9d, 0xce, 0xe8, 0x21, 0xa8, 0x95, 0x0d, 0xbf, 0xf8, 0x5f, 0xf3, 0xbe, 0x49, 0x3a, 0x3b,
+ 0x5e, 0x86, 0xf2, 0x3e, 0x9a, 0x88, 0x47, 0x6d, 0xf3, 0x3d, 0x16, 0x9c, 0x2f, 0x8e, 0x60, 0x8a,
+ 0x5d, 0x3e, 0x80, 0x3e, 0x7d, 0xc8, 0x4d, 0x44, 0xf8, 0x33, 0xd8, 0x64, 0x6f, 0xbe, 0x10, 0x69,
+ 0x01, 0xf4, 0x95, 0x36, 0x7e, 0xbf, 0xf1, 0x9b, 0x7b, 0x39, 0xaf, 0x18, 0x79, 0xef, 0x2f, 0xdf,
+ 0x78, 0x50, 0x9b, 0xff, 0x8a, 0x05, 0xe7, 0xf7, 0x35, 0xba, 0xe4, 0x98, 0x5f, 0x72, 0x66, 0x74,
+ 0xc9, 0xb1, 0x11, 0x85, 0xc7, 0x57, 0xae, 0xce, 0x4e, 0x85, 0x8f, 0xaf, 0x5c, 0x5d, 0x9e, 0x5a,
+ 0x79, 0x7c, 0xe5, 0xea, 0x9d, 0xa9, 0xbb, 0xb7, 0xfe, 0x51, 0xbb, 0xf0, 0x1c, 0x77, 0xd9, 0x24,
+ 0x75, 0x8e, 0x84, 0xbf, 0x00, 0x83, 0x1b, 0x2c, 0x8f, 0x34, 0xe1, 0xad, 0xdf, 0x7b, 0x63, 0x70,
+ 0x9b, 0x4d, 0xc4, 0x85, 0x31, 0x58, 0xe7, 0xc3, 0x15, 0x2f, 0x47, 0xd7, 0x4a, 0xe3, 0xf7, 0x68,
+ 0x0b, 0x6e, 0xb2, 0x31, 0xa9, 0x62, 0x43, 0x55, 0xef, 0xbf, 0x2e, 0xa3, 0xa1, 0x21, 0x58, 0x64,
+ 0x4c, 0x15, 0x99, 0x77, 0xb7, 0xfe, 0xdb, 0x31, 0x1a, 0x53, 0x45, 0x46, 0xbe, 0x76, 0xbd, 0xf1,
+ 0xd3, 0xbf, 0x97, 0x2e, 0xfd, 0x74, 0xba, 0x54, 0xfb, 0xf9, 0x74, 0xa9, 0xf6, 0xcb, 0xe9, 0x52,
+ 0xed, 0x5f, 0xa7, 0x4b, 0xb5, 0xbf, 0xbd, 0x5c, 0xba, 0xf4, 0xf3, 0xcb, 0xa5, 0x4b, 0xbf, 0xbc,
+ 0x5c, 0xba, 0xf4, 0xc3, 0xc4, 0x99, 0x10, 0xee, 0xbf, 0x45, 0x0d, 0xe4, 0xd3, 0xff, 0x04, 0x00,
+ 0x00, 0xff, 0xff, 0xd0, 0x11, 0x9c, 0xa0, 0xdf, 0x0f, 0x00, 0x00,
}
func (m *LocalOnlySessionData) Marshal() (dAtA []byte, err error) {
@@ -690,18 +683,6 @@ func (m *LocalOnlySessionData) MarshalToSizedBuffer(dAtA []byte) (int, error) {
i--
dAtA[i] = 0xa8
}
- if m.CopyPartitioningWhenDeinterleavingTable {
- i--
- if m.CopyPartitioningWhenDeinterleavingTable {
- dAtA[i] = 1
- } else {
- dAtA[i] = 0
- }
- i--
- dAtA[i] = 0x2
- i--
- dAtA[i] = 0xa0
- }
if len(m.ExperimentalComputedColumnRewrites) > 0 {
i -= len(m.ExperimentalComputedColumnRewrites)
copy(dAtA[i:], m.ExperimentalComputedColumnRewrites)
@@ -1191,9 +1172,6 @@ func (m *LocalOnlySessionData) Size() (n int) {
if l > 0 {
n += 2 + l + sovLocalOnlySessionData(uint64(l))
}
- if m.CopyPartitioningWhenDeinterleavingTable {
- n += 3
- }
if m.EnableStreamReplication {
n += 3
}
@@ -2009,26 +1987,6 @@ func (m *LocalOnlySessionData) Unmarshal(dAtA []byte) error {
}
m.ExperimentalComputedColumnRewrites = string(dAtA[iNdEx:postIndex])
iNdEx = postIndex
- case 36:
- if wireType != 0 {
- return fmt.Errorf("proto: wrong wireType = %d for field CopyPartitioningWhenDeinterleavingTable", wireType)
- }
- var v int
- for shift := uint(0); ; shift += 7 {
- if shift >= 64 {
- return ErrIntOverflowLocalOnlySessionData
- }
- if iNdEx >= l {
- return io.ErrUnexpectedEOF
- }
- b := dAtA[iNdEx]
- iNdEx++
- v |= int(b&0x7F) << shift
- if b < 0x80 {
- break
- }
- }
- m.CopyPartitioningWhenDeinterleavingTable = bool(v != 0)
case 37:
if wireType != 0 {
return fmt.Errorf("proto: wrong wireType = %d for field EnableStreamReplication", wireType)
diff --git a/pkg/sql/sessiondatapb/local_only_session_data.proto b/pkg/sql/sessiondatapb/local_only_session_data.proto
index 8c3be5b4f798..0373f20ab39c 100644
--- a/pkg/sql/sessiondatapb/local_only_session_data.proto
+++ b/pkg/sql/sessiondatapb/local_only_session_data.proto
@@ -133,11 +133,7 @@ message LocalOnlySessionData {
// experimentalComputedColumnRewrites cluster setting for a description of the
// format.
string experimental_computed_column_rewrites = 35;
- // CopyPartitioningWhenDeinterleavingTable indicates that when running an
- // ALTER PRIMARY KEY that retains the same columns but removes any
- // interleaving that zone configurations and partitioning from the root
- // of that interleave should be applied to the new primary index.
- bool copy_partitioning_when_deinterleaving_table = 36;
+ reserved 36;
// EnableStreamReplication indicates whether to allow setting up a replication
// stream.
bool enable_stream_replication = 37;
diff --git a/pkg/sql/show_create.go b/pkg/sql/show_create.go
index 0f267b53ae6b..a7a942609b41 100644
--- a/pkg/sql/show_create.go
+++ b/pkg/sql/show_create.go
@@ -59,10 +59,9 @@ type ShowCreateDisplayOptions struct {
// ShowCreateTable returns a valid SQL representation of the CREATE
// TABLE statement used to create the given table.
//
-// The names of the tables references by foreign keys, and the
-// interleaved parent if any, are prefixed by their own database name
-// unless it is equal to the given dbPrefix. This allows us to elide
-// the prefix when the given table references other tables in the
+// The names of the tables referenced by foreign keys are prefixed by their own
+// database name unless it is equal to the given dbPrefix. This allows us to
+// elide the prefix when the given table references other tables in the
// current database.
func ShowCreateTable(
ctx context.Context,
@@ -134,61 +133,30 @@ func ShowCreateTable(
return "", err
}
}
- allIdx := append(
- append([]catalog.Index{}, desc.PublicNonPrimaryIndexes()...),
- desc.GetPrimaryIndex())
- for _, idx := range allIdx {
- // Only add indexes to the create_statement column, and not to the
- // create_nofks column if they are not associated with an INTERLEAVE
- // statement.
- // Initialize to false if Interleave has no ancestors, indicating that the
- // index is not interleaved at all.
- includeInterleaveClause := idx.NumInterleaveAncestors() == 0
- if displayOptions.FKDisplayMode != OmitFKClausesFromCreate {
- // The caller is instructing us to not omit FK clauses from inside the CREATE.
- // (i.e. the caller does not want them as separate DDL.)
- // Since we're including FK clauses, we need to also include the PARTITION and INTERLEAVE
- // clauses as well.
- includeInterleaveClause = true
+ for _, idx := range desc.PublicNonPrimaryIndexes() {
+ // Showing the primary index is handled above.
+
+ // Build the PARTITION BY clause.
+ var partitionBuf bytes.Buffer
+ if err := ShowCreatePartitioning(
+ a, p.ExecCfg().Codec, desc, idx, idx.GetPartitioning(), &partitionBuf, 1 /* indent */, 0, /* colOffset */
+ ); err != nil {
+ return "", err
}
- if !idx.Primary() && includeInterleaveClause {
- // Showing the primary index is handled above.
-
- // Build the PARTITION BY clause.
- var partitionBuf bytes.Buffer
- if err := ShowCreatePartitioning(
- a, p.ExecCfg().Codec, desc, idx, idx.GetPartitioning(), &partitionBuf, 1 /* indent */, 0, /* colOffset */
- ); err != nil {
- return "", err
- }
-
- // Add interleave or Foreign Key indexes only to the create_table columns,
- // and not the create_nofks column.
- var interleaveBuf bytes.Buffer
- if includeInterleaveClause {
- // TODO(mgartner): The logic in showCreateInterleave can be
- // moved to catformat.IndexForDisplay.
- if err := showCreateInterleave(idx, &interleaveBuf, dbPrefix, lCtx); err != nil {
- return "", err
- }
- }
-
- f.WriteString(",\n\t")
- idxStr, err := catformat.IndexForDisplay(
- ctx,
- desc,
- &descpb.AnonymousTable,
- idx,
- partitionBuf.String(),
- interleaveBuf.String(),
- p.RunParams(ctx).p.SemaCtx(),
- )
- if err != nil {
- return "", err
- }
- f.WriteString(idxStr)
+ f.WriteString(",\n\t")
+ idxStr, err := catformat.IndexForDisplay(
+ ctx,
+ desc,
+ &descpb.AnonymousTable,
+ idx,
+ partitionBuf.String(),
+ p.RunParams(ctx).p.SemaCtx(),
+ )
+ if err != nil {
+ return "", err
}
+ f.WriteString(idxStr)
}
// Create the FAMILY and CONSTRAINTs of the CREATE statement
@@ -197,9 +165,6 @@ func ShowCreateTable(
return "", err
}
- if err := showCreateInterleave(desc.GetPrimaryIndex(), &f.Buffer, dbPrefix, lCtx); err != nil {
- return "", err
- }
if err := ShowCreatePartitioning(
a, p.ExecCfg().Codec, desc, desc.GetPrimaryIndex(), desc.GetPrimaryIndex().GetPartitioning(), &f.Buffer, 0 /* indent */, 0, /* colOffset */
); err != nil {
diff --git a/pkg/sql/show_create_clauses.go b/pkg/sql/show_create_clauses.go
index 646699ff0a9c..8eba73ec35d8 100644
--- a/pkg/sql/show_create_clauses.go
+++ b/pkg/sql/show_create_clauses.go
@@ -381,46 +381,6 @@ func showCreateLocality(desc catalog.TableDescriptor, f *tree.FmtCtx) error {
return nil
}
-// showCreateInterleave returns an INTERLEAVE IN PARENT clause for the specified
-// index, if applicable.
-//
-// The name of the parent table is prefixed by its database name unless
-// it is equal to the given dbPrefix. This allows us to elide the prefix
-// when the given index is interleaved in a table of the current database.
-func showCreateInterleave(
- idx catalog.Index, buf *bytes.Buffer, dbPrefix string, lCtx simpleSchemaResolver,
-) error {
- if idx.NumInterleaveAncestors() == 0 {
- return nil
- }
- intl := idx.IndexDesc().Interleave
- parentTableID := intl.Ancestors[len(intl.Ancestors)-1].TableID
- var err error
- var parentName tree.TableName
- if lCtx != nil {
- parentName, err = getParentAsTableName(lCtx, parentTableID, dbPrefix)
- if err != nil {
- return err
- }
- } else {
- parentName = tree.MakeTableNameWithSchema(tree.Name(""), tree.PublicSchemaName, tree.Name(fmt.Sprintf("[%d as parent]", parentTableID)))
- parentName.ExplicitCatalog = false
- parentName.ExplicitSchema = false
- }
- var sharedPrefixLen int
- for _, ancestor := range intl.Ancestors {
- sharedPrefixLen += int(ancestor.SharedPrefixLen)
- }
- buf.WriteString(" INTERLEAVE IN PARENT ")
- fmtCtx := tree.NewFmtCtx(tree.FmtSimple)
- fmtCtx.FormatNode(&parentName)
- buf.WriteString(fmtCtx.CloseAndGetString())
- buf.WriteString(" (")
- formatQuoteNames(buf, idx.IndexDesc().KeyColumnNames[:sharedPrefixLen]...)
- buf.WriteString(")")
- return nil
-}
-
// ShowCreatePartitioning returns a PARTITION BY clause for the specified
// index, if applicable.
func ShowCreatePartitioning(
diff --git a/pkg/sql/span/span_builder.go b/pkg/sql/span/span_builder.go
index 27175cbf796a..8498a7c96cee 100644
--- a/pkg/sql/span/span_builder.go
+++ b/pkg/sql/span/span_builder.go
@@ -84,24 +84,9 @@ func MakeBuilder(
}
// Set up the interstices for encoding interleaved tables later.
+ //
+ // TODO(yuzefovich): simplify this, interleaves are dead now.
s.interstices[0] = s.KeyPrefix
- if index.NumInterleaveAncestors() > 0 {
- // TODO(rohany): too much of this code is copied from EncodePartialIndexKey.
- sharedPrefixLen := 0
- for i := 0; i < index.NumInterleaveAncestors(); i++ {
- ancestor := index.GetInterleaveAncestor(i)
- // The first ancestor is already encoded in interstices[0].
- if i != 0 {
- s.interstices[sharedPrefixLen] = rowenc.EncodePartialTableIDIndexID(
- s.interstices[sharedPrefixLen], ancestor.TableID, ancestor.IndexID)
- }
- sharedPrefixLen += int(ancestor.SharedPrefixLen)
- s.interstices[sharedPrefixLen] = encoding.EncodeInterleavedSentinel(
- s.interstices[sharedPrefixLen])
- }
- s.interstices[sharedPrefixLen] = rowenc.EncodePartialTableIDIndexID(
- s.interstices[sharedPrefixLen], table.GetID(), index.GetID())
- }
return s
}
diff --git a/pkg/sql/sqlinstance/instancestorage/row_codec.go b/pkg/sql/sqlinstance/instancestorage/row_codec.go
index bec03699f019..2e3993dc5cbf 100644
--- a/pkg/sql/sqlinstance/instancestorage/row_codec.go
+++ b/pkg/sql/sqlinstance/instancestorage/row_codec.go
@@ -91,7 +91,7 @@ func (d *rowCodec) decodeRow(
{
types := []*types.T{tbl.PublicColumns()[0].GetType()}
row := make([]rowenc.EncDatum, 1)
- _, _, _, err := rowenc.DecodeIndexKey(d.codec, tbl, tbl.GetPrimaryIndex(), types, row, nil, kv.Key)
+ _, _, _, err := rowenc.DecodeIndexKey(d.codec, types, row, nil, kv.Key)
if err != nil {
return base.SQLInstanceID(0), "", "", hlc.Timestamp{}, false, errors.Wrap(err, "failed to decode key")
}
diff --git a/pkg/sql/sqltelemetry/schema.go b/pkg/sql/sqltelemetry/schema.go
index 308262775111..d0624cd08998 100644
--- a/pkg/sql/sqltelemetry/schema.go
+++ b/pkg/sql/sqltelemetry/schema.go
@@ -31,10 +31,6 @@ func SchemaNewTypeCounter(t string) telemetry.Counter {
}
var (
- // CreateInterleavedTableCounter is to be incremented every time an
- // interleaved table is being created.
- CreateInterleavedTableCounter = telemetry.GetCounterOnce("sql.schema.create_interleaved_table")
-
// CreateTempTableCounter is to be incremented every time a TEMP TABLE
// has been created.
CreateTempTableCounter = telemetry.GetCounterOnce("sql.schema.create_temp_table")
diff --git a/pkg/sql/stats/stats_cache.go b/pkg/sql/stats/stats_cache.go
index 5a8443b01a49..bf6365cc102b 100644
--- a/pkg/sql/stats/stats_cache.go
+++ b/pkg/sql/stats/stats_cache.go
@@ -22,7 +22,6 @@ import (
"github.com/cockroachdb/cockroach/pkg/sql/catalog"
"github.com/cockroachdb/cockroach/pkg/sql/catalog/descpb"
"github.com/cockroachdb/cockroach/pkg/sql/catalog/descs"
- "github.com/cockroachdb/cockroach/pkg/sql/catalog/systemschema"
"github.com/cockroachdb/cockroach/pkg/sql/opt/cat"
"github.com/cockroachdb/cockroach/pkg/sql/rowenc"
"github.com/cockroachdb/cockroach/pkg/sql/sem/tree"
@@ -181,14 +180,11 @@ func NewTableStatisticsCache(
func decodeTableStatisticsKV(
codec keys.SQLCodec, kv *roachpb.RangeFeedValue, da *rowenc.DatumAlloc,
) (tableDesc descpb.ID, err error) {
- tbl := systemschema.TableStatisticsTable
// The primary key of table_statistics is (tableID INT, statisticID INT).
types := []*types.T{types.Int, types.Int}
dirs := []descpb.IndexDescriptor_Direction{descpb.IndexDescriptor_ASC, descpb.IndexDescriptor_ASC}
keyVals := make([]rowenc.EncDatum, 2)
- _, matches, _, err := rowenc.DecodeIndexKey(
- codec, tbl, tbl.GetPrimaryIndex(), types, keyVals, dirs, kv.Key,
- )
+ _, matches, _, err := rowenc.DecodeIndexKey(codec, types, keyVals, dirs, kv.Key)
if err != nil {
return 0, err
}
diff --git a/pkg/sql/tablewriter_delete.go b/pkg/sql/tablewriter_delete.go
index 3083ab4a6c57..f789e21282e5 100644
--- a/pkg/sql/tablewriter_delete.go
+++ b/pkg/sql/tablewriter_delete.go
@@ -17,12 +17,9 @@ import (
"github.com/cockroachdb/cockroach/pkg/roachpb"
"github.com/cockroachdb/cockroach/pkg/settings"
"github.com/cockroachdb/cockroach/pkg/sql/catalog"
- "github.com/cockroachdb/cockroach/pkg/sql/catalog/descpb"
"github.com/cockroachdb/cockroach/pkg/sql/row"
"github.com/cockroachdb/cockroach/pkg/sql/rowenc"
- "github.com/cockroachdb/cockroach/pkg/sql/rowinfra"
"github.com/cockroachdb/cockroach/pkg/sql/sem/tree"
- "github.com/cockroachdb/cockroach/pkg/util"
"github.com/cockroachdb/cockroach/pkg/util/log"
"github.com/cockroachdb/errors"
)
@@ -60,34 +57,21 @@ func (td *tableDeleter) row(
}
// deleteAllRows runs the kv operations necessary to delete all sql rows in the
-// table passed at construction. This may require a scan.
+// table passed at construction, using the DelRange KV request to delete data
+// quickly.
//
// resume is the resume-span which should be used for the table deletion when
// the table deletion is chunked. The first call to this method should use a
// zero resume-span. After a chunk is deleted a new resume-span is returned.
//
-// limit is a limit on either the number of keys or table-rows (for
-// interleaved tables) deleted in the operation.
-func (td *tableDeleter) deleteAllRows(
- ctx context.Context, resume roachpb.Span, limit int64, traceKV bool,
-) (roachpb.Span, error) {
- if td.tableDesc().IsInterleaved() {
- log.VEvent(ctx, 2, "delete forced to scan: table is interleaved")
- return td.deleteAllRowsScan(ctx, resume, limit, traceKV)
- }
- // TODO(pbardea): Is this ever called anymore?
- return td.deleteAllRowsFast(ctx, resume, limit, traceKV)
-}
-
-// deleteAllRowsFast uses the DelRange KV request to delete data quickly,
-// relative to deleteAllRowsScan.
+// limit is a limit on the number of keys deleted in the operation.
//
// Note that this method leaves a RocksDB deletion tombstone on every key in the
// table, resulting in substantial write amplification. When possible, the
// schema changer avoids using a tableDeleter entirely in favor of the
// ClearRange KV request, which uses RocksDB range deletion tombstones to avoid
// write amplification.
-func (td *tableDeleter) deleteAllRowsFast(
+func (td *tableDeleter) deleteAllRows(
ctx context.Context, resume roachpb.Span, limit int64, traceKV bool,
) (roachpb.Span, error) {
if resume.Key == nil {
@@ -111,81 +95,8 @@ func (td *tableDeleter) deleteAllRowsFast(
return td.b.Results[0].ResumeSpanAsValue(), nil
}
-func (td *tableDeleter) deleteAllRowsScan(
- ctx context.Context, resume roachpb.Span, limit int64, traceKV bool,
-) (roachpb.Span, error) {
- if resume.Key == nil {
- resume = td.tableDesc().PrimaryIndexSpan(td.rd.Helper.Codec)
- }
-
- var valNeededForCol util.FastIntSet
- for i := range td.rd.FetchCols {
- col := td.rd.FetchCols[i].GetID()
- valNeededForCol.Add(td.rd.FetchColIDtoRowIndex.GetDefault(col))
- }
-
- var rf row.Fetcher
- tableArgs := row.FetcherTableArgs{
- Desc: td.tableDesc(),
- Index: td.tableDesc().GetPrimaryIndex(),
- ColIdxMap: td.rd.FetchColIDtoRowIndex,
- Cols: td.rd.FetchCols,
- ValNeededForCol: valNeededForCol,
- }
- if err := rf.Init(
- ctx,
- td.rd.Helper.Codec,
- false, /* reverse */
- // TODO(nvanbenschoten): it might make sense to use a FOR_UPDATE locking
- // strength here. Consider hooking this in to the same knob that will
- // control whether we perform locking implicitly during DELETEs.
- descpb.ScanLockingStrength_FOR_NONE,
- descpb.ScanLockingWaitPolicy_BLOCK,
- td.lockTimeout,
- false, /* isCheck */
- td.alloc,
- // TODO(bulkio): this might need a memory monitor for the slow case of truncate.
- nil, /* memMonitor */
- tableArgs,
- ); err != nil {
- return resume, err
- }
- if err := rf.StartScan(
- ctx, td.txn, roachpb.Spans{resume}, rowinfra.DefaultBatchBytesLimit, rowinfra.NoRowLimit, traceKV, td.forceProductionBatchSizes,
- ); err != nil {
- return resume, err
- }
-
- for i := int64(0); i < limit; i++ {
- datums, _, _, err := rf.NextRowDecoded(ctx)
- if err != nil {
- return resume, err
- }
- if datums == nil {
- // Done deleting all rows.
- resume = roachpb.Span{}
- break
- }
- // An empty PartialIndexUpdateHelper is passed here, meaning that DEL
- // operations will be issued for every partial index, regardless of
- // whether or not the row is indexed by the partial index.
- // TODO(mgartner): Try evaluating each partial index predicate
- // expression for each row and benchmark to determine if it is faster
- // than simply issuing DEL operations for entries that do not exist.
- var pm row.PartialIndexUpdateHelper
- if err = td.row(ctx, datums, pm, traceKV); err != nil {
- return resume, err
- }
- }
- if resume.Key != nil {
- // Update the resume start key for the next iteration.
- resume.Key = rf.Key()
- }
- return resume, td.finalize(ctx)
-}
-
// deleteIndex runs the kv operations necessary to delete all kv entries in the
-// given index. This may require a scan.
+// given index.
//
// resume is the resume-span which should be used for the index deletion
// when the index deletion is chunked. The first call to this method should
@@ -195,18 +106,6 @@ func (td *tableDeleter) deleteAllRowsScan(
// limit is a limit on the number of index entries deleted in the operation.
func (td *tableDeleter) deleteIndex(
ctx context.Context, idx catalog.Index, resume roachpb.Span, limit int64, traceKV bool,
-) (roachpb.Span, error) {
- if idx.IsInterleaved() {
- if log.V(2) {
- log.Info(ctx, "delete forced to scan: table is interleaved")
- }
- return td.deleteIndexScan(ctx, idx, resume, limit, traceKV)
- }
- return td.deleteIndexFast(ctx, idx, resume, limit, traceKV)
-}
-
-func (td *tableDeleter) deleteIndexFast(
- ctx context.Context, idx catalog.Index, resume roachpb.Span, limit int64, traceKV bool,
) (roachpb.Span, error) {
if resume.Key == nil {
resume = td.tableDesc().IndexSpan(td.rd.Helper.Codec, idx.GetID())
@@ -227,10 +126,6 @@ func (td *tableDeleter) deleteIndexFast(
}
func (td *tableDeleter) clearIndex(ctx context.Context, idx catalog.Index) error {
- if idx.IsInterleaved() {
- return errors.Errorf("unexpected interleaved index %d", idx.GetID())
- }
-
sp := td.tableDesc().IndexSpan(td.rd.Helper.Codec, idx.GetID())
// ClearRange cannot be run in a transaction, so create a
@@ -248,72 +143,6 @@ func (td *tableDeleter) clearIndex(ctx context.Context, idx catalog.Index) error
return td.txn.DB().Run(ctx, b)
}
-func (td *tableDeleter) deleteIndexScan(
- ctx context.Context, idx catalog.Index, resume roachpb.Span, limit int64, traceKV bool,
-) (roachpb.Span, error) {
- if resume.Key == nil {
- resume = td.tableDesc().PrimaryIndexSpan(td.rd.Helper.Codec)
- }
-
- var valNeededForCol util.FastIntSet
- for i := range td.rd.FetchCols {
- col := td.rd.FetchCols[i].GetID()
- valNeededForCol.Add(td.rd.FetchColIDtoRowIndex.GetDefault(col))
- }
-
- var rf row.Fetcher
- tableArgs := row.FetcherTableArgs{
- Desc: td.tableDesc(),
- Index: td.tableDesc().GetPrimaryIndex(),
- ColIdxMap: td.rd.FetchColIDtoRowIndex,
- Cols: td.rd.FetchCols,
- ValNeededForCol: valNeededForCol,
- }
- if err := rf.Init(
- ctx,
- td.rd.Helper.Codec,
- false, /* reverse */
- // TODO(nvanbenschoten): it might make sense to use a FOR_UPDATE locking
- // strength here. Consider hooking this in to the same knob that will
- // control whether we perform locking implicitly during DELETEs.
- descpb.ScanLockingStrength_FOR_NONE,
- descpb.ScanLockingWaitPolicy_BLOCK,
- td.lockTimeout,
- false, /* isCheck */
- td.alloc,
- // TODO(bulkio): this might need a memory monitor.
- nil, /* memMonitor */
- tableArgs,
- ); err != nil {
- return resume, err
- }
- if err := rf.StartScan(
- ctx, td.txn, roachpb.Spans{resume}, rowinfra.DefaultBatchBytesLimit, rowinfra.NoRowLimit, traceKV, td.forceProductionBatchSizes,
- ); err != nil {
- return resume, err
- }
-
- for i := int64(0); i < limit; i++ {
- datums, _, _, err := rf.NextRowDecoded(ctx)
- if err != nil {
- return resume, err
- }
- if datums == nil {
- // Done deleting all rows.
- resume = roachpb.Span{}
- break
- }
- if err := td.rd.DeleteIndexRow(ctx, td.b, idx, datums, traceKV); err != nil {
- return resume, err
- }
- }
- if resume.Key != nil {
- // Update the resume start key for the next iteration.
- resume.Key = rf.Key()
- }
- return resume, td.finalize(ctx)
-}
-
func (td *tableDeleter) tableDesc() catalog.TableDescriptor {
return td.rd.Helper.TableDesc
}
diff --git a/pkg/sql/testdata/telemetry/error b/pkg/sql/testdata/telemetry/error
index 1113d6cbf5f1..1c6687ed15bb 100644
--- a/pkg/sql/testdata/telemetry/error
+++ b/pkg/sql/testdata/telemetry/error
@@ -89,14 +89,6 @@ errorcodes.XXUUU
othererror.XXUUU
othererror.XXUUU.crdb_internal.set_vmodule()
-# 0A000 is pgcode.FeatureNotSupported.
-feature-usage
-CREATE TABLE foo (a INT8 PRIMARY KEY, b INT8, INDEX (b) INTERLEAVE IN PARENT foo (b))
-----
-error: pq: unimplemented: use CREATE INDEX to make interleaved indexes
-errorcodes.0A000
-unimplemented.#9148
-
# 22012 is pgcode.DivisionByZero.
feature-usage
SELECT 2/0
diff --git a/pkg/sql/truncate.go b/pkg/sql/truncate.go
index 761047762801..6e84b9c6682c 100644
--- a/pkg/sql/truncate.go
+++ b/pkg/sql/truncate.go
@@ -35,7 +35,6 @@ import (
"github.com/cockroachdb/cockroach/pkg/util/errorutil/unimplemented"
"github.com/cockroachdb/cockroach/pkg/util/log"
"github.com/cockroachdb/cockroach/pkg/util/log/eventpb"
- "github.com/cockroachdb/cockroach/pkg/util/protoutil"
"github.com/cockroachdb/cockroach/pkg/util/timeutil"
"github.com/cockroachdb/errors"
)
@@ -64,24 +63,6 @@ func (t *truncateNode) startExec(params runParams) error {
// while constructing the list of tables that should be truncated.
toTraverse := make([]tabledesc.Mutable, 0, len(n.Tables))
- // Collect copies of each interleaved descriptor being truncated before any
- // modification has been done to them. We need this in order to truncate
- // the interleaved indexes in the GC job. We have to collect these descriptors
- // before the truncate modifications to know what are the correct index spans
- // to delete. Once changes have been made, the index spans where k/v data for
- // the table reside are no longer accessible from the table.
- interleaveCopies := make(map[descpb.ID]*descpb.TableDescriptor)
- maybeAddInterleave := func(desc catalog.TableDescriptor) {
- if !desc.IsInterleaved() {
- return
- }
- _, ok := interleaveCopies[desc.GetID()]
- if ok {
- return
- }
- interleaveCopies[desc.GetID()] = protoutil.Clone(desc.TableDesc()).(*descpb.TableDescriptor)
- }
-
for i := range n.Tables {
tn := &n.Tables[i]
_, tableDesc, err := p.ResolveMutableTableDescriptor(
@@ -96,7 +77,6 @@ func (t *truncateNode) startExec(params runParams) error {
toTruncate[tableDesc.ID] = tn.FQString()
toTraverse = append(toTraverse, *tableDesc)
- maybeAddInterleave(tableDesc)
}
// Check that any referencing tables are contained in the set, or, if CASCADE
@@ -129,7 +109,6 @@ func (t *truncateNode) startExec(params runParams) error {
}
toTruncate[other.ID] = otherName.FQString()
toTraverse = append(toTraverse, *other)
- maybeAddInterleave(other)
return nil
}
@@ -139,14 +118,6 @@ func (t *truncateNode) startExec(params runParams) error {
return err
}
}
- for _, idx := range tableDesc.NonDropIndexes() {
- for i := 0; i < idx.NumInterleavedBy(); i++ {
- ref := idx.GetInterleavedBy(i)
- if err := maybeEnqueue(ref.Table, "interleaved by"); err != nil {
- return err
- }
- }
- }
}
// Mark this query as non-cancellable if autocommitting.
@@ -155,7 +126,7 @@ func (t *truncateNode) startExec(params runParams) error {
}
for id, name := range toTruncate {
- if err := p.truncateTable(ctx, id, interleaveCopies, tree.AsStringWithFQNames(t.n, params.Ann())); err != nil {
+ if err := p.truncateTable(ctx, id, tree.AsStringWithFQNames(t.n, params.Ann())); err != nil {
return err
}
@@ -190,15 +161,8 @@ var PreservedSplitCountMultiple = settings.RegisterIntSetting(
// truncateTable truncates the data of a table in a single transaction. It does
// so by dropping all existing indexes on the table and creating new ones without
// backfilling any data into the new indexes. The old indexes are cleaned up
-// asynchronously by the SchemaChangeGCJob. interleaveDescs is a set of
-// interleaved TableDescriptors being truncated before any of the truncate
-// mutations have been applied.
-func (p *planner) truncateTable(
- ctx context.Context,
- id descpb.ID,
- interleaveDescs map[descpb.ID]*descpb.TableDescriptor,
- jobDesc string,
-) error {
+// asynchronously by the SchemaChangeGCJob.
+func (p *planner) truncateTable(ctx context.Context, id descpb.ID, jobDesc string) error {
// Read the table descriptor because it might have changed
// while another table in the truncation list was truncated.
tableDesc, err := p.Descriptors().GetMutableTableVersionByID(ctx, id, p.txn)
@@ -206,12 +170,6 @@ func (p *planner) truncateTable(
return err
}
- // Get all tables that might reference this one.
- allRefs, err := p.findAllReferencingInterleaves(ctx, tableDesc)
- if err != nil {
- return err
- }
-
if err := checkTableForDisallowedMutationsWithTruncate(tableDesc); err != nil {
return err
}
@@ -263,28 +221,18 @@ func (p *planner) truncateTable(
// Create schema change GC jobs for all of the indexes.
dropTime := timeutil.Now().UnixNano()
droppedIndexes := make([]jobspb.SchemaChangeGCDetails_DroppedIndex, 0, len(oldIndexes))
- var droppedInterleaves []descpb.IndexDescriptor
for i := range oldIndexes {
idx := oldIndexes[i]
- if idx.IsInterleaved() {
- droppedInterleaves = append(droppedInterleaves, idx)
- } else {
- droppedIndexes = append(droppedIndexes, jobspb.SchemaChangeGCDetails_DroppedIndex{
- IndexID: idx.ID,
- DropTime: dropTime,
- })
- }
+ droppedIndexes = append(droppedIndexes, jobspb.SchemaChangeGCDetails_DroppedIndex{
+ IndexID: idx.ID,
+ DropTime: dropTime,
+ })
}
details := jobspb.SchemaChangeGCDetails{
Indexes: droppedIndexes,
ParentID: tableDesc.ID,
}
- // If we have any interleaved indexes, add that information to the job record.
- if len(droppedInterleaves) > 0 {
- details.InterleavedTable = interleaveDescs[tableDesc.ID]
- details.InterleavedIndexes = droppedInterleaves
- }
record := CreateGCJobRecord(jobDesc, p.User(), details)
if _, err := p.ExecCfg().JobRegistry.CreateAdoptableJobWithTxn(
ctx, record, p.ExecCfg().JobRegistry.MakeJobID(), p.txn); err != nil {
@@ -315,20 +263,6 @@ func (p *planner) truncateTable(
return err
}
- // Reassign any referenced index ID's from other tables.
- if err := p.reassignInterleaveIndexReferences(ctx, allRefs, tableDesc.ID, indexIDMapping); err != nil {
- return err
- }
- // Reassign any self references.
- if err := p.reassignInterleaveIndexReferences(
- ctx,
- []*tabledesc.Mutable{tableDesc},
- tableDesc.ID,
- indexIDMapping,
- ); err != nil {
- return err
- }
-
// Move any zone configs on indexes over to the new set of indexes.
swapInfo := &descpb.PrimaryKeySwap{
OldPrimaryIndexId: oldIndexIDs[0],
@@ -465,30 +399,6 @@ func ClearTableDataInChunks(
return nil
}
-// findAllReferencingInterleaves finds all tables that might interleave or
-// be interleaved by the input table.
-func (p *planner) findAllReferencingInterleaves(
- ctx context.Context, table *tabledesc.Mutable,
-) ([]*tabledesc.Mutable, error) {
- refs, err := table.FindAllReferences()
- if err != nil {
- return nil, err
- }
- tables := make([]*tabledesc.Mutable, 0, len(refs))
- for id := range refs {
- if id == table.ID {
- continue
- }
- t, err := p.Descriptors().GetMutableTableVersionByID(ctx, id, p.txn)
- if err != nil {
- return nil, err
- }
- tables = append(tables, t)
- }
-
- return tables, nil
-}
-
// copySplitPointsToNewIndexes copies any range split points from the indexes
// given by the oldIndexIDs slice to the indexes given by the newIndexIDs slice
// on the table given by the tableID.
@@ -638,43 +548,6 @@ func (p *planner) copySplitPointsToNewIndexes(
return p.txn.DB().Run(ctx, &b)
}
-// reassignInterleaveIndexReferences reassigns all index ID's present in
-// interleave descriptor references according to indexIDMapping.
-func (p *planner) reassignInterleaveIndexReferences(
- ctx context.Context,
- tables []*tabledesc.Mutable,
- truncatedID descpb.ID,
- indexIDMapping map[descpb.IndexID]descpb.IndexID,
-) error {
- for _, table := range tables {
- changed := false
- if err := catalog.ForEachNonDropIndex(table, func(indexI catalog.Index) error {
- index := indexI.IndexDesc()
- for j, a := range index.Interleave.Ancestors {
- if a.TableID == truncatedID {
- index.Interleave.Ancestors[j].IndexID = indexIDMapping[index.Interleave.Ancestors[j].IndexID]
- changed = true
- }
- }
- for j, c := range index.InterleavedBy {
- if c.Table == truncatedID {
- index.InterleavedBy[j].Index = indexIDMapping[index.InterleavedBy[j].Index]
- changed = true
- }
- }
- return nil
- }); err != nil {
- return err
- }
- if changed {
- if err := p.writeSchemaChange(ctx, table, descpb.InvalidMutationID, "updating reference for truncated table"); err != nil {
- return err
- }
- }
- }
- return nil
-}
-
func (p *planner) reassignIndexComments(
ctx context.Context, table *tabledesc.Mutable, indexIDMapping map[descpb.IndexID]descpb.IndexID,
) error {
@@ -713,11 +586,3 @@ func (p *planner) reassignIndexComments(
}
return nil
}
-
-// canClearRangeForDrop returns if an index can be deleted by deleting every
-// key from a single span.
-// This determines whether an index is dropped during a schema change, or if
-// it is only deleted upon GC.
-func canClearRangeForDrop(index catalog.Index) bool {
- return !index.IsInterleaved()
-}
diff --git a/pkg/sql/vars.go b/pkg/sql/vars.go
index b61c49535e6c..a5aa24af37cd 100644
--- a/pkg/sql/vars.go
+++ b/pkg/sql/vars.go
@@ -1634,24 +1634,6 @@ var varGen = map[string]sessionVar{
},
},
- `enable_copying_partitioning_when_deinterleaving_table`: {
- GetStringVal: makePostgresBoolGetStringValFn(`enable_experimental_stream_replication`),
- Set: func(_ context.Context, m sessionDataMutator, s string) error {
- b, err := paramparse.ParseBoolVar(`enable_experimental_stream_replication`, s)
- if err != nil {
- return err
- }
- m.SetCopyPartitioningWhenDeinterleavingTable(b)
- return nil
- },
- Get: func(evalCtx *extendedEvalContext) (string, error) {
- return formatBoolAsPostgresSetting(evalCtx.SessionData().CopyPartitioningWhenDeinterleavingTable), nil
- },
- GlobalDefault: func(sv *settings.Values) string {
- return formatBoolAsPostgresSetting(copyPartitioningWhenDeinterleavingTable.Get(sv))
- },
- },
-
`null_ordered_last`: {
GetStringVal: makePostgresBoolGetStringValFn(`null_ordered_last`),
Set: func(_ context.Context, m sessionDataMutator, s string) error {
diff --git a/pkg/testutils/sqlutils/table_gen.go b/pkg/testutils/sqlutils/table_gen.go
index 762a333f83fe..7fe710536cb2 100644
--- a/pkg/testutils/sqlutils/table_gen.go
+++ b/pkg/testutils/sqlutils/table_gen.go
@@ -57,7 +57,7 @@ func genValues(w io.Writer, firstRow, lastRow int, fn GenRowFn, shouldPrint bool
func CreateTable(
tb testing.TB, sqlDB *gosql.DB, tableName, schema string, numRows int, fn GenRowFn,
) {
- CreateTableInterleaved(tb, sqlDB, tableName, schema, "" /*interleaveSchema*/, numRows, fn)
+ CreateTableDebug(tb, sqlDB, tableName, schema, numRows, fn, false /* print */)
}
// CreateTableDebug is identical to debug, but allows for the added option of
@@ -70,38 +70,9 @@ func CreateTableDebug(
fn GenRowFn,
shouldPrint bool,
) {
- CreateTableInterleavedDebug(tb, sqlDB, tableName, schema, "" /*interleaveSchema*/, numRows, fn, shouldPrint)
-}
-
-// CreateTableInterleaved is identical to CreateTable with the added option
-// of specifying an interleave schema for interleaving the table.
-func CreateTableInterleaved(
- tb testing.TB,
- sqlDB *gosql.DB,
- tableName, schema, interleaveSchema string,
- numRows int,
- fn GenRowFn,
-) {
- CreateTableInterleavedDebug(tb, sqlDB, tableName, schema, interleaveSchema, numRows, fn, false /* print */)
-}
-
-// CreateTableInterleavedDebug is identical to CreateTableInterleaved with the
-// option of printing the table being created.
-func CreateTableInterleavedDebug(
- tb testing.TB,
- sqlDB *gosql.DB,
- tableName, schema, interleaveSchema string,
- numRows int,
- fn GenRowFn,
- shouldPrint bool,
-) {
- if interleaveSchema != "" {
- interleaveSchema = fmt.Sprintf(`INTERLEAVE IN PARENT %s.%s`, TestDB, interleaveSchema)
- }
-
r := MakeSQLRunner(sqlDB)
stmt := fmt.Sprintf(`CREATE DATABASE IF NOT EXISTS %s;`, TestDB)
- stmt += fmt.Sprintf(`CREATE TABLE %s.%s (%s) %s;`, TestDB, tableName, schema, interleaveSchema)
+ stmt += fmt.Sprintf(`CREATE TABLE %s.%s (%s);`, TestDB, tableName, schema)
r.Exec(tb, stmt)
if shouldPrint {
fmt.Printf("Creating table: %s\n%s\n", tableName, schema)
diff --git a/pkg/workload/ledger/ledger.go b/pkg/workload/ledger/ledger.go
index 1e68d06b3a54..1bd1eabb8543 100644
--- a/pkg/workload/ledger/ledger.go
+++ b/pkg/workload/ledger/ledger.go
@@ -21,7 +21,6 @@ import (
"github.com/cockroachdb/cockroach/pkg/util/timeutil"
"github.com/cockroachdb/cockroach/pkg/workload"
"github.com/cockroachdb/cockroach/pkg/workload/histogram"
- "github.com/cockroachdb/errors"
"github.com/spf13/pflag"
)
@@ -31,7 +30,6 @@ type ledger struct {
seed int64
customers int
- interleaved bool
inlineArgs bool
splits int
fks bool
@@ -60,7 +58,6 @@ var ledgerMeta = workload.Meta{
g.connFlags = workload.NewConnFlags(&g.flags)
g.flags.Int64Var(&g.seed, `seed`, 1, `Random number generator seed`)
g.flags.IntVar(&g.customers, `customers`, 1000, `Number of customers`)
- g.flags.BoolVar(&g.interleaved, `interleaved`, false, `Use interleaved tables`)
g.flags.BoolVar(&g.inlineArgs, `inline-args`, false, `Use inline query arguments`)
g.flags.IntVar(&g.splits, `splits`, 0, `Number of splits to perform before starting normal operations`)
g.flags.BoolVar(&g.fks, `fks`, true, `Add the foreign keys`)
@@ -87,9 +84,6 @@ func (w *ledger) Flags() workload.Flags { return w.flags }
func (w *ledger) Hooks() workload.Hooks {
return workload.Hooks{
Validate: func() error {
- if w.interleaved {
- return errors.Errorf("interleaved tables are not yet supported")
- }
return initializeMix(w)
},
PostLoad: func(sqlDB *gosql.DB) error {
diff --git a/pkg/workload/tpcc/ddls.go b/pkg/workload/tpcc/ddls.go
index ec0e1d0ed686..b52afdde9974 100644
--- a/pkg/workload/tpcc/ddls.go
+++ b/pkg/workload/tpcc/ddls.go
@@ -53,8 +53,6 @@ const (
family static (d_w_id, d_id, d_name, d_street_1, d_street_2, d_city, d_state, d_zip),
family dynamic_1 (d_ytd),
family dynamic_2 (d_next_o_id, d_tax)`
- tpccDistrictSchemaInterleaveSuffix = `
- interleave in parent warehouse (d_w_id)`
// CUSTOMER table.
tpccCustomerSchemaBase = `(
@@ -87,8 +85,6 @@ const (
c_city, c_state, c_zip, c_phone, c_since, c_credit, c_credit_lim, c_discount
),
family dynamic (c_balance, c_ytd_payment, c_payment_cnt, c_data, c_delivery_cnt)`
- tpccCustomerSchemaInterleaveSuffix = `
- interleave in parent district (c_w_id, c_d_id)`
// HISTORY table.
tpccHistorySchemaBase = `(
@@ -119,8 +115,6 @@ const (
primary key (o_w_id, o_d_id, o_id DESC),
unique index order_idx (o_w_id, o_d_id, o_c_id, o_id DESC) storing (o_entry_d, o_carrier_id)
`
- tpccOrderSchemaInterleaveSuffix = `
- interleave in parent district (o_w_id, o_d_id)`
// NEW-ORDER table.
tpccNewOrderSchema = `(
@@ -129,11 +123,6 @@ const (
no_w_id integer not null,
primary key (no_w_id, no_d_id, no_o_id)
`
- // This natural-seeming interleave makes performance worse, because this
- // table has a ton of churn and produces a lot of MVCC tombstones, which
- // then will gum up the works of scans over the parent table.
- // tpccNewOrderSchemaInterleaveSuffix = `
- // interleave in parent "order" (no_w_id, no_d_id, no_o_id)`
// ITEM table.
tpccItemSchema = `(
@@ -167,8 +156,6 @@ const (
primary key (s_w_id, s_i_id)`
deprecatedTpccStockSchemaFkSuffix = `
index stock_item_fk_idx (s_i_id)`
- tpccStockSchemaInterleaveSuffix = `
- interleave in parent warehouse (s_w_id)`
// ORDER-LINE table.
tpccOrderLineSchemaBase = `(
@@ -185,8 +172,6 @@ const (
primary key (ol_w_id, ol_d_id, ol_o_id DESC, ol_number)`
deprecatedTpccOrderLineSchemaFkSuffix = `
index order_line_stock_fk_idx (ol_supply_w_id, ol_i_id)`
- tpccOrderLineSchemaInterleaveSuffix = `
- interleave in parent "order" (ol_w_id, ol_d_id, ol_o_id)`
localityRegionalByRowSuffix = `
locality regional by row`
@@ -197,11 +182,10 @@ const (
)
type schemaOptions struct {
- fkClause string
- familyClause string
- columnClause string
- localityClause string
- interleaveClause string
+ fkClause string
+ familyClause string
+ columnClause string
+ localityClause string
}
type makeSchemaOption func(o *schemaOptions)
@@ -222,14 +206,6 @@ func maybeAddColumnFamiliesSuffix(separateColumnFamilies bool, suffix string) ma
}
}
-func maybeAddInterleaveSuffix(interleave bool, suffix string) makeSchemaOption {
- return func(o *schemaOptions) {
- if interleave {
- o.interleaveClause = suffix
- }
- }
-}
-
func maybeAddLocalityRegionalByRow(
multiRegionCfg multiRegionConfig, partColName string,
) makeSchemaOption {
@@ -271,9 +247,6 @@ func makeSchema(base string, opts ...makeSchemaOption) string {
if o.columnClause != "" {
ret += "," + o.columnClause
}
- if o.interleaveClause != "" {
- ret += "," + o.interleaveClause
- }
ret += endSchema
if o.localityClause != "" {
ret += o.localityClause
diff --git a/pkg/workload/tpcc/tpcc.go b/pkg/workload/tpcc/tpcc.go
index cf602ff43472..6ea0c7ffc11f 100644
--- a/pkg/workload/tpcc/tpcc.go
+++ b/pkg/workload/tpcc/tpcc.go
@@ -40,7 +40,6 @@ type tpcc struct {
seed uint64
warehouses int
activeWarehouses int
- interleaved bool
nowString []byte
numConns int
@@ -184,10 +183,6 @@ var tpccMeta = workload.Meta{
g.flags.IntVar(&g.warehouses, `warehouses`, 1, `Number of warehouses for loading`)
g.flags.BoolVar(&g.fks, `fks`, true, `Add the foreign keys`)
g.flags.BoolVar(&g.deprecatedFkIndexes, `deprecated-fk-indexes`, false, `Add deprecated foreign keys (needed when running against v20.1 or below clusters)`)
- g.flags.BoolVar(&g.interleaved, `interleaved`, false, `Use interleaved tables`)
- if err := g.Flags().MarkHidden("interleaved"); err != nil {
- panic(errors.Wrap(err, "no interleaved flag?"))
- }
g.flags.StringVar(&g.mix, `mix`,
`newOrder=10,payment=10,orderStatus=1,delivery=1,stockLevel=1`,
@@ -595,10 +590,6 @@ func (w *tpcc) Tables() []workload.Table {
w.separateColumnFamilies,
tpccDistrictColumnFamiliesSuffix,
),
- maybeAddInterleaveSuffix(
- w.interleaved,
- tpccDistrictSchemaInterleaveSuffix,
- ),
maybeAddLocalityRegionalByRow(w.multiRegionCfg, `d_w_id`),
),
InitialRows: workload.BatchedTuples{
@@ -617,10 +608,6 @@ func (w *tpcc) Tables() []workload.Table {
Name: `customer`,
Schema: makeSchema(
tpccCustomerSchemaBase,
- maybeAddInterleaveSuffix(
- w.interleaved,
- tpccCustomerSchemaInterleaveSuffix,
- ),
maybeAddColumnFamiliesSuffix(
w.separateColumnFamilies,
tpccCustomerColumnFamiliesSuffix,
@@ -659,10 +646,6 @@ func (w *tpcc) Tables() []workload.Table {
Name: `order`,
Schema: makeSchema(
tpccOrderSchemaBase,
- maybeAddInterleaveSuffix(
- w.interleaved,
- tpccOrderSchemaInterleaveSuffix,
- ),
maybeAddLocalityRegionalByRow(w.multiRegionCfg, `o_w_id`),
),
InitialRows: workload.BatchedTuples{
@@ -704,10 +687,6 @@ func (w *tpcc) Tables() []workload.Table {
Name: `stock`,
Schema: makeSchema(
tpccStockSchemaBase,
- maybeAddInterleaveSuffix(
- w.interleaved,
- tpccStockSchemaInterleaveSuffix,
- ),
maybeAddFkSuffix(
w.deprecatedFkIndexes,
deprecatedTpccStockSchemaFkSuffix,
@@ -724,10 +703,6 @@ func (w *tpcc) Tables() []workload.Table {
Name: `order_line`,
Schema: makeSchema(
tpccOrderLineSchemaBase,
- maybeAddInterleaveSuffix(
- w.interleaved,
- tpccOrderLineSchemaInterleaveSuffix,
- ),
maybeAddFkSuffix(
w.deprecatedFkIndexes,
deprecatedTpccOrderLineSchemaFkSuffix,