diff --git a/llap-server/src/java/org/apache/hadoop/hive/llap/io/api/impl/LlapInputFormat.java b/llap-server/src/java/org/apache/hadoop/hive/llap/io/api/impl/LlapInputFormat.java
index e74885e57a3d..67e59155b67c 100644
--- a/llap-server/src/java/org/apache/hadoop/hive/llap/io/api/impl/LlapInputFormat.java
+++ b/llap-server/src/java/org/apache/hadoop/hive/llap/io/api/impl/LlapInputFormat.java
@@ -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;
@@ -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();
         }
diff --git a/ql/src/java/org/apache/hadoop/hive/llap/ProactiveEviction.java b/ql/src/java/org/apache/hadoop/hive/llap/ProactiveEviction.java
index 120949fc9949..f4a008257bb8 100644
--- a/ql/src/java/org/apache/hadoop/hive/llap/ProactiveEviction.java
+++ b/ql/src/java/org/apache/hadoop/hive/llap/ProactiveEviction.java
@@ -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;
     }
 
@@ -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) {
@@ -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()) {
@@ -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) {
@@ -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<>();
@@ -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);
@@ -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);
@@ -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);
@@ -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()) {
@@ -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) {
diff --git a/ql/src/java/org/apache/hadoop/hive/ql/ddl/table/column/show/ShowColumnsOperation.java b/ql/src/java/org/apache/hadoop/hive/ql/ddl/table/column/show/ShowColumnsOperation.java
index 289479b7ee79..87d115df72ed 100644
--- a/ql/src/java/org/apache/hadoop/hive/ql/ddl/table/column/show/ShowColumnsOperation.java
+++ b/ql/src/java/org/apache/hadoop/hive/ql/ddl/table/column/show/ShowColumnsOperation.java
@@ -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());
   }
 
   private Matcher getMatcher() {
@@ -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;
   }
diff --git a/ql/src/java/org/apache/hadoop/hive/ql/ddl/table/info/desc/formatter/TextDescTableFormatter.java b/ql/src/java/org/apache/hadoop/hive/ql/ddl/table/info/desc/formatter/TextDescTableFormatter.java
index b1dd9738572a..31250b6be9a3 100644
--- a/ql/src/java/org/apache/hadoop/hive/ql/ddl/table/info/desc/formatter/TextDescTableFormatter.java
+++ b/ql/src/java/org/apache/hadoop/hive/ql/ddl/table/info/desc/formatter/TextDescTableFormatter.java
@@ -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;
@@ -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;
@@ -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.getPartCols() : null;
       if (CollectionUtils.isNotEmpty(partitionColumns) &&
           conf.getBoolVar(ConfVars.HIVE_DISPLAY_PARTITION_COLUMNS_SEPARATELY)) {
         TextMetaDataTable metaDataTable = new TextMetaDataTable();
@@ -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);
@@ -335,7 +323,7 @@ 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);
       }
 
@@ -343,16 +331,16 @@ private void getStorageDescriptorInfo(StringBuilder tableInfo, Table table, Stor
         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) {
@@ -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++) {
@@ -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);
@@ -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);
@@ -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);
diff --git a/ql/src/java/org/apache/hadoop/hive/ql/ddl/table/partition/PartitionUtils.java b/ql/src/java/org/apache/hadoop/hive/ql/ddl/table/partition/PartitionUtils.java
index db7a5dfcd3d0..5882e4616506 100644
--- a/ql/src/java/org/apache/hadoop/hive/ql/ddl/table/partition/PartitionUtils.java
+++ b/ql/src/java/org/apache/hadoop/hive/ql/ddl/table/partition/PartitionUtils.java
@@ -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;
diff --git a/ql/src/java/org/apache/hadoop/hive/ql/exec/ArchiveUtils.java b/ql/src/java/org/apache/hadoop/hive/ql/exec/ArchiveUtils.java
index ebe8f2f52775..e333ed85f439 100644
--- a/ql/src/java/org/apache/hadoop/hive/ql/exec/ArchiveUtils.java
+++ b/ql/src/java/org/apache/hadoop/hive/ql/exec/ArchiveUtils.java
@@ -24,7 +24,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;
 
@@ -254,7 +253,7 @@ public static String getPartialName(Partition p, int level) throws HiveException
    * @throws HiveException
    */
   public static String conflictingArchiveNameOrNull(Hive db, Table tbl,
-        LinkedHashMap<String, String> partSpec)
+        Map<String, String> partSpec)
       throws HiveException {
 
     List<FieldSchema> partKeys = tbl.getPartitionKeys();
diff --git a/ql/src/java/org/apache/hadoop/hive/ql/exec/DDLPlanUtils.java b/ql/src/java/org/apache/hadoop/hive/ql/exec/DDLPlanUtils.java
index a5bc66733f46..9196a3441200 100644
--- a/ql/src/java/org/apache/hadoop/hive/ql/exec/DDLPlanUtils.java
+++ b/ql/src/java/org/apache/hadoop/hive/ql/exec/DDLPlanUtils.java
@@ -38,7 +38,6 @@
 import org.apache.hadoop.hive.metastore.api.DoubleColumnStatsData;
 import org.apache.hadoop.hive.metastore.api.FieldSchema;
 import org.apache.hadoop.hive.metastore.api.LongColumnStatsData;
-import org.apache.hadoop.hive.metastore.api.MetaException;
 import org.apache.hadoop.hive.metastore.api.Order;
 import org.apache.hadoop.hive.metastore.api.SerDeInfo;
 import org.apache.hadoop.hive.metastore.api.SkewedInfo;
diff --git a/ql/src/java/org/apache/hadoop/hive/ql/exec/vector/VectorizedRowBatchCtx.java b/ql/src/java/org/apache/hadoop/hive/ql/exec/vector/VectorizedRowBatchCtx.java
index a0906cfb0339..38c4dfb036b8 100644
--- a/ql/src/java/org/apache/hadoop/hive/ql/exec/vector/VectorizedRowBatchCtx.java
+++ b/ql/src/java/org/apache/hadoop/hive/ql/exec/vector/VectorizedRowBatchCtx.java
@@ -19,7 +19,6 @@
 
 import java.io.IOException;
 import java.util.Arrays;
-import java.util.LinkedHashMap;
 import java.util.Map;
 import java.util.stream.IntStream;
 
@@ -287,7 +286,7 @@ public static void getPartitionValues(VectorizedRowBatchCtx vrbCtx,
   public static void getPartitionValues(VectorizedRowBatchCtx vrbCtx, PartitionDesc partDesc,
       Object[] partitionValues) {
 
-    LinkedHashMap<String, String> partSpec = partDesc.getPartSpec();
+    Map<String, String> partSpec = partDesc.getPartSpec();
 
     for (int i = 0; i < vrbCtx.partitionColumnCount; i++) {
       Object objectValue;
diff --git a/ql/src/java/org/apache/hadoop/hive/ql/metadata/DummyPartition.java b/ql/src/java/org/apache/hadoop/hive/ql/metadata/DummyPartition.java
index c188eb09fdcf..9f871d05feb3 100644
--- a/ql/src/java/org/apache/hadoop/hive/ql/metadata/DummyPartition.java
+++ b/ql/src/java/org/apache/hadoop/hive/ql/metadata/DummyPartition.java
@@ -90,10 +90,7 @@ public List<String> getValues() {
     Table table = this.getTable();
     values = new ArrayList<>();
 
-    // TODO (HIVE-29413): Refactor to a generic getPartCols() implementation
-    for (FieldSchema fs : table.hasNonNativePartitionSupport()
-        ? table.getStorageHandler().getPartitionKeys(table)
-        : table.getPartCols()) {
+    for (FieldSchema fs : table.getPartCols()) {
       String val = partSpec.get(fs.getName());
       values.add(val);
     }
diff --git a/ql/src/java/org/apache/hadoop/hive/ql/metadata/HiveMaterializedViewsRegistry.java b/ql/src/java/org/apache/hadoop/hive/ql/metadata/HiveMaterializedViewsRegistry.java
index 0cf02a95e392..ee55fde100f6 100644
--- a/ql/src/java/org/apache/hadoop/hive/ql/metadata/HiveMaterializedViewsRegistry.java
+++ b/ql/src/java/org/apache/hadoop/hive/ql/metadata/HiveMaterializedViewsRegistry.java
@@ -20,7 +20,6 @@
 import java.util.ArrayList;
 import java.util.Collection;
 import java.util.Collections;
-import java.util.EnumSet;
 import java.util.HashMap;
 import java.util.HashSet;
 import java.util.List;
@@ -430,10 +429,10 @@ private static RelNode createMaterializedViewScan(HiveConf conf, Table viewTable
 
     // 1.2 Add column info corresponding to partition columns
     ArrayList<ColumnInfo> partitionColumns = new ArrayList<ColumnInfo>();
-    for (FieldSchema part_col : viewTable.getPartCols()) {
-      colName = part_col.getName();
+    for (FieldSchema partCol : viewTable.getPartCols()) {
+      colName = partCol.getName();
       colInfo = new ColumnInfo(colName,
-          TypeInfoFactory.getPrimitiveTypeInfo(part_col.getType()), null, true);
+          TypeInfoFactory.getPrimitiveTypeInfo(partCol.getType()), null, true);
       rr.put(null, colName, colInfo);
       cInfoLst.add(colInfo);
       partitionColumns.add(colInfo);
diff --git a/ql/src/java/org/apache/hadoop/hive/ql/metadata/Partition.java b/ql/src/java/org/apache/hadoop/hive/ql/metadata/Partition.java
index 736e6e8c9f1a..4715775d3b4c 100644
--- a/ql/src/java/org/apache/hadoop/hive/ql/metadata/Partition.java
+++ b/ql/src/java/org/apache/hadoop/hive/ql/metadata/Partition.java
@@ -23,7 +23,6 @@
 import java.util.Arrays;
 import java.util.Collections;
 import java.util.HashMap;
-import java.util.LinkedHashMap;
 import java.util.List;
 import java.util.Map;
 import java.util.Objects;
@@ -124,7 +123,7 @@ public Partition(Table tbl, Map<String, String> partSpec, Path location) throws
 
   public static org.apache.hadoop.hive.metastore.api.Partition createMetaPartitionObject(
       Table tbl, Map<String, String> partSpec, Path location) throws HiveException {
-    List<String> pvals = new ArrayList<String>();
+    List<String> pvals = new ArrayList<>();
     for (FieldSchema field : tbl.getPartCols()) {
       String val = partSpec.get(field.getName());
       if (val == null || val.isEmpty()) {
@@ -173,7 +172,8 @@ protected void initialize(Table table,
           // set default if location is not set and this is a physical
           // table partition (not a view partition)
           if (table.getDataLocation() != null) {
-            Path partPath = new Path(table.getDataLocation(), Warehouse.makePartName(table.getPartCols(), tPartition.getValues()));
+            Path partPath = new Path(table.getDataLocation(),
+                Warehouse.makePartName(table.getPartCols(), tPartition.getValues()));
             tPartition.getSd().setLocation(partPath.toString());
           }
         }
@@ -416,7 +416,7 @@ public Path[] getPath(Sample s) throws HiveException {
       }
 
       int scount = s.getSampleFraction();
-      ArrayList<Path> ret = new ArrayList<Path>();
+      List<Path> ret = new ArrayList<>();
 
       if (bcount == scount) {
         ret.add(getBucketPath(s.getSampleNum() - 1));
@@ -428,7 +428,7 @@ public Path[] getPath(Sample s) throws HiveException {
         }
         // undersampling a bucket
         ret.add(getBucketPath((s.getSampleNum() - 1) % bcount));
-      } else if (bcount > scount) {
+      } else {
         if ((bcount / scount) * scount != bcount) {
           throw new HiveException("Sample Count" + scount
               + " is not a divisor of bucket count " + bcount + " for table "
@@ -439,11 +439,11 @@ public Path[] getPath(Sample s) throws HiveException {
           ret.add(getBucketPath(i * scount + (s.getSampleNum() - 1)));
         }
       }
-      return (ret.toArray(new Path[ret.size()]));
+      return (ret.toArray(new Path[0]));
     }
   }
 
-  public LinkedHashMap<String, String> getSpec() {
+  public Map<String, String> getSpec() {
     return table.createSpec(tPartition);
   }
 
@@ -542,7 +542,7 @@ public void setLocation(String location) {
    */
   public void setValues(Map<String, String> partSpec)
       throws HiveException {
-    List<String> pvals = new ArrayList<String>();
+    List<String> pvals = new ArrayList<>();
     for (FieldSchema field : table.getPartCols()) {
       String val = partSpec.get(field.getName());
       if (val == null) {
@@ -582,12 +582,11 @@ public List<String> getSkewedColNames() {
     return tPartition.getSd().getSkewedInfo().getSkewedColNames();
   }
 
-  public void setSkewedValueLocationMap(List<String> valList, String dirName)
-      throws HiveException {
+  public void setSkewedValueLocationMap(List<String> valList, String dirName) {
     Map<List<String>, String> mappings = tPartition.getSd().getSkewedInfo()
         .getSkewedColValueLocationMaps();
     if (null == mappings) {
-      mappings = new HashMap<List<String>, String>();
+      mappings = new HashMap<>();
       tPartition.getSd().getSkewedInfo().setSkewedColValueLocationMaps(mappings);
     }
 
@@ -612,8 +611,7 @@ public int hashCode() {
 
   @Override
   public boolean equals(Object obj) {
-    if (obj instanceof Partition) {
-      Partition o = (Partition) obj;
+    if (obj instanceof Partition o) {
       return Objects.equals(tPartition, o.tPartition);
     }
     return false;
diff --git a/ql/src/java/org/apache/hadoop/hive/ql/metadata/Table.java b/ql/src/java/org/apache/hadoop/hive/ql/metadata/Table.java
index f857e7d505f1..3e076e3a8039 100644
--- a/ql/src/java/org/apache/hadoop/hive/ql/metadata/Table.java
+++ b/ql/src/java/org/apache/hadoop/hive/ql/metadata/Table.java
@@ -19,6 +19,7 @@
 package org.apache.hadoop.hive.ql.metadata;
 
 import java.io.IOException;
+import java.io.Serial;
 import java.io.Serializable;
 import java.util.ArrayList;
 import java.util.Arrays;
@@ -33,6 +34,7 @@
 import java.util.Set;
 import java.util.stream.Collectors;
 
+
 import org.apache.commons.collections4.CollectionUtils;
 import org.apache.commons.lang3.StringUtils;
 import org.apache.hadoop.conf.Configuration;
@@ -47,6 +49,7 @@
 import org.apache.hadoop.hive.metastore.HiveMetaStoreUtils;
 import org.apache.hadoop.hive.metastore.api.SourceTable;
 import org.apache.hadoop.hive.metastore.conf.MetastoreConf;
+import org.apache.hadoop.hive.metastore.HiveMetaHook;
 import org.apache.hadoop.hive.metastore.TableType;
 import org.apache.hadoop.hive.metastore.Warehouse;
 import org.apache.hadoop.hive.metastore.api.ColumnStatistics;
@@ -100,6 +103,7 @@
  */
 public class Table implements Serializable {
 
+  @Serial
   private static final long serialVersionUID = 1L;
 
   static final private Logger LOG = LoggerFactory.getLogger("hive.ql.metadata.Table");
@@ -109,6 +113,7 @@ public class Table implements Serializable {
   /**
    * These fields are all cached fields.  The information comes from tTable.
    */
+  private List<FieldSchema> cachedPartCols;
   private transient Deserializer deserializer;
   private Class<? extends OutputFormat> outputFormatClass;
   private Class<? extends InputFormat> inputFormatClass;
@@ -193,6 +198,9 @@ public Table makeCopy() {
 
     newTab.setMetaTable(this.getMetaTable());
     newTab.setSnapshotRef(this.getSnapshotRef());
+    if (this.cachedPartCols != null) {
+      newTab.cachedPartCols = new ArrayList<>(this.cachedPartCols);
+    }
     return newTab;
   }
 
@@ -225,11 +233,11 @@ public void setTTable(org.apache.hadoop.hive.metastore.api.Table tTable) {
     {
       sd.setSerdeInfo(new SerDeInfo());
       sd.setNumBuckets(-1);
-      sd.setBucketCols(new ArrayList<String>());
-      sd.setCols(new ArrayList<FieldSchema>());
-      sd.setParameters(new HashMap<String, String>());
-      sd.setSortCols(new ArrayList<Order>());
-      sd.getSerdeInfo().setParameters(new HashMap<String, String>());
+      sd.setBucketCols(new ArrayList<>());
+      sd.setCols(new ArrayList<>());
+      sd.setParameters(new HashMap<>());
+      sd.setSortCols(new ArrayList<>());
+      sd.getSerdeInfo().setParameters(new HashMap<>());
       // We have to use MetadataTypedColumnsetSerDe because LazySimpleSerDe does
       // not support a table with no columns.
       sd.getSerdeInfo().setSerializationLib(MetadataTypedColumnsetSerDe.class.getName());
@@ -239,17 +247,17 @@ public void setTTable(org.apache.hadoop.hive.metastore.api.Table tTable) {
       sd.setInputFormat(SequenceFileInputFormat.class.getName());
       sd.setOutputFormat(HiveSequenceFileOutputFormat.class.getName());
       SkewedInfo skewInfo = new SkewedInfo();
-      skewInfo.setSkewedColNames(new ArrayList<String>());
-      skewInfo.setSkewedColValues(new ArrayList<List<String>>());
-      skewInfo.setSkewedColValueLocationMaps(new HashMap<List<String>, String>());
+      skewInfo.setSkewedColNames(new ArrayList<>());
+      skewInfo.setSkewedColValues(new ArrayList<>());
+      skewInfo.setSkewedColValueLocationMaps(new HashMap<>());
       sd.setSkewedInfo(skewInfo);
     }
 
     org.apache.hadoop.hive.metastore.api.Table t = new org.apache.hadoop.hive.metastore.api.Table();
     {
       t.setSd(sd);
-      t.setPartitionKeys(new ArrayList<FieldSchema>());
-      t.setParameters(new HashMap<String, String>());
+      t.setPartitionKeys(new ArrayList<>());
+      t.setParameters(new HashMap<>());
       t.setTableType(TableType.MANAGED_TABLE.toString());
       t.setDbName(databaseName);
       t.setTableName(tableName);
@@ -402,7 +410,7 @@ public void setStorageHandlerInfo(StorageHandlerInfo storageHandlerInfo) {
     this.storageHandlerInfo = storageHandlerInfo;
   }
 
-  final public Class<? extends InputFormat> getInputFormatClass() {
+  public final Class<? extends InputFormat> getInputFormatClass() {
     if (inputFormatClass == null) {
       try {
         String className = tTable.getSd().getInputFormat();
@@ -422,7 +430,7 @@ final public Class<? extends InputFormat> getInputFormatClass() {
     return inputFormatClass;
   }
 
-  final public Class<? extends OutputFormat> getOutputFormatClass() {
+  public final Class<? extends OutputFormat> getOutputFormatClass() {
     if (outputFormatClass == null) {
       try {
         String className = tTable.getSd().getOutputFormat();
@@ -456,7 +464,7 @@ public void setMaterializedTable(boolean materializedTable) {
    * Marker SemanticException, so that processing that allows for table validation failures
    * and appropriately handles them can recover from these types of SemanticExceptions
    */
-  public class ValidationFailureSemanticException extends SemanticException{
+  public static class ValidationFailureSemanticException extends SemanticException{
     public ValidationFailureSemanticException(String s) {
       super(s);
     }
@@ -526,9 +534,9 @@ public TableType getTableType() {
     return Enum.valueOf(TableType.class, tTable.getTableType());
   }
 
-  public ArrayList<StructField> getFields() {
+  public List<StructField> getFields() {
 
-    ArrayList<StructField> fields = new ArrayList<StructField>();
+    List<StructField> fields = new ArrayList<>();
     try {
       Deserializer decoder = getDeserializer();
 
@@ -594,7 +602,7 @@ public boolean equals(Object obj) {
         && Objects.equals(snapshotRef, other.snapshotRef);
   }
 
-  public List<FieldSchema> getPartCols() {
+  private List<FieldSchema> getNativePartCols() {
     List<FieldSchema> partKeys = tTable.getPartitionKeys();
     if (partKeys == null) {
       partKeys = new ArrayList<>();
@@ -603,17 +611,38 @@ public List<FieldSchema> getPartCols() {
     return partKeys;
   }
 
+  /**
+   * Returns partition columns, consulting the storage handler for non-native tables (e.g. Iceberg)
+   * where partition columns are not stored in the metastore.
+   */
+  public List<FieldSchema> getPartCols() {
+    if (cachedPartCols != null) {
+      return cachedPartCols;
+    }
+    if (isTableTypeSet() && hasNonNativePartitionSupport()) {
+      cachedPartCols = getStorageHandler().getPartitionKeys(this);
+    } else {
+      cachedPartCols = getNativePartCols();
+    }
+    return cachedPartCols;
+  }
+
+  private boolean isTableTypeSet() {
+    if (tTable.getParameters() == null) {
+      return false;
+    }
+    String tableType = tTable.getParameters().get(HiveMetaHook.TABLE_TYPE);
+    return tableType != null;
+  }
+
   public FieldSchema getPartColByName(String colName) {
     return getPartCols().stream()
-      .filter(key -> key.getName().toLowerCase().equals(colName))
-      .findFirst().orElse(null);
+        .filter(key -> key.getName().toLowerCase().equals(colName))
+        .findFirst().orElse(null);
   }
 
   public List<String> getPartColNames() {
-    List<FieldSchema> partCols = hasNonNativePartitionSupport() ?
-        getStorageHandler().getPartitionKeys(this) : getPartCols();
-    return partCols.stream().map(FieldSchema::getName)
-      .collect(Collectors.toList());
+    return getPartCols().stream().map(FieldSchema::getName).toList();
   }
 
   public boolean hasNonNativePartitionSupport() {
@@ -671,7 +700,7 @@ public void setSkewedValueLocationMap(List<String> valList, String dirName) {
     Map<List<String>, String> mappings = tTable.getSd().getSkewedInfo()
         .getSkewedColValueLocationMaps();
     if (null == mappings) {
-      mappings = new HashMap<List<String>, String>();
+      mappings = new HashMap<>();
       tTable.getSd().getSkewedInfo().setSkewedColValueLocationMaps(mappings);
     }
 
@@ -681,7 +710,7 @@ public void setSkewedValueLocationMap(List<String> valList, String dirName) {
 
   public Map<List<String>, String> getSkewedColValueLocationMaps() {
     return (tTable.getSd().getSkewedInfo() != null) ? tTable.getSd().getSkewedInfo()
-        .getSkewedColValueLocationMaps() : new HashMap<List<String>, String>();
+        .getSkewedColValueLocationMaps() : new HashMap<>();
   }
 
   public void setSkewedColValues(List<List<String>> skewedValues) {
@@ -690,7 +719,7 @@ public void setSkewedColValues(List<List<String>> skewedValues) {
 
   public List<List<String>> getSkewedColValues(){
     return (tTable.getSd().getSkewedInfo() != null) ? tTable.getSd().getSkewedInfo()
-        .getSkewedColValues() : new ArrayList<List<String>>();
+        .getSkewedColValues() : new ArrayList<>();
   }
 
   public void setSkewedColNames(List<String> skewedColNames) {
@@ -699,7 +728,7 @@ public void setSkewedColNames(List<String> skewedColNames) {
 
   public List<String> getSkewedColNames() {
     return (tTable.getSd().getSkewedInfo() != null) ? tTable.getSd().getSkewedInfo()
-        .getSkewedColNames() : new ArrayList<String>();
+        .getSkewedColNames() : new ArrayList<>();
   }
 
   public SkewedInfo getSkewedInfo() {
@@ -728,7 +757,17 @@ private boolean isField(String col) {
   }
 
   public List<FieldSchema> getCols() {
-    return getColsInternal(false);
+    if (!isNonNative()) {
+      return getColsInternal(false);
+    }
+    List<FieldSchema> nonPartFields = new ArrayList<>();
+    Set<String> partFieldsName = getPartCols().stream().map(FieldSchema::getName).collect(Collectors.toSet());
+    for (FieldSchema field : getColsInternal(false)) {
+      if (!partFieldsName.contains(field.getName())) {
+        nonPartFields.add(field);
+      }
+    }
+    return nonPartFields;
   }
 
   public List<FieldSchema> getColsForMetastore() {
@@ -761,10 +800,9 @@ private List<FieldSchema> getColsInternal(boolean forMs) {
    * @return List&lt;FieldSchema&gt;
    */
   public List<FieldSchema> getAllCols() {
-    ArrayList<FieldSchema> f_list = new ArrayList<FieldSchema>();
-    f_list.addAll(getCols());
-    f_list.addAll(getPartCols());
-    return f_list;
+    ArrayList<FieldSchema> allCols = new ArrayList<>(getCols());
+    allCols.addAll(getPartCols());
+    return allCols;
   }
 
   public void setPartCols(List<FieldSchema> partCols) {
@@ -812,7 +850,7 @@ public void setOutputFormatClass(String name) throws HiveException {
   }
   
   public boolean isPartitioned() {
-    return hasNonNativePartitionSupport() ? getStorageHandler().isPartitioned(this) : 
+    return hasNonNativePartitionSupport() ? getStorageHandler().isPartitioned(this) :
         CollectionUtils.isNotEmpty(getPartCols());
   }
 
@@ -1008,12 +1046,12 @@ public boolean isMaterializedView() {
    *          Use the information from this partition.
    * @return Partition name to value mapping.
    */
-  public LinkedHashMap<String, String> createSpec(
+  public Map<String, String> createSpec(
       org.apache.hadoop.hive.metastore.api.Partition tp) {
 
     List<FieldSchema> fsl = getPartCols();
     List<String> tpl = tp.getValues();
-    LinkedHashMap<String, String> spec = new LinkedHashMap<String, String>(fsl.size());
+    Map<String, String> spec = LinkedHashMap.newLinkedHashMap(fsl.size());
     for (int i = 0; i < fsl.size(); i++) {
       FieldSchema fs = fsl.get(i);
       String value = tpl.get(i);
diff --git a/ql/src/java/org/apache/hadoop/hive/ql/optimizer/ColumnPrunerProcFactory.java b/ql/src/java/org/apache/hadoop/hive/ql/optimizer/ColumnPrunerProcFactory.java
index 3d3e4ce7663f..0e914843e2e1 100644
--- a/ql/src/java/org/apache/hadoop/hive/ql/optimizer/ColumnPrunerProcFactory.java
+++ b/ql/src/java/org/apache/hadoop/hive/ql/optimizer/ColumnPrunerProcFactory.java
@@ -807,8 +807,7 @@ public Object process(Node nd, Stack<Node> stack, NodeProcessorCtx ctx,
         for (FieldNode col : cols) {
           int index = originalOutputColumnNames.indexOf(col.getFieldName());
           Table tab = cppCtx.getParseContext().getViewProjectToTableSchema().get(op);
-          List<FieldSchema> fullFieldList = new ArrayList<FieldSchema>(tab.getCols());
-          fullFieldList.addAll(tab.getPartCols());
+          List<FieldSchema> fullFieldList = new ArrayList<>(tab.getAllCols());
           cppCtx.getParseContext().getColumnAccessInfo()
               .add(tab.getCompleteName(), fullFieldList.get(index).getName());
         }
diff --git a/ql/src/java/org/apache/hadoop/hive/ql/optimizer/physical/Vectorizer.java b/ql/src/java/org/apache/hadoop/hive/ql/optimizer/physical/Vectorizer.java
index f4b4c2ff3bad..82f81861a4dc 100644
--- a/ql/src/java/org/apache/hadoop/hive/ql/optimizer/physical/Vectorizer.java
+++ b/ql/src/java/org/apache/hadoop/hive/ql/optimizer/physical/Vectorizer.java
@@ -1767,7 +1767,7 @@ private ImmutablePair<Boolean, Boolean> validateInputFormatAndSchemaEvolution(Ma
            * allColumnNameList and allTypeInfoList variables -- into the data and partition columns.
            */
 
-          LinkedHashMap<String, String> partSpec = partDesc.getPartSpec();
+          Map<String, String> partSpec = partDesc.getPartSpec();
           if (partSpec != null && partSpec.size() > 0) {
             partitionColumnCount = partSpec.size();
             dataColumnCount = dataAndPartColumnCount - partitionColumnCount;
diff --git a/ql/src/java/org/apache/hadoop/hive/ql/optimizer/ppr/PartExprEvalUtils.java b/ql/src/java/org/apache/hadoop/hive/ql/optimizer/ppr/PartExprEvalUtils.java
index 91340b1b76ef..d08fe92208ad 100644
--- a/ql/src/java/org/apache/hadoop/hive/ql/optimizer/ppr/PartExprEvalUtils.java
+++ b/ql/src/java/org/apache/hadoop/hive/ql/optimizer/ppr/PartExprEvalUtils.java
@@ -19,7 +19,6 @@
 package org.apache.hadoop.hive.ql.optimizer.ppr;
 
 import java.util.ArrayList;
-import java.util.LinkedHashMap;
 import java.util.List;
 import java.util.Map;
 import java.util.Properties;
@@ -51,7 +50,7 @@ public class PartExprEvalUtils {
    * @throws HiveException
    */
   static public Object evalExprWithPart(ExprNodeDesc expr, Partition p) throws HiveException {
-    LinkedHashMap<String, String> partSpec = p.getSpec();
+    Map<String, String> partSpec = p.getSpec();
     Properties partProps = p.getSchema();
     
     String[] partKeyTypes;
@@ -59,8 +58,8 @@ static public Object evalExprWithPart(ExprNodeDesc expr, Partition p) throws Hiv
       if (!partSpec.keySet().containsAll(expr.getCols())) {
         return null;
       }
-      partKeyTypes = p.getTable().getStorageHandler().getPartitionKeys(p.getTable()).stream()
-          .map(FieldSchema::getType).toArray(String[]::new);
+      partKeyTypes = p.getTable().getPartCols().stream().map(FieldSchema::getType)
+          .toArray(String[]::new);
     } else {
       String pcolTypes = partProps.getProperty(hive_metastoreConstants.META_TABLE_PARTITION_COLUMN_TYPES);
       partKeyTypes = pcolTypes.trim().split(":");
@@ -104,7 +103,7 @@ public static Pair<PrimitiveObjectInspector, ExprNodeEvaluator> prepareExpr(
       ExprNodeDesc expr, List<String> partColumnNames,
       List<PrimitiveTypeInfo> partColumnTypeInfos) throws HiveException {
     // Create the row object
-    List<ObjectInspector> partObjectInspectors = new ArrayList<ObjectInspector>();
+    List<ObjectInspector> partObjectInspectors = new ArrayList<>();
     for (int i = 0; i < partColumnNames.size(); i++) {
       partObjectInspectors.add(PrimitiveObjectInspectorFactory.getPrimitiveJavaObjectInspector(
         partColumnTypeInfos.get(i)));
diff --git a/ql/src/java/org/apache/hadoop/hive/ql/parse/AcidExportSemanticAnalyzer.java b/ql/src/java/org/apache/hadoop/hive/ql/parse/AcidExportSemanticAnalyzer.java
index 06912a1b3226..05f3b85f271f 100644
--- a/ql/src/java/org/apache/hadoop/hive/ql/parse/AcidExportSemanticAnalyzer.java
+++ b/ql/src/java/org/apache/hadoop/hive/ql/parse/AcidExportSemanticAnalyzer.java
@@ -175,7 +175,8 @@ private void analyzeAcidExport(ASTNode ast, Table exportTable, ASTNode tokRefOrN
     //now generate insert statement
     //insert into newTableName select * from ts <where partition spec>
     StringBuilder rewrittenQueryStr = generateExportQuery(
-            newTable.getPartCols(), tokRefOrNameExportTable, (ASTNode) tokRefOrNameExportTable.parent, newTableName);
+        newTable.getPartCols(),
+        tokRefOrNameExportTable, (ASTNode) tokRefOrNameExportTable.parent, newTableName);
     ReparseResult rr = ParseUtils.parseRewrittenQuery(ctx, rewrittenQueryStr);
     Context rewrittenCtx = rr.rewrittenCtx;
     rewrittenCtx.setIsUpdateDeleteMerge(false); //it's set in parseRewrittenQuery()
diff --git a/ql/src/java/org/apache/hadoop/hive/ql/parse/ColumnStatsSemanticAnalyzer.java b/ql/src/java/org/apache/hadoop/hive/ql/parse/ColumnStatsSemanticAnalyzer.java
index ee80fc475299..3aeda8d9d910 100644
--- a/ql/src/java/org/apache/hadoop/hive/ql/parse/ColumnStatsSemanticAnalyzer.java
+++ b/ql/src/java/org/apache/hadoop/hive/ql/parse/ColumnStatsSemanticAnalyzer.java
@@ -208,8 +208,7 @@ private static CharSequence genPartitionClause(Table tbl, List<TransformSpec> pa
 
 
   private static String getColTypeOf(Table tbl, String partKey) {
-    for (FieldSchema fs : tbl.hasNonNativePartitionSupport() ?
-          tbl.getStorageHandler().getPartitionKeys(tbl) : tbl.getPartitionKeys()) {
+    for (FieldSchema fs : tbl.getPartCols()) {
       if (partKey.equalsIgnoreCase(fs.getName())) {
         return fs.getType().toLowerCase();
       }
diff --git a/ql/src/java/org/apache/hadoop/hive/ql/parse/ImportSemanticAnalyzer.java b/ql/src/java/org/apache/hadoop/hive/ql/parse/ImportSemanticAnalyzer.java
index 4d4956fbec13..dcf197a2c201 100644
--- a/ql/src/java/org/apache/hadoop/hive/ql/parse/ImportSemanticAnalyzer.java
+++ b/ql/src/java/org/apache/hadoop/hive/ql/parse/ImportSemanticAnalyzer.java
@@ -37,7 +37,6 @@
 import org.apache.hadoop.hive.metastore.api.StorageDescriptor;
 import org.apache.hadoop.hive.metastore.ReplChangeManager;
 import org.apache.hadoop.hive.metastore.utils.MetaStoreUtils;
-import org.apache.hadoop.hive.ql.Context;
 import org.apache.hadoop.hive.ql.ErrorMsg;
 import org.apache.hadoop.hive.metastore.txn.TxnUtils;
 import org.apache.hadoop.hive.ql.QueryState;
@@ -89,7 +88,6 @@
 import java.util.LinkedHashMap;
 import java.util.List;
 import java.util.Map;
-import java.util.TreeMap;
 
 
 /**
diff --git a/ql/src/java/org/apache/hadoop/hive/ql/parse/LoadSemanticAnalyzer.java b/ql/src/java/org/apache/hadoop/hive/ql/parse/LoadSemanticAnalyzer.java
index eb4a73f1e5e9..9093570706f3 100644
--- a/ql/src/java/org/apache/hadoop/hive/ql/parse/LoadSemanticAnalyzer.java
+++ b/ql/src/java/org/apache/hadoop/hive/ql/parse/LoadSemanticAnalyzer.java
@@ -561,7 +561,7 @@ private void reparseAndSuperAnalyze(Table table, URI fromURI) throws SemanticExc
     }
 
     rewrittenQueryStr.append(getFullTableNameForSQL((ASTNode)(tableTree.getChild(0))));
-    addPartitionColsToInsert(table.getPartCols(), inpPartSpec, rewrittenQueryStr);
+    addPartitionColsToInsert(parts, inpPartSpec, rewrittenQueryStr);
     rewrittenQueryStr.append(" select * from ");
     rewrittenQueryStr.append(tempTblName);
 
diff --git a/ql/src/java/org/apache/hadoop/hive/ql/parse/MergeSemanticAnalyzer.java b/ql/src/java/org/apache/hadoop/hive/ql/parse/MergeSemanticAnalyzer.java
index 882840ffef5a..ddde37433b5a 100644
--- a/ql/src/java/org/apache/hadoop/hive/ql/parse/MergeSemanticAnalyzer.java
+++ b/ql/src/java/org/apache/hadoop/hive/ql/parse/MergeSemanticAnalyzer.java
@@ -29,7 +29,6 @@
 import org.apache.hadoop.hive.ql.metadata.Table;
 import org.apache.hadoop.hive.ql.parse.rewrite.MergeStatement;
 import org.apache.hadoop.hive.ql.parse.rewrite.RewriterFactory;
-import org.apache.hadoop.hive.ql.plan.HiveOperation;
 
 import java.util.ArrayList;
 import java.util.HashMap;
@@ -230,7 +229,7 @@ private MergeStatement.UpdateClause handleUpdate(ASTNode whenMatchedUpdateClause
                                                    String deleteExtraPredicate) throws SemanticException {
     assert whenMatchedUpdateClause.getType() == HiveParser.TOK_MATCHED;
     assert getWhenClauseOperation(whenMatchedUpdateClause).getType() == HiveParser.TOK_UPDATE;
-    Map<String, String> newValuesMap = new HashMap<>(targetTable.getCols().size() + targetTable.getPartCols().size());
+    Map<String, String> newValuesMap = HashMap.newHashMap(targetTable.getAllCols().size());
     ASTNode setClause = (ASTNode)getWhenClauseOperation(whenMatchedUpdateClause).getChild(0);
     //columns being updated -> update expressions; "setRCols" (last param) is null because we use actual expressions
     //before re-parsing, i.e. they are known to SemanticAnalyzer logic
@@ -303,7 +302,7 @@ private List<ASTNode> findWhenClauses(ASTNode tree, int start) throws SemanticEx
         "Unexpected node type found: " + whenClause.getType() + addParseInfo(whenClause);
       whenClauses.add(whenClause);
     }
-    if (whenClauses.size() <= 0) {
+    if (whenClauses.isEmpty()) {
       //Futureproofing: the parser will actually not allow this
       throw new SemanticException("Must have at least 1 WHEN clause in MERGE statement");
     }
@@ -499,11 +498,7 @@ private void handleUnresolvedColumns() {
     private void addColumn2Table(String tableName, String columnName) {
       tableName = tableName.toLowerCase(); //normalize name for mapping
       tableNamesFound.add(tableName);
-      List<String> cols = table2column.get(tableName);
-      if (cols == null) {
-        cols = new ArrayList<>();
-        table2column.put(tableName, cols);
-      }
+      List<String> cols = table2column.computeIfAbsent(tableName, k -> new ArrayList<>());
       //we want to preserve 'columnName' as it was in original input query so that rewrite
       //looks as much as possible like original query
       cols.add(columnName);
@@ -526,7 +521,7 @@ private String getPredicate() {
       }
       StringBuilder sb = new StringBuilder();
       for (String col : targetCols) {
-        if (sb.length() > 0) {
+        if (!sb.isEmpty()) {
           sb.append(" AND ");
         }
         //but preserve table name in SQL
@@ -605,17 +600,15 @@ protected String getMatchedText(ASTNode n) {
   }
 
   protected boolean isAliased(ASTNode n) {
-    switch (n.getType()) {
-      case HiveParser.TOK_TABREF:
-        return findTabRefIdxs(n)[0] != 0;
-      case HiveParser.TOK_TABNAME:
-        return false;
-      case HiveParser.TOK_SUBQUERY:
+    return switch (n.getType()) {
+      case HiveParser.TOK_TABREF -> findTabRefIdxs(n)[0] != 0;
+      case HiveParser.TOK_TABNAME -> false;
+      case HiveParser.TOK_SUBQUERY -> {
         assert n.getChildCount() > 1 : "Expected Derived Table to be aliased";
-        return true;
-      default:
-        throw raiseWrongType("TOK_TABREF|TOK_TABNAME", n);
-    }
+        yield true;
+      }
+      default -> throw raiseWrongType("TOK_TABREF|TOK_TABNAME", n);
+    };
   }
 
   /**
diff --git a/ql/src/java/org/apache/hadoop/hive/ql/parse/ParseUtils.java b/ql/src/java/org/apache/hadoop/hive/ql/parse/ParseUtils.java
index 9964b9369065..9edbe5b05e13 100644
--- a/ql/src/java/org/apache/hadoop/hive/ql/parse/ParseUtils.java
+++ b/ql/src/java/org/apache/hadoop/hive/ql/parse/ParseUtils.java
@@ -123,15 +123,11 @@ public static ASTNode parse(
    * @return boolean
    */
   public static boolean isJoinToken(ASTNode node) {
-    switch (node.getToken().getType()) {
-    case HiveParser.TOK_JOIN:
-    case HiveParser.TOK_LEFTOUTERJOIN:
-    case HiveParser.TOK_RIGHTOUTERJOIN:
-    case HiveParser.TOK_FULLOUTERJOIN:
-      return true;
-    default:
-      return false;
-    }
+    return switch (node.getToken().getType()) {
+      case HiveParser.TOK_JOIN, HiveParser.TOK_LEFTOUTERJOIN, HiveParser.TOK_RIGHTOUTERJOIN,
+           HiveParser.TOK_FULLOUTERJOIN -> true;
+      default -> false;
+    };
   }
 
   /**
@@ -163,12 +159,10 @@ public static List<String> validateColumnNameUniqueness(
     // but it should not be a major bottleneck as the number of columns are
     // anyway not so big
     Iterator<FieldSchema> iterCols = fieldSchemas.iterator();
-    List<String> colNames = new ArrayList<String>();
+    List<String> colNames = new ArrayList<>();
     while (iterCols.hasNext()) {
       String colName = iterCols.next().getName();
-      Iterator<String> iter = colNames.iterator();
-      while (iter.hasNext()) {
-        String oldColName = iter.next();
+      for (String oldColName : colNames) {
         if (colName.equalsIgnoreCase(oldColName)) {
           throw new SemanticException(ErrorMsg.DUPLICATE_COLUMN_NAMES
               .getMsg(oldColName));
@@ -286,7 +280,7 @@ public static Pair<Boolean, String> containsTokenOfType(ASTNode root, Integer ..
     final Set<Integer> tokensToMatch = new HashSet<>(Arrays.asList(tokens));
     final String[] matched = {null};
 
-    boolean check =  ParseUtils.containsTokenOfType(root, new PTFUtils.Predicate<ASTNode>() {
+    boolean check = ParseUtils.containsTokenOfType(root, new PTFUtils.Predicate<>() {
       @Override
       public boolean apply(ASTNode node) {
         if (tokensToMatch.contains(node.getType())) {
@@ -302,7 +296,7 @@ public boolean apply(ASTNode node) {
   }
 
   public static boolean containsTokenOfType(ASTNode root, PTFUtils.Predicate<ASTNode> predicate) {
-    Queue<ASTNode> queue = new ArrayDeque<ASTNode>();
+    Queue<ASTNode> queue = new ArrayDeque<>();
 
     // BFS
     queue.add(root);
@@ -535,7 +529,7 @@ public static String getKeywords(Set<String> excludes) {
       if (excludes != null && excludes.contains(name)) {
         continue;
       }
-      if (sb.length() > 0) {
+      if (!sb.isEmpty()) {
         sb.append(",");
       }
       sb.append(name);
@@ -581,8 +575,7 @@ public static Map<Integer, List<ExprNodeGenericFuncDesc>> getFullPartitionSpecs(
       CommonTree ast, Table table, Configuration conf, boolean canGroupExprs) throws SemanticException {
     String defaultPartitionName = HiveConf.getVar(conf, HiveConf.ConfVars.DEFAULT_PARTITION_NAME);
     Map<String, String> colTypes = new HashMap<>();
-    List<FieldSchema> partitionKeys = table.hasNonNativePartitionSupport() ?
-        table.getStorageHandler().getPartitionKeys(table) : table.getPartitionKeys();
+    List<FieldSchema> partitionKeys = table.getPartCols();
     for (FieldSchema fs : partitionKeys) {
       colTypes.put(fs.getName().toLowerCase(), fs.getType());
     }
diff --git a/ql/src/java/org/apache/hadoop/hive/ql/parse/SemanticAnalyzer.java b/ql/src/java/org/apache/hadoop/hive/ql/parse/SemanticAnalyzer.java
index 1aec2ac86091..5c5f921de597 100644
--- a/ql/src/java/org/apache/hadoop/hive/ql/parse/SemanticAnalyzer.java
+++ b/ql/src/java/org/apache/hadoop/hive/ql/parse/SemanticAnalyzer.java
@@ -12039,10 +12039,10 @@ private Operator genTablePlan(String alias, QB qb) throws SemanticException {
       }
       // Hack!! - refactor once the metadata APIs with types are ready
       // Finally add the partitioning columns
-      for (FieldSchema part_col : tab.getPartCols()) {
-        LOG.trace("Adding partition col: " + part_col);
-        rwsch.put(alias, part_col.getName(), new ColumnInfo(part_col.getName(),
-            TypeInfoFactory.getPrimitiveTypeInfo(part_col.getType()), alias, true));
+      for (FieldSchema partCol : tab.getPartCols()) {
+        LOG.trace("Adding partition col: " + partCol);
+        rwsch.put(alias, partCol.getName(), new ColumnInfo(partCol.getName(),
+            TypeInfoFactory.getPrimitiveTypeInfo(partCol.getType()), alias, true));
       }
 
       // put virtual columns into RowResolver.
diff --git a/ql/src/java/org/apache/hadoop/hive/ql/parse/rewrite/CopyOnWriteMergeRewriter.java b/ql/src/java/org/apache/hadoop/hive/ql/parse/rewrite/CopyOnWriteMergeRewriter.java
index b72f2496d938..b7335473da85 100644
--- a/ql/src/java/org/apache/hadoop/hive/ql/parse/rewrite/CopyOnWriteMergeRewriter.java
+++ b/ql/src/java/org/apache/hadoop/hive/ql/parse/rewrite/CopyOnWriteMergeRewriter.java
@@ -202,7 +202,7 @@ public void appendWhenMatchedUpdateClause(MergeStatement.UpdateClause updateClau
         sqlGenerator.append(hintStr);
         hintStr = null;
       }
-      List<String> values = new ArrayList<>(targetTable.getCols().size() + targetTable.getPartCols().size());
+      List<String> values = new ArrayList<>(targetTable.getAllCols().size());
       values.addAll(sqlGenerator.getDeleteValues(Context.Operation.MERGE));
       addValues(targetTable, targetAlias, updateClause.getNewValuesMap(), values);
       addValuesForRowLineageForCopyOnMerge(isRowLineageSupported, values,
diff --git a/ql/src/java/org/apache/hadoop/hive/ql/parse/rewrite/MergeRewriter.java b/ql/src/java/org/apache/hadoop/hive/ql/parse/rewrite/MergeRewriter.java
index 3ec2e580f046..cb759a11d080 100644
--- a/ql/src/java/org/apache/hadoop/hive/ql/parse/rewrite/MergeRewriter.java
+++ b/ql/src/java/org/apache/hadoop/hive/ql/parse/rewrite/MergeRewriter.java
@@ -224,7 +224,7 @@ public void appendWhenMatchedUpdateClause(MergeStatement.UpdateClause updateClau
 
       sqlGenerator.append("    -- update clause").append("\n");
       List<String> valuesAndAcidSortKeys = new ArrayList<>(
-          targetTable.getCols().size() + targetTable.getPartCols().size() + 1);
+          targetTable.getAllCols().size() + 1);
       valuesAndAcidSortKeys.addAll(sqlGenerator.getSortKeys(Operation.MERGE));
       addValues(targetTable, targetAlias, updateClause.getNewValuesMap(), valuesAndAcidSortKeys);
       sqlGenerator.appendInsertBranch(hintStr, valuesAndAcidSortKeys);
@@ -249,7 +249,7 @@ protected void addValues(Table targetTable, String targetAlias, Map<String, Stri
           values.add(formatter.apply(fieldSchema.getName()));
         }
       }
-      
+
       targetTable.getPartCols().forEach(fieldSchema -> values.add(
           formatter.apply(fieldSchema.getName())));
     }
diff --git a/ql/src/java/org/apache/hadoop/hive/ql/parse/rewrite/SplitMergeRewriter.java b/ql/src/java/org/apache/hadoop/hive/ql/parse/rewrite/SplitMergeRewriter.java
index 84fcf186f6b7..06edaca90f0f 100644
--- a/ql/src/java/org/apache/hadoop/hive/ql/parse/rewrite/SplitMergeRewriter.java
+++ b/ql/src/java/org/apache/hadoop/hive/ql/parse/rewrite/SplitMergeRewriter.java
@@ -58,7 +58,7 @@ public void appendWhenMatchedUpdateClause(MergeStatement.UpdateClause updateClau
       String onClauseAsString = mergeStatement.getOnClauseAsText();
 
       sqlGenerator.append("    -- update clause (insert part)\n");
-      List<String> values = new ArrayList<>(targetTable.getCols().size() + targetTable.getPartCols().size());
+      List<String> values = new ArrayList<>(targetTable.getAllCols().size());
       addValues(targetTable, targetAlias, updateClause.getNewValuesMap(), values);
       addRowLineageColumnsForWhenMatchedUpdateClause(isRowLineageSupported, values, targetAlias, conf);
       sqlGenerator.appendInsertBranch(hintStr, values);
diff --git a/ql/src/java/org/apache/hadoop/hive/ql/plan/PartitionDesc.java b/ql/src/java/org/apache/hadoop/hive/ql/plan/PartitionDesc.java
index 0dcfe72d7f5b..b5b4662a1491 100644
--- a/ql/src/java/org/apache/hadoop/hive/ql/plan/PartitionDesc.java
+++ b/ql/src/java/org/apache/hadoop/hive/ql/plan/PartitionDesc.java
@@ -57,7 +57,7 @@ public class PartitionDesc implements Serializable, Cloneable {
   private static final Interner<Class<?>> CLASS_INTERNER = Interners.newWeakInterner();
 
   private TableDesc tableDesc;
-  private LinkedHashMap<String, String> partSpec;
+  private Map<String, String> partSpec;
   private Class<? extends InputFormat> inputFileFormatClass;
   private Class<? extends OutputFormat> outputFileFormatClass;
   private Properties properties;
@@ -73,7 +73,7 @@ public void setBaseFileName(String baseFileName) {
   public PartitionDesc() {
   }
 
-  public PartitionDesc(final TableDesc table, final LinkedHashMap<String, String> partSpec) {
+  public PartitionDesc(final TableDesc table, final Map<String, String> partSpec) {
     this.tableDesc = table;
     setPartSpec(partSpec);
   }
@@ -138,11 +138,11 @@ public void setTableDesc(TableDesc tableDesc) {
   }
 
   @Explain(displayName = "partition values", explainLevels = { Level.USER, Level.DEFAULT, Level.EXTENDED })
-  public LinkedHashMap<String, String> getPartSpec() {
+  public Map<String, String> getPartSpec() {
     return partSpec;
   }
 
-  public void setPartSpec(final LinkedHashMap<String, String> partSpec) {
+  public void setPartSpec(final Map<String, String> partSpec) {
     StringInternUtils.internValuesInMap(partSpec);
     this.partSpec = partSpec;
   }
diff --git a/storage-api/src/java/org/apache/hadoop/hive/common/io/CacheTag.java b/storage-api/src/java/org/apache/hadoop/hive/common/io/CacheTag.java
index 0f5d7b915168..f81f8e9ec816 100644
--- a/storage-api/src/java/org/apache/hadoop/hive/common/io/CacheTag.java
+++ b/storage-api/src/java/org/apache/hadoop/hive/common/io/CacheTag.java
@@ -82,7 +82,7 @@ public static final CacheTag build(String tableName) {
     return new TableCacheTag(tableName);
   }
 
-  public static final CacheTag build(String tableName, LinkedHashMap<String, String> partDescMap) {
+  public static final CacheTag build(String tableName, Map<String, String> partDescMap) {
     if (StringUtils.isEmpty(tableName) || partDescMap == null || partDescMap.isEmpty()) {
       throw new IllegalArgumentException();
     }