From 9d037d6e34764b58cb75dc913cf24b73a622662e Mon Sep 17 00:00:00 2001 From: wecharyu Date: Sat, 20 Jan 2024 08:50:38 +0000 Subject: [PATCH] address conflicts --- .../apache/hadoop/hive/metastore/StatObjectConverter.java | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/standalone-metastore/metastore-server/src/main/java/org/apache/hadoop/hive/metastore/StatObjectConverter.java b/standalone-metastore/metastore-server/src/main/java/org/apache/hadoop/hive/metastore/StatObjectConverter.java index defac21d673d9..3c5c1d7f7dd3b 100644 --- a/standalone-metastore/metastore-server/src/main/java/org/apache/hadoop/hive/metastore/StatObjectConverter.java +++ b/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; }