(paimon) branch master updated: [hotfix] Fix merge conflicts for FileIO.writeFileUtf8

[lzljs3620320]

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

lzljs3620320 pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/paimon.git


The following commit(s) were added to refs/heads/master by this push:
     new ad3f2a35a [hotfix] Fix merge conflicts for FileIO.writeFileUtf8
ad3f2a35a is described below

commit ad3f2a35afbd2a801f2b6b02420a9cef813e05ed
Author: Jingsong <jingsongl...@gmail.com>
AuthorDate: Mon Jul 1 18:36:55 2024 +0800

    [hotfix] Fix merge conflicts for FileIO.writeFileUtf8
---
 .../org/apache/paimon/flink/action/RemoveOrphanFilesActionITCase.java | 4 ++--
 .../paimon/spark/procedure/RemoveOrphanFilesProcedureTest.scala       | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git 
a/paimon-flink/paimon-flink-common/src/test/java/org/apache/paimon/flink/action/RemoveOrphanFilesActionITCase.java
 
b/paimon-flink/paimon-flink-common/src/test/java/org/apache/paimon/flink/action/RemoveOrphanFilesActionITCase.java
index 32a476d4d..0c335c726 100644
--- 
a/paimon-flink/paimon-flink-common/src/test/java/org/apache/paimon/flink/action/RemoveOrphanFilesActionITCase.java
+++ 
b/paimon-flink/paimon-flink-common/src/test/java/org/apache/paimon/flink/action/RemoveOrphanFilesActionITCase.java
@@ -69,9 +69,9 @@ public class RemoveOrphanFilesActionITCase extends 
ActionITCaseBase {
         Path orphanFile2 = new Path(table.location(), "bucket-0/orphan_file2");
 
         FileIO fileIO = table.fileIO();
-        fileIO.writeFileUtf8(orphanFile1, "a");
+        fileIO.writeFile(orphanFile1, "a", true);
         Thread.sleep(2000);
-        fileIO.writeFileUtf8(orphanFile2, "b");
+        fileIO.writeFile(orphanFile2, "b", true);
 
         List<String> args =
                 new ArrayList<>(
diff --git 
a/paimon-spark/paimon-spark-common/src/test/scala/org/apache/paimon/spark/procedure/RemoveOrphanFilesProcedureTest.scala
 
b/paimon-spark/paimon-spark-common/src/test/scala/org/apache/paimon/spark/procedure/RemoveOrphanFilesProcedureTest.scala
index a2a69e257..c0bf84c4d 100644
--- 
a/paimon-spark/paimon-spark-common/src/test/scala/org/apache/paimon/spark/procedure/RemoveOrphanFilesProcedureTest.scala
+++ 
b/paimon-spark/paimon-spark-common/src/test/scala/org/apache/paimon/spark/procedure/RemoveOrphanFilesProcedureTest.scala
@@ -87,9 +87,9 @@ class RemoveOrphanFilesProcedureTest extends 
PaimonSparkTestBase {
     val orphanFile1 = new Path(tablePath, "bucket-0/orphan_file1")
     val orphanFile2 = new Path(tablePath, "bucket-0/orphan_file2")
 
-    fileIO.writeFileUtf8(orphanFile1, "a")
+    fileIO.writeFile(orphanFile1, "a", true)
     Thread.sleep(2000)
-    fileIO.writeFileUtf8(orphanFile2, "b")
+    fileIO.writeFile(orphanFile2, "b", true)
 
     // by default, no file deleted
     checkAnswer(spark.sql(s"CALL sys.remove_orphan_files(table => 'T')"), Nil)