You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@celeborn.apache.org by re...@apache.org on 2023/03/29 02:23:50 UTC

[incubator-celeborn] 35/42: [CELEBORN-432][FLINK] fix compile

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

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

commit 089b0e6d9c0db312c93f38d9e769f8a95bb1ee64
Author: Shuang <lv...@gmail.com>
AuthorDate: Mon Mar 20 15:21:26 2023 +0800

    [CELEBORN-432][FLINK] fix compile
---
 .../celeborn/plugin/flink/RemoteShuffleOutputGateSuiteJ.java | 12 ++++++------
 .../plugin/flink/RemoteShuffleResultPartitionSuiteJ.java     |  2 +-
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/client-flink/flink-1.15/src/test/java/org/apache/celeborn/plugin/flink/RemoteShuffleOutputGateSuiteJ.java b/client-flink/flink-1.15/src/test/java/org/apache/celeborn/plugin/flink/RemoteShuffleOutputGateSuiteJ.java
index 3dd9ec64f..1b72b9c09 100644
--- a/client-flink/flink-1.15/src/test/java/org/apache/celeborn/plugin/flink/RemoteShuffleOutputGateSuiteJ.java
+++ b/client-flink/flink-1.15/src/test/java/org/apache/celeborn/plugin/flink/RemoteShuffleOutputGateSuiteJ.java
@@ -48,7 +48,7 @@ public class RemoteShuffleOutputGateSuiteJ {
 
   @Before
   public void setup() throws IOException {
-    remoteShuffleOutputGate.shuffleWriteClient = shuffleClient;
+    remoteShuffleOutputGate.flinkShuffleClient = shuffleClient;
     networkBufferPool = new NetworkBufferPool(10, BUFFER_SIZE);
     bufferPool = networkBufferPool.createBufferPool(10, 10);
   }
@@ -61,12 +61,12 @@ public class RemoteShuffleOutputGateSuiteJ {
     when(shuffleClient.registerMapPartitionTask(any(), anyInt(), anyInt(), anyInt(), anyInt()))
         .thenAnswer(t -> partitionLocation);
     doNothing()
-        .when(remoteShuffleOutputGate.shuffleWriteClient)
+        .when(remoteShuffleOutputGate.flinkShuffleClient)
         .pushDataHandShake(anyString(), anyInt(), anyInt(), anyInt(), anyInt(), anyInt(), any());
 
     remoteShuffleOutputGate.handshake(true);
 
-    when(remoteShuffleOutputGate.shuffleWriteClient.regionStart(
+    when(remoteShuffleOutputGate.flinkShuffleClient.regionStart(
             any(), anyInt(), anyInt(), anyInt(), any(), anyInt(), anyBoolean()))
         .thenAnswer(t -> Optional.empty());
     remoteShuffleOutputGate.regionStart(false);
@@ -74,16 +74,16 @@ public class RemoteShuffleOutputGateSuiteJ {
     remoteShuffleOutputGate.write(bufferPool.requestBuffer(), 0);
 
     doNothing()
-        .when(remoteShuffleOutputGate.shuffleWriteClient)
+        .when(remoteShuffleOutputGate.flinkShuffleClient)
         .regionFinish(any(), anyInt(), anyInt(), anyInt(), any());
     remoteShuffleOutputGate.regionFinish();
 
     doNothing()
-        .when(remoteShuffleOutputGate.shuffleWriteClient)
+        .when(remoteShuffleOutputGate.flinkShuffleClient)
         .mapperEnd(any(), anyInt(), anyInt(), anyInt(), anyInt());
     remoteShuffleOutputGate.finish();
 
-    doNothing().when(remoteShuffleOutputGate.shuffleWriteClient).shutdown();
+    doNothing().when(remoteShuffleOutputGate.flinkShuffleClient).shutdown();
     remoteShuffleOutputGate.close();
   }
 
diff --git a/client-flink/flink-1.15/src/test/java/org/apache/celeborn/plugin/flink/RemoteShuffleResultPartitionSuiteJ.java b/client-flink/flink-1.15/src/test/java/org/apache/celeborn/plugin/flink/RemoteShuffleResultPartitionSuiteJ.java
index aa9a66070..b05fccb7c 100644
--- a/client-flink/flink-1.15/src/test/java/org/apache/celeborn/plugin/flink/RemoteShuffleResultPartitionSuiteJ.java
+++ b/client-flink/flink-1.15/src/test/java/org/apache/celeborn/plugin/flink/RemoteShuffleResultPartitionSuiteJ.java
@@ -455,7 +455,7 @@ public class RemoteShuffleResultPartitionSuiteJ {
     }
 
     @Override
-    FlinkShuffleClientImpl createWriteClient() {
+    FlinkShuffleClientImpl getShuffleClient() {
       FlinkShuffleClientImpl client = mock(FlinkShuffleClientImpl.class);
       doNothing().when(client).cleanup(anyString(), anyInt(), anyInt(), anyInt());
       return client;