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

release-22.2: sql: Define more columns in pg_catalog.pg_statistic_ext #94009

Merged
merged 1 commit into from
Dec 21, 2022
Merged

release-22.2: sql: Define more columns in pg_catalog.pg_statistic_ext #94009

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
15 changes: 13 additions & 2 deletions pkg/sql/logictest/testdata/logic_test/pg_catalog
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4343,7 +4343,14 @@ statement ok
CREATE TABLE stxtbl(a INT, b INT, c INT);
CREATE STATISTICS stxobj ON b, c FROM stxtbl;

query TTOOTTT colnames
statement ok
CREATE SCHEMA test;
CREATE TABLE test.stxtbl2(a INT, b INT, c INT);
CREATE STATISTICS stxobj2 ON a, c FROM test.stxtbl2;
CREATE TABLE stx(stx) AS SELECT generate_series(1,100);
ANALYZE stx;

query TTOOITT colnames
SELECT
relname,
stxname,
Expand All @@ -4356,7 +4363,10 @@ FROM pg_statistic_ext
JOIN pg_class ON pg_statistic_ext.stxrelid = pg_class.oid
----
relname stxname stxnamespace stxowner stxstattarget stxkeys stxkind
stxtbl stxobj NULL NULL NULL {2,3} NULL
stxtbl stxobj 105 NULL -1 {2,3} {d}
stxtbl2 stxobj2 189 NULL -1 {1,3} {d}
stx NULL 105 NULL -1 {2} {d}
stx NULL 105 NULL -1 {1} {d}

# Test that pg_shadow doesn't include roles that can't login
query B colnames
Expand Down Expand Up @@ -4736,3 +4746,4 @@ WHERE
AND t.typname LIKE 'myt%';
----
0

34 changes: 24 additions & 10 deletions pkg/sql/pg_catalog.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,7 @@ import (
"github.com/cockroachdb/cockroach/pkg/sql/catalog/catpb"
"github.com/cockroachdb/cockroach/pkg/sql/catalog/catprivilege"
"github.com/cockroachdb/cockroach/pkg/sql/catalog/descpb"
"github.com/cockroachdb/cockroach/pkg/sql/catalog/descs"
"github.com/cockroachdb/cockroach/pkg/sql/catalog/schemaexpr"
"github.com/cockroachdb/cockroach/pkg/sql/catalog/tabledesc"
"github.com/cockroachdb/cockroach/pkg/sql/catalog/typedesc"
Expand Down Expand Up @@ -3425,35 +3426,48 @@ var pgCatalogStatisticExtTable = virtualSchemaTable{
comment: `pg_statistic_ext has the statistics objects created with CREATE STATISTICS
https://www.postgresql.org/docs/13/catalog-pg-statistic-ext.html`,
schema: vtable.PgCatalogStatisticExt,
populate: func(ctx context.Context, p *planner, _ catalog.DatabaseDescriptor, addRow func(...tree.Datum) error) error {
query := `SELECT "statisticID", name, "tableID", "columnIDs" FROM system.table_statistics;`
populate: func(ctx context.Context, p *planner, db catalog.DatabaseDescriptor, addRow func(...tree.Datum) error) error {

// '{d}' refers to Postgres code for n-distinct statistics or multi-column
// statistics.
query := `SELECT "tableID", name, "columnIDs", "statisticID", '{d}'::"char"[] FROM system.table_statistics;`

rows, err := p.ExtendedEvalContext().ExecCfg.InternalExecutor.QueryBuffered(
ctx, "read-statistics-objects", p.txn, query,
)
if err != nil {
return err
}
h := makeOidHasher()
statTgt := tree.NewDInt(-1)

for _, row := range rows {
statisticsID := tree.MustBeDInt(row[0])
name := tree.MustBeDString(row[1])
tableID := tree.MustBeDInt(row[2])
columnIDs := tree.MustBeDArray(row[3])
tableID := tree.MustBeDInt(row[0])
columnIDs := tree.MustBeDArray(row[2])
statisticsID := tree.MustBeDInt(row[3])
statisticsKind := tree.MustBeDArray(row[4])

// The statisticsID is generated from unique_rowid() so it won't fit in a
// uint32.
h.writeUInt64(uint64(statisticsID))
statisticsOID := h.getOid()

tn, err := descs.GetTableNameByID(ctx, p.Txn(), p.descCollection, descpb.ID(tableID))
if err != nil {
return err
}

schemaOid := h.NamespaceOid(db, tn.SchemaName.String())

if err := addRow(
statisticsOID, // oid
tableOid(descpb.ID(tableID)), // stxrelid
&name, // stxname
tree.DNull, // stxnamespace
row[1], // stxname
schemaOid, // stxnamespace
tree.DNull, // stxowner
tree.DNull, // stxstattarget
statTgt, // stxstattarget
columnIDs, // stxkeys
tree.DNull, // stxkind
statisticsKind, // stxkind
); err != nil {
return err
}
Expand Down