Repository: hive Updated Branches: refs/heads/master 5179558cc -> 7dd1d3694
HIVE-14764 : Enabling "hive.metastore.metrics.enabled" throws OOM in HiveMetastore (Rajesh Balamohan, reviewed by Vaibhav Gumashta) Project: http://git-wip-us.apache.org/repos/asf/hive/repo Commit: http://git-wip-us.apache.org/repos/asf/hive/commit/7dd1d369 Tree: http://git-wip-us.apache.org/repos/asf/hive/tree/7dd1d369 Diff: http://git-wip-us.apache.org/repos/asf/hive/diff/7dd1d369 Branch: refs/heads/master Commit: 7dd1d3694856a2fd55eba1355e81e5fa71477b0d Parents: 5179558 Author: Rajesh Balamohan <rbalamohan at apache dot org> Authored: Fri Sep 16 00:28:16 2016 -0700 Committer: Thejas Nair <[email protected]> Committed: Fri Sep 16 00:28:16 2016 -0700 ---------------------------------------------------------------------- .../hadoop/hive/metastore/HiveMetaStore.java | 50 +++++++++++--------- 1 file changed, 27 insertions(+), 23 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/hive/blob/7dd1d369/metastore/src/java/org/apache/hadoop/hive/metastore/HiveMetaStore.java ---------------------------------------------------------------------- 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 f0b8476..71175df 100644 --- a/metastore/src/java/org/apache/hadoop/hive/metastore/HiveMetaStore.java +++ b/metastore/src/java/org/apache/hadoop/hive/metastore/HiveMetaStore.java @@ -4506,7 +4506,7 @@ public class HiveMetaStore extends ThriftHiveMetastore { dbName = dbName.toLowerCase(); tableName = tableName.toLowerCase(); colName = colName.toLowerCase(); - startFunction("get_column_statistics_by_table: db=" + dbName + " table=" + tableName + + startFunction("get_column_statistics_by_table", ": db=" + dbName + " table=" + tableName + " column=" + colName); ColumnStatistics statsObj = null; try { @@ -4517,7 +4517,7 @@ public class HiveMetaStore extends ThriftHiveMetastore { } return statsObj; } finally { - endFunction("get_column_statistics_by_table: ", statsObj != null, null, tableName); + endFunction("get_column_statistics_by_table", statsObj != null, null, tableName); } } @@ -4526,7 +4526,7 @@ public class HiveMetaStore extends ThriftHiveMetastore { throws MetaException, NoSuchObjectException, TException { String dbName = request.getDbName().toLowerCase(); String tblName = request.getTblName().toLowerCase(); - startFunction("get_table_statistics_req: db=" + dbName + " table=" + tblName); + startFunction("get_table_statistics_req", ": db=" + dbName + " table=" + tblName); TableStatsResult result = null; List<String> lowerCaseColNames = new ArrayList<String>(request.getColNames().size()); for (String colName : request.getColNames()) { @@ -4537,7 +4537,7 @@ public class HiveMetaStore extends ThriftHiveMetastore { result = new TableStatsResult((cs == null || cs.getStatsObj() == null) ? Lists.<ColumnStatisticsObj>newArrayList() : cs.getStatsObj()); } finally { - endFunction("get_table_statistics_req: ", result == null, null, tblName); + endFunction("get_table_statistics_req", result == null, null, tblName); } return result; } @@ -4550,8 +4550,9 @@ public class HiveMetaStore extends ThriftHiveMetastore { tableName = tableName.toLowerCase(); colName = colName.toLowerCase(); String convertedPartName = lowerCaseConvertPartName(partName); - startFunction("get_column_statistics_by_partition: db=" + dbName + " table=" + tableName + - " partition=" + convertedPartName + " column=" + colName); + startFunction("get_column_statistics_by_partition", + ": db=" + dbName + " table=" + tableName + + " partition=" + convertedPartName + " column=" + colName); ColumnStatistics statsObj = null; try { @@ -4563,7 +4564,7 @@ public class HiveMetaStore extends ThriftHiveMetastore { } statsObj = list.get(0); } finally { - endFunction("get_column_statistics_by_partition: ", statsObj != null, null, tableName); + endFunction("get_column_statistics_by_partition", statsObj != null, null, tableName); } return statsObj; } @@ -4573,7 +4574,7 @@ public class HiveMetaStore extends ThriftHiveMetastore { throws MetaException, NoSuchObjectException, TException { String dbName = request.getDbName().toLowerCase(); String tblName = request.getTblName().toLowerCase(); - startFunction("get_partitions_statistics_req: db=" + dbName + " table=" + tblName); + startFunction("get_partitions_statistics_req", ": db=" + dbName + " table=" + tblName); PartitionsStatsResult result = null; List<String> lowerCaseColNames = new ArrayList<String>(request.getColNames().size()); @@ -4594,7 +4595,7 @@ public class HiveMetaStore extends ThriftHiveMetastore { } result = new PartitionsStatsResult(map); } finally { - endFunction("get_partitions_statistics_req: ", result == null, null, tblName); + endFunction("get_partitions_statistics_req", result == null, null, tblName); } return result; } @@ -4618,11 +4619,11 @@ public class HiveMetaStore extends ThriftHiveMetastore { List<ColumnStatisticsObj> statsObjs = colStats.getStatsObj(); + startFunction("write_column_statistics", ": db=" + dbName + + " table=" + tableName + " column=" + colName); for (ColumnStatisticsObj statsObj:statsObjs) { colName = statsObj.getColName().toLowerCase(); statsObj.setColName(colName); - startFunction("write_column_statistics: db=" + dbName + " table=" + tableName + - " column=" + colName); } colStats.setStatsDesc(statsDesc); @@ -4634,7 +4635,7 @@ public class HiveMetaStore extends ThriftHiveMetastore { ret = getMS().updateTableColumnStatistics(colStats); return ret; } finally { - endFunction("write_column_statistics: ", ret != false, null, tableName); + endFunction("write_column_statistics", ret != false, null, tableName); } } @@ -4659,11 +4660,12 @@ public class HiveMetaStore extends ThriftHiveMetastore { List<ColumnStatisticsObj> statsObjs = colStats.getStatsObj(); + startFunction("write_partition_column_statistics", + ": db=" + dbName + " table=" + tableName + + " part=" + partName + "column=" + colName); for (ColumnStatisticsObj statsObj:statsObjs) { colName = statsObj.getColName().toLowerCase(); statsObj.setColName(colName); - startFunction("write_partition_column_statistics: db=" + dbName + " table=" + tableName + - " part=" + partName + "column=" + colName); } colStats.setStatsDesc(statsDesc); @@ -4679,7 +4681,7 @@ public class HiveMetaStore extends ThriftHiveMetastore { ret = getMS().updatePartitionColumnStatistics(colStats, partVals); return ret; } finally { - endFunction("write_partition_column_statistics: ", ret != false, null, tableName); + endFunction("write_partition_column_statistics", ret != false, null, tableName); } } @@ -4701,8 +4703,9 @@ public class HiveMetaStore extends ThriftHiveMetastore { colName = colName.toLowerCase(); } String convertedPartName = lowerCaseConvertPartName(partName); - startFunction("delete_column_statistics_by_partition: db=" + dbName + " table=" + tableName + - " partition=" + convertedPartName + " column=" + colName); + startFunction("delete_column_statistics_by_partition",": db=" + dbName + + " table=" + tableName + " partition=" + convertedPartName + + " column=" + colName); boolean ret = false; try { @@ -4710,7 +4713,7 @@ public class HiveMetaStore extends ThriftHiveMetastore { ret = getMS().deletePartitionColumnStatistics(dbName, tableName, convertedPartName, partVals, colName); } finally { - endFunction("delete_column_statistics_by_partition: ", ret != false, null, tableName); + endFunction("delete_column_statistics_by_partition", ret != false, null, tableName); } return ret; } @@ -4725,14 +4728,14 @@ public class HiveMetaStore extends ThriftHiveMetastore { if (colName != null) { colName = colName.toLowerCase(); } - startFunction("delete_column_statistics_by_table: db=" + dbName + " table=" + tableName + - " column=" + colName); + startFunction("delete_column_statistics_by_table", ": db=" + dbName + + " table=" + tableName + " column=" + colName); boolean ret = false; try { ret = getMS().deleteTableColumnStatistics(dbName, tableName, colName); } finally { - endFunction("delete_column_statistics_by_table: ", ret != false, null, tableName); + endFunction("delete_column_statistics_by_table", ret != false, null, tableName); } return ret; } @@ -6102,7 +6105,8 @@ public class HiveMetaStore extends ThriftHiveMetastore { throws NoSuchObjectException, MetaException, TException { String dbName = request.getDbName().toLowerCase(); String tblName = request.getTblName().toLowerCase(); - startFunction("get_aggr_stats_for: db=" + request.getDbName() + " table=" + request.getTblName()); + startFunction("get_aggr_stats_for", ": db=" + request.getDbName() + + " table=" + request.getTblName()); List<String> lowerCaseColNames = new ArrayList<String>(request.getColNames().size()); for (String colName : request.getColNames()) { @@ -6119,7 +6123,7 @@ public class HiveMetaStore extends ThriftHiveMetastore { lowerCaseColNames)); return aggrStats; } finally { - endFunction("get_partitions_statistics_req: ", aggrStats == null, null, request.getTblName()); + endFunction("get_aggr_stats_for", aggrStats == null, null, request.getTblName()); } }
