SQL: Change the runtime field script for IT tests (#71512)

Change the runtime field used in tests to overcome H2's locale dependent implications in certain date/time related queries

x-pack/plugin/eql/src/main/java/org/elasticsearch/xpack/eql/action/EqlSearchRequest.java

@@ -123,6 +123,8 @@ public class EqlSearchRequest extends ActionRequest implements IndicesRequest.Re
                 fetchFields = in.readList(FieldAndFormat::new);
             }
             runtimeMappings = in.readMap();
+        } else {
+            runtimeMappings = emptyMap();
         }
     }
 
@@ -220,7 +222,7 @@ public class EqlSearchRequest extends ActionRequest implements IndicesRequest.Re
         if (fetchFields != null && fetchFields.isEmpty() == false) {
             builder.field(KEY_FETCH_FIELDS, fetchFields);
         }
-        if (runtimeMappings != null && runtimeMappings.isEmpty() == false) {
+        if (runtimeMappings != null) {
             builder.field(KEY_RUNTIME_MAPPINGS, runtimeMappings);
         }
 

x-pack/plugin/eql/src/test/java/org/elasticsearch/xpack/eql/action/EqlSearchRequestTests.java

@@ -24,6 +24,7 @@ import java.util.ArrayList;
 import java.util.Collections;
 import java.util.List;
 
+import static java.util.Collections.emptyMap;
 import static org.elasticsearch.index.query.AbstractQueryBuilder.parseInnerQueryBuilder;
 import static org.elasticsearch.xpack.ql.TestUtils.randomRuntimeMappings;
 
@@ -119,7 +120,7 @@ public class EqlSearchRequestTests extends AbstractBWCSerializationTestCase<EqlS
         mutatedInstance.keepAlive(instance.keepAlive());
         mutatedInstance.keepOnCompletion(instance.keepOnCompletion());
         mutatedInstance.fetchFields(version.onOrAfter(Version.V_7_13_0) ? instance.fetchFields() : null);
-        mutatedInstance.runtimeMappings(version.onOrAfter(Version.V_7_13_0) ? instance.runtimeMappings() : null);
+        mutatedInstance.runtimeMappings(version.onOrAfter(Version.V_7_13_0) ? instance.runtimeMappings() : emptyMap());
 
         return mutatedInstance;
     }

x-pack/plugin/sql/qa/server/src/main/java/org/elasticsearch/xpack/sql/qa/jdbc/DataLoader.java

@@ -153,12 +153,12 @@ public class DataLoader {
             // define the runtime field
             createIndex.startObject("runtime");
             {
-                createIndex.startObject("birth_date_day_of_week").field("type", "keyword");
+                createIndex.startObject("name").field("type", "keyword");
                 createIndex.startObject("script")
                     .field(
                         "source",
-                        "if (doc['birth_date'].size()==0) return; "
-                            + "else emit(doc['birth_date'].value.dayOfWeekEnum.getDisplayName(TextStyle.FULL, Locale.ROOT))"
+                        "if (doc['first_name.keyword'].size()==0) emit(' '.concat(doc['last_name.keyword'].value));"
+                            + " else emit(doc['first_name.keyword'].value.concat(' ').concat(doc['last_name.keyword'].value))"
                     );
                 createIndex.endObject();
                 createIndex.endObject();

x-pack/plugin/sql/qa/server/src/main/resources/alias.csv-spec

@@ -31,7 +31,6 @@ DESCRIBE test_alias;
         column        |     type      |    mapping    
 ----------------------+---------------+---------------
 birth_date            |TIMESTAMP      |datetime       
-birth_date_day_of_week|VARCHAR        |keyword        
 dep                   |STRUCT         |nested         
 dep.dep_id            |VARCHAR        |keyword        
 dep.dep_name          |VARCHAR        |text           
@@ -51,6 +50,7 @@ hire_date             |TIMESTAMP      |datetime
 languages             |TINYINT        |byte           
 last_name             |VARCHAR        |text           
 last_name.keyword     |VARCHAR        |keyword        
+name                  |VARCHAR        |keyword
 null_constant         |VARCHAR        |keyword        
 salary                |INTEGER        |integer        
 wildcard_name         |VARCHAR        |keyword        
@@ -62,7 +62,6 @@ DESCRIBE "test_*";
         column        |     type      |    mapping    
 ----------------------+---------------+---------------
 birth_date            |TIMESTAMP      |datetime       
-birth_date_day_of_week|VARCHAR        |keyword        
 dep                   |STRUCT         |nested         
 dep.dep_id            |VARCHAR        |keyword        
 dep.dep_name          |VARCHAR        |text           
@@ -82,6 +81,7 @@ hire_date             |TIMESTAMP      |datetime
 languages             |TINYINT        |byte           
 last_name             |VARCHAR        |text           
 last_name.keyword     |VARCHAR        |keyword        
+name                  |VARCHAR        |keyword
 null_constant         |VARCHAR        |keyword        
 salary                |INTEGER        |integer        
 wildcard_name         |VARCHAR        |keyword        

x-pack/plugin/sql/qa/server/src/main/resources/command.csv-spec

@@ -277,7 +277,6 @@ DESCRIBE LIKE 'test_emp';
         column        |     type      |    mapping    
 ----------------------+---------------+---------------
 birth_date            |TIMESTAMP      |datetime       
-birth_date_day_of_week|VARCHAR        |keyword        
 dep                   |STRUCT         |nested         
 dep.dep_id            |VARCHAR        |keyword        
 dep.dep_name          |VARCHAR        |text           
@@ -297,6 +296,7 @@ hire_date             |TIMESTAMP      |datetime
 languages             |TINYINT        |byte           
 last_name             |VARCHAR        |text           
 last_name.keyword     |VARCHAR        |keyword        
+name                  |VARCHAR        |keyword        
 null_constant         |VARCHAR        |keyword        
 salary                |INTEGER        |integer        
 wildcard_name         |VARCHAR        |keyword        
@@ -308,7 +308,6 @@ DESCRIBE LIKE 'test_emp%';
         column        |     type      |    mapping    
 ----------------------+---------------+---------------
 birth_date            |TIMESTAMP      |datetime       
-birth_date_day_of_week|VARCHAR        |keyword        
 dep                   |STRUCT         |nested         
 dep.dep_id            |VARCHAR        |keyword        
 dep.dep_name          |VARCHAR        |text           
@@ -328,6 +327,7 @@ hire_date             |TIMESTAMP      |datetime
 languages             |TINYINT        |byte           
 last_name             |VARCHAR        |text           
 last_name.keyword     |VARCHAR        |keyword        
+name                  |VARCHAR        |keyword        
 null_constant         |VARCHAR        |keyword        
 salary                |INTEGER        |integer        
 wildcard_name         |VARCHAR        |keyword        
@@ -339,7 +339,6 @@ DESCRIBE "test_emp";
         column        |     type      |    mapping    
 ----------------------+---------------+---------------
 birth_date            |TIMESTAMP      |datetime       
-birth_date_day_of_week|VARCHAR        |keyword        
 dep                   |STRUCT         |nested         
 dep.dep_id            |VARCHAR        |keyword        
 dep.dep_name          |VARCHAR        |text           
@@ -354,6 +353,7 @@ hire_date             |TIMESTAMP      |datetime
 languages             |TINYINT        |byte           
 last_name             |VARCHAR        |text           
 last_name.keyword     |VARCHAR        |keyword        
+name                  |VARCHAR        |keyword        
 salary                |INTEGER        |integer        
 ;
 

x-pack/plugin/sql/qa/server/src/main/resources/conditionals.csv-spec

@@ -534,16 +534,18 @@ SELECT GREATEST(null, null, birth_date + INTERVAL 25 YEARS, hire_date + INTERVAL
 ;
 
 ifNullWithRuntimeField
-SELECT COUNT(*) c, IFNULL(birth_date_day_of_week, 'no day') AS day FROM test_emp GROUP BY day ORDER BY c;
+SELECT COUNT(*) c, LEFT(IFNULL(name, 'never'), 1) AS n FROM test_emp GROUP BY n ORDER BY n DESC LIMIT 10;
 
-      c:l      |      day:s      
+      c:l      |      n:s      
 ---------------+---------------
-8              |Monday         
-10             |Sunday         
-10             |no day       
-12             |Friday         
-13             |Saturday       
-14             |Wednesday      
-15             |Thursday       
-18             |Tuesday        
+2              |Z
+3              |Y
+1              |X
+1              |W
+3              |V
+2              |U
+3              |T
+11             |S
+3              |R
+5              |P
 ;

x-pack/plugin/sql/qa/server/src/main/resources/datetime.csv-spec

@@ -146,21 +146,6 @@ SELECT ISO_DAY_OF_WEEK(birth_date) AS d, SUM(salary) s FROM test_emp GROUP BY d
 null           |430039
 ;
 
-runtimeFieldDayOfWeek
-SELECT birth_date_day_of_week, SUM(salary) s FROM test_emp GROUP BY birth_date_day_of_week ORDER BY birth_date_day_of_week DESC;
-
-birth_date_day_of_week:s|      s:i       
-------------------------+---------------
-Wednesday               |655169       
-Tuesday                 |888011       
-Thursday                |740669       
-Sunday                  |386466       
-Saturday                |643304       
-Monday                  |428067       
-Friday                  |653130       
-null                    |430039
-;              
-
 isoWeekOfYear
 schema::birth_date:ts|iso_week:i|week:i
 SELECT birth_date, IW(birth_date) iso_week, WEEK(birth_date) week FROM test_emp WHERE IW(birth_date) < 8 AND week >2 ORDER BY iso_week;
@@ -1339,9 +1324,9 @@ SELECT CAST(hire_date AS LONG) AS date FROM test_emp GROUP BY date ORDER BY date
 ;
 
 dateTimeAggByIsoDayOfWeekWithFilter
-SELECT IDOW(birth_date) day, DAY_NAME(birth_date) name, COUNT(*) c FROM test_emp WHERE IDOW(birth_date) < 6 GROUP BY day, name ORDER BY day desc;
+SELECT IDOW(birth_date) day, DAY_NAME(birth_date) dayname, COUNT(*) c FROM test_emp WHERE IDOW(birth_date) < 6 GROUP BY day, dayname ORDER BY day desc;
 
-    day:i      |   name:s      |     c:l       
+    day:i      |   dayname:s   |     c:l       
 ---------------+---------------+---------------
 5              |Friday         |12             
 4              |Thursday       |15             
@@ -1351,9 +1336,9 @@ SELECT IDOW(birth_date) day, DAY_NAME(birth_date) name, COUNT(*) c FROM test_emp
 ;
 
 dateTimeAggByIsoDayOfWeek
-SELECT IDOW(birth_date) day, DAY_NAME(birth_date) name, COUNT(*) c FROM test_emp GROUP BY day, name ORDER BY day desc;
+SELECT IDOW(birth_date) day, DAY_NAME(birth_date) dayname, COUNT(*) c FROM test_emp GROUP BY day, dayname ORDER BY day desc;
 
-    day:i      |   name:s      |     c:l       
+    day:i      |   dayname:s   |     c:l       
 ---------------+---------------+---------------
 7              |Sunday         |10
 6              |Saturday       |13

x-pack/plugin/sql/qa/server/src/main/resources/docs/docs.csv-spec

@@ -14,25 +14,25 @@ describeTable
 // tag::describeTable
 DESCRIBE emp;
 
-        column        |     type      |    mapping    
-----------------------+---------------+---------------
-birth_date            |TIMESTAMP      |datetime       
-birth_date_day_of_week|VARCHAR        |keyword        
-dep                   |STRUCT         |nested         
-dep.dep_id            |VARCHAR        |keyword        
-dep.dep_name          |VARCHAR        |text           
-dep.dep_name.keyword  |VARCHAR        |keyword        
-dep.from_date         |TIMESTAMP      |datetime       
-dep.to_date           |TIMESTAMP      |datetime       
-emp_no                |INTEGER        |integer        
-first_name            |VARCHAR        |text           
-first_name.keyword    |VARCHAR        |keyword        
-gender                |VARCHAR        |keyword        
-hire_date             |TIMESTAMP      |datetime       
-languages             |TINYINT        |byte           
-last_name             |VARCHAR        |text           
-last_name.keyword     |VARCHAR        |keyword        
-salary                |INTEGER        |integer        
+       column       |     type      |    mapping    
+--------------------+---------------+---------------
+birth_date          |TIMESTAMP      |datetime       
+dep                 |STRUCT         |nested         
+dep.dep_id          |VARCHAR        |keyword        
+dep.dep_name        |VARCHAR        |text           
+dep.dep_name.keyword|VARCHAR        |keyword        
+dep.from_date       |TIMESTAMP      |datetime       
+dep.to_date         |TIMESTAMP      |datetime       
+emp_no              |INTEGER        |integer        
+first_name          |VARCHAR        |text           
+first_name.keyword  |VARCHAR        |keyword        
+gender              |VARCHAR        |keyword        
+hire_date           |TIMESTAMP      |datetime       
+languages           |TINYINT        |byte           
+last_name           |VARCHAR        |text           
+last_name.keyword   |VARCHAR        |keyword        
+name                |VARCHAR        |keyword        
+salary              |INTEGER        |integer        
 
 // end::describeTable
 ;
@@ -54,25 +54,25 @@ showColumns
 // tag::showColumns
 SHOW COLUMNS IN emp;
 
-        column        |     type      |    mapping    
-----------------------+---------------+---------------
-birth_date            |TIMESTAMP      |datetime       
-birth_date_day_of_week|VARCHAR        |keyword        
-dep                   |STRUCT         |nested         
-dep.dep_id            |VARCHAR        |keyword        
-dep.dep_name          |VARCHAR        |text           
-dep.dep_name.keyword  |VARCHAR        |keyword        
-dep.from_date         |TIMESTAMP      |datetime       
-dep.to_date           |TIMESTAMP      |datetime       
-emp_no                |INTEGER        |integer        
-first_name            |VARCHAR        |text           
-first_name.keyword    |VARCHAR        |keyword        
-gender                |VARCHAR        |keyword        
-hire_date             |TIMESTAMP      |datetime       
-languages             |TINYINT        |byte           
-last_name             |VARCHAR        |text           
-last_name.keyword     |VARCHAR        |keyword        
-salary                |INTEGER        |integer        
+       column       |     type      |    mapping    
+--------------------+---------------+---------------
+birth_date          |TIMESTAMP      |datetime       
+dep                 |STRUCT         |nested         
+dep.dep_id          |VARCHAR        |keyword        
+dep.dep_name        |VARCHAR        |text           
+dep.dep_name.keyword|VARCHAR        |keyword        
+dep.from_date       |TIMESTAMP      |datetime       
+dep.to_date         |TIMESTAMP      |datetime       
+emp_no              |INTEGER        |integer        
+first_name          |VARCHAR        |text           
+first_name.keyword  |VARCHAR        |keyword        
+gender              |VARCHAR        |keyword        
+hire_date           |TIMESTAMP      |datetime       
+languages           |TINYINT        |byte           
+last_name           |VARCHAR        |text           
+last_name.keyword   |VARCHAR        |keyword        
+name                |VARCHAR        |keyword        
+salary              |INTEGER        |integer        
 
 // end::showColumns
 ;
@@ -487,9 +487,9 @@ wildcardWithOrder
 // tag::wildcardWithOrder
 SELECT * FROM emp LIMIT 1;
 
-     birth_date     |birth_date_day_of_week|    emp_no     |  first_name   |    gender     |     hire_date      |   languages   |   last_name   |    salary     
---------------------+----------------------+---------------+---------------+---------------+--------------------+---------------+---------------+---------------
-1953-09-02T00:00:00Z|Wednesday             |10001          |Georgi         |M              |1986-06-26T00:00:00Z|2              |Facello        |57305
+     birth_date     |    emp_no     |  first_name   |    gender     |       hire_date        |   languages   |   last_name   |     name      |    salary     
+--------------------+---------------+---------------+---------------+------------------------+---------------+---------------+---------------+---------------
+1953-09-02T00:00:00Z|10001          |Georgi         |M              |1986-06-26T00:00:00.000Z|2              |Facello        |Georgi Facello |57305
 
 // end::wildcardWithOrder
 ;
@@ -498,9 +498,9 @@ fromTable
 // tag::fromTable
 SELECT * FROM emp LIMIT 1;
 
-     birth_date     |birth_date_day_of_week|    emp_no     |  first_name   |    gender     |     hire_date      |   languages   |   last_name   |    salary     
---------------------+----------------------+---------------+---------------+---------------+--------------------+---------------+---------------+---------------
-1953-09-02T00:00:00Z|Wednesday             |10001          |Georgi         |M              |1986-06-26T00:00:00Z|2              |Facello        |57305
+     birth_date     |    emp_no     |  first_name   |    gender     |       hire_date        |   languages   |   last_name   |     name      |    salary     
+--------------------+---------------+---------------+---------------+------------------------+---------------+---------------+---------------+---------------
+1953-09-02T00:00:00Z|10001          |Georgi         |M              |1986-06-26T00:00:00.000Z|2              |Facello        |Georgi Facello |57305
   
 
 // end::fromTable
@@ -510,9 +510,9 @@ fromTableQuoted
 // tag::fromTableQuoted
 SELECT * FROM "emp" LIMIT 1;
 
-     birth_date     |birth_date_day_of_week|    emp_no     |  first_name   |    gender     |     hire_date      |   languages   |   last_name   |    salary     
---------------------+----------------------+---------------+---------------+---------------+--------------------+---------------+---------------+---------------
-1953-09-02T00:00:00Z|Wednesday             |10001          |Georgi         |M              |1986-06-26T00:00:00Z|2              |Facello        |57305
+     birth_date     |    emp_no     |  first_name   |    gender     |       hire_date        |   languages   |   last_name   |     name      |    salary     
+--------------------+---------------+---------------+---------------+------------------------+---------------+---------------+---------------+---------------
+1953-09-02T00:00:00Z|10001          |Georgi         |M              |1986-06-26T00:00:00.000Z|2              |Facello        |Georgi Facello |57305
 
 // end::fromTableQuoted
 ;

x-pack/plugin/sql/qa/server/src/main/resources/filter.csv-spec

@@ -160,19 +160,21 @@ SELECT count(*) AS c FROM test_emp WHERE birth_date::time IN ('00:00:00Z'::TIME,
 ;
 
 inWithRuntimeField
-SELECT COUNT(*) AS c, birth_date_day_of_week FROM test_emp WHERE birth_date_day_of_week IN ('Saturday', 'Sunday') GROUP BY birth_date_day_of_week;
+SELECT COUNT(*) AS c, LEFT(name, 1) AS first_letter FROM test_emp WHERE first_letter IN ('X', 'Y', 'Z') GROUP BY first_letter;
 
-       c:l     |birth_date_day_of_week:s
----------------+------------------------
-13             |Saturday              
-10             |Sunday                
+       c:l     |first_letter:s
+---------------+--------------
+1              |X              
+3              |Y              
+2              |Z              
 ;
 
-inWithDayName
-SELECT COUNT(*) AS c, DAY_NAME(birth_date) FROM test_emp WHERE DAY_NAME(birth_date) IN ('Saturday', 'Sunday') GROUP BY DAY_NAME(birth_date);
+inWithConcat
+SELECT COUNT(*) AS c, LEFT(CONCAT(first_name, last_name), 1) AS first_letter FROM test_emp WHERE first_letter IN ('X', 'Y', 'Z') GROUP BY first_letter;
 
-       c:l     |DAY_NAME(birth_date):s
----------------+----------------------
-13             |Saturday            
-10             |Sunday              
+       c:l     |first_letter:s
+---------------+--------------
+1              |X              
+3              |Y              
+2              |Z                            
 ;

x-pack/plugin/sql/qa/server/src/main/resources/fulltext.csv-spec

@@ -204,12 +204,12 @@ null           |1.9161749939033146|0.1480828817161133 |74999          |28336
 ;
 
 runtimeFieldWithQuery
-SELECT COUNT(*) AS c, birth_date_day_of_week FROM test_emp WHERE QUERY('T*','default_field=birth_date_day_of_week') OR QUERY('S*','default_field=birth_date_day_of_week') GROUP BY birth_date_day_of_week ORDER BY c;
-
-      c:l      |birth_date_day_of_week:s
----------------+------------------------
-10             |Sunday                
-13             |Saturday              
-15             |Thursday              
-18             |Tuesday               
+SELECT COUNT(*) AS c, name FROM test_emp WHERE QUERY('T*','default_field=name') OR QUERY('O*','default_field=name') GROUP BY name ORDER BY c;
+
+      c:l      |      name:s       
+---------------+-----------------
+1              |Otmar Herbst     
+1              |Tse Herber       
+1              |Tuval Kalloufi   
+1              |Tzvetan Zielinski
 ;

x-pack/plugin/sql/qa/server/src/main/resources/nested.csv-spec

@@ -8,25 +8,25 @@
 describeParent
 DESCRIBE test_emp;
 
-        column        |     type      |    mapping    
-----------------------+---------------+---------------
-birth_date            |TIMESTAMP      |datetime       
-birth_date_day_of_week|VARCHAR        |keyword        
-dep                   |STRUCT         |nested         
-dep.dep_id            |VARCHAR        |keyword        
-dep.dep_name          |VARCHAR        |text           
-dep.dep_name.keyword  |VARCHAR        |keyword        
-dep.from_date         |TIMESTAMP      |datetime       
-dep.to_date           |TIMESTAMP      |datetime       
-emp_no                |INTEGER        |integer        
-first_name            |VARCHAR        |text           
-first_name.keyword    |VARCHAR        |keyword        
-gender                |VARCHAR        |keyword        
-hire_date             |TIMESTAMP      |datetime       
-languages             |TINYINT        |byte           
-last_name             |VARCHAR        |text           
-last_name.keyword     |VARCHAR        |keyword        
-salary                |INTEGER        |integer        
+       column       |     type      |    mapping    
+--------------------+---------------+---------------
+birth_date          |TIMESTAMP      |datetime       
+dep                 |STRUCT         |nested         
+dep.dep_id          |VARCHAR        |keyword        
+dep.dep_name        |VARCHAR        |text           
+dep.dep_name.keyword|VARCHAR        |keyword        
+dep.from_date       |TIMESTAMP      |datetime       
+dep.to_date         |TIMESTAMP      |datetime       
+emp_no              |INTEGER        |integer        
+first_name          |VARCHAR        |text           
+first_name.keyword  |VARCHAR        |keyword        
+gender              |VARCHAR        |keyword        
+hire_date           |TIMESTAMP      |datetime       
+languages           |TINYINT        |byte           
+last_name           |VARCHAR        |text           
+last_name.keyword   |VARCHAR        |keyword        
+name                |VARCHAR        |keyword        
+salary              |INTEGER        |integer
 ;
 
 nestedStar

x-pack/plugin/sql/qa/server/src/main/resources/pivot.csv-spec

@@ -186,17 +186,17 @@ null           |48396.28571428572|62140.666666666664
 ;
 
 sumWithoutSubquery
-schema::birth_date:ts|birth_date_day_of_week:s|emp_no:i|first_name:s|gender:s|hire_date:ts|last_name:s|1:i|2:i
+schema::birth_date:ts|emp_no:i|first_name:s|gender:s|hire_date:ts|last_name:s|name:s|1:i|2:i
 // tag::sumWithoutSubquery
 SELECT * FROM test_emp PIVOT (SUM(salary) FOR languages IN (1, 2)) LIMIT 5;
 
-     birth_date      |birth_date_day_of_week|    emp_no     |  first_name   |    gender     |       hire_date     |   last_name   |       1       |       2       
----------------------+----------------------+---------------+---------------+---------------+---------------------+---------------+---------------+---------------
-null                 |null                  |10041          |Uri            |F              |1989-11-12 00:00:00.0|Lenart         |56415          |null
-null                 |null                  |10043          |Yishay         |M              |1990-10-20 00:00:00.0|Tzvieli        |34341          |null
-null                 |null                  |10044          |Mingsen        |F              |1994-05-21 00:00:00.0|Casley         |39728          |null
-1952-04-19 00:00:00.0|Saturday              |10009          |Sumant         |F              |1985-02-18 00:00:00.0|Peac           |66174          |null
-1953-01-07 00:00:00.0|Wednesday             |10067          |Claudi         |M              |1987-03-04 00:00:00.0|Stavenow       |null           |52044
+       birth_date    |    emp_no     |  first_name   |    gender     |     hire_date       |   last_name   |       name       |       1       |       2       
+---------------------+---------------+---------------+---------------+---------------------+---------------+------------------+---------------+---------------
+null                 |10041          |Uri            |F              |1989-11-12 00:00:00.0|Lenart         |Uri Lenart        |56415          |null           
+null                 |10043          |Yishay         |M              |1990-10-20 00:00:00.0|Tzvieli        |Yishay Tzvieli    |34341          |null           
+null                 |10044          |Mingsen        |F              |1994-05-21 00:00:00.0|Casley         |Mingsen Casley    |39728          |null           
+1952-04-19 00:00:00.0|10009          |Sumant         |F              |1985-02-18 00:00:00.0|Peac           |Sumant Peac       |66174          |null           
+1953-01-07 00:00:00.0|10067          |Claudi         |M              |1987-03-04 00:00:00.0|Stavenow       |Claudi Stavenow   |null           |52044
 // end::sumWithoutSubquery
 ;
 
@@ -213,29 +213,29 @@ PIVOT (SUM(bytes_in) FOR status IN ('OK','Error'));
 ;
 
 sumWithInnerAggregateSumOfSquares
-schema::birth_date:ts|birth_date_day_of_week:s|emp_no:i|first_name:s|gender:s|hire_date:ts|last_name:s|1:d|2:d
+schema::birth_date:ts|emp_no:i|first_name:s|gender:s|hire_date:ts|last_name:s|name:s|1:d|2:d
 SELECT * FROM test_emp PIVOT (SUM_OF_SQUARES(salary) FOR languages IN (1, 2)) LIMIT 5;
 
-     birth_date      |birth_date_day_of_week|    emp_no     |  first_name   |    gender     |       hire_date     |   last_name   |       1       |       2       
----------------------+----------------------+---------------+---------------+---------------+---------------------+---------------+---------------+---------------
-null                 |null                  |10041          |Uri            |F              |1989-11-12 00:00:00.0|Lenart         |3.182652225E9  |null
-null                 |null                  |10043          |Yishay         |M              |1990-10-20 00:00:00.0|Tzvieli        |1.179304281E9  |null
-null                 |null                  |10044          |Mingsen        |F              |1994-05-21 00:00:00.0|Casley         |1.578313984E9  |null
-1952-04-19 00:00:00.0|Saturday              |10009          |Sumant         |F              |1985-02-18 00:00:00.0|Peac           |4.378998276E9  |null
-1953-01-07 00:00:00.0|Wednesday             |10067          |Claudi         |M              |1987-03-04 00:00:00.0|Stavenow       |null           |2.708577936E9
+       birth_date    |    emp_no     |  first_name   |    gender     |       hire_date     |   last_name   |       name       |       1       |       2       
+---------------------+---------------+---------------+---------------+---------------------+---------------+------------------+---------------+---------------
+null                 |10041          |Uri            |F              |1989-11-12 00:00:00.0|Lenart         |Uri Lenart        |3.182652225E9  |null           
+null                 |10043          |Yishay         |M              |1990-10-20 00:00:00.0|Tzvieli        |Yishay Tzvieli    |1.179304281E9  |null           
+null                 |10044          |Mingsen        |F              |1994-05-21 00:00:00.0|Casley         |Mingsen Casley    |1.578313984E9  |null           
+1952-04-19 00:00:00.0|10009          |Sumant         |F              |1985-02-18 00:00:00.0|Peac           |Sumant Peac       |4.378998276E9  |null           
+1953-01-07 00:00:00.0|10067          |Claudi         |M              |1987-03-04 00:00:00.0|Stavenow       |Claudi Stavenow   |null           |2.708577936E9
 ;
 
 sumWithInnerAggregateSumOfSquaresRound
-schema::birth_date:ts|birth_date_day_of_week:s|emp_no:i|first_name:s|gender:s|hire_date:ts|last_name:s|1:d|2:d
+schema::birth_date:ts|emp_no:i|first_name:s|gender:s|hire_date:ts|last_name:s|name:s|1:d|2:d
 SELECT * FROM test_emp PIVOT (ROUND(SUM_OF_SQUARES(salary)/1E6, 2) FOR languages IN (1, 2)) LIMIT 5;
 
-     birth_date      |birth_date_day_of_week|    emp_no     |  first_name   |    gender     |      hire_date      |   last_name   |       1       |       2       
----------------------+----------------------+---------------+---------------+---------------+---------------------+---------------+---------------+---------------
-null                 |null                  |10041          |Uri            |F              |1989-11-12 00:00:00.0|Lenart         |3182.65        |null
-null                 |null                  |10043          |Yishay         |M              |1990-10-20 00:00:00.0|Tzvieli        |1179.3         |null
-null                 |null                  |10044          |Mingsen        |F              |1994-05-21 00:00:00.0|Casley         |1578.31        |null
-1952-04-19 00:00:00.0|Saturday              |10009          |Sumant         |F              |1985-02-18 00:00:00.0|Peac           |4379.0         |null
-1953-01-07 00:00:00.0|Wednesday             |10067          |Claudi         |M              |1987-03-04 00:00:00.0|Stavenow       |null           |2708.58
+       birth_date    |    emp_no     |  first_name   |    gender     |       hire_date     |   last_name   |       name       |       1       |       2       
+---------------------+---------------+---------------+---------------+---------------------+---------------+------------------+---------------+---------------
+null                 |10041          |Uri            |F              |1989-11-12 00:00:00.0|Lenart         |Uri Lenart        |3182.65        |null           
+null                 |10043          |Yishay         |M              |1990-10-20 00:00:00.0|Tzvieli        |Yishay Tzvieli    |1179.3         |null           
+null                 |10044          |Mingsen        |F              |1994-05-21 00:00:00.0|Casley         |Mingsen Casley    |1578.31        |null           
+1952-04-19 00:00:00.0|10009          |Sumant         |F              |1985-02-18 00:00:00.0|Peac           |Sumant Peac       |4379.0         |null           
+1953-01-07 00:00:00.0|10067          |Claudi         |M              |1987-03-04 00:00:00.0|Stavenow       |Claudi Stavenow   |null           |2708.58
 ;
 
 sumWithInnerAggregateKurtosis

x-pack/plugin/sql/qa/server/src/main/resources/select.csv-spec

@@ -189,16 +189,16 @@ SELECT emp_no, CAST(languages NOT IN (2, 3) AS STRING), CAST(NOT languages IN (2
 ;
 
 topWithWildCard
-schema::birth_date:ts|birth_date_day_of_week:s|emp_no:i|first_name:s|gender:s|hire_date:ts|languages:byte|last_name:s|salary:i
+schema::birth_date:ts|emp_no:i|first_name:s|gender:s|hire_date:ts|languages:byte|last_name:s|name:s|salary:i
 SELECT TOP 5 * FROM test_emp ORDER BY emp_no;
 
-       birth_date       |birth_date_day_of_week|    emp_no     |  first_name   |    gender     |       hire_date        |   languages   |   last_name   |    salary
-------------------------+----------------------+---------------+---------------+---------------+------------------------+---------------+---------------+---------------
-1953-09-02T00:00:00.000Z|Wednesday             |10001          |Georgi         |M              |1986-06-26T00:00:00.000Z|2              |Facello        |57305
-1964-06-02T00:00:00.000Z|Tuesday               |10002          |Bezalel        |F              |1985-11-21T00:00:00.000Z|5              |Simmel         |56371
-1959-12-03T00:00:00.000Z|Thursday              |10003          |Parto          |M              |1986-08-28T00:00:00.000Z|4              |Bamford        |61805
-1954-05-01T00:00:00.000Z|Saturday              |10004          |Chirstian      |M              |1986-12-01T00:00:00.000Z|5              |Koblick        |36174
-1955-01-21T00:00:00.000Z|Friday                |10005          |Kyoichi        |M              |1989-09-12T00:00:00.000Z|1              |Maliniak       |63528
+       birth_date       |    emp_no     |  first_name   |    gender     |       hire_date        |   languages   |   last_name   |      name       |    salary     
+------------------------+---------------+---------------+---------------+------------------------+---------------+---------------+-----------------+---------------
+1953-09-02T00:00:00.000Z|10001          |Georgi         |M              |1986-06-26T00:00:00.000Z|2              |Facello        |Georgi Facello   |57305          
+1964-06-02T00:00:00.000Z|10002          |Bezalel        |F              |1985-11-21T00:00:00.000Z|5              |Simmel         |Bezalel Simmel   |56371          
+1959-12-03T00:00:00.000Z|10003          |Parto          |M              |1986-08-28T00:00:00.000Z|4              |Bamford        |Parto Bamford    |61805          
+1954-05-01T00:00:00.000Z|10004          |Chirstian      |M              |1986-12-01T00:00:00.000Z|5              |Koblick        |Chirstian Koblick|36174          
+1955-01-21T00:00:00.000Z|10005          |Kyoichi        |M              |1989-09-12T00:00:00.000Z|1              |Maliniak       |Kyoichi Maliniak |63528
 ;
 
 topWithColumnNames
@@ -227,23 +227,18 @@ SELECT TOP 3 count(*) AS cnt, emp_no % languages FROM test_emp GROUP BY 2 ORDER
 ;
 
 runtimeFieldWithFunctions
-SELECT emp_no, CONCAT(CONCAT(SUBSTRING(birth_date_day_of_week, 0, LENGTH(birth_date_day_of_week) - 3), SPACE(11 - LENGTH(birth_date_day_of_week))), 'DAY') AS c, ISO_DAY_OF_WEEK(birth_date) AS iso FROM test_emp ORDER BY emp_no DESC LIMIT 15;
+SELECT first_name, UCASE(SUBSTRING(name, 0, LOCATE(' ', name) - 1)) ucase FROM test_emp ORDER BY ucase DESC LIMIT 10;
 
-    emp_no     |       c       |      iso      
----------------+---------------+---------------
-10100          |Tues    DAY    |2              
-10099          |Fri     DAY    |5              
-10098          |Satur   DAY    |6              
-10097          |Wednes  DAY    |3              
-10096          |Thurs   DAY    |4              
-10095          |Sun     DAY    |7              
-10094          |Satur   DAY    |6              
-10093          |Thurs   DAY    |4              
-10092          |Sun     DAY    |7              
-10091          |Tues    DAY    |2              
-10090          |Tues    DAY    |2              
-10089          |Thurs   DAY    |4              
-10088          |Thurs   DAY    |4              
-10087          |Thurs   DAY    |4              
-10086          |Mon     DAY    |1
+  first_name   |     ucase     
+---------------+---------------
+Zvonko         |ZVONKO         
+Zhongwei       |ZHONGWEI       
+Yongqiao       |YONGQIAO       
+Yishay         |YISHAY         
+Yinghua        |YINGHUA        
+Xinglin        |XINGLIN        
+Weiyi          |WEIYI          
+Vishv          |VISHV          
+Valter         |VALTER         
+Valdiodio      |VALDIODIO
 ;

x-pack/plugin/sql/qa/server/src/main/resources/select.sql-spec

@@ -4,8 +4,7 @@
 // Basic SELECT
 //
 
-// AwaitsFix https://github.com/elastic/elasticsearch/issues/71442
-wildcardWithOrder-Ignore
+wildcardWithOrder
 SELECT * FROM test_emp ORDER BY emp_no;
 column
 SELECT last_name FROM "test_emp" ORDER BY emp_no;
@@ -22,11 +21,9 @@ SELECT first_name f, last_name AS l FROM "test_emp" ORDER BY emp_no;
 // SELECT with LIMIT
 //
 
-// AwaitsFix https://github.com/elastic/elasticsearch/issues/71442
-wildcardWithLimit-Ignore
+wildcardWithLimit
 SELECT * FROM "test_emp" ORDER BY emp_no LIMIT 5;
-// AwaitsFix https://github.com/elastic/elasticsearch/issues/71442
-wildcardWithOrderWithLimit-Ignore
+wildcardWithOrderWithLimit
 SELECT * FROM "test_emp" ORDER BY emp_no LIMIT 5;
 columnWithLimit
 SELECT last_name FROM "test_emp" ORDER BY emp_no LIMIT 5;

x-pack/plugin/sql/qa/server/src/main/resources/setup_test_emp.sql

@@ -1,13 +1,13 @@
 DROP TABLE IF EXISTS "test_emp";
 CREATE TABLE "test_emp" (
                     "birth_date" TIMESTAMP WITH TIME ZONE,
-                    "birth_date_day_of_week" VARCHAR(50),
                     "emp_no" INT, 
                     "first_name" VARCHAR(50),
                     "gender" VARCHAR(1),
                     "hire_date" TIMESTAMP WITH TIME ZONE,
                     "languages" TINYINT,
                     "last_name" VARCHAR(50),
+                    "name" VARCHAR(50),
                     "salary" INT
                    )
-   AS SELECT birth_date, DAYNAME(birth_date) AS birth_date_day_of_week, emp_no, first_name, gender, hire_date, languages, last_name, salary FROM CSVREAD('classpath:/employees.csv');
+   AS SELECT birth_date, emp_no, first_name, gender, hire_date, languages, last_name, CONCAT(first_name, ' ', last_name) AS name, salary FROM CSVREAD('classpath:/employees.csv');

x-pack/plugin/sql/qa/server/src/main/resources/single-node-only/command-sys.csv-spec

@@ -9,17 +9,17 @@ SYS COLUMNS TABLE LIKE 'test\_emp' ESCAPE '\';
 
    TABLE_CAT:s   |  TABLE_SCHEM:s|  TABLE_NAME:s |    COLUMN_NAME:s     |   DATA_TYPE:i |   TYPE_NAME:s |  COLUMN_SIZE:i| BUFFER_LENGTH:i|DECIMAL_DIGITS:i|NUM_PREC_RADIX:i | NULLABLE:i|    REMARKS:s  |  COLUMN_DEF:s |SQL_DATA_TYPE:i|SQL_DATETIME_SUB:i|CHAR_OCTET_LENGTH:i|ORDINAL_POSITION:i|IS_NULLABLE:s|SCOPE_CATALOG:s|SCOPE_SCHEMA:s|SCOPE_TABLE:s|SOURCE_DATA_TYPE:sh|IS_AUTOINCREMENT:s|IS_GENERATEDCOLUMN:s
 -----------------+---------------+---------------+----------------------+---------------+---------------+---------------+---------------+-----------------+-----------------+-----------+---------------+---------------+---------------+----------------+-----------------+----------------+---------------+---------------+---------------+---------------+----------------+----------------+------------------
-integTest        |null           |test_emp       |birth_date            |93             |DATETIME       |34             |8              |null           |null           |1              |null           |null           |9              |3               |null             |1               |YES            |null           |null           |null           |null            |NO              |NO                
-integTest        |null           |test_emp       |birth_date_day_of_week|12             |KEYWORD        |32766          |2147483647     |null           |null           |1              |null           |null           |12             |0               |2147483647       |2               |YES            |null           |null           |null           |null            |NO              |NO                
-integTest        |null           |test_emp       |emp_no                |4              |INTEGER        |11             |4              |null           |10             |1              |null           |null           |4              |0               |null             |4               |YES            |null           |null           |null           |null            |NO              |NO                
-integTest        |null           |test_emp       |first_name            |12             |TEXT           |2147483647     |2147483647     |null           |null           |1              |null           |null           |12             |0               |2147483647       |5               |YES            |null           |null           |null           |null            |NO              |NO                
-integTest        |null           |test_emp       |first_name.keyword    |12             |KEYWORD        |32766          |2147483647     |null           |null           |1              |null           |null           |12             |0               |2147483647       |6               |YES            |null           |null           |null           |null            |NO              |NO                
-integTest        |null           |test_emp       |gender                |12             |KEYWORD        |32766          |2147483647     |null           |null           |1              |null           |null           |12             |0               |2147483647       |7               |YES            |null           |null           |null           |null            |NO              |NO                
-integTest        |null           |test_emp       |hire_date             |93             |DATETIME       |34             |8              |null           |null           |1              |null           |null           |9              |3               |null             |8               |YES            |null           |null           |null           |null            |NO              |NO                
-integTest        |null           |test_emp       |languages             |-6             |BYTE           |5              |1              |null           |10             |1              |null           |null           |-6             |0               |null             |9               |YES            |null           |null           |null           |null            |NO              |NO                
-integTest        |null           |test_emp       |last_name             |12             |TEXT           |2147483647     |2147483647     |null           |null           |1              |null           |null           |12             |0               |2147483647       |10              |YES            |null           |null           |null           |null            |NO              |NO                
-integTest        |null           |test_emp       |last_name.keyword     |12             |KEYWORD        |32766          |2147483647     |null           |null           |1              |null           |null           |12             |0               |2147483647       |11              |YES            |null           |null           |null           |null            |NO              |NO                
-integTest        |null           |test_emp       |salary                |4              |INTEGER        |11             |4              |null           |10             |1              |null           |null           |4              |0               |null             |12              |YES            |null           |null           |null           |null            |NO              |NO                                
+integTest        |null           |test_emp       |birth_date        |93             |DATETIME       |34             |8              |null           |null           |1              |null           |null           |9              |3               |null             |1               |YES            |null           |null           |null           |null            |NO              |NO                
+integTest        |null           |test_emp       |emp_no            |4              |INTEGER        |11             |4              |null           |10             |1              |null           |null           |4              |0               |null             |3               |YES            |null           |null           |null           |null            |NO              |NO                
+integTest        |null           |test_emp       |first_name        |12             |TEXT           |2147483647     |2147483647     |null           |null           |1              |null           |null           |12             |0               |2147483647       |4               |YES            |null           |null           |null           |null            |NO              |NO                
+integTest        |null           |test_emp       |first_name.keyword|12             |KEYWORD        |32766          |2147483647     |null           |null           |1              |null           |null           |12             |0               |2147483647       |5               |YES            |null           |null           |null           |null            |NO              |NO                
+integTest        |null           |test_emp       |gender            |12             |KEYWORD        |32766          |2147483647     |null           |null           |1              |null           |null           |12             |0               |2147483647       |6               |YES            |null           |null           |null           |null            |NO              |NO                
+integTest        |null           |test_emp       |hire_date         |93             |DATETIME       |34             |8              |null           |null           |1              |null           |null           |9              |3               |null             |7               |YES            |null           |null           |null           |null            |NO              |NO                
+integTest        |null           |test_emp       |languages         |-6             |BYTE           |5              |1              |null           |10             |1              |null           |null           |-6             |0               |null             |8               |YES            |null           |null           |null           |null            |NO              |NO                
+integTest        |null           |test_emp       |last_name         |12             |TEXT           |2147483647     |2147483647     |null           |null           |1              |null           |null           |12             |0               |2147483647       |9               |YES            |null           |null           |null           |null            |NO              |NO                
+integTest        |null           |test_emp       |last_name.keyword |12             |KEYWORD        |32766          |2147483647     |null           |null           |1              |null           |null           |12             |0               |2147483647       |10              |YES            |null           |null           |null           |null            |NO              |NO                
+integTest        |null           |test_emp       |name              |12             |KEYWORD        |32766          |2147483647     |null           |null           |1              |null           |null           |12             |0               |2147483647       |11              |YES            |null           |null           |null           |null            |NO              |NO                
+integTest        |null           |test_emp       |salary            |4              |INTEGER        |11             |4              |null           |10             |1              |null           |null           |4              |0               |null             |12              |YES            |null           |null           |null           |null            |NO              |NO                                                
 ;
 
 sysColumnsWithTableLikeNoEscape
@@ -30,22 +30,22 @@ SYS COLUMNS TABLE LIKE 'test_emp';
 
    TABLE_CAT:s |  TABLE_SCHEM:s|  TABLE_NAME:s |    COLUMN_NAME:s   |   DATA_TYPE:i |   TYPE_NAME:s |  COLUMN_SIZE:i| BUFFER_LENGTH:i|DECIMAL_DIGITS:i|NUM_PREC_RADIX:i | NULLABLE:i|    REMARKS:s  |  COLUMN_DEF:s |SQL_DATA_TYPE:i|SQL_DATETIME_SUB:i|CHAR_OCTET_LENGTH:i|ORDINAL_POSITION:i|IS_NULLABLE:s|SCOPE_CATALOG:s|SCOPE_SCHEMA:s|SCOPE_TABLE:s|SOURCE_DATA_TYPE:sh|IS_AUTOINCREMENT:s|IS_GENERATEDCOLUMN:s
 ---------------+---------------+---------------+--------------------+---------------+---------------+---------------+---------------+---------------+---------------+---------------+---------------+---------------+---------------+----------------+-----------------+----------------+---------------+---------------+---------------+---------------+----------------+----------------+------------------
-integTest        |null           |test_emp       |birth_date            |93             |DATETIME       |34             |8              |null           |null           |1              |null           |null           |9              |3               |null             |1               |YES            |null           |null           |null           |null            |NO              |NO                
-integTest        |null           |test_emp       |birth_date_day_of_week|12             |KEYWORD        |32766          |2147483647     |null           |null           |1              |null           |null           |12             |0               |2147483647       |2               |YES            |null           |null           |null           |null            |NO              |NO                
-integTest        |null           |test_emp       |emp_no                |4              |INTEGER        |11             |4              |null           |10             |1              |null           |null           |4              |0               |null             |4               |YES            |null           |null           |null           |null            |NO              |NO                
-integTest        |null           |test_emp       |extra.info.gender     |12             |KEYWORD        |32766          |2147483647     |null           |null           |1              |null           |null           |12             |0               |2147483647       |7               |YES            |null           |null           |null           |null            |NO              |NO                
-integTest        |null           |test_emp       |extra_gender          |12             |KEYWORD        |32766          |2147483647     |null           |null           |1              |null           |null           |12             |0               |2147483647       |8               |YES            |null           |null           |null           |null            |NO              |NO                
-integTest        |null           |test_emp       |extra_no              |4              |INTEGER        |11             |4              |null           |10             |1              |null           |null           |4              |0               |null             |9               |YES            |null           |null           |null           |null            |NO              |NO                
-integTest        |null           |test_emp       |first_name            |12             |TEXT           |2147483647     |2147483647     |null           |null           |1              |null           |null           |12             |0               |2147483647       |10              |YES            |null           |null           |null           |null            |NO              |NO                
-integTest        |null           |test_emp       |first_name.keyword    |12             |KEYWORD        |32766          |2147483647     |null           |null           |1              |null           |null           |12             |0               |2147483647       |11              |YES            |null           |null           |null           |null            |NO              |NO                
-integTest        |null           |test_emp       |gender                |12             |KEYWORD        |32766          |2147483647     |null           |null           |1              |null           |null           |12             |0               |2147483647       |12              |YES            |null           |null           |null           |null            |NO              |NO                
-integTest        |null           |test_emp       |hire_date             |93             |DATETIME       |34             |8              |null           |null           |1              |null           |null           |9              |3               |null             |13              |YES            |null           |null           |null           |null            |NO              |NO                
-integTest        |null           |test_emp       |languages             |-6             |BYTE           |5              |1              |null           |10             |1              |null           |null           |-6             |0               |null             |14              |YES            |null           |null           |null           |null            |NO              |NO                
-integTest        |null           |test_emp       |last_name             |12             |TEXT           |2147483647     |2147483647     |null           |null           |1              |null           |null           |12             |0               |2147483647       |15              |YES            |null           |null           |null           |null            |NO              |NO                
-integTest        |null           |test_emp       |last_name.keyword     |12             |KEYWORD        |32766          |2147483647     |null           |null           |1              |null           |null           |12             |0               |2147483647       |16              |YES            |null           |null           |null           |null            |NO              |NO                
-integTest        |null           |test_emp       |null_constant         |12             |KEYWORD        |32766          |2147483647     |null           |null           |1              |null           |null           |12             |0               |2147483647       |17              |YES            |null           |null           |null           |null            |NO              |NO                
-integTest        |null           |test_emp       |salary                |4              |INTEGER        |11             |4              |null           |10             |1              |null           |null           |4              |0               |null             |18              |YES            |null           |null           |null           |null            |NO              |NO                
-integTest        |null           |test_emp       |wildcard_name         |12             |KEYWORD        |32766          |2147483647     |null           |null           |1              |null           |null           |12             |0               |2147483647       |19              |YES            |null           |null           |null           |null            |NO              |NO                                                
+integTest        |null           |test_emp       |birth_date        |93             |DATETIME       |34             |8              |null           |null           |1              |null           |null           |9              |3               |null             |1               |YES            |null           |null           |null           |null            |NO              |NO                
+integTest        |null           |test_emp       |emp_no            |4              |INTEGER        |11             |4              |null           |10             |1              |null           |null           |4              |0               |null             |3               |YES            |null           |null           |null           |null            |NO              |NO                
+integTest        |null           |test_emp       |extra.info.gender |12             |KEYWORD        |32766          |2147483647     |null           |null           |1              |null           |null           |12             |0               |2147483647       |6               |YES            |null           |null           |null           |null            |NO              |NO                
+integTest        |null           |test_emp       |extra_gender      |12             |KEYWORD        |32766          |2147483647     |null           |null           |1              |null           |null           |12             |0               |2147483647       |7               |YES            |null           |null           |null           |null            |NO              |NO                
+integTest        |null           |test_emp       |extra_no          |4              |INTEGER        |11             |4              |null           |10             |1              |null           |null           |4              |0               |null             |8               |YES            |null           |null           |null           |null            |NO              |NO                
+integTest        |null           |test_emp       |first_name        |12             |TEXT           |2147483647     |2147483647     |null           |null           |1              |null           |null           |12             |0               |2147483647       |9               |YES            |null           |null           |null           |null            |NO              |NO                
+integTest        |null           |test_emp       |first_name.keyword|12             |KEYWORD        |32766          |2147483647     |null           |null           |1              |null           |null           |12             |0               |2147483647       |10              |YES            |null           |null           |null           |null            |NO              |NO                
+integTest        |null           |test_emp       |gender            |12             |KEYWORD        |32766          |2147483647     |null           |null           |1              |null           |null           |12             |0               |2147483647       |11              |YES            |null           |null           |null           |null            |NO              |NO                
+integTest        |null           |test_emp       |hire_date         |93             |DATETIME       |34             |8              |null           |null           |1              |null           |null           |9              |3               |null             |12              |YES            |null           |null           |null           |null            |NO              |NO                
+integTest        |null           |test_emp       |languages         |-6             |BYTE           |5              |1              |null           |10             |1              |null           |null           |-6             |0               |null             |13              |YES            |null           |null           |null           |null            |NO              |NO                
+integTest        |null           |test_emp       |last_name         |12             |TEXT           |2147483647     |2147483647     |null           |null           |1              |null           |null           |12             |0               |2147483647       |14              |YES            |null           |null           |null           |null            |NO              |NO                
+integTest        |null           |test_emp       |last_name.keyword |12             |KEYWORD        |32766          |2147483647     |null           |null           |1              |null           |null           |12             |0               |2147483647       |15              |YES            |null           |null           |null           |null            |NO              |NO                
+integTest        |null           |test_emp       |name              |12             |KEYWORD        |32766          |2147483647     |null           |null           |1              |null           |null           |12             |0               |2147483647       |16              |YES            |null           |null           |null           |null            |NO              |NO                
+integTest        |null           |test_emp       |null_constant     |12             |KEYWORD        |32766          |2147483647     |null           |null           |1              |null           |null           |12             |0               |2147483647       |17              |YES            |null           |null           |null           |null            |NO              |NO                
+integTest        |null           |test_emp       |salary            |4              |INTEGER        |11             |4              |null           |10             |1              |null           |null           |4              |0               |null             |18              |YES            |null           |null           |null           |null            |NO              |NO                
+integTest        |null           |test_emp       |wildcard_name     |12             |KEYWORD        |32766          |2147483647     |null           |null           |1              |null           |null           |12             |0               |2147483647       |19              |YES            |null           |null           |null           |null            |NO              |NO                                                
 ;
 
 sysColumnsWithCatalogAndLike
@@ -53,22 +53,22 @@ SYS COLUMNS CATALOG 'integTest' TABLE LIKE 'test\_emp\_copy' ESCAPE '\';
 
    TABLE_CAT:s |  TABLE_SCHEM:s|  TABLE_NAME:s |    COLUMN_NAME:s  |   DATA_TYPE:i |   TYPE_NAME:s |  COLUMN_SIZE:i| BUFFER_LENGTH:i|DECIMAL_DIGITS:i|NUM_PREC_RADIX:i | NULLABLE:i|    REMARKS:s  |  COLUMN_DEF:s |SQL_DATA_TYPE:i|SQL_DATETIME_SUB:i|CHAR_OCTET_LENGTH:i|ORDINAL_POSITION:i|IS_NULLABLE:s|SCOPE_CATALOG:s|SCOPE_SCHEMA:s|SCOPE_TABLE:s|SOURCE_DATA_TYPE:sh|IS_AUTOINCREMENT:s|IS_GENERATEDCOLUMN:s
 ---------------+---------------+---------------+-------------------+---------------+---------------+---------------+---------------+---------------+---------------+---------------+---------------+---------------+---------------+----------------+-----------------+----------------+---------------+---------------+---------------+---------------+----------------+----------------+------------------
-integTest        |null           |test_emp_copy  |birth_date            |93             |DATETIME       |34             |8              |null           |null           |1              |null           |null           |9              |3               |null             |1               |YES            |null           |null           |null           |null            |NO              |NO                
-integTest        |null           |test_emp_copy  |birth_date_day_of_week|12             |KEYWORD        |32766          |2147483647     |null           |null           |1              |null           |null           |12             |0               |2147483647       |2               |YES            |null           |null           |null           |null            |NO              |NO                
-integTest        |null           |test_emp_copy  |emp_no                |4              |INTEGER        |11             |4              |null           |10             |1              |null           |null           |4              |0               |null             |4               |YES            |null           |null           |null           |null            |NO              |NO                
-integTest        |null           |test_emp_copy  |extra.info.gender     |12             |KEYWORD        |32766          |2147483647     |null           |null           |1              |null           |null           |12             |0               |2147483647       |7               |YES            |null           |null           |null           |null            |NO              |NO                
-integTest        |null           |test_emp_copy  |extra_gender          |12             |KEYWORD        |32766          |2147483647     |null           |null           |1              |null           |null           |12             |0               |2147483647       |8               |YES            |null           |null           |null           |null            |NO              |NO                
-integTest        |null           |test_emp_copy  |extra_no              |4              |INTEGER        |11             |4              |null           |10             |1              |null           |null           |4              |0               |null             |9               |YES            |null           |null           |null           |null            |NO              |NO                
-integTest        |null           |test_emp_copy  |first_name            |12             |TEXT           |2147483647     |2147483647     |null           |null           |1              |null           |null           |12             |0               |2147483647       |10              |YES            |null           |null           |null           |null            |NO              |NO                
-integTest        |null           |test_emp_copy  |first_name.keyword    |12             |KEYWORD        |32766          |2147483647     |null           |null           |1              |null           |null           |12             |0               |2147483647       |11              |YES            |null           |null           |null           |null            |NO              |NO                
-integTest        |null           |test_emp_copy  |gender                |12             |KEYWORD        |32766          |2147483647     |null           |null           |1              |null           |null           |12             |0               |2147483647       |12              |YES            |null           |null           |null           |null            |NO              |NO                
-integTest        |null           |test_emp_copy  |hire_date             |93             |DATETIME       |34             |8              |null           |null           |1              |null           |null           |9              |3               |null             |13              |YES            |null           |null           |null           |null            |NO              |NO                
-integTest        |null           |test_emp_copy  |languages             |-6             |BYTE           |5              |1              |null           |10             |1              |null           |null           |-6             |0               |null             |14              |YES            |null           |null           |null           |null            |NO              |NO                
-integTest        |null           |test_emp_copy  |last_name             |12             |TEXT           |2147483647     |2147483647     |null           |null           |1              |null           |null           |12             |0               |2147483647       |15              |YES            |null           |null           |null           |null            |NO              |NO                
-integTest        |null           |test_emp_copy  |last_name.keyword     |12             |KEYWORD        |32766          |2147483647     |null           |null           |1              |null           |null           |12             |0               |2147483647       |16              |YES            |null           |null           |null           |null            |NO              |NO                
-integTest        |null           |test_emp_copy  |null_constant         |12             |KEYWORD        |32766          |2147483647     |null           |null           |1              |null           |null           |12             |0               |2147483647       |17              |YES            |null           |null           |null           |null            |NO              |NO                
-integTest        |null           |test_emp_copy  |salary                |4              |INTEGER        |11             |4              |null           |10             |1              |null           |null           |4              |0               |null             |18              |YES            |null           |null           |null           |null            |NO              |NO                
-integTest        |null           |test_emp_copy  |wildcard_name         |12             |KEYWORD        |32766          |2147483647     |null           |null           |1              |null           |null           |12             |0               |2147483647       |19              |YES            |null           |null           |null           |null            |NO              |NO                                                
+integTest        |null           |test_emp_copy  |birth_date        |93             |DATETIME       |34             |8              |null           |null           |1              |null           |null           |9              |3               |null             |1               |YES            |null           |null           |null           |null            |NO              |NO                
+integTest        |null           |test_emp_copy  |emp_no            |4              |INTEGER        |11             |4              |null           |10             |1              |null           |null           |4              |0               |null             |3               |YES            |null           |null           |null           |null            |NO              |NO                
+integTest        |null           |test_emp_copy  |extra.info.gender |12             |KEYWORD        |32766          |2147483647     |null           |null           |1              |null           |null           |12             |0               |2147483647       |6               |YES            |null           |null           |null           |null            |NO              |NO                
+integTest        |null           |test_emp_copy  |extra_gender      |12             |KEYWORD        |32766          |2147483647     |null           |null           |1              |null           |null           |12             |0               |2147483647       |7               |YES            |null           |null           |null           |null            |NO              |NO                
+integTest        |null           |test_emp_copy  |extra_no          |4              |INTEGER        |11             |4              |null           |10             |1              |null           |null           |4              |0               |null             |8               |YES            |null           |null           |null           |null            |NO              |NO                
+integTest        |null           |test_emp_copy  |first_name        |12             |TEXT           |2147483647     |2147483647     |null           |null           |1              |null           |null           |12             |0               |2147483647       |9               |YES            |null           |null           |null           |null            |NO              |NO                
+integTest        |null           |test_emp_copy  |first_name.keyword|12             |KEYWORD        |32766          |2147483647     |null           |null           |1              |null           |null           |12             |0               |2147483647       |10              |YES            |null           |null           |null           |null            |NO              |NO                
+integTest        |null           |test_emp_copy  |gender            |12             |KEYWORD        |32766          |2147483647     |null           |null           |1              |null           |null           |12             |0               |2147483647       |11              |YES            |null           |null           |null           |null            |NO              |NO                
+integTest        |null           |test_emp_copy  |hire_date         |93             |DATETIME       |34             |8              |null           |null           |1              |null           |null           |9              |3               |null             |12              |YES            |null           |null           |null           |null            |NO              |NO                
+integTest        |null           |test_emp_copy  |languages         |-6             |BYTE           |5              |1              |null           |10             |1              |null           |null           |-6             |0               |null             |13              |YES            |null           |null           |null           |null            |NO              |NO                
+integTest        |null           |test_emp_copy  |last_name         |12             |TEXT           |2147483647     |2147483647     |null           |null           |1              |null           |null           |12             |0               |2147483647       |14              |YES            |null           |null           |null           |null            |NO              |NO                
+integTest        |null           |test_emp_copy  |last_name.keyword |12             |KEYWORD        |32766          |2147483647     |null           |null           |1              |null           |null           |12             |0               |2147483647       |15              |YES            |null           |null           |null           |null            |NO              |NO                
+integTest        |null           |test_emp_copy  |name              |12             |KEYWORD        |32766          |2147483647     |null           |null           |1              |null           |null           |12             |0               |2147483647       |16              |YES            |null           |null           |null           |null            |NO              |NO                
+integTest        |null           |test_emp_copy  |null_constant     |12             |KEYWORD        |32766          |2147483647     |null           |null           |1              |null           |null           |12             |0               |2147483647       |17              |YES            |null           |null           |null           |null            |NO              |NO                
+integTest        |null           |test_emp_copy  |salary            |4              |INTEGER        |11             |4              |null           |10             |1              |null           |null           |4              |0               |null             |18              |YES            |null           |null           |null           |null            |NO              |NO                
+integTest        |null           |test_emp_copy  |wildcard_name     |12             |KEYWORD        |32766          |2147483647     |null           |null           |1              |null           |null           |12             |0               |2147483647       |19              |YES            |null           |null           |null           |null            |NO              |NO                                                
 ;
 
 sysColumnsOnAliasWithTableLike
@@ -76,22 +76,22 @@ SYS COLUMNS TABLE LIKE 'test\_alias' ESCAPE '\';
 
    TABLE_CAT:s |  TABLE_SCHEM:s|  TABLE_NAME:s |    COLUMN_NAME:s   |   DATA_TYPE:i |   TYPE_NAME:s |  COLUMN_SIZE:i| BUFFER_LENGTH:i|DECIMAL_DIGITS:i|NUM_PREC_RADIX:i | NULLABLE:i|    REMARKS:s  |  COLUMN_DEF:s |SQL_DATA_TYPE:i|SQL_DATETIME_SUB:i|CHAR_OCTET_LENGTH:i|ORDINAL_POSITION:i|IS_NULLABLE:s|SCOPE_CATALOG:s|SCOPE_SCHEMA:s|SCOPE_TABLE:s|SOURCE_DATA_TYPE:sh|IS_AUTOINCREMENT:s|IS_GENERATEDCOLUMN:s
 ---------------+---------------+---------------+--------------------+---------------+---------------+---------------+---------------+---------------+---------------+---------------+---------------+---------------+---------------+----------------+-----------------+----------------+---------------+---------------+---------------+---------------+----------------+----------------+------------------
-integTest        |null           |test_alias     |birth_date            |93             |DATETIME       |34             |8              |null           |null           |1              |null           |null           |9              |3               |null             |1               |YES            |null           |null           |null           |null            |NO              |NO                
-integTest        |null           |test_alias     |birth_date_day_of_week|12             |KEYWORD        |32766          |2147483647     |null           |null           |1              |null           |null           |12             |0               |2147483647       |2               |YES            |null           |null           |null           |null            |NO              |NO                
-integTest        |null           |test_alias     |emp_no                |4              |INTEGER        |11             |4              |null           |10             |1              |null           |null           |4              |0               |null             |4               |YES            |null           |null           |null           |null            |NO              |NO                
-integTest        |null           |test_alias     |extra.info.gender     |12             |KEYWORD        |32766          |2147483647     |null           |null           |1              |null           |null           |12             |0               |2147483647       |7               |YES            |null           |null           |null           |null            |NO              |NO                
-integTest        |null           |test_alias     |extra_gender          |12             |KEYWORD        |32766          |2147483647     |null           |null           |1              |null           |null           |12             |0               |2147483647       |8               |YES            |null           |null           |null           |null            |NO              |NO                
-integTest        |null           |test_alias     |extra_no              |4              |INTEGER        |11             |4              |null           |10             |1              |null           |null           |4              |0               |null             |9               |YES            |null           |null           |null           |null            |NO              |NO                
-integTest        |null           |test_alias     |first_name            |12             |TEXT           |2147483647     |2147483647     |null           |null           |1              |null           |null           |12             |0               |2147483647       |10              |YES            |null           |null           |null           |null            |NO              |NO                
-integTest        |null           |test_alias     |first_name.keyword    |12             |KEYWORD        |32766          |2147483647     |null           |null           |1              |null           |null           |12             |0               |2147483647       |11              |YES            |null           |null           |null           |null            |NO              |NO                
-integTest        |null           |test_alias     |gender                |12             |KEYWORD        |32766          |2147483647     |null           |null           |1              |null           |null           |12             |0               |2147483647       |12              |YES            |null           |null           |null           |null            |NO              |NO                
-integTest        |null           |test_alias     |hire_date             |93             |DATETIME       |34             |8              |null           |null           |1              |null           |null           |9              |3               |null             |13              |YES            |null           |null           |null           |null            |NO              |NO                
-integTest        |null           |test_alias     |languages             |-6             |BYTE           |5              |1              |null           |10             |1              |null           |null           |-6             |0               |null             |14              |YES            |null           |null           |null           |null            |NO              |NO                
-integTest        |null           |test_alias     |last_name             |12             |TEXT           |2147483647     |2147483647     |null           |null           |1              |null           |null           |12             |0               |2147483647       |15              |YES            |null           |null           |null           |null            |NO              |NO                
-integTest        |null           |test_alias     |last_name.keyword     |12             |KEYWORD        |32766          |2147483647     |null           |null           |1              |null           |null           |12             |0               |2147483647       |16              |YES            |null           |null           |null           |null            |NO              |NO                
-integTest        |null           |test_alias     |null_constant         |12             |KEYWORD        |32766          |2147483647     |null           |null           |1              |null           |null           |12             |0               |2147483647       |17              |YES            |null           |null           |null           |null            |NO              |NO                
-integTest        |null           |test_alias     |salary                |4              |INTEGER        |11             |4              |null           |10             |1              |null           |null           |4              |0               |null             |18              |YES            |null           |null           |null           |null            |NO              |NO                
-integTest        |null           |test_alias     |wildcard_name         |12             |KEYWORD        |32766          |2147483647     |null           |null           |1              |null           |null           |12             |0               |2147483647       |19              |YES            |null           |null           |null           |null            |NO              |NO                                                
+integTest        |null           |test_alias     |birth_date        |93             |DATETIME       |34             |8              |null           |null           |1              |null           |null           |9              |3               |null             |1               |YES            |null           |null           |null           |null            |NO              |NO                
+integTest        |null           |test_alias     |emp_no            |4              |INTEGER        |11             |4              |null           |10             |1              |null           |null           |4              |0               |null             |3               |YES            |null           |null           |null           |null            |NO              |NO                
+integTest        |null           |test_alias     |extra.info.gender |12             |KEYWORD        |32766          |2147483647     |null           |null           |1              |null           |null           |12             |0               |2147483647       |6               |YES            |null           |null           |null           |null            |NO              |NO                
+integTest        |null           |test_alias     |extra_gender      |12             |KEYWORD        |32766          |2147483647     |null           |null           |1              |null           |null           |12             |0               |2147483647       |7               |YES            |null           |null           |null           |null            |NO              |NO                
+integTest        |null           |test_alias     |extra_no          |4              |INTEGER        |11             |4              |null           |10             |1              |null           |null           |4              |0               |null             |8               |YES            |null           |null           |null           |null            |NO              |NO                
+integTest        |null           |test_alias     |first_name        |12             |TEXT           |2147483647     |2147483647     |null           |null           |1              |null           |null           |12             |0               |2147483647       |9               |YES            |null           |null           |null           |null            |NO              |NO                
+integTest        |null           |test_alias     |first_name.keyword|12             |KEYWORD        |32766          |2147483647     |null           |null           |1              |null           |null           |12             |0               |2147483647       |10              |YES            |null           |null           |null           |null            |NO              |NO                
+integTest        |null           |test_alias     |gender            |12             |KEYWORD        |32766          |2147483647     |null           |null           |1              |null           |null           |12             |0               |2147483647       |11              |YES            |null           |null           |null           |null            |NO              |NO                
+integTest        |null           |test_alias     |hire_date         |93             |DATETIME       |34             |8              |null           |null           |1              |null           |null           |9              |3               |null             |12              |YES            |null           |null           |null           |null            |NO              |NO                
+integTest        |null           |test_alias     |languages         |-6             |BYTE           |5              |1              |null           |10             |1              |null           |null           |-6             |0               |null             |13              |YES            |null           |null           |null           |null            |NO              |NO                
+integTest        |null           |test_alias     |last_name         |12             |TEXT           |2147483647     |2147483647     |null           |null           |1              |null           |null           |12             |0               |2147483647       |14              |YES            |null           |null           |null           |null            |NO              |NO                
+integTest        |null           |test_alias     |last_name.keyword |12             |KEYWORD        |32766          |2147483647     |null           |null           |1              |null           |null           |12             |0               |2147483647       |15              |YES            |null           |null           |null           |null            |NO              |NO                
+integTest        |null           |test_alias     |name              |12             |KEYWORD        |32766          |2147483647     |null           |null           |1              |null           |null           |12             |0               |2147483647       |16              |YES            |null           |null           |null           |null            |NO              |NO                
+integTest        |null           |test_alias     |null_constant     |12             |KEYWORD        |32766          |2147483647     |null           |null           |1              |null           |null           |12             |0               |2147483647       |17              |YES            |null           |null           |null           |null            |NO              |NO                
+integTest        |null           |test_alias     |salary            |4              |INTEGER        |11             |4              |null           |10             |1              |null           |null           |4              |0               |null             |18              |YES            |null           |null           |null           |null            |NO              |NO                
+integTest        |null           |test_alias     |wildcard_name     |12             |KEYWORD        |32766          |2147483647     |null           |null           |1              |null           |null           |12             |0               |2147483647       |19              |YES            |null           |null           |null           |null            |NO              |NO                                                
 ;
 
 sysColumnsAllTables
@@ -99,74 +99,74 @@ SYS COLUMNS TABLE LIKE '%';
 
     TABLE_CAT:s  |  TABLE_SCHEM:s|  TABLE_NAME:s |  COLUMN_NAME:s   |   DATA_TYPE:i |   TYPE_NAME:s  |  COLUMN_SIZE:i|BUFFER_LENGTH:i|DECIMAL_DIGITS:i|NUM_PREC_RADIX:i | NULLABLE:i|    REMARKS:s  |  COLUMN_DEF:s |SQL_DATA_TYPE:i|SQL_DATETIME_SUB:i|CHAR_OCTET_LENGTH:i|ORDINAL_POSITION:i|IS_NULLABLE:s|SCOPE_CATALOG:s|SCOPE_SCHEMA:s|SCOPE_TABLE:s|SOURCE_DATA_TYPE:sh|IS_AUTOINCREMENT:s|IS_GENERATEDCOLUMN:s
 -----------------+---------------+---------------+------------------+---------------+----------------+---------------+---------------+----------------+---------------+---------------+---------------+---------------+---------------+----------------+-----------------+----------------+---------------+---------------+---------------+---------------+----------------+----------------+------------------
-integTest        |null           |logs           |@timestamp            |93             |DATETIME       |34             |8              |null           |null           |1              |null           |null           |9              |3               |null             |1               |YES            |null           |null           |null           |null            |NO              |NO                
-integTest        |null           |logs           |bytes_in              |4              |INTEGER        |11             |4              |null           |10             |1              |null           |null           |4              |0               |null             |2               |YES            |null           |null           |null           |null            |NO              |NO                
-integTest        |null           |logs           |bytes_out             |4              |INTEGER        |11             |4              |null           |10             |1              |null           |null           |4              |0               |null             |3               |YES            |null           |null           |null           |null            |NO              |NO                
-integTest        |null           |logs           |client_ip             |12             |IP             |45             |45             |null           |null           |1              |null           |null           |12             |0               |null             |4               |YES            |null           |null           |null           |null            |NO              |NO                
-integTest        |null           |logs           |client_port           |4              |INTEGER        |11             |4              |null           |10             |1              |null           |null           |4              |0               |null             |5               |YES            |null           |null           |null           |null            |NO              |NO                
-integTest        |null           |logs           |dest_ip               |12             |IP             |45             |45             |null           |null           |1              |null           |null           |12             |0               |null             |6               |YES            |null           |null           |null           |null            |NO              |NO                
-integTest        |null           |logs           |id                    |4              |INTEGER        |11             |4              |null           |10             |1              |null           |null           |4              |0               |null             |7               |YES            |null           |null           |null           |null            |NO              |NO                
-integTest        |null           |logs           |status                |12             |KEYWORD        |32766          |2147483647     |null           |null           |1              |null           |null           |12             |0               |2147483647       |8               |YES            |null           |null           |null           |null            |NO              |NO                
-integTest        |null           |logs_nanos     |@timestamp            |93             |DATETIME       |34             |8              |null           |null           |1              |null           |null           |9              |3               |null             |1               |YES            |null           |null           |null           |null            |NO              |NO                
-integTest        |null           |logs_nanos     |id                    |4              |INTEGER        |11             |4              |null           |10             |1              |null           |null           |4              |0               |null             |2               |YES            |null           |null           |null           |null            |NO              |NO                
-integTest        |null           |logs_nanos     |status                |12             |KEYWORD        |32766          |2147483647     |null           |null           |1              |null           |null           |12             |0               |2147483647       |3               |YES            |null           |null           |null           |null            |NO              |NO                
-integTest        |null           |test_alias     |birth_date            |93             |DATETIME       |34             |8              |null           |null           |1              |null           |null           |9              |3               |null             |1               |YES            |null           |null           |null           |null            |NO              |NO                
-integTest        |null           |test_alias     |birth_date_day_of_week|12             |KEYWORD        |32766          |2147483647     |null           |null           |1              |null           |null           |12             |0               |2147483647       |2               |YES            |null           |null           |null           |null            |NO              |NO                
-integTest        |null           |test_alias     |emp_no                |4              |INTEGER        |11             |4              |null           |10             |1              |null           |null           |4              |0               |null             |4               |YES            |null           |null           |null           |null            |NO              |NO                
-integTest        |null           |test_alias     |extra.info.gender     |12             |KEYWORD        |32766          |2147483647     |null           |null           |1              |null           |null           |12             |0               |2147483647       |7               |YES            |null           |null           |null           |null            |NO              |NO                
-integTest        |null           |test_alias     |extra_gender          |12             |KEYWORD        |32766          |2147483647     |null           |null           |1              |null           |null           |12             |0               |2147483647       |8               |YES            |null           |null           |null           |null            |NO              |NO                
-integTest        |null           |test_alias     |extra_no              |4              |INTEGER        |11             |4              |null           |10             |1              |null           |null           |4              |0               |null             |9               |YES            |null           |null           |null           |null            |NO              |NO                
-integTest        |null           |test_alias     |first_name            |12             |TEXT           |2147483647     |2147483647     |null           |null           |1              |null           |null           |12             |0               |2147483647       |10              |YES            |null           |null           |null           |null            |NO              |NO                
-integTest        |null           |test_alias     |first_name.keyword    |12             |KEYWORD        |32766          |2147483647     |null           |null           |1              |null           |null           |12             |0               |2147483647       |11              |YES            |null           |null           |null           |null            |NO              |NO                
-integTest        |null           |test_alias     |gender                |12             |KEYWORD        |32766          |2147483647     |null           |null           |1              |null           |null           |12             |0               |2147483647       |12              |YES            |null           |null           |null           |null            |NO              |NO                
-integTest        |null           |test_alias     |hire_date             |93             |DATETIME       |34             |8              |null           |null           |1              |null           |null           |9              |3               |null             |13              |YES            |null           |null           |null           |null            |NO              |NO                
-integTest        |null           |test_alias     |languages             |-6             |BYTE           |5              |1              |null           |10             |1              |null           |null           |-6             |0               |null             |14              |YES            |null           |null           |null           |null            |NO              |NO                
-integTest        |null           |test_alias     |last_name             |12             |TEXT           |2147483647     |2147483647     |null           |null           |1              |null           |null           |12             |0               |2147483647       |15              |YES            |null           |null           |null           |null            |NO              |NO                
-integTest        |null           |test_alias     |last_name.keyword     |12             |KEYWORD        |32766          |2147483647     |null           |null           |1              |null           |null           |12             |0               |2147483647       |16              |YES            |null           |null           |null           |null            |NO              |NO                
-integTest        |null           |test_alias     |null_constant         |12             |KEYWORD        |32766          |2147483647     |null           |null           |1              |null           |null           |12             |0               |2147483647       |17              |YES            |null           |null           |null           |null            |NO              |NO                
-integTest        |null           |test_alias     |salary                |4              |INTEGER        |11             |4              |null           |10             |1              |null           |null           |4              |0               |null             |18              |YES            |null           |null           |null           |null            |NO              |NO                
-integTest        |null           |test_alias     |wildcard_name         |12             |KEYWORD        |32766          |2147483647     |null           |null           |1              |null           |null           |12             |0               |2147483647       |19              |YES            |null           |null           |null           |null            |NO              |NO                
-integTest        |null           |test_alias_emp |birth_date            |93             |DATETIME       |34             |8              |null           |null           |1              |null           |null           |9              |3               |null             |1               |YES            |null           |null           |null           |null            |NO              |NO                
-integTest        |null           |test_alias_emp |birth_date_day_of_week|12             |KEYWORD        |32766          |2147483647     |null           |null           |1              |null           |null           |12             |0               |2147483647       |2               |YES            |null           |null           |null           |null            |NO              |NO                
-integTest        |null           |test_alias_emp |emp_no                |4              |INTEGER        |11             |4              |null           |10             |1              |null           |null           |4              |0               |null             |4               |YES            |null           |null           |null           |null            |NO              |NO                
-integTest        |null           |test_alias_emp |extra.info.gender     |12             |KEYWORD        |32766          |2147483647     |null           |null           |1              |null           |null           |12             |0               |2147483647       |7               |YES            |null           |null           |null           |null            |NO              |NO                
-integTest        |null           |test_alias_emp |extra_gender          |12             |KEYWORD        |32766          |2147483647     |null           |null           |1              |null           |null           |12             |0               |2147483647       |8               |YES            |null           |null           |null           |null            |NO              |NO                
-integTest        |null           |test_alias_emp |extra_no              |4              |INTEGER        |11             |4              |null           |10             |1              |null           |null           |4              |0               |null             |9               |YES            |null           |null           |null           |null            |NO              |NO                
-integTest        |null           |test_alias_emp |first_name            |12             |TEXT           |2147483647     |2147483647     |null           |null           |1              |null           |null           |12             |0               |2147483647       |10              |YES            |null           |null           |null           |null            |NO              |NO                
-integTest        |null           |test_alias_emp |first_name.keyword    |12             |KEYWORD        |32766          |2147483647     |null           |null           |1              |null           |null           |12             |0               |2147483647       |11              |YES            |null           |null           |null           |null            |NO              |NO                
-integTest        |null           |test_alias_emp |gender                |12             |KEYWORD        |32766          |2147483647     |null           |null           |1              |null           |null           |12             |0               |2147483647       |12              |YES            |null           |null           |null           |null            |NO              |NO                
-integTest        |null           |test_alias_emp |hire_date             |93             |DATETIME       |34             |8              |null           |null           |1              |null           |null           |9              |3               |null             |13              |YES            |null           |null           |null           |null            |NO              |NO                
-integTest        |null           |test_alias_emp |languages             |-6             |BYTE           |5              |1              |null           |10             |1              |null           |null           |-6             |0               |null             |14              |YES            |null           |null           |null           |null            |NO              |NO                
-integTest        |null           |test_alias_emp |last_name             |12             |TEXT           |2147483647     |2147483647     |null           |null           |1              |null           |null           |12             |0               |2147483647       |15              |YES            |null           |null           |null           |null            |NO              |NO                
-integTest        |null           |test_alias_emp |last_name.keyword     |12             |KEYWORD        |32766          |2147483647     |null           |null           |1              |null           |null           |12             |0               |2147483647       |16              |YES            |null           |null           |null           |null            |NO              |NO                
-integTest        |null           |test_alias_emp |null_constant         |12             |KEYWORD        |32766          |2147483647     |null           |null           |1              |null           |null           |12             |0               |2147483647       |17              |YES            |null           |null           |null           |null            |NO              |NO                
-integTest        |null           |test_alias_emp |salary                |4              |INTEGER        |11             |4              |null           |10             |1              |null           |null           |4              |0               |null             |18              |YES            |null           |null           |null           |null            |NO              |NO                
-integTest        |null           |test_alias_emp |wildcard_name         |12             |KEYWORD        |32766          |2147483647     |null           |null           |1              |null           |null           |12             |0               |2147483647       |19              |YES            |null           |null           |null           |null            |NO              |NO                
-integTest        |null           |test_emp       |birth_date            |93             |DATETIME       |34             |8              |null           |null           |1              |null           |null           |9              |3               |null             |1               |YES            |null           |null           |null           |null            |NO              |NO                
-integTest        |null           |test_emp       |birth_date_day_of_week|12             |KEYWORD        |32766          |2147483647     |null           |null           |1              |null           |null           |12             |0               |2147483647       |2               |YES            |null           |null           |null           |null            |NO              |NO                
-integTest        |null           |test_emp       |emp_no                |4              |INTEGER        |11             |4              |null           |10             |1              |null           |null           |4              |0               |null             |4               |YES            |null           |null           |null           |null            |NO              |NO                
-integTest        |null           |test_emp       |first_name            |12             |TEXT           |2147483647     |2147483647     |null           |null           |1              |null           |null           |12             |0               |2147483647       |5               |YES            |null           |null           |null           |null            |NO              |NO                
-integTest        |null           |test_emp       |first_name.keyword    |12             |KEYWORD        |32766          |2147483647     |null           |null           |1              |null           |null           |12             |0               |2147483647       |6               |YES            |null           |null           |null           |null            |NO              |NO                
-integTest        |null           |test_emp       |gender                |12             |KEYWORD        |32766          |2147483647     |null           |null           |1              |null           |null           |12             |0               |2147483647       |7               |YES            |null           |null           |null           |null            |NO              |NO                
-integTest        |null           |test_emp       |hire_date             |93             |DATETIME       |34             |8              |null           |null           |1              |null           |null           |9              |3               |null             |8               |YES            |null           |null           |null           |null            |NO              |NO                
-integTest        |null           |test_emp       |languages             |-6             |BYTE           |5              |1              |null           |10             |1              |null           |null           |-6             |0               |null             |9               |YES            |null           |null           |null           |null            |NO              |NO                
-integTest        |null           |test_emp       |last_name             |12             |TEXT           |2147483647     |2147483647     |null           |null           |1              |null           |null           |12             |0               |2147483647       |10              |YES            |null           |null           |null           |null            |NO              |NO                
-integTest        |null           |test_emp       |last_name.keyword     |12             |KEYWORD        |32766          |2147483647     |null           |null           |1              |null           |null           |12             |0               |2147483647       |11              |YES            |null           |null           |null           |null            |NO              |NO                
-integTest        |null           |test_emp       |salary                |4              |INTEGER        |11             |4              |null           |10             |1              |null           |null           |4              |0               |null             |12              |YES            |null           |null           |null           |null            |NO              |NO                
-integTest        |null           |test_emp_copy  |birth_date            |93             |DATETIME       |34             |8              |null           |null           |1              |null           |null           |9              |3               |null             |1               |YES            |null           |null           |null           |null            |NO              |NO                
-integTest        |null           |test_emp_copy  |birth_date_day_of_week|12             |KEYWORD        |32766          |2147483647     |null           |null           |1              |null           |null           |12             |0               |2147483647       |2               |YES            |null           |null           |null           |null            |NO              |NO                
-integTest        |null           |test_emp_copy  |emp_no                |4              |INTEGER        |11             |4              |null           |10             |1              |null           |null           |4              |0               |null             |4               |YES            |null           |null           |null           |null            |NO              |NO                
-integTest        |null           |test_emp_copy  |extra.info.gender     |12             |KEYWORD        |32766          |2147483647     |null           |null           |1              |null           |null           |12             |0               |2147483647       |7               |YES            |null           |null           |null           |null            |NO              |NO                
-integTest        |null           |test_emp_copy  |extra_gender          |12             |KEYWORD        |32766          |2147483647     |null           |null           |1              |null           |null           |12             |0               |2147483647       |8               |YES            |null           |null           |null           |null            |NO              |NO                
-integTest        |null           |test_emp_copy  |extra_no              |4              |INTEGER        |11             |4              |null           |10             |1              |null           |null           |4              |0               |null             |9               |YES            |null           |null           |null           |null            |NO              |NO                
-integTest        |null           |test_emp_copy  |first_name            |12             |TEXT           |2147483647     |2147483647     |null           |null           |1              |null           |null           |12             |0               |2147483647       |10              |YES            |null           |null           |null           |null            |NO              |NO                
-integTest        |null           |test_emp_copy  |first_name.keyword    |12             |KEYWORD        |32766          |2147483647     |null           |null           |1              |null           |null           |12             |0               |2147483647       |11              |YES            |null           |null           |null           |null            |NO              |NO                
-integTest        |null           |test_emp_copy  |gender                |12             |KEYWORD        |32766          |2147483647     |null           |null           |1              |null           |null           |12             |0               |2147483647       |12              |YES            |null           |null           |null           |null            |NO              |NO                
-integTest        |null           |test_emp_copy  |hire_date             |93             |DATETIME       |34             |8              |null           |null           |1              |null           |null           |9              |3               |null             |13              |YES            |null           |null           |null           |null            |NO              |NO                
-integTest        |null           |test_emp_copy  |languages             |-6             |BYTE           |5              |1              |null           |10             |1              |null           |null           |-6             |0               |null             |14              |YES            |null           |null           |null           |null            |NO              |NO                
-integTest        |null           |test_emp_copy  |last_name             |12             |TEXT           |2147483647     |2147483647     |null           |null           |1              |null           |null           |12             |0               |2147483647       |15              |YES            |null           |null           |null           |null            |NO              |NO                
-integTest        |null           |test_emp_copy  |last_name.keyword     |12             |KEYWORD        |32766          |2147483647     |null           |null           |1              |null           |null           |12             |0               |2147483647       |16              |YES            |null           |null           |null           |null            |NO              |NO                
-integTest        |null           |test_emp_copy  |null_constant         |12             |KEYWORD        |32766          |2147483647     |null           |null           |1              |null           |null           |12             |0               |2147483647       |17              |YES            |null           |null           |null           |null            |NO              |NO                
-integTest        |null           |test_emp_copy  |salary                |4              |INTEGER        |11             |4              |null           |10             |1              |null           |null           |4              |0               |null             |18              |YES            |null           |null           |null           |null            |NO              |NO                
-integTest        |null           |test_emp_copy  |wildcard_name         |12             |KEYWORD        |32766          |2147483647     |null           |null           |1              |null           |null           |12             |0               |2147483647       |19              |YES            |null           |null           |null           |null            |NO              |NO                
+integTest        |null           |logs           |@timestamp        |93             |DATETIME       |34             |8              |null           |null           |1              |null           |null           |9              |3               |null             |1               |YES            |null           |null           |null           |null            |NO              |NO                
+integTest        |null           |logs           |bytes_in          |4              |INTEGER        |11             |4              |null           |10             |1              |null           |null           |4              |0               |null             |2               |YES            |null           |null           |null           |null            |NO              |NO                
+integTest        |null           |logs           |bytes_out         |4              |INTEGER        |11             |4              |null           |10             |1              |null           |null           |4              |0               |null             |3               |YES            |null           |null           |null           |null            |NO              |NO                
+integTest        |null           |logs           |client_ip         |12             |IP             |45             |45             |null           |null           |1              |null           |null           |12             |0               |null             |4               |YES            |null           |null           |null           |null            |NO              |NO                
+integTest        |null           |logs           |client_port       |4              |INTEGER        |11             |4              |null           |10             |1              |null           |null           |4              |0               |null             |5               |YES            |null           |null           |null           |null            |NO              |NO                
+integTest        |null           |logs           |dest_ip           |12             |IP             |45             |45             |null           |null           |1              |null           |null           |12             |0               |null             |6               |YES            |null           |null           |null           |null            |NO              |NO                
+integTest        |null           |logs           |id                |4              |INTEGER        |11             |4              |null           |10             |1              |null           |null           |4              |0               |null             |7               |YES            |null           |null           |null           |null            |NO              |NO                
+integTest        |null           |logs           |status            |12             |KEYWORD        |32766          |2147483647     |null           |null           |1              |null           |null           |12             |0               |2147483647       |8               |YES            |null           |null           |null           |null            |NO              |NO                
+integTest        |null           |logs_nanos     |@timestamp        |93             |DATETIME       |34             |8              |null           |null           |1              |null           |null           |9              |3               |null             |1               |YES            |null           |null           |null           |null            |NO              |NO                
+integTest        |null           |logs_nanos     |id                |4              |INTEGER        |11             |4              |null           |10             |1              |null           |null           |4              |0               |null             |2               |YES            |null           |null           |null           |null            |NO              |NO                
+integTest        |null           |logs_nanos     |status            |12             |KEYWORD        |32766          |2147483647     |null           |null           |1              |null           |null           |12             |0               |2147483647       |3               |YES            |null           |null           |null           |null            |NO              |NO                
+integTest        |null           |test_alias     |birth_date        |93             |DATETIME       |34             |8              |null           |null           |1              |null           |null           |9              |3               |null             |1               |YES            |null           |null           |null           |null            |NO              |NO                
+integTest        |null           |test_alias     |emp_no            |4              |INTEGER        |11             |4              |null           |10             |1              |null           |null           |4              |0               |null             |3               |YES            |null           |null           |null           |null            |NO              |NO                
+integTest        |null           |test_alias     |extra.info.gender |12             |KEYWORD        |32766          |2147483647     |null           |null           |1              |null           |null           |12             |0               |2147483647       |6               |YES            |null           |null           |null           |null            |NO              |NO                
+integTest        |null           |test_alias     |extra_gender      |12             |KEYWORD        |32766          |2147483647     |null           |null           |1              |null           |null           |12             |0               |2147483647       |7               |YES            |null           |null           |null           |null            |NO              |NO                
+integTest        |null           |test_alias     |extra_no          |4              |INTEGER        |11             |4              |null           |10             |1              |null           |null           |4              |0               |null             |8               |YES            |null           |null           |null           |null            |NO              |NO                
+integTest        |null           |test_alias     |first_name        |12             |TEXT           |2147483647     |2147483647     |null           |null           |1              |null           |null           |12             |0               |2147483647       |9               |YES            |null           |null           |null           |null            |NO              |NO                
+integTest        |null           |test_alias     |first_name.keyword|12             |KEYWORD        |32766          |2147483647     |null           |null           |1              |null           |null           |12             |0               |2147483647       |10              |YES            |null           |null           |null           |null            |NO              |NO                
+integTest        |null           |test_alias     |gender            |12             |KEYWORD        |32766          |2147483647     |null           |null           |1              |null           |null           |12             |0               |2147483647       |11              |YES            |null           |null           |null           |null            |NO              |NO                
+integTest        |null           |test_alias     |hire_date         |93             |DATETIME       |34             |8              |null           |null           |1              |null           |null           |9              |3               |null             |12              |YES            |null           |null           |null           |null            |NO              |NO                
+integTest        |null           |test_alias     |languages         |-6             |BYTE           |5              |1              |null           |10             |1              |null           |null           |-6             |0               |null             |13              |YES            |null           |null           |null           |null            |NO              |NO                
+integTest        |null           |test_alias     |last_name         |12             |TEXT           |2147483647     |2147483647     |null           |null           |1              |null           |null           |12             |0               |2147483647       |14              |YES            |null           |null           |null           |null            |NO              |NO                
+integTest        |null           |test_alias     |last_name.keyword |12             |KEYWORD        |32766          |2147483647     |null           |null           |1              |null           |null           |12             |0               |2147483647       |15              |YES            |null           |null           |null           |null            |NO              |NO                
+integTest        |null           |test_alias     |name              |12             |KEYWORD        |32766          |2147483647     |null           |null           |1              |null           |null           |12             |0               |2147483647       |16              |YES            |null           |null           |null           |null            |NO              |NO                
+integTest        |null           |test_alias     |null_constant     |12             |KEYWORD        |32766          |2147483647     |null           |null           |1              |null           |null           |12             |0               |2147483647       |17              |YES            |null           |null           |null           |null            |NO              |NO                
+integTest        |null           |test_alias     |salary            |4              |INTEGER        |11             |4              |null           |10             |1              |null           |null           |4              |0               |null             |18              |YES            |null           |null           |null           |null            |NO              |NO                
+integTest        |null           |test_alias     |wildcard_name     |12             |KEYWORD        |32766          |2147483647     |null           |null           |1              |null           |null           |12             |0               |2147483647       |19              |YES            |null           |null           |null           |null            |NO              |NO                
+integTest        |null           |test_alias_emp |birth_date        |93             |DATETIME       |34             |8              |null           |null           |1              |null           |null           |9              |3               |null             |1               |YES            |null           |null           |null           |null            |NO              |NO                
+integTest        |null           |test_alias_emp |emp_no            |4              |INTEGER        |11             |4              |null           |10             |1              |null           |null           |4              |0               |null             |3               |YES            |null           |null           |null           |null            |NO              |NO                
+integTest        |null           |test_alias_emp |extra.info.gender |12             |KEYWORD        |32766          |2147483647     |null           |null           |1              |null           |null           |12             |0               |2147483647       |6               |YES            |null           |null           |null           |null            |NO              |NO                
+integTest        |null           |test_alias_emp |extra_gender      |12             |KEYWORD        |32766          |2147483647     |null           |null           |1              |null           |null           |12             |0               |2147483647       |7               |YES            |null           |null           |null           |null            |NO              |NO                
+integTest        |null           |test_alias_emp |extra_no          |4              |INTEGER        |11             |4              |null           |10             |1              |null           |null           |4              |0               |null             |8               |YES            |null           |null           |null           |null            |NO              |NO                
+integTest        |null           |test_alias_emp |first_name        |12             |TEXT           |2147483647     |2147483647     |null           |null           |1              |null           |null           |12             |0               |2147483647       |9               |YES            |null           |null           |null           |null            |NO              |NO                
+integTest        |null           |test_alias_emp |first_name.keyword|12             |KEYWORD        |32766          |2147483647     |null           |null           |1              |null           |null           |12             |0               |2147483647       |10              |YES            |null           |null           |null           |null            |NO              |NO                
+integTest        |null           |test_alias_emp |gender            |12             |KEYWORD        |32766          |2147483647     |null           |null           |1              |null           |null           |12             |0               |2147483647       |11              |YES            |null           |null           |null           |null            |NO              |NO                
+integTest        |null           |test_alias_emp |hire_date         |93             |DATETIME       |34             |8              |null           |null           |1              |null           |null           |9              |3               |null             |12              |YES            |null           |null           |null           |null            |NO              |NO                
+integTest        |null           |test_alias_emp |languages         |-6             |BYTE           |5              |1              |null           |10             |1              |null           |null           |-6             |0               |null             |13              |YES            |null           |null           |null           |null            |NO              |NO                
+integTest        |null           |test_alias_emp |last_name         |12             |TEXT           |2147483647     |2147483647     |null           |null           |1              |null           |null           |12             |0               |2147483647       |14              |YES            |null           |null           |null           |null            |NO              |NO                
+integTest        |null           |test_alias_emp |last_name.keyword |12             |KEYWORD        |32766          |2147483647     |null           |null           |1              |null           |null           |12             |0               |2147483647       |15              |YES            |null           |null           |null           |null            |NO              |NO                
+integTest        |null           |test_alias_emp |name              |12             |KEYWORD        |32766          |2147483647     |null           |null           |1              |null           |null           |12             |0               |2147483647       |16              |YES            |null           |null           |null           |null            |NO              |NO                
+integTest        |null           |test_alias_emp |null_constant     |12             |KEYWORD        |32766          |2147483647     |null           |null           |1              |null           |null           |12             |0               |2147483647       |17              |YES            |null           |null           |null           |null            |NO              |NO                
+integTest        |null           |test_alias_emp |salary            |4              |INTEGER        |11             |4              |null           |10             |1              |null           |null           |4              |0               |null             |18              |YES            |null           |null           |null           |null            |NO              |NO                
+integTest        |null           |test_alias_emp |wildcard_name     |12             |KEYWORD        |32766          |2147483647     |null           |null           |1              |null           |null           |12             |0               |2147483647       |19              |YES            |null           |null           |null           |null            |NO              |NO                
+integTest        |null           |test_emp       |birth_date        |93             |DATETIME       |34             |8              |null           |null           |1              |null           |null           |9              |3               |null             |1               |YES            |null           |null           |null           |null            |NO              |NO                
+integTest        |null           |test_emp       |emp_no            |4              |INTEGER        |11             |4              |null           |10             |1              |null           |null           |4              |0               |null             |3               |YES            |null           |null           |null           |null            |NO              |NO                
+integTest        |null           |test_emp       |first_name        |12             |TEXT           |2147483647     |2147483647     |null           |null           |1              |null           |null           |12             |0               |2147483647       |4               |YES            |null           |null           |null           |null            |NO              |NO                
+integTest        |null           |test_emp       |first_name.keyword|12             |KEYWORD        |32766          |2147483647     |null           |null           |1              |null           |null           |12             |0               |2147483647       |5               |YES            |null           |null           |null           |null            |NO              |NO                
+integTest        |null           |test_emp       |gender            |12             |KEYWORD        |32766          |2147483647     |null           |null           |1              |null           |null           |12             |0               |2147483647       |6               |YES            |null           |null           |null           |null            |NO              |NO                
+integTest        |null           |test_emp       |hire_date         |93             |DATETIME       |34             |8              |null           |null           |1              |null           |null           |9              |3               |null             |7               |YES            |null           |null           |null           |null            |NO              |NO                
+integTest        |null           |test_emp       |languages         |-6             |BYTE           |5              |1              |null           |10             |1              |null           |null           |-6             |0               |null             |8               |YES            |null           |null           |null           |null            |NO              |NO                
+integTest        |null           |test_emp       |last_name         |12             |TEXT           |2147483647     |2147483647     |null           |null           |1              |null           |null           |12             |0               |2147483647       |9               |YES            |null           |null           |null           |null            |NO              |NO                
+integTest        |null           |test_emp       |last_name.keyword |12             |KEYWORD        |32766          |2147483647     |null           |null           |1              |null           |null           |12             |0               |2147483647       |10              |YES            |null           |null           |null           |null            |NO              |NO                
+integTest        |null           |test_emp       |name              |12             |KEYWORD        |32766          |2147483647     |null           |null           |1              |null           |null           |12             |0               |2147483647       |11              |YES            |null           |null           |null           |null            |NO              |NO                
+integTest        |null           |test_emp       |salary            |4              |INTEGER        |11             |4              |null           |10             |1              |null           |null           |4              |0               |null             |12              |YES            |null           |null           |null           |null            |NO              |NO                
+integTest        |null           |test_emp_copy  |birth_date        |93             |DATETIME       |34             |8              |null           |null           |1              |null           |null           |9              |3               |null             |1               |YES            |null           |null           |null           |null            |NO              |NO                
+integTest        |null           |test_emp_copy  |emp_no            |4              |INTEGER        |11             |4              |null           |10             |1              |null           |null           |4              |0               |null             |3               |YES            |null           |null           |null           |null            |NO              |NO                
+integTest        |null           |test_emp_copy  |extra.info.gender |12             |KEYWORD        |32766          |2147483647     |null           |null           |1              |null           |null           |12             |0               |2147483647       |6               |YES            |null           |null           |null           |null            |NO              |NO                
+integTest        |null           |test_emp_copy  |extra_gender      |12             |KEYWORD        |32766          |2147483647     |null           |null           |1              |null           |null           |12             |0               |2147483647       |7               |YES            |null           |null           |null           |null            |NO              |NO                
+integTest        |null           |test_emp_copy  |extra_no          |4              |INTEGER        |11             |4              |null           |10             |1              |null           |null           |4              |0               |null             |8               |YES            |null           |null           |null           |null            |NO              |NO                
+integTest        |null           |test_emp_copy  |first_name        |12             |TEXT           |2147483647     |2147483647     |null           |null           |1              |null           |null           |12             |0               |2147483647       |9               |YES            |null           |null           |null           |null            |NO              |NO                
+integTest        |null           |test_emp_copy  |first_name.keyword|12             |KEYWORD        |32766          |2147483647     |null           |null           |1              |null           |null           |12             |0               |2147483647       |10              |YES            |null           |null           |null           |null            |NO              |NO                
+integTest        |null           |test_emp_copy  |gender            |12             |KEYWORD        |32766          |2147483647     |null           |null           |1              |null           |null           |12             |0               |2147483647       |11              |YES            |null           |null           |null           |null            |NO              |NO                
+integTest        |null           |test_emp_copy  |hire_date         |93             |DATETIME       |34             |8              |null           |null           |1              |null           |null           |9              |3               |null             |12              |YES            |null           |null           |null           |null            |NO              |NO                
+integTest        |null           |test_emp_copy  |languages         |-6             |BYTE           |5              |1              |null           |10             |1              |null           |null           |-6             |0               |null             |13              |YES            |null           |null           |null           |null            |NO              |NO                
+integTest        |null           |test_emp_copy  |last_name         |12             |TEXT           |2147483647     |2147483647     |null           |null           |1              |null           |null           |12             |0               |2147483647       |14              |YES            |null           |null           |null           |null            |NO              |NO                
+integTest        |null           |test_emp_copy  |last_name.keyword |12             |KEYWORD        |32766          |2147483647     |null           |null           |1              |null           |null           |12             |0               |2147483647       |15              |YES            |null           |null           |null           |null            |NO              |NO                
+integTest        |null           |test_emp_copy  |name              |12             |KEYWORD        |32766          |2147483647     |null           |null           |1              |null           |null           |12             |0               |2147483647       |16              |YES            |null           |null           |null           |null            |NO              |NO                
+integTest        |null           |test_emp_copy  |null_constant     |12             |KEYWORD        |32766          |2147483647     |null           |null           |1              |null           |null           |12             |0               |2147483647       |17              |YES            |null           |null           |null           |null            |NO              |NO                
+integTest        |null           |test_emp_copy  |salary            |4              |INTEGER        |11             |4              |null           |10             |1              |null           |null           |4              |0               |null             |18              |YES            |null           |null           |null           |null            |NO              |NO                
+integTest        |null           |test_emp_copy  |wildcard_name     |12             |KEYWORD        |32766          |2147483647     |null           |null           |1              |null           |null           |12             |0               |2147483647       |19              |YES            |null           |null           |null           |null            |NO              |NO                
 ;

x-pack/plugin/sql/qa/server/src/main/resources/subselect.sql-spec

@@ -35,12 +35,10 @@ FROM (
 )
 ORDER BY e DESC;
 
-// AwaitsFix https://github.com/elastic/elasticsearch/issues/71442
-multiLevelSelectStar-Ignore
+multiLevelSelectStar
 SELECT * FROM (SELECT * FROM ( SELECT * FROM test_emp ));
 
-// AwaitsFix https://github.com/elastic/elasticsearch/issues/71442
-multiLevelSelectStarWithAlias-Ignore
+multiLevelSelectStarWithAlias
 SELECT * FROM (SELECT * FROM ( SELECT * FROM test_emp ) b) c;
 
 filterAfterGroupBy
@@ -92,8 +90,7 @@ SELECT GREATEST(10096, ABS(emp_no + 1)) AS gt FROM (SELECT * FROM test_emp) ORDE
 inAndIsNotNull
 SELECT NOT((languages = 2) IS NULL) AS col1, NOT((languages = 2) IS NOT NULL) AS col2 FROM (SELECT * FROM test_emp WHERE emp_no IN (10019, 10020, 10021)) WHERE emp_no IN (10018, 10019, 10020) ORDER BY emp_no;
 
-// AwaitsFix https://github.com/elastic/elasticsearch/issues/71442
-filterOnColumn-Ignore
+filterOnColumn
 SELECT * FROM (
     SELECT * FROM test_emp
 )
@@ -139,8 +136,7 @@ SELECT * FROM (
 )
 WHERE languages < 5
 ;
-// AwaitsFix https://github.com/elastic/elasticsearch/issues/71442
-filterOnColumnFunctionWithOutsideFilter-Ignore
+filterOnColumnFunctionWithOutsideFilter
 SELECT * FROM (
     SELECT * FROM test_emp WHERE languages + 1 > 1
 )