corrected load, partition evolution tests

Author: ramitg254

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

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

ql/src/java/org/apache/hadoop/hive/ql/parse/CalcitePlanner.java

@@ -3067,8 +3067,8 @@ private RelNode genTableLogicalPlan(String tableAlias, QB qb) throws SemanticExc
         // 3.2 Add column info corresponding to partition columns
         for (FieldSchema part_col : tabMetaData.getPartCols()) {
           colName = part_col.getName();
-          if (alreadyAdded.contains(colName)) {
-            continue;
+          if (tabMetaData.hasNonNativePartitionSupport()) {
+            break;
           }
           colInfo = new ColumnInfo(colName,
                   TypeInfoFactory.getPrimitiveTypeInfo(part_col.getType()),

ql/src/java/org/apache/hadoop/hive/ql/parse/LoadSemanticAnalyzer.java

@@ -23,6 +23,7 @@
 import java.net.URISyntaxException;
 import java.util.ArrayList;
 import java.util.Arrays;
+import java.util.Collections;
 import java.util.HashMap;
 import java.util.LinkedHashMap;
 import java.util.List;
@@ -511,7 +512,7 @@ private void reparseAndSuperAnalyze(Table table, URI fromURI) throws SemanticExc
 
     // Partition spec was already validated by caller when create TableSpec object.
     // So, need not validate inpPartSpec here.
-    List<FieldSchema> parts = table.getPartCols();
+    List<FieldSchema> parts = table.hasNonNativePartitionSupport() ? Collections.emptyList() : table.getPartCols();
     if (tableTree.getChildCount() >= 2) {
       ASTNode partSpecNode = (ASTNode) tableTree.getChild(1);
       inpPartSpec = new HashMap<>(partSpecNode.getChildCount());
@@ -561,7 +562,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);