dev

featzhang · Apr 23, 2024 · 13446c1 · 13446c1
1 parent 317d65d
commit 13446c1
Show file tree

Hide file tree

Showing 18 changed files with 26 additions and 26 deletions.
diff --git a/...ger-pojo/src/main/java/org/apache/inlong/manager/pojo/node/paimon/PaimonDataNodeInfo.java b/...ger-pojo/src/main/java/org/apache/inlong/manager/pojo/node/paimon/PaimonDataNodeInfo.java
@@ -33,7 +33,7 @@
 @Data
 @ToString(callSuper = true)
 @EqualsAndHashCode(callSuper = true)
-@JsonTypeDefine(value = DataNodeType.HUDI)
+@JsonTypeDefine(value = DataNodeType.PAIMON)
 @ApiModel("Paimon data node info")
 public class PaimonDataNodeInfo extends DataNodeInfo {
 
@@ -44,7 +44,7 @@ public class PaimonDataNodeInfo extends DataNodeInfo {
     private String warehouse;
 
     public PaimonDataNodeInfo() {
-        this.setType(DataNodeType.HUDI);
+        this.setType(DataNodeType.PAIMON);
     }
 
     @Override

diff --git a/...-pojo/src/main/java/org/apache/inlong/manager/pojo/node/paimon/PaimonDataNodeRequest.java b/...-pojo/src/main/java/org/apache/inlong/manager/pojo/node/paimon/PaimonDataNodeRequest.java
@@ -32,7 +32,7 @@
 @Data
 @ToString(callSuper = true)
 @EqualsAndHashCode(callSuper = true)
-@JsonTypeDefine(value = DataNodeType.HUDI)
+@JsonTypeDefine(value = DataNodeType.PAIMON)
 @ApiModel("Paimon data node request")
 public class PaimonDataNodeRequest extends DataNodeRequest {
 
@@ -43,7 +43,7 @@ public class PaimonDataNodeRequest extends DataNodeRequest {
     private String warehouse;
 
     public PaimonDataNodeRequest() {
-        this.setType(DataNodeType.HUDI);
+        this.setType(DataNodeType.PAIMON);
     }
 
 }
diff --git a/...ger/manager-pojo/src/main/java/org/apache/inlong/manager/pojo/sink/paimon/PaimonSink.java b/...ger/manager-pojo/src/main/java/org/apache/inlong/manager/pojo/sink/paimon/PaimonSink.java
@@ -39,7 +39,7 @@
 @ToString(callSuper = true)
 @EqualsAndHashCode(callSuper = true)
 @ApiModel(value = "Paimon sink info")
-@JsonTypeDefine(value = SinkType.HUDI)
+@JsonTypeDefine(value = SinkType.PAIMON)
 public class PaimonSink extends StreamSink {
 
     @ApiModelProperty("Catalog type, like: HIVE, HADOOP, default is HIVE")
@@ -77,7 +77,7 @@ public class PaimonSink extends StreamSink {
     private String partitionKey;
 
     public PaimonSink() {
-        this.setSinkType(SinkType.HUDI);
+        this.setSinkType(SinkType.PAIMON);
     }
 
     @Override

diff --git a/...ager-pojo/src/main/java/org/apache/inlong/manager/pojo/sink/paimon/PaimonSinkRequest.java b/...ager-pojo/src/main/java/org/apache/inlong/manager/pojo/sink/paimon/PaimonSinkRequest.java
@@ -37,7 +37,7 @@
 @ToString(callSuper = true)
 @EqualsAndHashCode(callSuper = true)
 @ApiModel(value = "Paimon sink request")
-@JsonTypeDefine(value = SinkType.HUDI)
+@JsonTypeDefine(value = SinkType.PAIMON)
 public class PaimonSinkRequest extends SinkRequest {
 
     @ApiModelProperty("Catalog type, like: HIVE, HADOOP, default is HIVE")

diff --git a/...ger/manager-pojo/src/main/java/org/apache/inlong/manager/pojo/sink/paimon/PaimonType.java b/...ger/manager-pojo/src/main/java/org/apache/inlong/manager/pojo/sink/paimon/PaimonType.java
@@ -59,6 +59,6 @@ public static PaimonType forType(String type) {
                 return ibType;
             }
         }
-        throw new IllegalArgumentException(String.format("invalid hudi type = %s", type));
+        throw new IllegalArgumentException(String.format("invalid paimon type = %s", type));
     }
 }
diff --git a/...-pojo/src/main/java/org/apache/inlong/manager/pojo/sort/node/provider/PaimonProvider.java b/...-pojo/src/main/java/org/apache/inlong/manager/pojo/sort/node/provider/PaimonProvider.java
@@ -42,7 +42,7 @@ public class PaimonProvider implements ExtractNodeProvider, LoadNodeProvider {
 
     @Override
     public Boolean accept(String streamType) {
-        return StreamType.HUDI.equals(streamType);
+        return StreamType.PAIMON.equals(streamType);
     }
 
     @Override

diff --git a/...manager-pojo/src/main/java/org/apache/inlong/manager/pojo/source/paimon/PaimonSource.java b/...manager-pojo/src/main/java/org/apache/inlong/manager/pojo/source/paimon/PaimonSource.java
@@ -42,7 +42,7 @@
 @ToString(callSuper = true)
 @EqualsAndHashCode(callSuper = true)
 @ApiModel(value = "Paimon source info")
-@JsonTypeDefine(value = SourceType.HUDI)
+@JsonTypeDefine(value = SourceType.PAIMON)
 public class PaimonSource extends StreamSource {
 
     @ApiModelProperty("The database name of Paimon")
@@ -70,7 +70,7 @@ public class PaimonSource extends StreamSource {
     private List<HashMap<String, String>> extList;
 
     public PaimonSource() {
-        this.setSourceType(SourceType.HUDI);
+        this.setSourceType(SourceType.PAIMON);
     }
 
     @Override

diff --git a/...-pojo/src/main/java/org/apache/inlong/manager/pojo/source/paimon/PaimonSourceRequest.java b/...-pojo/src/main/java/org/apache/inlong/manager/pojo/source/paimon/PaimonSourceRequest.java
@@ -36,7 +36,7 @@
 @ToString(callSuper = true)
 @EqualsAndHashCode(callSuper = true)
 @ApiModel(value = "Request of the Paimon source")
-@JsonTypeDefine(value = SourceType.HUDI)
+@JsonTypeDefine(value = SourceType.PAIMON)
 public class PaimonSourceRequest extends SourceRequest {
 
     @ApiModelProperty("The database name of Paimon")
@@ -61,7 +61,7 @@ public class PaimonSourceRequest extends SourceRequest {
     private List<HashMap<String, String>> extList;
 
     public PaimonSourceRequest() {
-        this.setSourceType(SourceType.HUDI);
+        this.setSourceType(SourceType.PAIMON);
     }
 
 }
diff --git a/...e/src/main/java/org/apache/inlong/manager/service/node/paimon/PaimonDataNodeOperator.java b/...e/src/main/java/org/apache/inlong/manager/service/node/paimon/PaimonDataNodeOperator.java
@@ -52,7 +52,7 @@ public Boolean accept(String dataNodeType) {
 
     @Override
     public String getDataNodeType() {
-        return DataNodeType.HUDI;
+        return DataNodeType.PAIMON;
     }
 
     @Override

diff --git a/...rc/main/java/org/apache/inlong/manager/service/resource/sink/paimon/PaimonFileFormat.java b/...rc/main/java/org/apache/inlong/manager/service/resource/sink/paimon/PaimonFileFormat.java
@@ -18,12 +18,12 @@
 package org.apache.inlong.manager.service.resource.sink.paimon;
 
 /**
- * Hudi file format.
+ * Paimon file format.
  */
 public enum PaimonFileFormat {
 
     PARQUET,
-    HUDI_LOG,
+    PAIMON_LOG,
     HFILE,
     ORC;
 

diff --git a/...n/java/org/apache/inlong/manager/service/resource/sink/paimon/PaimonResourceOperator.java b/...n/java/org/apache/inlong/manager/service/resource/sink/paimon/PaimonResourceOperator.java
@@ -65,7 +65,7 @@ public class PaimonResourceOperator implements SinkResourceOperator {
 
     @Override
     public Boolean accept(String sinkType) {
-        return SinkType.HUDI.equals(sinkType);
+        return SinkType.PAIMON.equals(sinkType);
     }
 
     /**

diff --git a/...ice/src/main/java/org/apache/inlong/manager/service/resource/sink/paimon/PaimonUtils.java b/...ice/src/main/java/org/apache/inlong/manager/service/resource/sink/paimon/PaimonUtils.java
@@ -35,7 +35,7 @@ public class PaimonUtils {
 
     public static final String IS_QUERY_AS_RO_TABLE = "Paimon.query.as.ro.table";
 
-    private static final Set<String> HUDI_METADATA_FILES =
+    private static final Set<String> PAIMON_METADATA_FILES =
             Sets.newHashSet(COMMIT_TIME_METADATA_FILE_NAME, COMMIT_SEQNO_METADATA_FILE_NAME,
                     RECORD_KEY_METADATA_FILE_NAME, PARTITION_PATH_METADATA_FILE_NAME, METADATA_FILE_NAME,
                     OPERATION_METADATA_FILE_NAME);
@@ -57,7 +57,7 @@ public class PaimonUtils {
      * Check if metadata file.
      */
     public static boolean isMetadataFile(String fileName) {
-        return HUDI_METADATA_FILES.contains(fileName);
+        return PAIMON_METADATA_FILES.contains(fileName);
     }
 
     /**

diff --git a/...r-service/src/test/java/org/apache/inlong/manager/service/sink/PaimonSinkServiceTest.java b/...r-service/src/test/java/org/apache/inlong/manager/service/sink/PaimonSinkServiceTest.java
@@ -52,7 +52,7 @@ public Integer saveSink(String sinkName) {
         PaimonSinkRequest sinkInfo = new PaimonSinkRequest();
         sinkInfo.setInlongGroupId(globalGroupId);
         sinkInfo.setInlongStreamId(globalStreamId);
-        sinkInfo.setSinkType(SinkType.HUDI);
+        sinkInfo.setSinkType(SinkType.PAIMON);
         sinkInfo.setEnableCreateResource(InlongConstants.DISABLE_CREATE_RESOURCE);
         sinkInfo.setDataPath("hdfs://127.0.0.1:8020/data");
         sinkInfo.setSinkName(sinkName);

diff --git a/...rt/sort-common/src/main/java/org/apache/inlong/sort/protocol/constant/PaimonConstant.java b/...rt/sort-common/src/main/java/org/apache/inlong/sort/protocol/constant/PaimonConstant.java
@@ -18,7 +18,7 @@
 package org.apache.inlong.sort.protocol.constant;
 
 /**
- * Hudi option constant
+ * PAIMON option constant
  */
 public class PaimonConstant {
 
@@ -142,7 +142,7 @@ public class PaimonConstant {
     public static final String READ_STREAMING_SKIP_COMPACT = "read.streaming.skip_compaction";
 
     /**
-     * Hudi supported catalog type
+     * PAIMON supported catalog type
      */
     public enum CatalogType {
 

diff --git a/inlong-sort/sort-flink/sort-flink-v1.15/sort-connectors/hudi/pom.xml b/inlong-sort/sort-flink/sort-flink-v1.15/sort-connectors/hudi/pom.xml
@@ -79,7 +79,7 @@
                         <configuration>
                             <artifactSet>
                                 <includes>
-                                    <include>org.apache.paimon:*</include>
+                                    <include>org.apache.hudi:*</include>
                                     <include>org.apache.hive:hive-exec</include>
                                     <include>org.apache.hadoop:*</include>
                                     <include>com.fasterxml.woodstox:*</include>

diff --git a/...on/table/sink/HudiTableInlongFactory.java → ...di/table/sink/HudiTableInlongFactory.java b/...on/table/sink/HudiTableInlongFactory.java → ...di/table/sink/HudiTableInlongFactory.java
@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-package org.apache.inlong.sort.paimon.table.sink;
+package org.apache.inlong.sort.hudi.table.sink;
 
 import org.apache.flink.configuration.ConfigOption;
 import org.apache.flink.table.connector.sink.DynamicTableSink;

diff --git a/...ectors/hudi/src/main/resources/META-INF/services/org.apache.flink.table.factories.Factory b/...ectors/hudi/src/main/resources/META-INF/services/org.apache.flink.table.factories.Factory
@@ -13,4 +13,4 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-org.apache.inlong.sort.paimon.table.sink.HudiTableInlongFactory
+org.apache.inlong.sort.hudi.table.sink.HudiTableInlongFactory
diff --git a/inlong-sort/sort-flink/sort-flink-v1.15/sort-connectors/paimon/pom.xml b/inlong-sort/sort-flink/sort-flink-v1.15/sort-connectors/paimon/pom.xml
@@ -79,7 +79,7 @@
                         <configuration>
                             <artifactSet>
                                 <includes>
-                                    <include>org.apache.hudi:*</include>
+                                    <include>org.apache.paimon:*</include>
                                     <include>org.apache.hive:hive-exec</include>
                                     <include>org.apache.hadoop:*</include>
                                     <include>com.fasterxml.woodstox:*</include>