Location via proxy:   [ UP ]  
[Report a bug]   [Manage cookies]                
Skip to content

Commit b6aa17e

Browse files
tglsfdctglsfdc
committed
De-support floating-point timestamps.
Per discussion, the time has come to do this. The handwriting has been on the wall at least since 9.0 that this would happen someday, whenever it got to be too much of a burden to support the float-timestamp option. The triggering factor now is the discovery that there are multiple bugs in the code that attempts to implement use of integer timestamps in the replication protocol even when the server is built for float timestamps. The internal float timestamps leak into the protocol fields in places. While we could fix the identified bugs, there's a very high risk of introducing more. Trying to build a wall that would positively prevent mixing integer and float timestamps is more complexity than we want to undertake to maintain a long-deprecated option. The fact that these bugs weren't found through testing also indicates a lack of interest in float timestamps. This commit disables configure's --disable-integer-datetimes switch (it'll still accept --enable-integer-datetimes, though), removes direct references to USE_INTEGER_DATETIMES, and removes discussion of float timestamps from the user documentation. A considerable amount of code is rendered dead by this, but removing that will occur as separate mop-up. Discussion: https://postgr.es/m/26788.1487455319@sss.pgh.pa.us
1 parent c3368f9 commit b6aa17e

15 files changed

+36
-124
lines changed

‎configure

Lines changed: 6 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1473,7 +1473,7 @@ Optional Features:
14731473
--disable-FEATURE do not include FEATURE (same as --enable-FEATURE=no)
14741474
--enable-FEATURE[=ARG] include FEATURE [ARG=yes]
14751475
--disable-integer-datetimes
1476-
disable 64-bit integer date/time support
1476+
obsolete option, no longer supported
14771477
--enable-nls[=LANGUAGES]
14781478
enable Native Language Support
14791479
--disable-rpath do not embed shared library search path in
@@ -2984,23 +2984,21 @@ fi
29842984

29852985

29862986
#
2987-
# 64-bit integer date/time storage: enabled by default.
2987+
# 64-bit integer date/time storage is now the only option, but to avoid
2988+
# unnecessary breakage of build scripts, continue to accept an explicit
2989+
# "--enable-integer-datetimes" switch.
29882990
#
2989-
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to build with 64-bit integer date/time support" >&5
2990-
$as_echo_n "checking whether to build with 64-bit integer date/time support... " >&6; }
29912991

29922992

29932993
# Check whether --enable-integer-datetimes was given.
29942994
if test "${enable_integer_datetimes+set}" = set; then :
29952995
enableval=$enable_integer_datetimes;
29962996
case $enableval in
29972997
yes)
2998-
2999-
$as_echo "#define USE_INTEGER_DATETIMES 1" >>confdefs.h
3000-
2998+
:
30012999
;;
30023000
no)
3003-
:
3001+
as_fn_error $? "--disable-integer-datetimes is no longer supported" "$LINENO" 5
30043002
;;
30053003
*)
30063004
as_fn_error $? "no argument expected for --enable-integer-datetimes option" "$LINENO" 5
@@ -3010,13 +3008,9 @@ $as_echo "#define USE_INTEGER_DATETIMES 1" >>confdefs.h
30103008
else
30113009
enable_integer_datetimes=yes
30123010

3013-
$as_echo "#define USE_INTEGER_DATETIMES 1" >>confdefs.h
3014-
30153011
fi
30163012

30173013

3018-
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $enable_integer_datetimes" >&5
3019-
$as_echo "$enable_integer_datetimes" >&6; }
30203014

30213015

30223016
#

‎configure.in

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -122,13 +122,13 @@ PGAC_ARG_REQ(with, libs, [DIRS], [alternative spelling of --with-libraries]
122122

123123

124124
#
125-
# 64-bit integer date/time storage: enabled by default.
125+
# 64-bit integer date/time storage is now the only option, but to avoid
126+
# unnecessary breakage of build scripts, continue to accept an explicit
127+
# "--enable-integer-datetimes" switch.
126128
#
127-
AC_MSG_CHECKING([whether to build with 64-bit integer date/time support])
128-
PGAC_ARG_BOOL(enable, integer-datetimes, yes, [disable 64-bit integer date/time support],
129-
[AC_DEFINE([USE_INTEGER_DATETIMES], 1,
130-
[Define to 1 if you want 64-bit integer timestamp and interval support. (--enable-integer-datetimes)])])
131-
AC_MSG_RESULT([$enable_integer_datetimes])
129+
PGAC_ARG_BOOL(enable, integer-datetimes, yes, [obsolete option, no longer supported],
130+
[],
131+
[AC_MSG_ERROR([--disable-integer-datetimes is no longer supported])])
132132

133133

134134
#

‎doc/src/sgml/config.sgml

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -7695,11 +7695,9 @@ dynamic_library_path = 'C:\tools\postgresql;H:\my_project\lib;$libdir'
76957695
</term>
76967696
<listitem>
76977697
<para>
7698-
Reports whether <productname>PostgreSQL</> was built with
7699-
support for 64-bit-integer dates and times. This can be
7700-
disabled by configuring with <literal>--disable-integer-datetimes</>
7701-
when building <productname>PostgreSQL</>. The default value is
7702-
<literal>on</literal>.
7698+
Reports whether <productname>PostgreSQL</> was built with support for
7699+
64-bit-integer dates and times. As of <productname>PostgreSQL</> 10,
7700+
this is always <literal>on</literal>.
77037701
</para>
77047702
</listitem>
77057703
</varlistentry>

‎doc/src/sgml/datatype.sgml

Lines changed: 11 additions & 44 deletions
Original file line numberDiff line numberDiff line change
@@ -1580,15 +1580,15 @@ SELECT E'\\xDEADBEEF';
15801580
<entry>both date and time (no time zone)</entry>
15811581
<entry>4713 BC</entry>
15821582
<entry>294276 AD</entry>
1583-
<entry>1 microsecond / 14 digits</entry>
1583+
<entry>1 microsecond</entry>
15841584
</row>
15851585
<row>
15861586
<entry><type>timestamp [ (<replaceable>p</replaceable>) ] with time zone</type></entry>
15871587
<entry>8 bytes</entry>
15881588
<entry>both date and time, with time zone</entry>
15891589
<entry>4713 BC</entry>
15901590
<entry>294276 AD</entry>
1591-
<entry>1 microsecond / 14 digits</entry>
1591+
<entry>1 microsecond</entry>
15921592
</row>
15931593
<row>
15941594
<entry><type>date</type></entry>
@@ -1604,23 +1604,23 @@ SELECT E'\\xDEADBEEF';
16041604
<entry>time of day (no date)</entry>
16051605
<entry>00:00:00</entry>
16061606
<entry>24:00:00</entry>
1607-
<entry>1 microsecond / 14 digits</entry>
1607+
<entry>1 microsecond</entry>
16081608
</row>
16091609
<row>
16101610
<entry><type>time [ (<replaceable>p</replaceable>) ] with time zone</type></entry>
16111611
<entry>12 bytes</entry>
1612-
<entry>times of day only, with time zone</entry>
1612+
<entry>time of day (no date), with time zone</entry>
16131613
<entry>00:00:00+1459</entry>
16141614
<entry>24:00:00-1459</entry>
1615-
<entry>1 microsecond / 14 digits</entry>
1615+
<entry>1 microsecond</entry>
16161616
</row>
16171617
<row>
16181618
<entry><type>interval [ <replaceable>fields</replaceable> ] [ (<replaceable>p</replaceable>) ]</type></entry>
16191619
<entry>16 bytes</entry>
16201620
<entry>time interval</entry>
16211621
<entry>-178000000 years</entry>
16221622
<entry>178000000 years</entry>
1623-
<entry>1 microsecond / 14 digits</entry>
1623+
<entry>1 microsecond</entry>
16241624
</row>
16251625
</tbody>
16261626
</tgroup>
@@ -1643,41 +1643,7 @@ SELECT E'\\xDEADBEEF';
16431643
<replaceable>p</replaceable> which specifies the number of
16441644
fractional digits retained in the seconds field. By default, there
16451645
is no explicit bound on precision. The allowed range of
1646-
<replaceable>p</replaceable> is from 0 to 6 for the
1647-
<type>timestamp</type> and <type>interval</type> types.
1648-
</para>
1649-
1650-
<note>
1651-
<para>
1652-
When <type>timestamp</> values are stored as eight-byte integers
1653-
(currently the default), microsecond precision is available over
1654-
the full range of values. In this case, the internal representation
1655-
is the number of microseconds before or after midnight 2000-01-01.
1656-
When <type>timestamp</> values are stored as double precision
1657-
floating-point numbers (a deprecated compile-time option), the
1658-
internal representation is the number of seconds before or after
1659-
midnight 2000-01-01. With this representation, the effective limit
1660-
of precision might be less than 6; in practice,
1661-
microsecond precision is achieved for dates within a few
1662-
years of 2000-01-01, but the precision degrades for dates further
1663-
away. Note that using floating-point datetimes allows a larger
1664-
range of <type>timestamp</type> values to be represented than
1665-
shown above: from 4713 BC up to 5874897 AD.
1666-
</para>
1667-
1668-
<para>
1669-
The same compile-time option also determines whether
1670-
<type>time</type> and <type>interval</type> values are stored as
1671-
floating-point numbers or eight-byte integers. In the
1672-
floating-point case, large <type>interval</type> values degrade in
1673-
precision as the size of the interval increases.
1674-
</para>
1675-
</note>
1676-
1677-
<para>
1678-
For the <type>time</type> types, the allowed range of
1679-
<replaceable>p</replaceable> is from 0 to 6 when eight-byte integer
1680-
storage is used, or from 0 to 10 when floating-point storage is used.
1646+
<replaceable>p</replaceable> is from 0 to 6.
16811647
</para>
16821648

16831649
<para>
@@ -1760,9 +1726,10 @@ MINUTE TO SECOND
17601726
specification giving the number of
17611727
fractional digits in the seconds field. Precision can be
17621728
specified for <type>time</type>, <type>timestamp</type>, and
1763-
<type>interval</type> types. The allowed values are mentioned
1764-
above. If no precision is specified in a constant specification,
1765-
it defaults to the precision of the literal value.
1729+
<type>interval</type> types, and can range from 0 to 6.
1730+
If no precision is specified in a constant specification,
1731+
it defaults to the precision of the literal value (but not
1732+
more than 6 digits).
17661733
</para>
17671734

17681735
<sect3>

‎doc/src/sgml/installation.sgml

Lines changed: 0 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -955,28 +955,6 @@ su - postgres
955955
</listitem>
956956
</varlistentry>
957957

958-
<varlistentry>
959-
<term><option>--disable-integer-datetimes</option></term>
960-
<listitem>
961-
<para>
962-
Disable support for 64-bit integer storage for timestamps and
963-
intervals, and store datetime values as floating-point
964-
numbers instead. Floating-point datetime storage was the
965-
default in <productname>PostgreSQL</productname> releases
966-
prior to 8.4, but it is now deprecated, because it does not
967-
support microsecond precision for the full range of
968-
<type>timestamp</type> values. However, integer-based
969-
datetime storage requires a 64-bit integer type. Therefore,
970-
this option can be used when no such type is available, or
971-
for compatibility with applications written for prior
972-
versions of <productname>PostgreSQL</productname>. See
973-
<![%standalone-include[the documentation about datetime datatypes]]>
974-
<![%standalone-ignore[<xref linkend="datatype-datetime">]]>
975-
for more information.
976-
</para>
977-
</listitem>
978-
</varlistentry>
979-
980958
<varlistentry>
981959
<term><option>--disable-float4-byval</option></term>
982960
<listitem>

‎src/include/c.h

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -340,10 +340,11 @@ typedef unsigned PG_INT128_TYPE uint128;
340340
#define PG_INT64_MAX INT64CONST(0x7FFFFFFFFFFFFFFF)
341341
#define PG_UINT64_MAX UINT64CONST(0xFFFFFFFFFFFFFFFF)
342342

343-
/* Select timestamp representation (float8 or int64) */
344-
#ifdef USE_INTEGER_DATETIMES
343+
/*
344+
* We now always use int64 timestamps, but keep this symbol defined for the
345+
* benefit of external code that might test it.
346+
*/
345347
#define HAVE_INT64_TIMESTAMP
346-
#endif
347348

348349
/*
349350
* Size

‎src/include/pg_config.h.in

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -831,10 +831,6 @@
831831
(--enable-float8-byval) */
832832
#undef USE_FLOAT8_BYVAL
833833

834-
/* Define to 1 if you want 64-bit integer timestamp and interval support.
835-
(--enable-integer-datetimes) */
836-
#undef USE_INTEGER_DATETIMES
837-
838834
/* Define to 1 to build with LDAP support. (--with-ldap) */
839835
#undef USE_LDAP
840836

‎src/include/pg_config.h.win32

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -625,10 +625,6 @@
625625
/* Define to use /dev/urandom for random number generation */
626626
/* #undef USE_DEV_URANDOM */
627627

628-
/* Define to 1 if you want 64-bit integer timestamp and interval support.
629-
(--enable-integer-datetimes) */
630-
/* #undef USE_INTEGER_DATETIMES */
631-
632628
/* Define to 1 to build with LDAP support. (--with-ldap) */
633629
/* #undef USE_LDAP */
634630

‎src/interfaces/ecpg/include/ecpg_config.h.in

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -10,10 +10,6 @@
1010
/* Define to 1 if `long long int' works and is 64 bits. */
1111
#undef HAVE_LONG_LONG_INT_64
1212

13-
/* Define to 1 if you want 64-bit integer timestamp and interval support.
14-
(--enable-integer-datetimes) */
15-
#undef USE_INTEGER_DATETIMES
16-
1713
/* Define to 1 to build client libraries as thread-safe code.
1814
* (--enable-thread-safety) */
1915
#undef ENABLE_THREAD_SAFETY

‎src/interfaces/ecpg/include/pgtypes_interval.h

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,9 +20,7 @@ typedef long long int int64;
2020
#error must have a working 64-bit integer datatype
2121
#endif
2222

23-
#ifdef USE_INTEGER_DATETIMES
2423
#define HAVE_INT64_TIMESTAMP
25-
#endif
2624
#endif /* C_H */
2725

2826
typedef struct

‎src/interfaces/ecpg/test/expected/pgtypeslib-dt_test2.c

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -145,10 +145,8 @@ main(void)
145145
sprintf(t, "%s %s", dates[i], times[j]);
146146
ts1 = PGTYPEStimestamp_from_asc(t, NULL);
147147
text = PGTYPEStimestamp_to_asc(ts1);
148-
/* skip outputs sensitive to USE_INTEGER_DATETIMES */
149-
if (i != 19 || (j != 3 && j != 4))
150-
printf("TS[%d,%d]: %s\n",
151-
i, j, errno ? "-" : text);
148+
printf("TS[%d,%d]: %s\n",
149+
i, j, errno ? "-" : text);
152150
free(text);
153151
free(t);
154152
}

‎src/interfaces/ecpg/test/expected/pgtypeslib-dt_test2.stdout

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -103,6 +103,8 @@ Date[19]: 0099-01-08 BC (N - F)
103103
TS[19,0]: 0099-01-08 00:04:00 BC
104104
TS[19,1]: 0099-01-08 01:59:00 BC
105105
TS[19,2]: 0099-01-08 13:24:40 BC
106+
TS[19,3]: 0099-01-08 13:24:40.495 BC
107+
TS[19,4]: 0099-01-08 13:24:40.123456 BC
106108
Date[20]: - (N - T)
107109
Date[21]: - (N - T)
108110
interval[0]: @ 1 min

‎src/interfaces/ecpg/test/pgtypeslib/dt_test2.pgc

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -110,10 +110,8 @@ main(void)
110110
sprintf(t, "%s %s", dates[i], times[j]);
111111
ts1 = PGTYPEStimestamp_from_asc(t, NULL);
112112
text = PGTYPEStimestamp_to_asc(ts1);
113-
/* skip outputs sensitive to USE_INTEGER_DATETIMES */
114-
if (i != 19 || (j != 3 && j != 4))
115-
printf("TS[%d,%d]: %s\n",
116-
i, j, errno ? "-" : text);
113+
printf("TS[%d,%d]: %s\n",
114+
i, j, errno ? "-" : text);
117115
free(text);
118116
free(t);
119117
}

‎src/tools/msvc/Solution.pm

Lines changed: 0 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -28,9 +28,6 @@ sub _new
2828
$self->DeterminePlatform();
2929
my $bits = $self->{platform} eq 'Win32' ? 32 : 64;
3030

31-
# integer_datetimes is now the default
32-
$options->{integer_datetimes} = 1
33-
unless exists $options->{integer_datetimes};
3431
$options->{float4byval} = 1
3532
unless exists $options->{float4byval};
3633
$options->{float8byval} = ($bits == 64)
@@ -169,8 +166,6 @@ s{PG_VERSION_STR "[^"]+"}{__STRINGIFY(x) #x\n#define __STRINGIFY2(z) __STRINGIFY
169166
print O "#ifndef IGNORE_CONFIGURED_SETTINGS\n";
170167
print O "#define USE_ASSERT_CHECKING 1\n"
171168
if ($self->{options}->{asserts});
172-
print O "#define USE_INTEGER_DATETIMES 1\n"
173-
if ($self->{options}->{integer_datetimes});
174169
print O "#define USE_LDAP 1\n" if ($self->{options}->{ldap});
175170
print O "#define HAVE_LIBZ 1\n" if ($self->{options}->{zlib});
176171
print O "#define USE_OPENSSL 1\n" if ($self->{options}->{openssl});
@@ -427,8 +422,6 @@ s{PG_VERSION_STR "[^"]+"}{__STRINGIFY(x) #x\n#define __STRINGIFY2(z) __STRINGIFY
427422
#define HAVE_LONG_LONG_INT_64
428423
#define ENABLE_THREAD_SAFETY 1
429424
EOF
430-
print O "#define USE_INTEGER_DATETIMES 1\n"
431-
if ($self->{options}->{integer_datetimes});
432425
print O "#endif\n";
433426
close(O);
434427
}
@@ -661,8 +654,6 @@ sub GetFakeConfigure
661654

662655
my $cfg = '--enable-thread-safety';
663656
$cfg .= ' --enable-cassert' if ($self->{options}->{asserts});
664-
$cfg .= ' --enable-integer-datetimes'
665-
if ($self->{options}->{integer_datetimes});
666657
$cfg .= ' --enable-nls' if ($self->{options}->{nls});
667658
$cfg .= ' --enable-tap-tests' if ($self->{options}->{tap_tests});
668659
$cfg .= ' --with-ldap' if ($self->{options}->{ldap});

‎src/tools/msvc/config_default.pl

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,6 @@
44

55
our $config = {
66
asserts => 0, # --enable-cassert
7-
# integer_datetimes=>1, # --enable-integer-datetimes - on is now default
87
# float4byval=>1, # --disable-float4-byval, on by default
98

109
# float8byval=> $platformbits == 64, # --disable-float8-byval,

0 commit comments

Comments
 (0)