From 06b853ab1afa359b3dfc35dcba130f08e955a620 Mon Sep 17 00:00:00 2001 From: Justin Pryzby Date: Sat, 13 Feb 2021 20:48:51 -0600 Subject: [PATCH v24 02/10] psql: Add HIDE_COMPRESSAM for regress testing This avoids churn in regression output, and allows testing with alternate compression AMs. --- doc/src/sgml/ref/psql-ref.sgml | 11 +++++++++++ src/bin/psql/describe.c | 1 + src/bin/psql/help.c | 2 ++ src/bin/psql/settings.h | 1 + src/bin/psql/startup.c | 9 +++++++++ src/test/regress/pg_regress_main.c | 4 ++-- 6 files changed, 26 insertions(+), 2 deletions(-) diff --git a/doc/src/sgml/ref/psql-ref.sgml b/doc/src/sgml/ref/psql-ref.sgml index 13c1edfa4d..66dcb1b33b 100644 --- a/doc/src/sgml/ref/psql-ref.sgml +++ b/doc/src/sgml/ref/psql-ref.sgml @@ -3863,6 +3863,17 @@ bar + + HIDE_COMPRESSAM + + + If this variable is set to true, column's + compression access method details are not displayed. This is mainly + useful for regression tests. + + + + HIDE_TABLEAM diff --git a/src/bin/psql/describe.c b/src/bin/psql/describe.c index ba464d463e..b835b0cf76 100644 --- a/src/bin/psql/describe.c +++ b/src/bin/psql/describe.c @@ -1897,6 +1897,7 @@ describeOneTableDetails(const char *schemaname, /* compresssion info */ if (pset.sversion >= 140000 && + !pset.hide_compressam && (tableinfo.relkind == RELKIND_RELATION || tableinfo.relkind == RELKIND_PARTITIONED_TABLE || tableinfo.relkind == RELKIND_MATVIEW)) diff --git a/src/bin/psql/help.c b/src/bin/psql/help.c index e44120bf76..a818ee5503 100644 --- a/src/bin/psql/help.c +++ b/src/bin/psql/help.c @@ -375,6 +375,8 @@ helpVariables(unsigned short int pager) " true if last query failed, else false\n")); fprintf(output, _(" FETCH_COUNT\n" " the number of result rows to fetch and display at a time (0 = unlimited)\n")); + fprintf(output, _(" HIDE_COMPRESSAM\n" + " if set, compression access methods are not displayed\n")); fprintf(output, _(" HIDE_TABLEAM\n" " if set, table access methods are not displayed\n")); fprintf(output, _(" HISTCONTROL\n" diff --git a/src/bin/psql/settings.h b/src/bin/psql/settings.h index d65990059d..9755e8eac6 100644 --- a/src/bin/psql/settings.h +++ b/src/bin/psql/settings.h @@ -134,6 +134,7 @@ typedef struct _psqlSettings bool quiet; bool singleline; bool singlestep; + bool hide_compressam; bool hide_tableam; int fetch_count; int histsize; diff --git a/src/bin/psql/startup.c b/src/bin/psql/startup.c index 780479c8d7..554b64367d 100644 --- a/src/bin/psql/startup.c +++ b/src/bin/psql/startup.c @@ -1159,6 +1159,12 @@ show_context_hook(const char *newval) return true; } +static bool +hide_compressam_hook(const char *newval) +{ + return ParseVariableBool(newval, "HIDE_COMPRESSAM", &pset.hide_compressam); +} + static bool hide_tableam_hook(const char *newval) { @@ -1227,6 +1233,9 @@ EstablishVariableSpace(void) SetVariableHooks(pset.vars, "SHOW_CONTEXT", show_context_substitute_hook, show_context_hook); + SetVariableHooks(pset.vars, "HIDE_COMPRESSAM", + bool_substitute_hook, + hide_compressam_hook); SetVariableHooks(pset.vars, "HIDE_TABLEAM", bool_substitute_hook, hide_tableam_hook); diff --git a/src/test/regress/pg_regress_main.c b/src/test/regress/pg_regress_main.c index 8dc4941c24..07fd3f6a4d 100644 --- a/src/test/regress/pg_regress_main.c +++ b/src/test/regress/pg_regress_main.c @@ -78,11 +78,11 @@ psql_start_test(const char *testname, * against different AMs without unnecessary differences. */ offset += snprintf(psql_cmd + offset, sizeof(psql_cmd) - offset, - "\"%s%spsql\" -X -a -q -d \"%s\" -v %s < \"%s\" > \"%s\" 2>&1", + "\"%s%spsql\" -X -a -q -d \"%s\" %s < \"%s\" > \"%s\" 2>&1", bindir ? bindir : "", bindir ? "/" : "", dblist->str, - "HIDE_TABLEAM=\"on\"", + "-v HIDE_TABLEAM=on -v HIDE_COMPRESSAM=on", infile, outfile); if (offset >= sizeof(psql_cmd)) -- 2.17.0