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/07/18 15:32:02 UTC
[flink] 04/06: [FLINK-13078][table-common] Simplify serializable
string representation for parsers
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
commit f6c65fc2d8e2817b823172a65a54df9a0361371a
Author: Timo Walther <tw...@apache.org>
AuthorDate: Wed Jul 10 08:46:29 2019 +0200
[FLINK-13078][table-common] Simplify serializable string representation for parsers
---
.../java/org/apache/flink/table/types/logical/AnyType.java | 4 ++--
.../org/apache/flink/table/types/logical/SymbolType.java | 2 +-
.../flink/table/types/logical/TypeInformationAnyType.java | 2 +-
.../java/org/apache/flink/table/types/LogicalTypesTest.java | 12 ++++++------
4 files changed, 10 insertions(+), 10 deletions(-)
diff --git a/flink-table/flink-table-common/src/main/java/org/apache/flink/table/types/logical/AnyType.java b/flink-table/flink-table-common/src/main/java/org/apache/flink/table/types/logical/AnyType.java
index ba849ca..82e805d 100644
--- a/flink-table/flink-table-common/src/main/java/org/apache/flink/table/types/logical/AnyType.java
+++ b/flink-table/flink-table-common/src/main/java/org/apache/flink/table/types/logical/AnyType.java
@@ -35,7 +35,7 @@ import java.util.Set;
* Logical type of an arbitrary serialized type. This type is a black box within the table ecosystem
* and is only deserialized at the edges. The any type is an extension to the SQL standard.
*
- * <p>The serialized string representation is {@code ANY(c, s)} where {@code c} is the originating
+ * <p>The serialized string representation is {@code ANY('c', 's')} where {@code c} is the originating
* class and {@code s} is the serialized {@link TypeSerializerSnapshot} in Base64 encoding.
*
* @param <T> originating class for this type
@@ -43,7 +43,7 @@ import java.util.Set;
@PublicEvolving
public final class AnyType<T> extends LogicalType {
- private static final String FORMAT = "ANY(%s, %s)";
+ private static final String FORMAT = "ANY('%s', '%s')";
private static final Set<String> INPUT_OUTPUT_CONVERSION = conversionSet(
byte[].class.getName(),
diff --git a/flink-table/flink-table-common/src/main/java/org/apache/flink/table/types/logical/SymbolType.java b/flink-table/flink-table-common/src/main/java/org/apache/flink/table/types/logical/SymbolType.java
index c57857c..643e10f 100644
--- a/flink-table/flink-table-common/src/main/java/org/apache/flink/table/types/logical/SymbolType.java
+++ b/flink-table/flink-table-common/src/main/java/org/apache/flink/table/types/logical/SymbolType.java
@@ -40,7 +40,7 @@ import java.util.Objects;
@PublicEvolving
public final class SymbolType<T extends TableSymbol> extends LogicalType {
- private static final String FORMAT = "SYMBOL(%s)";
+ private static final String FORMAT = "SYMBOL('%s')";
private final Class<T> symbolClass;
diff --git a/flink-table/flink-table-common/src/main/java/org/apache/flink/table/types/logical/TypeInformationAnyType.java b/flink-table/flink-table-common/src/main/java/org/apache/flink/table/types/logical/TypeInformationAnyType.java
index 2c1c0dc..9e64044 100644
--- a/flink-table/flink-table-common/src/main/java/org/apache/flink/table/types/logical/TypeInformationAnyType.java
+++ b/flink-table/flink-table-common/src/main/java/org/apache/flink/table/types/logical/TypeInformationAnyType.java
@@ -49,7 +49,7 @@ import java.util.Set;
@PublicEvolving
public final class TypeInformationAnyType<T> extends LogicalType {
- private static final String FORMAT = "ANY(%s, ?)";
+ private static final String FORMAT = "ANY('%s', ?)";
private static final Set<String> INPUT_OUTPUT_CONVERSION = conversionSet(
byte[].class.getName(),
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 edf28cf..49feb47 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
@@ -557,7 +557,7 @@ public class LogicalTypesTest {
testEquality(anyType, new TypeInformationAnyType<>(Types.TUPLE(Types.STRING, Types.LONG)));
- testStringSummary(anyType, "ANY(org.apache.flink.api.java.tuple.Tuple2, ?)");
+ testStringSummary(anyType, "ANY('org.apache.flink.api.java.tuple.Tuple2', ?)");
testNullability(anyType);
@@ -572,8 +572,8 @@ public class LogicalTypesTest {
public void testAnyType() {
testAll(
new AnyType<>(Human.class, new KryoSerializer<>(Human.class, new ExecutionConfig())),
- "ANY(org.apache.flink.table.types.LogicalTypesTest$Human, " +
- "AEdvcmcuYXBhY2hlLmZsaW5rLmFwaS5qYXZhLnR5cGV1dGlscy5ydW50aW1lLmtyeW8uS3J5b1Nlcml" +
+ "ANY('org.apache.flink.table.types.LogicalTypesTest$Human', " +
+ "'AEdvcmcuYXBhY2hlLmZsaW5rLmFwaS5qYXZhLnR5cGV1dGlscy5ydW50aW1lLmtyeW8uS3J5b1Nlcml" +
"hbGl6ZXJTbmFwc2hvdAAAAAIAM29yZy5hcGFjaGUuZmxpbmsudGFibGUudHlwZXMuTG9naWNhbFR5cG" +
"VzVGVzdCRIdW1hbgAABPLGmj1wAAAAAgAzb3JnLmFwYWNoZS5mbGluay50YWJsZS50eXBlcy5Mb2dpY" +
"2FsVHlwZXNUZXN0JEh1bWFuAQAAADUAM29yZy5hcGFjaGUuZmxpbmsudGFibGUudHlwZXMuTG9naWNh" +
@@ -583,8 +583,8 @@ public class LogicalTypesTest {
"mcuYXBhY2hlLmZsaW5rLmFwaS5qYXZhLnR5cGV1dGlscy5ydW50aW1lLmtyeW8uU2VyaWFsaXplcnMk" +
"RHVtbXlBdnJvUmVnaXN0ZXJlZENsYXNzAAAAAQBZb3JnLmFwYWNoZS5mbGluay5hcGkuamF2YS50eXB" +
"ldXRpbHMucnVudGltZS5rcnlvLlNlcmlhbGl6ZXJzJER1bW15QXZyb0tyeW9TZXJpYWxpemVyQ2xhc3" +
- "MAAATyxpo9cAAAAAAAAATyxpo9cAAAAAA=)",
- "ANY(org.apache.flink.table.types.LogicalTypesTest$Human, ...)",
+ "MAAATyxpo9cAAAAAAAAATyxpo9cAAAAAA=')",
+ "ANY('org.apache.flink.table.types.LogicalTypesTest$Human', '...')",
new Class[]{Human.class, User.class}, // every User is Human
new Class[]{Human.class},
new LogicalType[]{},
@@ -598,7 +598,7 @@ public class LogicalTypesTest {
testEquality(symbolType, new SymbolType<>(TimePointUnit.class));
- testStringSummary(symbolType, "SYMBOL(" + TimeIntervalUnit.class.getName() + ")");
+ testStringSummary(symbolType, "SYMBOL('" + TimeIntervalUnit.class.getName() + "')");
testNullability(symbolType);