From 9c43365bebf7a01c673c5335bc817ebb87a987ab Mon Sep 17 00:00:00 2001 From: Marios Trivyzas Date: Wed, 16 Jan 2019 18:08:33 +0200 Subject: [PATCH] SQL: Lowercase es data type (mapping) returned from SQL Commands (#37531) To follow the ES convention, convert the es data type, returned as column `mapping` from SQL Commands, to lowercase. Fixes: #37521 --- .../sql/qa/security/SqlSecurityTestCase.java | 12 +- .../sql/qa/src/main/resources/alias.csv-spec | 86 +++++----- .../qa/src/main/resources/command.csv-spec | 148 +++++++++--------- .../sql/qa/src/main/resources/docs.csv-spec | 64 ++++---- .../sql/qa/src/main/resources/nested.csv-spec | 34 ++-- .../sql/plan/logical/command/ShowColumns.java | 4 +- 6 files changed, 174 insertions(+), 174 deletions(-) diff --git a/x-pack/plugin/sql/qa/security/src/test/java/org/elasticsearch/xpack/sql/qa/security/SqlSecurityTestCase.java b/x-pack/plugin/sql/qa/security/src/test/java/org/elasticsearch/xpack/sql/qa/security/SqlSecurityTestCase.java index 848fee17c7f1f..f6a475946c43b 100644 --- a/x-pack/plugin/sql/qa/security/src/test/java/org/elasticsearch/xpack/sql/qa/security/SqlSecurityTestCase.java +++ b/x-pack/plugin/sql/qa/security/src/test/java/org/elasticsearch/xpack/sql/qa/security/SqlSecurityTestCase.java @@ -391,9 +391,9 @@ public void testShowTablesWithLimitedAccessUnaccessableIndex() throws Exception public void testDescribeWorksAsAdmin() throws Exception { Map> expected = new TreeMap<>(); - expected.put("a", asList("BIGINT", "LONG")); - expected.put("b", asList("BIGINT", "LONG")); - expected.put("c", asList("BIGINT", "LONG")); + expected.put("a", asList("BIGINT", "long")); + expected.put("b", asList("BIGINT", "long")); + expected.put("c", asList("BIGINT", "long")); actions.expectDescribe(expected, null); createAuditLogAsserter() .expectSqlCompositeActionFieldCaps("test_admin", "test") @@ -434,7 +434,7 @@ public void testDescribeWithWrongAccess() throws Exception { public void testDescribeSingleFieldGranted() throws Exception { createUser("only_a", "read_test_a"); - actions.expectDescribe(singletonMap("a", asList("BIGINT", "LONG")), "only_a"); + actions.expectDescribe(singletonMap("a", asList("BIGINT", "long")), "only_a"); createAuditLogAsserter() .expectSqlCompositeActionFieldCaps("only_a", "test") .assertLogs(); @@ -444,8 +444,8 @@ public void testDescribeSingleFieldExcepted() throws Exception { createUser("not_c", "read_test_a_and_b"); Map> expected = new TreeMap<>(); - expected.put("a", asList("BIGINT", "LONG")); - expected.put("b", asList("BIGINT", "LONG")); + expected.put("a", asList("BIGINT", "long")); + expected.put("b", asList("BIGINT", "long")); actions.expectDescribe(expected, "not_c"); createAuditLogAsserter() .expectSqlCompositeActionFieldCaps("not_c", "test") diff --git a/x-pack/plugin/sql/qa/src/main/resources/alias.csv-spec b/x-pack/plugin/sql/qa/src/main/resources/alias.csv-spec index d395ec2b21bad..7ad8ef342669d 100644 --- a/x-pack/plugin/sql/qa/src/main/resources/alias.csv-spec +++ b/x-pack/plugin/sql/qa/src/main/resources/alias.csv-spec @@ -28,27 +28,27 @@ DESCRIBE test_alias; column | type | mapping --------------------+---------------+--------------- -birth_date |TIMESTAMP |DATE -dep |STRUCT |NESTED -dep.dep_id |VARCHAR |KEYWORD -dep.dep_name |VARCHAR |TEXT -dep.dep_name.keyword|VARCHAR |KEYWORD -dep.from_date |TIMESTAMP |DATE -dep.to_date |TIMESTAMP |DATE -emp_no |INTEGER |INTEGER -extra |STRUCT |OBJECT -extra.info |STRUCT |OBJECT -extra.info.gender |VARCHAR |KEYWORD -extra_gender |VARCHAR |KEYWORD -extra_no |INTEGER |INTEGER -first_name |VARCHAR |TEXT -first_name.keyword |VARCHAR |KEYWORD -gender |VARCHAR |KEYWORD -hire_date |TIMESTAMP |DATE -languages |TINYINT |BYTE -last_name |VARCHAR |TEXT -last_name.keyword |VARCHAR |KEYWORD -salary |INTEGER |INTEGER +birth_date |TIMESTAMP |date +dep |STRUCT |nested +dep.dep_id |VARCHAR |keyword +dep.dep_name |VARCHAR |text +dep.dep_name.keyword|VARCHAR |keyword +dep.from_date |TIMESTAMP |date +dep.to_date |TIMESTAMP |date +emp_no |INTEGER |integer +extra |STRUCT |object +extra.info |STRUCT |object +extra.info.gender |VARCHAR |keyword +extra_gender |VARCHAR |keyword +extra_no |INTEGER |integer +first_name |VARCHAR |text +first_name.keyword |VARCHAR |keyword +gender |VARCHAR |keyword +hire_date |TIMESTAMP |date +languages |TINYINT |byte +last_name |VARCHAR |text +last_name.keyword |VARCHAR |keyword +salary |INTEGER |integer ; describePattern @@ -56,27 +56,27 @@ DESCRIBE "test_*"; column | type | mapping --------------------+---------------+--------------- -birth_date |TIMESTAMP |DATE -dep |STRUCT |NESTED -dep.dep_id |VARCHAR |KEYWORD -dep.dep_name |VARCHAR |TEXT -dep.dep_name.keyword|VARCHAR |KEYWORD -dep.from_date |TIMESTAMP |DATE -dep.to_date |TIMESTAMP |DATE -emp_no |INTEGER |INTEGER -extra |STRUCT |OBJECT -extra.info |STRUCT |OBJECT -extra.info.gender |VARCHAR |KEYWORD -extra_gender |VARCHAR |KEYWORD -extra_no |INTEGER |INTEGER -first_name |VARCHAR |TEXT -first_name.keyword |VARCHAR |KEYWORD -gender |VARCHAR |KEYWORD -hire_date |TIMESTAMP |DATE -languages |TINYINT |BYTE -last_name |VARCHAR |TEXT -last_name.keyword |VARCHAR |KEYWORD -salary |INTEGER |INTEGER +birth_date |TIMESTAMP |date +dep |STRUCT |nested +dep.dep_id |VARCHAR |keyword +dep.dep_name |VARCHAR |text +dep.dep_name.keyword|VARCHAR |keyword +dep.from_date |TIMESTAMP |date +dep.to_date |TIMESTAMP |date +emp_no |INTEGER |integer +extra |STRUCT |object +extra.info |STRUCT |object +extra.info.gender |VARCHAR |keyword +extra_gender |VARCHAR |keyword +extra_no |INTEGER |integer +first_name |VARCHAR |text +first_name.keyword |VARCHAR |keyword +gender |VARCHAR |keyword +hire_date |TIMESTAMP |date +languages |TINYINT |byte +last_name |VARCHAR |text +last_name.keyword |VARCHAR |keyword +salary |INTEGER |integer ; showAlias @@ -115,4 +115,4 @@ gender:s | p1:d F | 10099.52 M | 10096.0 -; \ No newline at end of file +; diff --git a/x-pack/plugin/sql/qa/src/main/resources/command.csv-spec b/x-pack/plugin/sql/qa/src/main/resources/command.csv-spec index ef8606bbed041..0128873997bd3 100644 --- a/x-pack/plugin/sql/qa/src/main/resources/command.csv-spec +++ b/x-pack/plugin/sql/qa/src/main/resources/command.csv-spec @@ -228,27 +228,27 @@ DESCRIBE LIKE 'test_emp'; column | type | mapping --------------------+---------------+--------------- -birth_date |TIMESTAMP |DATE -dep |STRUCT |NESTED -dep.dep_id |VARCHAR |KEYWORD -dep.dep_name |VARCHAR |TEXT -dep.dep_name.keyword|VARCHAR |KEYWORD -dep.from_date |TIMESTAMP |DATE -dep.to_date |TIMESTAMP |DATE -emp_no |INTEGER |INTEGER -extra |STRUCT |OBJECT -extra.info |STRUCT |OBJECT -extra.info.gender |VARCHAR |KEYWORD -extra_gender |VARCHAR |KEYWORD -extra_no |INTEGER |INTEGER -first_name |VARCHAR |TEXT -first_name.keyword |VARCHAR |KEYWORD -gender |VARCHAR |KEYWORD -hire_date |TIMESTAMP |DATE -languages |TINYINT |BYTE -last_name |VARCHAR |TEXT -last_name.keyword |VARCHAR |KEYWORD -salary |INTEGER |INTEGER +birth_date |TIMESTAMP |date +dep |STRUCT |nested +dep.dep_id |VARCHAR |keyword +dep.dep_name |VARCHAR |text +dep.dep_name.keyword|VARCHAR |keyword +dep.from_date |TIMESTAMP |date +dep.to_date |TIMESTAMP |date +emp_no |INTEGER |integer +extra |STRUCT |object +extra.info |STRUCT |object +extra.info.gender |VARCHAR |keyword +extra_gender |VARCHAR |keyword +extra_no |INTEGER |integer +first_name |VARCHAR |text +first_name.keyword |VARCHAR |keyword +gender |VARCHAR |keyword +hire_date |TIMESTAMP |date +languages |TINYINT |byte +last_name |VARCHAR |text +last_name.keyword |VARCHAR |keyword +salary |INTEGER |integer ; describeMultiLike @@ -256,27 +256,27 @@ DESCRIBE LIKE 'test_emp%'; column | type | mapping --------------------+---------------+--------------- -birth_date |TIMESTAMP |DATE -dep |STRUCT |NESTED -dep.dep_id |VARCHAR |KEYWORD -dep.dep_name |VARCHAR |TEXT -dep.dep_name.keyword|VARCHAR |KEYWORD -dep.from_date |TIMESTAMP |DATE -dep.to_date |TIMESTAMP |DATE -emp_no |INTEGER |INTEGER -extra |STRUCT |OBJECT -extra.info |STRUCT |OBJECT -extra.info.gender |VARCHAR |KEYWORD -extra_gender |VARCHAR |KEYWORD -extra_no |INTEGER |INTEGER -first_name |VARCHAR |TEXT -first_name.keyword |VARCHAR |KEYWORD -gender |VARCHAR |KEYWORD -hire_date |TIMESTAMP |DATE -languages |TINYINT |BYTE -last_name |VARCHAR |TEXT -last_name.keyword |VARCHAR |KEYWORD -salary |INTEGER |INTEGER +birth_date |TIMESTAMP |date +dep |STRUCT |nested +dep.dep_id |VARCHAR |keyword +dep.dep_name |VARCHAR |text +dep.dep_name.keyword|VARCHAR |keyword +dep.from_date |TIMESTAMP |date +dep.to_date |TIMESTAMP |date +emp_no |INTEGER |integer +extra |STRUCT |object +extra.info |STRUCT |object +extra.info.gender |VARCHAR |keyword +extra_gender |VARCHAR |keyword +extra_no |INTEGER |integer +first_name |VARCHAR |text +first_name.keyword |VARCHAR |keyword +gender |VARCHAR |keyword +hire_date |TIMESTAMP |date +languages |TINYINT |byte +last_name |VARCHAR |text +last_name.keyword |VARCHAR |keyword +salary |INTEGER |integer ; describeSimpleIdentifier @@ -284,22 +284,22 @@ DESCRIBE "test_emp"; column | type | mapping --------------------+---------------+--------------- -birth_date |TIMESTAMP |DATE -dep |STRUCT |NESTED -dep.dep_id |VARCHAR |KEYWORD -dep.dep_name |VARCHAR |TEXT -dep.dep_name.keyword|VARCHAR |KEYWORD -dep.from_date |TIMESTAMP |DATE -dep.to_date |TIMESTAMP |DATE -emp_no |INTEGER |INTEGER -first_name |VARCHAR |TEXT -first_name.keyword |VARCHAR |KEYWORD -gender |VARCHAR |KEYWORD -hire_date |TIMESTAMP |DATE -languages |TINYINT |BYTE -last_name |VARCHAR |TEXT -last_name.keyword |VARCHAR |KEYWORD -salary |INTEGER |INTEGER +birth_date |TIMESTAMP |date +dep |STRUCT |nested +dep.dep_id |VARCHAR |keyword +dep.dep_name |VARCHAR |text +dep.dep_name.keyword|VARCHAR |keyword +dep.from_date |TIMESTAMP |date +dep.to_date |TIMESTAMP |date +emp_no |INTEGER |integer +first_name |VARCHAR |text +first_name.keyword |VARCHAR |keyword +gender |VARCHAR |keyword +hire_date |TIMESTAMP |date +languages |TINYINT |byte +last_name |VARCHAR |text +last_name.keyword |VARCHAR |keyword +salary |INTEGER |integer ; @@ -310,20 +310,20 @@ DESCRIBE "test_*,-test_alias*"; column | type | mapping --------------------+---------------+--------------- -birth_date |TIMESTAMP |DATE -dep |STRUCT |NESTED -dep.dep_id |VARCHAR |KEYWORD -dep.dep_name |VARCHAR |TEXT -dep.dep_name.keyword|VARCHAR |KEYWORD -dep.from_date |TIMESTAMP |DATE -dep.to_date |TIMESTAMP |DATE -emp_no |INTEGER |INTEGER -first_name |VARCHAR |TEXT -first_name.keyword |VARCHAR |KEYWORD -gender |VARCHAR |KEYWORD -hire_date |TIMESTAMP |DATE -languages |TINYINT |BYTE -last_name |VARCHAR |TEXT -last_name.keyword |VARCHAR |KEYWORD -salary |INTEGER |INTEGER +birth_date |TIMESTAMP |date +dep |STRUCT |nested +dep.dep_id |VARCHAR |keyword +dep.dep_name |VARCHAR |text +dep.dep_name.keyword|VARCHAR |keyword +dep.from_date |TIMESTAMP |date +dep.to_date |TIMESTAMP |date +emp_no |INTEGER |integer +first_name |VARCHAR |text +first_name.keyword |VARCHAR |keyword +gender |VARCHAR |keyword +hire_date |TIMESTAMP |date +languages |TINYINT |byte +last_name |VARCHAR |text +last_name.keyword |VARCHAR |keyword +salary |INTEGER |integer ; diff --git a/x-pack/plugin/sql/qa/src/main/resources/docs.csv-spec b/x-pack/plugin/sql/qa/src/main/resources/docs.csv-spec index c0d8ba3ebb123..b874da7239593 100644 --- a/x-pack/plugin/sql/qa/src/main/resources/docs.csv-spec +++ b/x-pack/plugin/sql/qa/src/main/resources/docs.csv-spec @@ -14,22 +14,22 @@ DESCRIBE emp; column | type | mapping --------------------+---------------+--------------- -birth_date |TIMESTAMP |DATE -dep |STRUCT |NESTED -dep.dep_id |VARCHAR |KEYWORD -dep.dep_name |VARCHAR |TEXT -dep.dep_name.keyword|VARCHAR |KEYWORD -dep.from_date |TIMESTAMP |DATE -dep.to_date |TIMESTAMP |DATE -emp_no |INTEGER |INTEGER -first_name |VARCHAR |TEXT -first_name.keyword |VARCHAR |KEYWORD -gender |VARCHAR |KEYWORD -hire_date |TIMESTAMP |DATE -languages |TINYINT |BYTE -last_name |VARCHAR |TEXT -last_name.keyword |VARCHAR |KEYWORD -salary |INTEGER |INTEGER +birth_date |TIMESTAMP |date +dep |STRUCT |nested +dep.dep_id |VARCHAR |keyword +dep.dep_name |VARCHAR |text +dep.dep_name.keyword|VARCHAR |keyword +dep.from_date |TIMESTAMP |date +dep.to_date |TIMESTAMP |date +emp_no |INTEGER |integer +first_name |VARCHAR |text +first_name.keyword |VARCHAR |keyword +gender |VARCHAR |keyword +hire_date |TIMESTAMP |date +languages |TINYINT |byte +last_name |VARCHAR |text +last_name.keyword |VARCHAR |keyword +salary |INTEGER |integer // end::describeTable ; @@ -53,22 +53,22 @@ SHOW COLUMNS IN emp; column | type | mapping --------------------+---------------+--------------- -birth_date |TIMESTAMP |DATE -dep |STRUCT |NESTED -dep.dep_id |VARCHAR |KEYWORD -dep.dep_name |VARCHAR |TEXT -dep.dep_name.keyword|VARCHAR |KEYWORD -dep.from_date |TIMESTAMP |DATE -dep.to_date |TIMESTAMP |DATE -emp_no |INTEGER |INTEGER -first_name |VARCHAR |TEXT -first_name.keyword |VARCHAR |KEYWORD -gender |VARCHAR |KEYWORD -hire_date |TIMESTAMP |DATE -languages |TINYINT |BYTE -last_name |VARCHAR |TEXT -last_name.keyword |VARCHAR |KEYWORD -salary |INTEGER |INTEGER +birth_date |TIMESTAMP |date +dep |STRUCT |nested +dep.dep_id |VARCHAR |keyword +dep.dep_name |VARCHAR |text +dep.dep_name.keyword|VARCHAR |keyword +dep.from_date |TIMESTAMP |date +dep.to_date |TIMESTAMP |date +emp_no |INTEGER |integer +first_name |VARCHAR |text +first_name.keyword |VARCHAR |keyword +gender |VARCHAR |keyword +hire_date |TIMESTAMP |date +languages |TINYINT |byte +last_name |VARCHAR |text +last_name.keyword |VARCHAR |keyword +salary |INTEGER |integer // end::showColumns ; diff --git a/x-pack/plugin/sql/qa/src/main/resources/nested.csv-spec b/x-pack/plugin/sql/qa/src/main/resources/nested.csv-spec index 3be0547fd43d8..d20769e237f97 100644 --- a/x-pack/plugin/sql/qa/src/main/resources/nested.csv-spec +++ b/x-pack/plugin/sql/qa/src/main/resources/nested.csv-spec @@ -8,22 +8,22 @@ DESCRIBE test_emp; column | type | mapping --------------------+---------------+--------------- -birth_date |TIMESTAMP |DATE -dep |STRUCT |NESTED -dep.dep_id |VARCHAR |KEYWORD -dep.dep_name |VARCHAR |TEXT -dep.dep_name.keyword|VARCHAR |KEYWORD -dep.from_date |TIMESTAMP |DATE -dep.to_date |TIMESTAMP |DATE -emp_no |INTEGER |INTEGER -first_name |VARCHAR |TEXT -first_name.keyword |VARCHAR |KEYWORD -gender |VARCHAR |KEYWORD -hire_date |TIMESTAMP |DATE -languages |TINYINT |BYTE -last_name |VARCHAR |TEXT -last_name.keyword |VARCHAR |KEYWORD -salary |INTEGER |INTEGER +birth_date |TIMESTAMP |date +dep |STRUCT |nested +dep.dep_id |VARCHAR |keyword +dep.dep_name |VARCHAR |text +dep.dep_name.keyword|VARCHAR |keyword +dep.from_date |TIMESTAMP |date +dep.to_date |TIMESTAMP |date +emp_no |INTEGER |integer +first_name |VARCHAR |text +first_name.keyword |VARCHAR |keyword +gender |VARCHAR |keyword +hire_date |TIMESTAMP |date +languages |TINYINT |byte +last_name |VARCHAR |text +last_name.keyword |VARCHAR |keyword +salary |INTEGER |integer ; nestedStar @@ -296,4 +296,4 @@ SELECT dep.dep_id, dep.dep_name, first_name, emp_no FROM test_emp WHERE emp_no=1 dep.dep_id:s | dep.dep_name:s | first_name:s | emp_no:i ---------------+----------------+---------------+--------------- d007 |Sales |Valter |10099 -; \ No newline at end of file +; diff --git a/x-pack/plugin/sql/src/main/java/org/elasticsearch/xpack/sql/plan/logical/command/ShowColumns.java b/x-pack/plugin/sql/src/main/java/org/elasticsearch/xpack/sql/plan/logical/command/ShowColumns.java index 7ef7e0fddcd64..f68bbeeffb63c 100644 --- a/x-pack/plugin/sql/src/main/java/org/elasticsearch/xpack/sql/plan/logical/command/ShowColumns.java +++ b/x-pack/plugin/sql/src/main/java/org/elasticsearch/xpack/sql/plan/logical/command/ShowColumns.java @@ -81,7 +81,7 @@ private void fillInRows(Map mapping, String prefix, List