Skip to content

Commit f1aa336

Browse files
committedJul 1, 2021
Merge branch 'master' into stable
2 parents 18174da + afd5b2d commit f1aa336

File tree

2 files changed

+3854
-4
lines changed

2 files changed

+3854
-4
lines changed
 

‎expected/pg_variables_trans_0.out

Lines changed: 3840 additions & 0 deletions
Large diffs are not rendered by default.

‎pg_variables.c

Lines changed: 14 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1489,7 +1489,9 @@ getMemoryTotalSpace(MemoryContext context, int level, Size *totalspace)
14891489

14901490
/* Examine the context itself */
14911491
memset(&totals, 0, sizeof(totals));
1492-
#if PG_VERSION_NUM >= 110000
1492+
#if PG_VERSION_NUM >= 140000
1493+
(*context->methods->stats) (context, NULL, NULL, &totals, true);
1494+
#elif PG_VERSION_NUM >= 110000
14931495
(*context->methods->stats) (context, NULL, NULL, &totals);
14941496
#else
14951497
(*context->methods->stats) (context, level, false, &totals);
@@ -1641,7 +1643,11 @@ ensurePackagesHashExists(void)
16411643

16421644
packagesHash = hash_create("Packages hash",
16431645
NUMPACKAGES, &ctl,
1644-
HASH_ELEM | HASH_CONTEXT);
1646+
HASH_ELEM |
1647+
# if PG_VERSION_NUM >= 140000
1648+
HASH_STRINGS |
1649+
# endif
1650+
HASH_CONTEXT);
16451651
}
16461652

16471653
/*
@@ -1668,7 +1674,11 @@ makePackHTAB(Package *package, bool is_trans)
16681674
ctl.hcxt = *context;
16691675

16701676
*htab = hash_create(hash_name, NUMVARIABLES, &ctl,
1671-
HASH_ELEM | HASH_CONTEXT);
1677+
HASH_ELEM |
1678+
# if PG_VERSION_NUM >= 140000
1679+
HASH_STRINGS |
1680+
# endif
1681+
HASH_CONTEXT);
16721682
}
16731683

16741684
static void
@@ -2494,7 +2504,7 @@ compatibility_check(void)
24942504
if (!pg_compatibility_check_no_error())
24952505
freeStatsLists();
24962506

2497-
PG_COMPATIBILITY_CHECK("pg_variables");
2507+
PG_COMPATIBILITY_CHECK(pg_variables);
24982508
}
24992509
# endif /* PG_COMPATIBILITY_CHECK */
25002510
# endif /* PG_VERSION_NUM */

0 commit comments

Comments
 (0)
Please sign in to comment.