You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@doris.apache.org by mo...@apache.org on 2021/11/13 09:10:33 UTC
[incubator-doris] branch master updated: [Feature] Support Flink and Spark connector support String type (#7075)
This is an automated email from the ASF dual-hosted git repository.
morningman pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-doris.git
The following commit(s) were added to refs/heads/master by this push:
new 88651a4 [Feature] Support Flink and Spark connector support String type (#7075)
88651a4 is described below
commit 88651a47c7fa5a4f7536430965710bb5abc8647b
Author: wudi <67...@qq.com>
AuthorDate: Sat Nov 13 17:10:22 2021 +0800
[Feature] Support Flink and Spark connector support String type (#7075)
Support String type for Flink and Spark connector
---
.../main/java/org/apache/doris/flink/serialization/RowBatch.java | 1 +
.../flink-doris-connector/src/main/thrift/doris/Types.thrift | 8 +++++++-
.../main/java/org/apache/doris/spark/serialization/RowBatch.java | 1 +
.../spark-doris-connector/src/main/thrift/doris/Types.thrift | 8 +++++++-
4 files changed, 16 insertions(+), 2 deletions(-)
diff --git a/extension/flink-doris-connector/src/main/java/org/apache/doris/flink/serialization/RowBatch.java b/extension/flink-doris-connector/src/main/java/org/apache/doris/flink/serialization/RowBatch.java
index 00c699b..3337637 100644
--- a/extension/flink-doris-connector/src/main/java/org/apache/doris/flink/serialization/RowBatch.java
+++ b/extension/flink-doris-connector/src/main/java/org/apache/doris/flink/serialization/RowBatch.java
@@ -251,6 +251,7 @@ public class RowBatch {
case "DATETIME":
case "CHAR":
case "VARCHAR":
+ case "STRING":
Preconditions.checkArgument(mt.equals(Types.MinorType.VARCHAR),
typeMismatchMessage(currentType, mt));
VarCharVector varCharVector = (VarCharVector) curFieldVector;
diff --git a/extension/flink-doris-connector/src/main/thrift/doris/Types.thrift b/extension/flink-doris-connector/src/main/thrift/doris/Types.thrift
index 2d902ba..44ce606 100644
--- a/extension/flink-doris-connector/src/main/thrift/doris/Types.thrift
+++ b/extension/flink-doris-connector/src/main/thrift/doris/Types.thrift
@@ -73,7 +73,13 @@ enum TPrimitiveType {
VARCHAR,
HLL,
DECIMALV2,
- TIME
+ TIME,
+ OBJECT,
+ ARRAY,
+ MAP,
+ STRUCT,
+ STRING,
+ ALL
}
enum TTypeNodeType {
diff --git a/extension/spark-doris-connector/src/main/java/org/apache/doris/spark/serialization/RowBatch.java b/extension/spark-doris-connector/src/main/java/org/apache/doris/spark/serialization/RowBatch.java
index ad3cfe5..bcc76d5 100644
--- a/extension/spark-doris-connector/src/main/java/org/apache/doris/spark/serialization/RowBatch.java
+++ b/extension/spark-doris-connector/src/main/java/org/apache/doris/spark/serialization/RowBatch.java
@@ -256,6 +256,7 @@ public class RowBatch {
case "LARGEINT":
case "CHAR":
case "VARCHAR":
+ case "STRING":
Preconditions.checkArgument(mt.equals(Types.MinorType.VARCHAR),
typeMismatchMessage(currentType, mt));
VarCharVector varCharVector = (VarCharVector) curFieldVector;
diff --git a/extension/spark-doris-connector/src/main/thrift/doris/Types.thrift b/extension/spark-doris-connector/src/main/thrift/doris/Types.thrift
index 2d902ba..44ce606 100644
--- a/extension/spark-doris-connector/src/main/thrift/doris/Types.thrift
+++ b/extension/spark-doris-connector/src/main/thrift/doris/Types.thrift
@@ -73,7 +73,13 @@ enum TPrimitiveType {
VARCHAR,
HLL,
DECIMALV2,
- TIME
+ TIME,
+ OBJECT,
+ ARRAY,
+ MAP,
+ STRUCT,
+ STRING,
+ ALL
}
enum TTypeNodeType {
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@doris.apache.org
For additional commands, e-mail: commits-help@doris.apache.org