You are viewing a plain text version of this content. The canonical link for it is here.
Posted to notifications@shardingsphere.apache.org by ji...@apache.org on 2024/10/23 11:08:47 UTC
(shardingsphere) branch master updated: Refactor InventoryColumnValueReaderEngine (#33375)
This is an automated email from the ASF dual-hosted git repository.
jianglongtao 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 b6b00548b0a Refactor InventoryColumnValueReaderEngine (#33375)
b6b00548b0a is described below
commit b6b00548b0a1b6fe5565c1645e591d0ac2c63d71
Author: Liang Zhang <zh...@apache.org>
AuthorDate: Wed Oct 23 19:08:39 2024 +0800
Refactor InventoryColumnValueReaderEngine (#33375)
---
.../column/InventoryColumnValueReaderEngine.java | 15 +++++++--------
1 file changed, 7 insertions(+), 8 deletions(-)
diff --git a/kernel/data-pipeline/core/src/main/java/org/apache/shardingsphere/data/pipeline/core/ingest/dumper/inventory/column/InventoryColumnValueReaderEngine.java b/kernel/data-pipeline/core/src/main/java/org/apache/shardingsphere/data/pipeline/core/ingest/dumper/inventory/column/InventoryColumnValueReaderEngine.java
index e7e5efd1e2a..338ffb9450f 100644
--- a/kernel/data-pipeline/core/src/main/java/org/apache/shardingsphere/data/pipeline/core/ingest/dumper/inventory/column/InventoryColumnValueReaderEngine.java
+++ b/kernel/data-pipeline/core/src/main/java/org/apache/shardingsphere/data/pipeline/core/ingest/dumper/inventory/column/InventoryColumnValueReaderEngine.java
@@ -17,6 +17,7 @@
package org.apache.shardingsphere.data.pipeline.core.ingest.dumper.inventory.column;
+import lombok.RequiredArgsConstructor;
import org.apache.shardingsphere.infra.database.core.spi.DatabaseTypedSPILoader;
import org.apache.shardingsphere.infra.database.core.type.DatabaseType;
@@ -32,13 +33,10 @@ import java.util.Optional;
/**
* Inventory column value reader engine.
*/
+@RequiredArgsConstructor
public final class InventoryColumnValueReaderEngine {
- private final DialectInventoryColumnValueReader columnReader;
-
- public InventoryColumnValueReaderEngine(final DatabaseType databaseType) {
- columnReader = DatabaseTypedSPILoader.findService(DialectInventoryColumnValueReader.class, databaseType).orElse(null);
- }
+ private final DatabaseType databaseType;
/**
* Read column value.
@@ -56,10 +54,11 @@ public final class InventoryColumnValueReaderEngine {
}
private Optional<Object> readDialectValue(final ResultSet resultSet, final ResultSetMetaData metaData, final int columnIndex) throws SQLException {
- return null == columnReader ? Optional.empty() : columnReader.read(resultSet, metaData, columnIndex);
+ Optional<DialectInventoryColumnValueReader> dialectColumnReader = DatabaseTypedSPILoader.findService(DialectInventoryColumnValueReader.class, databaseType);
+ return dialectColumnReader.isPresent() ? dialectColumnReader.get().read(resultSet, metaData, columnIndex) : Optional.empty();
}
- private static Object readStandardValue(final ResultSet resultSet, final ResultSetMetaData metaData, final int columnIndex) throws SQLException {
+ private Object readStandardValue(final ResultSet resultSet, final ResultSetMetaData metaData, final int columnIndex) throws SQLException {
int columnType = metaData.getColumnType(columnIndex);
switch (columnType) {
case Types.BOOLEAN:
@@ -129,7 +128,7 @@ public final class InventoryColumnValueReaderEngine {
}
}
- private static boolean isSigned(final ResultSetMetaData metaData, final int columnIndex) throws SQLException {
+ private boolean isSigned(final ResultSetMetaData metaData, final int columnIndex) throws SQLException {
return metaData.isSigned(columnIndex);
}
}