pgsql: adjust query id feature to use pg_stat_activity.query_id

adjust query id feature to use pg_stat_activity.query_id

Previously, it was pg_stat_activity.queryid to match the
pg_stat_statements queryid column. This is an adjustment to patch
4f0b0966c8. This also adjusts some of the internal function calls to
match. Catversion bumped.

Reported-by: Álvaro Herrera, Julien Rouhaud

Discussion: https://postgr.es/m/20210408032704.GA7498@alvherre.pgsql

Branch
------
master

Details
-------
https://git.postgresql.org/pg/commitdiff/9660834dd8bf5b093f7b49eef846666201d45a35

Modified Files
--------------
doc/src/sgml/monitoring.sgml | 2 +-
src/backend/catalog/system_views.sql | 2 +-
src/backend/executor/execMain.c | 8 ++++----
src/backend/executor/execParallel.c | 2 +-
src/backend/parser/analyze.c | 4 ++--
src/backend/tcop/postgres.c | 4 ++--
src/backend/utils/activity/backend_status.c | 22 +++++++++++-----------
src/backend/utils/adt/pgstatfuncs.c | 4 ++--
src/backend/utils/error/elog.c | 6 +++---
src/backend/utils/misc/queryjumble.c | 6 +++---
src/include/catalog/catversion.h | 2 +-
src/include/catalog/pg_proc.dat | 2 +-
src/include/utils/backend_status.h | 6 +++---
src/test/regress/expected/rules.out | 10 +++++-----
14 files changed, 40 insertions(+), 40 deletions(-)