diff --git ql/src/java/org/apache/hadoop/hive/ql/ddl/database/show/ShowDatabasesOperation.java ql/src/java/org/apache/hadoop/hive/ql/ddl/database/show/ShowDatabasesOperation.java index 625a48ee71..12a5299eea 100644 --- ql/src/java/org/apache/hadoop/hive/ql/ddl/database/show/ShowDatabasesOperation.java +++ ql/src/java/org/apache/hadoop/hive/ql/ddl/database/show/ShowDatabasesOperation.java @@ -45,7 +45,7 @@ public int execute() throws HiveException { List databases = context.getDb().getAllDatabases(); if (desc.getPattern() != null) { LOG.debug("pattern: {}", desc.getPattern()); - Pattern pattern = Pattern.compile(UDFLike.likePatternToRegExp(desc.getPattern())); + Pattern pattern = Pattern.compile(UDFLike.likePatternToRegExp(desc.getPattern()), Pattern.CASE_INSENSITIVE); databases = databases.stream().filter(name -> pattern.matcher(name).matches()).collect(Collectors.toList()); } diff --git ql/src/java/org/apache/hadoop/hive/ql/ddl/table/info/show/status/ShowTableStatusOperation.java ql/src/java/org/apache/hadoop/hive/ql/ddl/table/info/show/status/ShowTableStatusOperation.java index 914e63d80c..75ea0e3b55 100644 --- ql/src/java/org/apache/hadoop/hive/ql/ddl/table/info/show/status/ShowTableStatusOperation.java +++ ql/src/java/org/apache/hadoop/hive/ql/ddl/table/info/show/status/ShowTableStatusOperation.java @@ -23,11 +23,11 @@ import java.io.DataOutputStream; import java.util.ArrayList; -import java.util.Iterator; +import java.util.Collections; import java.util.List; import java.util.Map; -import java.util.SortedSet; -import java.util.TreeSet; +import java.util.regex.Pattern; +import java.util.stream.Collectors; import org.apache.hadoop.fs.Path; import org.apache.hadoop.hive.ql.ErrorMsg; @@ -35,6 +35,7 @@ import org.apache.hadoop.hive.ql.metadata.HiveException; import org.apache.hadoop.hive.ql.metadata.Partition; import org.apache.hadoop.hive.ql.metadata.Table; +import org.apache.hadoop.hive.ql.udf.UDFLike; import org.apache.hadoop.io.IOUtils; /** @@ -47,35 +48,37 @@ public ShowTableStatusOperation(DDLOperationContext context, ShowTableStatusDesc @Override public int execute() throws HiveException { - // get the tables for the desired pattern - populate the output stream - List tbls = new ArrayList
(); - Map part = desc.getPartSpec(); - Partition par = null; - if (part != null) { - Table tbl = context.getDb().getTable(desc.getDbName(), desc.getPattern()); - par = context.getDb().getPartition(tbl, part, false); - if (par == null) { - throw new HiveException("Partition " + part + " for table " + desc.getPattern() + " does not exist."); + List
tables = new ArrayList
(); + Map partitionSpec = desc.getPartSpec(); + Partition partition = null; + if (partitionSpec != null) { + Table table = context.getDb().getTable(desc.getDbName(), desc.getPattern()); + partition = context.getDb().getPartition(table, partitionSpec, false); + if (partition == null) { + throw new HiveException("Partition " + partitionSpec + " for table " + desc.getPattern() + " does not exist."); } - tbls.add(tbl); + tables.add(table); } else { LOG.debug("pattern: {}", desc.getPattern()); - List tblStr = context.getDb().getTablesForDb(desc.getDbName(), desc.getPattern()); - SortedSet sortedTbls = new TreeSet(tblStr); - Iterator iterTbls = sortedTbls.iterator(); - while (iterTbls.hasNext()) { - // create a row per table name - String tblName = iterTbls.next(); - Table tbl = context.getDb().getTable(desc.getDbName(), tblName); - tbls.add(tbl); + List tableNames = context.getDb().getTablesForDb(desc.getDbName(), null); + if (desc.getPattern() != null) { + Pattern pattern = Pattern.compile(UDFLike.likePatternToRegExp(desc.getPattern()), Pattern.CASE_INSENSITIVE); + tableNames = tableNames.stream() + .filter(name -> pattern.matcher(name).matches()) + .collect(Collectors.toList()); } - LOG.info("Found {} table(s) matching the SHOW TABLE EXTENDED statement.", tblStr.size()); + Collections.sort(tableNames); + for (String tableName : tableNames) { + Table table = context.getDb().getTable(desc.getDbName(), tableName); + tables.add(table); + } + LOG.info("Found {} table(s) matching the SHOW TABLE EXTENDED statement.", tableNames.size()); } - // write the results in the file DataOutputStream outStream = DDLUtils.getOutputStream(new Path(desc.getResFile()), context); try { - context.getFormatter().showTableStatus(outStream, context.getDb(), context.getConf(), tbls, part, par); + context.getFormatter().showTableStatus(outStream, context.getDb(), context.getConf(), tables, partitionSpec, + partition); } catch (Exception e) { throw new HiveException(e, ErrorMsg.GENERIC_ERROR, "show table status"); } finally { diff --git ql/src/java/org/apache/hadoop/hive/ql/ddl/table/info/show/tables/ShowTablesOperation.java ql/src/java/org/apache/hadoop/hive/ql/ddl/table/info/show/tables/ShowTablesOperation.java index 4846d2969c..eec4828c5c 100644 --- ql/src/java/org/apache/hadoop/hive/ql/ddl/table/info/show/tables/ShowTablesOperation.java +++ ql/src/java/org/apache/hadoop/hive/ql/ddl/table/info/show/tables/ShowTablesOperation.java @@ -28,13 +28,15 @@ import java.util.List; import java.util.SortedSet; import java.util.TreeSet; +import java.util.regex.Pattern; +import java.util.stream.Collectors; import org.apache.hadoop.fs.Path; -import org.apache.hadoop.hive.metastore.TableType; import org.apache.hadoop.hive.ql.ErrorMsg; import org.apache.hadoop.hive.ql.ddl.DDLOperation; import org.apache.hadoop.hive.ql.metadata.HiveException; import org.apache.hadoop.hive.ql.metadata.Table; +import org.apache.hadoop.hive.ql.udf.UDFLike; /** * Operation process showing the tables. @@ -46,43 +48,53 @@ public ShowTablesOperation(DDLOperationContext context, ShowTablesDesc desc) { @Override public int execute() throws HiveException { - String dbName = desc.getDbName(); - String pattern = desc.getPattern(); // if null, all tables/views are returned - TableType typeFilter = desc.getTypeFilter(); - String resultsFile = desc.getResFile(); - boolean isExtended = desc.isExtended(); - - if (!context.getDb().databaseExists(dbName)) { - throw new HiveException(ErrorMsg.DATABASE_NOT_EXISTS, dbName); + if (!context.getDb().databaseExists(desc.getDbName())) { + throw new HiveException(ErrorMsg.DATABASE_NOT_EXISTS, desc.getDbName()); } - List tableNames = null; - List
tableObjects = null; - if (isExtended) { - tableObjects = new ArrayList<>(); - tableObjects.addAll(context.getDb().getTableObjectsByType(dbName, pattern, typeFilter)); - LOG.debug("Found {} table(s) matching the SHOW EXTENDED TABLES statement.", tableObjects.size()); + if (!desc.isExtended()) { + showTables(); } else { - tableNames = context.getDb().getTablesByType(dbName, pattern, typeFilter); - LOG.debug("Found {} table(s) matching the SHOW TABLES statement.", tableNames.size()); + showTablesExtended(); + } + + return 0; + } + + private void showTables() throws HiveException { + List tableNames = new ArrayList<>( + context.getDb().getTablesByType(desc.getDbName(), null, desc.getTypeFilter())); + if (desc.getPattern() != null) { + Pattern pattern = Pattern.compile(UDFLike.likePatternToRegExp(desc.getPattern()), Pattern.CASE_INSENSITIVE); + tableNames = tableNames.stream().filter(name -> pattern.matcher(name).matches()).collect(Collectors.toList()); } + Collections.sort(tableNames); + LOG.debug("Found {} table(s) matching the SHOW TABLES statement.", tableNames.size()); - try (DataOutputStream os = DDLUtils.getOutputStream(new Path(resultsFile), context)) { - if (tableNames != null) { - SortedSet sortedSet = new TreeSet(tableNames); - context.getFormatter().showTables(os, sortedSet); - } else { - Collections.sort(tableObjects, Comparator.comparing(Table::getTableName)); - if (isExtended) { - context.getFormatter().showTablesExtended(os, tableObjects); - } else { - context.getFormatter().showMaterializedViews(os, tableObjects); - } - } + try (DataOutputStream os = DDLUtils.getOutputStream(new Path(desc.getResFile()), context)) { + SortedSet sortedSet = new TreeSet(tableNames); + context.getFormatter().showTables(os, sortedSet); } catch (Exception e) { - throw new HiveException(e, ErrorMsg.GENERIC_ERROR, "in database" + dbName); + throw new HiveException(e, ErrorMsg.GENERIC_ERROR, "in database" + desc.getDbName()); } + } - return 0; + private void showTablesExtended() throws HiveException { + List
tableObjects = new ArrayList<>(); + tableObjects.addAll(context.getDb().getTableObjects(desc.getDbName(), null, desc.getTypeFilter())); + if (desc.getPattern() != null) { + Pattern pattern = Pattern.compile(UDFLike.likePatternToRegExp(desc.getPattern()), Pattern.CASE_INSENSITIVE); + tableObjects = tableObjects.stream() + .filter(object -> pattern.matcher(object.getTableName()).matches()) + .collect(Collectors.toList()); + } + Collections.sort(tableObjects, Comparator.comparing(Table::getTableName)); + LOG.debug("Found {} table(s) matching the SHOW EXTENDED TABLES statement.", tableObjects.size()); + + try (DataOutputStream os = DDLUtils.getOutputStream(new Path(desc.getResFile()), context)) { + context.getFormatter().showTablesExtended(os, tableObjects); + } catch (Exception e) { + throw new HiveException(e, ErrorMsg.GENERIC_ERROR, "in database" + desc.getDbName()); + } } } diff --git ql/src/java/org/apache/hadoop/hive/ql/ddl/view/materialized/show/ShowMaterializedViewsOperation.java ql/src/java/org/apache/hadoop/hive/ql/ddl/view/materialized/show/ShowMaterializedViewsOperation.java index 792b352e4c..1e245cda32 100644 --- ql/src/java/org/apache/hadoop/hive/ql/ddl/view/materialized/show/ShowMaterializedViewsOperation.java +++ ql/src/java/org/apache/hadoop/hive/ql/ddl/view/materialized/show/ShowMaterializedViewsOperation.java @@ -23,6 +23,8 @@ import java.util.Collections; import java.util.Comparator; import java.util.List; +import java.util.regex.Pattern; +import java.util.stream.Collectors; import org.apache.hadoop.fs.Path; import org.apache.hadoop.hive.ql.ErrorMsg; @@ -31,6 +33,7 @@ import org.apache.hadoop.hive.ql.ddl.DDLUtils; import org.apache.hadoop.hive.ql.metadata.HiveException; import org.apache.hadoop.hive.ql.metadata.Table; +import org.apache.hadoop.hive.ql.udf.UDFLike; /** * Operation process showing the materialized views. @@ -42,23 +45,27 @@ public ShowMaterializedViewsOperation(DDLOperationContext context, ShowMateriali @Override public int execute() throws HiveException { - String dbName = desc.getDbName(); - String pattern = desc.getPattern(); // if null, all tables/views are returned - String resultsFile = desc.getResFile(); - - if (!context.getDb().databaseExists(dbName)) { - throw new HiveException(ErrorMsg.DATABASE_NOT_EXISTS, dbName); + if (!context.getDb().databaseExists(desc.getDbName())) { + throw new HiveException(ErrorMsg.DATABASE_NOT_EXISTS, desc.getDbName()); } // the returned list is not sortable as it is immutable, thus it must be put into a new ArrayList - List
tableObjects = new ArrayList<>(context.getDb().getMaterializedViewObjectsByPattern(dbName, pattern)); - LOG.debug("Found {} materialized view(s) matching the SHOW MATERIALIZED VIEWS statement.", tableObjects.size()); + List
viewObjects = new ArrayList<>( + context.getDb().getMaterializedViewObjectsByPattern(desc.getDbName(), null)); + if (desc.getPattern() != null) { + Pattern pattern = Pattern.compile(UDFLike.likePatternToRegExp(desc.getPattern()), Pattern.CASE_INSENSITIVE); + viewObjects = viewObjects.stream() + .filter(object -> pattern.matcher(object.getTableName()).matches()) + .collect(Collectors.toList()); + } + Collections.sort(viewObjects, Comparator.comparing(Table::getTableName)); + LOG.debug("Found {} materialized view(s) matching the SHOW MATERIALIZED VIEWS statement.", viewObjects.size()); - try (DataOutputStream os = DDLUtils.getOutputStream(new Path(resultsFile), context)) { - Collections.sort(tableObjects, Comparator.comparing(Table::getTableName)); - context.getFormatter().showMaterializedViews(os, tableObjects); + try (DataOutputStream os = DDLUtils.getOutputStream(new Path(desc.getResFile()), context)) { + Collections.sort(viewObjects, Comparator.comparing(Table::getTableName)); + context.getFormatter().showMaterializedViews(os, viewObjects); } catch (Exception e) { - throw new HiveException(e, ErrorMsg.GENERIC_ERROR, "in database" + dbName); + throw new HiveException(e, ErrorMsg.GENERIC_ERROR, "in database" + desc.getDbName()); } return 0; diff --git ql/src/java/org/apache/hadoop/hive/ql/ddl/view/show/ShowViewsOperation.java ql/src/java/org/apache/hadoop/hive/ql/ddl/view/show/ShowViewsOperation.java index 7962551cc9..747dbde142 100644 --- ql/src/java/org/apache/hadoop/hive/ql/ddl/view/show/ShowViewsOperation.java +++ ql/src/java/org/apache/hadoop/hive/ql/ddl/view/show/ShowViewsOperation.java @@ -19,9 +19,12 @@ package org.apache.hadoop.hive.ql.ddl.view.show; import java.io.DataOutputStream; +import java.util.Collections; import java.util.List; import java.util.SortedSet; import java.util.TreeSet; +import java.util.regex.Pattern; +import java.util.stream.Collectors; import org.apache.hadoop.fs.Path; import org.apache.hadoop.hive.metastore.TableType; @@ -30,6 +33,7 @@ import org.apache.hadoop.hive.ql.ddl.DDLOperationContext; import org.apache.hadoop.hive.ql.ddl.DDLUtils; import org.apache.hadoop.hive.ql.metadata.HiveException; +import org.apache.hadoop.hive.ql.udf.UDFLike; /** * Operation process showing the views. @@ -41,22 +45,25 @@ public ShowViewsOperation(DDLOperationContext context, ShowViewsDesc desc) { @Override public int execute() throws HiveException { - String dbName = desc.getDbName(); - String pattern = desc.getPattern(); // if null, all tables/views are returned - String resultsFile = desc.getResFile(); - - if (!context.getDb().databaseExists(dbName)) { - throw new HiveException(ErrorMsg.DATABASE_NOT_EXISTS, dbName); + if (!context.getDb().databaseExists(desc.getDbName())) { + throw new HiveException(ErrorMsg.DATABASE_NOT_EXISTS, desc.getDbName()); } - List tableNames = context.getDb().getTablesByType(dbName, pattern, TableType.VIRTUAL_VIEW); - LOG.debug("Found {} view(s) matching the SHOW VIEWS statement.", tableNames.size()); + List viewNames = context.getDb().getTablesByType(desc.getDbName(), null, TableType.VIRTUAL_VIEW); + if (desc.getPattern() != null) { + Pattern pattern = Pattern.compile(UDFLike.likePatternToRegExp(desc.getPattern()), Pattern.CASE_INSENSITIVE); + viewNames = viewNames.stream() + .filter(name -> pattern.matcher(name).matches()) + .collect(Collectors.toList()); + } + Collections.sort(viewNames); + LOG.debug("Found {} view(s) matching the SHOW VIEWS statement.", viewNames.size()); - try (DataOutputStream os = DDLUtils.getOutputStream(new Path(resultsFile), context)) { - SortedSet sortedSet = new TreeSet(tableNames); + try (DataOutputStream os = DDLUtils.getOutputStream(new Path(desc.getResFile()), context)) { + SortedSet sortedSet = new TreeSet(viewNames); context.getFormatter().showTables(os, sortedSet); } catch (Exception e) { - throw new HiveException(e, ErrorMsg.GENERIC_ERROR, "in database" + dbName); + throw new HiveException(e, ErrorMsg.GENERIC_ERROR, "in database" + desc.getDbName()); } return 0; diff --git ql/src/java/org/apache/hadoop/hive/ql/metadata/Hive.java ql/src/java/org/apache/hadoop/hive/ql/metadata/Hive.java index f6a5207ddb..c5901cdf8c 100644 --- ql/src/java/org/apache/hadoop/hive/ql/metadata/Hive.java +++ ql/src/java/org/apache/hadoop/hive/ql/metadata/Hive.java @@ -1488,18 +1488,6 @@ public Table getTable(final String dbName, final String tableName, boolean throw return getTableObjects(dbName, ".*", null); } - /** - * Get tables for the specified database that match the provided regex pattern and table type. - * @param dbName - * @param pattern - * @param tableType - * @return List of table objects - * @throws HiveException - */ - public List
getTableObjectsByType(String dbName, String pattern, TableType tableType) throws HiveException { - return getTableObjects(dbName, pattern, tableType); - } - /** * Get all materialized view names for the specified database. * @param dbName @@ -1531,7 +1519,7 @@ public Table getTable(final String dbName, final String tableName, boolean throw return getTableObjects(dbName, pattern, TableType.MATERIALIZED_VIEW); } - private List
getTableObjects(String dbName, String pattern, TableType tableType) throws HiveException { + public List
getTableObjects(String dbName, String pattern, TableType tableType) throws HiveException { try { return Lists.transform(getMSC().getTableObjectsByName(dbName, getTablesByType(dbName, pattern, tableType)), new com.google.common.base.Function() { diff --git ql/src/test/queries/clientnegative/show_tablestatus.q ql/src/test/queries/clientnegative/show_tablestatus.q index 283b5836e2..7270927f2d 100644 --- ql/src/test/queries/clientnegative/show_tablestatus.q +++ ql/src/test/queries/clientnegative/show_tablestatus.q @@ -1 +1 @@ -SHOW TABLE EXTENDED LIKE `srcpar*` PARTITION(ds='2008-04-08', hr=11); \ No newline at end of file +SHOW TABLE EXTENDED LIKE `srcpar%` PARTITION(ds='2008-04-08', hr=11); diff --git ql/src/test/queries/clientpositive/alter1.q ql/src/test/queries/clientpositive/alter1.q index 0843351996..03d003644b 100644 --- ql/src/test/queries/clientpositive/alter1.q +++ ql/src/test/queries/clientpositive/alter1.q @@ -28,7 +28,7 @@ describe alter1; -- Cleanup DROP TABLE alter1; -SHOW TABLES LIKE "alter*"; +SHOW TABLES LIKE "alter%"; -- With non-default Database diff --git ql/src/test/queries/clientpositive/alter2.q ql/src/test/queries/clientpositive/alter2.q index 6586afca8f..6f0128a72b 100644 --- ql/src/test/queries/clientpositive/alter2.q +++ ql/src/test/queries/clientpositive/alter2.q @@ -21,13 +21,13 @@ show partitions alter2; -- Cleanup DROP TABLE alter2; -SHOW TABLES LIKE "alter*"; +SHOW TABLES LIKE "alter%"; -- Using non-default Database CREATE DATABASE alter2_db; USE alter2_db; -SHOW TABLES LIKE "alter*"; +SHOW TABLES LIKE "alter%"; CREATE TABLE alter2(a int, b int) PARTITIONED BY (insertdate string); DESCRIBE EXTENDED alter2; diff --git ql/src/test/queries/clientpositive/alter3.q ql/src/test/queries/clientpositive/alter3.q index a38643de41..4f8ca22238 100644 --- ql/src/test/queries/clientpositive/alter3.q +++ ql/src/test/queries/clientpositive/alter3.q @@ -25,7 +25,7 @@ describe extended alter3_like_renamed; DROP TABLE alter3_src; DROP TABLE alter3_renamed; DROP TABLE alter3_like_renamed; -SHOW TABLES LIKE "alter3_*"; +SHOW TABLES LIKE "alter3_%"; -- With non-default Database diff --git ql/src/test/queries/clientpositive/alter4.q ql/src/test/queries/clientpositive/alter4.q index 7a87113edc..62b913334a 100644 --- ql/src/test/queries/clientpositive/alter4.q +++ ql/src/test/queries/clientpositive/alter4.q @@ -6,7 +6,7 @@ DESCRIBE EXTENDED set_bucketing_test; -- Cleanup DROP TABLE set_bucketing_test; -SHOW TABLES LIKE "set_bucketing_*"; +SHOW TABLES LIKE "set_bucketing_%"; -- with non-default Database diff --git ql/src/test/queries/clientpositive/alter5.q ql/src/test/queries/clientpositive/alter5.q index 5abd14f075..6334291bb0 100644 --- ql/src/test/queries/clientpositive/alter5.q +++ ql/src/test/queries/clientpositive/alter5.q @@ -23,7 +23,7 @@ describe extended alter5_n1 partition (dt='a'); -- Cleanup DROP TABLE alter5_src; DROP TABLE alter5_n1; -SHOW TABLES LIKE "alter*"; +SHOW TABLES LIKE "alter%"; -- With non-default Database diff --git ql/src/test/queries/clientpositive/create_view.q ql/src/test/queries/clientpositive/create_view.q index 392ebf4591..e4f5938c41 100644 --- ql/src/test/queries/clientpositive/create_view.q +++ ql/src/test/queries/clientpositive/create_view.q @@ -41,8 +41,8 @@ CREATE VIEW view0(valoo) AS SELECT upper(value) FROM src WHERE key=86; EXPLAIN SELECT * from view2 where key=18; -SHOW TABLES 'view.*'; -SHOW VIEWS 'view.*'; +SHOW TABLES 'view%'; +SHOW VIEWS 'view%'; DESCRIBE view1; DESCRIBE EXTENDED view1; DESCRIBE FORMATTED view1; diff --git ql/src/test/queries/clientpositive/describe_table_json.q ql/src/test/queries/clientpositive/describe_table_json.q index 8aea7f283f..cbdbc707a5 100644 --- ql/src/test/queries/clientpositive/describe_table_json.q +++ ql/src/test/queries/clientpositive/describe_table_json.q @@ -2,9 +2,9 @@ set hive.ddl.output.format=json; CREATE TABLE IF NOT EXISTS jsontable (key INT, value STRING) COMMENT 'json table' STORED AS TEXTFILE; -SHOW TABLES LIKE 'jsontab*'; +SHOW TABLES LIKE 'jsontab%'; -SHOW TABLE EXTENDED LIKE 'jsontab*'; +SHOW TABLE EXTENDED LIKE 'jsontab%'; ALTER TABLE jsontable SET TBLPROPERTIES ('id' = 'jsontable'); diff --git ql/src/test/queries/clientpositive/encryption_auto_purge_tables.q ql/src/test/queries/clientpositive/encryption_auto_purge_tables.q index 14c7f7eb96..aef2f5668e 100644 --- ql/src/test/queries/clientpositive/encryption_auto_purge_tables.q +++ ql/src/test/queries/clientpositive/encryption_auto_purge_tables.q @@ -10,7 +10,7 @@ CREATE TABLE encrypted_table_n5 (key INT, value STRING) LOCATION '${hiveconf:hiv CRYPTO CREATE_KEY --keyName key_128 --bitLength 128; CRYPTO CREATE_ZONE --keyName key_128 --path ${hiveconf:hive.metastore.warehouse.dir}/default/encrypted_table; -SHOW TABLES LIKE "encrypted_*"; +SHOW TABLES LIKE "encrypted_%"; ALTER TABLE encrypted_table_n5 SET TBLPROPERTIES("auto.purge"="true"); @@ -31,7 +31,7 @@ SELECT COUNT(*) from encrypted_ext_table_n0; DROP TABLE encrypted_table_n5; DROP TABLE encrypted_ext_table_n0; -SHOW TABLES LIKE "encrypted_*"; +SHOW TABLES LIKE "encrypted_%"; -- cleanup DROP TABLE IF EXISTS encrypted_table_n5 PURGE; diff --git ql/src/test/queries/clientpositive/encryption_drop_table.q ql/src/test/queries/clientpositive/encryption_drop_table.q index 884e510a92..e6633f5265 100644 --- ql/src/test/queries/clientpositive/encryption_drop_table.q +++ ql/src/test/queries/clientpositive/encryption_drop_table.q @@ -15,13 +15,13 @@ CRYPTO CREATE_ZONE --keyName key_128 --path ${hiveconf:hive.metastore.warehouse. INSERT OVERWRITE TABLE encrypted_table_n2 SELECT * FROM src; CREATE EXTERNAL TABLE encrypted_ext_table (key INT, value STRING) LOCATION '${hiveconf:hive.metastore.warehouse.dir}/default/encrypted_table'; -SHOW TABLES LIKE "encrypted_*"; +SHOW TABLES LIKE "encrypted_%"; DROP TABLE default.encrypted_ext_table; -SHOW TABLES LIKE "encrypted_*"; +SHOW TABLES LIKE "encrypted_%"; DROP TABLE default.encrypted_table_n2; -SHOW TABLES LIKE "encrypted_*"; +SHOW TABLES LIKE "encrypted_%"; DROP TABLE IF EXISTS encrypted_table1; CREATE TABLE encrypted_table1 (key INT, value STRING) LOCATION '${hiveconf:hive.metastore.warehouse.dir}/default/encrypted_table1'; @@ -34,10 +34,10 @@ SELECT COUNT(*) FROM encrypted_table1; INSERT OVERWRITE TABLE encrypted_table1 SELECT * FROM src; DROP TABLE default.encrypted_table1; -SHOW TABLES LIKE "encrypted_*"; +SHOW TABLES LIKE "encrypted_%"; TRUNCATE TABLE encrypted_table1; DROP TABLE default.encrypted_table1; -SHOW TABLES LIKE "encrypted_*"; +SHOW TABLES LIKE "encrypted_%"; CRYPTO DELETE_KEY --keyName key_128; diff --git ql/src/test/queries/clientpositive/encryption_move_tbl.q ql/src/test/queries/clientpositive/encryption_move_tbl.q index b63607641a..ddf732f279 100644 --- ql/src/test/queries/clientpositive/encryption_move_tbl.q +++ ql/src/test/queries/clientpositive/encryption_move_tbl.q @@ -20,7 +20,7 @@ CRYPTO CREATE_KEY --keyName key_128_2 --bitLength 128; CRYPTO CREATE_ZONE --keyName key_128_2 --path ${hiveconf:hive.metastore.warehouse.dir}/encrypted_db.db; INSERT OVERWRITE TABLE encrypted_table_n1 SELECT * FROM src; -SHOW TABLES LIKE "encrypted_*"; +SHOW TABLES LIKE "encrypted_%"; ANALYZE TABLE encrypted_table_n1 COMPUTE STATISTICS FOR COLUMNS; DESCRIBE FORMATTED encrypted_table_n1 key; DESCRIBE FORMATTED encrypted_table_n1 value; diff --git ql/src/test/queries/clientpositive/input2.q ql/src/test/queries/clientpositive/input2.q index c7b0d3024a..a2a4833c28 100644 --- ql/src/test/queries/clientpositive/input2.q +++ ql/src/test/queries/clientpositive/input2.q @@ -3,10 +3,10 @@ DESCRIBE TEST2a; DESC TEST2a; CREATE TABLE TEST2b(A ARRAY, B DOUBLE, C MAP) STORED AS TEXTFILE; DESCRIBE TEST2b; -SHOW TABLES LIKE "TEST2*"; +SHOW TABLES LIKE "TEST2%"; DROP TABLE TEST2a; -SHOW TABLES LIKE "TEST2*"; +SHOW TABLES LIKE "TEST2%"; DROP TABLE TEST2b; EXPLAIN -SHOW TABLES LIKE "TEST2*"; +SHOW TABLES LIKE "TEST2%"; diff --git ql/src/test/queries/clientpositive/input3.q ql/src/test/queries/clientpositive/input3.q index 07d75bdb29..e0540a6bdc 100644 --- ql/src/test/queries/clientpositive/input3.q +++ ql/src/test/queries/clientpositive/input3.q @@ -2,7 +2,7 @@ CREATE TABLE TEST3a(A INT, B DOUBLE) STORED AS TEXTFILE; DESCRIBE TEST3a; CREATE TABLE TEST3b(A ARRAY, B DOUBLE, C MAP) STORED AS TEXTFILE; DESCRIBE TEST3b; -SHOW TABLES LIKE "TEST3*"; +SHOW TABLES LIKE "TEST3%"; EXPLAIN ALTER TABLE TEST3b ADD COLUMNS (X DOUBLE); ALTER TABLE TEST3b ADD COLUMNS (X DOUBLE); @@ -11,7 +11,7 @@ EXPLAIN ALTER TABLE TEST3b RENAME TO TEST3c; ALTER TABLE TEST3b RENAME TO TEST3c; DESCRIBE TEST3c; -SHOW TABLES LIKE "TEST3*"; +SHOW TABLES LIKE "TEST3%"; set hive.metastore.disallow.incompatible.col.type.changes=false; EXPLAIN ALTER TABLE TEST3c REPLACE COLUMNS (R1 INT, R2 DOUBLE); diff --git ql/src/test/queries/clientpositive/rename_column.q ql/src/test/queries/clientpositive/rename_column.q index 82036f68b0..bcfade650f 100644 --- ql/src/test/queries/clientpositive/rename_column.q +++ ql/src/test/queries/clientpositive/rename_column.q @@ -26,7 +26,7 @@ ALTER TABLE kv_rename_test CHANGE COLUMN a2 a INT AFTER b; DESCRIBE kv_rename_test; DROP TABLE kv_rename_test; -SHOW TABLES LIKE "kv_rename_*"; +SHOW TABLES LIKE "kv_rename_%"; -- Using non-default Database CREATE DATABASE kv_rename_test_db; @@ -57,4 +57,4 @@ ALTER TABLE kv_rename_test CHANGE COLUMN a2 a INT AFTER b; DESCRIBE kv_rename_test; reset hive.metastore.disallow.incompatible.col.type.changes; DROP TABLE kv_rename_test; -SHOW TABLES LIKE "kv_rename_*"; +SHOW TABLES LIKE "kv_rename_%"; diff --git ql/src/test/queries/clientpositive/show_materialized_views.q ql/src/test/queries/clientpositive/show_materialized_views.q index 81f86a7a95..a37ed77300 100644 --- ql/src/test/queries/clientpositive/show_materialized_views.q +++ ql/src/test/queries/clientpositive/show_materialized_views.q @@ -1,3 +1,5 @@ +-- NO_SESSION_REUSE + set hive.support.concurrency=true; set hive.txn.manager=org.apache.hadoop.hive.ql.lockmgr.DbTxnManager; set hive.strict.checks.cartesian.product=false; @@ -31,14 +33,12 @@ SELECT * FROM shtb_test2 where KEY > 100 and KEY < 200; USE test1; EXPLAIN SHOW MATERIALIZED VIEWS; SHOW MATERIALIZED VIEWS; -EXPLAIN SHOW MATERIALIZED VIEWS '*test*'; -SHOW MATERIALIZED VIEWS '*test*'; -SHOW MATERIALIZED VIEWS '*view2'; -EXPLAIN SHOW MATERIALIZED VIEWS LIKE 'shtb_test1_view1|shtb_test1_view2'; -SHOW MATERIALIZED VIEWS LIKE 'shtb_test1_view1|shtb_test1_view2'; +EXPLAIN SHOW MATERIALIZED VIEWS '%test%'; +SHOW MATERIALIZED VIEWS '%test%'; +SHOW MATERIALIZED VIEWS '%view2'; USE test2; -SHOW MATERIALIZED VIEWS 'shtb_*'; +SHOW MATERIALIZED VIEWS 'shtb_%'; -- SHOW MATERIALIZED VIEWS basic syntax tests USE default; @@ -48,8 +48,8 @@ SHOW MATERIALIZED VIEWS FROM test2; EXPLAIN SHOW MATERIALIZED VIEWS IN test1; SHOW MATERIALIZED VIEWS IN test1; SHOW MATERIALIZED VIEWS IN default; -EXPLAIN SHOW MATERIALIZED VIEWS IN test1 "shtb_test*"; -SHOW MATERIALIZED VIEWS IN test1 "shtb_test*"; +EXPLAIN SHOW MATERIALIZED VIEWS IN test1 "shtb_test%"; +SHOW MATERIALIZED VIEWS IN test1 "shtb_test%"; DESCRIBE FORMATTED test1.shtb_full_view2; DESCRIBE FORMATTED test1.shtb_test1_view1; DESCRIBE FORMATTED test1.shtb_test1_view2; diff --git ql/src/test/queries/clientpositive/show_tables.q ql/src/test/queries/clientpositive/show_tables.q index 8576daa689..6b358b2489 100644 --- ql/src/test/queries/clientpositive/show_tables.q +++ ql/src/test/queries/clientpositive/show_tables.q @@ -1,15 +1,12 @@ +-- NO_SESSION_REUSE + CREATE TABLE shtb_test1_n0(KEY STRING, VALUE STRING) PARTITIONED BY(ds STRING) STORED AS TEXTFILE; CREATE TABLE shtb_test2_n0(KEY STRING, VALUE STRING) PARTITIONED BY(ds STRING) STORED AS TEXTFILE; EXPLAIN -SHOW TABLES 'shtb_*'; - -SHOW TABLES 'shtb_*'; - -EXPLAIN -SHOW TABLES LIKE 'shtb_test1_n0|shtb_test2_n0'; +SHOW TABLES 'shtb_%'; -SHOW TABLES LIKE 'shtb_test1_n0|shtb_test2_n0'; +SHOW TABLES 'shtb_%'; -- SHOW TABLES FROM/IN database CREATE DATABASE test_db; @@ -29,8 +26,8 @@ EXPLAIN SHOW TABLES IN test_db; SHOW TABLES IN test_db; EXPLAIN SHOW EXTENDED TABLES IN test_db; SHOW EXTENDED TABLES IN test_db; -EXPLAIN SHOW TABLES IN test_db "test*"; -SHOW TABLES IN test_db "test*"; +EXPLAIN SHOW TABLES IN test_db "test%"; +SHOW TABLES IN test_db "test%"; EXPLAIN SHOW TABLES IN test_db LIKE "nomatch"; SHOW TABLES IN test_db LIKE "nomatch"; EXPLAIN SHOW TABLES IN test_db WHERE `table_type` = "MANAGED_TABLE"; @@ -40,12 +37,15 @@ SHOW EXTENDED TABLES IN test_db WHERE `table_type` = "VIRTUAL_VIEW"; -- SHOW TABLE EXTENDED basic syntax tests and wildcard SHOW TABLE EXTENDED IN test_db LIKE foo_n4; +SHOW TABLE EXTENDED IN test_db LIKE "foo\_n4"; +SHOW TABLE EXTENDED IN test_db LIKE foo_n_; SHOW TABLE EXTENDED IN test_db LIKE "foo_n4"; SHOW TABLE EXTENDED IN test_db LIKE 'foo_n4'; SHOW TABLE EXTENDED IN test_db LIKE `foo_n4`; -SHOW TABLE EXTENDED IN test_db LIKE 'ba*'; -SHOW TABLE EXTENDED IN test_db LIKE "ba*"; -SHOW TABLE EXTENDED IN test_db LIKE `ba*`; +SHOW TABLE EXTENDED IN test_db LIKE 'ba%'; +SHOW TABLE EXTENDED IN test_db LIKE "ba%"; +SHOW TABLE EXTENDED IN test_db LIKE `ba%`; +SHOW TABLE EXTENDED IN test_db LIKE `ba_`; -- SHOW TABLES from a database with a name that requires escaping CREATE DATABASE `database`; diff --git ql/src/test/queries/clientpositive/show_tablestatus.q ql/src/test/queries/clientpositive/show_tablestatus.q index d8f04ec30d..7ae5c2d89e 100644 --- ql/src/test/queries/clientpositive/show_tablestatus.q +++ ql/src/test/queries/clientpositive/show_tablestatus.q @@ -1,5 +1,7 @@ --! qt:dataset:srcpart --! qt:dataset:src +-- NO_SESSION_REUSE + set hive.support.quoted.identifiers=none; EXPLAIN SHOW TABLE EXTENDED IN default LIKE `src`; @@ -10,14 +12,14 @@ SHOW TABLE EXTENDED from default LIKE `src`; SHOW TABLE EXTENDED LIKE `src`; -SHOW TABLE EXTENDED LIKE `src.?`; +SHOW TABLE EXTENDED LIKE `src_`; -SHOW TABLE EXTENDED from default LIKE `src.?`; +SHOW TABLE EXTENDED from default LIKE `src_`; -SHOW TABLE EXTENDED LIKE `^s.*`; +SHOW TABLE EXTENDED LIKE "%"; -SHOW TABLE EXTENDED from default LIKE `^s.*`; +SHOW TABLE EXTENDED from default LIKE "%"; SHOW TABLE EXTENDED LIKE `srcpart` PARTITION(ds='2008-04-08', hr=11); -SHOW TABLE EXTENDED from default LIKE src; \ No newline at end of file +SHOW TABLE EXTENDED from default LIKE src; diff --git ql/src/test/queries/clientpositive/show_views.q ql/src/test/queries/clientpositive/show_views.q index 1af89b6d9e..8bb539ecb7 100644 --- ql/src/test/queries/clientpositive/show_views.q +++ ql/src/test/queries/clientpositive/show_views.q @@ -1,3 +1,5 @@ +-- NO_SESSION_REUSE + CREATE DATABASE test1; CREATE DATABASE test2; @@ -15,14 +17,12 @@ CREATE VIEW shtb_test2_view2_n0 AS SELECT * FROM shtb_test2_n1 where KEY > 100 a USE test1; EXPLAIN SHOW VIEWS; SHOW VIEWS; -EXPLAIN SHOW VIEWS 'test_*'; -SHOW VIEWS 'test_*'; -SHOW VIEWS '*view2'; -EXPLAIN SHOW VIEWS LIKE 'test_view1|test_view2'; -SHOW VIEWS LIKE 'test_view1|test_view2'; +EXPLAIN SHOW VIEWS 'test_%'; +SHOW VIEWS 'test_%'; +SHOW VIEWS '%view2'; USE test2; -SHOW VIEWS 'shtb_*'; +SHOW VIEWS 'shtb_%'; -- SHOW VIEWS basic syntax tests USE default; @@ -32,8 +32,8 @@ SHOW VIEWS FROM test2; EXPLAIN SHOW VIEWS IN test1; SHOW VIEWS IN test1; SHOW VIEWS IN default; -EXPLAIN SHOW VIEWS IN test1 "shtb_test_*"; -SHOW VIEWS IN test1 "shtb_test_*"; +EXPLAIN SHOW VIEWS IN test1 "shtb_test_%"; +SHOW VIEWS IN test1 "shtb_test_%"; SHOW VIEWS IN test2 LIKE "nomatch"; -- SHOW VIEWS from a database with a name that requires escaping diff --git ql/src/test/queries/clientpositive/temp_table_names.q ql/src/test/queries/clientpositive/temp_table_names.q index bac26d3bf3..1fc8aed6fa 100644 --- ql/src/test/queries/clientpositive/temp_table_names.q +++ ql/src/test/queries/clientpositive/temp_table_names.q @@ -2,7 +2,7 @@ -- Test temp tables with upper/lower case names create temporary table Default.Temp_Table_Names (C1 string, c2 string); -show tables 'Temp_Table*'; +show tables 'Temp_Table%'; show tables in default 'temp_table_names'; show tables in DEFAULT 'TEMP_TABLE_NAMES'; diff --git ql/src/test/queries/clientpositive/temp_table_truncate.q ql/src/test/queries/clientpositive/temp_table_truncate.q index 93a54d9f46..8e40ee2d55 100644 --- ql/src/test/queries/clientpositive/temp_table_truncate.q +++ ql/src/test/queries/clientpositive/temp_table_truncate.q @@ -7,7 +7,7 @@ CREATE TEMPORARY TABLE tmp_srcpart AS SELECT * FROM srcpart; DESCRIBE tmp_src; DESCRIBE tmp_srcpart; -SHOW TABLES LIKE "tmp_src*"; +SHOW TABLES LIKE "tmp_src%"; SELECT count(*) FROM tmp_src; SELECT count(*) FROM tmp_srcpart; diff --git ql/src/test/results/clientnegative/show_tablestatus.q.out ql/src/test/results/clientnegative/show_tablestatus.q.out index ed962e7eca..c4179170a8 100644 --- ql/src/test/results/clientnegative/show_tablestatus.q.out +++ ql/src/test/results/clientnegative/show_tablestatus.q.out @@ -1 +1 @@ -FAILED: SemanticException [Error 10001]: Table not found srcpar* +FAILED: SemanticException [Error 10001]: Table not found srcpar% diff --git ql/src/test/results/clientpositive/create_view.q.out ql/src/test/results/clientpositive/create_view.q.out index 7414d4749d..9a251fcd2f 100644 --- ql/src/test/results/clientpositive/create_view.q.out +++ ql/src/test/results/clientpositive/create_view.q.out @@ -226,18 +226,18 @@ STAGE PLANS: Processor Tree: ListSink -PREHOOK: query: SHOW TABLES 'view.*' +PREHOOK: query: SHOW TABLES 'view%' PREHOOK: type: SHOWTABLES PREHOOK: Input: database:default -POSTHOOK: query: SHOW TABLES 'view.*' +POSTHOOK: query: SHOW TABLES 'view%' POSTHOOK: type: SHOWTABLES POSTHOOK: Input: database:default view1 view2 view3 -PREHOOK: query: SHOW VIEWS 'view.*' +PREHOOK: query: SHOW VIEWS 'view%' PREHOOK: type: SHOWVIEWS -POSTHOOK: query: SHOW VIEWS 'view.*' +POSTHOOK: query: SHOW VIEWS 'view%' POSTHOOK: type: SHOWVIEWS view1 view2 diff --git ql/src/test/results/clientpositive/encrypted/encryption_auto_purge_tables.q.out ql/src/test/results/clientpositive/encrypted/encryption_auto_purge_tables.q.out index 1d7707cc76..7889719c6d 100644 --- ql/src/test/results/clientpositive/encrypted/encryption_auto_purge_tables.q.out +++ ql/src/test/results/clientpositive/encrypted/encryption_auto_purge_tables.q.out @@ -18,10 +18,10 @@ POSTHOOK: Output: database:default POSTHOOK: Output: default@encrypted_table_n5 Encryption key created: 'key_128' Encryption zone created: '/build/ql/test/data/warehouse/default/encrypted_table' using key: 'key_128' -PREHOOK: query: SHOW TABLES LIKE "encrypted_*" +PREHOOK: query: SHOW TABLES LIKE "encrypted_%" PREHOOK: type: SHOWTABLES PREHOOK: Input: database:default -POSTHOOK: query: SHOW TABLES LIKE "encrypted_*" +POSTHOOK: query: SHOW TABLES LIKE "encrypted_%" POSTHOOK: type: SHOWTABLES POSTHOOK: Input: database:default encrypted_table_n5 @@ -139,10 +139,10 @@ POSTHOOK: query: DROP TABLE encrypted_ext_table_n0 POSTHOOK: type: DROPTABLE POSTHOOK: Input: default@encrypted_ext_table_n0 POSTHOOK: Output: default@encrypted_ext_table_n0 -PREHOOK: query: SHOW TABLES LIKE "encrypted_*" +PREHOOK: query: SHOW TABLES LIKE "encrypted_%" PREHOOK: type: SHOWTABLES PREHOOK: Input: database:default -POSTHOOK: query: SHOW TABLES LIKE "encrypted_*" +POSTHOOK: query: SHOW TABLES LIKE "encrypted_%" POSTHOOK: type: SHOWTABLES POSTHOOK: Input: database:default PREHOOK: query: DROP TABLE IF EXISTS encrypted_table_n5 PURGE diff --git ql/src/test/results/clientpositive/encrypted/encryption_drop_table.q.out ql/src/test/results/clientpositive/encrypted/encryption_drop_table.q.out index 90ec23641f..6a93e0c32c 100644 --- ql/src/test/results/clientpositive/encrypted/encryption_drop_table.q.out +++ ql/src/test/results/clientpositive/encrypted/encryption_drop_table.q.out @@ -38,10 +38,10 @@ POSTHOOK: type: CREATETABLE POSTHOOK: Input: hdfs://### HDFS PATH ### POSTHOOK: Output: database:default POSTHOOK: Output: default@encrypted_ext_table -PREHOOK: query: SHOW TABLES LIKE "encrypted_*" +PREHOOK: query: SHOW TABLES LIKE "encrypted_%" PREHOOK: type: SHOWTABLES PREHOOK: Input: database:default -POSTHOOK: query: SHOW TABLES LIKE "encrypted_*" +POSTHOOK: query: SHOW TABLES LIKE "encrypted_%" POSTHOOK: type: SHOWTABLES POSTHOOK: Input: database:default encrypted_ext_table @@ -54,10 +54,10 @@ POSTHOOK: query: DROP TABLE default.encrypted_ext_table POSTHOOK: type: DROPTABLE POSTHOOK: Input: default@encrypted_ext_table POSTHOOK: Output: default@encrypted_ext_table -PREHOOK: query: SHOW TABLES LIKE "encrypted_*" +PREHOOK: query: SHOW TABLES LIKE "encrypted_%" PREHOOK: type: SHOWTABLES PREHOOK: Input: database:default -POSTHOOK: query: SHOW TABLES LIKE "encrypted_*" +POSTHOOK: query: SHOW TABLES LIKE "encrypted_%" POSTHOOK: type: SHOWTABLES POSTHOOK: Input: database:default encrypted_table_n2 @@ -69,10 +69,10 @@ POSTHOOK: query: DROP TABLE default.encrypted_table_n2 POSTHOOK: type: DROPTABLE POSTHOOK: Input: default@encrypted_table_n2 POSTHOOK: Output: default@encrypted_table_n2 -PREHOOK: query: SHOW TABLES LIKE "encrypted_*" +PREHOOK: query: SHOW TABLES LIKE "encrypted_%" PREHOOK: type: SHOWTABLES PREHOOK: Input: database:default -POSTHOOK: query: SHOW TABLES LIKE "encrypted_*" +POSTHOOK: query: SHOW TABLES LIKE "encrypted_%" POSTHOOK: type: SHOWTABLES POSTHOOK: Input: database:default PREHOOK: query: DROP TABLE IF EXISTS encrypted_table1 @@ -142,10 +142,10 @@ POSTHOOK: query: DROP TABLE default.encrypted_table1 POSTHOOK: type: DROPTABLE POSTHOOK: Input: default@encrypted_table1 POSTHOOK: Output: default@encrypted_table1 -PREHOOK: query: SHOW TABLES LIKE "encrypted_*" +PREHOOK: query: SHOW TABLES LIKE "encrypted_%" PREHOOK: type: SHOWTABLES PREHOOK: Input: database:default -POSTHOOK: query: SHOW TABLES LIKE "encrypted_*" +POSTHOOK: query: SHOW TABLES LIKE "encrypted_%" POSTHOOK: type: SHOWTABLES POSTHOOK: Input: database:default FAILED: SemanticException [Error 10001]: Table not found encrypted_table1 @@ -153,9 +153,9 @@ PREHOOK: query: DROP TABLE default.encrypted_table1 PREHOOK: type: DROPTABLE POSTHOOK: query: DROP TABLE default.encrypted_table1 POSTHOOK: type: DROPTABLE -PREHOOK: query: SHOW TABLES LIKE "encrypted_*" +PREHOOK: query: SHOW TABLES LIKE "encrypted_%" PREHOOK: type: SHOWTABLES PREHOOK: Input: database:default -POSTHOOK: query: SHOW TABLES LIKE "encrypted_*" +POSTHOOK: query: SHOW TABLES LIKE "encrypted_%" POSTHOOK: type: SHOWTABLES POSTHOOK: Input: database:default diff --git ql/src/test/results/clientpositive/encrypted/encryption_move_tbl.q.out ql/src/test/results/clientpositive/encrypted/encryption_move_tbl.q.out index ff3bda628c..354d048dcc 100644 --- ql/src/test/results/clientpositive/encrypted/encryption_move_tbl.q.out +++ ql/src/test/results/clientpositive/encrypted/encryption_move_tbl.q.out @@ -38,10 +38,10 @@ POSTHOOK: Input: default@src POSTHOOK: Output: default@encrypted_table_n1 POSTHOOK: Lineage: encrypted_table_n1.key EXPRESSION [(src)src.FieldSchema(name:key, type:string, comment:default), ] POSTHOOK: Lineage: encrypted_table_n1.value SIMPLE [(src)src.FieldSchema(name:value, type:string, comment:default), ] -PREHOOK: query: SHOW TABLES LIKE "encrypted_*" +PREHOOK: query: SHOW TABLES LIKE "encrypted_%" PREHOOK: type: SHOWTABLES PREHOOK: Input: database:default -POSTHOOK: query: SHOW TABLES LIKE "encrypted_*" +POSTHOOK: query: SHOW TABLES LIKE "encrypted_%" POSTHOOK: type: SHOWTABLES POSTHOOK: Input: database:default encrypted_table_n1 diff --git ql/src/test/results/clientpositive/llap/alter1.q.out ql/src/test/results/clientpositive/llap/alter1.q.out index 1fef592df4..1807b3a007 100644 --- ql/src/test/results/clientpositive/llap/alter1.q.out +++ ql/src/test/results/clientpositive/llap/alter1.q.out @@ -185,10 +185,10 @@ POSTHOOK: query: DROP TABLE alter1 POSTHOOK: type: DROPTABLE POSTHOOK: Input: default@alter1 POSTHOOK: Output: default@alter1 -PREHOOK: query: SHOW TABLES LIKE "alter*" +PREHOOK: query: SHOW TABLES LIKE "alter%" PREHOOK: type: SHOWTABLES PREHOOK: Input: database:default -POSTHOOK: query: SHOW TABLES LIKE "alter*" +POSTHOOK: query: SHOW TABLES LIKE "alter%" POSTHOOK: type: SHOWTABLES POSTHOOK: Input: database:default PREHOOK: query: CREATE DATABASE alter1_db diff --git ql/src/test/results/clientpositive/llap/alter2.q.out ql/src/test/results/clientpositive/llap/alter2.q.out index b9d1b6170a..86bcc18312 100644 --- ql/src/test/results/clientpositive/llap/alter2.q.out +++ ql/src/test/results/clientpositive/llap/alter2.q.out @@ -198,10 +198,10 @@ POSTHOOK: query: DROP TABLE alter2 POSTHOOK: type: DROPTABLE POSTHOOK: Input: default@alter2 POSTHOOK: Output: default@alter2 -PREHOOK: query: SHOW TABLES LIKE "alter*" +PREHOOK: query: SHOW TABLES LIKE "alter%" PREHOOK: type: SHOWTABLES PREHOOK: Input: database:default -POSTHOOK: query: SHOW TABLES LIKE "alter*" +POSTHOOK: query: SHOW TABLES LIKE "alter%" POSTHOOK: type: SHOWTABLES POSTHOOK: Input: database:default PREHOOK: query: CREATE DATABASE alter2_db @@ -216,10 +216,10 @@ PREHOOK: Input: database:alter2_db POSTHOOK: query: USE alter2_db POSTHOOK: type: SWITCHDATABASE POSTHOOK: Input: database:alter2_db -PREHOOK: query: SHOW TABLES LIKE "alter*" +PREHOOK: query: SHOW TABLES LIKE "alter%" PREHOOK: type: SHOWTABLES PREHOOK: Input: database:alter2_db -POSTHOOK: query: SHOW TABLES LIKE "alter*" +POSTHOOK: query: SHOW TABLES LIKE "alter%" POSTHOOK: type: SHOWTABLES POSTHOOK: Input: database:alter2_db PREHOOK: query: CREATE TABLE alter2(a int, b int) PARTITIONED BY (insertdate string) diff --git ql/src/test/results/clientpositive/llap/alter3.q.out ql/src/test/results/clientpositive/llap/alter3.q.out index 7ceeb3af9c..b77be8a085 100644 --- ql/src/test/results/clientpositive/llap/alter3.q.out +++ ql/src/test/results/clientpositive/llap/alter3.q.out @@ -174,10 +174,10 @@ POSTHOOK: query: DROP TABLE alter3_like_renamed POSTHOOK: type: DROPTABLE POSTHOOK: Input: default@alter3_like_renamed POSTHOOK: Output: default@alter3_like_renamed -PREHOOK: query: SHOW TABLES LIKE "alter3_*" +PREHOOK: query: SHOW TABLES LIKE "alter3_%" PREHOOK: type: SHOWTABLES PREHOOK: Input: database:default -POSTHOOK: query: SHOW TABLES LIKE "alter3_*" +POSTHOOK: query: SHOW TABLES LIKE "alter3_%" POSTHOOK: type: SHOWTABLES POSTHOOK: Input: database:default PREHOOK: query: CREATE DATABASE alter3_db diff --git ql/src/test/results/clientpositive/llap/alter4.q.out ql/src/test/results/clientpositive/llap/alter4.q.out index 74e2dfb6b6..7f4e5ee3ad 100644 --- ql/src/test/results/clientpositive/llap/alter4.q.out +++ ql/src/test/results/clientpositive/llap/alter4.q.out @@ -42,10 +42,10 @@ POSTHOOK: query: DROP TABLE set_bucketing_test POSTHOOK: type: DROPTABLE POSTHOOK: Input: default@set_bucketing_test POSTHOOK: Output: default@set_bucketing_test -PREHOOK: query: SHOW TABLES LIKE "set_bucketing_*" +PREHOOK: query: SHOW TABLES LIKE "set_bucketing_%" PREHOOK: type: SHOWTABLES PREHOOK: Input: database:default -POSTHOOK: query: SHOW TABLES LIKE "set_bucketing_*" +POSTHOOK: query: SHOW TABLES LIKE "set_bucketing_%" POSTHOOK: type: SHOWTABLES POSTHOOK: Input: database:default PREHOOK: query: CREATE DATABASE alter4_db diff --git ql/src/test/results/clientpositive/llap/alter5.q.out ql/src/test/results/clientpositive/llap/alter5.q.out index 61a04f2702..ce63719cf1 100644 --- ql/src/test/results/clientpositive/llap/alter5.q.out +++ ql/src/test/results/clientpositive/llap/alter5.q.out @@ -100,10 +100,10 @@ POSTHOOK: query: DROP TABLE alter5_n1 POSTHOOK: type: DROPTABLE POSTHOOK: Input: default@alter5_n1 POSTHOOK: Output: default@alter5_n1 -PREHOOK: query: SHOW TABLES LIKE "alter*" +PREHOOK: query: SHOW TABLES LIKE "alter%" PREHOOK: type: SHOWTABLES PREHOOK: Input: database:default -POSTHOOK: query: SHOW TABLES LIKE "alter*" +POSTHOOK: query: SHOW TABLES LIKE "alter%" POSTHOOK: type: SHOWTABLES POSTHOOK: Input: database:default PREHOOK: query: CREATE DATABASE alter5_db diff --git ql/src/test/results/clientpositive/llap/describe_table_json.q.out ql/src/test/results/clientpositive/llap/describe_table_json.q.out index cc33e6dccc..9e30244ac5 100644 --- ql/src/test/results/clientpositive/llap/describe_table_json.q.out +++ ql/src/test/results/clientpositive/llap/describe_table_json.q.out @@ -6,16 +6,16 @@ POSTHOOK: query: CREATE TABLE IF NOT EXISTS jsontable (key INT, value STRING) CO POSTHOOK: type: CREATETABLE POSTHOOK: Output: database:default POSTHOOK: Output: default@jsontable -PREHOOK: query: SHOW TABLES LIKE 'jsontab*' +PREHOOK: query: SHOW TABLES LIKE 'jsontab%' PREHOOK: type: SHOWTABLES PREHOOK: Input: database:default -POSTHOOK: query: SHOW TABLES LIKE 'jsontab*' +POSTHOOK: query: SHOW TABLES LIKE 'jsontab%' POSTHOOK: type: SHOWTABLES POSTHOOK: Input: database:default {"tables":["jsontable"]} -PREHOOK: query: SHOW TABLE EXTENDED LIKE 'jsontab*' +PREHOOK: query: SHOW TABLE EXTENDED LIKE 'jsontab%' PREHOOK: type: SHOW_TABLESTATUS -POSTHOOK: query: SHOW TABLE EXTENDED LIKE 'jsontab*' +POSTHOOK: query: SHOW TABLE EXTENDED LIKE 'jsontab%' POSTHOOK: type: SHOW_TABLESTATUS #### A masked pattern was here #### PREHOOK: query: ALTER TABLE jsontable SET TBLPROPERTIES ('id' = 'jsontable') diff --git ql/src/test/results/clientpositive/llap/input2.q.out ql/src/test/results/clientpositive/llap/input2.q.out index 28f7da4f02..7a431913c0 100644 --- ql/src/test/results/clientpositive/llap/input2.q.out +++ ql/src/test/results/clientpositive/llap/input2.q.out @@ -39,10 +39,10 @@ POSTHOOK: Input: default@test2b a array b double c map -PREHOOK: query: SHOW TABLES LIKE "TEST2*" +PREHOOK: query: SHOW TABLES LIKE "TEST2%" PREHOOK: type: SHOWTABLES PREHOOK: Input: database:default -POSTHOOK: query: SHOW TABLES LIKE "TEST2*" +POSTHOOK: query: SHOW TABLES LIKE "TEST2%" POSTHOOK: type: SHOWTABLES POSTHOOK: Input: database:default test2a @@ -55,10 +55,10 @@ POSTHOOK: query: DROP TABLE TEST2a POSTHOOK: type: DROPTABLE POSTHOOK: Input: default@test2a POSTHOOK: Output: default@test2a -PREHOOK: query: SHOW TABLES LIKE "TEST2*" +PREHOOK: query: SHOW TABLES LIKE "TEST2%" PREHOOK: type: SHOWTABLES PREHOOK: Input: database:default -POSTHOOK: query: SHOW TABLES LIKE "TEST2*" +POSTHOOK: query: SHOW TABLES LIKE "TEST2%" POSTHOOK: type: SHOWTABLES POSTHOOK: Input: database:default test2b @@ -71,11 +71,11 @@ POSTHOOK: type: DROPTABLE POSTHOOK: Input: default@test2b POSTHOOK: Output: default@test2b PREHOOK: query: EXPLAIN -SHOW TABLES LIKE "TEST2*" +SHOW TABLES LIKE "TEST2%" PREHOOK: type: SHOWTABLES PREHOOK: Input: database:default POSTHOOK: query: EXPLAIN -SHOW TABLES LIKE "TEST2*" +SHOW TABLES LIKE "TEST2%" POSTHOOK: type: SHOWTABLES POSTHOOK: Input: database:default STAGE DEPENDENCIES: @@ -86,7 +86,7 @@ STAGE PLANS: Stage: Stage-0 Show Tables database name: default - pattern: TEST2* + pattern: TEST2% Stage: Stage-1 Fetch Operator diff --git ql/src/test/results/clientpositive/llap/input3.q.out ql/src/test/results/clientpositive/llap/input3.q.out index 0365ff25ba..6e530b1bbd 100644 --- ql/src/test/results/clientpositive/llap/input3.q.out +++ ql/src/test/results/clientpositive/llap/input3.q.out @@ -31,10 +31,10 @@ POSTHOOK: Input: default@test3b a array b double c map -PREHOOK: query: SHOW TABLES LIKE "TEST3*" +PREHOOK: query: SHOW TABLES LIKE "TEST3%" PREHOOK: type: SHOWTABLES PREHOOK: Input: database:default -POSTHOOK: query: SHOW TABLES LIKE "TEST3*" +POSTHOOK: query: SHOW TABLES LIKE "TEST3%" POSTHOOK: type: SHOWTABLES POSTHOOK: Input: database:default test3a @@ -114,10 +114,10 @@ a array b double c map x double -PREHOOK: query: SHOW TABLES LIKE "TEST3*" +PREHOOK: query: SHOW TABLES LIKE "TEST3%" PREHOOK: type: SHOWTABLES PREHOOK: Input: database:default -POSTHOOK: query: SHOW TABLES LIKE "TEST3*" +POSTHOOK: query: SHOW TABLES LIKE "TEST3%" POSTHOOK: type: SHOWTABLES POSTHOOK: Input: database:default test3a diff --git ql/src/test/results/clientpositive/llap/rename_column.q.out ql/src/test/results/clientpositive/llap/rename_column.q.out index 15816bbf98..7e735f5b91 100644 --- ql/src/test/results/clientpositive/llap/rename_column.q.out +++ ql/src/test/results/clientpositive/llap/rename_column.q.out @@ -203,10 +203,10 @@ POSTHOOK: query: DROP TABLE kv_rename_test POSTHOOK: type: DROPTABLE POSTHOOK: Input: default@kv_rename_test POSTHOOK: Output: default@kv_rename_test -PREHOOK: query: SHOW TABLES LIKE "kv_rename_*" +PREHOOK: query: SHOW TABLES LIKE "kv_rename_%" PREHOOK: type: SHOWTABLES PREHOOK: Input: database:default -POSTHOOK: query: SHOW TABLES LIKE "kv_rename_*" +POSTHOOK: query: SHOW TABLES LIKE "kv_rename_%" POSTHOOK: type: SHOWTABLES POSTHOOK: Input: database:default PREHOOK: query: CREATE DATABASE kv_rename_test_db @@ -365,9 +365,9 @@ POSTHOOK: query: DROP TABLE kv_rename_test POSTHOOK: type: DROPTABLE POSTHOOK: Input: kv_rename_test_db@kv_rename_test POSTHOOK: Output: kv_rename_test_db@kv_rename_test -PREHOOK: query: SHOW TABLES LIKE "kv_rename_*" +PREHOOK: query: SHOW TABLES LIKE "kv_rename_%" PREHOOK: type: SHOWTABLES PREHOOK: Input: database:kv_rename_test_db -POSTHOOK: query: SHOW TABLES LIKE "kv_rename_*" +POSTHOOK: query: SHOW TABLES LIKE "kv_rename_%" POSTHOOK: type: SHOWTABLES POSTHOOK: Input: database:kv_rename_test_db diff --git ql/src/test/results/clientpositive/llap/show_materialized_views.q.out ql/src/test/results/clientpositive/llap/show_materialized_views.q.out index d377f97f14..5eb57a9e22 100644 --- ql/src/test/results/clientpositive/llap/show_materialized_views.q.out +++ ql/src/test/results/clientpositive/llap/show_materialized_views.q.out @@ -149,9 +149,9 @@ POSTHOOK: type: SHOWMATERIALIZEDVIEWS shtb_full_view2 Yes Manual refresh (Valid for 5min) shtb_test1_view1 No Manual refresh shtb_test1_view2 Yes Manual refresh (Valid always) -PREHOOK: query: EXPLAIN SHOW MATERIALIZED VIEWS '*test*' +PREHOOK: query: EXPLAIN SHOW MATERIALIZED VIEWS '%test%' PREHOOK: type: SHOWMATERIALIZEDVIEWS -POSTHOOK: query: EXPLAIN SHOW MATERIALIZED VIEWS '*test*' +POSTHOOK: query: EXPLAIN SHOW MATERIALIZED VIEWS '%test%' POSTHOOK: type: SHOWMATERIALIZEDVIEWS STAGE DEPENDENCIES: Stage-0 is a root stage @@ -161,7 +161,7 @@ STAGE PLANS: Stage: Stage-0 Show Materialized Views database name: test1 - pattern: *test* + pattern: %test% Stage: Stage-1 Fetch Operator @@ -169,56 +169,29 @@ STAGE PLANS: Processor Tree: ListSink -PREHOOK: query: SHOW MATERIALIZED VIEWS '*test*' +PREHOOK: query: SHOW MATERIALIZED VIEWS '%test%' PREHOOK: type: SHOWMATERIALIZEDVIEWS -POSTHOOK: query: SHOW MATERIALIZED VIEWS '*test*' +POSTHOOK: query: SHOW MATERIALIZED VIEWS '%test%' POSTHOOK: type: SHOWMATERIALIZEDVIEWS # MV Name Rewriting Enabled Mode shtb_test1_view1 No Manual refresh shtb_test1_view2 Yes Manual refresh (Valid always) -PREHOOK: query: SHOW MATERIALIZED VIEWS '*view2' +PREHOOK: query: SHOW MATERIALIZED VIEWS '%view2' PREHOOK: type: SHOWMATERIALIZEDVIEWS -POSTHOOK: query: SHOW MATERIALIZED VIEWS '*view2' +POSTHOOK: query: SHOW MATERIALIZED VIEWS '%view2' POSTHOOK: type: SHOWMATERIALIZEDVIEWS # MV Name Rewriting Enabled Mode shtb_full_view2 Yes Manual refresh (Valid for 5min) shtb_test1_view2 Yes Manual refresh (Valid always) -PREHOOK: query: EXPLAIN SHOW MATERIALIZED VIEWS LIKE 'shtb_test1_view1|shtb_test1_view2' -PREHOOK: type: SHOWMATERIALIZEDVIEWS -POSTHOOK: query: EXPLAIN SHOW MATERIALIZED VIEWS LIKE 'shtb_test1_view1|shtb_test1_view2' -POSTHOOK: type: SHOWMATERIALIZEDVIEWS -STAGE DEPENDENCIES: - Stage-0 is a root stage - Stage-1 depends on stages: Stage-0 - -STAGE PLANS: - Stage: Stage-0 - Show Materialized Views - database name: test1 - pattern: shtb_test1_view1|shtb_test1_view2 - - Stage: Stage-1 - Fetch Operator - limit: -1 - Processor Tree: - ListSink - -PREHOOK: query: SHOW MATERIALIZED VIEWS LIKE 'shtb_test1_view1|shtb_test1_view2' -PREHOOK: type: SHOWMATERIALIZEDVIEWS -POSTHOOK: query: SHOW MATERIALIZED VIEWS LIKE 'shtb_test1_view1|shtb_test1_view2' -POSTHOOK: type: SHOWMATERIALIZEDVIEWS -# MV Name Rewriting Enabled Mode -shtb_test1_view1 No Manual refresh -shtb_test1_view2 Yes Manual refresh (Valid always) PREHOOK: query: USE test2 PREHOOK: type: SWITCHDATABASE PREHOOK: Input: database:test2 POSTHOOK: query: USE test2 POSTHOOK: type: SWITCHDATABASE POSTHOOK: Input: database:test2 -PREHOOK: query: SHOW MATERIALIZED VIEWS 'shtb_*' +PREHOOK: query: SHOW MATERIALIZED VIEWS 'shtb_%' PREHOOK: type: SHOWMATERIALIZEDVIEWS -POSTHOOK: query: SHOW MATERIALIZED VIEWS 'shtb_*' +POSTHOOK: query: SHOW MATERIALIZED VIEWS 'shtb_%' POSTHOOK: type: SHOWMATERIALIZEDVIEWS # MV Name Rewriting Enabled Mode shtb_test1_view1 No Manual refresh @@ -294,9 +267,9 @@ PREHOOK: query: SHOW MATERIALIZED VIEWS IN default PREHOOK: type: SHOWMATERIALIZEDVIEWS POSTHOOK: query: SHOW MATERIALIZED VIEWS IN default POSTHOOK: type: SHOWMATERIALIZEDVIEWS -PREHOOK: query: EXPLAIN SHOW MATERIALIZED VIEWS IN test1 "shtb_test*" +PREHOOK: query: EXPLAIN SHOW MATERIALIZED VIEWS IN test1 "shtb_test%" PREHOOK: type: SHOWMATERIALIZEDVIEWS -POSTHOOK: query: EXPLAIN SHOW MATERIALIZED VIEWS IN test1 "shtb_test*" +POSTHOOK: query: EXPLAIN SHOW MATERIALIZED VIEWS IN test1 "shtb_test%" POSTHOOK: type: SHOWMATERIALIZEDVIEWS STAGE DEPENDENCIES: Stage-0 is a root stage @@ -306,7 +279,7 @@ STAGE PLANS: Stage: Stage-0 Show Materialized Views database name: test1 - pattern: shtb_test* + pattern: shtb_test% Stage: Stage-1 Fetch Operator @@ -314,9 +287,9 @@ STAGE PLANS: Processor Tree: ListSink -PREHOOK: query: SHOW MATERIALIZED VIEWS IN test1 "shtb_test*" +PREHOOK: query: SHOW MATERIALIZED VIEWS IN test1 "shtb_test%" PREHOOK: type: SHOWMATERIALIZEDVIEWS -POSTHOOK: query: SHOW MATERIALIZED VIEWS IN test1 "shtb_test*" +POSTHOOK: query: SHOW MATERIALIZED VIEWS IN test1 "shtb_test%" POSTHOOK: type: SHOWMATERIALIZEDVIEWS # MV Name Rewriting Enabled Mode shtb_test1_view1 No Manual refresh diff --git ql/src/test/results/clientpositive/llap/show_tables.q.out ql/src/test/results/clientpositive/llap/show_tables.q.out index ade1690e89..dbdc52195b 100644 --- ql/src/test/results/clientpositive/llap/show_tables.q.out +++ ql/src/test/results/clientpositive/llap/show_tables.q.out @@ -15,11 +15,11 @@ POSTHOOK: type: CREATETABLE POSTHOOK: Output: database:default POSTHOOK: Output: default@shtb_test2_n0 PREHOOK: query: EXPLAIN -SHOW TABLES 'shtb_*' +SHOW TABLES 'shtb_%' PREHOOK: type: SHOWTABLES PREHOOK: Input: database:default POSTHOOK: query: EXPLAIN -SHOW TABLES 'shtb_*' +SHOW TABLES 'shtb_%' POSTHOOK: type: SHOWTABLES POSTHOOK: Input: database:default STAGE DEPENDENCIES: @@ -30,7 +30,7 @@ STAGE PLANS: Stage: Stage-0 Show Tables database name: default - pattern: shtb_* + pattern: shtb_% Stage: Stage-1 Fetch Operator @@ -38,42 +38,10 @@ STAGE PLANS: Processor Tree: ListSink -PREHOOK: query: SHOW TABLES 'shtb_*' +PREHOOK: query: SHOW TABLES 'shtb_%' PREHOOK: type: SHOWTABLES PREHOOK: Input: database:default -POSTHOOK: query: SHOW TABLES 'shtb_*' -POSTHOOK: type: SHOWTABLES -POSTHOOK: Input: database:default -shtb_test1_n0 -shtb_test2_n0 -PREHOOK: query: EXPLAIN -SHOW TABLES LIKE 'shtb_test1_n0|shtb_test2_n0' -PREHOOK: type: SHOWTABLES -PREHOOK: Input: database:default -POSTHOOK: query: EXPLAIN -SHOW TABLES LIKE 'shtb_test1_n0|shtb_test2_n0' -POSTHOOK: type: SHOWTABLES -POSTHOOK: Input: database:default -STAGE DEPENDENCIES: - Stage-0 is a root stage - Stage-1 depends on stages: Stage-0 - -STAGE PLANS: - Stage: Stage-0 - Show Tables - database name: default - pattern: shtb_test1_n0|shtb_test2_n0 - - Stage: Stage-1 - Fetch Operator - limit: -1 - Processor Tree: - ListSink - -PREHOOK: query: SHOW TABLES LIKE 'shtb_test1_n0|shtb_test2_n0' -PREHOOK: type: SHOWTABLES -PREHOOK: Input: database:default -POSTHOOK: query: SHOW TABLES LIKE 'shtb_test1_n0|shtb_test2_n0' +POSTHOOK: query: SHOW TABLES 'shtb_%' POSTHOOK: type: SHOWTABLES POSTHOOK: Input: database:default shtb_test1_n0 @@ -259,10 +227,10 @@ bar_n0 MANAGED_TABLE baz MANAGED_TABLE foo_n4 MANAGED_TABLE test_view_n100 VIRTUAL_VIEW -PREHOOK: query: EXPLAIN SHOW TABLES IN test_db "test*" +PREHOOK: query: EXPLAIN SHOW TABLES IN test_db "test%" PREHOOK: type: SHOWTABLES PREHOOK: Input: database:test_db -POSTHOOK: query: EXPLAIN SHOW TABLES IN test_db "test*" +POSTHOOK: query: EXPLAIN SHOW TABLES IN test_db "test%" POSTHOOK: type: SHOWTABLES POSTHOOK: Input: database:test_db STAGE DEPENDENCIES: @@ -273,7 +241,7 @@ STAGE PLANS: Stage: Stage-0 Show Tables database name: test_db - pattern: test* + pattern: test% Stage: Stage-1 Fetch Operator @@ -281,10 +249,10 @@ STAGE PLANS: Processor Tree: ListSink -PREHOOK: query: SHOW TABLES IN test_db "test*" +PREHOOK: query: SHOW TABLES IN test_db "test%" PREHOOK: type: SHOWTABLES PREHOOK: Input: database:test_db -POSTHOOK: query: SHOW TABLES IN test_db "test*" +POSTHOOK: query: SHOW TABLES IN test_db "test%" POSTHOOK: type: SHOWTABLES POSTHOOK: Input: database:test_db test_view_n100 @@ -395,6 +363,40 @@ maxFileSize:0 minFileSize:0 #### A masked pattern was here #### +PREHOOK: query: SHOW TABLE EXTENDED IN test_db LIKE "foo\_n4" +PREHOOK: type: SHOW_TABLESTATUS +POSTHOOK: query: SHOW TABLE EXTENDED IN test_db LIKE "foo\_n4" +POSTHOOK: type: SHOW_TABLESTATUS +tableName:foo_n4 +#### A masked pattern was here #### +inputformat:org.apache.hadoop.mapred.TextInputFormat +outputformat:org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat +columns:struct columns { i32 a} +partitioned:false +partitionColumns: +totalNumberFiles:0 +totalFileSize:0 +maxFileSize:0 +minFileSize:0 +#### A masked pattern was here #### + +PREHOOK: query: SHOW TABLE EXTENDED IN test_db LIKE foo_n_ +PREHOOK: type: SHOW_TABLESTATUS +POSTHOOK: query: SHOW TABLE EXTENDED IN test_db LIKE foo_n_ +POSTHOOK: type: SHOW_TABLESTATUS +tableName:foo_n4 +#### A masked pattern was here #### +inputformat:org.apache.hadoop.mapred.TextInputFormat +outputformat:org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat +columns:struct columns { i32 a} +partitioned:false +partitionColumns: +totalNumberFiles:0 +totalFileSize:0 +maxFileSize:0 +minFileSize:0 +#### A masked pattern was here #### + PREHOOK: query: SHOW TABLE EXTENDED IN test_db LIKE "foo_n4" PREHOOK: type: SHOW_TABLESTATUS POSTHOOK: query: SHOW TABLE EXTENDED IN test_db LIKE "foo_n4" @@ -446,9 +448,9 @@ maxFileSize:0 minFileSize:0 #### A masked pattern was here #### -PREHOOK: query: SHOW TABLE EXTENDED IN test_db LIKE 'ba*' +PREHOOK: query: SHOW TABLE EXTENDED IN test_db LIKE 'ba%' PREHOOK: type: SHOW_TABLESTATUS -POSTHOOK: query: SHOW TABLE EXTENDED IN test_db LIKE 'ba*' +POSTHOOK: query: SHOW TABLE EXTENDED IN test_db LIKE 'ba%' POSTHOOK: type: SHOW_TABLESTATUS tableName:bar_n0 #### A masked pattern was here #### @@ -476,9 +478,9 @@ maxFileSize:0 minFileSize:0 #### A masked pattern was here #### -PREHOOK: query: SHOW TABLE EXTENDED IN test_db LIKE "ba*" +PREHOOK: query: SHOW TABLE EXTENDED IN test_db LIKE "ba%" PREHOOK: type: SHOW_TABLESTATUS -POSTHOOK: query: SHOW TABLE EXTENDED IN test_db LIKE "ba*" +POSTHOOK: query: SHOW TABLE EXTENDED IN test_db LIKE "ba%" POSTHOOK: type: SHOW_TABLESTATUS tableName:bar_n0 #### A masked pattern was here #### @@ -506,9 +508,9 @@ maxFileSize:0 minFileSize:0 #### A masked pattern was here #### -PREHOOK: query: SHOW TABLE EXTENDED IN test_db LIKE `ba*` +PREHOOK: query: SHOW TABLE EXTENDED IN test_db LIKE `ba%` PREHOOK: type: SHOW_TABLESTATUS -POSTHOOK: query: SHOW TABLE EXTENDED IN test_db LIKE `ba*` +POSTHOOK: query: SHOW TABLE EXTENDED IN test_db LIKE `ba%` POSTHOOK: type: SHOW_TABLESTATUS tableName:bar_n0 #### A masked pattern was here #### @@ -536,6 +538,23 @@ maxFileSize:0 minFileSize:0 #### A masked pattern was here #### +PREHOOK: query: SHOW TABLE EXTENDED IN test_db LIKE `ba_` +PREHOOK: type: SHOW_TABLESTATUS +POSTHOOK: query: SHOW TABLE EXTENDED IN test_db LIKE `ba_` +POSTHOOK: type: SHOW_TABLESTATUS +tableName:baz +#### A masked pattern was here #### +inputformat:org.apache.hadoop.mapred.TextInputFormat +outputformat:org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat +columns:struct columns { i32 a} +partitioned:false +partitionColumns: +totalNumberFiles:0 +totalFileSize:0 +maxFileSize:0 +minFileSize:0 +#### A masked pattern was here #### + PREHOOK: query: CREATE DATABASE `database` PREHOOK: type: CREATEDATABASE PREHOOK: Output: database:database diff --git ql/src/test/results/clientpositive/llap/show_tablestatus.q.out ql/src/test/results/clientpositive/llap/show_tablestatus.q.out index f875778430..bffb6b3598 100644 --- ql/src/test/results/clientpositive/llap/show_tablestatus.q.out +++ ql/src/test/results/clientpositive/llap/show_tablestatus.q.out @@ -71,22 +71,74 @@ maxFileSize:5812 minFileSize:5812 #### A masked pattern was here #### -PREHOOK: query: SHOW TABLE EXTENDED LIKE `src.?` +PREHOOK: query: SHOW TABLE EXTENDED LIKE `src_` PREHOOK: type: SHOW_TABLESTATUS -POSTHOOK: query: SHOW TABLE EXTENDED LIKE `src.?` +POSTHOOK: query: SHOW TABLE EXTENDED LIKE `src_` POSTHOOK: type: SHOW_TABLESTATUS -PREHOOK: query: SHOW TABLE EXTENDED from default LIKE `src.?` +PREHOOK: query: SHOW TABLE EXTENDED from default LIKE `src_` PREHOOK: type: SHOW_TABLESTATUS -POSTHOOK: query: SHOW TABLE EXTENDED from default LIKE `src.?` +POSTHOOK: query: SHOW TABLE EXTENDED from default LIKE `src_` POSTHOOK: type: SHOW_TABLESTATUS -PREHOOK: query: SHOW TABLE EXTENDED LIKE `^s.*` +PREHOOK: query: SHOW TABLE EXTENDED LIKE "%" PREHOOK: type: SHOW_TABLESTATUS -POSTHOOK: query: SHOW TABLE EXTENDED LIKE `^s.*` +POSTHOOK: query: SHOW TABLE EXTENDED LIKE "%" POSTHOOK: type: SHOW_TABLESTATUS -PREHOOK: query: SHOW TABLE EXTENDED from default LIKE `^s.*` +tableName:src +#### A masked pattern was here #### +inputformat:org.apache.hadoop.mapred.TextInputFormat +outputformat:org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat +columns:struct columns { string key, string value} +partitioned:false +partitionColumns: +totalNumberFiles:1 +totalFileSize:5812 +maxFileSize:5812 +minFileSize:5812 +#### A masked pattern was here #### + +tableName:srcpart +#### A masked pattern was here #### +inputformat:org.apache.hadoop.mapred.TextInputFormat +outputformat:org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat +columns:struct columns { string key, string value} +partitioned:true +partitionColumns:struct partition_columns { string ds, string hr} +totalNumberFiles:4 +totalFileSize:23248 +maxFileSize:5812 +minFileSize:5812 +#### A masked pattern was here #### + +PREHOOK: query: SHOW TABLE EXTENDED from default LIKE "%" PREHOOK: type: SHOW_TABLESTATUS -POSTHOOK: query: SHOW TABLE EXTENDED from default LIKE `^s.*` +POSTHOOK: query: SHOW TABLE EXTENDED from default LIKE "%" POSTHOOK: type: SHOW_TABLESTATUS +tableName:src +#### A masked pattern was here #### +inputformat:org.apache.hadoop.mapred.TextInputFormat +outputformat:org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat +columns:struct columns { string key, string value} +partitioned:false +partitionColumns: +totalNumberFiles:1 +totalFileSize:5812 +maxFileSize:5812 +minFileSize:5812 +#### A masked pattern was here #### + +tableName:srcpart +#### A masked pattern was here #### +inputformat:org.apache.hadoop.mapred.TextInputFormat +outputformat:org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat +columns:struct columns { string key, string value} +partitioned:true +partitionColumns:struct partition_columns { string ds, string hr} +totalNumberFiles:4 +totalFileSize:23248 +maxFileSize:5812 +minFileSize:5812 +#### A masked pattern was here #### + PREHOOK: query: SHOW TABLE EXTENDED LIKE `srcpart` PARTITION(ds='2008-04-08', hr=11) PREHOOK: type: SHOW_TABLESTATUS POSTHOOK: query: SHOW TABLE EXTENDED LIKE `srcpart` PARTITION(ds='2008-04-08', hr=11) diff --git ql/src/test/results/clientpositive/llap/show_views.q.out ql/src/test/results/clientpositive/llap/show_views.q.out index b5d2027420..05226f20be 100644 --- ql/src/test/results/clientpositive/llap/show_views.q.out +++ ql/src/test/results/clientpositive/llap/show_views.q.out @@ -143,9 +143,9 @@ POSTHOOK: type: SHOWVIEWS shtb_full_view2_n0 shtb_test1_view1_n0 shtb_test1_view2_n0 -PREHOOK: query: EXPLAIN SHOW VIEWS 'test_*' +PREHOOK: query: EXPLAIN SHOW VIEWS 'test_%' PREHOOK: type: SHOWVIEWS -POSTHOOK: query: EXPLAIN SHOW VIEWS 'test_*' +POSTHOOK: query: EXPLAIN SHOW VIEWS 'test_%' POSTHOOK: type: SHOWVIEWS STAGE DEPENDENCIES: Stage-0 is a root stage @@ -155,7 +155,7 @@ STAGE PLANS: Stage: Stage-0 Show Views database name: test1 - pattern: test_* + pattern: test_% Stage: Stage-1 Fetch Operator @@ -163,37 +163,13 @@ STAGE PLANS: Processor Tree: ListSink -PREHOOK: query: SHOW VIEWS 'test_*' +PREHOOK: query: SHOW VIEWS 'test_%' PREHOOK: type: SHOWVIEWS -POSTHOOK: query: SHOW VIEWS 'test_*' +POSTHOOK: query: SHOW VIEWS 'test_%' POSTHOOK: type: SHOWVIEWS -PREHOOK: query: SHOW VIEWS '*view2' +PREHOOK: query: SHOW VIEWS '%view2' PREHOOK: type: SHOWVIEWS -POSTHOOK: query: SHOW VIEWS '*view2' -POSTHOOK: type: SHOWVIEWS -PREHOOK: query: EXPLAIN SHOW VIEWS LIKE 'test_view1|test_view2' -PREHOOK: type: SHOWVIEWS -POSTHOOK: query: EXPLAIN SHOW VIEWS LIKE 'test_view1|test_view2' -POSTHOOK: type: SHOWVIEWS -STAGE DEPENDENCIES: - Stage-0 is a root stage - Stage-1 depends on stages: Stage-0 - -STAGE PLANS: - Stage: Stage-0 - Show Views - database name: test1 - pattern: test_view1|test_view2 - - Stage: Stage-1 - Fetch Operator - limit: -1 - Processor Tree: - ListSink - -PREHOOK: query: SHOW VIEWS LIKE 'test_view1|test_view2' -PREHOOK: type: SHOWVIEWS -POSTHOOK: query: SHOW VIEWS LIKE 'test_view1|test_view2' +POSTHOOK: query: SHOW VIEWS '%view2' POSTHOOK: type: SHOWVIEWS PREHOOK: query: USE test2 PREHOOK: type: SWITCHDATABASE @@ -201,9 +177,9 @@ PREHOOK: Input: database:test2 POSTHOOK: query: USE test2 POSTHOOK: type: SWITCHDATABASE POSTHOOK: Input: database:test2 -PREHOOK: query: SHOW VIEWS 'shtb_*' +PREHOOK: query: SHOW VIEWS 'shtb_%' PREHOOK: type: SHOWVIEWS -POSTHOOK: query: SHOW VIEWS 'shtb_*' +POSTHOOK: query: SHOW VIEWS 'shtb_%' POSTHOOK: type: SHOWVIEWS shtb_test1_view1_n0 shtb_test2_view2_n0 @@ -275,9 +251,9 @@ PREHOOK: query: SHOW VIEWS IN default PREHOOK: type: SHOWVIEWS POSTHOOK: query: SHOW VIEWS IN default POSTHOOK: type: SHOWVIEWS -PREHOOK: query: EXPLAIN SHOW VIEWS IN test1 "shtb_test_*" +PREHOOK: query: EXPLAIN SHOW VIEWS IN test1 "shtb_test_%" PREHOOK: type: SHOWVIEWS -POSTHOOK: query: EXPLAIN SHOW VIEWS IN test1 "shtb_test_*" +POSTHOOK: query: EXPLAIN SHOW VIEWS IN test1 "shtb_test_%" POSTHOOK: type: SHOWVIEWS STAGE DEPENDENCIES: Stage-0 is a root stage @@ -287,7 +263,7 @@ STAGE PLANS: Stage: Stage-0 Show Views database name: test1 - pattern: shtb_test_* + pattern: shtb_test_% Stage: Stage-1 Fetch Operator @@ -295,10 +271,12 @@ STAGE PLANS: Processor Tree: ListSink -PREHOOK: query: SHOW VIEWS IN test1 "shtb_test_*" +PREHOOK: query: SHOW VIEWS IN test1 "shtb_test_%" PREHOOK: type: SHOWVIEWS -POSTHOOK: query: SHOW VIEWS IN test1 "shtb_test_*" +POSTHOOK: query: SHOW VIEWS IN test1 "shtb_test_%" POSTHOOK: type: SHOWVIEWS +shtb_test1_view1_n0 +shtb_test1_view2_n0 PREHOOK: query: SHOW VIEWS IN test2 LIKE "nomatch" PREHOOK: type: SHOWVIEWS POSTHOOK: query: SHOW VIEWS IN test2 LIKE "nomatch" diff --git ql/src/test/results/clientpositive/llap/temp_table_names.q.out ql/src/test/results/clientpositive/llap/temp_table_names.q.out index f8ad01a2d9..892c78cc36 100644 --- ql/src/test/results/clientpositive/llap/temp_table_names.q.out +++ ql/src/test/results/clientpositive/llap/temp_table_names.q.out @@ -6,10 +6,10 @@ POSTHOOK: query: create temporary table Default.Temp_Table_Names (C1 string, c2 POSTHOOK: type: CREATETABLE POSTHOOK: Output: Default@Temp_Table_Names POSTHOOK: Output: database:default -PREHOOK: query: show tables 'Temp_Table*' +PREHOOK: query: show tables 'Temp_Table%' PREHOOK: type: SHOWTABLES PREHOOK: Input: database:default -POSTHOOK: query: show tables 'Temp_Table*' +POSTHOOK: query: show tables 'Temp_Table%' POSTHOOK: type: SHOWTABLES POSTHOOK: Input: database:default temp_table_names diff --git ql/src/test/results/clientpositive/llap/temp_table_truncate.q.out ql/src/test/results/clientpositive/llap/temp_table_truncate.q.out index 20aeafc2db..c16a7e0706 100644 --- ql/src/test/results/clientpositive/llap/temp_table_truncate.q.out +++ ql/src/test/results/clientpositive/llap/temp_table_truncate.q.out @@ -44,10 +44,10 @@ key string value string ds string hr string -PREHOOK: query: SHOW TABLES LIKE "tmp_src*" +PREHOOK: query: SHOW TABLES LIKE "tmp_src%" PREHOOK: type: SHOWTABLES PREHOOK: Input: database:default -POSTHOOK: query: SHOW TABLES LIKE "tmp_src*" +POSTHOOK: query: SHOW TABLES LIKE "tmp_src%" POSTHOOK: type: SHOWTABLES POSTHOOK: Input: database:default tmp_src