Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

sql: fix index visibility parsing for small values #109697

Merged
merged 1 commit into from
Aug 30, 2023
Merged

sql: fix index visibility parsing for small values #109697

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 5 additions & 4 deletions pkg/internal/sqlsmith/alter.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -364,11 +364,12 @@ func makeCreateIndex(s *Smither) (tree.Statement, bool) {
storing = append(storing, col.Name)
}

visibility := 1.0
invisibility := tree.IndexInvisibility{Value: 0.0}
if notvisible := s.d6() == 1; notvisible {
visibility = 0.0
invisibility.Value = 1.0
if s.coin() {
visibility = s.rnd.Float64() // [0.0, 1.0)
invisibility.Value = s.rnd.Float64() // [0.0, 1.0)
invisibility.FloatProvided = true
}
}

Expand All @@ -380,7 +381,7 @@ func makeCreateIndex(s *Smither) (tree.Statement, bool) {
Storing: storing,
Inverted: inverted,
Concurrently: s.coin(),
Invisibility: 1 - visibility,
Invisibility: invisibility,
}, true
}

Expand Down
16 changes: 8 additions & 8 deletions pkg/sql/alter_index_visible.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -82,19 +82,19 @@ func (p *planner) AlterIndexVisible(
func (n *alterIndexVisibleNode) ReadingOwnWrites() {}

func (n *alterIndexVisibleNode) startExec(params runParams) error {
if n.n.Invisibility != 0.0 && n.index.Primary() {
if n.n.Invisibility.Value != 0.0 && n.index.Primary() {
return pgerror.Newf(pgcode.FeatureNotSupported, "primary index cannot be invisible")
}

activeVersion := params.ExecCfg().Settings.Version.ActiveVersion(params.ctx)
if !activeVersion.IsActive(clusterversion.V23_2_PartiallyVisibleIndexes) &&
n.n.Invisibility > 0.0 && n.n.Invisibility < 1.0 {
n.n.Invisibility.Value > 0.0 && n.n.Invisibility.Value < 1.0 {
return unimplemented.New("partially visible indexes", "partially visible indexes are not yet supported")
}

// Warn if this invisible index may still be used to enforce constraint check
// behind the scene.
if n.n.Invisibility != 0.0 {
if n.n.Invisibility.Value != 0.0 {
if notVisibleIndexNotice := tabledesc.ValidateNotVisibleIndex(n.index, n.tableDesc); notVisibleIndexNotice != nil {
params.p.BufferClientNotice(
params.ctx,
Expand All @@ -103,13 +103,13 @@ func (n *alterIndexVisibleNode) startExec(params runParams) error {
}
}

if n.index.GetInvisibility() == n.n.Invisibility {
if n.index.GetInvisibility() == n.n.Invisibility.Value {
// Nothing needed if the index is already what they want.
return nil
}

n.index.IndexDesc().NotVisible = n.n.Invisibility != 0.0
n.index.IndexDesc().Invisibility = n.n.Invisibility
n.index.IndexDesc().NotVisible = n.n.Invisibility.Value != 0.0
n.index.IndexDesc().Invisibility = n.n.Invisibility.Value

if err := validateDescriptor(params.ctx, params.p, n.tableDesc); err != nil {
return err
Expand All @@ -126,8 +126,8 @@ func (n *alterIndexVisibleNode) startExec(params runParams) error {
&eventpb.AlterIndexVisible{
TableName: n.n.Index.Table.FQString(),
IndexName: n.index.GetName(),
NotVisible: n.n.Invisibility != 0.0,
Invisibility: n.n.Invisibility,
NotVisible: n.n.Invisibility.Value != 0.0,
Invisibility: n.n.Invisibility.Value,
})
}
func (n *alterIndexVisibleNode) Next(runParams) (bool, error) { return false, nil }
Expand Down
6 changes: 3 additions & 3 deletions pkg/sql/alter_table.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -299,14 +299,14 @@ func (n *alterTableNode) startExec(params runParams) error {

activeVersion := params.ExecCfg().Settings.Version.ActiveVersion(params.ctx)
if !activeVersion.IsActive(clusterversion.V23_2_PartiallyVisibleIndexes) &&
d.Invisibility > 0.0 && d.Invisibility < 1.0 {
d.Invisibility.Value > 0.0 && d.Invisibility.Value < 1.0 {
return unimplemented.New("partially visible indexes", "partially visible indexes are not yet supported")
}
idx := descpb.IndexDescriptor{
Name: string(d.Name),
Unique: true,
NotVisible: d.Invisibility != 0.0,
Invisibility: d.Invisibility,
NotVisible: d.Invisibility.Value != 0.0,
Invisibility: d.Invisibility.Value,
StoreColumnNames: d.Storing.ToStrings(),
CreatedAtNanos: params.EvalContext().GetTxnTimestamp(time.Microsecond).UnixNano(),
}
Expand Down
6 changes: 3 additions & 3 deletions pkg/sql/create_index.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -200,7 +200,7 @@ func makeIndexDescriptor(
}

if !activeVersion.IsActive(clusterversion.V23_2_PartiallyVisibleIndexes) &&
n.Invisibility > 0.0 && n.Invisibility < 1.0 {
n.Invisibility.Value > 0.0 && n.Invisibility.Value < 1.0 {
return nil, unimplemented.New("partially visible indexes", "partially visible indexes are not yet supported")
}
indexDesc := descpb.IndexDescriptor{
Expand All @@ -209,8 +209,8 @@ func makeIndexDescriptor(
StoreColumnNames: n.Storing.ToStrings(),
CreatedExplicitly: true,
CreatedAtNanos: params.EvalContext().GetTxnTimestamp(time.Microsecond).UnixNano(),
NotVisible: n.Invisibility != 0.0,
Invisibility: n.Invisibility,
NotVisible: n.Invisibility.Value != 0.0,
Invisibility: n.Invisibility.Value,
}

if n.Inverted {
Expand Down
16 changes: 8 additions & 8 deletions pkg/sql/create_table.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -708,7 +708,7 @@ func addUniqueWithoutIndexTableDef(
"partitioned unique constraints without an index are not supported",
)
}
if d.Invisibility != 0.0 {
if d.Invisibility.Value != 0.0 {
// Theoretically, this should never happen because this is not supported by
// the parser. This is just a safe check.
return pgerror.Newf(pgcode.FeatureNotSupported,
Expand Down Expand Up @@ -1829,15 +1829,15 @@ func NewTableDesc(
return nil, err
}
if !version.IsActive(clusterversion.V23_2_PartiallyVisibleIndexes) &&
d.Invisibility > 0.0 && d.Invisibility < 1.0 {
d.Invisibility.Value > 0.0 && d.Invisibility.Value < 1.0 {
return nil, unimplemented.New("partially visible indexes", "partially visible indexes are not yet supported")
}
idx := descpb.IndexDescriptor{
Name: string(d.Name),
StoreColumnNames: d.Storing.ToStrings(),
Version: indexEncodingVersion,
NotVisible: d.Invisibility != 0.0,
Invisibility: d.Invisibility,
NotVisible: d.Invisibility.Value != 0.0,
Invisibility: d.Invisibility.Value,
}
if d.Inverted {
idx.Type = descpb.IndexDescriptor_INVERTED
Expand Down Expand Up @@ -1948,16 +1948,16 @@ func NewTableDesc(
return nil, err
}
if !version.IsActive(clusterversion.V23_2_PartiallyVisibleIndexes) &&
d.Invisibility > 0.0 && d.Invisibility < 1.0 {
d.Invisibility.Value > 0.0 && d.Invisibility.Value < 1.0 {
return nil, unimplemented.New("partially visible indexes", "partially visible indexes are not yet supported")
}
idx := descpb.IndexDescriptor{
Name: string(d.Name),
Unique: true,
StoreColumnNames: d.Storing.ToStrings(),
Version: indexEncodingVersion,
NotVisible: d.Invisibility != 0.0,
Invisibility: d.Invisibility,
NotVisible: d.Invisibility.Value != 0.0,
Invisibility: d.Invisibility.Value,
}
columns := d.Columns
if d.Sharded != nil {
Expand Down Expand Up @@ -2660,7 +2660,7 @@ func replaceLikeTableOpts(n *tree.CreateTable, params runParams) (tree.TableDefs
Inverted: idx.GetType() == descpb.IndexDescriptor_INVERTED,
Storing: make(tree.NameList, 0, idx.NumSecondaryStoredColumns()),
Columns: make(tree.IndexElemList, 0, idx.NumKeyColumns()),
Invisibility: idx.GetInvisibility(),
Invisibility: tree.IndexInvisibility{Value: idx.GetInvisibility()},
}
numColumns := idx.NumKeyColumns()
if idx.IsSharded() {
Expand Down
2 changes: 1 addition & 1 deletion pkg/sql/opt/testutils/testcat/create_table.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -863,7 +863,7 @@ func (tt *Table) addIndexWithVersion(
IdxZone: cat.EmptyZone(),
table: tt,
version: version,
Invisibility: def.Invisibility,
Invisibility: def.Invisibility.Value,
}

// Look for name suffixes indicating this is a mutation index.
Expand Down
Loading