feat!: remove deprecated time, timestamp and timestamp_tz types

BREAKING CHANGE

Signed-off-by: Niels Pardon <par@zurich.ibm.com>

Author: nielspardon

extensions/functions_datetime.yaml

@@ -55,9 +55,6 @@ argument
     | stringArg
     | decimalArg
     | dateArg
-    | timeArg
-    | timestampArg
-    | timestampTzArg
     | intervalYearArg
     | intervalDayArg
     | intervalCompoundArg
@@ -160,18 +157,6 @@ dateArg
     : DateLiteral DoubleColon dateType
     ;
 
-timeArg
-    : TimeLiteral DoubleColon timeType
-    ;
-
-timestampArg
-    : TimestampLiteral DoubleColon timestampType
-    ;
-
-timestampTzArg
-    : TimestampTzLiteral DoubleColon timestampTZType
-    ;
-
 intervalYearArg
     : IntervalYearLiteral DoubleColon intervalYearType
     ;
@@ -249,10 +234,7 @@ scalarType
   | floatType                            #float
   | stringType                           #string
   | binaryType                           #binary
-  | timestampType                        #timestamp
-  | timestampTZType                      #timestampTz
   | dateType                             #date
-  | timeType                             #time
   | intervalYearType                     #intervalYear
   | UUID isnull=QMark?                   #uuid
   | UserDefined Identifier isnull=QMark? #userDefined
@@ -282,18 +264,6 @@ dateType
     : Date isnull=QMark?
     ;
 
-timeType
-    : Time isnull=QMark?
-    ;
-
-timestampType
-    : (Ts | Timestamp) isnull=QMark?
-    ;
-
-timestampTZType
-    : (TsTZ | Timestamp_TZ) isnull=QMark?
-    ;
-
 intervalYearType
     : (IYear | Interval_Year) isnull=QMark?
     ;

grammar/FuncTestCaseParser.g4

@@ -27,10 +27,7 @@ FP32     : 'FP32';
 FP64     : 'FP64';
 String   : 'STRING';
 Binary   : 'BINARY';
-Timestamp: 'TIMESTAMP';
-Timestamp_TZ: 'TIMESTAMP_TZ';
 Date     : 'DATE';
-Time     : 'TIME';
 Interval_Year: 'INTERVAL_YEAR';
 Interval_Day: 'INTERVAL_DAY';
 Interval_Compound: 'INTERVAL_COMPOUND';
@@ -52,8 +49,6 @@ UserDefined: 'U!';
 Bool: 'BOOL';
 Str: 'STR';
 VBin: 'VBIN';
-Ts: 'TS';
-TsTZ: 'TSTZ';
 IYear: 'IYEAR';
 IDay: 'IDAY';
 ICompound: 'ICOMPOUND';

grammar/SubstraitLexer.g4

@@ -20,10 +20,7 @@ scalarType
   | FP64                    #fp64
   | String                  #string
   | Binary                  #binary
-  | Timestamp               #timestamp
-  | Timestamp_TZ            #timestampTz
   | Date                    #date
-  | Time                    #time
   | Interval_Year           #intervalYear
   | UUID                    #uuid
   ;

grammar/SubstraitType.g4

@@ -997,6 +997,8 @@ message Expression {
   }
 
   message Literal {
+    reserved 14, 17, 27;
+
     oneof literal_type {
       bool boolean = 1;
       int32 i8 = 2;
@@ -1007,14 +1009,8 @@ message Expression {
       double fp64 = 11;
       string string = 12;
       bytes binary = 13;
-      // Timestamp in units of microseconds since the UNIX epoch.
-      // Deprecated in favor of `precision_timestamp`.
-      int64 timestamp = 14 [deprecated = true];
       // Date in units of days since the UNIX epoch.
       int32 date = 16;
-      // Time in units of microseconds past midnight.
-      // Deprecated in favor of `precision_time`.
-      int64 time = 17 [deprecated = true];
       IntervalYearToMonth interval_year_to_month = 19;
       IntervalDayToSecond interval_day_to_second = 20;
       IntervalCompound interval_compound = 36;
@@ -1028,9 +1024,6 @@ message Expression {
       PrecisionTimestamp precision_timestamp_tz = 35;
       Struct struct = 25;
       Map map = 26;
-      // Timestamp in units of microseconds since the UNIX epoch.
-      // Deprecated in favor of `precision_timestamp_tz`
-      int64 timestamp_tz = 27 [deprecated = true];
       bytes uuid = 28;
       Type null = 29; // a typed null literal
       List list = 30;

proto/substrait/algebra.proto

@@ -15,6 +15,8 @@ option java_package = "io.substrait.proto";
 //
 // The value 0 represents the system-preferred variation and is a valid reference value.
 message Type {
+  reserved 14, 17, 29;
+
   oneof kind {
     Boolean bool = 1;
     I8 i8 = 2;
@@ -25,16 +27,10 @@ message Type {
     FP64 fp64 = 11;
     String string = 12;
     Binary binary = 13;
-    // Deprecated in favor of `PrecisionTimestamp precision_timestamp`
-    Timestamp timestamp = 14 [deprecated = true];
     Date date = 16;
-    // Deprecated in favor of `PrecisionTime precision_time`
-    Time time = 17 [deprecated = true];
     IntervalYear interval_year = 19;
     IntervalDay interval_day = 20;
     IntervalCompound interval_compound = 35;
-    // Deprecated in favor of `PrecisionTimestampTZ precision_timestamp_tz`
-    TimestampTZ timestamp_tz = 29 [deprecated = true];
     UUID uuid = 32;
 
     FixedChar fixed_char = 21;
@@ -113,26 +109,11 @@ message Type {
     Nullability nullability = 2;
   }
 
-  message Timestamp {
-    uint32 type_variation_reference = 1;
-    Nullability nullability = 2;
-  }
-
   message Date {
     uint32 type_variation_reference = 1;
     Nullability nullability = 2;
   }
 
-  message Time {
-    uint32 type_variation_reference = 1;
-    Nullability nullability = 2;
-  }
-
-  message TimestampTZ {
-    uint32 type_variation_reference = 1;
-    Nullability nullability = 2;
-  }
-
   // An interval consisting of years and months
   message IntervalYear {
     uint32 type_variation_reference = 1;

proto/substrait/type.proto

@@ -98,10 +98,7 @@ A function signature uniquely identifies a function implementation within a sing
 | string                          | str            |
 | binary                          | vbin           |
 | boolean                         | bool           |
-| timestamp                       | ts             |
-| timestamp_tz                    | tstz           |
 | date                            | date           |
-| time                            | time           |
 | interval_year                   | iyear          |
 | interval_day                    | iday           |
 | interval_compound               | icompound      |
@@ -126,7 +123,7 @@ A function signature uniquely identifies a function implementation within a sing
 | ------------------------------------------------- | ------------------- |
 | `add(optional enumeration, i8, i8) => i8`         | `add:i8_i8`         |
 | `avg(fp32) => fp32`                               | `avg:fp32`          |
-| `extract(required enumeration, timestamp) => i64` | `extract:req_ts`    |
+| `extract(required enumeration, precision_timestamp<6>) => i64` | `extract:req_pts`    |
 | `sum(any1) => any1`                               | `sum:any`           |
 | `concat(str...) => str`                           | `concat:str`        |
 | `transform(list<any1>, func<any1 -> any2>) => list<any2>` | `transform:list_func` |

site/docs/extensions/index.md

@@ -21,10 +21,7 @@ Simple type classes are those that don't support any form of configuration. For
 | fp64            | An 8-byte double-precision floating point number with the same range and precision as defined for the [IEEE 754 64-bit floating-point format](https://standards.ieee.org/ieee/754/6210/). | `double`
 | string          | A unicode string of text, [0..2,147,483,647] UTF-8 bytes in length. | `string`
 | binary          | A binary value, [0..2,147,483,647] bytes in length.          | `binary`
-| timestamp       | A naive timestamp with microsecond precision. Does not include timezone information and can thus not be unambiguously mapped to a moment on the timeline without context. Similar to naive datetime in Python. | `int64` microseconds since 1970-01-01 00:00:00.000000 (in an unspecified timezone)
-| timestamp_tz    | A timezone-aware timestamp with microsecond precision. Similar to timezone-aware datetime in Python. | `int64` microseconds since 1970-01-01 00:00:00.000000 UTC
 | date            | A date within [1000-01-01..9999-12-31].                      | `int32` days since `1970-01-01`
-| time            | A time since the beginning of any day. Range of [0..86,399,999,999] microseconds; leap seconds need not be supported. | `int64` microseconds past midnight
 | interval_year   | Interval year to month. Supports a range of [-10,000..10,000] years with month precision (= [-120,000..120,000] months). Usually stored as separate integers for years and months, but only the total number of months is significant, i.e. `1y 0m` is considered equal to `0y 12m` or `1001y -12000m`. | `int32` years and `int32` months, with the added constraint that each component can never independently specify more than 10,000 years, even if the components have opposite signs (e.g. `-10000y 200000m` is **not** allowed)
 | uuid            | A universally-unique identifier composed of 128 bits. Typically presented to users in the following hexadecimal format: `c48ffa9e-64f4-44cb-ae47-152b4e60e77b`. Any 128-bit value is allowed, without specific adherence to RFC4122. | 16-byte `binary`
 

site/docs/types/type_classes.md

@@ -37,7 +37,7 @@ Structs are unique from other types because they have an arbitrary number of par
 
     ```
     // Struct
-    struct?<string, i8, i32?, timestamp_tz>
+    struct?<string, i8, i32?, precision_timestamp_tz<6>>
 
     // Named structs are not yet supported in the text format.
     ```

site/docs/types/type_parsing.md

@@ -109,9 +109,9 @@ literal     := <literal_value>::<datatype>
 result      := <substrait_error> | <literal>
 options     := <option>, <option>, ... <option>
 option      := <option_name>:<option_value>
-literal_value := string | integer | decimal | float | boolean | date | time | timestamp | timestamp_tz | interval year | interval days | null
+literal_value := string | integer | decimal | float | boolean | date | interval year | interval days | null
 datatype    := <basic_type> | <parametrized_type> | <complex_type>
-basic_type := bool | i8 | i16 | i32 | i64 | f32 | f64 | str | date | time | ts | tstz | iyear | vbin | <parametrized_type>
+basic_type := bool | i8 | i16 | i32 | i64 | f32 | f64 | str | date | iyear | vbin | <parametrized_type>
 parametrized_type := fchar<int> | vchar<int> | dec<int,int> | fbin<int> | iday<int> | icompound<int> | pt<int> | pts<int> | ptstz<int> | func<params -> datatype>
 params := datatype | (datatype(, datatype)*)
 complex_type := <struct> | <list> | <map>
@@ -152,9 +152,9 @@ Integers are represented as sequences of digits. Negative numbers are preceded b
 All date and time literals use ISO 8601 format:
 
 - **date**: `YYYY-MM-DD`, example: `2021-01-01`
-- **time**: `HH:MM:SS[.fraction]`, example: `12:00:00.000`
-- **timestamp**: `YYYY-MM-DD HH:MM:SS[.fraction]`, example: `2021-01-01 12:00:00`
-- **timestamp_tz**: `YYYY-MM-DD HH:MM:SS[.fraction]±HH:MM`, example: `2021-01-01 12:00:00+05:30`
+- **precision_time**: `HH:MM:SS[.fraction]`, example: `12:00:00.000`
+- **precision_timestamp**: `YYYY-MM-DD HH:MM:SS[.fraction]`, example: `2021-01-01 12:00:00`
+- **precision_timestamp_tz**: `YYYY-MM-DD HH:MM:SS[.fraction]±HH:MM`, example: `2021-01-01 12:00:00+05:30`
 - **interval year**: `'P[n]Y[n]M'`, example: `'P2Y3M'` (2 years, 3 months)
 - **interval days**: `'P[n]DT[n]H[n]M[n]S'`, example: `'P2DT3H2M9S'` (2 days, 3 hours, 2 minutes, 9 seconds)
   ex2: 'P1DT2H3M4.45::iday<3>' (1 day, 2 hours, 3 minutes, 4 seconds, 450 milliseconds)`
@@ -182,15 +182,12 @@ Use short names listed in https://substrait.io/extensions/#function-signature-co
 - **vchar**: Variable-length string `varchar<N>`
 - **vbin**: Fixed-length binary `fixedbinary<N>`
 - **date**: Date
-- **time**: Time
-- **ts**: Timestamp
-- **tstz**: Timestamp with timezone
 - **iyear**: Interval year
-- **iday**: Interval days
+- **iday**: Interval days `interval_day<P>`
 - **icompound**: Interval compound
-- **pt**: Precision Time
-- **pts**: Precision Timestamp
-- **ptstz**: Precision Timestamp with timezone
+- **pt**: Precision Time `precision_time<P>`
+- **pts**: Precision Timestamp `precision_timestamp<P>`
+- **ptstz**: Precision Timestamp with timezone `precision_timestamp_tz<P>`
 
 
 ### Nullability