This is an automated email from the ASF dual-hosted git repository.
menghaoranss 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 2063a2eadb7 Remove the useless constructor for
ShardingSphereIdentifier (#38703)
2063a2eadb7 is described below
commit 2063a2eadb767c719f6a0187757a7da6765168e4
Author: Haoran Meng <[email protected]>
AuthorDate: Tue May 19 10:39:16 2026 +0800
Remove the useless constructor for ShardingSphereIdentifier (#38703)
---
.../identifier/ShardingSphereIdentifier.java | 39 ----
.../identifier/ShardingSphereIdentifierTest.java | 232 +--------------------
2 files changed, 1 insertion(+), 270 deletions(-)
diff --git
a/infra/common/src/main/java/org/apache/shardingsphere/infra/metadata/identifier/ShardingSphereIdentifier.java
b/infra/common/src/main/java/org/apache/shardingsphere/infra/metadata/identifier/ShardingSphereIdentifier.java
index bf698a8369f..ce3e13f10c1 100644
---
a/infra/common/src/main/java/org/apache/shardingsphere/infra/metadata/identifier/ShardingSphereIdentifier.java
+++
b/infra/common/src/main/java/org/apache/shardingsphere/infra/metadata/identifier/ShardingSphereIdentifier.java
@@ -19,12 +19,6 @@ package org.apache.shardingsphere.infra.metadata.identifier;
import com.cedarsoftware.util.CaseInsensitiveMap.CaseInsensitiveString;
import lombok.Getter;
-import
org.apache.shardingsphere.database.connector.core.metadata.database.enums.QuoteCharacter;
-import
org.apache.shardingsphere.database.connector.core.metadata.database.metadata.DialectDatabaseMetaData;
-import
org.apache.shardingsphere.database.connector.core.metadata.database.metadata.option.IdentifierPatternType;
-import org.apache.shardingsphere.database.connector.core.type.DatabaseType;
-import
org.apache.shardingsphere.database.connector.core.type.DatabaseTypeRegistry;
-import
org.apache.shardingsphere.sql.parser.statement.core.value.identifier.IdentifierValue;
import java.util.Objects;
@@ -46,39 +40,6 @@ public final class ShardingSphereIdentifier {
caseSensitive = false;
}
- public ShardingSphereIdentifier(final String value, final DatabaseType
databaseType) {
- this.value = null == value ? null : CaseInsensitiveString.of(value);
- DialectDatabaseMetaData dialectDatabaseMetaData = new
DatabaseTypeRegistry(databaseType).getDialectDatabaseMetaData();
- standardizeValue = standardizeValue(value, dialectDatabaseMetaData,
false);
- caseSensitive = dialectDatabaseMetaData.isCaseSensitive();
- }
-
- public ShardingSphereIdentifier(final IdentifierValue identifierValue,
final DatabaseType databaseType) {
- value = null == identifierValue.getValue() ? null :
CaseInsensitiveString.of(identifierValue.getValue());
- DialectDatabaseMetaData dialectDatabaseMetaData = new
DatabaseTypeRegistry(databaseType).getDialectDatabaseMetaData();
- standardizeValue = standardizeValue(identifierValue.getValue(),
dialectDatabaseMetaData, QuoteCharacter.NONE !=
identifierValue.getQuoteCharacter());
- caseSensitive = dialectDatabaseMetaData.isCaseSensitive();
- }
-
- private static String standardizeValue(final String value, final
DialectDatabaseMetaData dialectDatabaseMetaData, final boolean quoted) {
- if (null == value) {
- return null;
- }
- if (quoted) {
- return value;
- }
- IdentifierPatternType patternType =
dialectDatabaseMetaData.getIdentifierPatternType();
- switch (patternType) {
- case UPPER_CASE:
- return value.toUpperCase();
- case LOWER_CASE:
- return value.toLowerCase();
- case KEEP_ORIGIN:
- default:
- return value;
- }
- }
-
/**
* Get identifier value.
*
diff --git
a/infra/common/src/test/java/org/apache/shardingsphere/infra/metadata/identifier/ShardingSphereIdentifierTest.java
b/infra/common/src/test/java/org/apache/shardingsphere/infra/metadata/identifier/ShardingSphereIdentifierTest.java
index a01dc9c793b..da4002ccf3c 100644
---
a/infra/common/src/test/java/org/apache/shardingsphere/infra/metadata/identifier/ShardingSphereIdentifierTest.java
+++
b/infra/common/src/test/java/org/apache/shardingsphere/infra/metadata/identifier/ShardingSphereIdentifierTest.java
@@ -17,18 +17,11 @@
package org.apache.shardingsphere.infra.metadata.identifier;
-import org.apache.shardingsphere.database.connector.core.type.DatabaseType;
-import org.apache.shardingsphere.infra.spi.type.typed.TypedSPILoader;
-import
org.apache.shardingsphere.sql.parser.statement.core.value.identifier.IdentifierValue;
import org.junit.jupiter.api.Test;
-import java.util.HashMap;
-import java.util.Map;
-
+import static org.hamcrest.MatcherAssert.assertThat;
import static org.hamcrest.Matchers.is;
import static org.hamcrest.Matchers.not;
-import static org.hamcrest.MatcherAssert.assertThat;
-import static org.junit.jupiter.api.Assertions.assertNull;
class ShardingSphereIdentifierTest {
@@ -38,23 +31,6 @@ class ShardingSphereIdentifierTest {
assertThat(new ShardingSphereIdentifier("foo").getStandardizeValue(),
is("foo"));
}
- @Test
- void assertConstructorWithValueAndDatabaseType() {
- DatabaseType postgresql = getDatabaseType("PostgreSQL");
- assertThat(new ShardingSphereIdentifier("foo", postgresql).getValue(),
is("foo"));
- assertThat(new ShardingSphereIdentifier("foo",
postgresql).getStandardizeValue(), is("foo"));
- assertThat(new ShardingSphereIdentifier("FOO",
postgresql).getStandardizeValue(), is("foo"));
- }
-
- @Test
- void assertConstructorWithIdentifierValueAndDatabaseType() {
- DatabaseType postgresql = getDatabaseType("PostgreSQL");
- assertThat(new ShardingSphereIdentifier(new IdentifierValue("foo"),
postgresql).getValue(), is("foo"));
- assertThat(new ShardingSphereIdentifier(new IdentifierValue("FOO"),
postgresql).getStandardizeValue(), is("foo"));
- assertThat(new ShardingSphereIdentifier(new
IdentifierValue("\"foo\""), postgresql).getStandardizeValue(), is("foo"));
- assertThat(new ShardingSphereIdentifier(new
IdentifierValue("\"FOO\""), postgresql).getStandardizeValue(), is("FOO"));
- }
-
@Test
void assertEqualsWithNotShardingSphereIdentifier() {
assertThat(new ShardingSphereIdentifier("foo"), not(new Object()));
@@ -78,210 +54,4 @@ class ShardingSphereIdentifierTest {
assertThat(new ShardingSphereIdentifier("foo").hashCode(), is(new
ShardingSphereIdentifier("foo").hashCode()));
assertThat(new ShardingSphereIdentifier("foo").hashCode(), is(new
ShardingSphereIdentifier("FOO").hashCode()));
}
-
- @Test
- void assertToString() {
- DatabaseType postgresql = getDatabaseType("PostgreSQL");
- assertThat(new ShardingSphereIdentifier("foo", postgresql).toString(),
is("foo"));
- assertThat(new ShardingSphereIdentifier("FOO", postgresql).toString(),
is("FOO"));
- assertThat(new ShardingSphereIdentifier(new IdentifierValue("foo"),
postgresql).toString(), is("foo"));
- }
-
- @Test
- void assertPostgresSQLLowerCaseUnquoted() {
- DatabaseType postgresql = getDatabaseType("PostgreSQL");
- Map<ShardingSphereIdentifier, String> map = new HashMap<>();
- map.put(new ShardingSphereIdentifier("mytable", postgresql), "value1");
- assertThat(map.get(new ShardingSphereIdentifier("MYTABLE",
postgresql)), is("value1"));
- assertThat(map.get(new ShardingSphereIdentifier("mytable",
postgresql)), is("value1"));
- }
-
- @Test
- void assertPostgresSQLQuotedCaseSensitive() {
- DatabaseType postgresql = getDatabaseType("PostgreSQL");
- Map<ShardingSphereIdentifier, String> map = new HashMap<>();
- map.put(new ShardingSphereIdentifier(new
IdentifierValue("\"MyTable\""), postgresql), "value1");
- assertThat(map.get(new ShardingSphereIdentifier(new
IdentifierValue("\"MyTable\""), postgresql)), is("value1"));
- assertNull(map.get(new ShardingSphereIdentifier("MyTable",
postgresql)));
- assertNull(map.get(new ShardingSphereIdentifier("mytable",
postgresql)));
- }
-
- @Test
- void assertPostgresSQLStandardizeValue() {
- DatabaseType postgresql = getDatabaseType("PostgreSQL");
- ShardingSphereIdentifier unquoted = new
ShardingSphereIdentifier("MyTable", postgresql);
- assertThat(unquoted.getValue(), is("MyTable"));
- assertThat(unquoted.getStandardizeValue(), is("mytable"));
- ShardingSphereIdentifier quoted = new ShardingSphereIdentifier(new
IdentifierValue("\"MyTable\""), postgresql);
- assertThat(quoted.getValue(), is("MyTable"));
- assertThat(quoted.getStandardizeValue(), is("MyTable"));
- }
-
- @Test
- void assertOracleUpperCaseUnquoted() {
- DatabaseType oracle = getDatabaseType("Oracle");
- Map<ShardingSphereIdentifier, String> map = new HashMap<>();
- map.put(new ShardingSphereIdentifier("MYTABLE", oracle), "value1");
- assertThat(map.get(new ShardingSphereIdentifier("mytable", oracle)),
is("value1"));
- assertThat(map.get(new ShardingSphereIdentifier("MYTABLE", oracle)),
is("value1"));
- }
-
- @Test
- void assertOracleQuotedCaseInsensitive() {
- DatabaseType oracle = getDatabaseType("Oracle");
- Map<ShardingSphereIdentifier, String> map = new HashMap<>();
- map.put(new ShardingSphereIdentifier(new
IdentifierValue("\"MYTABLE\""), oracle), "value1");
- assertThat(map.get(new ShardingSphereIdentifier(new
IdentifierValue("\"MYTABLE\""), oracle)), is("value1"));
- assertThat(map.get(new ShardingSphereIdentifier(new
IdentifierValue("\"mytable\""), oracle)), is("value1"));
- assertThat(map.get(new ShardingSphereIdentifier("mytable", oracle)),
is("value1"));
- }
-
- @Test
- void assertOracleStandardizeValue() {
- DatabaseType oracle = getDatabaseType("Oracle");
- ShardingSphereIdentifier unquoted = new
ShardingSphereIdentifier("mytable", oracle);
- assertThat(unquoted.getValue(), is("mytable"));
- // TODO FIXME
- // assertThat(unquoted.getStandardizeValue(), is("MYTABLE"));
- ShardingSphereIdentifier quoted = new ShardingSphereIdentifier(new
IdentifierValue("\"mytable\""), oracle);
- assertThat(quoted.getValue(), is("mytable"));
- assertThat(quoted.getStandardizeValue(), is("mytable"));
- }
-
- @Test
- void assertClickHouseKeepOriginUnquoted() {
- DatabaseType clickhouse = getDatabaseType("ClickHouse");
- Map<ShardingSphereIdentifier, String> map = new HashMap<>();
- map.put(new ShardingSphereIdentifier("MyTable", clickhouse), "value1");
- assertThat(map.get(new ShardingSphereIdentifier("MyTable",
clickhouse)), is("value1"));
- assertThat(map.get(new ShardingSphereIdentifier("mytable",
clickhouse)), is("value1"));
- }
-
- @Test
- void assertClickHouseQuotedCaseSensitive() {
- DatabaseType clickhouse = getDatabaseType("ClickHouse");
- Map<ShardingSphereIdentifier, String> map = new HashMap<>();
- map.put(new ShardingSphereIdentifier(new
IdentifierValue("\"MyTable\""), clickhouse), "value1");
- assertThat(map.get(new ShardingSphereIdentifier(new
IdentifierValue("\"MyTable\""), clickhouse)), is("value1"));
- assertThat(map.get(new ShardingSphereIdentifier(new
IdentifierValue("\"mytable\""), clickhouse)), is("value1"));
- }
-
- @Test
- void assertClickHouseStandardizeValue() {
- DatabaseType clickhouse = getDatabaseType("ClickHouse");
- ShardingSphereIdentifier unquoted = new
ShardingSphereIdentifier("MyTable", clickhouse);
- assertThat(unquoted.getValue(), is("MyTable"));
- assertThat(unquoted.getStandardizeValue(), is("MyTable"));
- ShardingSphereIdentifier quoted = new ShardingSphereIdentifier(new
IdentifierValue("\"MyTable\""), clickhouse);
- assertThat(quoted.getValue(), is("MyTable"));
- assertThat(quoted.getStandardizeValue(), is("MyTable"));
- }
-
- @Test
- void assertHashCodeWithCaseSensitive() {
- DatabaseType postgresql = getDatabaseType("PostgreSQL");
- ShardingSphereIdentifier quoted1 = new ShardingSphereIdentifier(new
IdentifierValue("\"MyTable\""), postgresql);
- ShardingSphereIdentifier quoted2 = new ShardingSphereIdentifier(new
IdentifierValue("\"MyTable\""), postgresql);
- ShardingSphereIdentifier quoted3 = new ShardingSphereIdentifier(new
IdentifierValue("\"mytable\""), postgresql);
- assertThat(quoted1.hashCode(), is(quoted2.hashCode()));
- assertThat(quoted1.hashCode(), not(quoted3.hashCode()));
- }
-
- @Test
- void assertNullValue() {
- DatabaseType postgresql = getDatabaseType("PostgreSQL");
- ShardingSphereIdentifier nullIdentifier = new
ShardingSphereIdentifier(null);
- assertNull(nullIdentifier.getValue());
- assertNull(nullIdentifier.getStandardizeValue());
- ShardingSphereIdentifier nullIdentifierWithDatabaseType = new
ShardingSphereIdentifier(new IdentifierValue(null), postgresql);
- assertNull(nullIdentifierWithDatabaseType.getValue());
- assertNull(nullIdentifierWithDatabaseType.getStandardizeValue());
- }
-
- @Test
- void assertEqualsWithNullValues() {
- DatabaseType postgresql = getDatabaseType("PostgreSQL");
- ShardingSphereIdentifier null1 = new ShardingSphereIdentifier(null);
- ShardingSphereIdentifier null2 = new ShardingSphereIdentifier(null);
- assertThat(null1, is(null2));
- assertThat(null1.hashCode(), is(null2.hashCode()));
- ShardingSphereIdentifier null3 = new ShardingSphereIdentifier(new
IdentifierValue(null), postgresql);
- ShardingSphereIdentifier null4 = new ShardingSphereIdentifier(new
IdentifierValue(null), postgresql);
- assertThat(null3, is(null4));
- assertThat(null3.hashCode(), is(null4.hashCode()));
- }
-
- @Test
- void assertNotEqualsWithOneNullValue() {
- DatabaseType postgresql = getDatabaseType("PostgreSQL");
- ShardingSphereIdentifier nullIdentifier = new
ShardingSphereIdentifier(null);
- ShardingSphereIdentifier nonNullIdentifier = new
ShardingSphereIdentifier("foo");
- assertThat(nullIdentifier, not(nonNullIdentifier));
- ShardingSphereIdentifier nullIdentifierWithDatabaseType = new
ShardingSphereIdentifier(new IdentifierValue(null), postgresql);
- ShardingSphereIdentifier nonNullIdentifierWithDatabaseType = new
ShardingSphereIdentifier("foo", postgresql);
- assertThat(nullIdentifierWithDatabaseType,
not(nonNullIdentifierWithDatabaseType));
- }
-
- @Test
- void assertMySQLKeepOriginUnquoted() {
- DatabaseType mysql = getDatabaseType("MySQL");
- Map<ShardingSphereIdentifier, String> map = new HashMap<>();
- map.put(new ShardingSphereIdentifier("MyTable", mysql), "value1");
- assertThat(map.get(new ShardingSphereIdentifier("MyTable", mysql)),
is("value1"));
- assertThat(map.get(new ShardingSphereIdentifier("mytable", mysql)),
is("value1"));
- }
-
- @Test
- void assertMySQLQuotedCaseSensitive() {
- DatabaseType mysql = getDatabaseType("MySQL");
- Map<ShardingSphereIdentifier, String> map = new HashMap<>();
- map.put(new ShardingSphereIdentifier(new IdentifierValue("`MyTable`"),
mysql), "value1");
- assertThat(map.get(new ShardingSphereIdentifier(new
IdentifierValue("`MyTable`"), mysql)), is("value1"));
- assertThat(map.get(new ShardingSphereIdentifier(new
IdentifierValue("`mytable`"), mysql)), is("value1"));
- }
-
- @Test
- void assertMySQLStandardizeValue() {
- DatabaseType mysql = getDatabaseType("MySQL");
- ShardingSphereIdentifier unquoted = new
ShardingSphereIdentifier("MyTable", mysql);
- assertThat(unquoted.getValue(), is("MyTable"));
- assertThat(unquoted.getStandardizeValue(), is("MyTable"));
- ShardingSphereIdentifier quoted = new ShardingSphereIdentifier(new
IdentifierValue("`MyTable`"), mysql);
- assertThat(quoted.getValue(), is("MyTable"));
- assertThat(quoted.getStandardizeValue(), is("MyTable"));
- }
-
- @Test
- void assertOpenGaussLowerCaseUnquoted() {
- DatabaseType opengauss = getDatabaseType("openGauss");
- Map<ShardingSphereIdentifier, String> map = new HashMap<>();
- map.put(new ShardingSphereIdentifier("mytable", opengauss), "value1");
- assertThat(map.get(new ShardingSphereIdentifier("MYTABLE",
opengauss)), is("value1"));
- assertThat(map.get(new ShardingSphereIdentifier("mytable",
opengauss)), is("value1"));
- }
-
- @Test
- void assertOpenGaussQuotedCaseSensitive() {
- DatabaseType opengauss = getDatabaseType("openGauss");
- Map<ShardingSphereIdentifier, String> map = new HashMap<>();
- map.put(new ShardingSphereIdentifier(new
IdentifierValue("\"MyTable\""), opengauss), "value1");
- assertThat(map.get(new ShardingSphereIdentifier(new
IdentifierValue("\"MyTable\""), opengauss)), is("value1"));
- assertNull(map.get(new ShardingSphereIdentifier("MyTable",
opengauss)));
- assertNull(map.get(new ShardingSphereIdentifier("mytable",
opengauss)));
- }
-
- @Test
- void assertOpenGaussStandardizeValue() {
- DatabaseType opengauss = getDatabaseType("openGauss");
- ShardingSphereIdentifier unquoted = new
ShardingSphereIdentifier("MyTable", opengauss);
- assertThat(unquoted.getValue(), is("MyTable"));
- assertThat(unquoted.getStandardizeValue(), is("mytable"));
- ShardingSphereIdentifier quoted = new ShardingSphereIdentifier(new
IdentifierValue("\"MyTable\""), opengauss);
- assertThat(quoted.getValue(), is("MyTable"));
- assertThat(quoted.getStandardizeValue(), is("MyTable"));
- }
-
- private DatabaseType getDatabaseType(final String databaseTypeName) {
- return TypedSPILoader.getService(DatabaseType.class, databaseTypeName);
- }
}
