This is an automated email from the ASF dual-hosted git repository.
zhangliang 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 0152cad1beb Rename PostgreSQLIncrementalDumper (#32525)
0152cad1beb is described below
commit 0152cad1beb0d56f06286b435fa69f127594c20a
Author: Liang Zhang <[email protected]>
AuthorDate: Thu Aug 15 16:07:22 2024 +0800
Rename PostgreSQLIncrementalDumper (#32525)
---
...enGaussWALDumper.java => OpenGaussIncrementalDumper.java} | 8 ++++----
.../ingest/dumper/OpenGaussIncrementalDumperCreator.java | 2 +-
...ALDumperTest.java => OpenGaussIncrementalDumperTest.java} | 12 ++++++------
...greSQLWALDumper.java => PostgreSQLIncrementalDumper.java} | 8 ++++----
.../ingest/dumper/PostgreSQLIncrementalDumperCreator.java | 2 +-
...LDumperTest.java => PostgreSQLIncrementalDumperTest.java} | 8 ++++----
6 files changed, 20 insertions(+), 20 deletions(-)
diff --git
a/kernel/data-pipeline/dialect/opengauss/src/main/java/org/apache/shardingsphere/data/pipeline/opengauss/ingest/dumper/OpenGaussWALDumper.java
b/kernel/data-pipeline/dialect/opengauss/src/main/java/org/apache/shardingsphere/data/pipeline/opengauss/ingest/dumper/OpenGaussIncrementalDumper.java
similarity index 96%
rename from
kernel/data-pipeline/dialect/opengauss/src/main/java/org/apache/shardingsphere/data/pipeline/opengauss/ingest/dumper/OpenGaussWALDumper.java
rename to
kernel/data-pipeline/dialect/opengauss/src/main/java/org/apache/shardingsphere/data/pipeline/opengauss/ingest/dumper/OpenGaussIncrementalDumper.java
index e354b900dbb..1886a699bb2 100644
---
a/kernel/data-pipeline/dialect/opengauss/src/main/java/org/apache/shardingsphere/data/pipeline/opengauss/ingest/dumper/OpenGaussWALDumper.java
+++
b/kernel/data-pipeline/dialect/opengauss/src/main/java/org/apache/shardingsphere/data/pipeline/opengauss/ingest/dumper/OpenGaussIncrementalDumper.java
@@ -59,11 +59,11 @@ import java.util.regex.Matcher;
import java.util.regex.Pattern;
/**
- * WAL dumper of openGauss.
+ * Incremental dumper of openGauss.
*/
@HighFrequencyInvocation
@Slf4j
-public final class OpenGaussWALDumper extends
AbstractPipelineLifecycleRunnable implements IncrementalDumper {
+public final class OpenGaussIncrementalDumper extends
AbstractPipelineLifecycleRunnable implements IncrementalDumper {
private static final Pattern VERSION_PATTERN =
Pattern.compile("^\\(openGauss (\\d)");
@@ -85,8 +85,8 @@ public final class OpenGaussWALDumper extends
AbstractPipelineLifecycleRunnable
private final AtomicReference<Long> currentCsn = new AtomicReference<>();
- public OpenGaussWALDumper(final IncrementalDumperContext dumperContext,
final IngestPosition position,
- final PipelineChannel channel, final
PipelineTableMetaDataLoader metaDataLoader) {
+ public OpenGaussIncrementalDumper(final IncrementalDumperContext
dumperContext, final IngestPosition position,
+ final PipelineChannel channel, final
PipelineTableMetaDataLoader metaDataLoader) {
this.dumperContext = dumperContext;
walPosition = new AtomicReference<>((WALPosition) position);
this.channel = channel;
diff --git
a/kernel/data-pipeline/dialect/opengauss/src/main/java/org/apache/shardingsphere/data/pipeline/opengauss/ingest/dumper/OpenGaussIncrementalDumperCreator.java
b/kernel/data-pipeline/dialect/opengauss/src/main/java/org/apache/shardingsphere/data/pipeline/opengauss/ingest/dumper/OpenGaussIncrementalDumperCreator.java
index e9e55a19810..86c9b32a465 100644
---
a/kernel/data-pipeline/dialect/opengauss/src/main/java/org/apache/shardingsphere/data/pipeline/opengauss/ingest/dumper/OpenGaussIncrementalDumperCreator.java
+++
b/kernel/data-pipeline/dialect/opengauss/src/main/java/org/apache/shardingsphere/data/pipeline/opengauss/ingest/dumper/OpenGaussIncrementalDumperCreator.java
@@ -28,7 +28,7 @@ public final class OpenGaussIncrementalDumperCreator
implements DialectIncrement
@Override
public IncrementalDumper createIncrementalDumper(final
CreateIncrementalDumperParameter param) {
- return new OpenGaussWALDumper(param.getContext(), param.getPosition(),
param.getChannel(), param.getMetaDataLoader());
+ return new OpenGaussIncrementalDumper(param.getContext(),
param.getPosition(), param.getChannel(), param.getMetaDataLoader());
}
@Override
diff --git
a/kernel/data-pipeline/dialect/opengauss/src/test/java/org/apache/shardingsphere/data/pipeline/opengauss/ingest/dumper/OpenGaussWALDumperTest.java
b/kernel/data-pipeline/dialect/opengauss/src/test/java/org/apache/shardingsphere/data/pipeline/opengauss/ingest/dumper/OpenGaussIncrementalDumperTest.java
similarity index 68%
rename from
kernel/data-pipeline/dialect/opengauss/src/test/java/org/apache/shardingsphere/data/pipeline/opengauss/ingest/dumper/OpenGaussWALDumperTest.java
rename to
kernel/data-pipeline/dialect/opengauss/src/test/java/org/apache/shardingsphere/data/pipeline/opengauss/ingest/dumper/OpenGaussIncrementalDumperTest.java
index 41cb6108344..c16f497388b 100644
---
a/kernel/data-pipeline/dialect/opengauss/src/test/java/org/apache/shardingsphere/data/pipeline/opengauss/ingest/dumper/OpenGaussWALDumperTest.java
+++
b/kernel/data-pipeline/dialect/opengauss/src/test/java/org/apache/shardingsphere/data/pipeline/opengauss/ingest/dumper/OpenGaussIncrementalDumperTest.java
@@ -24,18 +24,18 @@ import static org.hamcrest.CoreMatchers.is;
import static org.hamcrest.MatcherAssert.assertThat;
import static org.mockito.Mockito.mock;
-class OpenGaussWALDumperTest {
+class OpenGaussIncrementalDumperTest {
@Test
void assertGetVersion() throws NoSuchMethodException {
- OpenGaussWALDumper dumper = mock(OpenGaussWALDumper.class);
- int version =
ReflectionUtils.invokeMethod(OpenGaussWALDumper.class.getDeclaredMethod("parseMajorVersion",
String.class), dumper,
+ OpenGaussIncrementalDumper dumper =
mock(OpenGaussIncrementalDumper.class);
+ int version =
ReflectionUtils.invokeMethod(OpenGaussIncrementalDumper.class.getDeclaredMethod("parseMajorVersion",
String.class), dumper,
"(openGauss 3.1.0 build ) compiled at 2023-02-17 16:13:51
commit 0 last mr on x86_64-unknown-linux-gnu, compiled by g++ (GCC) 7.3.0,
64-bit");
assertThat(version, is(3));
- OpenGaussWALDumper mock = mock(OpenGaussWALDumper.class);
- version =
ReflectionUtils.invokeMethod(OpenGaussWALDumper.class.getDeclaredMethod("parseMajorVersion",
String.class), mock, "(openGauss 5.0.1 build )");
+ OpenGaussIncrementalDumper mock =
mock(OpenGaussIncrementalDumper.class);
+ version =
ReflectionUtils.invokeMethod(OpenGaussIncrementalDumper.class.getDeclaredMethod("parseMajorVersion",
String.class), mock, "(openGauss 5.0.1 build )");
assertThat(version, is(5));
- version =
ReflectionUtils.invokeMethod(OpenGaussWALDumper.class.getDeclaredMethod("parseMajorVersion",
String.class), mock, "not match");
+ version =
ReflectionUtils.invokeMethod(OpenGaussIncrementalDumper.class.getDeclaredMethod("parseMajorVersion",
String.class), mock, "not match");
assertThat(version, is(2));
}
}
diff --git
a/kernel/data-pipeline/dialect/postgresql/src/main/java/org/apache/shardingsphere/data/pipeline/postgresql/ingest/dumper/PostgreSQLWALDumper.java
b/kernel/data-pipeline/dialect/postgresql/src/main/java/org/apache/shardingsphere/data/pipeline/postgresql/ingest/dumper/PostgreSQLIncrementalDumper.java
similarity index 94%
rename from
kernel/data-pipeline/dialect/postgresql/src/main/java/org/apache/shardingsphere/data/pipeline/postgresql/ingest/dumper/PostgreSQLWALDumper.java
rename to
kernel/data-pipeline/dialect/postgresql/src/main/java/org/apache/shardingsphere/data/pipeline/postgresql/ingest/dumper/PostgreSQLIncrementalDumper.java
index a8a5bfdea49..55c72f87fa0 100644
---
a/kernel/data-pipeline/dialect/postgresql/src/main/java/org/apache/shardingsphere/data/pipeline/postgresql/ingest/dumper/PostgreSQLWALDumper.java
+++
b/kernel/data-pipeline/dialect/postgresql/src/main/java/org/apache/shardingsphere/data/pipeline/postgresql/ingest/dumper/PostgreSQLIncrementalDumper.java
@@ -55,11 +55,11 @@ import java.util.concurrent.atomic.AtomicInteger;
import java.util.concurrent.atomic.AtomicReference;
/**
- * PostgreSQL WAL dumper.
+ * PostgreSQL incremental dumper.
*/
@HighFrequencyInvocation
@Slf4j
-public final class PostgreSQLWALDumper extends
AbstractPipelineLifecycleRunnable implements IncrementalDumper {
+public final class PostgreSQLIncrementalDumper extends
AbstractPipelineLifecycleRunnable implements IncrementalDumper {
private final IncrementalDumperContext dumperContext;
@@ -75,8 +75,8 @@ public final class PostgreSQLWALDumper extends
AbstractPipelineLifecycleRunnable
private List<AbstractRowEvent> rowEvents = new LinkedList<>();
- public PostgreSQLWALDumper(final IncrementalDumperContext dumperContext,
final IngestPosition position,
- final PipelineChannel channel, final
PipelineTableMetaDataLoader metaDataLoader) {
+ public PostgreSQLIncrementalDumper(final IncrementalDumperContext
dumperContext, final IngestPosition position,
+ final PipelineChannel channel, final
PipelineTableMetaDataLoader metaDataLoader) {
this.dumperContext = dumperContext;
walPosition = new AtomicReference<>((WALPosition) position);
this.channel = channel;
diff --git
a/kernel/data-pipeline/dialect/postgresql/src/main/java/org/apache/shardingsphere/data/pipeline/postgresql/ingest/dumper/PostgreSQLIncrementalDumperCreator.java
b/kernel/data-pipeline/dialect/postgresql/src/main/java/org/apache/shardingsphere/data/pipeline/postgresql/ingest/dumper/PostgreSQLIncrementalDumperCreator.java
index a7e8823f943..f1771873474 100644
---
a/kernel/data-pipeline/dialect/postgresql/src/main/java/org/apache/shardingsphere/data/pipeline/postgresql/ingest/dumper/PostgreSQLIncrementalDumperCreator.java
+++
b/kernel/data-pipeline/dialect/postgresql/src/main/java/org/apache/shardingsphere/data/pipeline/postgresql/ingest/dumper/PostgreSQLIncrementalDumperCreator.java
@@ -28,7 +28,7 @@ public final class PostgreSQLIncrementalDumperCreator
implements DialectIncremen
@Override
public IncrementalDumper createIncrementalDumper(final
CreateIncrementalDumperParameter param) {
- return new PostgreSQLWALDumper(param.getContext(),
param.getPosition(), param.getChannel(), param.getMetaDataLoader());
+ return new PostgreSQLIncrementalDumper(param.getContext(),
param.getPosition(), param.getChannel(), param.getMetaDataLoader());
}
@Override
diff --git
a/kernel/data-pipeline/dialect/postgresql/src/test/java/org/apache/shardingsphere/data/pipeline/postgresql/ingest/dumper/PostgreSQLWALDumperTest.java
b/kernel/data-pipeline/dialect/postgresql/src/test/java/org/apache/shardingsphere/data/pipeline/postgresql/ingest/dumper/PostgreSQLIncrementalDumperTest.java
similarity index 95%
rename from
kernel/data-pipeline/dialect/postgresql/src/test/java/org/apache/shardingsphere/data/pipeline/postgresql/ingest/dumper/PostgreSQLWALDumperTest.java
rename to
kernel/data-pipeline/dialect/postgresql/src/test/java/org/apache/shardingsphere/data/pipeline/postgresql/ingest/dumper/PostgreSQLIncrementalDumperTest.java
index 01971a397d3..ab0862084ec 100644
---
a/kernel/data-pipeline/dialect/postgresql/src/test/java/org/apache/shardingsphere/data/pipeline/postgresql/ingest/dumper/PostgreSQLWALDumperTest.java
+++
b/kernel/data-pipeline/dialect/postgresql/src/test/java/org/apache/shardingsphere/data/pipeline/postgresql/ingest/dumper/PostgreSQLIncrementalDumperTest.java
@@ -65,7 +65,7 @@ import static org.mockito.Mockito.when;
@ExtendWith(AutoMockExtension.class)
@StaticMockSettings({PostgreSQLIngestPositionManager.class,
PostgreSQLSlotNameGenerator.class})
@MockitoSettings(strictness = Strictness.LENIENT)
-class PostgreSQLWALDumperTest {
+class PostgreSQLIncrementalDumperTest {
@Mock
private PostgreSQLLogicalReplication logicalReplication;
@@ -80,7 +80,7 @@ class PostgreSQLWALDumperTest {
private IncrementalDumperContext dumperContext;
- private PostgreSQLWALDumper walDumper;
+ private PostgreSQLIncrementalDumper walDumper;
private MemoryPipelineChannel channel;
@@ -97,7 +97,7 @@ class PostgreSQLWALDumperTest {
String password = "root";
createTable(jdbcUrl, username, password);
dumperContext = createDumperContext(jdbcUrl, username, password);
- walDumper = new PostgreSQLWALDumper(dumperContext, position, channel,
+ walDumper = new PostgreSQLIncrementalDumper(dumperContext, position,
channel,
new
StandardPipelineTableMetaDataLoader(dataSourceManager.getDataSource(dumperContext.getCommonContext().getDataSourceConfig())));
}
@@ -133,7 +133,7 @@ class PostgreSQLWALDumperTest {
void assertStart() throws SQLException, ReflectiveOperationException {
StandardPipelineDataSourceConfiguration dataSourceConfig =
(StandardPipelineDataSourceConfiguration)
dumperContext.getCommonContext().getDataSourceConfig();
try {
-
Plugins.getMemberAccessor().set(PostgreSQLWALDumper.class.getDeclaredField("logicalReplication"),
walDumper, logicalReplication);
+
Plugins.getMemberAccessor().set(PostgreSQLIncrementalDumper.class.getDeclaredField("logicalReplication"),
walDumper, logicalReplication);
when(logicalReplication.createConnection(dataSourceConfig)).thenReturn(pgConnection);
when(pgConnection.unwrap(PgConnection.class)).thenReturn(pgConnection);
when(PostgreSQLSlotNameGenerator.getUniqueSlotName(eq(pgConnection),
anyString())).thenReturn("0101123456");
