You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@flink.apache.org by tw...@apache.org on 2019/05/03 14:27:49 UTC

[flink] branch master updated: [FLINK-12253][table-common] Add a DATE type

This is an automated email from the ASF dual-hosted git repository.

twalthr pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/flink.git


The following commit(s) were added to refs/heads/master by this push:
     new 22de460  [FLINK-12253][table-common] Add a DATE type
22de460 is described below

commit 22de460167babfbe99eeb73c943995cb8116df2f
Author: Timo Walther <tw...@apache.org>
AuthorDate: Thu May 2 09:24:12 2019 +0200

    [FLINK-12253][table-common] Add a DATE type
---
 .../apache/flink/table/types/logical/DateType.java | 96 ++++++++++++++++++++++
 .../table/types/logical/LogicalTypeVisitor.java    |  2 +
 .../apache/flink/table/types/LogicalTypesTest.java | 14 ++++
 3 files changed, 112 insertions(+)

diff --git a/flink-table/flink-table-common/src/main/java/org/apache/flink/table/types/logical/DateType.java b/flink-table/flink-table-common/src/main/java/org/apache/flink/table/types/logical/DateType.java
new file mode 100644
index 0000000..6c81a71
--- /dev/null
+++ b/flink-table/flink-table-common/src/main/java/org/apache/flink/table/types/logical/DateType.java
@@ -0,0 +1,96 @@
+/*
+ * 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.flink.table.types.logical;
+
+import org.apache.flink.annotation.PublicEvolving;
+
+import java.util.Collections;
+import java.util.List;
+import java.util.Set;
+
+/**
+ * Logical type of a date consisting of {@code year-month-day} with values ranging from {@code 0000-01-01}
+ * to {@code 9999-12-31}. Compared to the SQL standard, the range starts at year {@code 0000}.
+ *
+ * <p>The serialized string representation is {@code DATE}.
+ *
+ * <p>A conversion from and to {@code int} describes the number of days since epoch.
+ */
+@PublicEvolving
+public final class DateType extends LogicalType {
+
+	private static final String FORMAT = "DATE";
+
+	private static final Set<String> NULL_OUTPUT_CONVERSION = conversionSet(
+		java.sql.Date.class.getName(),
+		java.time.LocalDate.class.getName());
+
+	private static final Set<String> NOT_NULL_INPUT_OUTPUT_CONVERSION = conversionSet(
+		java.sql.Date.class.getName(),
+		java.time.LocalDate.class.getName(),
+		int.class.getName());
+
+	private static final Class<?> DEFAULT_CONVERSION = java.time.LocalDate.class;
+
+	public DateType(boolean isNullable) {
+		super(isNullable, LogicalTypeRoot.DATE);
+	}
+
+	public DateType() {
+		this(true);
+	}
+
+	@Override
+	public LogicalType copy(boolean isNullable) {
+		return new DateType(isNullable);
+	}
+
+	@Override
+	public String asSerializableString() {
+		return withNullability(FORMAT);
+	}
+
+	@Override
+	public boolean supportsInputConversion(Class<?> clazz) {
+		return NOT_NULL_INPUT_OUTPUT_CONVERSION.contains(clazz.getName());
+	}
+
+	@Override
+	public boolean supportsOutputConversion(Class<?> clazz) {
+		if (isNullable()) {
+			return NULL_OUTPUT_CONVERSION.contains(clazz.getName());
+		}
+		return NOT_NULL_INPUT_OUTPUT_CONVERSION.contains(clazz.getName());
+	}
+
+	@Override
+	public Class<?> getDefaultConversion() {
+		return DEFAULT_CONVERSION;
+	}
+
+	@Override
+	public List<LogicalType> getChildren() {
+		return Collections.emptyList();
+	}
+
+	@Override
+	public <R> R accept(LogicalTypeVisitor<R> visitor) {
+		return visitor.visit(this);
+	}
+}
diff --git a/flink-table/flink-table-common/src/main/java/org/apache/flink/table/types/logical/LogicalTypeVisitor.java b/flink-table/flink-table-common/src/main/java/org/apache/flink/table/types/logical/LogicalTypeVisitor.java
index 6567ced..ceefad0 100644
--- a/flink-table/flink-table-common/src/main/java/org/apache/flink/table/types/logical/LogicalTypeVisitor.java
+++ b/flink-table/flink-table-common/src/main/java/org/apache/flink/table/types/logical/LogicalTypeVisitor.java
@@ -53,5 +53,7 @@ public interface LogicalTypeVisitor<R> {
 
 	R visit(DoubleType doubleType);
 
+	R visit(DateType dateType);
+
 	R visit(LogicalType other);
 }
diff --git a/flink-table/flink-table-common/src/test/java/org/apache/flink/table/types/LogicalTypesTest.java b/flink-table/flink-table-common/src/test/java/org/apache/flink/table/types/LogicalTypesTest.java
index 9ba540a..ac6dab0 100644
--- a/flink-table/flink-table-common/src/test/java/org/apache/flink/table/types/LogicalTypesTest.java
+++ b/flink-table/flink-table-common/src/test/java/org/apache/flink/table/types/LogicalTypesTest.java
@@ -22,6 +22,7 @@ import org.apache.flink.table.types.logical.BigIntType;
 import org.apache.flink.table.types.logical.BinaryType;
 import org.apache.flink.table.types.logical.BooleanType;
 import org.apache.flink.table.types.logical.CharType;
+import org.apache.flink.table.types.logical.DateType;
 import org.apache.flink.table.types.logical.DecimalType;
 import org.apache.flink.table.types.logical.DoubleType;
 import org.apache.flink.table.types.logical.FloatType;
@@ -205,6 +206,19 @@ public class LogicalTypesTest {
 		);
 	}
 
+	@Test
+	public void testDateType() {
+		testAll(
+			new DateType(),
+			"DATE",
+			"DATE",
+			new Class[]{java.sql.Date.class, java.time.LocalDate.class, int.class},
+			new Class[]{java.time.LocalDate.class},
+			new LogicalType[]{},
+			new DateType(false)
+		);
+	}
+
 	// --------------------------------------------------------------------------------------------
 
 	private static void testAll(