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 2025/10/11 14:40:59 UTC
(shardingsphere) branch master updated: Rename impl of CharsetVariableProvider (#36852)
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 1e4ed043fb3 Rename impl of CharsetVariableProvider (#36852)
1e4ed043fb3 is described below
commit 1e4ed043fb375319eb5ab30744600428350b586b
Author: Liang Zhang <zh...@apache.org>
AuthorDate: Sat Oct 11 22:40:53 2025 +0800
Rename impl of CharsetVariableProvider (#36852)
---
...arsetExecutor.java => FirebirdCharsetVariableProvider.java} | 10 +++-------
...ler.admin.executor.variable.charset.CharsetVariableProvider | 2 +-
...tCharsetExecutor.java => MySQLCharsetVariableProvider.java} | 4 ++--
...ler.admin.executor.variable.charset.CharsetVariableProvider | 2 +-
...setExecutor.java => PostgreSQLCharsetVariableProvider.java} | 4 ++--
...ler.admin.executor.variable.charset.CharsetVariableProvider | 2 +-
6 files changed, 10 insertions(+), 14 deletions(-)
diff --git a/proxy/backend/dialect/firebird/src/main/java/org/apache/shardingsphere/proxy/backend/firebird/handler/admin/executor/variable/charset/FirebirdSetCharsetExecutor.java b/proxy/backend/dialect/firebird/src/main/java/org/apache/shardingsphere/proxy/backend/firebird/handler/admin/executor/variable/charset/FirebirdCharsetVariableProvider.java
similarity index 86%
rename from proxy/backend/dialect/firebird/src/main/java/org/apache/shardingsphere/proxy/backend/firebird/handler/admin/executor/variable/charset/FirebirdSetCharsetExecutor.java
rename to proxy/backend/dialect/firebird/src/main/java/org/apache/shardingsphere/proxy/backend/firebird/handler/admin/executor/variable/charset/FirebirdCharsetVariableProvider.java
index a817c8ffe98..c2bcbe6d18a 100644
--- a/proxy/backend/dialect/firebird/src/main/java/org/apache/shardingsphere/proxy/backend/firebird/handler/admin/executor/variable/charset/FirebirdSetCharsetExecutor.java
+++ b/proxy/backend/dialect/firebird/src/main/java/org/apache/shardingsphere/proxy/backend/firebird/handler/admin/executor/variable/charset/FirebirdCharsetVariableProvider.java
@@ -24,9 +24,9 @@ import java.nio.charset.Charset;
import java.util.Locale;
/**
- * Set charset executor of Firebird.
+ * Charset variable provider of Firebird.
*/
-public final class FirebirdSetCharsetExecutor implements CharsetVariableProvider {
+public final class FirebirdCharsetVariableProvider implements CharsetVariableProvider {
@Override
public boolean isCharsetVariable(final String variableName) {
@@ -35,7 +35,7 @@ public final class FirebirdSetCharsetExecutor implements CharsetVariableProvider
@Override
public Charset parseCharset(final String variableValue) {
- String formattedValue = formatValue(variableValue);
+ String formattedValue = variableValue.trim();
try {
String result = formattedValue.toLowerCase(Locale.ROOT);
return "default".equals(result) ? Charset.defaultCharset() : FirebirdCharacterSets.findCharacterSet(result);
@@ -44,10 +44,6 @@ public final class FirebirdSetCharsetExecutor implements CharsetVariableProvider
}
}
- private String formatValue(final String variableValue) {
- return variableValue.trim();
- }
-
@Override
public String getDatabaseType() {
return "Firebird";
diff --git a/proxy/backend/dialect/firebird/src/main/resources/META-INF/services/org.apache.shardingsphere.proxy.backend.handler.admin.executor.variable.charset.CharsetVariableProvider b/proxy/backend/dialect/firebird/src/main/resources/META-INF/services/org.apache.shardingsphere.proxy.backend.handler.admin.executor.variable.charset.CharsetVariableProvider
index 7f1c5d9defe..faa3e28d2cc 100644
--- a/proxy/backend/dialect/firebird/src/main/resources/META-INF/services/org.apache.shardingsphere.proxy.backend.handler.admin.executor.variable.charset.CharsetVariableProvider
+++ b/proxy/backend/dialect/firebird/src/main/resources/META-INF/services/org.apache.shardingsphere.proxy.backend.handler.admin.executor.variable.charset.CharsetVariableProvider
@@ -15,4 +15,4 @@
# limitations under the License.
#
-org.apache.shardingsphere.proxy.backend.firebird.handler.admin.executor.variable.charset.FirebirdSetCharsetExecutor
+org.apache.shardingsphere.proxy.backend.firebird.handler.admin.executor.variable.charset.FirebirdCharsetVariableProvider
diff --git a/proxy/backend/dialect/mysql/src/main/java/org/apache/shardingsphere/proxy/backend/mysql/handler/admin/executor/variable/charset/MySQLSetCharsetExecutor.java b/proxy/backend/dialect/mysql/src/main/java/org/apache/shardingsphere/proxy/backend/mysql/handler/admin/executor/variable/charset/MySQLCharsetVariableProvider.java
similarity index 95%
rename from proxy/backend/dialect/mysql/src/main/java/org/apache/shardingsphere/proxy/backend/mysql/handler/admin/executor/variable/charset/MySQLSetCharsetExecutor.java
rename to proxy/backend/dialect/mysql/src/main/java/org/apache/shardingsphere/proxy/backend/mysql/handler/admin/executor/variable/charset/MySQLCharsetVariableProvider.java
index fed0624634a..a4d02ae4fdd 100644
--- a/proxy/backend/dialect/mysql/src/main/java/org/apache/shardingsphere/proxy/backend/mysql/handler/admin/executor/variable/charset/MySQLSetCharsetExecutor.java
+++ b/proxy/backend/dialect/mysql/src/main/java/org/apache/shardingsphere/proxy/backend/mysql/handler/admin/executor/variable/charset/MySQLCharsetVariableProvider.java
@@ -27,9 +27,9 @@ import java.nio.charset.StandardCharsets;
import java.util.Locale;
/**
- * Set charset executor of MySQL.
+ * Charset variable provider of MySQL.
*/
-public final class MySQLSetCharsetExecutor implements CharsetVariableProvider {
+public final class MySQLCharsetVariableProvider implements CharsetVariableProvider {
@Override
public boolean isCharsetVariable(final String variableName) {
diff --git a/proxy/backend/dialect/mysql/src/main/resources/META-INF/services/org.apache.shardingsphere.proxy.backend.handler.admin.executor.variable.charset.CharsetVariableProvider b/proxy/backend/dialect/mysql/src/main/resources/META-INF/services/org.apache.shardingsphere.proxy.backend.handler.admin.executor.variable.charset.CharsetVariableProvider
index 8f750f65a35..66f1d579ed7 100644
--- a/proxy/backend/dialect/mysql/src/main/resources/META-INF/services/org.apache.shardingsphere.proxy.backend.handler.admin.executor.variable.charset.CharsetVariableProvider
+++ b/proxy/backend/dialect/mysql/src/main/resources/META-INF/services/org.apache.shardingsphere.proxy.backend.handler.admin.executor.variable.charset.CharsetVariableProvider
@@ -15,4 +15,4 @@
# limitations under the License.
#
-org.apache.shardingsphere.proxy.backend.mysql.handler.admin.executor.variable.charset.MySQLSetCharsetExecutor
+org.apache.shardingsphere.proxy.backend.mysql.handler.admin.executor.variable.charset.MySQLCharsetVariableProvider
diff --git a/proxy/backend/dialect/postgresql/src/main/java/org/apache/shardingsphere/proxy/backend/postgresql/handler/admin/executor/variable/charset/PostgreSQLSetCharsetExecutor.java b/proxy/backend/dialect/postgresql/src/main/java/org/apache/shardingsphere/proxy/backend/postgresql/handler/admin/executor/variable/charset/PostgreSQLCharsetVariableProvider.java
similarity index 94%
rename from proxy/backend/dialect/postgresql/src/main/java/org/apache/shardingsphere/proxy/backend/postgresql/handler/admin/executor/variable/charset/PostgreSQLSetCharsetExecutor.java
rename to proxy/backend/dialect/postgresql/src/main/java/org/apache/shardingsphere/proxy/backend/postgresql/handler/admin/executor/variable/charset/PostgreSQLCharsetVariableProvider.java
index 1c4b5c82b80..067a7fd29b7 100644
--- a/proxy/backend/dialect/postgresql/src/main/java/org/apache/shardingsphere/proxy/backend/postgresql/handler/admin/executor/variable/charset/PostgreSQLSetCharsetExecutor.java
+++ b/proxy/backend/dialect/postgresql/src/main/java/org/apache/shardingsphere/proxy/backend/postgresql/handler/admin/executor/variable/charset/PostgreSQLCharsetVariableProvider.java
@@ -25,9 +25,9 @@ import java.nio.charset.StandardCharsets;
import java.util.Locale;
/**
- * Set charset executor of PostgreSQL.
+ * Charset variable provider of PostgreSQL.
*/
-public final class PostgreSQLSetCharsetExecutor implements CharsetVariableProvider {
+public final class PostgreSQLCharsetVariableProvider implements CharsetVariableProvider {
@Override
public boolean isCharsetVariable(final String variableName) {
diff --git a/proxy/backend/dialect/postgresql/src/main/resources/META-INF/services/org.apache.shardingsphere.proxy.backend.handler.admin.executor.variable.charset.CharsetVariableProvider b/proxy/backend/dialect/postgresql/src/main/resources/META-INF/services/org.apache.shardingsphere.proxy.backend.handler.admin.executor.variable.charset.CharsetVariableProvider
index 9b6cf14605a..bd07c2bc5bd 100644
--- a/proxy/backend/dialect/postgresql/src/main/resources/META-INF/services/org.apache.shardingsphere.proxy.backend.handler.admin.executor.variable.charset.CharsetVariableProvider
+++ b/proxy/backend/dialect/postgresql/src/main/resources/META-INF/services/org.apache.shardingsphere.proxy.backend.handler.admin.executor.variable.charset.CharsetVariableProvider
@@ -15,4 +15,4 @@
# limitations under the License.
#
-org.apache.shardingsphere.proxy.backend.postgresql.handler.admin.executor.variable.charset.PostgreSQLSetCharsetExecutor
+org.apache.shardingsphere.proxy.backend.postgresql.handler.admin.executor.variable.charset.PostgreSQLCharsetVariableProvider