mirror of
https://git.postgresql.org/git/postgresql.git
synced 2024-09-28 21:01:48 +02:00
Update query_id computation
Properly fix: - the "ONLY" in FROM [ONLY] isn't hashed - the agglevelsup field in GROUPING isn't hashed - WITH TIES not being hashed (new in PG 13) - "DISTINCT" in "GROUP BY [DISTINCT]" isn't hashed (new in PG 14) Reported-by: Julien Rouhaud Discussion: https://postgr.es/m/20210425081119.ulyzxqz23ueh3wuj@nol
This commit is contained in:
Bruce Momjian
parent
5df6aeab42
commit
f7a97b6ec3
@ -916,4 +916,155 @@ SELECT query, toplevel, plans, calls FROM pg_stat_statements WHERE query LIKE '%
|
||||
$$ LANGUAGE plpgsql | | |
|
||||
(3 rows)
|
||||
|
||||
-- FROM [ONLY]
|
||||
CREATE TABLE tbl_inh(id integer);
|
||||
CREATE TABLE tbl_inh_1() INHERITS (tbl_inh);
|
||||
INSERT INTO tbl_inh_1 SELECT 1;
|
||||
SELECT * FROM tbl_inh;
|
||||
id
|
||||
----
|
||||
1
|
||||
(1 row)
|
||||
|
||||
SELECT * FROM ONLY tbl_inh;
|
||||
id
|
||||
----
|
||||
(0 rows)
|
||||
|
||||
SELECT COUNT(*) FROM pg_stat_statements WHERE query LIKE '%FROM%tbl_inh%';
|
||||
count
|
||||
-------
|
||||
2
|
||||
(1 row)
|
||||
|
||||
-- WITH TIES
|
||||
CREATE TABLE limitoption AS SELECT 0 AS val FROM generate_series(1, 10);
|
||||
SELECT *
|
||||
FROM limitoption
|
||||
WHERE val < 2
|
||||
ORDER BY val
|
||||
FETCH FIRST 2 ROWS WITH TIES;
|
||||
val
|
||||
-----
|
||||
0
|
||||
0
|
||||
0
|
||||
0
|
||||
0
|
||||
0
|
||||
0
|
||||
0
|
||||
0
|
||||
0
|
||||
(10 rows)
|
||||
|
||||
SELECT *
|
||||
FROM limitoption
|
||||
WHERE val < 2
|
||||
ORDER BY val
|
||||
FETCH FIRST 2 ROW ONLY;
|
||||
val
|
||||
-----
|
||||
0
|
||||
0
|
||||
(2 rows)
|
||||
|
||||
SELECT COUNT(*) FROM pg_stat_statements WHERE query LIKE '%FETCH FIRST%';
|
||||
count
|
||||
-------
|
||||
2
|
||||
(1 row)
|
||||
|
||||
-- GROUP BY [DISTINCT]
|
||||
SELECT a, b, c
|
||||
FROM (VALUES (1, 2, 3), (4, NULL, 6), (7, 8, 9)) AS t (a, b, c)
|
||||
GROUP BY ROLLUP(a, b), rollup(a, c)
|
||||
ORDER BY a, b, c;
|
||||
a | b | c
|
||||
---+---+---
|
||||
1 | 2 | 3
|
||||
1 | 2 |
|
||||
1 | 2 |
|
||||
1 | | 3
|
||||
1 | | 3
|
||||
1 | |
|
||||
1 | |
|
||||
1 | |
|
||||
4 | | 6
|
||||
4 | | 6
|
||||
4 | | 6
|
||||
4 | |
|
||||
4 | |
|
||||
4 | |
|
||||
4 | |
|
||||
4 | |
|
||||
7 | 8 | 9
|
||||
7 | 8 |
|
||||
7 | 8 |
|
||||
7 | | 9
|
||||
7 | | 9
|
||||
7 | |
|
||||
7 | |
|
||||
7 | |
|
||||
| |
|
||||
(25 rows)
|
||||
|
||||
SELECT a, b, c
|
||||
FROM (VALUES (1, 2, 3), (4, NULL, 6), (7, 8, 9)) AS t (a, b, c)
|
||||
GROUP BY DISTINCT ROLLUP(a, b), rollup(a, c)
|
||||
ORDER BY a, b, c;
|
||||
a | b | c
|
||||
---+---+---
|
||||
1 | 2 | 3
|
||||
1 | 2 |
|
||||
1 | | 3
|
||||
1 | |
|
||||
4 | | 6
|
||||
4 | | 6
|
||||
4 | |
|
||||
4 | |
|
||||
7 | 8 | 9
|
||||
7 | 8 |
|
||||
7 | | 9
|
||||
7 | |
|
||||
| |
|
||||
(13 rows)
|
||||
|
||||
SELECT COUNT(*) FROM pg_stat_statements WHERE query LIKE '%GROUP BY%ROLLUP%';
|
||||
count
|
||||
-------
|
||||
2
|
||||
(1 row)
|
||||
|
||||
-- GROUPING SET agglevelsup
|
||||
SELECT (
|
||||
SELECT (
|
||||
SELECT GROUPING(a,b) FROM (VALUES (1)) v2(c)
|
||||
) FROM (VALUES (1,2)) v1(a,b) GROUP BY (a,b)
|
||||
) FROM (VALUES(6,7)) v3(e,f) GROUP BY ROLLUP(e,f);
|
||||
grouping
|
||||
----------
|
||||
0
|
||||
0
|
||||
0
|
||||
(3 rows)
|
||||
|
||||
SELECT (
|
||||
SELECT (
|
||||
SELECT GROUPING(e,f) FROM (VALUES (1)) v2(c)
|
||||
) FROM (VALUES (1,2)) v1(a,b) GROUP BY (a,b)
|
||||
) FROM (VALUES(6,7)) v3(e,f) GROUP BY ROLLUP(e,f);
|
||||
grouping
|
||||
----------
|
||||
3
|
||||
0
|
||||
1
|
||||
(3 rows)
|
||||
|
||||
SELECT COUNT(*) FROM pg_stat_statements WHERE query LIKE '%SELECT GROUPING%';
|
||||
count
|
||||
-------
|
||||
2
|
||||
(1 row)
|
||||
|
||||
DROP EXTENSION pg_stat_statements;
|
||||
|
||||
@ -385,4 +385,56 @@ END;
|
||||
$$ LANGUAGE plpgsql;
|
||||
SELECT query, toplevel, plans, calls FROM pg_stat_statements WHERE query LIKE '%DELETE%' ORDER BY query COLLATE "C", toplevel;
|
||||
|
||||
-- FROM [ONLY]
|
||||
CREATE TABLE tbl_inh(id integer);
|
||||
CREATE TABLE tbl_inh_1() INHERITS (tbl_inh);
|
||||
INSERT INTO tbl_inh_1 SELECT 1;
|
||||
|
||||
SELECT * FROM tbl_inh;
|
||||
SELECT * FROM ONLY tbl_inh;
|
||||
|
||||
SELECT COUNT(*) FROM pg_stat_statements WHERE query LIKE '%FROM%tbl_inh%';
|
||||
|
||||
-- WITH TIES
|
||||
CREATE TABLE limitoption AS SELECT 0 AS val FROM generate_series(1, 10);
|
||||
SELECT *
|
||||
FROM limitoption
|
||||
WHERE val < 2
|
||||
ORDER BY val
|
||||
FETCH FIRST 2 ROWS WITH TIES;
|
||||
|
||||
SELECT *
|
||||
FROM limitoption
|
||||
WHERE val < 2
|
||||
ORDER BY val
|
||||
FETCH FIRST 2 ROW ONLY;
|
||||
|
||||
SELECT COUNT(*) FROM pg_stat_statements WHERE query LIKE '%FETCH FIRST%';
|
||||
|
||||
-- GROUP BY [DISTINCT]
|
||||
SELECT a, b, c
|
||||
FROM (VALUES (1, 2, 3), (4, NULL, 6), (7, 8, 9)) AS t (a, b, c)
|
||||
GROUP BY ROLLUP(a, b), rollup(a, c)
|
||||
ORDER BY a, b, c;
|
||||
SELECT a, b, c
|
||||
FROM (VALUES (1, 2, 3), (4, NULL, 6), (7, 8, 9)) AS t (a, b, c)
|
||||
GROUP BY DISTINCT ROLLUP(a, b), rollup(a, c)
|
||||
ORDER BY a, b, c;
|
||||
|
||||
SELECT COUNT(*) FROM pg_stat_statements WHERE query LIKE '%GROUP BY%ROLLUP%';
|
||||
|
||||
-- GROUPING SET agglevelsup
|
||||
SELECT (
|
||||
SELECT (
|
||||
SELECT GROUPING(a,b) FROM (VALUES (1)) v2(c)
|
||||
) FROM (VALUES (1,2)) v1(a,b) GROUP BY (a,b)
|
||||
) FROM (VALUES(6,7)) v3(e,f) GROUP BY ROLLUP(e,f);
|
||||
SELECT (
|
||||
SELECT (
|
||||
SELECT GROUPING(e,f) FROM (VALUES (1)) v2(c)
|
||||
) FROM (VALUES (1,2)) v1(a,b) GROUP BY (a,b)
|
||||
) FROM (VALUES(6,7)) v3(e,f) GROUP BY ROLLUP(e,f);
|
||||
|
||||
SELECT COUNT(*) FROM pg_stat_statements WHERE query LIKE '%SELECT GROUPING%';
|
||||
|
||||
DROP EXTENSION pg_stat_statements;
|
||||
|
||||
@ -230,6 +230,7 @@ JumbleQueryInternal(JumbleState *jstate, Query *query)
|
||||
JumbleExpr(jstate, (Node *) query->onConflict);
|
||||
JumbleExpr(jstate, (Node *) query->returningList);
|
||||
JumbleExpr(jstate, (Node *) query->groupClause);
|
||||
APP_JUMB(query->groupDistinct);
|
||||
JumbleExpr(jstate, (Node *) query->groupingSets);
|
||||
JumbleExpr(jstate, query->havingQual);
|
||||
JumbleExpr(jstate, (Node *) query->windowClause);
|
||||
@ -237,6 +238,7 @@ JumbleQueryInternal(JumbleState *jstate, Query *query)
|
||||
JumbleExpr(jstate, (Node *) query->sortClause);
|
||||
JumbleExpr(jstate, query->limitOffset);
|
||||
JumbleExpr(jstate, query->limitCount);
|
||||
APP_JUMB(query->limitOption);
|
||||
JumbleRowMarks(jstate, query->rowMarks);
|
||||
JumbleExpr(jstate, query->setOperations);
|
||||
}
|
||||
@ -259,6 +261,7 @@ JumbleRangeTable(JumbleState *jstate, List *rtable)
|
||||
case RTE_RELATION:
|
||||
APP_JUMB(rte->relid);
|
||||
JumbleExpr(jstate, (Node *) rte->tablesample);
|
||||
APP_JUMB(rte->inh);
|
||||
break;
|
||||
case RTE_SUBQUERY:
|
||||
JumbleQueryInternal(jstate, rte->subquery);
|
||||
@ -399,6 +402,7 @@ JumbleExpr(JumbleState *jstate, Node *node)
|
||||
GroupingFunc *grpnode = (GroupingFunc *) node;
|
||||
|
||||
JumbleExpr(jstate, (Node *) grpnode->refs);
|
||||
APP_JUMB(grpnode->agglevelsup);
|
||||
}
|
||||
break;
|
||||
case T_WindowFunc:
|
||||
|
||||
Loading…
Reference in New Issue
Block a user