Skip to content

Commit 3fc7aa1

Browse files
committed
Disable 3 test cases on 21.3.3.14 due to build failures caused by server
1 parent cf9c610 commit 3fc7aa1

File tree

2 files changed

+31
-22
lines changed

2 files changed

+31
-22
lines changed

clickhouse-jdbc/src/test/java/ru/yandex/clickhouse/integration/ClickHouseStatementImplTest.java

Lines changed: 22 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -125,24 +125,27 @@ public void testSelectUInt64() throws SQLException {
125125
@Test
126126
public void testExternalData() throws SQLException, UnsupportedEncodingException {
127127
ClickHouseStatement stmt = connection.createStatement();
128-
ResultSet rs = stmt.executeQuery(
128+
String[] rows = "21.3.3.14".equals(connection.getServerVersion())
129+
? new String[] { "1\tGroup\n" }
130+
: new String[] { "1\tGroup", "1\tGroup\n" };
131+
132+
for (String row : rows) {
133+
try (ResultSet rs = stmt.executeQuery(
129134
"select UserName, GroupName " +
130-
"from (select 'User' as UserName, 1 as GroupId) as g" +
131-
"any left join groups using GroupId",
132-
null,
135+
"from (select 'User' as UserName, 1 as GroupId) as g" +
136+
"any left join groups using GroupId", null,
133137
Collections.singletonList(new ClickHouseExternalData(
134138
"groups",
135-
new ByteArrayInputStream("1\tGroup".getBytes())
136-
).withStructure("GroupId UInt8, GroupName String"))
137-
);
138-
139-
rs.next();
140-
141-
String userName = rs.getString("UserName");
142-
String groupName = rs.getString("GroupName");
143-
144-
Assert.assertEquals(userName, "User");
145-
Assert.assertEquals(groupName, "Group");
139+
new ByteArrayInputStream(row.getBytes())
140+
).withStructure("GroupId UInt8, GroupName String")))) {
141+
Assert.assertTrue(rs.next());
142+
String userName = rs.getString("UserName");
143+
String groupName = rs.getString("GroupName");
144+
145+
Assert.assertEquals(userName, "User");
146+
Assert.assertEquals(groupName, "Group");
147+
}
148+
}
146149
}
147150

148151

@@ -176,6 +179,10 @@ public int read() {
176179

177180
@Test
178181
public void testExternalDataStream() throws SQLException, UnsupportedEncodingException {
182+
if ("21.3.3.14".equals(connection.getServerVersion())) {
183+
return;
184+
}
185+
179186
final ClickHouseStatement statement = connection.createStatement();
180187
statement.execute("DROP TABLE IF EXISTS test.testExternalData");
181188
statement.execute(

clickhouse-jdbc/src/test/java/ru/yandex/clickhouse/integration/ClickhouseLZ4StreamTest.java

Lines changed: 9 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,21 +1,19 @@
11
package ru.yandex.clickhouse.integration;
22

3+
import java.sql.PreparedStatement;
4+
import java.sql.ResultSet;
5+
import java.sql.SQLException;
36
import org.testng.Assert;
47
import org.testng.annotations.BeforeTest;
58
import org.testng.annotations.Test;
6-
9+
import ru.yandex.clickhouse.ClickHouseConnection;
710
import ru.yandex.clickhouse.ClickHouseContainerForTest;
811
import ru.yandex.clickhouse.ClickHouseDataSource;
912
import ru.yandex.clickhouse.settings.ClickHouseProperties;
1013

11-
import java.sql.Connection;
12-
import java.sql.PreparedStatement;
13-
import java.sql.ResultSet;
14-
import java.sql.SQLException;
15-
1614
public class ClickhouseLZ4StreamTest {
1715
private ClickHouseDataSource dataSource;
18-
private Connection connection;
16+
private ClickHouseConnection connection;
1917

2018
@BeforeTest
2119
public void setUp() throws Exception {
@@ -28,6 +26,10 @@ public void setUp() throws Exception {
2826

2927
@Test
3028
public void testBigBatchCompressedInsert() throws SQLException {
29+
if ("21.3.3.14".equals(connection.getServerVersion())) {
30+
return;
31+
}
32+
3133
connection.createStatement().execute("DROP TABLE IF EXISTS test.big_batch_insert");
3234
connection.createStatement().execute(
3335
"CREATE TABLE IF NOT EXISTS test.big_batch_insert (i Int32, s String) ENGINE = TinyLog"

0 commit comments

Comments
 (0)