[incubator-paimon] branch master updated: [hotfix] Fix merge conflicts compile error

[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/incubator-paimon.git


The following commit(s) were added to refs/heads/master by this push:
     new 000497e57 [hotfix] Fix merge conflicts compile error
000497e57 is described below

commit 000497e570da7dc38607aa8d5882ebcfa1265aca
Author: JingsongLi <lzljs3620...@aliyun.com>
AuthorDate: Mon Jun 26 09:48:48 2023 +0800

    [hotfix] Fix merge conflicts compile error
---
 .../src/test/java/org/apache/paimon/flink/sink/FlinkSinkTest.java    | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git 
a/paimon-flink/paimon-flink-common/src/test/java/org/apache/paimon/flink/sink/FlinkSinkTest.java
 
b/paimon-flink/paimon-flink-common/src/test/java/org/apache/paimon/flink/sink/FlinkSinkTest.java
index cf954b340..bbb4ed97f 100644
--- 
a/paimon-flink/paimon-flink-common/src/test/java/org/apache/paimon/flink/sink/FlinkSinkTest.java
+++ 
b/paimon-flink/paimon-flink-common/src/test/java/org/apache/paimon/flink/sink/FlinkSinkTest.java
@@ -83,8 +83,7 @@ public class FlinkSinkTest {
         DataStreamSource<RowData> source =
                 streamExecutionEnvironment.fromCollection(
                         Collections.singletonList(new 
FlinkRowData(GenericRow.of(1, 1))));
-        FlinkSink<RowData> flinkSink =
-                new FileStoreSink(fileStoreTable, Lock.emptyFactory(), null, 
null);
+        FlinkSink<RowData> flinkSink = new FileStoreSink(fileStoreTable, null, 
null);
         SingleOutputStreamOperator<Committable> written = 
flinkSink.doWrite(source, "123", 1);
         RowDataStoreWriteOperator operator =
                 ((RowDataStoreWriteOperator)
@@ -128,6 +127,6 @@ public class FlinkSinkTest {
                                 conf.toMap(),
                                 ""));
         return FileStoreTableFactory.create(
-                FileIOFinder.find(tablePath), tablePath, tableSchema, conf);
+                FileIOFinder.find(tablePath), tablePath, tableSchema, conf, 
Lock.emptyFactory());
     }
 }