You are viewing a plain text version of this content. The canonical link for it is here.
Posted to notifications@shardingsphere.apache.org by zh...@apache.org on 2023/12/25 16:40:52 UTC
(shardingsphere) branch master updated: Refactor MultiplexPipelineChannel (#29541)
This is an automated email from the ASF dual-hosted git repository.
zhaojinchao pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/shardingsphere.git
The following commit(s) were added to refs/heads/master by this push:
new 5d893c6c973 Refactor MultiplexPipelineChannel (#29541)
5d893c6c973 is described below
commit 5d893c6c973ce309fcbd1a71d5d3d1392ec3f44b
Author: Liang Zhang <zh...@apache.org>
AuthorDate: Tue Dec 26 00:40:44 2023 +0800
Refactor MultiplexPipelineChannel (#29541)
* Refactor MultiplexPipelineChannel
* Refactor PipelineChannelCreator
* Refactor PipelineTaskUtils
* Fix test case
* Fix test case
---
...eChannel.java => MultiplexPipelineChannel.java} | 13 +++-----
.../core/channel/PipelineChannelCreator.java | 5 ++-
...lineChannel.java => MemoryPipelineChannel.java} | 6 ++--
.../memory/MemoryPipelineChannelCreator.java | 13 ++++----
.../data/pipeline/core/task/PipelineTaskUtils.java | 25 ++++++++-------
.../memory/MemoryPipelineChannelCreatorTest.java | 19 ++---------
...nelTest.java => MemoryPipelineChannelTest.java} | 6 ++--
.../memory/MultiplexMemoryPipelineChannelTest.java | 37 ++++++++++++----------
.../mysql/ingest/MySQLIncrementalDumperTest.java | 4 +--
.../postgresql/ingest/PostgreSQLWALDumperTest.java | 6 ++--
10 files changed, 61 insertions(+), 73 deletions(-)
diff --git a/kernel/data-pipeline/core/src/main/java/org/apache/shardingsphere/data/pipeline/core/channel/memory/MultiplexMemoryPipelineChannel.java b/kernel/data-pipeline/core/src/main/java/org/apache/shardingsphere/data/pipeline/core/channel/MultiplexPipelineChannel.java
similarity index 87%
rename from kernel/data-pipeline/core/src/main/java/org/apache/shardingsphere/data/pipeline/core/channel/memory/MultiplexMemoryPipelineChannel.java
rename to kernel/data-pipeline/core/src/main/java/org/apache/shardingsphere/data/pipeline/core/channel/MultiplexPipelineChannel.java
index c3b54521221..a43b048de3a 100644
--- a/kernel/data-pipeline/core/src/main/java/org/apache/shardingsphere/data/pipeline/core/channel/memory/MultiplexMemoryPipelineChannel.java
+++ b/kernel/data-pipeline/core/src/main/java/org/apache/shardingsphere/data/pipeline/core/channel/MultiplexPipelineChannel.java
@@ -15,11 +15,9 @@
* limitations under the License.
*/
-package org.apache.shardingsphere.data.pipeline.core.channel.memory;
+package org.apache.shardingsphere.data.pipeline.core.channel;
import org.apache.shardingsphere.data.pipeline.core.constant.PipelineSQLOperationType;
-import org.apache.shardingsphere.data.pipeline.core.channel.PipelineChannelAckCallback;
-import org.apache.shardingsphere.data.pipeline.core.channel.PipelineChannel;
import org.apache.shardingsphere.data.pipeline.core.ingest.record.DataRecord;
import org.apache.shardingsphere.data.pipeline.core.ingest.record.FinishedRecord;
import org.apache.shardingsphere.data.pipeline.core.ingest.record.PlaceholderRecord;
@@ -34,9 +32,9 @@ import java.util.stream.Collectors;
import java.util.stream.IntStream;
/**
- * Multiplex memory pipeline channel.
+ * Multiplex pipeline channel.
*/
-public final class MultiplexMemoryPipelineChannel implements PipelineChannel {
+public final class MultiplexPipelineChannel implements PipelineChannel {
private final int channelCount;
@@ -44,10 +42,9 @@ public final class MultiplexMemoryPipelineChannel implements PipelineChannel {
private final Map<String, Integer> channelAssignment = new HashMap<>();
- public MultiplexMemoryPipelineChannel(final int channelCount, final int blockQueueSize, final PipelineChannelAckCallback ackCallback) {
+ public MultiplexPipelineChannel(final int channelCount, final PipelineChannelCreator channelCreator, final int importerBatchSize, final PipelineChannelAckCallback ackCallback) {
this.channelCount = channelCount;
- int handledQueueSize = blockQueueSize < 1 ? 5 : blockQueueSize;
- channels = IntStream.range(0, channelCount).mapToObj(each -> new SimpleMemoryPipelineChannel(handledQueueSize, ackCallback)).collect(Collectors.toList());
+ channels = IntStream.range(0, channelCount).mapToObj(each -> channelCreator.newInstance(importerBatchSize, ackCallback)).collect(Collectors.toList());
}
@Override
diff --git a/kernel/data-pipeline/core/src/main/java/org/apache/shardingsphere/data/pipeline/core/channel/PipelineChannelCreator.java b/kernel/data-pipeline/core/src/main/java/org/apache/shardingsphere/data/pipeline/core/channel/PipelineChannelCreator.java
index 09c3d12aeb5..61f369483f2 100644
--- a/kernel/data-pipeline/core/src/main/java/org/apache/shardingsphere/data/pipeline/core/channel/PipelineChannelCreator.java
+++ b/kernel/data-pipeline/core/src/main/java/org/apache/shardingsphere/data/pipeline/core/channel/PipelineChannelCreator.java
@@ -27,10 +27,9 @@ public interface PipelineChannelCreator extends TypedSPI {
/**
* Create new instance of pipeline channel.
*
- * @param outputConcurrency output concurrency
- * @param averageElementSize average element size, affect the size of the queue
+ * @param importerBatchSize importer batch size
* @param ackCallback ack callback
* @return created instance
*/
- PipelineChannel newInstance(int outputConcurrency, int averageElementSize, PipelineChannelAckCallback ackCallback);
+ PipelineChannel newInstance(int importerBatchSize, PipelineChannelAckCallback ackCallback);
}
diff --git a/kernel/data-pipeline/core/src/main/java/org/apache/shardingsphere/data/pipeline/core/channel/memory/SimpleMemoryPipelineChannel.java b/kernel/data-pipeline/core/src/main/java/org/apache/shardingsphere/data/pipeline/core/channel/memory/MemoryPipelineChannel.java
similarity index 93%
rename from kernel/data-pipeline/core/src/main/java/org/apache/shardingsphere/data/pipeline/core/channel/memory/SimpleMemoryPipelineChannel.java
rename to kernel/data-pipeline/core/src/main/java/org/apache/shardingsphere/data/pipeline/core/channel/memory/MemoryPipelineChannel.java
index 36ae1fe0637..2425a61cf78 100644
--- a/kernel/data-pipeline/core/src/main/java/org/apache/shardingsphere/data/pipeline/core/channel/memory/SimpleMemoryPipelineChannel.java
+++ b/kernel/data-pipeline/core/src/main/java/org/apache/shardingsphere/data/pipeline/core/channel/memory/MemoryPipelineChannel.java
@@ -31,15 +31,15 @@ import java.util.concurrent.SynchronousQueue;
import java.util.concurrent.TimeUnit;
/**
- * Simple memory pipeline channel.
+ * Memory pipeline channel.
*/
-public final class SimpleMemoryPipelineChannel implements PipelineChannel {
+public final class MemoryPipelineChannel implements PipelineChannel {
private final BlockingQueue<List<Record>> queue;
private final PipelineChannelAckCallback ackCallback;
- public SimpleMemoryPipelineChannel(final int blockQueueSize, final PipelineChannelAckCallback ackCallback) {
+ public MemoryPipelineChannel(final int blockQueueSize, final PipelineChannelAckCallback ackCallback) {
queue = blockQueueSize < 1 ? new SynchronousQueue<>(true) : new ArrayBlockingQueue<>(blockQueueSize, true);
this.ackCallback = ackCallback;
}
diff --git a/kernel/data-pipeline/core/src/main/java/org/apache/shardingsphere/data/pipeline/core/channel/memory/MemoryPipelineChannelCreator.java b/kernel/data-pipeline/core/src/main/java/org/apache/shardingsphere/data/pipeline/core/channel/memory/MemoryPipelineChannelCreator.java
index 1ed97fbc187..a034645a529 100644
--- a/kernel/data-pipeline/core/src/main/java/org/apache/shardingsphere/data/pipeline/core/channel/memory/MemoryPipelineChannelCreator.java
+++ b/kernel/data-pipeline/core/src/main/java/org/apache/shardingsphere/data/pipeline/core/channel/memory/MemoryPipelineChannelCreator.java
@@ -18,8 +18,8 @@
package org.apache.shardingsphere.data.pipeline.core.channel.memory;
import org.apache.shardingsphere.data.pipeline.core.channel.PipelineChannel;
-import org.apache.shardingsphere.data.pipeline.core.channel.PipelineChannelCreator;
import org.apache.shardingsphere.data.pipeline.core.channel.PipelineChannelAckCallback;
+import org.apache.shardingsphere.data.pipeline.core.channel.PipelineChannelCreator;
import java.util.Properties;
@@ -32,18 +32,17 @@ public final class MemoryPipelineChannelCreator implements PipelineChannelCreato
private static final String BLOCK_QUEUE_SIZE_DEFAULT_VALUE = "2000";
- private int blockQueueSize;
+ private int queueSize;
@Override
public void init(final Properties props) {
- blockQueueSize = Integer.parseInt(props.getProperty(BLOCK_QUEUE_SIZE_KEY, BLOCK_QUEUE_SIZE_DEFAULT_VALUE));
+ queueSize = Integer.parseInt(props.getProperty(BLOCK_QUEUE_SIZE_KEY, BLOCK_QUEUE_SIZE_DEFAULT_VALUE));
}
@Override
- public PipelineChannel newInstance(final int outputConcurrency, final int averageElementSize, final PipelineChannelAckCallback ackCallback) {
- return 1 == outputConcurrency
- ? new SimpleMemoryPipelineChannel(blockQueueSize / averageElementSize, ackCallback)
- : new MultiplexMemoryPipelineChannel(outputConcurrency, blockQueueSize, ackCallback);
+ public PipelineChannel newInstance(final int importerBatchSize, final PipelineChannelAckCallback ackCallback) {
+ int queueSize = this.queueSize / importerBatchSize;
+ return new MemoryPipelineChannel(0 == queueSize ? 1 : queueSize, ackCallback);
}
@Override
diff --git a/kernel/data-pipeline/core/src/main/java/org/apache/shardingsphere/data/pipeline/core/task/PipelineTaskUtils.java b/kernel/data-pipeline/core/src/main/java/org/apache/shardingsphere/data/pipeline/core/task/PipelineTaskUtils.java
index 6c6f222f472..74ba13eafc4 100644
--- a/kernel/data-pipeline/core/src/main/java/org/apache/shardingsphere/data/pipeline/core/task/PipelineTaskUtils.java
+++ b/kernel/data-pipeline/core/src/main/java/org/apache/shardingsphere/data/pipeline/core/task/PipelineTaskUtils.java
@@ -19,6 +19,7 @@ package org.apache.shardingsphere.data.pipeline.core.task;
import lombok.AccessLevel;
import lombok.NoArgsConstructor;
+import org.apache.shardingsphere.data.pipeline.core.channel.MultiplexPipelineChannel;
import org.apache.shardingsphere.data.pipeline.core.channel.PipelineChannel;
import org.apache.shardingsphere.data.pipeline.core.channel.PipelineChannelCreator;
import org.apache.shardingsphere.data.pipeline.core.ingest.dumper.context.InventoryDumperContext;
@@ -63,26 +64,28 @@ public final class PipelineTaskUtils {
}
/**
- * Create channel for inventory task.
+ * Create pipeline channel for inventory task.
*
- * @param pipelineChannelCreator channel creator
- * @param averageElementSize average element size
+ * @param channelCreator pipeline channel creator
+ * @param importerBatchSize importer batch size
* @param position ingest position
- * @return channel
+ * @return created pipeline channel
*/
- public static PipelineChannel createInventoryChannel(final PipelineChannelCreator pipelineChannelCreator, final int averageElementSize, final AtomicReference<IngestPosition> position) {
- return pipelineChannelCreator.newInstance(1, averageElementSize, new InventoryTaskAckCallback(position));
+ public static PipelineChannel createInventoryChannel(final PipelineChannelCreator channelCreator, final int importerBatchSize, final AtomicReference<IngestPosition> position) {
+ return channelCreator.newInstance(importerBatchSize, new InventoryTaskAckCallback(position));
}
/**
- * Create incremental channel.
+ * Create pipeline channel for incremental task.
*
* @param concurrency output concurrency
- * @param pipelineChannelCreator channel creator
+ * @param channelCreator pipeline channel creator
* @param progress incremental task progress
- * @return channel
+ * @return created pipeline channel
*/
- public static PipelineChannel createIncrementalChannel(final int concurrency, final PipelineChannelCreator pipelineChannelCreator, final IncrementalTaskProgress progress) {
- return pipelineChannelCreator.newInstance(concurrency, 5, new IncrementalTaskAckCallback(progress));
+ public static PipelineChannel createIncrementalChannel(final int concurrency, final PipelineChannelCreator channelCreator, final IncrementalTaskProgress progress) {
+ return 1 == concurrency
+ ? channelCreator.newInstance(5, new IncrementalTaskAckCallback(progress))
+ : new MultiplexPipelineChannel(concurrency, channelCreator, 5, new IncrementalTaskAckCallback(progress));
}
}
diff --git a/kernel/data-pipeline/core/src/test/java/org/apache/shardingsphere/data/pipeline/core/channel/memory/MemoryPipelineChannelCreatorTest.java b/kernel/data-pipeline/core/src/test/java/org/apache/shardingsphere/data/pipeline/core/channel/memory/MemoryPipelineChannelCreatorTest.java
index 2146b4c1ce2..51bad419155 100644
--- a/kernel/data-pipeline/core/src/test/java/org/apache/shardingsphere/data/pipeline/core/channel/memory/MemoryPipelineChannelCreatorTest.java
+++ b/kernel/data-pipeline/core/src/test/java/org/apache/shardingsphere/data/pipeline/core/channel/memory/MemoryPipelineChannelCreatorTest.java
@@ -17,7 +17,6 @@
package org.apache.shardingsphere.data.pipeline.core.channel.memory;
-import org.apache.shardingsphere.data.pipeline.core.channel.PipelineChannelAckCallback;
import org.apache.shardingsphere.data.pipeline.core.channel.PipelineChannelCreator;
import org.apache.shardingsphere.infra.spi.type.typed.TypedSPILoader;
import org.apache.shardingsphere.test.util.PropertiesBuilder;
@@ -25,32 +24,20 @@ import org.apache.shardingsphere.test.util.PropertiesBuilder.Property;
import org.junit.jupiter.api.Test;
import org.mockito.internal.configuration.plugins.Plugins;
-import static org.hamcrest.CoreMatchers.instanceOf;
import static org.hamcrest.CoreMatchers.is;
import static org.hamcrest.MatcherAssert.assertThat;
-import static org.mockito.Mockito.mock;
class MemoryPipelineChannelCreatorTest {
@Test
void assertInitWithBlockQueueSize() throws Exception {
PipelineChannelCreator creator = TypedSPILoader.getService(PipelineChannelCreator.class, "MEMORY", PropertiesBuilder.build(new Property("block-queue-size", "200")));
- assertThat(Plugins.getMemberAccessor().get(MemoryPipelineChannelCreator.class.getDeclaredField("blockQueueSize"), creator), is(200));
+ assertThat(Plugins.getMemberAccessor().get(MemoryPipelineChannelCreator.class.getDeclaredField("queueSize"), creator), is(200));
}
@Test
- void assertInitWithoutBlockQueueSize() throws Exception {
+ void assertNewInstanceWithoutBlockQueueSize() throws Exception {
PipelineChannelCreator creator = TypedSPILoader.getService(PipelineChannelCreator.class, "MEMORY");
- assertThat(Plugins.getMemberAccessor().get(MemoryPipelineChannelCreator.class.getDeclaredField("blockQueueSize"), creator), is(2000));
- }
-
- @Test
- void assertCreateSimpleMemoryPipelineChannel() {
- assertThat(TypedSPILoader.getService(PipelineChannelCreator.class, "MEMORY").newInstance(1, 1, mock(PipelineChannelAckCallback.class)), instanceOf(SimpleMemoryPipelineChannel.class));
- }
-
- @Test
- void assertCreateMultiplexMemoryPipelineChannel() {
- assertThat(TypedSPILoader.getService(PipelineChannelCreator.class, "MEMORY").newInstance(2, 1, mock(PipelineChannelAckCallback.class)), instanceOf(MultiplexMemoryPipelineChannel.class));
+ assertThat(Plugins.getMemberAccessor().get(MemoryPipelineChannelCreator.class.getDeclaredField("queueSize"), creator), is(2000));
}
}
diff --git a/kernel/data-pipeline/core/src/test/java/org/apache/shardingsphere/data/pipeline/core/channel/memory/SimpleMemoryPipelineChannelTest.java b/kernel/data-pipeline/core/src/test/java/org/apache/shardingsphere/data/pipeline/core/channel/memory/MemoryPipelineChannelTest.java
similarity index 91%
rename from kernel/data-pipeline/core/src/test/java/org/apache/shardingsphere/data/pipeline/core/channel/memory/SimpleMemoryPipelineChannelTest.java
rename to kernel/data-pipeline/core/src/test/java/org/apache/shardingsphere/data/pipeline/core/channel/memory/MemoryPipelineChannelTest.java
index 75e9436c4ba..cc90f6c5018 100644
--- a/kernel/data-pipeline/core/src/test/java/org/apache/shardingsphere/data/pipeline/core/channel/memory/SimpleMemoryPipelineChannelTest.java
+++ b/kernel/data-pipeline/core/src/test/java/org/apache/shardingsphere/data/pipeline/core/channel/memory/MemoryPipelineChannelTest.java
@@ -31,12 +31,12 @@ import static org.hamcrest.CoreMatchers.is;
import static org.hamcrest.MatcherAssert.assertThat;
import static org.junit.jupiter.api.Assertions.assertTrue;
-class SimpleMemoryPipelineChannelTest {
+class MemoryPipelineChannelTest {
@SneakyThrows(InterruptedException.class)
@Test
void assertZeroQueueSizeWorks() {
- SimpleMemoryPipelineChannel channel = new SimpleMemoryPipelineChannel(0, records -> {
+ MemoryPipelineChannel channel = new MemoryPipelineChannel(0, records -> {
});
List<Record> records = Collections.singletonList(new PlaceholderRecord(new IngestFinishedPosition()));
@@ -48,7 +48,7 @@ class SimpleMemoryPipelineChannelTest {
@Test
void assertFetchRecordsTimeoutCorrectly() {
- SimpleMemoryPipelineChannel channel = new SimpleMemoryPipelineChannel(10, records -> {
+ MemoryPipelineChannel channel = new MemoryPipelineChannel(10, records -> {
});
long startMillis = System.currentTimeMillis();
diff --git a/kernel/data-pipeline/core/src/test/java/org/apache/shardingsphere/data/pipeline/core/channel/memory/MultiplexMemoryPipelineChannelTest.java b/kernel/data-pipeline/core/src/test/java/org/apache/shardingsphere/data/pipeline/core/channel/memory/MultiplexMemoryPipelineChannelTest.java
index 3d0921f0b87..0cebdcc4565 100644
--- a/kernel/data-pipeline/core/src/test/java/org/apache/shardingsphere/data/pipeline/core/channel/memory/MultiplexMemoryPipelineChannelTest.java
+++ b/kernel/data-pipeline/core/src/test/java/org/apache/shardingsphere/data/pipeline/core/channel/memory/MultiplexMemoryPipelineChannelTest.java
@@ -20,7 +20,9 @@ package org.apache.shardingsphere.data.pipeline.core.channel.memory;
import lombok.Getter;
import lombok.RequiredArgsConstructor;
import lombok.SneakyThrows;
+import org.apache.shardingsphere.data.pipeline.core.channel.MultiplexPipelineChannel;
import org.apache.shardingsphere.data.pipeline.core.channel.PipelineChannelAckCallback;
+import org.apache.shardingsphere.data.pipeline.core.channel.PipelineChannelCreator;
import org.apache.shardingsphere.data.pipeline.core.constant.PipelineSQLOperationType;
import org.apache.shardingsphere.data.pipeline.core.ingest.position.IngestPosition;
import org.apache.shardingsphere.data.pipeline.core.ingest.position.type.placeholder.IngestPlaceholderPosition;
@@ -28,6 +30,7 @@ import org.apache.shardingsphere.data.pipeline.core.ingest.record.DataRecord;
import org.apache.shardingsphere.data.pipeline.core.ingest.record.FinishedRecord;
import org.apache.shardingsphere.data.pipeline.core.ingest.record.PlaceholderRecord;
import org.apache.shardingsphere.data.pipeline.core.ingest.record.Record;
+import org.apache.shardingsphere.infra.spi.type.typed.TypedSPILoader;
import org.junit.jupiter.api.Test;
import java.security.SecureRandom;
@@ -61,6 +64,18 @@ class MultiplexMemoryPipelineChannelTest {
}, countDataRecord(records), records);
}
+ private Record[] mockRecords() {
+ Record[] result = new Record[100];
+ for (int i = 1; i <= result.length; i++) {
+ result[i - 1] = random.nextBoolean() ? new DataRecord(PipelineSQLOperationType.INSERT, "t1", new IntPosition(i), 0) : new PlaceholderRecord(new IntPosition(i));
+ }
+ return result;
+ }
+
+ private int countDataRecord(final Record[] records) {
+ return (int) Arrays.stream(records).filter(each -> each instanceof DataRecord).count();
+ }
+
@Test
void assertBroadcastFinishedRecord() {
execute(records -> assertThat(records.size(), is(1)), 2, new FinishedRecord(new IngestPlaceholderPosition()));
@@ -69,20 +84,20 @@ class MultiplexMemoryPipelineChannelTest {
@SneakyThrows(InterruptedException.class)
private void execute(final PipelineChannelAckCallback ackCallback, final int recordCount, final Record... records) {
CountDownLatch countDownLatch = new CountDownLatch(recordCount);
- MultiplexMemoryPipelineChannel memoryChannel = new MultiplexMemoryPipelineChannel(CHANNEL_NUMBER, 10000, ackCallback);
- fetchWithMultiThreads(memoryChannel, countDownLatch);
- memoryChannel.push(Arrays.asList(records));
+ MultiplexPipelineChannel channel = new MultiplexPipelineChannel(CHANNEL_NUMBER, TypedSPILoader.getService(PipelineChannelCreator.class, "MEMORY"), 10000, ackCallback);
+ fetchWithMultiThreads(channel, countDownLatch);
+ channel.push(Arrays.asList(records));
boolean awaitResult = countDownLatch.await(10, TimeUnit.SECONDS);
assertTrue(awaitResult, "await failed");
}
- private void fetchWithMultiThreads(final MultiplexMemoryPipelineChannel memoryChannel, final CountDownLatch countDownLatch) {
+ private void fetchWithMultiThreads(final MultiplexPipelineChannel memoryChannel, final CountDownLatch countDownLatch) {
for (int i = 0; i < CHANNEL_NUMBER; i++) {
new Thread(() -> fetch(memoryChannel, countDownLatch)).start();
}
}
- private void fetch(final MultiplexMemoryPipelineChannel memoryChannel, final CountDownLatch countDownLatch) {
+ private void fetch(final MultiplexPipelineChannel memoryChannel, final CountDownLatch countDownLatch) {
int maxLoopCount = 10;
for (int j = 1; j <= maxLoopCount; j++) {
List<Record> records = memoryChannel.fetch(100, 1, TimeUnit.SECONDS);
@@ -94,18 +109,6 @@ class MultiplexMemoryPipelineChannelTest {
}
}
- private Record[] mockRecords() {
- Record[] result = new Record[100];
- for (int i = 1; i <= result.length; i++) {
- result[i - 1] = random.nextBoolean() ? new DataRecord(PipelineSQLOperationType.INSERT, "t1", new IntPosition(i), 0) : new PlaceholderRecord(new IntPosition(i));
- }
- return result;
- }
-
- private int countDataRecord(final Record[] records) {
- return (int) Arrays.stream(records).filter(each -> each instanceof DataRecord).count();
- }
-
@RequiredArgsConstructor
@Getter
private static final class IntPosition implements IngestPosition {
diff --git a/kernel/data-pipeline/dialect/mysql/src/test/java/org/apache/shardingsphere/data/pipeline/mysql/ingest/MySQLIncrementalDumperTest.java b/kernel/data-pipeline/dialect/mysql/src/test/java/org/apache/shardingsphere/data/pipeline/mysql/ingest/MySQLIncrementalDumperTest.java
index a629d9d9e1f..42eabc8fca9 100644
--- a/kernel/data-pipeline/dialect/mysql/src/test/java/org/apache/shardingsphere/data/pipeline/mysql/ingest/MySQLIncrementalDumperTest.java
+++ b/kernel/data-pipeline/dialect/mysql/src/test/java/org/apache/shardingsphere/data/pipeline/mysql/ingest/MySQLIncrementalDumperTest.java
@@ -18,7 +18,7 @@
package org.apache.shardingsphere.data.pipeline.mysql.ingest;
import org.apache.shardingsphere.data.pipeline.api.type.StandardPipelineDataSourceConfiguration;
-import org.apache.shardingsphere.data.pipeline.core.channel.memory.SimpleMemoryPipelineChannel;
+import org.apache.shardingsphere.data.pipeline.core.channel.memory.MemoryPipelineChannel;
import org.apache.shardingsphere.data.pipeline.core.constant.PipelineSQLOperationType;
import org.apache.shardingsphere.data.pipeline.core.datasource.PipelineDataSourceManager;
import org.apache.shardingsphere.data.pipeline.core.datasource.PipelineDataSourceWrapper;
@@ -87,7 +87,7 @@ class MySQLIncrementalDumperTest {
IncrementalDumperContext dumperContext = createDumperContext();
initTableData(dumperContext);
PipelineTableMetaDataLoader metaDataLoader = mock(PipelineTableMetaDataLoader.class);
- SimpleMemoryPipelineChannel channel = new SimpleMemoryPipelineChannel(10000, records -> {
+ MemoryPipelineChannel channel = new MemoryPipelineChannel(10000, records -> {
});
incrementalDumper = new MySQLIncrementalDumper(dumperContext, new BinlogPosition("binlog-000001", 4L, 0L), channel, metaDataLoader);
diff --git a/kernel/data-pipeline/dialect/postgresql/src/test/java/org/apache/shardingsphere/data/pipeline/postgresql/ingest/PostgreSQLWALDumperTest.java b/kernel/data-pipeline/dialect/postgresql/src/test/java/org/apache/shardingsphere/data/pipeline/postgresql/ingest/PostgreSQLWALDumperTest.java
index 02d430f8eb3..862d7cdcc6b 100644
--- a/kernel/data-pipeline/dialect/postgresql/src/test/java/org/apache/shardingsphere/data/pipeline/postgresql/ingest/PostgreSQLWALDumperTest.java
+++ b/kernel/data-pipeline/dialect/postgresql/src/test/java/org/apache/shardingsphere/data/pipeline/postgresql/ingest/PostgreSQLWALDumperTest.java
@@ -18,7 +18,7 @@
package org.apache.shardingsphere.data.pipeline.postgresql.ingest;
import org.apache.shardingsphere.data.pipeline.api.type.StandardPipelineDataSourceConfiguration;
-import org.apache.shardingsphere.data.pipeline.core.channel.memory.SimpleMemoryPipelineChannel;
+import org.apache.shardingsphere.data.pipeline.core.channel.memory.MemoryPipelineChannel;
import org.apache.shardingsphere.data.pipeline.core.datasource.PipelineDataSourceManager;
import org.apache.shardingsphere.data.pipeline.core.exception.IngestException;
import org.apache.shardingsphere.data.pipeline.core.ingest.dumper.context.DumperCommonContext;
@@ -75,14 +75,14 @@ class PostgreSQLWALDumperTest {
private PostgreSQLWALDumper walDumper;
- private SimpleMemoryPipelineChannel channel;
+ private MemoryPipelineChannel channel;
private final PipelineDataSourceManager dataSourceManager = new PipelineDataSourceManager();
@BeforeEach
void setUp() {
position = new WALPosition(new PostgreSQLLogSequenceNumber(LogSequenceNumber.valueOf(100L)));
- channel = new SimpleMemoryPipelineChannel(10000, records -> {
+ channel = new MemoryPipelineChannel(10000, records -> {
});
String jdbcUrl = "jdbc:h2:mem:test;DB_CLOSE_DELAY=-1;DATABASE_TO_UPPER=false;MODE=PostgreSQL";