Skip to content

Commit

Permalink
SQL: Fix test to not run as a jdbc driver newer than the server (#70674
Browse files Browse the repository at this point in the history
…) (#70718)

Fix test simulating running an newer JDBC driver against an older
server. This scenario's no longer supported.

Fixes #70630.

(cherry picked from commit e6c4ce5)
  • Loading branch information
bpintea committed Mar 23, 2021
1 parent e1f8563 commit 89f1684
Showing 1 changed file with 4 additions and 10 deletions.
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 @@ -225,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 @@ -248,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

0 comments on commit 89f1684

Please sign in to comment.