[hotfix][table-common] Summarize VARBINARY(Int.MAX) to BYTES

arganzheng · May 16, 2019 · 529dcbb · 529dcbb
1 parent 6a293ee
commit 529dcbb
Show file tree

Hide file tree

Showing 2 changed files with 25 additions and 1 deletion.
diff --git a/.../flink-table-common/src/main/java/org/apache/flink/table/types/logical/VarBinaryType.java b/.../flink-table-common/src/main/java/org/apache/flink/table/types/logical/VarBinaryType.java
@@ -31,7 +31,8 @@
  *
  * <p>The serialized string representation is {@code VARBINARY(n)} where {@code n} is the maximum
  * number of bytes. {@code n} must have a value between 1 and {@link Integer#MAX_VALUE} (both
- * inclusive). If no length is specified, {@code n} is equal to 1.
+ * inclusive). If no length is specified, {@code n} is equal to 1. {@code BYTES} is a synonym for
+ * {@code VARBINARY(2147483647)}.
  */
 @PublicEvolving
 public final class VarBinaryType extends LogicalType {
@@ -44,6 +45,8 @@ public final class VarBinaryType extends LogicalType {
 
 	private static final String FORMAT = "VARBINARY(%d)";
 
+	private static final String MAX_FORMAT = "BYTES";
+
 	private static final Set<String> INPUT_OUTPUT_CONVERSION = conversionSet(
 		byte[].class.getName(),
 		"org.apache.flink.table.dataformat.BinaryArray");
@@ -86,6 +89,14 @@ public String asSerializableString() {
 		return withNullability(FORMAT, length);
 	}
 
+	@Override
+	public String asSummaryString() {
+		if (length == MAX_LENGTH) {
+			return withNullability(MAX_FORMAT);
+		}
+		return withNullability(FORMAT, length);
+	}
+
 	@Override
 	public boolean supportsInputConversion(Class<?> clazz) {
 		return INPUT_OUTPUT_CONVERSION.contains(clazz.getName());

diff --git a/...table/flink-table-common/src/test/java/org/apache/flink/table/types/LogicalTypesTest.java b/...table/flink-table-common/src/test/java/org/apache/flink/table/types/LogicalTypesTest.java
@@ -155,6 +155,19 @@ public void testVarBinaryType() {
 		);
 	}
 
+	@Test
+	public void testVarBinaryTypeWithMaximumLength() {
+		testAll(
+			new VarBinaryType(Integer.MAX_VALUE),
+			"VARBINARY(2147483647)",
+			"BYTES",
+			new Class[]{byte[].class},
+			new Class[]{byte[].class},
+			new LogicalType[]{},
+			new VarBinaryType(12)
+		);
+	}
+
 	@Test
 	public void testDecimalType() {
 		testAll(