diff options
| author | Tom Lane | 2017-02-23 17:23:12 +0000 |
|---|---|---|
| committer | Tom Lane | 2017-02-23 17:23:12 +0000 |
| commit | d28aafb6dda326688e2f042c95c93ea57963c03c (patch) | |
| tree | 530fb08d5f3250b541996e0aa21930fa4684d07a /src/bin | |
| parent | b6aa17e0ae367afdcea07118e016111af4fa6bc3 (diff) | |
Remove pg_control's enableIntTimes field.
We don't need it any more.
pg_controldata continues to report that date/time type storage is
"64-bit integers", but that's now a hard-wired behavior not something
it sees in the data. This avoids breaking pg_upgrade, and perhaps other
utilities that inspect pg_control this way. Ditto for pg_resetwal.
I chose to remove the "bigint_timestamps" output column of
pg_control_init(), though, as that function hasn't been around long
and probably doesn't have ossified users.
Discussion: https://postgr.es/m/26788.1487455319@sss.pgh.pa.us
Diffstat (limited to 'src/bin')
| -rw-r--r-- | src/bin/pg_controldata/pg_controldata.c | 3 | ||||
| -rw-r--r-- | src/bin/pg_resetwal/pg_resetwal.c | 8 |
2 files changed, 4 insertions, 7 deletions
diff --git a/src/bin/pg_controldata/pg_controldata.c b/src/bin/pg_controldata/pg_controldata.c index 20077a66397..f47171d29d9 100644 --- a/src/bin/pg_controldata/pg_controldata.c +++ b/src/bin/pg_controldata/pg_controldata.c @@ -293,8 +293,9 @@ main(int argc, char *argv[]) ControlFile->toast_max_chunk_size); printf(_("Size of a large-object chunk: %u\n"), ControlFile->loblksize); + /* This is no longer configurable, but users may still expect to see it: */ printf(_("Date/time type storage: %s\n"), - (ControlFile->enableIntTimes ? _("64-bit integers") : _("floating-point numbers"))); + _("64-bit integers")); printf(_("Float4 argument passing: %s\n"), (ControlFile->float4ByVal ? _("by value") : _("by reference"))); printf(_("Float8 argument passing: %s\n"), diff --git a/src/bin/pg_resetwal/pg_resetwal.c b/src/bin/pg_resetwal/pg_resetwal.c index 96b7097f8b7..502ea5b2900 100644 --- a/src/bin/pg_resetwal/pg_resetwal.c +++ b/src/bin/pg_resetwal/pg_resetwal.c @@ -598,11 +598,6 @@ GuessControlValues(void) ControlFile.indexMaxKeys = INDEX_MAX_KEYS; ControlFile.toast_max_chunk_size = TOAST_MAX_CHUNK_SIZE; ControlFile.loblksize = LOBLKSIZE; -#ifdef HAVE_INT64_TIMESTAMP - ControlFile.enableIntTimes = true; -#else - ControlFile.enableIntTimes = false; -#endif ControlFile.float4ByVal = FLOAT4PASSBYVAL; ControlFile.float8ByVal = FLOAT8PASSBYVAL; @@ -688,8 +683,9 @@ PrintControlValues(bool guessed) ControlFile.toast_max_chunk_size); printf(_("Size of a large-object chunk: %u\n"), ControlFile.loblksize); + /* This is no longer configurable, but users may still expect to see it: */ printf(_("Date/time type storage: %s\n"), - (ControlFile.enableIntTimes ? _("64-bit integers") : _("floating-point numbers"))); + _("64-bit integers")); printf(_("Float4 argument passing: %s\n"), (ControlFile.float4ByVal ? _("by value") : _("by reference"))); printf(_("Float8 argument passing: %s\n"), |