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 2022/02/11 15:35:40 UTC
[incubator-doris-flink-connector] 30/32: [fix](httpv2) make http v2 and v1 interface compatible (#7848)
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-flink-connector.git
commit ea65872e1bf12e9a68c55bd909ec812c9b9696c8
Author: jiafeng.zhang <zh...@gmail.com>
AuthorDate: Mon Jan 31 22:12:34 2022 +0800
[fix](httpv2) make http v2 and v1 interface compatible (#7848)
http v2 TableSchemaAction adds the return value of aggregation_type,
and modifies the corresponding code of Flink/Spark Connector
---
src/main/java/org/apache/doris/flink/rest/SchemaUtils.java | 2 +-
src/main/java/org/apache/doris/flink/rest/models/Field.java | 12 +++++++++++-
src/main/java/org/apache/doris/flink/rest/models/Schema.java | 4 ++--
.../org/apache/doris/flink/serialization/TestRowBatch.java | 4 ++--
4 files changed, 16 insertions(+), 6 deletions(-)
diff --git a/src/main/java/org/apache/doris/flink/rest/SchemaUtils.java b/src/main/java/org/apache/doris/flink/rest/SchemaUtils.java
index 13bde01..5c64556 100644
--- a/src/main/java/org/apache/doris/flink/rest/SchemaUtils.java
+++ b/src/main/java/org/apache/doris/flink/rest/SchemaUtils.java
@@ -33,7 +33,7 @@ public class SchemaUtils {
*/
public static Schema convertToSchema(List<TScanColumnDesc> tscanColumnDescs) {
Schema schema = new Schema(tscanColumnDescs.size());
- tscanColumnDescs.stream().forEach(desc -> schema.put(new Field(desc.getName(), desc.getType().name(), "", 0, 0)));
+ tscanColumnDescs.stream().forEach(desc -> schema.put(new Field(desc.getName(), desc.getType().name(), "", 0, 0, "")));
return schema;
}
}
diff --git a/src/main/java/org/apache/doris/flink/rest/models/Field.java b/src/main/java/org/apache/doris/flink/rest/models/Field.java
index 9a58180..04341bf 100644
--- a/src/main/java/org/apache/doris/flink/rest/models/Field.java
+++ b/src/main/java/org/apache/doris/flink/rest/models/Field.java
@@ -25,16 +25,26 @@ public class Field {
private String comment;
private int precision;
private int scale;
+ private String aggregation_type;
public Field() {
}
- public Field(String name, String type, String comment, int precision, int scale) {
+ public Field(String name, String type, String comment, int precision, int scale, String aggregation_type) {
this.name = name;
this.type = type;
this.comment = comment;
this.precision = precision;
this.scale = scale;
+ this.aggregation_type = aggregation_type;
+ }
+
+ public String getAggregation_type() {
+ return aggregation_type;
+ }
+
+ public void setAggregation_type(String aggregation_type) {
+ this.aggregation_type = aggregation_type;
}
public String getName() {
diff --git a/src/main/java/org/apache/doris/flink/rest/models/Schema.java b/src/main/java/org/apache/doris/flink/rest/models/Schema.java
index e274352..264e736 100644
--- a/src/main/java/org/apache/doris/flink/rest/models/Schema.java
+++ b/src/main/java/org/apache/doris/flink/rest/models/Schema.java
@@ -58,8 +58,8 @@ public class Schema {
this.properties = properties;
}
- public void put(String name, String type, String comment, int scale, int precision) {
- properties.add(new Field(name, type, comment, scale, precision));
+ public void put(String name, String type, String comment, int scale, int precision, String aggregation_type) {
+ properties.add(new Field(name, type, comment, scale, precision, aggregation_type));
}
public void put(Field f) {
diff --git a/src/test/java/org/apache/doris/flink/serialization/TestRowBatch.java b/src/test/java/org/apache/doris/flink/serialization/TestRowBatch.java
index ac19066..0f45aaa 100644
--- a/src/test/java/org/apache/doris/flink/serialization/TestRowBatch.java
+++ b/src/test/java/org/apache/doris/flink/serialization/TestRowBatch.java
@@ -232,8 +232,8 @@ public class TestRowBatch {
+ "\"name\":\"k4\",\"comment\":\"\"},{\"type\":\"FLOAT\",\"name\":\"k9\",\"comment\":\"\"},"
+ "{\"type\":\"DOUBLE\",\"name\":\"k8\",\"comment\":\"\"},{\"type\":\"DATE\",\"name\":\"k10\","
+ "\"comment\":\"\"},{\"type\":\"DATETIME\",\"name\":\"k11\",\"comment\":\"\"},"
- + "{\"name\":\"k5\",\"scale\":\"9\",\"comment\":\"\","
- + "\"type\":\"DECIMAL\",\"precision\":\"2\"},{\"type\":\"CHAR\",\"name\":\"k6\",\"comment\":\"\"}],"
+ + "{\"name\":\"k5\",\"scale\":\"0\",\"comment\":\"\","
+ + "\"type\":\"DECIMAL\",\"precision\":\"9\",\"aggregation_type\":\"\"},{\"type\":\"CHAR\",\"name\":\"k6\",\"comment\":\"\",\"aggregation_type\":\"REPLACE_IF_NOT_NULL\"}],"
+ "\"status\":200}";
Schema schema = RestService.parseSchema(schemaStr, logger);
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@doris.apache.org
For additional commands, e-mail: commits-help@doris.apache.org