Skip to content

Enable IPv6 support in BalancedClickHouseDataSource #687

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
zhicwu merged 1 commit into from
Jul 11, 2021
Merged

Enable IPv6 support in BalancedClickHouseDataSource #687

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion clickhouse-jdbc/src/main/java/ru/yandex/clickhouse/BalancedClickhouseDataSource.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@
public class BalancedClickhouseDataSource implements DataSource {
private static final org.slf4j.Logger log = LoggerFactory.getLogger(BalancedClickhouseDataSource.class);
private static final Pattern URL_TEMPLATE = Pattern.compile(JDBC_CLICKHOUSE_PREFIX + "" +
"//([a-zA-Z0-9_:,.-]+)" +
"//([a-zA-Z0-9_\\[\\]:,.-]+)" +
"(/[a-zA-Z0-9_]+" +
"([?][a-zA-Z0-9_]+[=][a-zA-Z0-9_]+([&][a-zA-Z0-9_]+[=][a-zA-Z0-9_]+)*)?" +
")?");
Expand Down
14 changes: 14 additions & 0 deletions clickhouse-jdbc/src/test/java/ru/yandex/clickhouse/BalancedClickhouseDataSourceTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -313,4 +313,18 @@ public void testConnectionWithAuth() throws SQLException {
}
}

@Test
public void testIPv6() throws Exception {
// dedup is not supported at all :<
assertEquals(Arrays.asList("jdbc:clickhouse://[::1]:12345", "jdbc:clickhouse://[0:0:0:0:0:0:0:1]:12345"),
BalancedClickhouseDataSource.splitUrl("jdbc:clickhouse://[::1]:12345,[0:0:0:0:0:0:0:1]:12345"));
assertEquals(Arrays.asList("jdbc:clickhouse://[192:168:0:0:0:0:0:1]:12345", "jdbc:clickhouse://[192:168:0:0:0:0:0:2]:12345"),
BalancedClickhouseDataSource.splitUrl("jdbc:clickhouse://[192:168:0:0:0:0:0:1]:12345,[192:168:0:0:0:0:0:2]:12345"));

ClickHouseProperties properties = new ClickHouseProperties();
String hostAddr = ClickHouseContainerForTest.getClickHouseHttpAddress();
String ipAddr = ClickHouseContainerForTest.getClickHouseHttpAddress("[::1]");
assertEquals(ClickHouseContainerForTest.newBalancedDataSource(properties, ipAddr).getConnection().getServerVersion(),
ClickHouseContainerForTest.newBalancedDataSource(properties, hostAddr).getConnection().getServerVersion());
}
}
6 changes: 6 additions & 0 deletions clickhouse-jdbc/src/test/java/ru/yandex/clickhouse/ClickHouseContainerForTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -75,6 +75,12 @@ public static String getClickHouseHttpAddress(boolean useIPaddress) {
.append(':').append(clickhouseContainer.getMappedPort(HTTP_PORT)).toString();
}

public static String getClickHouseHttpAddress(String customHostOrIp) {
return new StringBuilder()
.append(customHostOrIp == null || customHostOrIp.isEmpty() ? clickhouseContainer.getContainerIpAddress() : customHostOrIp)
.append(':').append(clickhouseContainer.getMappedPort(HTTP_PORT)).toString();
}

public static ClickHouseDataSource newDataSource() {
return newDataSource(new ClickHouseProperties());
}
Expand Down