This is an automated email from the ASF dual-hosted git repository.
dengzh 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 39650a67bd2 HIVE-29034: ALTER TABLE CHANGE COLUMN fails with Oracle
backed Metastore (#5883)
39650a67bd2 is described below
commit 39650a67bd2e7f6d530b56b4b1b096ab481610a8
Author: dengzh <[email protected]>
AuthorDate: Tue Jun 24 06:40:29 2025 +0800
HIVE-29034: ALTER TABLE CHANGE COLUMN fails with Oracle backed Metastore
(#5883)
---
.../hadoop/hive/metastore/DirectSqlUpdatePart.java | 16 +++++++++++-----
1 file changed, 11 insertions(+), 5 deletions(-)
diff --git
a/standalone-metastore/metastore-server/src/main/java/org/apache/hadoop/hive/metastore/DirectSqlUpdatePart.java
b/standalone-metastore/metastore-server/src/main/java/org/apache/hadoop/hive/metastore/DirectSqlUpdatePart.java
index 7d28b774688..237f3153bf4 100644
---
a/standalone-metastore/metastore-server/src/main/java/org/apache/hadoop/hive/metastore/DirectSqlUpdatePart.java
+++
b/standalone-metastore/metastore-server/src/main/java/org/apache/hadoop/hive/metastore/DirectSqlUpdatePart.java
@@ -892,18 +892,24 @@ public List<Void> run(List<Long> input) throws Exception {
sdIdToNewCdId.containsKey(sdId) ? sdIdToNewCdId.get(sdId) : cdId);
updateSDInBatch(validSdIds, idToSd, sdIdToCdId);
- List<Long> usedIds = Batchable.runBatched(maxBatchSize, cdIdsMayDelete,
+ Set<Long> usedIds = new HashSet<>(Batchable.runBatched(maxBatchSize,
cdIdsMayDelete,
new Batchable<Long, Long>() {
@Override
public List<Long> run(List<Long> input) throws Exception {
String idLists = MetaStoreDirectSql.getIdListForIn(input);
- String queryText = "select \"CD_ID\" from \"SDS\" where \"CD_ID\"
in ( " + idLists + ")";
+ String queryText = "select DISTINCT \"CD_ID\" from \"SDS\" where
\"CD_ID\" in ( " + idLists + ")";
+ List<Long> cdIds = new ArrayList<>();
try (QueryWrapper query = new
QueryWrapper(pm.newQuery("javax.jdo.query.SQL", queryText))) {
- List<Long> sqlResult = executeWithArray(query.getInnerQuery(),
null, queryText);
- return new ArrayList<>(sqlResult);
+ List<Object> sqlResult = executeWithArray(query.getInnerQuery(),
null, queryText);
+ if (sqlResult != null) {
+ for (Object cdId : sqlResult) {
+ cdIds.add(MetastoreDirectSqlUtils.extractSqlLong(cdId));
+ }
+ }
}
+ return cdIds;
}
- });
+ }));
List<Long> unusedCdIds = cdIdsMayDelete.stream().filter(id ->
!usedIds.contains(id)).collect(Collectors.toList());
deleteCDInBatch(unusedCdIds);