address conflicts

Author: wecharyu

standalone-metastore/metastore-server/src/main/java/org/apache/hadoop/hive/metastore/StatObjectConverter.java

@@ -285,9 +285,7 @@ public static String getUpdatedColumnSql(MPartitionColumnStatistics mStatsObj) {
     if (mStatsObj.getNumNulls() != null) {
       setStmt.append("\"NUM_NULLS\" = ? ,");
     }
-    setStmt.append("\"ENGINE\" = ? ,");
-    setStmt.append("\"DB_NAME\" = ? ,");
-    setStmt.append("\"TABLE_NAME\" = ? ");
+    setStmt.append("\"ENGINE\" = ? ");
     return setStmt.toString();
   }
 
@@ -338,8 +336,6 @@ public static int initUpdatedColumnStatement(MPartitionColumnStatistics mStatsOb
       pst.setObject(colIdx++, mStatsObj.getNumNulls());
     }
     pst.setString(colIdx++, mStatsObj.getEngine());
-    pst.setString(colIdx++, mStatsObj.getDbName());
-    pst.setString(colIdx++, mStatsObj.getTableName());
     return colIdx;
   }