Skip to content

Commit 41812a9

Browse files
committed
sql/parser: fix bug parsing WITH READ VIRTUAL CLUSTER with other opts
Release note (bug fix): Fix a bug that would cause WITH READ VIRTUAL CLUSTER to be ignored if any other options were passed when running CREATE VIRTUAL CLUSTER FROM REPLICATION. Epic: none.
1 parent 6be7477 commit 41812a9

File tree

2 files changed

+7
-7
lines changed

2 files changed

+7
-7
lines changed

pkg/sql/parser/testdata/create_virtual_cluster

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -95,12 +95,12 @@ CREATE VIRTUAL CLUSTER "destination-hyphen" FROM REPLICATION OF "source-hyphen"
9595
CREATE VIRTUAL CLUSTER _ FROM REPLICATION OF _ ON 'pgurl' WITH RETENTION = '36h' -- identifiers removed
9696

9797
parse
98-
CREATE VIRTUAL CLUSTER "destination-hyphen" FROM REPLICATION OF "source-hyphen" ON 'pgurl' WITH READ VIRTUAL CLUSTER
98+
CREATE VIRTUAL CLUSTER "destination-hyphen" FROM REPLICATION OF "source-hyphen" ON 'pgurl' WITH RETENTION = '1h', READ VIRTUAL CLUSTER
9999
----
100-
CREATE VIRTUAL CLUSTER "destination-hyphen" FROM REPLICATION OF "source-hyphen" ON 'pgurl' WITH READ VIRTUAL CLUSTER
101-
CREATE VIRTUAL CLUSTER ("destination-hyphen") FROM REPLICATION OF ("source-hyphen") ON ('pgurl') WITH READ VIRTUAL CLUSTER -- fully parenthesized
102-
CREATE VIRTUAL CLUSTER "destination-hyphen" FROM REPLICATION OF "source-hyphen" ON '_' WITH READ VIRTUAL CLUSTER -- literals removed
103-
CREATE VIRTUAL CLUSTER _ FROM REPLICATION OF _ ON 'pgurl' WITH READ VIRTUAL CLUSTER -- identifiers removed
100+
CREATE VIRTUAL CLUSTER "destination-hyphen" FROM REPLICATION OF "source-hyphen" ON 'pgurl' WITH RETENTION = '1h', READ VIRTUAL CLUSTER
101+
CREATE VIRTUAL CLUSTER ("destination-hyphen") FROM REPLICATION OF ("source-hyphen") ON ('pgurl') WITH RETENTION = ('1h'), READ VIRTUAL CLUSTER -- fully parenthesized
102+
CREATE VIRTUAL CLUSTER "destination-hyphen" FROM REPLICATION OF "source-hyphen" ON '_' WITH RETENTION = '_', READ VIRTUAL CLUSTER -- literals removed
103+
CREATE VIRTUAL CLUSTER _ FROM REPLICATION OF _ ON 'pgurl' WITH RETENTION = '1h', READ VIRTUAL CLUSTER -- identifiers removed
104104

105105
parse
106106
CREATE VIRTUAL CLUSTER "destination-hyphen" FROM REPLICATION OF "source-hyphen" ON 'pgurl' WITH OPTIONS (READ VIRTUAL CLUSTER)

pkg/sql/sem/tree/create.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2369,9 +2369,9 @@ func (o *TenantReplicationOptions) CombineWith(other *TenantReplicationOptions)
23692369
if o.EnableReaderTenant != nil {
23702370
if other.EnableReaderTenant != nil {
23712371
return errors.New("READ VIRTUAL CLUSTER option specified multiple times")
2372-
} else {
2373-
o.EnableReaderTenant = other.EnableReaderTenant
23742372
}
2373+
} else {
2374+
o.EnableReaderTenant = other.EnableReaderTenant
23752375
}
23762376

23772377
return nil

0 commit comments

Comments
 (0)