You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@hive.apache.org by mg...@apache.org on 2020/05/08 12:52:28 UTC

[hive] branch master updated: HIVE-23359 'show tables like' support for SQL wildcard characters (% and _) (Miklos Gergely, reviewed by Zoltan Haindrich)

This is an automated email from the ASF dual-hosted git repository.

mgergely pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/hive.git


The following commit(s) were added to refs/heads/master by this push:
     new c419a7b  HIVE-23359 'show tables like' support for SQL wildcard characters (% and _) (Miklos Gergely, reviewed by Zoltan Haindrich)
c419a7b is described below

commit c419a7b99a69d1c1bede9394fc361591e57f4de6
Author: miklosgergely <mg...@cloudera.com>
AuthorDate: Mon May 4 16:52:38 2020 +0200

    HIVE-23359 'show tables like' support for SQL wildcard characters (% and _) (Miklos Gergely, reviewed by Zoltan Haindrich)
---
 .../ddl/database/show/ShowDatabasesOperation.java  |   2 +-
 .../info/show/status/ShowTableStatusOperation.java |  51 ++++-----
 .../info/show/tables/ShowTablesOperation.java      |  73 +++++++------
 .../show/ShowMaterializedViewsOperation.java       |  31 +++---
 .../hive/ql/ddl/view/show/ShowViewsOperation.java  |  30 +++---
 .../org/apache/hadoop/hive/ql/metadata/Hive.java   |  14 +--
 .../metadata/formatting/JsonMetaDataFormatter.java |   3 +-
 .../ql/metadata/formatting/MetaDataFormatter.java  |   3 +-
 .../metadata/formatting/TextMetaDataFormatter.java |   3 +-
 .../test/queries/clientnegative/show_tablestatus.q |   2 +-
 ql/src/test/queries/clientpositive/alter1.q        |   2 +-
 ql/src/test/queries/clientpositive/alter2.q        |   4 +-
 ql/src/test/queries/clientpositive/alter3.q        |   2 +-
 ql/src/test/queries/clientpositive/alter4.q        |   2 +-
 ql/src/test/queries/clientpositive/alter5.q        |   2 +-
 ql/src/test/queries/clientpositive/create_view.q   |   4 +-
 .../queries/clientpositive/describe_table_json.q   |   4 +-
 .../clientpositive/encryption_auto_purge_tables.q  |   4 +-
 .../queries/clientpositive/encryption_drop_table.q |  10 +-
 .../queries/clientpositive/encryption_move_tbl.q   |   2 +-
 ql/src/test/queries/clientpositive/input2.q        |   6 +-
 ql/src/test/queries/clientpositive/input3.q        |   4 +-
 ql/src/test/queries/clientpositive/rename_column.q |   4 +-
 .../clientpositive/show_materialized_views.q       |  16 +--
 ql/src/test/queries/clientpositive/show_tables.q   |  24 ++---
 .../test/queries/clientpositive/show_tablestatus.q |  13 ++-
 ql/src/test/queries/clientpositive/show_views.q    |  16 +--
 .../test/queries/clientpositive/temp_table_names.q |   2 +-
 .../queries/clientpositive/temp_table_truncate.q   |   2 +-
 .../results/clientnegative/show_tablestatus.q.out  |   2 +-
 .../test/results/clientpositive/create_view.q.out  |   8 +-
 .../encrypted/encryption_auto_purge_tables.q.out   |   8 +-
 .../encrypted/encryption_drop_table.q.out          |  20 ++--
 .../encrypted/encryption_move_tbl.q.out            |   4 +-
 .../test/results/clientpositive/llap/alter1.q.out  |   4 +-
 .../test/results/clientpositive/llap/alter2.q.out  |   8 +-
 .../test/results/clientpositive/llap/alter3.q.out  |   4 +-
 .../test/results/clientpositive/llap/alter4.q.out  |   4 +-
 .../test/results/clientpositive/llap/alter5.q.out  |   4 +-
 .../clientpositive/llap/describe_table_json.q.out  |   8 +-
 .../test/results/clientpositive/llap/input2.q.out  |  14 +--
 .../test/results/clientpositive/llap/input3.q.out  |   8 +-
 .../clientpositive/llap/rename_column.q.out        |   8 +-
 .../llap/show_materialized_views.q.out             |  55 +++-------
 .../results/clientpositive/llap/show_tables.q.out  | 115 ++++++++++++---------
 .../clientpositive/llap/show_tablestatus.q.out     |  68 ++++++++++--
 .../results/clientpositive/llap/show_views.q.out   |  54 +++-------
 .../clientpositive/llap/temp_table_names.q.out     |   4 +-
 .../clientpositive/llap/temp_table_truncate.q.out  |   4 +-
 49 files changed, 386 insertions(+), 353 deletions(-)

diff --git a/ql/src/java/org/apache/hadoop/hive/ql/ddl/database/show/ShowDatabasesOperation.java b/ql/src/java/org/apache/hadoop/hive/ql/ddl/database/show/ShowDatabasesOperation.java
index 625a48e..12a5299 100644
--- a/ql/src/java/org/apache/hadoop/hive/ql/ddl/database/show/ShowDatabasesOperation.java
+++ b/ql/src/java/org/apache/hadoop/hive/ql/ddl/database/show/ShowDatabasesOperation.java
@@ -45,7 +45,7 @@ public class ShowDatabasesOperation extends DDLOperation<ShowDatabasesDesc> {
     List<String> 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 a/ql/src/java/org/apache/hadoop/hive/ql/ddl/table/info/show/status/ShowTableStatusOperation.java b/ql/src/java/org/apache/hadoop/hive/ql/ddl/table/info/show/status/ShowTableStatusOperation.java
index 914e63d..75ea0e3 100644
--- a/ql/src/java/org/apache/hadoop/hive/ql/ddl/table/info/show/status/ShowTableStatusOperation.java
+++ b/ql/src/java/org/apache/hadoop/hive/ql/ddl/table/info/show/status/ShowTableStatusOperation.java
@@ -23,11 +23,11 @@ import org.apache.hadoop.hive.ql.ddl.DDLUtils;
 
 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.ddl.DDLOperation;
 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 class ShowTableStatusOperation extends DDLOperation<ShowTableStatusDesc>
 
   @Override
   public int execute() throws HiveException {
-    // get the tables for the desired pattern - populate the output stream
-    List<Table> tbls = new ArrayList<Table>();
-    Map<String, String> 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<Table> tables = new ArrayList<Table>();
+    Map<String, String> 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<String> tblStr = context.getDb().getTablesForDb(desc.getDbName(), desc.getPattern());
-      SortedSet<String> sortedTbls = new TreeSet<String>(tblStr);
-      Iterator<String> 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<String> 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 a/ql/src/java/org/apache/hadoop/hive/ql/ddl/table/info/show/tables/ShowTablesOperation.java b/ql/src/java/org/apache/hadoop/hive/ql/ddl/table/info/show/tables/ShowTablesOperation.java
index 4846d29..b1d2dd2 100644
--- a/ql/src/java/org/apache/hadoop/hive/ql/ddl/table/info/show/tables/ShowTablesOperation.java
+++ b/ql/src/java/org/apache/hadoop/hive/ql/ddl/table/info/show/tables/ShowTablesOperation.java
@@ -28,13 +28,15 @@ import java.util.Comparator;
 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,52 @@ public class ShowTablesOperation extends DDLOperation<ShowTablesDesc> {
 
   @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<String> tableNames  = null;
-    List<Table> 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<String> 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<String> sortedSet = new TreeSet<String>(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)) {
+      context.getFormatter().showTables(os, tableNames);
     } 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<Table> 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 a/ql/src/java/org/apache/hadoop/hive/ql/ddl/view/materialized/show/ShowMaterializedViewsOperation.java b/ql/src/java/org/apache/hadoop/hive/ql/ddl/view/materialized/show/ShowMaterializedViewsOperation.java
index 792b352..1e245cd 100644
--- a/ql/src/java/org/apache/hadoop/hive/ql/ddl/view/materialized/show/ShowMaterializedViewsOperation.java
+++ b/ql/src/java/org/apache/hadoop/hive/ql/ddl/view/materialized/show/ShowMaterializedViewsOperation.java
@@ -23,6 +23,8 @@ import java.util.ArrayList;
 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.DDLOperationContext;
 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 class ShowMaterializedViewsOperation extends DDLOperation<ShowMaterialize
 
   @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<Table> tableObjects = new ArrayList<>(context.getDb().getMaterializedViewObjectsByPattern(dbName, pattern));
-    LOG.debug("Found {} materialized view(s) matching the SHOW MATERIALIZED VIEWS statement.", tableObjects.size());
+    List<Table> 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 a/ql/src/java/org/apache/hadoop/hive/ql/ddl/view/show/ShowViewsOperation.java b/ql/src/java/org/apache/hadoop/hive/ql/ddl/view/show/ShowViewsOperation.java
index 7962551..a2d92e2 100644
--- a/ql/src/java/org/apache/hadoop/hive/ql/ddl/view/show/ShowViewsOperation.java
+++ b/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.DDLOperation;
 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,24 @@ public class ShowViewsOperation extends DDLOperation<ShowViewsDesc> {
 
   @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<String> tableNames = context.getDb().getTablesByType(dbName, pattern, TableType.VIRTUAL_VIEW);
-    LOG.debug("Found {} view(s) matching the SHOW VIEWS statement.", tableNames.size());
+    List<String> 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<String> sortedSet = new TreeSet<String>(tableNames);
-      context.getFormatter().showTables(os, sortedSet);
+    try (DataOutputStream os = DDLUtils.getOutputStream(new Path(desc.getResFile()), context)) {
+      context.getFormatter().showTables(os, viewNames);
     } 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 a/ql/src/java/org/apache/hadoop/hive/ql/metadata/Hive.java b/ql/src/java/org/apache/hadoop/hive/ql/metadata/Hive.java
index f6a5207..c5901cd 100644
--- a/ql/src/java/org/apache/hadoop/hive/ql/metadata/Hive.java
+++ b/ql/src/java/org/apache/hadoop/hive/ql/metadata/Hive.java
@@ -1489,18 +1489,6 @@ public class Hive {
   }
 
   /**
-   * 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<Table> 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
    * @return List of materialized view table names
@@ -1531,7 +1519,7 @@ public class Hive {
     return getTableObjects(dbName, pattern, TableType.MATERIALIZED_VIEW);
   }
 
-  private List<Table> getTableObjects(String dbName, String pattern, TableType tableType) throws HiveException {
+  public List<Table> 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<org.apache.hadoop.hive.metastore.api.Table, Table>() {
diff --git a/ql/src/java/org/apache/hadoop/hive/ql/metadata/formatting/JsonMetaDataFormatter.java b/ql/src/java/org/apache/hadoop/hive/ql/metadata/formatting/JsonMetaDataFormatter.java
index 45c69e7..a1611e3 100644
--- a/ql/src/java/org/apache/hadoop/hive/ql/metadata/formatting/JsonMetaDataFormatter.java
+++ b/ql/src/java/org/apache/hadoop/hive/ql/metadata/formatting/JsonMetaDataFormatter.java
@@ -28,7 +28,6 @@ import java.nio.charset.StandardCharsets;
 import java.util.ArrayList;
 import java.util.List;
 import java.util.Map;
-import java.util.Set;
 import java.util.concurrent.TimeUnit;
 
 import org.apache.commons.io.IOUtils;
@@ -122,7 +121,7 @@ public class JsonMetaDataFormatter implements MetaDataFormatter {
    * Show a list of tables.
    */
   @Override
-  public void showTables(DataOutputStream out, Set<String> tables)
+  public void showTables(DataOutputStream out, List<String> tables)
       throws HiveException {
     asJson(out, MapBuilder.create().put("tables", tables).build());
   }
diff --git a/ql/src/java/org/apache/hadoop/hive/ql/metadata/formatting/MetaDataFormatter.java b/ql/src/java/org/apache/hadoop/hive/ql/metadata/formatting/MetaDataFormatter.java
index 7b83a55..0747b32 100644
--- a/ql/src/java/org/apache/hadoop/hive/ql/metadata/formatting/MetaDataFormatter.java
+++ b/ql/src/java/org/apache/hadoop/hive/ql/metadata/formatting/MetaDataFormatter.java
@@ -22,7 +22,6 @@ import java.io.DataOutputStream;
 import java.io.OutputStream;
 import java.util.List;
 import java.util.Map;
-import java.util.Set;
 
 import org.apache.hadoop.hive.conf.HiveConf;
 import org.apache.hadoop.hive.metastore.api.ColumnStatisticsObj;
@@ -59,7 +58,7 @@ public interface MetaDataFormatter {
   /**
    * Show a list of tables.
    */
-  void showTables(DataOutputStream out, Set<String> tables)
+  void showTables(DataOutputStream out, List<String> tables)
       throws HiveException;
 
   /**
diff --git a/ql/src/java/org/apache/hadoop/hive/ql/metadata/formatting/TextMetaDataFormatter.java b/ql/src/java/org/apache/hadoop/hive/ql/metadata/formatting/TextMetaDataFormatter.java
index d64ae44..904891b 100644
--- a/ql/src/java/org/apache/hadoop/hive/ql/metadata/formatting/TextMetaDataFormatter.java
+++ b/ql/src/java/org/apache/hadoop/hive/ql/metadata/formatting/TextMetaDataFormatter.java
@@ -26,7 +26,6 @@ import java.util.ArrayList;
 import java.util.Iterator;
 import java.util.List;
 import java.util.Map;
-import java.util.Set;
 import java.util.concurrent.TimeUnit;
 
 import org.apache.hadoop.hive.metastore.utils.MetaStoreUtils;
@@ -111,7 +110,7 @@ class TextMetaDataFormatter implements MetaDataFormatter {
    * Show a list of tables.
    */
   @Override
-  public void showTables(DataOutputStream out, Set<String> tables)
+  public void showTables(DataOutputStream out, List<String> tables)
       throws HiveException {
     Iterator<String> iterTbls = tables.iterator();
 
diff --git a/ql/src/test/queries/clientnegative/show_tablestatus.q b/ql/src/test/queries/clientnegative/show_tablestatus.q
index 283b583..7270927 100644
--- a/ql/src/test/queries/clientnegative/show_tablestatus.q
+++ b/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 a/ql/src/test/queries/clientpositive/alter1.q b/ql/src/test/queries/clientpositive/alter1.q
index 0843351..03d0036 100644
--- a/ql/src/test/queries/clientpositive/alter1.q
+++ b/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 a/ql/src/test/queries/clientpositive/alter2.q b/ql/src/test/queries/clientpositive/alter2.q
index 6586afc..6f0128a 100644
--- a/ql/src/test/queries/clientpositive/alter2.q
+++ b/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 a/ql/src/test/queries/clientpositive/alter3.q b/ql/src/test/queries/clientpositive/alter3.q
index a38643d..4f8ca22 100644
--- a/ql/src/test/queries/clientpositive/alter3.q
+++ b/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 a/ql/src/test/queries/clientpositive/alter4.q b/ql/src/test/queries/clientpositive/alter4.q
index 7a87113..62b9133 100644
--- a/ql/src/test/queries/clientpositive/alter4.q
+++ b/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 a/ql/src/test/queries/clientpositive/alter5.q b/ql/src/test/queries/clientpositive/alter5.q
index 5abd14f..6334291 100644
--- a/ql/src/test/queries/clientpositive/alter5.q
+++ b/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 a/ql/src/test/queries/clientpositive/create_view.q b/ql/src/test/queries/clientpositive/create_view.q
index 392ebf4..e4f5938 100644
--- a/ql/src/test/queries/clientpositive/create_view.q
+++ b/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 a/ql/src/test/queries/clientpositive/describe_table_json.q b/ql/src/test/queries/clientpositive/describe_table_json.q
index 8aea7f2..cbdbc70 100644
--- a/ql/src/test/queries/clientpositive/describe_table_json.q
+++ b/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 a/ql/src/test/queries/clientpositive/encryption_auto_purge_tables.q b/ql/src/test/queries/clientpositive/encryption_auto_purge_tables.q
index 14c7f7e..aef2f56 100644
--- a/ql/src/test/queries/clientpositive/encryption_auto_purge_tables.q
+++ b/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 a/ql/src/test/queries/clientpositive/encryption_drop_table.q b/ql/src/test/queries/clientpositive/encryption_drop_table.q
index 884e510..e6633f5 100644
--- a/ql/src/test/queries/clientpositive/encryption_drop_table.q
+++ b/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 a/ql/src/test/queries/clientpositive/encryption_move_tbl.q b/ql/src/test/queries/clientpositive/encryption_move_tbl.q
index b636076..ddf732f 100644
--- a/ql/src/test/queries/clientpositive/encryption_move_tbl.q
+++ b/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 a/ql/src/test/queries/clientpositive/input2.q b/ql/src/test/queries/clientpositive/input2.q
index c7b0d30..a2a4833 100644
--- a/ql/src/test/queries/clientpositive/input2.q
+++ b/ql/src/test/queries/clientpositive/input2.q
@@ -3,10 +3,10 @@ DESCRIBE TEST2a;
 DESC TEST2a;
 CREATE TABLE TEST2b(A ARRAY<INT>, B DOUBLE, C MAP<DOUBLE, INT>) 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 a/ql/src/test/queries/clientpositive/input3.q b/ql/src/test/queries/clientpositive/input3.q
index 07d75bd..e0540a6 100644
--- a/ql/src/test/queries/clientpositive/input3.q
+++ b/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<INT>, B DOUBLE, C MAP<DOUBLE, INT>) 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 a/ql/src/test/queries/clientpositive/rename_column.q b/ql/src/test/queries/clientpositive/rename_column.q
index 82036f6..bcfade6 100644
--- a/ql/src/test/queries/clientpositive/rename_column.q
+++ b/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 a/ql/src/test/queries/clientpositive/show_materialized_views.q b/ql/src/test/queries/clientpositive/show_materialized_views.q
index 81f86a7..cc4ac66 100644
--- a/ql/src/test/queries/clientpositive/show_materialized_views.q
+++ b/ql/src/test/queries/clientpositive/show_materialized_views.q
@@ -1,3 +1,5 @@
+--! qt:dataset::ONLY
+
 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 a/ql/src/test/queries/clientpositive/show_tables.q b/ql/src/test/queries/clientpositive/show_tables.q
index 8576daa..97e4892 100644
--- a/ql/src/test/queries/clientpositive/show_tables.q
+++ b/ql/src/test/queries/clientpositive/show_tables.q
@@ -1,15 +1,12 @@
+--! qt:dataset::ONLY
+
 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 a/ql/src/test/queries/clientpositive/show_tablestatus.q b/ql/src/test/queries/clientpositive/show_tablestatus.q
index d8f04ec..0340670 100644
--- a/ql/src/test/queries/clientpositive/show_tablestatus.q
+++ b/ql/src/test/queries/clientpositive/show_tablestatus.q
@@ -1,5 +1,4 @@
---! qt:dataset:srcpart
---! qt:dataset:src
+--! qt:dataset:src,srcpart:ONLY
 set hive.support.quoted.identifiers=none;
 EXPLAIN 
 SHOW TABLE EXTENDED IN default LIKE `src`;
@@ -10,14 +9,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 a/ql/src/test/queries/clientpositive/show_views.q b/ql/src/test/queries/clientpositive/show_views.q
index 1af89b6..d9d05fc 100644
--- a/ql/src/test/queries/clientpositive/show_views.q
+++ b/ql/src/test/queries/clientpositive/show_views.q
@@ -1,3 +1,5 @@
+--! qt:dataset::ONLY
+
 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 a/ql/src/test/queries/clientpositive/temp_table_names.q b/ql/src/test/queries/clientpositive/temp_table_names.q
index bac26d3..1fc8aed 100644
--- a/ql/src/test/queries/clientpositive/temp_table_names.q
+++ b/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 a/ql/src/test/queries/clientpositive/temp_table_truncate.q b/ql/src/test/queries/clientpositive/temp_table_truncate.q
index 93a54d9..8e40ee2 100644
--- a/ql/src/test/queries/clientpositive/temp_table_truncate.q
+++ b/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 a/ql/src/test/results/clientnegative/show_tablestatus.q.out b/ql/src/test/results/clientnegative/show_tablestatus.q.out
index ed962e7..c417917 100644
--- a/ql/src/test/results/clientnegative/show_tablestatus.q.out
+++ b/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 a/ql/src/test/results/clientpositive/create_view.q.out b/ql/src/test/results/clientpositive/create_view.q.out
index 7414d47..9a251fc 100644
--- a/ql/src/test/results/clientpositive/create_view.q.out
+++ b/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 a/ql/src/test/results/clientpositive/encrypted/encryption_auto_purge_tables.q.out b/ql/src/test/results/clientpositive/encrypted/encryption_auto_purge_tables.q.out
index 1d7707c..7889719 100644
--- a/ql/src/test/results/clientpositive/encrypted/encryption_auto_purge_tables.q.out
+++ b/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 a/ql/src/test/results/clientpositive/encrypted/encryption_drop_table.q.out b/ql/src/test/results/clientpositive/encrypted/encryption_drop_table.q.out
index 90ec236..6a93e0c 100644
--- a/ql/src/test/results/clientpositive/encrypted/encryption_drop_table.q.out
+++ b/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 a/ql/src/test/results/clientpositive/encrypted/encryption_move_tbl.q.out b/ql/src/test/results/clientpositive/encrypted/encryption_move_tbl.q.out
index ff3bda6..354d048 100644
--- a/ql/src/test/results/clientpositive/encrypted/encryption_move_tbl.q.out
+++ b/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 a/ql/src/test/results/clientpositive/llap/alter1.q.out b/ql/src/test/results/clientpositive/llap/alter1.q.out
index 1fef592..1807b3a 100644
--- a/ql/src/test/results/clientpositive/llap/alter1.q.out
+++ b/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 a/ql/src/test/results/clientpositive/llap/alter2.q.out b/ql/src/test/results/clientpositive/llap/alter2.q.out
index b9d1b61..86bcc18 100644
--- a/ql/src/test/results/clientpositive/llap/alter2.q.out
+++ b/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 a/ql/src/test/results/clientpositive/llap/alter3.q.out b/ql/src/test/results/clientpositive/llap/alter3.q.out
index 7ceeb3a..b77be8a 100644
--- a/ql/src/test/results/clientpositive/llap/alter3.q.out
+++ b/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 a/ql/src/test/results/clientpositive/llap/alter4.q.out b/ql/src/test/results/clientpositive/llap/alter4.q.out
index 74e2dfb..7f4e5ee 100644
--- a/ql/src/test/results/clientpositive/llap/alter4.q.out
+++ b/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 a/ql/src/test/results/clientpositive/llap/alter5.q.out b/ql/src/test/results/clientpositive/llap/alter5.q.out
index 61a04f2..ce63719 100644
--- a/ql/src/test/results/clientpositive/llap/alter5.q.out
+++ b/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 a/ql/src/test/results/clientpositive/llap/describe_table_json.q.out b/ql/src/test/results/clientpositive/llap/describe_table_json.q.out
index cc33e6d..9e30244 100644
--- a/ql/src/test/results/clientpositive/llap/describe_table_json.q.out
+++ b/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 a/ql/src/test/results/clientpositive/llap/input2.q.out b/ql/src/test/results/clientpositive/llap/input2.q.out
index 28f7da4..7a43191 100644
--- a/ql/src/test/results/clientpositive/llap/input2.q.out
+++ b/ql/src/test/results/clientpositive/llap/input2.q.out
@@ -39,10 +39,10 @@ POSTHOOK: Input: default@test2b
 a                   	array<int>          	                    
 b                   	double              	                    
 c                   	map<double,int>     	                    
-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 a/ql/src/test/results/clientpositive/llap/input3.q.out b/ql/src/test/results/clientpositive/llap/input3.q.out
index 0365ff2..6e530b1 100644
--- a/ql/src/test/results/clientpositive/llap/input3.q.out
+++ b/ql/src/test/results/clientpositive/llap/input3.q.out
@@ -31,10 +31,10 @@ POSTHOOK: Input: default@test3b
 a                   	array<int>          	                    
 b                   	double              	                    
 c                   	map<double,int>     	                    
-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<int>
 b                   	double              	                    
 c                   	map<double,int>     	                    
 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 a/ql/src/test/results/clientpositive/llap/rename_column.q.out b/ql/src/test/results/clientpositive/llap/rename_column.q.out
index 15816bb..7e735f5 100644
--- a/ql/src/test/results/clientpositive/llap/rename_column.q.out
+++ b/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 a/ql/src/test/results/clientpositive/llap/show_materialized_views.q.out b/ql/src/test/results/clientpositive/llap/show_materialized_views.q.out
index d377f97..5eb57a9 100644
--- a/ql/src/test/results/clientpositive/llap/show_materialized_views.q.out
+++ b/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 a/ql/src/test/results/clientpositive/llap/show_tables.q.out b/ql/src/test/results/clientpositive/llap/show_tables.q.out
index ade1690..dbdc521 100644
--- a/ql/src/test/results/clientpositive/llap/show_tables.q.out
+++ b/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 a/ql/src/test/results/clientpositive/llap/show_tablestatus.q.out b/ql/src/test/results/clientpositive/llap/show_tablestatus.q.out
index f875778..bffb6b3 100644
--- a/ql/src/test/results/clientpositive/llap/show_tablestatus.q.out
+++ b/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 a/ql/src/test/results/clientpositive/llap/show_views.q.out b/ql/src/test/results/clientpositive/llap/show_views.q.out
index b5d2027..05226f2 100644
--- a/ql/src/test/results/clientpositive/llap/show_views.q.out
+++ b/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 a/ql/src/test/results/clientpositive/llap/temp_table_names.q.out b/ql/src/test/results/clientpositive/llap/temp_table_names.q.out
index f8ad01a..892c78c 100644
--- a/ql/src/test/results/clientpositive/llap/temp_table_names.q.out
+++ b/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 a/ql/src/test/results/clientpositive/llap/temp_table_truncate.q.out b/ql/src/test/results/clientpositive/llap/temp_table_truncate.q.out
index 20aeafc..c16a7e0 100644
--- a/ql/src/test/results/clientpositive/llap/temp_table_truncate.q.out
+++ b/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