Skip to content

HIVE-29413: Avoid code duplication by updating getPartCols method for iceberg tables #6413

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
ramitg254 wants to merge 7 commits into
base: master
Choose a base branch
from
Open

HIVE-29413: Avoid code duplication by updating getPartCols method for iceberg tables #6413

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
40b675f
HIVE-29413: Avoid code duplication by updating getPartCols method for…
ramitg254 Apr 8, 2026
dcc6bce
commit-2
ramitg254 Apr 9, 2026
fd02020
corrected bucket-map-join test
ramitg254 Apr 9, 2026
2d70019
corrected update statements
ramitg254 Apr 10, 2026
0f1ca01
corrected load, partition evolution tests
ramitg254 Apr 11, 2026
deeac50
refractored
ramitg254 Apr 11, 2026
63960b0
addressed sonar issues
ramitg254 Apr 12, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion ...alog/core/src/test/java/org/apache/hive/hcatalog/mapreduce/TestHCatMultiOutputFormat.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -374,7 +374,7 @@ private List<String> getTableData(String table, String database) throws Exceptio
Hive hive = Hive.get(conf);
org.apache.hadoop.hive.ql.metadata.Table tbl = hive.getTable(database, table);
FetchWork work;
if (!tbl.getPartCols().isEmpty()) {
if (!tbl.getEffectivePartCols().isEmpty()) {
Copy link
Copy Markdown
Member

@deniskuzZ deniskuzZ Apr 24, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@ramitg254 it's unnecessary here.

Copy link
Copy Markdown
Contributor Author

@ramitg254 ramitg254 Apr 25, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

yes , but getEffectivePartCols() will be renamed to getPartcols eventually when we will be able to drop the current getPartCols() after updation in getCols() as per : #6413 (comment)

List<Partition> partitions = hive.getPartitions(tbl);
List<PartitionDesc> partDesc = new ArrayList<PartitionDesc>();
List<Path> partLocs = new ArrayList<Path>();
Expand Down
3 changes: 1 addition & 2 deletions llap-server/src/java/org/apache/hadoop/hive/llap/io/api/impl/LlapInputFormat.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,6 @@
import java.util.Collections;
import java.util.HashMap;
import java.util.Iterator;
import java.util.LinkedHashMap;
import java.util.List;
import java.util.Map;
import java.util.concurrent.ExecutorService;
Expand Down Expand Up @@ -232,7 +231,7 @@ static VectorizedRowBatchCtx createFakeVrbCtx(MapWork mapWork) throws HiveExcept
if (paths.hasNext()) {
PartitionDesc partDesc = mapWork.getPathToPartitionInfo().get(paths.next());
if (partDesc != null) {
LinkedHashMap<String, String> partSpec = partDesc.getPartSpec();
Map<String, String> partSpec = partDesc.getPartSpec();
if (partSpec != null && !partSpec.isEmpty()) {
partitionColumnCount = partSpec.size();
}
Expand Down
32 changes: 16 additions & 16 deletions ql/src/java/org/apache/hadoop/hive/llap/ProactiveEviction.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -158,13 +158,13 @@ public static final class Request {

// Holds a hierarchical structure of DBs, tables and partitions such as:
// { testdb : { testtab0 : [], testtab1 : [ {pk0 : p0v0, pk1 : p0v1}, {pk0 : p1v0, pk1 : p1v1} ] }, testdb2 : {} }
private final Map<String, Map<String, Set<LinkedHashMap<String, String>>>> entities;
private final Map<String, Map<String, Set<Map<String, String>>>> entities;

private Request(Map<String, Map<String, Set<LinkedHashMap<String, String>>>> entities) {
private Request(Map<String, Map<String, Set<Map<String, String>>>> entities) {
this.entities = entities;
}

public Map<String, Map<String, Set<LinkedHashMap<String, String>>>> getEntities() {
public Map<String, Map<String, Set<Map<String, String>>>> getEntities() {
return entities;
}

Expand All @@ -191,21 +191,21 @@ public List<LlapDaemonProtocolProtos.EvictEntityRequestProto> toProtoRequests()

List<LlapDaemonProtocolProtos.EvictEntityRequestProto> protoRequests = new LinkedList<>();

for (Map.Entry<String, Map<String, Set<LinkedHashMap<String, String>>>> dbEntry : entities.entrySet()) {
for (Map.Entry<String, Map<String, Set<Map<String, String>>>> dbEntry : entities.entrySet()) {
String dbName = dbEntry.getKey();
Map<String, Set<LinkedHashMap<String, String>>> tables = dbEntry.getValue();
Map<String, Set<Map<String, String>>> tables = dbEntry.getValue();

LlapDaemonProtocolProtos.EvictEntityRequestProto.Builder requestBuilder =
LlapDaemonProtocolProtos.EvictEntityRequestProto.newBuilder();
LlapDaemonProtocolProtos.TableProto.Builder tableBuilder = null;

requestBuilder.setDbName(dbName.toLowerCase());
for (Map.Entry<String, Set<LinkedHashMap<String, String>>> tableEntry : tables.entrySet()) {
for (Map.Entry<String, Set<Map<String, String>>> tableEntry : tables.entrySet()) {
String tableName = tableEntry.getKey();
tableBuilder = LlapDaemonProtocolProtos.TableProto.newBuilder();
tableBuilder.setTableName(tableName.toLowerCase());

Set<LinkedHashMap<String, String>> partitions = tableEntry.getValue();
Set<Map<String, String>> partitions = tableEntry.getValue();
Set<String> partitionKeys = null;

for (Map<String, String> partitionSpec : partitions) {
Expand Down Expand Up @@ -245,7 +245,7 @@ public boolean isTagMatch(CacheTag cacheTag) {
return false;
}

Map<String, Set<LinkedHashMap<String, String>>> tables = entities.get(db);
Map<String, Set<Map<String, String>>> tables = entities.get(db);

// If true, must be a drop DB event and this cacheTag matches.
if (tables.isEmpty()) {
Expand All @@ -261,7 +261,7 @@ public boolean isTagMatch(CacheTag cacheTag) {
for (String tableAndDbName : tables.keySet()) {
if (tableAndDbName.equals(tagTableName.getNotEmptyDbTable())) {

Set<LinkedHashMap<String, String>> partDescs = tables.get(tableAndDbName);
Set<Map<String, String>> partDescs = tables.get(tableAndDbName);

// If true, must be a drop table event, and this cacheTag matches.
if (partDescs == null) {
Expand Down Expand Up @@ -292,7 +292,7 @@ public String toString() {
*/
public static final class Builder {

private final Map<String, Map<String, Set<LinkedHashMap<String, String>>>> entities;
private final Map<String, Map<String, Set<Map<String, String>>>> entities;

private Builder() {
this.entities = new HashMap<>();
Expand All @@ -302,7 +302,7 @@ public static Builder create() {
return new Builder();
}

public Builder addPartitionOfATable(String db, String tableName, LinkedHashMap<String, String> partSpec) {
public Builder addPartitionOfATable(String db, String tableName, Map<String, String> partSpec) {
ensureDb(db);
ensureTable(db, tableName);
entities.get(db).get(tableName).add(partSpec);
Expand All @@ -325,7 +325,7 @@ public Request build() {
}

private void ensureDb(String dbName) {
Map<String, Set<LinkedHashMap<String, String>>> tables = entities.get(dbName);
Map<String, Set<Map<String, String>>> tables = entities.get(dbName);
if (tables == null) {
tables = new HashMap<>();
entities.put(dbName, tables);
Expand All @@ -334,9 +334,9 @@ private void ensureDb(String dbName) {

private void ensureTable(String dbName, String tableName) {
ensureDb(dbName);
Map<String, Set<LinkedHashMap<String, String>>> tables = entities.get(dbName);
Map<String, Set<Map<String, String>>> tables = entities.get(dbName);

Set<LinkedHashMap<String, String>> partitions = tables.get(tableName);
Set<Map<String, String>> partitions = tables.get(tableName);
if (partitions == null) {
partitions = new HashSet<>();
tables.put(tableName, partitions);
Expand All @@ -352,7 +352,7 @@ public Builder fromProtoRequest(LlapDaemonProtocolProtos.EvictEntityRequestProto
entities.clear();
String dbName = protoRequest.getDbName().toLowerCase();

Map<String, Set<LinkedHashMap<String, String>>> entitiesInDb = new HashMap<>();
Map<String, Set<Map<String, String>>> entitiesInDb = new HashMap<>();
List<LlapDaemonProtocolProtos.TableProto> tables = protoRequest.getTableList();

if (tables != null && !tables.isEmpty()) {
Expand All @@ -364,7 +364,7 @@ public Builder fromProtoRequest(LlapDaemonProtocolProtos.EvictEntityRequestProto
entitiesInDb.put(dbAndTableName, null);
continue;
}
Set<LinkedHashMap<String, String>> partitions = new HashSet<>();
Set<Map<String, String>> partitions = new HashSet<>();
LinkedHashMap<String, String> partDesc = new LinkedHashMap<>();

for (int valIx = 0; valIx < table.getPartValCount(); ++valIx) {
Expand Down
13 changes: 2 additions & 11 deletions ql/src/java/org/apache/hadoop/hive/ql/ddl/table/column/show/ShowColumnsOperation.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -66,10 +66,7 @@ private List<FieldSchema> getColumnsByPattern() throws HiveException {

private List<FieldSchema> getCols() throws HiveException {
Table table = context.getDb().getTable(desc.getTableName());
List<FieldSchema> allColumns = new ArrayList<>();
allColumns.addAll(table.getCols());
allColumns.addAll(table.getPartCols());
return allColumns;
return new ArrayList<>(table.getAllCols());
Copy link
Copy Markdown
Member

@deniskuzZ deniskuzZ Apr 24, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

table.getAllCols() already created a new ArrayList - one more is redundant

}

private Matcher getMatcher() {
Expand All @@ -94,13 +91,7 @@ private List<FieldSchema> filterColumns(List<FieldSchema> columns, Matcher match
}

if (desc.isSorted()) {
result.sort(
new Comparator<FieldSchema>() {
@Override
public int compare(FieldSchema f1, FieldSchema f2) {
return f1.getName().compareTo(f2.getName());
}
});
result.sort(Comparator.comparing(FieldSchema::getName));
}
return result;
}
Expand Down
2 changes: 1 addition & 1 deletion ql/src/java/org/apache/hadoop/hive/ql/ddl/table/create/like/CreateTableLikeOperation.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -100,7 +100,7 @@ private Table createViewLikeTable(Table oldTable) throws HiveException {
setUserSpecifiedLocation(table);

table.setFields(oldTable.getCols());
table.setPartCols(oldTable.getPartCols());
table.setPartCols(oldTable.getEffectivePartCols());
Copy link
Copy Markdown
Member

@deniskuzZ deniskuzZ Apr 24, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

we should keep this unchanged. that would probably try to persist into HMS


if (desc.getDefaultSerdeProps() != null) {
for (Map.Entry<String, String> e : desc.getDefaultSerdeProps().entrySet()) {
Expand Down
36 changes: 12 additions & 24 deletions .../java/org/apache/hadoop/hive/ql/ddl/table/info/desc/formatter/TextDescTableFormatter.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -59,7 +59,6 @@

import java.io.DataOutputStream;
import java.io.IOException;
import java.io.UnsupportedEncodingException;
import java.nio.charset.StandardCharsets;
import java.util.ArrayList;
import java.util.Collections;
Expand All @@ -70,7 +69,6 @@
import java.util.Set;
import java.util.TreeMap;
import java.util.Map.Entry;
import java.util.stream.Collectors;

import static org.apache.hadoop.hive.metastore.api.hive_metastoreConstants.TABLE_IS_CTAS;
import static org.apache.hadoop.hive.ql.ddl.ShowUtils.ALIGNMENT;
Expand Down Expand Up @@ -171,13 +169,7 @@ private void addPartitionData(DataOutputStream out, HiveConf conf, String column
boolean isFormatted, boolean isOutputPadded) throws IOException {
String partitionData = "";
if (columnPath == null) {
List<FieldSchema> partitionColumns = null;
// TODO (HIVE-29413): Refactor to a generic getPartCols() implementation
if (table.isPartitioned()) {
partitionColumns = table.hasNonNativePartitionSupport() ?
table.getStorageHandler().getPartitionKeys(table) :
table.getPartCols();
}
List<FieldSchema> partitionColumns = table.isPartitioned() ? table.getEffectivePartCols() : null;
if (CollectionUtils.isNotEmpty(partitionColumns) &&
conf.getBoolVar(ConfVars.HIVE_DISPLAY_PARTITION_COLUMNS_SEPARATELY)) {
TextMetaDataTable metaDataTable = new TextMetaDataTable();
Expand All @@ -204,13 +196,9 @@ private void addPartitionData(DataOutputStream out, HiveConf conf, String column
}

private void addFormattedTableData(DataOutputStream out, Table table, Partition partition, boolean isOutputPadded)
throws IOException, UnsupportedEncodingException {
String formattedTableInfo = null;
if (partition != null) {
formattedTableInfo = getPartitionInformation(table, partition);
} else {
formattedTableInfo = getTableInformation(table, isOutputPadded);
}
throws IOException {
String formattedTableInfo = (partition != null) ? getPartitionInformation(table, partition) :
getTableInformation(table, isOutputPadded);

if (table.getTableConstraintsInfo().isTableConstraintsInfoNotEmpty()) {
formattedTableInfo += getConstraintsInformation(table);
Expand Down Expand Up @@ -335,24 +323,24 @@ private void getStorageDescriptorInfo(StringBuilder tableInfo, Table table, Stor
List<String> skewedCoumnNames =
storageDesc.getSkewedInfo().getSkewedColNames().stream()
.sorted()
.collect(Collectors.toList());
.toList();
formatOutput("Skewed Columns:", skewedCoumnNames.toString(), tableInfo);
}

if (CollectionUtils.isNotEmpty(storageDesc.getSkewedInfo().getSkewedColValues())) {
List<List<String>> skewedColumnValues =
storageDesc.getSkewedInfo().getSkewedColValues().stream()
.sorted(new VectorComparator<String>())
.collect(Collectors.toList());
.toList();
formatOutput("Skewed Values:", skewedColumnValues.toString(), tableInfo);
}

Map<List<String>, String> skewedColMap = new TreeMap<>(new VectorComparator<String>());
Map<List<String>, String> skewedColMap = new TreeMap<>(new VectorComparator<>());
skewedColMap.putAll(storageDesc.getSkewedInfo().getSkewedColValueLocationMaps());
if (MapUtils.isNotEmpty(skewedColMap)) {
formatOutput("Skewed Value to Path:", skewedColMap.toString(), tableInfo);
Map<List<String>, String> truncatedSkewedColMap =
new TreeMap<List<String>, String>(new VectorComparator<String>());
new TreeMap<>(new VectorComparator<>());
// walk through existing map to truncate path so that test won't mask it then we can verify location is right
Set<Entry<List<String>, String>> entries = skewedColMap.entrySet();
for (Entry<List<String>, String> entry : entries) {
Expand Down Expand Up @@ -401,7 +389,7 @@ private void getPartitionMetaDataInformation(StringBuilder tableInfo, Partition
}
}

private class VectorComparator<T extends Comparable<T>> implements Comparator<List<T>>{
private static final class VectorComparator<T extends Comparable<T>> implements Comparator<List<T>> {
@Override
public int compare(List<T> listA, List<T> listB) {
for (int i = 0; i < listA.size() && i < listB.size(); i++) {
Expand Down Expand Up @@ -436,7 +424,7 @@ private void displayAllParameters(Map<String, String> params, StringBuilder tabl

private void displayAllParameters(Map<String, String> params, StringBuilder tableInfo, boolean escapeUnicode,
boolean isOutputPadded) {
List<String> keys = new ArrayList<String>(params.keySet());
List<String> keys = new ArrayList<>(params.keySet());
Collections.sort(keys);
for (String key : keys) {
String value = params.get(key);
Expand Down Expand Up @@ -624,7 +612,7 @@ private void addExtendedTableData(DataOutputStream out, Table table, Partition p
}

private void addExtendedConstraintData(DataOutputStream out, Table table)
throws IOException, UnsupportedEncodingException {
throws IOException {
if (table.getTableConstraintsInfo().isTableConstraintsInfoNotEmpty()) {
out.write(("Constraints").getBytes(StandardCharsets.UTF_8));
out.write(Utilities.tabCode);
Expand Down Expand Up @@ -656,7 +644,7 @@ private void addExtendedConstraintData(DataOutputStream out, Table table)
}

private void addExtendedStorageData(DataOutputStream out, Table table)
throws IOException, UnsupportedEncodingException {
throws IOException {
if (table.getStorageHandlerInfo() != null) {
out.write(("StorageHandlerInfo").getBytes(StandardCharsets.UTF_8));
out.write(Utilities.newLineCode);
Expand Down
2 changes: 1 addition & 1 deletion ...che/hadoop/hive/ql/ddl/table/info/show/status/formatter/JsonShowTableStatusFormatter.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -69,7 +69,7 @@ private Map<String, Object> makeOneTableStatus(Table table, Hive db, HiveConf co

builder.put("partitioned", table.isPartitioned());
if (table.isPartitioned()) {
builder.put("partitionColumns", JsonDescTableFormatter.createColumnsInfo(table.getPartCols(),
builder.put("partitionColumns", JsonDescTableFormatter.createColumnsInfo(table.getEffectivePartCols(),
Collections.emptyList()));
}

Expand Down
2 changes: 1 addition & 1 deletion ...che/hadoop/hive/ql/ddl/table/info/show/status/formatter/TextShowTableStatusFormatter.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -73,7 +73,7 @@ private void writeStorageInfo(DataOutputStream out, Partition partition, Table t
private void writeColumnsInfo(DataOutputStream out, Table table) throws IOException, UnsupportedEncodingException {
String columns = MetaStoreUtils.getDDLFromFieldSchema("columns", table.getCols());
String partitionColumns = table.isPartitioned() ?
MetaStoreUtils.getDDLFromFieldSchema("partition_columns", table.getPartCols()) : "";
MetaStoreUtils.getDDLFromFieldSchema("partition_columns", table.getEffectivePartCols()) : "";

out.write(Utilities.newLineCode);
out.write(("columns:" + columns).getBytes(StandardCharsets.UTF_8));
Expand Down
3 changes: 1 addition & 2 deletions ql/src/java/org/apache/hadoop/hive/ql/ddl/table/partition/PartitionUtils.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,6 @@
import java.util.List;
import java.util.Map;
import java.util.Set;
import java.util.Map.Entry;

import org.apache.hadoop.hive.conf.HiveConf;
import org.apache.hadoop.hive.conf.HiveConf.ConfVars;
Expand Down Expand Up @@ -150,7 +149,7 @@ public static List<Partition> getPartitionsWithSpecs(Hive db, Table table, GetPa
}

private static String tablePartitionColNames(Table table) {
List<FieldSchema> partCols = table.getPartCols();
List<FieldSchema> partCols = table.getEffectivePartCols();
return String.join("/", partCols.toString());
}

Expand Down
4 changes: 2 additions & 2 deletions ...ache/hadoop/hive/ql/ddl/table/partition/exchange/AlterTableExchangePartitionAnalyzer.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -84,7 +84,7 @@ protected void analyzeCommand(TableName tableName, Map<String, String> partition
if (AcidUtils.isTransactionalTable(sourceTable) || AcidUtils.isTransactionalTable(destTable)) {
throw new SemanticException(ErrorMsg.EXCHANGE_PARTITION_NOT_ALLOWED_WITH_TRANSACTIONAL_TABLES.getMsg());
}
List<String> sourceProjectFilters = MetaStoreUtils.getPvals(sourceTable.getPartCols(), partitionSpecs);
List<String> sourceProjectFilters = MetaStoreUtils.getPvals(sourceTable.getEffectivePartCols(), partitionSpecs);
Copy link
Copy Markdown
Member

@deniskuzZ deniskuzZ Apr 24, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

are you sure we need to change here? i don't think we support ALTER TABLE ... EXCHANGE PARTITION ... WITH TABLE ... commands for non-native tables


// check if source partition exists
GetPartitionsFilterSpec sourcePartitionsFilterSpec = new GetPartitionsFilterSpec();
Expand All @@ -106,7 +106,7 @@ protected void analyzeCommand(TableName tableName, Map<String, String> partition
throw new SemanticException(ErrorMsg.PARTITION_VALUE_NOT_CONTINUOUS.getMsg(partitionSpecs.toString()));
}

List<String> destProjectFilters = MetaStoreUtils.getPvals(destTable.getPartCols(), partitionSpecs);
List<String> destProjectFilters = MetaStoreUtils.getPvals(destTable.getEffectivePartCols(), partitionSpecs);

// check if dest partition exists
GetPartitionsFilterSpec getDestPartitionsFilterSpec = new GetPartitionsFilterSpec();
Expand Down
6 changes: 3 additions & 3 deletions ql/src/java/org/apache/hadoop/hive/ql/ddl/table/partition/show/ShowPartitionAnalyzer.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -102,7 +102,7 @@ ExprNodeDesc getShowPartitionsFilter(Table table, ASTNode command) throws Semant
if (astChild.getType() == HiveParser.TOK_WHERE) {
RowResolver rwsch = new RowResolver();
Map<String, String> colTypes = new HashMap<String, String>();
for (FieldSchema fs : table.getPartCols()) {
for (FieldSchema fs : table.getEffectivePartCols()) {
Copy link
Copy Markdown
Member

@deniskuzZ deniskuzZ Apr 24, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

could you please check if this is supported in iceberg and add test if yes

rwsch.put(table.getTableName(), fs.getName(), new ColumnInfo(fs.getName(),
TypeInfoFactory.stringTypeInfo, null, true));
colTypes.put(fs.getName().toLowerCase(), fs.getType());
Expand Down Expand Up @@ -202,8 +202,8 @@ private String getShowPartitionsOrder(Table table, ASTNode command) throws Seman
if (astChild.getType() == HiveParser.TOK_ORDERBY) {
Map<String, Integer> poses = new HashMap<String, Integer>();
RowResolver rwsch = new RowResolver();
for (int i = 0; i < table.getPartCols().size(); i++) {
FieldSchema fs = table.getPartCols().get(i);
for (int i = 0; i < table.getEffectivePartCols().size(); i++) {
FieldSchema fs = table.getEffectivePartCols().get(i);
rwsch.put(table.getTableName(), fs.getName(), new ColumnInfo(fs.getName(),
TypeInfoFactory.getPrimitiveTypeInfo(fs.getType()), null, true));
poses.put(fs.getName().toLowerCase(), i);
Expand Down
2 changes: 1 addition & 1 deletion .../java/org/apache/hadoop/hive/ql/ddl/table/storage/archive/AlterTableArchiveOperation.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -129,7 +129,7 @@ private Path getOriginalDir(Table table, PartSpecInfo partitionSpecInfo, List<Pa
// in full partition specification case we allow custom locations to keep backward compatibility
if (partitions.isEmpty()) {
throw new HiveException("No partition matches the specification");
} else if (partitionSpecInfo.values.size() != table.getPartCols().size()) {
} else if (partitionSpecInfo.values.size() != table.getEffectivePartCols().size()) {
Copy link
Copy Markdown
Member

@deniskuzZ deniskuzZ Apr 24, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

do we need it here?

// for partial specifications we need partitions to follow the scheme
for (Partition partition : partitions) {
if (AlterTableArchiveUtils.partitionInCustomLocation(table, partition)) {
Expand Down
2 changes: 1 addition & 1 deletion ql/src/java/org/apache/hadoop/hive/ql/ddl/table/storage/archive/AlterTableArchiveUtils.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -71,7 +71,7 @@ static void setOriginalLocation(Partition partition, String loc) {
static boolean partitionInCustomLocation(Table table, Partition partition) throws HiveException {
String subdir = null;
try {
subdir = Warehouse.makePartName(table.getPartCols(), partition.getValues());
subdir = Warehouse.makePartName(table.getEffectivePartCols(), partition.getValues());
Copy link
Copy Markdown
Member

@deniskuzZ deniskuzZ Apr 24, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

same, i don't even know what this archive is doing

} catch (MetaException e) {
throw new HiveException("Unable to get partition's directory", e);
}
Expand Down
Loading
Loading