diff --git a/metastore/src/java/org/apache/hadoop/hive/metastore/HiveMetaStore.java b/metastore/src/java/org/apache/hadoop/hive/metastore/HiveMetaStore.java index 68b5563..86e1cb9 100644 --- a/metastore/src/java/org/apache/hadoop/hive/metastore/HiveMetaStore.java +++ b/metastore/src/java/org/apache/hadoop/hive/metastore/HiveMetaStore.java @@ -3721,19 +3721,6 @@ public boolean update_partition_column_statistics(ColumnStatistics colStats) endFunction("write_partition_column_statistics: ", ret != false, null, tableName); } } - public boolean update_partition_column_statistics( - SetPartitionsStatsRequest request) throws NoSuchObjectException, - InvalidObjectException, MetaException, TException, - InvalidInputException { - boolean ret = false; - try { - ret = getMS().updatePartitionColumnStatistics(request); - return ret; - } finally { - endFunction("write_partition_column_statistics: ", ret != false, null, - null); - } - } @Override public boolean delete_partition_column_statistics(String dbName, String tableName, @@ -5058,9 +5045,13 @@ public AggrStats get_aggr_stats_for(PartitionsStatsRequest request) @Override public boolean set_aggr_stats_for(SetPartitionsStatsRequest request) - throws NoSuchObjectException, InvalidObjectException, MetaException, - InvalidInputException, TException { - return update_partition_column_statistics(request); + throws NoSuchObjectException, InvalidObjectException, MetaException, InvalidInputException, + TException { + boolean ret = true; + for (ColumnStatistics colStats : request.getColStats()) { + ret = ret && update_partition_column_statistics(colStats); + } + return ret; } } diff --git a/metastore/src/java/org/apache/hadoop/hive/metastore/ObjectStore.java b/metastore/src/java/org/apache/hadoop/hive/metastore/ObjectStore.java index a16d1c2..f991deb 100644 --- a/metastore/src/java/org/apache/hadoop/hive/metastore/ObjectStore.java +++ b/metastore/src/java/org/apache/hadoop/hive/metastore/ObjectStore.java @@ -5779,34 +5779,6 @@ public boolean updatePartitionColumnStatistics(ColumnStatistics colStats, List statsObjs = colStats.getStatsObj(); - for (ColumnStatisticsObj statsObj : statsObjs) { - statsObj.setColName(statsObj.getColName().toLowerCase()); - statsObj.setColType(statsObj.getColType().toLowerCase()); - MPartitionColumnStatistics mStatsObj = StatObjectConverter - .convertToMPartitionColumnStatistics(null, statsDesc, statsObj); - pm.makePersistent(mStatsObj); - } - } - committed = commitTransaction(); - return committed; - } finally { - if (!committed) { - rollbackTransaction(); - } - } - } - private List getMTableColumnStatistics( Table table, List colNames) throws MetaException { boolean committed = false; diff --git a/metastore/src/java/org/apache/hadoop/hive/metastore/RawStore.java b/metastore/src/java/org/apache/hadoop/hive/metastore/RawStore.java index 0fdafa2..ae5c133 100644 --- a/metastore/src/java/org/apache/hadoop/hive/metastore/RawStore.java +++ b/metastore/src/java/org/apache/hadoop/hive/metastore/RawStore.java @@ -552,8 +552,5 @@ public void dropFunction(String dbName, String funcName) public AggrStats get_aggr_stats_for(String dbName, String tblName, List partNames, List colNames) throws MetaException, NoSuchObjectException; - - boolean updatePartitionColumnStatistics( - SetPartitionsStatsRequest request) throws NoSuchObjectException, - MetaException, InvalidObjectException, InvalidInputException; + } diff --git a/metastore/src/test/org/apache/hadoop/hive/metastore/DummyRawStoreControlledCommit.java b/metastore/src/test/org/apache/hadoop/hive/metastore/DummyRawStoreControlledCommit.java index 6b5e79d..ac2da84 100644 --- a/metastore/src/test/org/apache/hadoop/hive/metastore/DummyRawStoreControlledCommit.java +++ b/metastore/src/test/org/apache/hadoop/hive/metastore/DummyRawStoreControlledCommit.java @@ -720,10 +720,4 @@ public AggrStats get_aggr_stats_for(String dbName, return null; } - @Override - public boolean updatePartitionColumnStatistics(SetPartitionsStatsRequest request) - throws NoSuchObjectException, MetaException, InvalidObjectException, InvalidInputException { - return objectStore.updatePartitionColumnStatistics(request); - } - } diff --git a/metastore/src/test/org/apache/hadoop/hive/metastore/DummyRawStoreForJdoConnection.java b/metastore/src/test/org/apache/hadoop/hive/metastore/DummyRawStoreForJdoConnection.java index 981c5ff..5b77f91 100644 --- a/metastore/src/test/org/apache/hadoop/hive/metastore/DummyRawStoreForJdoConnection.java +++ b/metastore/src/test/org/apache/hadoop/hive/metastore/DummyRawStoreForJdoConnection.java @@ -736,12 +736,7 @@ public AggrStats get_aggr_stats_for(String dbName, throws MetaException { return null; } - - @Override - public boolean updatePartitionColumnStatistics(SetPartitionsStatsRequest request) - throws NoSuchObjectException, MetaException, InvalidObjectException, InvalidInputException { - return false; - } + }