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

Author: ragupta-netizen

hcatalog/core/src/test/java/org/apache/hive/hcatalog/mapreduce/TestHCatMultiOutputFormat.java

@@ -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.getPartCols(true).isEmpty()) {
       List<Partition> partitions = hive.getPartitions(tbl);
       List<PartitionDesc> partDesc = new ArrayList<PartitionDesc>();
       List<Path> partLocs = new ArrayList<Path>();

ql/src/java/org/apache/hadoop/hive/ql/ddl/table/AlterTableUtils.java

@@ -75,7 +75,7 @@ public static boolean isSchemaEvolutionEnabled(Table table, Configuration conf)
   }
 
   public static boolean isFullPartitionSpec(Table table, Map<String, String> partitionSpec) {
-    for (FieldSchema partitionCol : table.getPartCols()) {
+    for (FieldSchema partitionCol : table.getPartCols(false)) {
       if (partitionSpec.get(partitionCol.getName()) == null) {
         return false;
       }

ql/src/java/org/apache/hadoop/hive/ql/ddl/table/column/show/ShowColumnsOperation.java

@@ -66,9 +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());
+    List<FieldSchema> allColumns = new ArrayList<>(table.getAllCols());
     return allColumns;
   }
 

ql/src/java/org/apache/hadoop/hive/ql/ddl/table/create/like/CreateTableLikeOperation.java

@@ -100,7 +100,7 @@ private Table createViewLikeTable(Table oldTable) throws HiveException {
     setUserSpecifiedLocation(table);
 
     table.setFields(oldTable.getCols());
-    table.setPartCols(oldTable.getPartCols());
+    table.setPartCols(oldTable.getPartCols(true));
 
     if (desc.getDefaultSerdeProps() != null) {
       for (Map.Entry<String, String> e : desc.getDefaultSerdeProps().entrySet()) {

ql/src/java/org/apache/hadoop/hive/ql/ddl/table/info/desc/DescTableOperation.java

@@ -131,7 +131,7 @@ private void getColumnsNoColumnPath(Table table, Partition partition, List<Field
     cols.addAll(partition == null || table.getTableType() == TableType.VIRTUAL_VIEW ?
         table.getCols() : partition.getCols());
     if (!desc.isFormatted()) {
-      cols.addAll(table.getPartCols());
+      cols.addAll(table.getPartCols(false));
     }
 
     // Fetch partition statistics only for describe extended or formatted.

ql/src/java/org/apache/hadoop/hive/ql/ddl/table/info/desc/formatter/TextDescTableFormatter.java

@@ -174,9 +174,7 @@ private void addPartitionData(DataOutputStream out, HiveConf conf, String column
       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();
+        partitionColumns = table.getPartCols(true);
       }
       if (CollectionUtils.isNotEmpty(partitionColumns) &&
           conf.getBoolVar(ConfVars.HIVE_DISPLAY_PARTITION_COLUMNS_SEPARATELY)) {

ql/src/java/org/apache/hadoop/hive/ql/ddl/table/info/show/status/formatter/JsonShowTableStatusFormatter.java

@@ -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.getPartCols(true),
           Collections.emptyList()));
     }
 

ql/src/java/org/apache/hadoop/hive/ql/ddl/table/info/show/status/formatter/TextShowTableStatusFormatter.java

@@ -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.getPartCols(true)) : "";
 
     out.write(Utilities.newLineCode);
     out.write(("columns:" + columns).getBytes(StandardCharsets.UTF_8));

ql/src/java/org/apache/hadoop/hive/ql/ddl/table/partition/PartitionUtils.java

@@ -150,7 +150,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.getPartCols(true);
     return String.join("/", partCols.toString());
   }
 

ql/src/java/org/apache/hadoop/hive/ql/ddl/table/partition/exchange/AlterTableExchangePartitionAnalyzer.java

@@ -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.getPartCols(true), partitionSpecs);
 
     // check if source partition exists
     GetPartitionsFilterSpec sourcePartitionsFilterSpec = new GetPartitionsFilterSpec();
@@ -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.getPartCols(true), partitionSpecs);
 
     // check if dest partition exists
     GetPartitionsFilterSpec getDestPartitionsFilterSpec = new GetPartitionsFilterSpec();