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 2020/05/16 11:00:30 UTC
[flink] 01/05: [hotfix][table-common] Reduce conversion classes of
BINARY/VARBINARY
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 d25af465f696ee8767bb9f6f8e5dd6c60f713cb4
Author: Timo Walther <tw...@apache.org>
AuthorDate: Wed May 13 16:54:39 2020 +0200
[hotfix][table-common] Reduce conversion classes of BINARY/VARBINARY
---
.../java/org/apache/flink/table/types/logical/BinaryType.java | 10 +++-------
.../org/apache/flink/table/types/logical/VarBinaryType.java | 10 +++-------
2 files changed, 6 insertions(+), 14 deletions(-)
diff --git a/flink-table/flink-table-common/src/main/java/org/apache/flink/table/types/logical/BinaryType.java b/flink-table/flink-table-common/src/main/java/org/apache/flink/table/types/logical/BinaryType.java
index c8844c0..bf4d0c4 100644
--- a/flink-table/flink-table-common/src/main/java/org/apache/flink/table/types/logical/BinaryType.java
+++ b/flink-table/flink-table-common/src/main/java/org/apache/flink/table/types/logical/BinaryType.java
@@ -21,12 +21,10 @@ package org.apache.flink.table.types.logical;
import org.apache.flink.annotation.PublicEvolving;
import org.apache.flink.table.api.TableException;
import org.apache.flink.table.api.ValidationException;
-import org.apache.flink.table.data.ArrayData;
import java.util.Collections;
import java.util.List;
import java.util.Objects;
-import java.util.Set;
/**
* Logical type of a fixed-length binary string (=a sequence of bytes).
@@ -51,9 +49,7 @@ public final class BinaryType extends LogicalType {
private static final String FORMAT = "BINARY(%d)";
- private static final Set<String> INPUT_OUTPUT_CONVERSION = conversionSet(
- byte[].class.getName(),
- ArrayData.class.getName());
+ private static final Class<?> INPUT_OUTPUT_CONVERSION = byte[].class;
private static final Class<?> DEFAULT_CONVERSION = byte[].class;
@@ -125,12 +121,12 @@ public final class BinaryType extends LogicalType {
@Override
public boolean supportsInputConversion(Class<?> clazz) {
- return INPUT_OUTPUT_CONVERSION.contains(clazz.getName());
+ return INPUT_OUTPUT_CONVERSION == clazz;
}
@Override
public boolean supportsOutputConversion(Class<?> clazz) {
- return INPUT_OUTPUT_CONVERSION.contains(clazz.getName());
+ return INPUT_OUTPUT_CONVERSION == clazz;
}
@Override
diff --git a/flink-table/flink-table-common/src/main/java/org/apache/flink/table/types/logical/VarBinaryType.java b/flink-table/flink-table-common/src/main/java/org/apache/flink/table/types/logical/VarBinaryType.java
index 2253f7e..77b063a 100644
--- a/flink-table/flink-table-common/src/main/java/org/apache/flink/table/types/logical/VarBinaryType.java
+++ b/flink-table/flink-table-common/src/main/java/org/apache/flink/table/types/logical/VarBinaryType.java
@@ -21,12 +21,10 @@ package org.apache.flink.table.types.logical;
import org.apache.flink.annotation.PublicEvolving;
import org.apache.flink.table.api.TableException;
import org.apache.flink.table.api.ValidationException;
-import org.apache.flink.table.data.ArrayData;
import java.util.Collections;
import java.util.List;
import java.util.Objects;
-import java.util.Set;
/**
* Logical type of a variable-length binary string (=a sequence of bytes).
@@ -54,9 +52,7 @@ public final class VarBinaryType extends LogicalType {
private static final String MAX_FORMAT = "BYTES";
- private static final Set<String> INPUT_OUTPUT_CONVERSION = conversionSet(
- byte[].class.getName(),
- ArrayData.class.getName());
+ private static final Class<?> INPUT_OUTPUT_CONVERSION = byte[].class;
private static final Class<?> DEFAULT_CONVERSION = byte[].class;
@@ -133,12 +129,12 @@ public final class VarBinaryType extends LogicalType {
@Override
public boolean supportsInputConversion(Class<?> clazz) {
- return INPUT_OUTPUT_CONVERSION.contains(clazz.getName());
+ return INPUT_OUTPUT_CONVERSION == clazz;
}
@Override
public boolean supportsOutputConversion(Class<?> clazz) {
- return INPUT_OUTPUT_CONVERSION.contains(clazz.getName());
+ return INPUT_OUTPUT_CONVERSION == clazz;
}
@Override