commit

Author: ramitg254

ql/src/java/org/apache/hadoop/hive/ql/metadata/Table.java

@@ -32,11 +32,13 @@
 import java.util.Objects;
 import java.util.Properties;
 import java.util.Set;
+import java.util.TreeMap;
 import java.util.stream.Collectors;
 
 
 import org.apache.commons.collections4.CollectionUtils;
 import org.apache.commons.lang3.StringUtils;
+import org.apache.commons.lang3.tuple.Pair;
 import org.apache.hadoop.conf.Configuration;
 import org.apache.hadoop.fs.FileStatus;
 import org.apache.hadoop.fs.FileSystem;
@@ -113,7 +115,10 @@ public class Table implements Serializable {
   /**
    * These fields are all cached fields.  The information comes from tTable.
    */
-  private List<FieldSchema> cachedPartCols;
+  private List<FieldSchema> tablePartCols;
+  private List<FieldSchema> tableNonPartCols;
+  private List<FieldSchema> tableAllCols;
+  private Map<String, Pair<Integer, FieldSchema>> inputColumnIndexByName;
   private transient Deserializer deserializer;
   private Class<? extends OutputFormat> outputFormatClass;
   private Class<? extends InputFormat> inputFormatClass;
@@ -198,8 +203,8 @@ public Table makeCopy() {
 
     newTab.setMetaTable(this.getMetaTable());
     newTab.setSnapshotRef(this.getSnapshotRef());
-    if (this.cachedPartCols != null) {
-      newTab.cachedPartCols = new ArrayList<>(this.cachedPartCols);
+    if (this.tablePartCols != null) {
+      newTab.tablePartCols = new ArrayList<>(this.tablePartCols);
     }
     return newTab;
   }
@@ -616,15 +621,15 @@ private List<FieldSchema> getNativePartCols() {
    * where partition columns are not stored in the metastore.
    */
   public List<FieldSchema> getPartCols() {
-    if (cachedPartCols != null) {
-      return cachedPartCols;
+    if (tablePartCols != null) {
+      return tablePartCols;
     }
     if (isTableTypeSet() && hasNonNativePartitionSupport()) {
-      cachedPartCols = getStorageHandler().getPartitionKeys(this);
+      tablePartCols = getStorageHandler().getPartitionKeys(this);
     } else {
-      cachedPartCols = getNativePartCols();
+      tablePartCols = getNativePartCols();
     }
-    return cachedPartCols;
+    return tablePartCols;
   }
 
   private boolean isTableTypeSet() {
@@ -650,7 +655,11 @@ public boolean hasNonNativePartitionSupport() {
   }
 
   public boolean isPartitionKey(String colName) {
-    return getPartColByName(colName) != null;
+    List<FieldSchema> partKeys = getPartitionKeys();
+    if (partKeys.isEmpty()) {
+      return false;
+    }
+    return partKeys.stream().map(FieldSchema::getName).toList().contains(colName);
   }
 
   // TODO merge this with getBucketCols function
@@ -756,18 +765,48 @@ private boolean isField(String col) {
     return false;
   }
 
-  public List<FieldSchema> getCols() {
+  private void fillColumnIndexByName() {
+    inputColumnIndexByName = new HashMap<>();
+    List<FieldSchema> fsList = new ArrayList<>(getColsInternal(false));
     if (!isNonNative()) {
-      return getColsInternal(false);
+      fsList.addAll(getNativePartCols());
+    }
+    for (int i = 0; i < fsList.size(); i++) {
+      inputColumnIndexByName.put(fsList.get(i).getName(), Pair.of(i, fsList.get(i)));
+    }
+  }
+
+  public int getColumnIndexByName(String colName) {
+    if (inputColumnIndexByName == null) {
+      fillColumnIndexByName();
+    }
+    return inputColumnIndexByName.get(colName.toLowerCase()).getLeft();
+  }
+
+  public FieldSchema getFieldSchemaByName(String colName) {
+    if (inputColumnIndexByName == null) {
+      fillColumnIndexByName();
     }
-    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 inputColumnIndexByName.get(colName).getRight();
+  }
+
+  public List<FieldSchema> getCols() {
+    if (tableNonPartCols != null) {
+      return tableNonPartCols;
+    }
+    if (!isNonNative()) {
+      tableNonPartCols = getColsInternal(false);
+    } else {
+      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);
+        }
       }
+      tableNonPartCols = nonPartFields;
     }
-    return nonPartFields;
+    return tableNonPartCols;
   }
 
   public List<FieldSchema> getColsForMetastore() {
@@ -800,9 +839,18 @@ private List<FieldSchema> getColsInternal(boolean forMs) {
    * @return List&lt;FieldSchema&gt;
    */
   public List<FieldSchema> getAllCols() {
-    ArrayList<FieldSchema> allCols = new ArrayList<>(getCols());
-    allCols.addAll(getPartCols());
-    return allCols;
+    if (tableAllCols != null) {
+      return tableAllCols;
+    }
+    if (inputColumnIndexByName == null) {
+      fillColumnIndexByName();
+    }
+    TreeMap<Integer, FieldSchema> orderedMap = new TreeMap<>();
+    for (Map.Entry<String, Pair<Integer, FieldSchema>> e : inputColumnIndexByName.entrySet()) {
+      orderedMap.put(e.getValue().getLeft(), e.getValue().getRight());
+    }
+    tableAllCols = orderedMap.values().stream().toList();
+    return tableAllCols;
   }
 
   public void setPartCols(List<FieldSchema> partCols) {