mirror of
https://github.com/postgres/postgres.git
synced 2025-06-30 21:42:05 +03:00
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
This commit is contained in:
@ -4379,11 +4379,6 @@ WriteControlFile(void)
|
||||
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;
|
||||
|
||||
@ -4579,22 +4574,6 @@ ReadControlFile(void)
|
||||
ControlFile->loblksize, (int) LOBLKSIZE),
|
||||
errhint("It looks like you need to recompile or initdb.")));
|
||||
|
||||
#ifdef HAVE_INT64_TIMESTAMP
|
||||
if (ControlFile->enableIntTimes != true)
|
||||
ereport(FATAL,
|
||||
(errmsg("database files are incompatible with server"),
|
||||
errdetail("The database cluster was initialized without HAVE_INT64_TIMESTAMP"
|
||||
" but the server was compiled with HAVE_INT64_TIMESTAMP."),
|
||||
errhint("It looks like you need to recompile or initdb.")));
|
||||
#else
|
||||
if (ControlFile->enableIntTimes != false)
|
||||
ereport(FATAL,
|
||||
(errmsg("database files are incompatible with server"),
|
||||
errdetail("The database cluster was initialized with HAVE_INT64_TIMESTAMP"
|
||||
" but the server was compiled without HAVE_INT64_TIMESTAMP."),
|
||||
errhint("It looks like you need to recompile or initdb.")));
|
||||
#endif
|
||||
|
||||
#ifdef USE_FLOAT4_BYVAL
|
||||
if (ControlFile->float4ByVal != true)
|
||||
ereport(FATAL,
|
||||
|
Reference in New Issue
Block a user