Merge pull request #1 from syucream/flink-pb-format-java11

Use BinaryStringData directly to keep java8 compatibility
apache · Jan 7, 2021 · a9a50e7 · a9a50e7
2 parents 6b2d6e0 + 64dc032
commit a9a50e7
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 2 deletions.
diff --git a/.../main/java/org/apache/flink/formats/protobuf/deserialize/PbCodegenSimpleDeserializer.java b/.../main/java/org/apache/flink/formats/protobuf/deserialize/PbCodegenSimpleDeserializer.java
@@ -45,7 +45,8 @@ public String codegen(String returnVarName, String messageGetStr) {
 			case STRING:
 			case ENUM:
 				sb.append(
-					returnVarName + " = StringData.fromString(" + messageGetStr + ".toString());");
+					returnVarName + " = BinaryStringData.fromString(" + messageGetStr
+						+ ".toString());");
 				break;
 		}
 		return sb.toString();

diff --git a/...obuf/src/main/java/org/apache/flink/formats/protobuf/deserialize/ProtoToRowConverter.java b/...obuf/src/main/java/org/apache/flink/formats/protobuf/deserialize/ProtoToRowConverter.java
@@ -28,6 +28,7 @@
 import org.apache.flink.table.data.GenericRowData;
 import org.apache.flink.table.data.RowData;
 import org.apache.flink.table.data.StringData;
+import org.apache.flink.table.data.binary.BinaryStringData;
 import org.apache.flink.table.types.logical.RowType;
 
 import com.google.protobuf.Descriptors;
@@ -63,7 +64,7 @@ public ProtoToRowConverter(
 			se.setDefaultImports(
 				RowData.class.getName(),
 				ArrayData.class.getName(),
-				StringData.class.getName(),
+				BinaryStringData.class.getName(),
 				GenericRowData.class.getName(),
 				GenericMapData.class.getName(),
 				GenericArrayData.class.getName(),