corrected bucket-map-join test

Author: ramitg254

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

@@ -632,9 +632,9 @@ private boolean isTableTypeSet() {
   }
 
   public FieldSchema getPartColByName(String colName) {
-    return getPartCols().stream()
-      .filter(key -> key.getName().toLowerCase().equals(colName))
-      .findFirst().orElse(null);
+    return hasNonNativePartitionSupport() ? null : getPartCols().stream()
+        .filter(key -> key.getName().toLowerCase().equals(colName))
+        .findFirst().orElse(null);
   }
 
   public List<String> getPartColNames() {

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

@@ -12001,6 +12001,8 @@ private Operator genTablePlan(String alias, QB qb) throws SemanticException {
       // Determine row schema for TSOP.
       // Include column names from SerDe, the partition and virtual columns.
       rwsch = new RowResolver();
+      Set<String> partCols = tab.hasNonNativePartitionSupport() ?
+          Sets.newHashSet(tab.getPartColNames()) : Collections.emptySet();
       try {
         // Including parameters passed in the query
         if (properties != null) {
@@ -12018,8 +12020,6 @@ private Operator genTablePlan(String alias, QB qb) throws SemanticException {
         deserializer.handleJobLevelConfiguration(conf);
         List<? extends StructField> fields = rowObjectInspector
             .getAllStructFieldRefs();
-        Set<String> partCols = tab.hasNonNativePartitionSupport() ?
-            Sets.newHashSet(tab.getPartColNames()) : Collections.emptySet();
         for (int i = 0; i < fields.size(); i++) {
           /**
            * if the column is a skewed column, use ColumnInfo accordingly
@@ -12039,6 +12039,9 @@ 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()) {
+        if(partCols.contains(part_col.getName())){
+          break;
+        }
         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));