Merge v1.10 of pg_stat_statements into v1.9
v1.9 is already new in this version of PostgreSQL, so turn it into just one change. Author: Julien Rohaud Discussion: https://postgr.es/m/20210408120505.7zinijtdexbyghvb@nol
This commit is contained in:
parent
34399a670a
commit
5844c23dc5
|
@ -6,8 +6,7 @@ OBJS = \
|
||||||
pg_stat_statements.o
|
pg_stat_statements.o
|
||||||
|
|
||||||
EXTENSION = pg_stat_statements
|
EXTENSION = pg_stat_statements
|
||||||
DATA = pg_stat_statements--1.4.sql \
|
DATA = pg_stat_statements--1.4.sql pg_stat_statements--1.8--1.9.sql \
|
||||||
pg_stat_statements--1.9--1.10.sql pg_stat_statements--1.8--1.9.sql \
|
|
||||||
pg_stat_statements--1.7--1.8.sql pg_stat_statements--1.6--1.7.sql \
|
pg_stat_statements--1.7--1.8.sql pg_stat_statements--1.6--1.7.sql \
|
||||||
pg_stat_statements--1.5--1.6.sql pg_stat_statements--1.4--1.5.sql \
|
pg_stat_statements--1.5--1.6.sql pg_stat_statements--1.4--1.5.sql \
|
||||||
pg_stat_statements--1.3--1.4.sql pg_stat_statements--1.2--1.3.sql \
|
pg_stat_statements--1.3--1.4.sql pg_stat_statements--1.2--1.3.sql \
|
||||||
|
|
|
@ -16,3 +16,56 @@ CREATE VIEW pg_stat_statements_info AS
|
||||||
SELECT * FROM pg_stat_statements_info();
|
SELECT * FROM pg_stat_statements_info();
|
||||||
|
|
||||||
GRANT SELECT ON pg_stat_statements_info TO PUBLIC;
|
GRANT SELECT ON pg_stat_statements_info TO PUBLIC;
|
||||||
|
|
||||||
|
/* First we have to remove them from the extension */
|
||||||
|
ALTER EXTENSION pg_stat_statements DROP VIEW pg_stat_statements;
|
||||||
|
ALTER EXTENSION pg_stat_statements DROP FUNCTION pg_stat_statements(boolean);
|
||||||
|
|
||||||
|
/* Then we can drop them */
|
||||||
|
DROP VIEW pg_stat_statements;
|
||||||
|
DROP FUNCTION pg_stat_statements(boolean);
|
||||||
|
|
||||||
|
/* Now redefine */
|
||||||
|
CREATE FUNCTION pg_stat_statements(IN showtext boolean,
|
||||||
|
OUT userid oid,
|
||||||
|
OUT dbid oid,
|
||||||
|
OUT toplevel bool,
|
||||||
|
OUT queryid bigint,
|
||||||
|
OUT query text,
|
||||||
|
OUT plans int8,
|
||||||
|
OUT total_plan_time float8,
|
||||||
|
OUT min_plan_time float8,
|
||||||
|
OUT max_plan_time float8,
|
||||||
|
OUT mean_plan_time float8,
|
||||||
|
OUT stddev_plan_time float8,
|
||||||
|
OUT calls int8,
|
||||||
|
OUT total_exec_time float8,
|
||||||
|
OUT min_exec_time float8,
|
||||||
|
OUT max_exec_time float8,
|
||||||
|
OUT mean_exec_time float8,
|
||||||
|
OUT stddev_exec_time float8,
|
||||||
|
OUT rows int8,
|
||||||
|
OUT shared_blks_hit int8,
|
||||||
|
OUT shared_blks_read int8,
|
||||||
|
OUT shared_blks_dirtied int8,
|
||||||
|
OUT shared_blks_written int8,
|
||||||
|
OUT local_blks_hit int8,
|
||||||
|
OUT local_blks_read int8,
|
||||||
|
OUT local_blks_dirtied int8,
|
||||||
|
OUT local_blks_written int8,
|
||||||
|
OUT temp_blks_read int8,
|
||||||
|
OUT temp_blks_written int8,
|
||||||
|
OUT blk_read_time float8,
|
||||||
|
OUT blk_write_time float8,
|
||||||
|
OUT wal_records int8,
|
||||||
|
OUT wal_fpi int8,
|
||||||
|
OUT wal_bytes numeric
|
||||||
|
)
|
||||||
|
RETURNS SETOF record
|
||||||
|
AS 'MODULE_PATHNAME', 'pg_stat_statements_1_9'
|
||||||
|
LANGUAGE C STRICT VOLATILE PARALLEL SAFE;
|
||||||
|
|
||||||
|
CREATE VIEW pg_stat_statements AS
|
||||||
|
SELECT * FROM pg_stat_statements(true);
|
||||||
|
|
||||||
|
GRANT SELECT ON pg_stat_statements TO PUBLIC;
|
||||||
|
|
|
@ -1,57 +0,0 @@
|
||||||
/* contrib/pg_stat_statements/pg_stat_statements--1.9--1.10.sql */
|
|
||||||
|
|
||||||
-- complain if script is sourced in psql, rather than via ALTER EXTENSION
|
|
||||||
\echo Use "ALTER EXTENSION pg_stat_statements UPDATE TO '1.10'" to load this file. \quit
|
|
||||||
|
|
||||||
/* First we have to remove them from the extension */
|
|
||||||
ALTER EXTENSION pg_stat_statements DROP VIEW pg_stat_statements;
|
|
||||||
ALTER EXTENSION pg_stat_statements DROP FUNCTION pg_stat_statements(boolean);
|
|
||||||
|
|
||||||
/* Then we can drop them */
|
|
||||||
DROP VIEW pg_stat_statements;
|
|
||||||
DROP FUNCTION pg_stat_statements(boolean);
|
|
||||||
|
|
||||||
/* Now redefine */
|
|
||||||
CREATE FUNCTION pg_stat_statements(IN showtext boolean,
|
|
||||||
OUT userid oid,
|
|
||||||
OUT dbid oid,
|
|
||||||
OUT toplevel bool,
|
|
||||||
OUT queryid bigint,
|
|
||||||
OUT query text,
|
|
||||||
OUT plans int8,
|
|
||||||
OUT total_plan_time float8,
|
|
||||||
OUT min_plan_time float8,
|
|
||||||
OUT max_plan_time float8,
|
|
||||||
OUT mean_plan_time float8,
|
|
||||||
OUT stddev_plan_time float8,
|
|
||||||
OUT calls int8,
|
|
||||||
OUT total_exec_time float8,
|
|
||||||
OUT min_exec_time float8,
|
|
||||||
OUT max_exec_time float8,
|
|
||||||
OUT mean_exec_time float8,
|
|
||||||
OUT stddev_exec_time float8,
|
|
||||||
OUT rows int8,
|
|
||||||
OUT shared_blks_hit int8,
|
|
||||||
OUT shared_blks_read int8,
|
|
||||||
OUT shared_blks_dirtied int8,
|
|
||||||
OUT shared_blks_written int8,
|
|
||||||
OUT local_blks_hit int8,
|
|
||||||
OUT local_blks_read int8,
|
|
||||||
OUT local_blks_dirtied int8,
|
|
||||||
OUT local_blks_written int8,
|
|
||||||
OUT temp_blks_read int8,
|
|
||||||
OUT temp_blks_written int8,
|
|
||||||
OUT blk_read_time float8,
|
|
||||||
OUT blk_write_time float8,
|
|
||||||
OUT wal_records int8,
|
|
||||||
OUT wal_fpi int8,
|
|
||||||
OUT wal_bytes numeric
|
|
||||||
)
|
|
||||||
RETURNS SETOF record
|
|
||||||
AS 'MODULE_PATHNAME', 'pg_stat_statements_1_10'
|
|
||||||
LANGUAGE C STRICT VOLATILE PARALLEL SAFE;
|
|
||||||
|
|
||||||
CREATE VIEW pg_stat_statements AS
|
|
||||||
SELECT * FROM pg_stat_statements(true);
|
|
||||||
|
|
||||||
GRANT SELECT ON pg_stat_statements TO PUBLIC;
|
|
|
@ -120,7 +120,7 @@ typedef enum pgssVersion
|
||||||
PGSS_V1_2,
|
PGSS_V1_2,
|
||||||
PGSS_V1_3,
|
PGSS_V1_3,
|
||||||
PGSS_V1_8,
|
PGSS_V1_8,
|
||||||
PGSS_V1_10
|
PGSS_V1_9
|
||||||
} pgssVersion;
|
} pgssVersion;
|
||||||
|
|
||||||
typedef enum pgssStoreKind
|
typedef enum pgssStoreKind
|
||||||
|
@ -299,7 +299,7 @@ PG_FUNCTION_INFO_V1(pg_stat_statements_reset_1_7);
|
||||||
PG_FUNCTION_INFO_V1(pg_stat_statements_1_2);
|
PG_FUNCTION_INFO_V1(pg_stat_statements_1_2);
|
||||||
PG_FUNCTION_INFO_V1(pg_stat_statements_1_3);
|
PG_FUNCTION_INFO_V1(pg_stat_statements_1_3);
|
||||||
PG_FUNCTION_INFO_V1(pg_stat_statements_1_8);
|
PG_FUNCTION_INFO_V1(pg_stat_statements_1_8);
|
||||||
PG_FUNCTION_INFO_V1(pg_stat_statements_1_10);
|
PG_FUNCTION_INFO_V1(pg_stat_statements_1_9);
|
||||||
PG_FUNCTION_INFO_V1(pg_stat_statements);
|
PG_FUNCTION_INFO_V1(pg_stat_statements);
|
||||||
PG_FUNCTION_INFO_V1(pg_stat_statements_info);
|
PG_FUNCTION_INFO_V1(pg_stat_statements_info);
|
||||||
|
|
||||||
|
@ -1414,7 +1414,7 @@ pg_stat_statements_reset(PG_FUNCTION_ARGS)
|
||||||
#define PG_STAT_STATEMENTS_COLS_V1_2 19
|
#define PG_STAT_STATEMENTS_COLS_V1_2 19
|
||||||
#define PG_STAT_STATEMENTS_COLS_V1_3 23
|
#define PG_STAT_STATEMENTS_COLS_V1_3 23
|
||||||
#define PG_STAT_STATEMENTS_COLS_V1_8 32
|
#define PG_STAT_STATEMENTS_COLS_V1_8 32
|
||||||
#define PG_STAT_STATEMENTS_COLS_V1_10 33
|
#define PG_STAT_STATEMENTS_COLS_V1_9 33
|
||||||
#define PG_STAT_STATEMENTS_COLS 33 /* maximum of above */
|
#define PG_STAT_STATEMENTS_COLS 33 /* maximum of above */
|
||||||
|
|
||||||
/*
|
/*
|
||||||
|
@ -1428,11 +1428,11 @@ pg_stat_statements_reset(PG_FUNCTION_ARGS)
|
||||||
* function. Unfortunately we weren't bright enough to do that for 1.1.
|
* function. Unfortunately we weren't bright enough to do that for 1.1.
|
||||||
*/
|
*/
|
||||||
Datum
|
Datum
|
||||||
pg_stat_statements_1_10(PG_FUNCTION_ARGS)
|
pg_stat_statements_1_9(PG_FUNCTION_ARGS)
|
||||||
{
|
{
|
||||||
bool showtext = PG_GETARG_BOOL(0);
|
bool showtext = PG_GETARG_BOOL(0);
|
||||||
|
|
||||||
pg_stat_statements_internal(fcinfo, PGSS_V1_10, showtext);
|
pg_stat_statements_internal(fcinfo, PGSS_V1_9, showtext);
|
||||||
|
|
||||||
return (Datum) 0;
|
return (Datum) 0;
|
||||||
}
|
}
|
||||||
|
@ -1556,8 +1556,8 @@ pg_stat_statements_internal(FunctionCallInfo fcinfo,
|
||||||
if (api_version != PGSS_V1_8)
|
if (api_version != PGSS_V1_8)
|
||||||
elog(ERROR, "incorrect number of output arguments");
|
elog(ERROR, "incorrect number of output arguments");
|
||||||
break;
|
break;
|
||||||
case PG_STAT_STATEMENTS_COLS_V1_10:
|
case PG_STAT_STATEMENTS_COLS_V1_9:
|
||||||
if (api_version != PGSS_V1_10)
|
if (api_version != PGSS_V1_9)
|
||||||
elog(ERROR, "incorrect number of output arguments");
|
elog(ERROR, "incorrect number of output arguments");
|
||||||
break;
|
break;
|
||||||
default:
|
default:
|
||||||
|
@ -1651,7 +1651,7 @@ pg_stat_statements_internal(FunctionCallInfo fcinfo,
|
||||||
|
|
||||||
values[i++] = ObjectIdGetDatum(entry->key.userid);
|
values[i++] = ObjectIdGetDatum(entry->key.userid);
|
||||||
values[i++] = ObjectIdGetDatum(entry->key.dbid);
|
values[i++] = ObjectIdGetDatum(entry->key.dbid);
|
||||||
if (api_version >= PGSS_V1_10)
|
if (api_version >= PGSS_V1_9)
|
||||||
values[i++] = BoolGetDatum(entry->key.toplevel);
|
values[i++] = BoolGetDatum(entry->key.toplevel);
|
||||||
|
|
||||||
if (is_allowed_role || entry->key.userid == userid)
|
if (is_allowed_role || entry->key.userid == userid)
|
||||||
|
@ -1790,7 +1790,7 @@ pg_stat_statements_internal(FunctionCallInfo fcinfo,
|
||||||
api_version == PGSS_V1_2 ? PG_STAT_STATEMENTS_COLS_V1_2 :
|
api_version == PGSS_V1_2 ? PG_STAT_STATEMENTS_COLS_V1_2 :
|
||||||
api_version == PGSS_V1_3 ? PG_STAT_STATEMENTS_COLS_V1_3 :
|
api_version == PGSS_V1_3 ? PG_STAT_STATEMENTS_COLS_V1_3 :
|
||||||
api_version == PGSS_V1_8 ? PG_STAT_STATEMENTS_COLS_V1_8 :
|
api_version == PGSS_V1_8 ? PG_STAT_STATEMENTS_COLS_V1_8 :
|
||||||
api_version == PGSS_V1_10 ? PG_STAT_STATEMENTS_COLS_V1_10 :
|
api_version == PGSS_V1_9 ? PG_STAT_STATEMENTS_COLS_V1_9 :
|
||||||
-1 /* fail if you forget to update this assert */ ));
|
-1 /* fail if you forget to update this assert */ ));
|
||||||
|
|
||||||
tuplestore_putvalues(tupstore, tupdesc, values, nulls);
|
tuplestore_putvalues(tupstore, tupdesc, values, nulls);
|
||||||
|
|
|
@ -1,5 +1,5 @@
|
||||||
# pg_stat_statements extension
|
# pg_stat_statements extension
|
||||||
comment = 'track planning and execution statistics of all SQL statements executed'
|
comment = 'track planning and execution statistics of all SQL statements executed'
|
||||||
default_version = '1.10'
|
default_version = '1.9'
|
||||||
module_pathname = '$libdir/pg_stat_statements'
|
module_pathname = '$libdir/pg_stat_statements'
|
||||||
relocatable = true
|
relocatable = true
|
||||||
|
|
Loading…
Reference in New Issue