aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorMasahiko Sawada <msawada@postgresql.org>2025-02-21 10:14:36 -0800
committerMasahiko Sawada <msawada@postgresql.org>2025-02-21 10:14:36 -0800
commit30666d1857d7a785331f5805c20ec19430500466 (patch)
tree9184307e09b0728531b1922a476c16917c43a765 /src
parent44fe30fdab6746a287163e7cc093fd36cda8eb92 (diff)
downloadpostgresql-30666d1857d7a785331f5805c20ec19430500466.tar.gz
postgresql-30666d1857d7a785331f5805c20ec19430500466.zip
pg_resetwal: Add --char-signedness option to change the default char signedness.
With the newly added option --char-signedness, pg_resetwal updates the default char signedness flag in the controlfile. This option is primarily intended for an upcoming patch that pg_upgrade supports preserving the default char signedness during upgrades, and is not meant for manual operation. Reviewed-by: Noah Misch <noah@leadboat.com> Discussion: https://postgr.es/m/CB11ADBC-0C3F-4FE0-A678-666EE80CBB07%40amazon.com
Diffstat (limited to 'src')
-rw-r--r--src/bin/pg_resetwal/pg_resetwal.c25
-rw-r--r--src/bin/pg_resetwal/t/001_basic.pl6
2 files changed, 31 insertions, 0 deletions
diff --git a/src/bin/pg_resetwal/pg_resetwal.c b/src/bin/pg_resetwal/pg_resetwal.c
index ed73607a46f..31bc0abff16 100644
--- a/src/bin/pg_resetwal/pg_resetwal.c
+++ b/src/bin/pg_resetwal/pg_resetwal.c
@@ -75,6 +75,7 @@ static TimeLineID minXlogTli = 0;
static XLogSegNo minXlogSegNo = 0;
static int WalSegSz;
static int set_wal_segsize;
+static int set_char_signedness = -1;
static void CheckDataVersion(void);
static bool read_controlfile(void);
@@ -106,6 +107,7 @@ main(int argc, char *argv[])
{"oldest-transaction-id", required_argument, NULL, 'u'},
{"next-transaction-id", required_argument, NULL, 'x'},
{"wal-segsize", required_argument, NULL, 1},
+ {"char-signedness", required_argument, NULL, 2},
{NULL, 0, NULL, 0}
};
@@ -302,6 +304,23 @@ main(int argc, char *argv[])
break;
}
+ case 2:
+ {
+ errno = 0;
+
+ if (pg_strcasecmp(optarg, "signed") == 0)
+ set_char_signedness = 1;
+ else if (pg_strcasecmp(optarg, "unsigned") == 0)
+ set_char_signedness = 0;
+ else
+ {
+ pg_log_error("invalid argument for option %s", "--char-signedness");
+ pg_log_error_hint("Try \"%s --help\" for more information.", progname);
+ exit(1);
+ }
+ break;
+ }
+
default:
/* getopt_long already emitted a complaint */
pg_log_error_hint("Try \"%s --help\" for more information.", progname);
@@ -456,6 +475,9 @@ main(int argc, char *argv[])
if (set_wal_segsize != 0)
ControlFile.xlog_seg_size = WalSegSz;
+ if (set_char_signedness != -1)
+ ControlFile.default_char_signedness = (set_char_signedness == 1);
+
if (minXlogSegNo > newXlogSegNo)
newXlogSegNo = minXlogSegNo;
@@ -779,6 +801,8 @@ PrintControlValues(bool guessed)
(ControlFile.float8ByVal ? _("by value") : _("by reference")));
printf(_("Data page checksum version: %u\n"),
ControlFile.data_checksum_version);
+ printf(_("Default char data signedness: %s\n"),
+ (ControlFile.default_char_signedness ? _("signed") : _("unsigned")));
}
@@ -1188,6 +1212,7 @@ usage(void)
printf(_(" -O, --multixact-offset=OFFSET set next multitransaction offset\n"));
printf(_(" -u, --oldest-transaction-id=XID set oldest transaction ID\n"));
printf(_(" -x, --next-transaction-id=XID set next transaction ID\n"));
+ printf(_(" --char-signedness=OPTION set char signedness to \"signed\" or \"unsigned\"\n"));
printf(_(" --wal-segsize=SIZE size of WAL segments, in megabytes\n"));
printf(_("\nReport bugs to <%s>.\n"), PACKAGE_BUGREPORT);
diff --git a/src/bin/pg_resetwal/t/001_basic.pl b/src/bin/pg_resetwal/t/001_basic.pl
index 323cd483cf3..d6bbbd0ceda 100644
--- a/src/bin/pg_resetwal/t/001_basic.pl
+++ b/src/bin/pg_resetwal/t/001_basic.pl
@@ -173,6 +173,12 @@ command_fails_like(
qr/must be greater than/,
'fails with -x value too small');
+# --char-signedness
+command_fails_like(
+ [ 'pg_resetwal', '--char-signedness', 'foo', $node->data_dir ],
+ qr/error: invalid argument for option --char-signedness/,
+ 'fails with incorrect --char-signedness option');
+
# run with control override options
my $out = (run_command([ 'pg_resetwal', '--dry-run', $node->data_dir ]))[0];