hsnusonic commented on a change in pull request #2843:
URL: https://github.com/apache/hive/pull/2843#discussion_r763293899
##########
File path:
standalone-metastore/metastore-server/src/main/java/org/apache/hadoop/hive/metastore/MetaStoreDirectSql.java
##########
@@ -2818,26 +2820,24 @@ private void dropDanglingColumnDescriptors(List<Object>
columnDescriptorIdList)
// Drop column descriptor, if no relation left
queryText =
- "SELECT " + SDS + ".\"CD_ID\", count(1) "
+ "SELECT " + SDS + ".\"CD_ID\" "
+ "from " + SDS + " "
+ "WHERE " + SDS + ".\"CD_ID\" in (" + colIds + ") "
+ "GROUP BY " + SDS + ".\"CD_ID\"";
- List<Object> danglingColumnDescriptorIdList = new
ArrayList<>(columnDescriptorIdList.size());
+ Set<Long> danglingColumnDescriptorIdSet = new
HashSet<>(columnDescriptorIdList);
try (QueryWrapper query = new
QueryWrapper(pm.newQuery("javax.jdo.query.SQL", queryText))) {
- List<Object[]> sqlResult = MetastoreDirectSqlUtils
- .ensureList(executeWithArray(query, null, queryText));
+ List<Long> sqlResult = executeWithArray(query, null, queryText);
if (!sqlResult.isEmpty()) {
- for (Object[] fields : sqlResult) {
- if (MetastoreDirectSqlUtils.extractSqlInt(fields[1]) == 0) {
-
danglingColumnDescriptorIdList.add(MetastoreDirectSqlUtils.extractSqlLong(fields[0]));
- }
+ for (Long cdId : sqlResult) {
+ // the returned CD is not dangling, so remove it from the list
+ danglingColumnDescriptorIdSet.remove(cdId);
}
}
}
- if (!danglingColumnDescriptorIdList.isEmpty()) {
+ if (!danglingColumnDescriptorIdSet.isEmpty()) {
try {
- String danglingCDIds = getIdListForIn(danglingColumnDescriptorIdList);
+ String danglingCDIds =
getIdListForIn(Arrays.asList(danglingColumnDescriptorIdSet.toArray()));
Review comment:
Sounds great. I made the change.
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: [email protected]
For queries about this service, please contact Infrastructure at:
[email protected]
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
