Skip to content

Commit 9ab070c

Browse files
committed
HIVE-28898: using get_table_meta instead of getMS().getTableMetas()
HIVE-28898: remove condition
1 parent 1ff4b6e commit 9ab070c

File tree

2 files changed

+9
-11
lines changed
  • ql/src/java/org/apache/hadoop/hive/ql/security/authorization/plugin/metastore/filtercontext
  • standalone-metastore/metastore-server/src/main/java/org/apache/hadoop/hive/metastore

2 files changed

+9
-11
lines changed

ql/src/java/org/apache/hadoop/hive/ql/security/authorization/plugin/metastore/filtercontext/TableFilterContext.java

+2-6
Original file line numberDiff line numberDiff line change
@@ -81,9 +81,7 @@ public HiveMetaStoreAuthzInfo getAuthzContext() {
8181
}
8282

8383
private List<HivePrivilegeObject> getInputHObjs() {
84-
if (LOG.isDebugEnabled()) {
85-
LOG.debug("==> TableFilterContext.getOutputHObjs()");
86-
}
84+
LOG.debug("==> TableFilterContext.getOutputHObjs()");
8785

8886
List<HivePrivilegeObject> ret = new ArrayList<>();
8987

@@ -101,9 +99,7 @@ private List<HivePrivilegeObject> getInputHObjs() {
10199
}
102100
}
103101

104-
if (LOG.isDebugEnabled()) {
105-
LOG.debug("<== TableFilterContext.getOutputHObjs(): ret=" + ret);
106-
}
102+
LOG.debug("<== TableFilterContext.getOutputHObjs(): ret=" + ret);
107103

108104
return ret;
109105
}

standalone-metastore/metastore-server/src/main/java/org/apache/hadoop/hive/metastore/HMSHandler.java

+7-5
Original file line numberDiff line numberDiff line change
@@ -6453,12 +6453,14 @@ public List<String> get_all_tables(final String dbname) throws MetaException {
64536453
} catch (Exception e) { /* ignore */ }
64546454

64556455
try {
6456-
List<TableMeta> filteredTableMetas = getMS().getTableMeta(parsedDbName[CAT_NAME], parsedDbName[DB_NAME], "*", null);
6457-
filteredTableMetas = FilterUtils.filterTableMetasIfEnabled(isServerFilterEnabled, filterHook, filteredTableMetas);
6458-
if (filteredTableMetas.isEmpty()) {
6459-
return new ArrayList<>();
6456+
if (getIfServerFilterenabled()) {
6457+
List<TableMeta> filteredTableMetas = get_table_meta(dbname, "*", null);
6458+
ret = filteredTableMetas.stream()
6459+
.map(TableMeta::getTableName)
6460+
.collect(Collectors.toList());
6461+
} else {
6462+
ret = getMS().getAllTables(parsedDbName[CAT_NAME], parsedDbName[DB_NAME]);
64606463
}
6461-
ret = filteredTableMetas.stream().map(TableMeta::getTableName).collect(Collectors.toList());
64626464
} catch (Exception e) {
64636465
ex = e;
64646466
throw newMetaException(e);

0 commit comments

Comments
 (0)