This is an automated email from the ASF dual-hosted git repository.
dockerzhang pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/inlong.git
The following commit(s) were added to refs/heads/master by this push:
new 160d7dd60 [INLONG-4735][Sort] Add precision support for
DecimalFormatInfo, TimeFormatInfo (#4736)
160d7dd60 is described below
commit 160d7dd60a61ebc58417fa013ddae0fca1df0776
Author: yunqingmoswu <[email protected]>
AuthorDate: Wed Jun 22 18:11:43 2022 +0800
[INLONG-4735][Sort] Add precision support for DecimalFormatInfo,
TimeFormatInfo (#4736)
---
.../sort/parser/DecimalFormatSqlParseTest.java | 109 +++++++++++++++++++++
.../inlong/sort/formats/base/TableFormatUtils.java | 5 +-
.../sort/formats/common/DecimalFormatInfo.java | 44 ++++++++-
.../inlong/sort/formats/common/TimeFormatInfo.java | 37 ++++---
.../inlong/sort/formats/common/TypeInfo.java | 3 +-
5 files changed, 183 insertions(+), 15 deletions(-)
diff --git
a/inlong-sort/sort-core/src/test/java/org/apache/inlong/sort/parser/DecimalFormatSqlParseTest.java
b/inlong-sort/sort-core/src/test/java/org/apache/inlong/sort/parser/DecimalFormatSqlParseTest.java
new file mode 100644
index 000000000..c7e96239c
--- /dev/null
+++
b/inlong-sort/sort-core/src/test/java/org/apache/inlong/sort/parser/DecimalFormatSqlParseTest.java
@@ -0,0 +1,109 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.apache.inlong.sort.parser;
+
+import org.apache.flink.streaming.api.environment.StreamExecutionEnvironment;
+import org.apache.flink.table.api.EnvironmentSettings;
+import org.apache.flink.table.api.bridge.java.StreamTableEnvironment;
+import org.apache.flink.test.util.AbstractTestBase;
+import org.apache.inlong.sort.formats.common.DecimalFormatInfo;
+import org.apache.inlong.sort.formats.common.LongFormatInfo;
+import org.apache.inlong.sort.parser.impl.FlinkSqlParser;
+import org.apache.inlong.sort.parser.result.ParseResult;
+import org.apache.inlong.sort.protocol.FieldInfo;
+import org.apache.inlong.sort.protocol.GroupInfo;
+import org.apache.inlong.sort.protocol.StreamInfo;
+import org.apache.inlong.sort.protocol.enums.KafkaScanStartupMode;
+import org.apache.inlong.sort.protocol.node.Node;
+import org.apache.inlong.sort.protocol.node.extract.KafkaExtractNode;
+import org.apache.inlong.sort.protocol.node.format.CanalJsonFormat;
+import org.apache.inlong.sort.protocol.node.load.KafkaLoadNode;
+import org.apache.inlong.sort.protocol.transformation.FieldRelation;
+import org.apache.inlong.sort.protocol.transformation.relation.NodeRelation;
+import org.junit.Assert;
+import org.junit.Test;
+
+import java.util.Arrays;
+import java.util.Collections;
+import java.util.List;
+import java.util.stream.Collectors;
+
+/**
+ * Test for {@link DecimalFormatInfo} and {@link FlinkSqlParser}
+ */
+public class DecimalFormatSqlParseTest extends AbstractTestBase {
+
+ private KafkaExtractNode buildKafkaExtractNode() {
+ List<FieldInfo> fields = Arrays.asList(new FieldInfo("id", new
LongFormatInfo()),
+ new FieldInfo("salary", new DecimalFormatInfo(13, 9)));
+ return new KafkaExtractNode("1", "kafka_input", fields, null,
+ null, "kafka_input", "localhost:9092",
+ new CanalJsonFormat(), KafkaScanStartupMode.EARLIEST_OFFSET,
+ null, "groupId_1");
+ }
+
+ private KafkaLoadNode buildKafkaLoadNode() {
+ List<FieldInfo> fields = Arrays.asList(new FieldInfo("id", new
LongFormatInfo()),
+ new FieldInfo("salary", new DecimalFormatInfo(13, 9)));
+ List<FieldRelation> relations = Arrays
+ .asList(new FieldRelation(new FieldInfo("id", new
LongFormatInfo()),
+ new FieldInfo("id", new LongFormatInfo())),
+ new FieldRelation(new FieldInfo("salary", new
DecimalFormatInfo(13, 9)),
+ new FieldInfo("salary", new
DecimalFormatInfo(13, 9)))
+ );
+ return new KafkaLoadNode("2", "kafka_output", fields, relations, null,
+ null, "kafka_output", "localhost:9092",
+ new CanalJsonFormat(), null,
+ null, null);
+ }
+
+ public NodeRelation buildNodeRelation(List<Node> inputs, List<Node>
outputs) {
+ List<String> inputIds =
inputs.stream().map(Node::getId).collect(Collectors.toList());
+ List<String> outputIds =
outputs.stream().map(Node::getId).collect(Collectors.toList());
+ return new NodeRelation(inputIds, outputIds);
+ }
+
+ /**
+ * Test precision, scale for {@link DecimalFormatInfo}
+ *
+ * @throws Exception The exception may throws when executing
+ */
+ @Test
+ public void testDecimalFormatSqlParse() throws Exception {
+ EnvironmentSettings settings = EnvironmentSettings
+ .newInstance()
+ .useBlinkPlanner()
+ .inStreamingMode()
+ .build();
+ StreamExecutionEnvironment env =
StreamExecutionEnvironment.getExecutionEnvironment();
+ env.setParallelism(1);
+ env.enableCheckpointing(10000);
+ StreamTableEnvironment tableEnv = StreamTableEnvironment.create(env,
settings);
+ Node inputNode = buildKafkaExtractNode();
+ Node outputNode = buildKafkaLoadNode();
+ StreamInfo streamInfo = new StreamInfo("1", Arrays.asList(inputNode,
outputNode),
+ Collections.singletonList(
+
buildNodeRelation(Collections.singletonList(inputNode),
Collections.singletonList(outputNode))
+ ));
+ GroupInfo groupInfo = new GroupInfo("1",
Collections.singletonList(streamInfo));
+ FlinkSqlParser parser = FlinkSqlParser.getInstance(tableEnv,
groupInfo);
+ ParseResult result = parser.parse();
+ Assert.assertTrue(result.tryExecute());
+ }
+
+}
diff --git
a/inlong-sort/sort-formats/format-base/src/main/java/org/apache/inlong/sort/formats/base/TableFormatUtils.java
b/inlong-sort/sort-formats/format-base/src/main/java/org/apache/inlong/sort/formats/base/TableFormatUtils.java
index ae5f4413e..7136191a0 100644
---
a/inlong-sort/sort-formats/format-base/src/main/java/org/apache/inlong/sort/formats/base/TableFormatUtils.java
+++
b/inlong-sort/sort-formats/format-base/src/main/java/org/apache/inlong/sort/formats/base/TableFormatUtils.java
@@ -344,9 +344,10 @@ public class TableFormatUtils {
} else if (formatInfo instanceof DoubleFormatInfo) {
return new DoubleType();
} else if (formatInfo instanceof DecimalFormatInfo) {
- return new DecimalType();
+ DecimalFormatInfo decimalFormatInfo = (DecimalFormatInfo)
formatInfo;
+ return new DecimalType(decimalFormatInfo.getPrecision(),
decimalFormatInfo.getScale());
} else if (formatInfo instanceof TimeFormatInfo) {
- return new TimeType();
+ return new TimeType(((TimeFormatInfo) formatInfo).getPrecision());
} else if (formatInfo instanceof DateFormatInfo) {
return new DateType();
} else if (formatInfo instanceof TimestampFormatInfo) {
diff --git
a/inlong-sort/sort-formats/format-common/src/main/java/org/apache/inlong/sort/formats/common/DecimalFormatInfo.java
b/inlong-sort/sort-formats/format-common/src/main/java/org/apache/inlong/sort/formats/common/DecimalFormatInfo.java
index 794435d72..0dce0b40b 100644
---
a/inlong-sort/sort-formats/format-common/src/main/java/org/apache/inlong/sort/formats/common/DecimalFormatInfo.java
+++
b/inlong-sort/sort-formats/format-common/src/main/java/org/apache/inlong/sort/formats/common/DecimalFormatInfo.java
@@ -18,6 +18,9 @@
package org.apache.inlong.sort.formats.common;
+import
org.apache.flink.shaded.jackson2.com.fasterxml.jackson.annotation.JsonCreator;
+import
org.apache.flink.shaded.jackson2.com.fasterxml.jackson.annotation.JsonProperty;
+
import java.math.BigDecimal;
/**
@@ -25,9 +28,32 @@ import java.math.BigDecimal;
*/
public class DecimalFormatInfo implements BasicFormatInfo<BigDecimal> {
+ public static final DecimalFormatInfo INSTANCE = new DecimalFormatInfo();
+
+ public static final int DEFAULT_PRECISION = 10;
+
+ public static final int DEFAULT_SCALE = 0;
+
private static final long serialVersionUID = 1L;
+ @JsonProperty("precision")
+ private int precision;
- public static final DecimalFormatInfo INSTANCE = new DecimalFormatInfo();
+ @JsonProperty("scale")
+ private int scale;
+
+ public DecimalFormatInfo() {
+ this(DEFAULT_PRECISION, DEFAULT_SCALE);
+ }
+
+ public DecimalFormatInfo(@JsonProperty("scale") int scale) {
+ this(DEFAULT_PRECISION, scale);
+ }
+
+ @JsonCreator
+ public DecimalFormatInfo(@JsonProperty("precision") int precision,
@JsonProperty("scale") int scale) {
+ this.precision = precision;
+ this.scale = scale;
+ }
@Override
public DecimalTypeInfo getTypeInfo() {
@@ -62,4 +88,20 @@ public class DecimalFormatInfo implements
BasicFormatInfo<BigDecimal> {
public String toString() {
return "DecimalFormatInfo";
}
+
+ public int getPrecision() {
+ return precision;
+ }
+
+ public void setPrecision(int precision) {
+ this.precision = precision;
+ }
+
+ public int getScale() {
+ return scale;
+ }
+
+ public void setScale(int scale) {
+ this.scale = scale;
+ }
}
diff --git
a/inlong-sort/sort-formats/format-common/src/main/java/org/apache/inlong/sort/formats/common/TimeFormatInfo.java
b/inlong-sort/sort-formats/format-common/src/main/java/org/apache/inlong/sort/formats/common/TimeFormatInfo.java
index cd09759fe..4861ae58b 100644
---
a/inlong-sort/sort-formats/format-common/src/main/java/org/apache/inlong/sort/formats/common/TimeFormatInfo.java
+++
b/inlong-sort/sort-formats/format-common/src/main/java/org/apache/inlong/sort/formats/common/TimeFormatInfo.java
@@ -18,17 +18,18 @@
package org.apache.inlong.sort.formats.common;
+import
org.apache.flink.shaded.jackson2.com.fasterxml.jackson.annotation.JsonCreator;
+import
org.apache.flink.shaded.jackson2.com.fasterxml.jackson.annotation.JsonIgnore;
+import
org.apache.flink.shaded.jackson2.com.fasterxml.jackson.annotation.JsonProperty;
+
+import javax.annotation.Nonnull;
+import javax.annotation.Nullable;
import java.sql.Time;
import java.text.ParseException;
import java.text.SimpleDateFormat;
import java.util.Date;
import java.util.Objects;
import java.util.concurrent.TimeUnit;
-import javax.annotation.Nonnull;
-import javax.annotation.Nullable;
-import
org.apache.flink.shaded.jackson2.com.fasterxml.jackson.annotation.JsonCreator;
-import
org.apache.flink.shaded.jackson2.com.fasterxml.jackson.annotation.JsonIgnore;
-import
org.apache.flink.shaded.jackson2.com.fasterxml.jackson.annotation.JsonProperty;
import static
org.apache.inlong.sort.formats.common.Constants.DATE_AND_TIME_STANDARD_ISO_8601;
import static
org.apache.inlong.sort.formats.common.Constants.DATE_AND_TIME_STANDARD_SQL;
@@ -41,21 +42,23 @@ public class TimeFormatInfo implements
BasicFormatInfo<Time> {
private static final long serialVersionUID = 1L;
private static final String FIELD_FORMAT = "format";
-
+ // to support avro format, precision must be less than 3
+ private static final int DEFAULT_PRECISION_FOR_TIMESTAMP = 2;
@JsonProperty(FIELD_FORMAT)
@Nonnull
private final String format;
-
@JsonIgnore
@Nullable
private final SimpleDateFormat simpleDateFormat;
+ @JsonProperty("precision")
+ private int precision;
@JsonCreator
public TimeFormatInfo(
- @JsonProperty(FIELD_FORMAT) @Nonnull String format
- ) {
+ @JsonProperty(FIELD_FORMAT) @Nonnull String format,
+ @JsonProperty("precision") int precision) {
this.format = format;
-
+ this.precision = precision;
if (!format.equals("MICROS")
&& !format.equals("MILLIS")
&& !format.equals("SECONDS")
@@ -67,8 +70,12 @@ public class TimeFormatInfo implements BasicFormatInfo<Time>
{
}
}
+ public TimeFormatInfo(@JsonProperty(FIELD_FORMAT) @Nonnull String format) {
+ this(format, DEFAULT_PRECISION_FOR_TIMESTAMP);
+ }
+
public TimeFormatInfo() {
- this("HH:mm:ss");
+ this("HH:mm:ss", DEFAULT_PRECISION_FOR_TIMESTAMP);
}
@Nonnull
@@ -159,4 +166,12 @@ public class TimeFormatInfo implements
BasicFormatInfo<Time> {
public String toString() {
return "TimeFormatInfo{" + "format='" + format + '\'' + '}';
}
+
+ public int getPrecision() {
+ return precision;
+ }
+
+ public void setPrecision(int precision) {
+ this.precision = precision;
+ }
}
diff --git
a/inlong-sort/sort-formats/format-common/src/main/java/org/apache/inlong/sort/formats/common/TypeInfo.java
b/inlong-sort/sort-formats/format-common/src/main/java/org/apache/inlong/sort/formats/common/TypeInfo.java
index 2eaef3cb8..ec40aff95 100644
---
a/inlong-sort/sort-formats/format-common/src/main/java/org/apache/inlong/sort/formats/common/TypeInfo.java
+++
b/inlong-sort/sort-formats/format-common/src/main/java/org/apache/inlong/sort/formats/common/TypeInfo.java
@@ -18,10 +18,11 @@
package org.apache.inlong.sort.formats.common;
-import java.io.Serializable;
import
org.apache.flink.shaded.jackson2.com.fasterxml.jackson.annotation.JsonSubTypes;
import
org.apache.flink.shaded.jackson2.com.fasterxml.jackson.annotation.JsonTypeInfo;
+import java.io.Serializable;
+
/**
* The type information for data types.
*/
