Skip to content

SQL: Fix test to not run as a jdbc driver newer than the server #70674

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
bpintea merged 4 commits into from
Mar 23, 2021
Merged

SQL: Fix test to not run as a jdbc driver newer than the server #70674

Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
eeb55d6
Fix test to not run as a newer jdbc than server
bpintea Mar 22, 2021
d41ed39
Remove driver mode altogether
bpintea Mar 22, 2021
12e837d
Strip test disablign tag
bpintea Mar 22, 2021
bd69796
Checkstyle fix
bpintea Mar 23, 2021
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
15 changes: 4 additions & 11 deletions ...ql/qa/mixed-node/src/test/java/org/elasticsearch/xpack/sql/qa/mixed_node/SqlSearchIT.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,6 @@
import org.elasticsearch.test.rest.ESRestTestCase;
import org.elasticsearch.xpack.ql.TestNode;
import org.elasticsearch.xpack.ql.TestNodes;
import org.elasticsearch.xpack.sql.type.SqlDataTypes;
import org.junit.After;
import org.junit.Before;

Expand Down Expand Up @@ -90,7 +89,6 @@ public void cleanUpIndex() throws IOException {
}
}

@AwaitsFix(bugUrl = "https://github.com/elastic/elasticsearch/issues/70630")
public void testAllTypesWithRequestToOldNodes() throws Exception {
Map<String, Object> expectedResponse = prepareTestData(
columns -> {
Expand Down Expand Up @@ -226,19 +224,15 @@ private Map<String, Object> columnInfo(String name, String type) {
Map<String, Object> column = new HashMap<>();
column.put("name", name);
column.put("type", type);
column.put("display_size", SqlDataTypes.displaySize(SqlDataTypes.fromTypeName(type)));
return unmodifiableMap(column);
}

private void assertAllTypesWithNodes(Map<String, Object> expectedResponse, List<TestNode> nodesList) throws Exception {
private void assertAllTypesWithNodes(Map<String, Object> expectedResponse, List<TestNode> nodesList)
throws Exception {
try (
RestClient client = buildClient(restClientSettings(),
nodesList.stream().map(TestNode::getPublishAddress).toArray(HttpHost[]::new))
) {
Request request = new Request("POST", "_sql");
String version = ",\"version\":\"" + newVersion.toString() + "\"";
String binaryFormat = ",\"binary_format\":\"false\"";

@SuppressWarnings("unchecked")
List<Map<String, Object>> columns = (List<Map<String, Object>>) expectedResponse.get("columns");
String intervalYearMonth = "INTERVAL '150' YEAR AS interval_year, ";
Expand All @@ -249,9 +243,8 @@ private void assertAllTypesWithNodes(Map<String, Object> expectedResponse, List<
String fieldsList = columns.stream().map(m -> (String) m.get("name")).filter(str -> str.startsWith("interval") == false)
.collect(Collectors.toList()).stream().collect(Collectors.joining(", "));
String query = "SELECT " + intervalYearMonth + intervalDayTime + fieldsList + " FROM " + index + " ORDER BY id";
request.setJsonEntity(
"{\"mode\":\"jdbc\"" + version + binaryFormat + ",\"query\":\"" + query + "\"}"
);
Request request = new Request("POST", "_sql");
request.setJsonEntity("{\"query\":\"" + query + "\"}");
assertBusy(() -> { assertResponse(expectedResponse, runSql(client, request)); });
}
}
Expand Down