IGNITE-24825 Sql. Added boundary values validation for temporal types (#5515)

Author: xtern

docs/_docs/sql-reference/data-types.adoc

@@ -122,22 +122,41 @@ Maximum length: `65536`
 == Date and Time Types
 
 === TIME
-Possible values: The time data type. The format is `hh:mm[:ss]`.
+Possible values: [`00-00-00`, `23-59-59.999`].
+
+The format is `HH:mm:ss[.SSS]`.
 
 Default precision: `0`
 
 Maximum precision: `3`
 
 === DATE
-Possible values: The date data type.
+Possible values: [`0001-01-01`, `9999-12-31`].
 
 The format is `yyyy-MM-dd`.
 
 === TIMESTAMP
 
 WARNING: The timestamp data type only supports precision up to milliseconds (3 symbols). Any values past the 3rd symbol will be ignored.
 
-Possible values: The timestamp data type. The format is `yyyy-MM-dd hh:mm:ss[.mmm]`.
+Possible values: [`0001-01-01 18:00:00`, `9999-12-31 05:59:59.999`].
+
+The format is `yyyy-MM-dd HH:mm:ss[.SSS]`.
+
+Default precision: `6`
+
+Maximum precision: `9`
+
+=== TIMESTAMP WITH LOCAL TIME ZONE
+
+WARNING: The timestamp with local time zone data type only supports precision up to milliseconds (3 symbols). Any values past the 3rd symbol will be ignored.
+
+Unlike `TIMESTAMP`, the value is always stored in UTC time zone.
+The value passed to/from the user is converted from/to UTC using the user's session time zone.
+
+Possible values (in UTC time zone): [`0001-01-01 18:00:00`, `9999-12-31 05:59:59.999`].
+
+The format is `yyyy-MM-dd HH:mm:ss[.SSS]`.
 
 Default precision: `6`
 

modules/api/src/testFixtures/java/org/apache/ignite/table/AbstractImmutableTupleTest.java

@@ -36,7 +36,7 @@
 import java.time.LocalTime;
 import java.time.Year;
 import java.time.ZoneId;
-import java.time.temporal.ChronoUnit;
+import java.time.ZoneOffset;
 import java.time.temporal.Temporal;
 import java.util.Random;
 import java.util.UUID;
@@ -400,22 +400,18 @@ private static int tailFactor(int precision) {
             case DECIMAL:
                 return BigDecimal.valueOf(rnd.nextInt(), 5);
             case DATE: {
-                Year year = Year.of(rnd.nextInt(20_000) - 10000);
+                Year year = Year.of(1 + rnd.nextInt(9998));
                 return LocalDate.ofYearDay(year.getValue(), rnd.nextInt(year.length()) + 1);
             }
             case TIME:
                 return LocalTime.of(rnd.nextInt(24), rnd.nextInt(60), rnd.nextInt(60),
                         rnd.nextInt(1_000_000) * 1000);
-            case DATETIME: {
-                Year year = Year.of(rnd.nextInt(20_000) - 10000);
-                LocalDate localDate = LocalDate.ofYearDay(year.getValue(), rnd.nextInt(year.length()) + 1);
-                LocalTime localTime = LocalTime.of(rnd.nextInt(24), rnd.nextInt(60), rnd.nextInt(60),
-                        rnd.nextInt(1_000) * 1000_000);
-                return LocalDateTime.of(localDate, localTime);
-            }
+            case DATETIME:
+                return LocalDateTime.ofInstant(generateInstant(rnd), ZoneOffset.UTC);
+
             case TIMESTAMP:
-                return Instant.ofEpochMilli(rnd.nextLong()).truncatedTo(ChronoUnit.SECONDS)
-                        .plusNanos(rnd.nextInt(1_000_000_000));
+                return generateInstant(rnd);
+
             case UUID:
                 return new UUID(rnd.nextLong(), rnd.nextLong());
 
@@ -440,4 +436,13 @@ private static int tailFactor(int precision) {
                 throw new IllegalArgumentException("Unsupported type: " + type);
         }
     }
+
+    private static Instant generateInstant(Random rnd) {
+        long minTs = LocalDateTime.of(LocalDate.of(1, 1, 1), LocalTime.MIN)
+                .minusSeconds(ZoneOffset.MIN.getTotalSeconds()).toInstant(ZoneOffset.UTC).toEpochMilli();
+        long maxTs = LocalDateTime.of(LocalDate.of(9999, 12, 31), LocalTime.MAX)
+                .minusSeconds(ZoneOffset.MAX.getTotalSeconds()).toInstant(ZoneOffset.UTC).toEpochMilli();
+
+        return Instant.ofEpochMilli(minTs + (long) (rnd.nextDouble() * (maxTs - minTs)));
+    }
 }

modules/marshaller-common/build.gradle

@@ -37,5 +37,6 @@ dependencies {
     testImplementation libs.jmh.core
 
     testFixturesApi project(':ignite-api')
+    testFixturesApi(testFixtures(project(':ignite-schema')))
     testFixturesImplementation testFixtures(project(':ignite-core'))
 }

modules/marshaller-common/src/testFixtures/java/org/apache/ignite/internal/marshaller/testobjects/TestObjectWithAllTypes.java

@@ -17,19 +17,19 @@
 
 package org.apache.ignite.internal.marshaller.testobjects;
 
-import static org.apache.ignite.internal.util.TemporalTypeUtils.normalizeNanos;
+import static org.apache.ignite.internal.schema.SchemaTestUtils.generateRandomValue;
 
 import java.math.BigDecimal;
 import java.time.Instant;
 import java.time.LocalDate;
 import java.time.LocalDateTime;
 import java.time.LocalTime;
-import java.time.temporal.ChronoUnit;
 import java.util.Arrays;
 import java.util.Objects;
 import java.util.Random;
 import java.util.UUID;
 import org.apache.ignite.internal.testframework.IgniteTestUtils;
+import org.apache.ignite.internal.type.NativeTypes;
 
 /**
  * Test object.
@@ -40,35 +40,34 @@ public class TestObjectWithAllTypes {
      * Creates an object with random data.
      */
     public static TestObjectWithAllTypes randomObject(Random rnd) {
-        final TestObjectWithAllTypes obj = new TestObjectWithAllTypes();
-
-        obj.primitiveBooleanCol = rnd.nextBoolean();
-        obj.primitiveByteCol = (byte) rnd.nextInt(255);
-        obj.primitiveShortCol = (short) rnd.nextInt(65535);
-        obj.primitiveIntCol = rnd.nextInt();
-        obj.primitiveLongCol = rnd.nextLong();
-        obj.primitiveFloatCol = rnd.nextFloat();
-        obj.primitiveDoubleCol = rnd.nextDouble();
-
-        obj.booleanCol = rnd.nextBoolean();
-        obj.byteCol = (byte) rnd.nextInt(255);
-        obj.shortCol = (short) rnd.nextInt(65535);
-        obj.intCol = rnd.nextInt();
-        obj.longCol = rnd.nextLong();
-        obj.floatCol = rnd.nextFloat();
-        obj.doubleCol = rnd.nextDouble();
-
-        obj.uuidCol = new UUID(rnd.nextLong(), rnd.nextLong());
-
-        obj.dateCol = LocalDate.ofYearDay(1990 + rnd.nextInt(50), 1 + rnd.nextInt(360));
-        obj.timeCol = LocalTime.of(rnd.nextInt(24), rnd.nextInt(60));
-        obj.dateTimeCol = LocalDateTime.of(obj.dateCol, obj.timeCol);
-        obj.timestampCol = Instant.ofEpochMilli(rnd.nextLong()).truncatedTo(ChronoUnit.SECONDS)
-                .plusNanos(normalizeNanos(rnd.nextInt(1_000_000_000), 6));
-
-        obj.stringCol = IgniteTestUtils.randomString(rnd, rnd.nextInt(255));
-        obj.bytesCol = IgniteTestUtils.randomBytes(rnd, rnd.nextInt(255));
-        obj.decimalCol = BigDecimal.valueOf(rnd.nextLong(), 3);
+        TestObjectWithAllTypes obj = new TestObjectWithAllTypes();
+
+        obj.primitiveBooleanCol = (boolean) generateRandomValue(rnd, NativeTypes.BOOLEAN);
+        obj.primitiveByteCol = (byte) generateRandomValue(rnd, NativeTypes.INT8);
+        obj.primitiveShortCol = (short) generateRandomValue(rnd, NativeTypes.INT16);
+        obj.primitiveIntCol = (int) generateRandomValue(rnd, NativeTypes.INT32);
+        obj.primitiveLongCol = (long) generateRandomValue(rnd, NativeTypes.INT64);
+        obj.primitiveFloatCol = (float) generateRandomValue(rnd, NativeTypes.FLOAT);
+        obj.primitiveDoubleCol = (double) generateRandomValue(rnd, NativeTypes.DOUBLE);
+
+        obj.booleanCol = (boolean) generateRandomValue(rnd, NativeTypes.BOOLEAN);
+        obj.byteCol = (byte) generateRandomValue(rnd, NativeTypes.INT8);
+        obj.shortCol = (short) generateRandomValue(rnd, NativeTypes.INT16);
+        obj.intCol = (int) generateRandomValue(rnd, NativeTypes.INT32);
+        obj.longCol = (long) generateRandomValue(rnd, NativeTypes.INT64);
+        obj.floatCol = (float) generateRandomValue(rnd, NativeTypes.FLOAT);
+        obj.doubleCol = (double) generateRandomValue(rnd, NativeTypes.DOUBLE);
+
+        obj.uuidCol = (UUID) generateRandomValue(rnd, NativeTypes.UUID);
+
+        obj.dateCol = (LocalDate) generateRandomValue(rnd, NativeTypes.DATE);
+        obj.timeCol = (LocalTime) generateRandomValue(rnd, NativeTypes.time(0));
+        obj.dateTimeCol = (LocalDateTime) generateRandomValue(rnd, NativeTypes.datetime(0));
+        obj.timestampCol = (Instant) generateRandomValue(rnd, NativeTypes.timestamp(6));
+
+        obj.stringCol = (String) generateRandomValue(rnd, NativeTypes.stringOf(rnd.nextInt(255)));
+        obj.bytesCol = (byte[]) generateRandomValue(rnd, NativeTypes.blobOf(255));
+        obj.decimalCol = (BigDecimal) generateRandomValue(rnd, NativeTypes.decimalOf(10, 3));
 
         obj.nullLongCol = null;
         obj.nullBytesCol = null;

modules/platforms/dotnet/Apache.Ignite.Tests/Proto/ColocationHashTests.cs

@@ -86,8 +86,11 @@ public class ColocationHashTests : IgniteTestsBase
         ((char)BinaryTupleCommon.VarlenEmptyByte).ToString(),
         Guid.Empty,
         Guid.NewGuid(),
-        new LocalDate(9876, 7, 30),
-        new LocalDate(2, 1, 1),
+
+        // Maximum allowed DATE value.
+        new LocalDate(9999, 12, 31),
+
+        // Minimum allowed DATE value.
         new LocalDate(1, 1, 1),
         default(LocalDate),
         new LocalTime(9, 8, 7, 6),
@@ -96,10 +99,13 @@ public class ColocationHashTests : IgniteTestsBase
         LocalTime.Noon,
         LocalDateTime.FromDateTime(DateTime.UtcNow).TimeOfDay,
         default(LocalTime),
-        new LocalDateTime(year: 1, month: 1, day: 1, hour: 1, minute: 1, second: 1, millisecond: 1),
-        new LocalDateTime(year: 2022, month: 10, day: 22, hour: 10, minute: 30, second: 55, millisecond: 123),
+
+        // Minimum allowed DATETIME value.
+        new LocalDateTime(year: 1, month: 1, day: 1, hour: 18, minute: 0, second: 0, millisecond: 0),
+
+        // Maximum allowed DATETIME value.
+        new LocalDateTime(year: 9999, month: 12, day: 31, hour: 05, minute: 59, second: 59, millisecond: 999),
         LocalDateTime.FromDateTime(DateTime.UtcNow),
-        default(LocalDateTime),
         Instant.FromUnixTimeSeconds(0),
         default(Instant)
     };

modules/schema/src/main/java/org/apache/ignite/internal/schema/Column.java

@@ -19,9 +19,13 @@
 
 import static org.apache.ignite.internal.lang.IgniteStringFormatter.format;
 
+import java.time.Instant;
+import java.time.LocalDate;
+import java.time.LocalDateTime;
 import org.apache.ignite.internal.tostring.IgniteToStringExclude;
 import org.apache.ignite.internal.tostring.S;
 import org.apache.ignite.internal.type.NativeType;
+import org.apache.ignite.internal.type.NativeTypeSpec;
 import org.apache.ignite.internal.type.NativeTypes;
 import org.apache.ignite.internal.type.VarlenNativeType;
 import org.jetbrains.annotations.Nullable;
@@ -210,7 +214,7 @@ public void validate(@Nullable Object val) {
         if (objType != null && type.mismatch(objType)) {
             boolean specMatches = objType.spec() == type.spec();
 
-            if (specMatches &&  type instanceof VarlenNativeType) {
+            if (specMatches && type instanceof VarlenNativeType) {
                 String error = format("Value too long [column='{}', type={}]", name, type.displayName());
                 throw new InvalidTypeException(error);
             } else {
@@ -221,6 +225,25 @@ public void validate(@Nullable Object val) {
                 throw new InvalidTypeException(error);
             }
         }
+
+        if (val == null) {
+            return;
+        }
+
+        if (type.spec() == NativeTypeSpec.DATE) {
+            checkBounds((LocalDate) val, SchemaUtils.DATE_MIN, SchemaUtils.DATE_MAX);
+        } else if (type.spec() == NativeTypeSpec.DATETIME) {
+            checkBounds((LocalDateTime) val, SchemaUtils.DATETIME_MIN, SchemaUtils.DATETIME_MAX);
+        } else if (type.spec() == NativeTypeSpec.TIMESTAMP) {
+            checkBounds((Instant) val, SchemaUtils.TIMESTAMP_MIN, SchemaUtils.TIMESTAMP_MAX);
+        }
+    }
+
+    private <T extends Comparable<T>> void checkBounds(T value, T min, T max) {
+        if (value.compareTo(min) < 0 || value.compareTo(max) > 0) {
+            throw new ValueOutOfBoundsException(format("Value is out of allowed range"
+                    + " (column='{}', value='{}', min='{}', max='{}').", name, value, min, max));
+        }
     }
 
     /**

modules/schema/src/main/java/org/apache/ignite/internal/schema/SchemaUtils.java

@@ -17,6 +17,11 @@
 
 package org.apache.ignite.internal.schema;
 
+import java.time.Instant;
+import java.time.LocalDate;
+import java.time.LocalDateTime;
+import java.time.LocalTime;
+import java.time.ZoneOffset;
 import java.util.List;
 import org.apache.ignite.internal.catalog.descriptors.CatalogTableDescriptor;
 import org.apache.ignite.internal.schema.catalog.CatalogToSchemaDescriptorConverter;
@@ -27,6 +32,26 @@
  * Stateless schema utils that produces helper methods for schema preparation.
  */
 public class SchemaUtils {
+    /** Minimum allowed date value ({@code 0001-01-01}). */
+    public static final LocalDate DATE_MIN = LocalDate.of(1, 1, 1);
+
+    /** Maximum allowed date value ({@code 9999-12-31}). */
+    public static final LocalDate DATE_MAX = LocalDate.of(9999, 12, 31);
+
+    /** Minimum allowed datetime value ({@code 0001-01-01 18:00:00}). */
+    public static final LocalDateTime DATETIME_MIN =
+            LocalDateTime.of(DATE_MIN, LocalTime.MIN).minusSeconds(ZoneOffset.MIN.getTotalSeconds());
+
+    /** Maximum allowed datetime value ({@code 9999-12-31 05:59:59.999999999}). */
+    public static final LocalDateTime DATETIME_MAX =
+            LocalDateTime.of(DATE_MAX, LocalTime.MAX).minusSeconds(ZoneOffset.MAX.getTotalSeconds());
+
+    /** Minimum allowed timestamp value ({@code 0001-01-01 18:00:00 UTC}). */
+    public static final Instant TIMESTAMP_MIN = DATETIME_MIN.toInstant(ZoneOffset.UTC);
+
+    /** Maximum allowed timestamp value ({@code 9999-12-31 05:59:59.999999999 UTC}. */
+    public static final Instant TIMESTAMP_MAX = DATETIME_MAX.toInstant(ZoneOffset.UTC);
+
     /**
      * Creates schema descriptor for the table with specified descriptor.
      *

modules/schema/src/main/java/org/apache/ignite/internal/schema/ValueOutOfBoundsException.java

@@ -0,0 +1,35 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.apache.ignite.internal.schema;
+
+/**
+ * An exception thrown when an attempt to write value out of allowed range is performed.
+ */
+class ValueOutOfBoundsException extends SchemaMismatchException {
+    /** Serial version uid. */
+    private static final long serialVersionUID = 0L;
+
+    /**
+     * Constructor.
+     *
+     * @param msg Error message.
+     */
+    ValueOutOfBoundsException(String msg) {
+        super(msg);
+    }
+}