You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@inlong.apache.org by he...@apache.org on 2022/04/26 10:48:28 UTC

[incubator-inlong] branch master updated: [INLONG-3833][Sort] Fix Hive partition fields format error (#3957)

This is an automated email from the ASF dual-hosted git repository.

healchow pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-inlong.git


The following commit(s) were added to refs/heads/master by this push:
     new 863f5ad36 [INLONG-3833][Sort] Fix Hive partition fields format error (#3957)
863f5ad36 is described below

commit 863f5ad36ba1c6cc8959bb34d6d19b3b9de10ee3
Author: yunqingmoswu <44...@users.noreply.github.com>
AuthorDate: Tue Apr 26 18:48:20 2022 +0800

    [INLONG-3833][Sort] Fix Hive partition fields format error (#3957)
---
 .../main/java/org/apache/inlong/sort/protocol/BuiltInFieldInfo.java   | 2 +-
 .../inlong/sort/singletenant/flink/parser/impl/FlinkSqlParser.java    | 4 ++--
 .../sort/singletenant/flink/parser/DistinctNodeSqlParseTest.java      | 4 ++--
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/inlong-sort/sort-common/src/main/java/org/apache/inlong/sort/protocol/BuiltInFieldInfo.java b/inlong-sort/sort-common/src/main/java/org/apache/inlong/sort/protocol/BuiltInFieldInfo.java
index 085352df3..d73c9b243 100644
--- a/inlong-sort/sort-common/src/main/java/org/apache/inlong/sort/protocol/BuiltInFieldInfo.java
+++ b/inlong-sort/sort-common/src/main/java/org/apache/inlong/sort/protocol/BuiltInFieldInfo.java
@@ -72,7 +72,7 @@ public class BuiltInFieldInfo extends FieldInfo {
 
     public enum BuiltInField {
         DATA_TIME,
-        PROCCESS_TIME,
+        PROCESS_TIME,
         MYSQL_METADATA_DATABASE,
         MYSQL_METADATA_TABLE,
         MYSQL_METADATA_EVENT_TIME,
diff --git a/inlong-sort/sort-single-tenant/src/main/java/org/apache/inlong/sort/singletenant/flink/parser/impl/FlinkSqlParser.java b/inlong-sort/sort-single-tenant/src/main/java/org/apache/inlong/sort/singletenant/flink/parser/impl/FlinkSqlParser.java
index 8fa170d37..d60282df0 100644
--- a/inlong-sort/sort-single-tenant/src/main/java/org/apache/inlong/sort/singletenant/flink/parser/impl/FlinkSqlParser.java
+++ b/inlong-sort/sort-single-tenant/src/main/java/org/apache/inlong/sort/singletenant/flink/parser/impl/FlinkSqlParser.java
@@ -507,7 +507,7 @@ public class FlinkSqlParser implements Parser {
         sb.append(")");
         if (node.getPartitionFields() != null && !node.getPartitionFields().isEmpty()) {
             sb.append(String.format("\nPARTITIONED BY (%s)",
-                    StringUtils.joinWith(",", formatFields(node.getPartitionFields()))));
+                    StringUtils.join(formatFields(node.getPartitionFields()), ",")));
         }
         sb.append(parseOptions(node.tableOptions()));
         return sb.toString();
@@ -576,7 +576,7 @@ public class FlinkSqlParser implements Parser {
             if (field instanceof BuiltInFieldInfo) {
                 BuiltInFieldInfo builtInFieldInfo = (BuiltInFieldInfo) field;
                 switch (builtInFieldInfo.getBuiltInField()) {
-                    case PROCCESS_TIME:
+                    case PROCESS_TIME:
                         sb.append(" AS PROCTIME()");
                         break;
                     default:
diff --git a/inlong-sort/sort-single-tenant/src/test/java/org/apache/inlong/sort/singletenant/flink/parser/DistinctNodeSqlParseTest.java b/inlong-sort/sort-single-tenant/src/test/java/org/apache/inlong/sort/singletenant/flink/parser/DistinctNodeSqlParseTest.java
index c5f1fc52b..f18bd365d 100644
--- a/inlong-sort/sort-single-tenant/src/test/java/org/apache/inlong/sort/singletenant/flink/parser/DistinctNodeSqlParseTest.java
+++ b/inlong-sort/sort-single-tenant/src/test/java/org/apache/inlong/sort/singletenant/flink/parser/DistinctNodeSqlParseTest.java
@@ -65,7 +65,7 @@ public class DistinctNodeSqlParseTest extends AbstractTestBase {
                 new FieldInfo("age", new IntFormatInfo()),
                 new FieldInfo("salary", new FloatFormatInfo()),
                 new FieldInfo("ts", new TimestampFormatInfo()),
-                new BuiltInFieldInfo("proctime", new TimestampFormatInfo(), BuiltInField.PROCCESS_TIME));
+                new BuiltInFieldInfo("proctime", new TimestampFormatInfo(), BuiltInField.PROCESS_TIME));
         return new KafkaExtractNode("1", "kafka_input", fields, null,
                 null, "topic_input", "localhost:9092",
                 new JsonFormat(), ScanStartupMode.EARLIEST_OFFSET,
@@ -78,7 +78,7 @@ public class DistinctNodeSqlParseTest extends AbstractTestBase {
                 new FieldInfo("age", new IntFormatInfo()),
                 new FieldInfo("salary", new FloatFormatInfo()),
                 new FieldInfo("ts", new TimestampFormatInfo()),
-                new BuiltInFieldInfo("proctime", new TimestampFormatInfo(), BuiltInField.PROCCESS_TIME));
+                new BuiltInFieldInfo("proctime", new TimestampFormatInfo(), BuiltInField.PROCESS_TIME));
         WatermarkField wk = new WatermarkField(new FieldInfo("ts", new TimestampFormatInfo()),
                 new StringConstantParam("1"),
                 new TimeUnitConstantParam(TimeUnit.SECOND));