commit-2

Author: ramitg254

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

@@ -255,7 +255,7 @@ public void setTTable(org.apache.hadoop.hive.metastore.api.Table tTable) {
     org.apache.hadoop.hive.metastore.api.Table t = new org.apache.hadoop.hive.metastore.api.Table();
     {
       t.setSd(sd);
-      t.setPartitionKeys(null);
+      t.setPartitionKeys(new ArrayList<FieldSchema>());
       t.setParameters(new HashMap<String, String>());
       t.setTableType(TableType.MANAGED_TABLE.toString());
       t.setDbName(databaseName);

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

@@ -3048,6 +3048,7 @@ private RelNode genTableLogicalPlan(String tableAlias, QB qb) throws SemanticExc
         final NotNullConstraint nnc = tabMetaData.getNotNullConstraint();
         final PrimaryKeyInfo pkc = tabMetaData.getPrimaryKeyInfo();
 
+        Set<String> alreadyAdded = new HashSet<>();
         for (StructField structField : fields) {
           colName = structField.getFieldName();
           colInfo = new ColumnInfo(
@@ -3056,6 +3057,7 @@ private RelNode genTableLogicalPlan(String tableAlias, QB qb) throws SemanticExc
                   isNullable(colName, nnc, pkc), tableAlias, false);
           colInfo.setSkewedCol(isSkewedCol(tableAlias, qb, colName));
           rr.put(tableAlias, colName, colInfo);
+          alreadyAdded.add(colName);
           cInfoLst.add(colInfo);
         }
         // TODO: Fix this
@@ -3065,6 +3067,9 @@ 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;
+          }
           colInfo = new ColumnInfo(colName,
                   TypeInfoFactory.getPrimitiveTypeInfo(part_col.getType()),
                   isNullable(colName, nnc, pkc), tableAlias, true);