diff --git a/x-pack/plugin/sql/qa/mixed-node/src/test/java/org/elasticsearch/xpack/sql/qa/mixed_node/SqlSearchIT.java b/x-pack/plugin/sql/qa/mixed-node/src/test/java/org/elasticsearch/xpack/sql/qa/mixed_node/SqlSearchIT.java index b216f86f3bb2..7480700bbd8e 100644 --- a/x-pack/plugin/sql/qa/mixed-node/src/test/java/org/elasticsearch/xpack/sql/qa/mixed_node/SqlSearchIT.java +++ b/x-pack/plugin/sql/qa/mixed-node/src/test/java/org/elasticsearch/xpack/sql/qa/mixed_node/SqlSearchIT.java @@ -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; @@ -90,7 +89,6 @@ public void cleanUpIndex() throws IOException { } } - @AwaitsFix(bugUrl = "https://github.com/elastic/elasticsearch/issues/70630") public void testAllTypesWithRequestToOldNodes() throws Exception { Map expectedResponse = prepareTestData( columns -> { @@ -226,19 +224,15 @@ private Map columnInfo(String name, String type) { Map 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 expectedResponse, List nodesList) throws Exception { + private void assertAllTypesWithNodes(Map expectedResponse, List 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> columns = (List>) expectedResponse.get("columns"); String intervalYearMonth = "INTERVAL '150' YEAR AS interval_year, "; @@ -249,9 +243,8 @@ private void assertAllTypesWithNodes(Map 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)); }); } }