Add transform functions for various temporal typmod coercisions.

This enables ALTER TABLE to skip table and index rebuilds in some cases.

Noah Misch, with trivial changes by me.

diff --git a/src/backend/utils/adt/date.c b/src/backend/utils/adt/date.c
index bf3b6ea1deb1b12e5ed62f94bef21eca8faa2ba0..85e8fd00ff231c86bfcf3cee25e3f0fbb4963cf3 100644 (file)
--- a/src/backend/utils/adt/date.c
+++ b/src/backend/utils/adt/date.c
@@ -1210,6 +1210,17 @@ timetypmodout(PG_FUNCTION_ARGS)
 }
 
 
+/* time_transform()
+ * Flatten calls to time_scale() and timetz_scale() that solely represent
+ * increases in allowed precision.
+ */
+Datum
+time_transform(PG_FUNCTION_ARGS)
+{
+       PG_RETURN_POINTER(TemporalTransform(MAX_TIME_PRECISION,
+                                                                               (Node *) PG_GETARG_POINTER(0)));
+}
+
 /* time_scale()
  * Adjust time type for specified scale factor.
  * Used by PostgreSQL type system to stuff columns.

diff --git a/src/backend/utils/adt/datetime.c b/src/backend/utils/adt/datetime.c
index 07e43a60fe57a3efda4b1fe301c5b114357de3ff..f495c3f01092d8f2382db87314eb34db4a234b91 100644 (file)
--- a/src/backend/utils/adt/datetime.c
+++ b/src/backend/utils/adt/datetime.c
@@ -23,6 +23,8 @@
 #include "catalog/pg_type.h"
 #include "funcapi.h"
 #include "miscadmin.h"
+#include "nodes/nodeFuncs.h"
+#include "parser/parse_clause.h"
 #include "utils/builtins.h"
 #include "utils/date.h"
 #include "utils/datetime.h"
@@ -4141,6 +4143,39 @@ CheckDateTokenTables(void)
        return ok;
 }
 
+/*
+ * Helper for temporal protransform functions.  Types time, timetz, timestamp
+ * and timestamptz each have a range of allowed precisions.  An unspecified
+ * precision is rigorously equivalent to the highest specifiable precision.
+ */
+Node *
+TemporalTransform(int32 max_precis, Node *node)
+{
+       FuncExpr   *expr = (FuncExpr *) node;
+       Node       *typmod;
+       Node       *ret = NULL;
+
+       if (!IsA(expr, FuncExpr))
+               return ret;
+
+       Assert(list_length(expr->args) == 2);
+       typmod = lsecond(expr->args);
+
+       if (IsA(typmod, Const))
+       {
+               Node       *source = linitial(expr->args);
+               int32           old_precis = exprTypmod(source);
+               int32           new_precis = DatumGetInt32(((Const *) typmod)->constvalue);
+
+               if (new_precis == -1 ||
+                       new_precis == max_precis ||
+                       (old_precis != -1 && new_precis >= old_precis))
+                       ret = relabel_to_typmod(source, new_precis);
+       }
+
+       return ret;
+}
+
 /*
  * This function gets called during timezone config file load or reload
  * to create the final array of timezone tokens.  The argument array

diff --git a/src/backend/utils/adt/timestamp.c b/src/backend/utils/adt/timestamp.c
index db8d2c2b1091da0653e8cd43c39e66aa8cd66ebb..44a3a922ece61f3bbb86236c0497a1bc87e3c21b 100644 (file)
--- a/src/backend/utils/adt/timestamp.c
+++ b/src/backend/utils/adt/timestamp.c
@@ -27,6 +27,8 @@
 #include "funcapi.h"
 #include "libpq/pqformat.h"
 #include "miscadmin.h"
+#include "nodes/nodeFuncs.h"
+#include "parser/parse_clause.h"
 #include "parser/scansup.h"
 #include "utils/array.h"
 #include "utils/builtins.h"
@@ -308,6 +310,21 @@ timestamptypmodout(PG_FUNCTION_ARGS)
 }
 
 
+/* timestamp_transform()
+ * Flatten calls to timestamp_scale() and timestamptz_scale() that solely
+ * represent increases in allowed precision.
+ */
+Datum
+timestamp_transform(PG_FUNCTION_ARGS)
+{
+       /*
+        * timestamp_scale throws an error when the typmod is out of range, but we
+        * can't get there from a cast: our typmodin will have caught it already.
+        */
+       PG_RETURN_POINTER(TemporalTransform(MAX_TIMESTAMP_PRECISION,
+                                                                               (Node *) PG_GETARG_POINTER(0)));
+}
+
 /* timestamp_scale()
  * Adjust time type for specified scale factor.
  * Used by PostgreSQL type system to stuff columns.
@@ -745,6 +762,18 @@ interval_send(PG_FUNCTION_ARGS)
        PG_RETURN_BYTEA_P(pq_endtypsend(&buf));
 }
 
+/*
+ * The interval typmod stores a "range" in its high 16 bits and a "precision"
+ * in its low 16 bits.  Both contribute to defining the resolution of the
+ * type.  Range addresses resolution granules larger than one second, and
+ * precision specifies resolution below one second.  This representation can
+ * express all SQL standard resolutions, but we implement them all in terms of
+ * truncating rightward from some position.  Range is a bitmap of permitted
+ * fields, but only the temporally-smallest such field is significant to our
+ * calculations.  Precision is a count of sub-second decimal places to retain.
+ * Setting all bits (INTERVAL_FULL_PRECISION) gives the same truncation
+ * semantics as choosing MAX_INTERVAL_PRECISION.
+ */
 Datum
 intervaltypmodin(PG_FUNCTION_ARGS)
 {
@@ -901,6 +930,63 @@ intervaltypmodout(PG_FUNCTION_ARGS)
 }
 
 
+/* interval_transform()
+ * Flatten superfluous calls to interval_scale().  The interval typmod is
+ * complex to permit accepting and regurgitating all SQL standard variations.
+ * For truncation purposes, it boils down to a single, simple granularity.
+ */
+Datum
+interval_transform(PG_FUNCTION_ARGS)
+{
+       FuncExpr   *expr = (FuncExpr *) PG_GETARG_POINTER(0);
+       Node       *typmod;
+       Node       *ret = NULL;
+
+       if (!IsA(expr, FuncExpr))
+               PG_RETURN_POINTER(ret);
+
+       Assert(list_length(expr->args) == 2);
+       typmod = lsecond(expr->args);
+
+       if (IsA(typmod, Const))
+       {
+               Node       *source = linitial(expr->args);
+               int32           old_typmod = exprTypmod(source);
+               int32           new_typmod = DatumGetInt32(((Const *) typmod)->constvalue);
+               int                     old_range;
+               int                     old_precis;
+               int                     new_range = INTERVAL_RANGE(new_typmod);
+               int                     new_precis = INTERVAL_PRECISION(new_typmod);
+               int                     new_range_fls;
+
+               if (old_typmod == -1)
+               {
+                       old_range = INTERVAL_FULL_RANGE;
+                       old_precis = INTERVAL_FULL_PRECISION;
+               }
+               else
+               {
+                       old_range = INTERVAL_RANGE(old_typmod);
+                       old_precis = INTERVAL_PRECISION(old_typmod);
+               }
+
+               /*
+                * Temporally-smaller fields occupy higher positions in the range
+                * bitmap.  Since only the temporally-smallest bit matters for length
+                * coercion purposes, we compare the last-set bits in the ranges.
+                */
+               new_range_fls = fls(new_range);
+               if (new_typmod == -1 ||
+                       ((new_range_fls >= SECOND ||
+                         new_range_fls >= fls(old_range)) &&
+                        (new_precis >= MAX_INTERVAL_PRECISION ||
+                         new_precis >= old_precis)))
+                       ret = relabel_to_typmod(source, new_typmod);
+       }
+
+       PG_RETURN_POINTER(ret);
+}
+
 /* interval_scale()
  * Adjust interval type for specified fields.
  * Used by PostgreSQL type system to stuff columns.

diff --git a/src/include/catalog/catversion.h b/src/include/catalog/catversion.h
index ae4e5f5ae6b5fce71dfa2cd5a8c772664f01ee54..1d92ee38a0d89f017bc137ec84a9ac7ef5b44f5a 100644 (file)
--- a/src/include/catalog/catversion.h
+++ b/src/include/catalog/catversion.h
@@ -53,6 +53,6 @@
  */
 
 /*                                                     yyyymmddN */
-#define CATALOG_VERSION_NO     201202072
+#define CATALOG_VERSION_NO     201202081
 
 #endif

diff --git a/src/include/catalog/pg_proc.h b/src/include/catalog/pg_proc.h
index f8d01fbba49de0b31ad62997e7861ab3e87ba529..53e685f86dd853e0096bf813d25ed4dd419e29bb 100644 (file)
--- a/src/include/catalog/pg_proc.h
+++ b/src/include/catalog/pg_proc.h
@@ -1257,7 +1257,9 @@ DESCR("date difference preserving months and years");
 
 /* OIDS 1200 - 1299 */
 
-DATA(insert OID = 1200 (  interval                     PGNSP PGUID 12 1 0 0 0 f f f t f i 2 0 1186 "1186 23" _null_ _null_ _null_ _null_ interval_scale _null_ _null_ _null_ ));
+DATA(insert OID = 3918 (  interval_transform PGNSP PGUID 12 1 0 0 0 f f f t f i 1 0 2281 "2281" _null_ _null_ _null_ _null_ interval_transform _null_ _null_ _null_ ));
+DESCR("transform an interval length coercion");
+DATA(insert OID = 1200 (  interval                     PGNSP PGUID 12 1 0 0 3918 f f f t f i 2 0 1186 "1186 23" _null_ _null_ _null_ _null_ interval_scale _null_ _null_ _null_ ));
 DESCR("adjust interval precision");
 
 DATA(insert OID = 1215 (  obj_description      PGNSP PGUID 14 100 0 0 0 f f f t f s 2 0 25 "26 19" _null_ _null_ _null_ _null_ "select description from pg_catalog.pg_description where objoid = $1 and classoid = (select oid from pg_catalog.pg_class where relname = $2 and relnamespace = PGNSP) and objsubid = 0" _null_ _null_ _null_ ));
@@ -2732,7 +2734,9 @@ DATA(insert OID = 1953 (  byteane            PGNSP PGUID 12 1 0 0 0 f f f t f i 2 0 16
 DATA(insert OID = 1954 (  byteacmp                PGNSP PGUID 12 1 0 0 0 f f f t f i 2 0 23 "17 17" _null_ _null_ _null_ _null_ byteacmp _null_ _null_ _null_ ));
 DESCR("less-equal-greater");
 
-DATA(insert OID = 1961 (  timestamp               PGNSP PGUID 12 1 0 0 0 f f f t f i 2 0 1114 "1114 23" _null_ _null_ _null_ _null_ timestamp_scale _null_ _null_ _null_ ));
+DATA(insert OID = 3917 (  timestamp_transform PGNSP PGUID 12 1 0 0 0 f f f t f i 1 0 2281 "2281" _null_ _null_ _null_ _null_ timestamp_transform _null_ _null_ _null_ ));
+DESCR("transform a timestamp length coercion");
+DATA(insert OID = 1961 (  timestamp               PGNSP PGUID 12 1 0 0 3917 f f f t f i 2 0 1114 "1114 23" _null_ _null_ _null_ _null_ timestamp_scale _null_ _null_ _null_ ));
 DESCR("adjust timestamp precision");
 
 DATA(insert OID = 1965 (  oidlarger               PGNSP PGUID 12 1 0 0 0 f f f t f i 2 0 26 "26 26" _null_ _null_ _null_ _null_ oidlarger _null_ _null_ _null_ ));
@@ -2740,11 +2744,13 @@ DESCR("larger of two");
 DATA(insert OID = 1966 (  oidsmaller      PGNSP PGUID 12 1 0 0 0 f f f t f i 2 0 26 "26 26" _null_ _null_ _null_ _null_ oidsmaller _null_ _null_ _null_ ));
 DESCR("smaller of two");
 
-DATA(insert OID = 1967 (  timestamptz     PGNSP PGUID 12 1 0 0 0 f f f t f i 2 0 1184 "1184 23" _null_ _null_ _null_ _null_ timestamptz_scale _null_ _null_ _null_ ));
+DATA(insert OID = 1967 (  timestamptz     PGNSP PGUID 12 1 0 0 3917 f f f t f i 2 0 1184 "1184 23" _null_ _null_ _null_ _null_ timestamptz_scale _null_ _null_ _null_ ));
 DESCR("adjust timestamptz precision");
-DATA(insert OID = 1968 (  time                    PGNSP PGUID 12 1 0 0 0 f f f t f i 2 0 1083 "1083 23" _null_ _null_ _null_ _null_ time_scale _null_ _null_ _null_ ));
+DATA(insert OID = 3944 (  time_transform   PGNSP PGUID 12 1 0 0 0 f f f t f i 1 0 2281 "2281" _null_ _null_ _null_ _null_ time_transform _null_ _null_ _null_ ));
+DESCR("transform a time length coercion");
+DATA(insert OID = 1968 (  time                    PGNSP PGUID 12 1 0 0 3944 f f f t f i 2 0 1083 "1083 23" _null_ _null_ _null_ _null_ time_scale _null_ _null_ _null_ ));
 DESCR("adjust time precision");
-DATA(insert OID = 1969 (  timetz                  PGNSP PGUID 12 1 0 0 0 f f f t f i 2 0 1266 "1266 23" _null_ _null_ _null_ _null_ timetz_scale _null_ _null_ _null_ ));
+DATA(insert OID = 1969 (  timetz                  PGNSP PGUID 12 1 0 0 3944 f f f t f i 2 0 1266 "1266 23" _null_ _null_ _null_ _null_ timetz_scale _null_ _null_ _null_ ));
 DESCR("adjust time with time zone precision");
 
 DATA(insert OID = 2003 (  textanycat      PGNSP PGUID 14 1 0 0 0 f f f t f v 2 0 25 "25 2776" _null_ _null_ _null_ _null_ "select $1 || $2::pg_catalog.text" _null_ _null_ _null_ ));

diff --git a/src/include/utils/date.h b/src/include/utils/date.h
index 124efcf8a07eae7a786daab07ef8d8d8aa9d459a..8cdd9bc84f568f1e58c5df88266c58d6ff4d0329 100644 (file)
--- a/src/include/utils/date.h
+++ b/src/include/utils/date.h
@@ -154,6 +154,7 @@ extern Datum time_recv(PG_FUNCTION_ARGS);
 extern Datum time_send(PG_FUNCTION_ARGS);
 extern Datum timetypmodin(PG_FUNCTION_ARGS);
 extern Datum timetypmodout(PG_FUNCTION_ARGS);
+extern Datum time_transform(PG_FUNCTION_ARGS);
 extern Datum time_scale(PG_FUNCTION_ARGS);
 extern Datum time_eq(PG_FUNCTION_ARGS);
 extern Datum time_ne(PG_FUNCTION_ARGS);

diff --git a/src/include/utils/datetime.h b/src/include/utils/datetime.h
index 29d7b25119d42898c09e0374a264e750dd939c2c..358e2a67b0263c3ab6d012899e761c40073f303d 100644 (file)
--- a/src/include/utils/datetime.h
+++ b/src/include/utils/datetime.h
@@ -16,6 +16,7 @@
 #ifndef DATETIME_H
 #define DATETIME_H
 
+#include "nodes/nodes.h"
 #include "utils/timestamp.h"
 
 /* this struct is declared in utils/tzparser.h: */
@@ -298,6 +299,8 @@ extern int  DecodeUnits(int field, char *lowtoken, int *val);
 
 extern int     j2day(int jd);
 
+extern Node *TemporalTransform(int32 max_precis, Node *node);
+
 extern bool CheckDateTokenTables(void);
 
 extern void ConvertTimeZoneAbbrevs(TimeZoneAbbrevTable *tbl,

diff --git a/src/include/utils/timestamp.h b/src/include/utils/timestamp.h
index 22d1c04c95b29c8985e08d692c34fd34ddd64865..2eae95efac1d1c9bcf249cb7c24389a1a0c2e63b 100644 (file)
--- a/src/include/utils/timestamp.h
+++ b/src/include/utils/timestamp.h
@@ -100,6 +100,7 @@ extern Datum timestamp_recv(PG_FUNCTION_ARGS);
 extern Datum timestamp_send(PG_FUNCTION_ARGS);
 extern Datum timestamptypmodin(PG_FUNCTION_ARGS);
 extern Datum timestamptypmodout(PG_FUNCTION_ARGS);
+extern Datum timestamp_transform(PG_FUNCTION_ARGS);
 extern Datum timestamp_scale(PG_FUNCTION_ARGS);
 extern Datum timestamp_eq(PG_FUNCTION_ARGS);
 extern Datum timestamp_ne(PG_FUNCTION_ARGS);
@@ -136,6 +137,7 @@ extern Datum interval_recv(PG_FUNCTION_ARGS);
 extern Datum interval_send(PG_FUNCTION_ARGS);
 extern Datum intervaltypmodin(PG_FUNCTION_ARGS);
 extern Datum intervaltypmodout(PG_FUNCTION_ARGS);
+extern Datum interval_transform(PG_FUNCTION_ARGS);
 extern Datum interval_scale(PG_FUNCTION_ARGS);
 extern Datum interval_eq(PG_FUNCTION_ARGS);
 extern Datum interval_ne(PG_FUNCTION_ARGS);