From ce0c5b99650859bb13f204ea56221ca854a601e1 Mon Sep 17 00:00:00 2001 From: Justin Pryzby Date: Sat, 3 Apr 2021 19:06:37 -0500 Subject: [PATCH 1/4] track_activity_query_size is STATS_COLLECTOR category Not Resource Usage / Memory, as since 995fb7420 --- contrib/postgres_fdw/postgres_fdw.c | 1 + src/backend/utils/misc/guc.c | 2 +- src/include/pg_config_manual.h | 4 ++-- 3 files changed, 4 insertions(+), 3 deletions(-) diff --git a/contrib/postgres_fdw/postgres_fdw.c b/contrib/postgres_fdw/postgres_fdw.c index 16c2979f2d..aff6e8c085 100644 --- a/contrib/postgres_fdw/postgres_fdw.c +++ b/contrib/postgres_fdw/postgres_fdw.c @@ -6797,6 +6797,7 @@ fetch_more_data_begin(AsyncRequest *areq) char sql[64]; Assert(!fsstate->conn_state->pendingAreq); + Assert(fsstate->conn); /* Create the cursor synchronously. */ if (!fsstate->cursor_exists) diff --git a/src/backend/utils/misc/guc.c b/src/backend/utils/misc/guc.c index 584daffc8a..c315dd4bc1 100644 --- a/src/backend/utils/misc/guc.c +++ b/src/backend/utils/misc/guc.c @@ -3435,7 +3435,7 @@ static struct config_int ConfigureNamesInt[] = }, { - {"track_activity_query_size", PGC_POSTMASTER, RESOURCES_MEM, + {"track_activity_query_size", PGC_POSTMASTER, STATS_COLLECTOR, gettext_noop("Sets the size reserved for pg_stat_activity.query, in bytes."), NULL, GUC_UNIT_BYTE diff --git a/src/include/pg_config_manual.h b/src/include/pg_config_manual.h index e28c990382..fdb4fc1de2 100644 --- a/src/include/pg_config_manual.h +++ b/src/include/pg_config_manual.h @@ -288,7 +288,7 @@ * You should normally use MEMORY_CONTEXT_CHECKING with USE_VALGRIND; * instrumentation of repalloc() is inferior without it. */ -/* #define USE_VALGRIND */ +#define USE_VALGRIND /* * Define this to cause pfree()'d memory to be cleared immediately, to @@ -313,7 +313,7 @@ * facilitate catching code that depends on the contents of uninitialized * memory. Caution: this is horrendously expensive. */ -/* #define RANDOMIZE_ALLOCATED_MEMORY */ +#define RANDOMIZE_ALLOCATED_MEMORY /* * For cache invalidation debugging, define CLOBBER_CACHE_ENABLED to enable -- 2.17.0