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 91e03612c8a Remove StandardJdbcUrl.getPort() (#36401)
91e03612c8a is described below
commit 91e03612c8a39abfb27c786ff7e4a8e9ee313cd5
Author: Liang Zhang <zhangli...@apache.org>
AuthorDate: Sun Aug 24 15:55:18 2025 +0800
Remove StandardJdbcUrl.getPort() (#36401)
* Remove StandardJdbcUrl.getPort()
* Remove StandardJdbcUrl.getPort()
---
.../jdbcurl/parser/standard/StandardJdbcUrl.java | 10 -----
.../parser/standard/StandardJdbcUrlParser.java | 11 ++---
.../fixture/ConnectionPropertiesParserFixture.java | 2 +-
.../parser/standard/StandardJdbcUrlParserTest.java | 47 +++++++++++-----------
.../ClickHouseConnectionPropertiesParser.java | 5 +--
.../jdbcurl/MySQLConnectionPropertiesParser.java | 4 +-
.../OpenGaussConnectionPropertiesParser.java | 5 +--
.../PostgreSQLConnectionPropertiesParser.java | 5 +--
.../jdbcurl/PrestoConnectionPropertiesParser.java | 5 +--
.../MockedConnectionPropertiesParser.java | 2 +-
10 files changed, 42 insertions(+), 54 deletions(-)
diff --git
a/database/connector/core/src/main/java/org/apache/shardingsphere/database/connector/core/jdbcurl/parser/standard/StandardJdbcUrl.java
b/database/connector/core/src/main/java/org/apache/shardingsphere/database/connector/core/jdbcurl/parser/standard/StandardJdbcUrl.java
index 238a9f4c7d3..aa28224cbfb 100644
---
a/database/connector/core/src/main/java/org/apache/shardingsphere/database/connector/core/jdbcurl/parser/standard/StandardJdbcUrl.java
+++
b/database/connector/core/src/main/java/org/apache/shardingsphere/database/connector/core/jdbcurl/parser/standard/StandardJdbcUrl.java
@@ -38,14 +38,4 @@ public final class StandardJdbcUrl {
private final String schema;
private final Properties queryProperties;
-
- /**
- * Get port.
- *
- * @param defaultPort default port if absent
- * @return port
- */
- public int getPort(final int defaultPort) {
- return -1 == port ? defaultPort : port;
- }
}
diff --git
a/database/connector/core/src/main/java/org/apache/shardingsphere/database/connector/core/jdbcurl/parser/standard/StandardJdbcUrlParser.java
b/database/connector/core/src/main/java/org/apache/shardingsphere/database/connector/core/jdbcurl/parser/standard/StandardJdbcUrlParser.java
index 633128db4bb..c5515aa0173 100644
---
a/database/connector/core/src/main/java/org/apache/shardingsphere/database/connector/core/jdbcurl/parser/standard/StandardJdbcUrlParser.java
+++
b/database/connector/core/src/main/java/org/apache/shardingsphere/database/connector/core/jdbcurl/parser/standard/StandardJdbcUrlParser.java
@@ -64,9 +64,10 @@ public final class StandardJdbcUrlParser {
* Parse JDBC URL.
*
* @param jdbcUrl JDBC URL to be parsed
+ * @param defaultPort default port
* @return parsed JDBC URL
*/
- public StandardJdbcUrl parse(final String jdbcUrl) {
+ public StandardJdbcUrl parse(final String jdbcUrl, final int defaultPort) {
Matcher matcher = CONNECTION_URL_PATTERN.matcher(jdbcUrl);
ShardingSpherePreconditions.checkState(matcher.matches(), () -> new
UnrecognizedDatabaseURLException(jdbcUrl,
CONNECTION_URL_PATTERN.pattern().replaceAll("%", "%%")));
String authority = matcher.group(AUTHORITY_GROUP_KEY);
@@ -75,19 +76,19 @@ public final class StandardJdbcUrlParser {
String database = matcher.group(PATH_GROUP_KEY);
String schema = queryProperties.getProperty(SCHEMA_KEY);
if (authority.isEmpty()) {
- return new StandardJdbcUrl("", -1, database, schema,
queryProperties);
+ return new StandardJdbcUrl("", defaultPort, database, schema,
queryProperties);
}
Matcher hostMatcher = HOST_PORT_PATTERN_PATTERN.matcher(authority);
ShardingSpherePreconditions.checkState(hostMatcher.find(), () -> new
UnrecognizedDatabaseURLException(jdbcUrl,
CONNECTION_URL_PATTERN.pattern().replaceAll("%", "%%")));
- return new StandardJdbcUrl(parseHostname(hostMatcher),
parsePort(hostMatcher), database, schema, queryProperties);
+ return new StandardJdbcUrl(parseHostname(hostMatcher),
parsePort(hostMatcher, defaultPort), database, schema, queryProperties);
}
private String parseHostname(final Matcher hostMatcher) {
return
Optional.ofNullable(hostMatcher.group(IPV6_HOSTNAME_GROUP_KEY)).orElse(hostMatcher.group(HOSTNAME_GROUP_KEY));
}
- private int parsePort(final Matcher hostMatcher) {
- return
Optional.ofNullable(hostMatcher.group(PORT_GROUP_KEY)).map(Integer::parseInt).orElse(-1);
+ private int parsePort(final Matcher hostMatcher, final int defaultPort) {
+ return
Optional.ofNullable(hostMatcher.group(PORT_GROUP_KEY)).map(Integer::parseInt).orElse(defaultPort);
}
/**
diff --git
a/database/connector/core/src/test/java/org/apache/shardingsphere/database/connector/core/jdbcurl/parser/fixture/ConnectionPropertiesParserFixture.java
b/database/connector/core/src/test/java/org/apache/shardingsphere/database/connector/core/jdbcurl/parser/fixture/ConnectionPropertiesParserFixture.java
index 7ebdd4f39dd..a5cca500a9a 100644
---
a/database/connector/core/src/test/java/org/apache/shardingsphere/database/connector/core/jdbcurl/parser/fixture/ConnectionPropertiesParserFixture.java
+++
b/database/connector/core/src/test/java/org/apache/shardingsphere/database/connector/core/jdbcurl/parser/fixture/ConnectionPropertiesParserFixture.java
@@ -30,7 +30,7 @@ public final class ConnectionPropertiesParserFixture
implements ConnectionProper
@Override
public ConnectionProperties parse(final String url, final String username,
final String catalog) {
ConnectionProperties result = mock(ConnectionProperties.class,
RETURNS_DEEP_STUBS);
- when(result.getQueryProperties()).thenReturn(new
StandardJdbcUrlParser().parse(url).getQueryProperties());
+ when(result.getQueryProperties()).thenReturn(new
StandardJdbcUrlParser().parse(url, -1).getQueryProperties());
return result;
}
diff --git
a/database/connector/core/src/test/java/org/apache/shardingsphere/database/connector/core/jdbcurl/parser/standard/StandardJdbcUrlParserTest.java
b/database/connector/core/src/test/java/org/apache/shardingsphere/database/connector/core/jdbcurl/parser/standard/StandardJdbcUrlParserTest.java
index 30ac3719a4e..2f0bfceb4f6 100644
---
a/database/connector/core/src/test/java/org/apache/shardingsphere/database/connector/core/jdbcurl/parser/standard/StandardJdbcUrlParserTest.java
+++
b/database/connector/core/src/test/java/org/apache/shardingsphere/database/connector/core/jdbcurl/parser/standard/StandardJdbcUrlParserTest.java
@@ -39,9 +39,9 @@ class StandardJdbcUrlParserTest {
@ParameterizedTest(name = "{0}")
@ArgumentsSource(TestCaseArgumentsProvider.class)
- void assertParse(final String name, final String actualURL,
+ void assertParse(final String name, final String actualURL, final int
defaultPort,
final String expectedHostname, final int expectedPort,
final String expectedDatabaseName, final String expectedSchemaName, final
Properties expectedQueryProps) {
- StandardJdbcUrl actual = new StandardJdbcUrlParser().parse(actualURL);
+ StandardJdbcUrl actual = new StandardJdbcUrlParser().parse(actualURL,
defaultPort);
assertThat(actual.getHostname(), is(expectedHostname));
assertThat(actual.getPort(), is(expectedPort));
assertThat(actual.getDatabase(), is(expectedDatabaseName));
@@ -51,7 +51,7 @@ class StandardJdbcUrlParserTest {
@Test
void assertParseIncorrectURL() {
- assertThrows(UnrecognizedDatabaseURLException.class, () -> new
StandardJdbcUrlParser().parse("jdbc:h2:mem:test;DB_CLOSE_DELAY=-1;DATABASE_TO_UPPER=false;MODE=MySQL"));
+ assertThrows(UnrecognizedDatabaseURLException.class, () -> new
StandardJdbcUrlParser().parse("jdbc:h2:mem:test;DB_CLOSE_DELAY=-1;DATABASE_TO_UPPER=false;MODE=MySQL",
-1));
}
private static class TestCaseArgumentsProvider implements
ArgumentsProvider {
@@ -59,30 +59,31 @@ class StandardJdbcUrlParserTest {
@Override
public Stream<? extends Arguments> provideArguments(final
ParameterDeclarations parameters, final ExtensionContext context) {
return Stream.of(
- Arguments.arguments("simple",
"jdbc:mock://127.0.0.1/?schema=foo_schema", "127.0.0.1", -1, "", "foo_schema",
PropertiesBuilder.build(new Property("schema", "foo_schema"))),
- Arguments.arguments("MySQL_v4",
"jdbc:mysql://127.0.0.1:3306/foo_ds?useSSL=false&sessionVariables=group_concat_max_len=204800,SQL_SAFE_UPDATES=0",
"127.0.0.1", 3306, "foo_ds",
- null, PropertiesBuilder.build(new
Property("useSSL", Boolean.FALSE.toString()), new Property("sessionVariables",
"group_concat_max_len=204800,SQL_SAFE_UPDATES=0"))),
- Arguments.arguments("MySQL_v6",
"jdbc:mysql://[fe80::d114:22b3:a0d9:2b3]:3306/foo_ds",
"fe80::d114:22b3:a0d9:2b3", 3306, "foo_ds", null, new Properties()),
- Arguments.arguments("MySQL_with_replication",
"jdbc:mysql:replication://master-ip:3306,slave-1-ip:3306,slave-2-ip:3306/foo_ds?useUnicode=true",
"master-ip", 3306, "foo_ds", null,
- PropertiesBuilder.build(new Property("useUnicode",
Boolean.TRUE.toString()))),
- Arguments.arguments("PostgreSQL_v4",
"jdbc:postgresql://127.0.0.1:5432/foo_ds?prepareThreshold=1&preferQueryMode=extendedForPrepared",
"127.0.0.1", 5432, "foo_ds", null,
+ Arguments.arguments("simple",
"jdbc:mock://127.0.0.1/?schema=foo_schema", -1, "127.0.0.1", -1, "",
"foo_schema", PropertiesBuilder.build(new Property("schema", "foo_schema"))),
+ Arguments.arguments("MySQL_v4",
"jdbc:mysql://127.0.0.1/foo_ds?useSSL=false&sessionVariables=group_concat_max_len=204800,SQL_SAFE_UPDATES=0",
3306, "127.0.0.1", 3306,
+ "foo_ds", null,
+ PropertiesBuilder.build(new Property("useSSL",
Boolean.FALSE.toString()), new Property("sessionVariables",
"group_concat_max_len=204800,SQL_SAFE_UPDATES=0"))),
+ Arguments.arguments("MySQL_v6",
"jdbc:mysql://[fe80::d114:22b3:a0d9:2b3]:3306/foo_ds", 3306,
"fe80::d114:22b3:a0d9:2b3", 3306, "foo_ds", null, new Properties()),
+ Arguments.arguments("MySQL_with_replication",
"jdbc:mysql:replication://master-ip:3306,slave-1-ip:3306,slave-2-ip:3306/foo_ds?useUnicode=true",
3306, "master-ip", 3306, "foo_ds",
+ null, PropertiesBuilder.build(new
Property("useUnicode", Boolean.TRUE.toString()))),
+ Arguments.arguments("PostgreSQL_v4",
"jdbc:postgresql://127.0.0.1:5432/foo_ds?prepareThreshold=1&preferQueryMode=extendedForPrepared",
5432, "127.0.0.1", 5432, "foo_ds", null,
PropertiesBuilder.build(new
Property("prepareThreshold", "1"), new Property("preferQueryMode",
"extendedForPrepared"))),
- Arguments.arguments("testcontainers_MySQL",
"jdbc:tc:mysql:5.7.34:///foo_ds", "", -1, "foo_ds", null, new Properties()),
- Arguments.arguments("testcontainers_Postgres",
"jdbc:tc:postgresql:9.6.8:///foo_ds", "", -1, "foo_ds", null, new Properties()),
- Arguments.arguments("testcontainers_PostGIS",
"jdbc:tc:postgis:9.6-2.5:///foo_ds", "", -1, "foo_ds", null, new Properties()),
- Arguments.arguments("testcontainers_TimescaleDB",
"jdbc:tc:timescaledb:2.1.0-pg13:///foo_ds", "", -1, "foo_ds", null, new
Properties()),
- Arguments.arguments("testcontainers_Trino",
"jdbc:tc:trino:352://localhost/memory/default", "localhost", -1,
"memory/default", null, new Properties()),
- Arguments.arguments("testcontainers_CockroachDB",
"jdbc:tc:cockroach:v21.2.3:///foo_ds", "", -1, "foo_ds", null, new
Properties()),
- Arguments.arguments("testcontainers_TiDB",
"jdbc:tc:tidb:v6.1.0:///foo_ds", "", -1, "foo_ds", null, new Properties()),
- Arguments.arguments("testcontainers_INITSCRIPT_CLASSPATH",
"jdbc:tc:mysql:5.7.34:///foo_ds?TC_INITSCRIPT=somepath/init_mysql.sql", "", -1,
"foo_ds", null,
+ Arguments.arguments("testcontainers_MySQL",
"jdbc:tc:mysql:5.7.34:///foo_ds", -1, "", -1, "foo_ds", null, new Properties()),
+ Arguments.arguments("testcontainers_Postgres",
"jdbc:tc:postgresql:9.6.8:///foo_ds", -1, "", -1, "foo_ds", null, new
Properties()),
+ Arguments.arguments("testcontainers_PostGIS",
"jdbc:tc:postgis:9.6-2.5:///foo_ds", -1, "", -1, "foo_ds", null, new
Properties()),
+ Arguments.arguments("testcontainers_TimescaleDB",
"jdbc:tc:timescaledb:2.1.0-pg13:///foo_ds", -1, "", -1, "foo_ds", null, new
Properties()),
+ Arguments.arguments("testcontainers_Trino",
"jdbc:tc:trino:352://localhost/memory/default", -1, "localhost", -1,
"memory/default", null, new Properties()),
+ Arguments.arguments("testcontainers_CockroachDB",
"jdbc:tc:cockroach:v21.2.3:///foo_ds", -1, "", -1, "foo_ds", null, new
Properties()),
+ Arguments.arguments("testcontainers_TiDB",
"jdbc:tc:tidb:v6.1.0:///foo_ds", -1, "", -1, "foo_ds", null, new Properties()),
+ Arguments.arguments("testcontainers_INITSCRIPT_CLASSPATH",
"jdbc:tc:mysql:5.7.34:///foo_ds?TC_INITSCRIPT=somepath/init_mysql.sql", -1, "",
-1, "foo_ds", null,
PropertiesBuilder.build(new
Property("TC_INITSCRIPT", "somepath/init_mysql.sql"))),
- Arguments.arguments("testcontainers_INITSCRIPT",
"jdbc:tc:mysql:5.7.34:///foo_ds?TC_INITSCRIPT=file:src/main/resources/init_mysql.sql",
"", -1, "foo_ds", null,
+ Arguments.arguments("testcontainers_INITSCRIPT",
"jdbc:tc:mysql:5.7.34:///foo_ds?TC_INITSCRIPT=file:src/main/resources/init_mysql.sql",
-1, "", -1, "foo_ds", null,
PropertiesBuilder.build(new
Property("TC_INITSCRIPT", "file:src/main/resources/init_mysql.sql"))),
- Arguments.arguments("testcontainers_INITFUNCTION",
"jdbc:tc:mysql:5.7.34:///foo_ds?TC_INITFUNCTION=org.testcontainers.jdbc.JDBCDriverTest::sampleInitFunction",
"", -1, "foo_ds",
- null, PropertiesBuilder.build(new
Property("TC_INITFUNCTION",
"org.testcontainers.jdbc.JDBCDriverTest::sampleInitFunction"))),
- Arguments.arguments("testcontainers_DAEMON",
"jdbc:tc:mysql:5.7.34:///foo_ds?TC_DAEMON=true", "", -1, "foo_ds", null,
+ Arguments.arguments("testcontainers_INITFUNCTION",
"jdbc:tc:mysql:5.7.34:///foo_ds?TC_INITFUNCTION=org.testcontainers.jdbc.JDBCDriverTest::sampleInitFunction",
-1, "", -1,
+ "foo_ds", null, PropertiesBuilder.build(new
Property("TC_INITFUNCTION",
"org.testcontainers.jdbc.JDBCDriverTest::sampleInitFunction"))),
+ Arguments.arguments("testcontainers_DAEMON",
"jdbc:tc:mysql:5.7.34:///foo_ds?TC_DAEMON=true", -1, "", -1, "foo_ds", null,
PropertiesBuilder.build(new Property("TC_DAEMON",
Boolean.TRUE.toString()))),
- Arguments.arguments("testcontainers_TMPFS",
"jdbc:tc:postgresql:9.6.8:///foo_ds?TC_TMPFS=/testtmpfs:rw", "", -1, "foo_ds",
null,
+ Arguments.arguments("testcontainers_TMPFS",
"jdbc:tc:postgresql:9.6.8:///foo_ds?TC_TMPFS=/testtmpfs:rw", -1, "", -1,
"foo_ds", null,
PropertiesBuilder.build(new Property("TC_TMPFS",
"/testtmpfs:rw"))));
}
}
diff --git
a/database/connector/dialect/clickhouse/src/main/java/org/apache/shardingsphere/database/connector/clickhouse/jdbcurl/ClickHouseConnectionPropertiesParser.java
b/database/connector/dialect/clickhouse/src/main/java/org/apache/shardingsphere/database/connector/clickhouse/jdbcurl/ClickHouseConnectionPropertiesParser.java
index 3ca7d2142bb..c7bf068d8ea 100644
---
a/database/connector/dialect/clickhouse/src/main/java/org/apache/shardingsphere/database/connector/clickhouse/jdbcurl/ClickHouseConnectionPropertiesParser.java
+++
b/database/connector/dialect/clickhouse/src/main/java/org/apache/shardingsphere/database/connector/clickhouse/jdbcurl/ClickHouseConnectionPropertiesParser.java
@@ -31,9 +31,8 @@ public final class ClickHouseConnectionPropertiesParser
implements ConnectionPro
@Override
public ConnectionProperties parse(final String url, final String username,
final String catalog) {
- StandardJdbcUrl standardJdbcUrl = new
StandardJdbcUrlParser().parse(url);
- return new ConnectionProperties(
- standardJdbcUrl.getHostname(),
standardJdbcUrl.getPort(DEFAULT_PORT), standardJdbcUrl.getDatabase(),
standardJdbcUrl.getSchema(), standardJdbcUrl.getQueryProperties());
+ StandardJdbcUrl standardJdbcUrl = new
StandardJdbcUrlParser().parse(url, DEFAULT_PORT);
+ return new ConnectionProperties(standardJdbcUrl.getHostname(),
standardJdbcUrl.getPort(), standardJdbcUrl.getDatabase(),
standardJdbcUrl.getSchema(), standardJdbcUrl.getQueryProperties());
}
@Override
diff --git
a/database/connector/dialect/mysql/src/main/java/org/apache/shardingsphere/database/connector/mysql/jdbcurl/MySQLConnectionPropertiesParser.java
b/database/connector/dialect/mysql/src/main/java/org/apache/shardingsphere/database/connector/mysql/jdbcurl/MySQLConnectionPropertiesParser.java
index 4876c217007..a6de5f1de51 100644
---
a/database/connector/dialect/mysql/src/main/java/org/apache/shardingsphere/database/connector/mysql/jdbcurl/MySQLConnectionPropertiesParser.java
+++
b/database/connector/dialect/mysql/src/main/java/org/apache/shardingsphere/database/connector/mysql/jdbcurl/MySQLConnectionPropertiesParser.java
@@ -31,8 +31,8 @@ public final class MySQLConnectionPropertiesParser implements
ConnectionProperti
@Override
public ConnectionProperties parse(final String url, final String username,
final String catalog) {
- StandardJdbcUrl standardJdbcUrl = new
StandardJdbcUrlParser().parse(url);
- return new ConnectionProperties(standardJdbcUrl.getHostname(),
standardJdbcUrl.getPort(DEFAULT_PORT),
+ StandardJdbcUrl standardJdbcUrl = new
StandardJdbcUrlParser().parse(url, DEFAULT_PORT);
+ return new ConnectionProperties(standardJdbcUrl.getHostname(),
standardJdbcUrl.getPort(),
null == catalog ? standardJdbcUrl.getDatabase() : catalog,
standardJdbcUrl.getSchema(), standardJdbcUrl.getQueryProperties());
}
diff --git
a/database/connector/dialect/opengauss/src/main/java/org/apache/shardingsphere/database/connector/opengauss/jdbcurl/OpenGaussConnectionPropertiesParser.java
b/database/connector/dialect/opengauss/src/main/java/org/apache/shardingsphere/database/connector/opengauss/jdbcurl/OpenGaussConnectionPropertiesParser.java
index 24b946d972e..cde953948d1 100644
---
a/database/connector/dialect/opengauss/src/main/java/org/apache/shardingsphere/database/connector/opengauss/jdbcurl/OpenGaussConnectionPropertiesParser.java
+++
b/database/connector/dialect/opengauss/src/main/java/org/apache/shardingsphere/database/connector/opengauss/jdbcurl/OpenGaussConnectionPropertiesParser.java
@@ -31,9 +31,8 @@ public final class OpenGaussConnectionPropertiesParser
implements ConnectionProp
@Override
public ConnectionProperties parse(final String url, final String username,
final String catalog) {
- StandardJdbcUrl standardJdbcUrl = new
StandardJdbcUrlParser().parse(url);
- return new ConnectionProperties(
- standardJdbcUrl.getHostname(),
standardJdbcUrl.getPort(DEFAULT_PORT), standardJdbcUrl.getDatabase(),
standardJdbcUrl.getSchema(), standardJdbcUrl.getQueryProperties());
+ StandardJdbcUrl standardJdbcUrl = new
StandardJdbcUrlParser().parse(url, DEFAULT_PORT);
+ return new ConnectionProperties(standardJdbcUrl.getHostname(),
standardJdbcUrl.getPort(), standardJdbcUrl.getDatabase(),
standardJdbcUrl.getSchema(), standardJdbcUrl.getQueryProperties());
}
@Override
diff --git
a/database/connector/dialect/postgresql/src/main/java/org/apache/shardingsphere/database/connector/postgresql/jdbcurl/PostgreSQLConnectionPropertiesParser.java
b/database/connector/dialect/postgresql/src/main/java/org/apache/shardingsphere/database/connector/postgresql/jdbcurl/PostgreSQLConnectionPropertiesParser.java
index a1f2cc4e31a..b063982dc1c 100644
---
a/database/connector/dialect/postgresql/src/main/java/org/apache/shardingsphere/database/connector/postgresql/jdbcurl/PostgreSQLConnectionPropertiesParser.java
+++
b/database/connector/dialect/postgresql/src/main/java/org/apache/shardingsphere/database/connector/postgresql/jdbcurl/PostgreSQLConnectionPropertiesParser.java
@@ -31,9 +31,8 @@ public final class PostgreSQLConnectionPropertiesParser
implements ConnectionPro
@Override
public ConnectionProperties parse(final String url, final String username,
final String catalog) {
- StandardJdbcUrl standardJdbcUrl = new
StandardJdbcUrlParser().parse(url);
- return new ConnectionProperties(
- standardJdbcUrl.getHostname(),
standardJdbcUrl.getPort(DEFAULT_PORT), standardJdbcUrl.getDatabase(),
standardJdbcUrl.getSchema(), standardJdbcUrl.getQueryProperties());
+ StandardJdbcUrl standardJdbcUrl = new
StandardJdbcUrlParser().parse(url, DEFAULT_PORT);
+ return new ConnectionProperties(standardJdbcUrl.getHostname(),
standardJdbcUrl.getPort(), standardJdbcUrl.getDatabase(),
standardJdbcUrl.getSchema(), standardJdbcUrl.getQueryProperties());
}
@Override
diff --git
a/database/connector/dialect/presto/src/main/java/org/apache/shardingsphere/database/connector/presto/jdbcurl/PrestoConnectionPropertiesParser.java
b/database/connector/dialect/presto/src/main/java/org/apache/shardingsphere/database/connector/presto/jdbcurl/PrestoConnectionPropertiesParser.java
index b5af5dce245..c2fb86a53ca 100644
---
a/database/connector/dialect/presto/src/main/java/org/apache/shardingsphere/database/connector/presto/jdbcurl/PrestoConnectionPropertiesParser.java
+++
b/database/connector/dialect/presto/src/main/java/org/apache/shardingsphere/database/connector/presto/jdbcurl/PrestoConnectionPropertiesParser.java
@@ -31,9 +31,8 @@ public final class PrestoConnectionPropertiesParser
implements ConnectionPropert
@Override
public ConnectionProperties parse(final String url, final String username,
final String catalog) {
- StandardJdbcUrl standardJdbcUrl = new
StandardJdbcUrlParser().parse(url);
- return new ConnectionProperties(
- standardJdbcUrl.getHostname(),
standardJdbcUrl.getPort(DEFAULT_PORT), standardJdbcUrl.getDatabase(),
standardJdbcUrl.getSchema(), standardJdbcUrl.getQueryProperties());
+ StandardJdbcUrl standardJdbcUrl = new
StandardJdbcUrlParser().parse(url, DEFAULT_PORT);
+ return new ConnectionProperties(standardJdbcUrl.getHostname(),
standardJdbcUrl.getPort(), standardJdbcUrl.getDatabase(),
standardJdbcUrl.getSchema(), standardJdbcUrl.getQueryProperties());
}
@Override
diff --git
a/test/infra/fixture/database/src/main/java/org/apache/shardingsphere/test/infra/fixture/connector/MockedConnectionPropertiesParser.java
b/test/infra/fixture/database/src/main/java/org/apache/shardingsphere/test/infra/fixture/connector/MockedConnectionPropertiesParser.java
index 843ced8bca7..65791939249 100644
---
a/test/infra/fixture/database/src/main/java/org/apache/shardingsphere/test/infra/fixture/connector/MockedConnectionPropertiesParser.java
+++
b/test/infra/fixture/database/src/main/java/org/apache/shardingsphere/test/infra/fixture/connector/MockedConnectionPropertiesParser.java
@@ -32,7 +32,7 @@ public final class MockedConnectionPropertiesParser
implements ConnectionPropert
@Override
public ConnectionProperties parse(final String url, final String username,
final String catalog) {
- StandardJdbcUrl standardJdbcUrl = new
StandardJdbcUrlParser().parse(url);
+ StandardJdbcUrl standardJdbcUrl = new
StandardJdbcUrlParser().parse(url, -1);
return new ConnectionProperties(
standardJdbcUrl.getHostname(), standardJdbcUrl.getPort(),
Strings.isNullOrEmpty(catalog) ? standardJdbcUrl.getDatabase() : catalog,
standardJdbcUrl.getSchema(), new Properties());
}
