-
Notifications
You must be signed in to change notification settings - Fork 24.8k
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.
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
SQL: Add protocol tests and remove jdbc_type from drivers response #37516
Merged
Merged
Changes from all commits
Commits
Show all changes
3 commits
Select commit
Hold shift + click to select a range
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
12 changes: 12 additions & 0 deletions
12
...a/single-node/src/test/java/org/elasticsearch/xpack/sql/qa/single_node/SqlProtocolIT.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,12 @@ | ||
/* | ||
* Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one | ||
* or more contributor license agreements. Licensed under the Elastic License; | ||
* you may not use this file except in compliance with the Elastic License. | ||
*/ | ||
|
||
package org.elasticsearch.xpack.sql.qa.single_node; | ||
|
||
import org.elasticsearch.xpack.sql.qa.SqlProtocolTestCase; | ||
|
||
public class SqlProtocolIT extends SqlProtocolTestCase { | ||
} |
193 changes: 193 additions & 0 deletions
193
x-pack/plugin/sql/qa/src/main/java/org/elasticsearch/xpack/sql/qa/SqlProtocolTestCase.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,193 @@ | ||
/* | ||
* Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one | ||
* or more contributor license agreements. Licensed under the Elastic License; | ||
* you may not use this file except in compliance with the Elastic License. | ||
*/ | ||
|
||
package org.elasticsearch.xpack.sql.qa; | ||
|
||
import org.apache.http.entity.ContentType; | ||
import org.apache.http.entity.StringEntity; | ||
import org.elasticsearch.client.Request; | ||
import org.elasticsearch.client.RequestOptions; | ||
import org.elasticsearch.client.Response; | ||
import org.elasticsearch.common.xcontent.XContentHelper; | ||
import org.elasticsearch.common.xcontent.XContentType; | ||
import org.elasticsearch.common.xcontent.cbor.CborXContent; | ||
import org.elasticsearch.common.xcontent.json.JsonXContent; | ||
import org.elasticsearch.common.xcontent.smile.SmileXContent; | ||
import org.elasticsearch.common.xcontent.yaml.YamlXContent; | ||
import org.elasticsearch.test.rest.ESRestTestCase; | ||
import org.elasticsearch.xpack.sql.proto.Mode; | ||
|
||
import java.io.IOException; | ||
import java.io.InputStream; | ||
import java.util.ArrayList; | ||
import java.util.HashMap; | ||
import java.util.List; | ||
import java.util.Locale; | ||
import java.util.Map; | ||
|
||
import static org.elasticsearch.xpack.sql.proto.RequestInfo.CLIENT_IDS; | ||
import static org.elasticsearch.xpack.sql.qa.rest.RestSqlTestCase.mode; | ||
|
||
public abstract class SqlProtocolTestCase extends ESRestTestCase { | ||
|
||
public void testNulls() throws IOException { | ||
assertQuery("SELECT NULL", "NULL", "null", null, 0); | ||
} | ||
|
||
public void testBooleanType() throws IOException { | ||
assertQuery("SELECT TRUE", "TRUE", "boolean", true, 1); | ||
assertQuery("SELECT FALSE", "FALSE", "boolean", false, 1); | ||
} | ||
|
||
public void testNumericTypes() throws IOException { | ||
assertQuery("SELECT CAST(3 AS TINYINT)", "CAST(3 AS TINYINT)", "byte", 3, 5); | ||
assertQuery("SELECT CAST(-123 AS TINYINT)", "CAST(-123 AS TINYINT)", "byte", -123, 5); | ||
assertQuery("SELECT CAST(5 AS SMALLINT)", "CAST(5 AS SMALLINT)", "short", 5, 6); | ||
assertQuery("SELECT CAST(-25 AS SMALLINT)", "CAST(-25 AS SMALLINT)", "short", -25, 6); | ||
assertQuery("SELECT 123", "123", "integer", 123, 11); | ||
assertQuery("SELECT -2123", "-2123", "integer", -2123, 11); | ||
assertQuery("SELECT 1234567890123", "1234567890123", "long", 1234567890123L, 20); | ||
assertQuery("SELECT -1234567890123", "-1234567890123", "long", -1234567890123L, 20); | ||
assertQuery("SELECT 1234567890123.34", "1234567890123.34", "double", 1234567890123.34, 25); | ||
assertQuery("SELECT -1234567890123.34", "-1234567890123.34", "double", -1234567890123.34, 25); | ||
assertQuery("SELECT CAST(1234.34 AS REAL)", "CAST(1234.34 AS REAL)", "float", 1234.34f, 15); | ||
assertQuery("SELECT CAST(-1234.34 AS REAL)", "CAST(-1234.34 AS REAL)", "float", -1234.34f, 15); | ||
assertQuery("SELECT CAST(1234567890123.34 AS FLOAT)", "CAST(1234567890123.34 AS FLOAT)", "double", 1234567890123.34, 25); | ||
assertQuery("SELECT CAST(-1234567890123.34 AS FLOAT)", "CAST(-1234567890123.34 AS FLOAT)", "double", -1234567890123.34, 25); | ||
} | ||
|
||
public void testTextualType() throws IOException { | ||
assertQuery("SELECT 'abc123'", "'abc123'", "keyword", "abc123", 0); | ||
} | ||
|
||
public void testDateTimes() throws IOException { | ||
assertQuery("SELECT CAST('2019-01-14T12:29:25.000Z' AS DATE)", "CAST('2019-01-14T12:29:25.000Z' AS DATE)", "date", | ||
"2019-01-14T12:29:25.000Z", 24); | ||
assertQuery("SELECT CAST(-26853765751000 AS DATE)", "CAST(-26853765751000 AS DATE)", "date", "1119-01-15T12:37:29.000Z", 24); | ||
assertQuery("SELECT CAST(CAST('-26853765751000' AS BIGINT) AS DATE)", "CAST(CAST('-26853765751000' AS BIGINT) AS DATE)", "date", | ||
"1119-01-15T12:37:29.000Z", 24); | ||
} | ||
|
||
public void testIPs() throws IOException { | ||
assertQuery("SELECT CAST('12.13.14.15' AS IP)", "CAST('12.13.14.15' AS IP)", "ip", "12.13.14.15", 0); | ||
assertQuery("SELECT CAST('2001:0db8:0000:0000:0000:ff00:0042:8329' AS IP)", "CAST('2001:0db8:0000:0000:0000:ff00:0042:8329' AS IP)", | ||
"ip", "2001:0db8:0000:0000:0000:ff00:0042:8329", 0); | ||
} | ||
|
||
public void testDateTimeIntervals() throws IOException { | ||
assertQuery("SELECT INTERVAL '326' YEAR", "INTERVAL '326' YEAR", "interval_year", "P326Y", 7); | ||
assertQuery("SELECT INTERVAL '50' MONTH", "INTERVAL '50' MONTH", "interval_month", "P50M", 7); | ||
assertQuery("SELECT INTERVAL '520' DAY", "INTERVAL '520' DAY", "interval_day", "PT12480H", 23); | ||
assertQuery("SELECT INTERVAL '163' HOUR", "INTERVAL '163' HOUR", "interval_hour", "PT163H", 23); | ||
assertQuery("SELECT INTERVAL '163' MINUTE", "INTERVAL '163' MINUTE", "interval_minute", "PT2H43M", 23); | ||
assertQuery("SELECT INTERVAL '223.16' SECOND", "INTERVAL '223.16' SECOND", "interval_second", "PT3M43.016S", 23); | ||
assertQuery("SELECT INTERVAL '163-11' YEAR TO MONTH", "INTERVAL '163-11' YEAR TO MONTH", "interval_year_to_month", "P163Y11M", 7); | ||
assertQuery("SELECT INTERVAL '163 12' DAY TO HOUR", "INTERVAL '163 12' DAY TO HOUR", "interval_day_to_hour", "PT3924H", 23); | ||
assertQuery("SELECT INTERVAL '163 12:39' DAY TO MINUTE", "INTERVAL '163 12:39' DAY TO MINUTE", "interval_day_to_minute", | ||
"PT3924H39M", 23); | ||
assertQuery("SELECT INTERVAL '163 12:39:59.163' DAY TO SECOND", "INTERVAL '163 12:39:59.163' DAY TO SECOND", | ||
"interval_day_to_second", "PT3924H39M59.163S", 23); | ||
assertQuery("SELECT INTERVAL -'163 23:39:56.23' DAY TO SECOND", "INTERVAL -'163 23:39:56.23' DAY TO SECOND", | ||
"interval_day_to_second", "PT-3935H-39M-56.023S", 23); | ||
assertQuery("SELECT INTERVAL '163:39' HOUR TO MINUTE", "INTERVAL '163:39' HOUR TO MINUTE", "interval_hour_to_minute", | ||
"PT163H39M", 23); | ||
assertQuery("SELECT INTERVAL '163:39:59.163' HOUR TO SECOND", "INTERVAL '163:39:59.163' HOUR TO SECOND", "interval_hour_to_second", | ||
"PT163H39M59.163S", 23); | ||
assertQuery("SELECT INTERVAL '163:59.163' MINUTE TO SECOND", "INTERVAL '163:59.163' MINUTE TO SECOND", "interval_minute_to_second", | ||
"PT2H43M59.163S", 23); | ||
} | ||
|
||
@SuppressWarnings({ "unchecked" }) | ||
private void assertQuery(String sql, String columnName, String columnType, Object columnValue, int displaySize) throws IOException { | ||
for (Mode mode : Mode.values()) { | ||
Map<String, Object> response = runSql(mode.toString(), sql); | ||
List<Object> columns = (ArrayList<Object>) response.get("columns"); | ||
assertEquals(1, columns.size()); | ||
|
||
Map<String, Object> column = (HashMap<String, Object>) columns.get(0); | ||
assertEquals(columnName, column.get("name")); | ||
assertEquals(columnType, column.get("type")); | ||
if (mode != Mode.PLAIN) { | ||
assertEquals(3, column.size()); | ||
assertEquals(displaySize, column.get("display_size")); | ||
} else { | ||
assertEquals(2, column.size()); | ||
} | ||
|
||
List<Object> rows = (ArrayList<Object>) response.get("rows"); | ||
assertEquals(1, rows.size()); | ||
List<Object> row = (ArrayList<Object>) rows.get(0); | ||
assertEquals(1, row.size()); | ||
|
||
// from xcontent we can get float or double, depending on the conversion | ||
// method of the specific xcontent format implementation | ||
if (columnValue instanceof Float && row.get(0) instanceof Double) { | ||
assertEquals(columnValue, (float)((Number) row.get(0)).doubleValue()); | ||
} else { | ||
assertEquals(columnValue, row.get(0)); | ||
} | ||
} | ||
} | ||
|
||
private Map<String, Object> runSql(String mode, String sql) throws IOException { | ||
Request request = new Request("POST", "/_sql"); | ||
String requestContent = "{\"query\":\"" + sql + "\"" + mode(mode) + "}"; | ||
String format = randomFrom(XContentType.values()).name().toLowerCase(Locale.ROOT); | ||
|
||
// add a client_id to the request | ||
if (randomBoolean()) { | ||
String clientId = randomFrom(randomFrom(CLIENT_IDS), randomAlphaOfLengthBetween(10, 20)); | ||
requestContent = new StringBuilder(requestContent) | ||
.insert(requestContent.length() - 1, ",\"client_id\":\"" + clientId + "\"").toString(); | ||
} | ||
if (randomBoolean()) { | ||
request.addParameter("error_trace", "true"); | ||
} | ||
if (randomBoolean()) { | ||
request.addParameter("pretty", "true"); | ||
} | ||
if (!"json".equals(format) || randomBoolean()) { | ||
// since we default to JSON if a format is not specified, randomize setting it or not, explicitly; | ||
// for any other format, just set the format explicitly | ||
request.addParameter("format", format); | ||
} | ||
if (randomBoolean()) { | ||
// randomly use the Accept header for the response format | ||
RequestOptions.Builder options = request.getOptions().toBuilder(); | ||
options.addHeader("Accept", randomFrom("*/*", "application/" + format)); | ||
request.setOptions(options); | ||
} | ||
|
||
// send the query either as body or as request parameter | ||
if (randomBoolean()) { | ||
request.setEntity(new StringEntity(requestContent, ContentType.APPLICATION_JSON)); | ||
} else { | ||
request.setEntity(null); | ||
request.addParameter("source", requestContent); | ||
request.addParameter("source_content_type", ContentType.APPLICATION_JSON.getMimeType()); | ||
RequestOptions.Builder options = request.getOptions().toBuilder(); | ||
options.addHeader("Content-Type", "application/json"); | ||
request.setOptions(options); | ||
} | ||
|
||
Response response = client().performRequest(request); | ||
try (InputStream content = response.getEntity().getContent()) { | ||
switch(format) { | ||
case "cbor": { | ||
return XContentHelper.convertToMap(CborXContent.cborXContent, content, false); | ||
} | ||
case "yaml": { | ||
return XContentHelper.convertToMap(YamlXContent.yamlXContent, content, false); | ||
} | ||
case "smile": { | ||
return XContentHelper.convertToMap(SmileXContent.smileXContent, content, false); | ||
} | ||
default: | ||
return XContentHelper.convertToMap(JsonXContent.jsonXContent, content, false); | ||
} | ||
} | ||
} | ||
} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Just FYI if #37395 is merged first, change to
AS DATETIME
.