You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@celeborn.apache.org by zh...@apache.org on 2023/03/03 09:58:38 UTC
[incubator-celeborn] branch main updated: [CELEBORN-367][FOLLOWUP] [FLINK] fix conflicts in RemoteShuffleResultPartitionS… (#1306)
This is an automated email from the ASF dual-hosted git repository.
zhouky pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/incubator-celeborn.git
The following commit(s) were added to refs/heads/main by this push:
new 94361cd3e [CELEBORN-367][FOLLOWUP] [FLINK] fix conflicts in RemoteShuffleResultPartitionS… (#1306)
94361cd3e is described below
commit 94361cd3edd0523fce6e291b92ee5cc3d495372a
Author: zhongqiangchen <zh...@alibaba-inc.com>
AuthorDate: Fri Mar 3 17:58:34 2023 +0800
[CELEBORN-367][FOLLOWUP] [FLINK] fix conflicts in RemoteShuffleResultPartitionS… (#1306)
---
.../celeborn/plugin/flink/RemoteShuffleResultPartitionSuiteJ.java | 8 +++-----
1 file changed, 3 insertions(+), 5 deletions(-)
diff --git a/client-flink/flink-1.14/src/test/java/org/apache/celeborn/plugin/flink/RemoteShuffleResultPartitionSuiteJ.java b/client-flink/flink-1.14/src/test/java/org/apache/celeborn/plugin/flink/RemoteShuffleResultPartitionSuiteJ.java
index 62b71d712..aa9a66070 100644
--- a/client-flink/flink-1.14/src/test/java/org/apache/celeborn/plugin/flink/RemoteShuffleResultPartitionSuiteJ.java
+++ b/client-flink/flink-1.14/src/test/java/org/apache/celeborn/plugin/flink/RemoteShuffleResultPartitionSuiteJ.java
@@ -63,11 +63,10 @@ import org.junit.Test;
import org.mockito.Mockito;
import org.apache.celeborn.client.LifecycleManager;
-import org.apache.celeborn.client.ShuffleClient;
-import org.apache.celeborn.client.ShuffleClientImpl;
import org.apache.celeborn.common.CelebornConf;
import org.apache.celeborn.plugin.flink.buffer.BufferPacker;
import org.apache.celeborn.plugin.flink.buffer.SortBuffer;
+import org.apache.celeborn.plugin.flink.readclient.FlinkShuffleClientImpl;
import org.apache.celeborn.plugin.flink.utils.BufferUtils;
public class RemoteShuffleResultPartitionSuiteJ {
@@ -456,9 +455,8 @@ public class RemoteShuffleResultPartitionSuiteJ {
}
@Override
- ShuffleClient createWriteClient() {
- ShuffleClient client = mock(ShuffleClientImpl.class);
-
+ FlinkShuffleClientImpl createWriteClient() {
+ FlinkShuffleClientImpl client = mock(FlinkShuffleClientImpl.class);
doNothing().when(client).cleanup(anyString(), anyInt(), anyInt(), anyInt());
return client;
}