diff --git metastore/src/java/org/apache/hadoop/hive/metastore/HiveMetaStore.java metastore/src/java/org/apache/hadoop/hive/metastore/HiveMetaStore.java index f0b8476..71175df 100644 --- metastore/src/java/org/apache/hadoop/hive/metastore/HiveMetaStore.java +++ metastore/src/java/org/apache/hadoop/hive/metastore/HiveMetaStore.java @@ -4506,7 +4506,7 @@ public ColumnStatistics get_table_column_statistics(String dbName, String tableN 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 ColumnStatistics get_table_column_statistics(String dbName, String tableN } 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 TableStatsResult get_table_statistics_req(TableStatsRequest request) 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 lowerCaseColNames = new ArrayList(request.getColNames().size()); for (String colName : request.getColNames()) { @@ -4537,7 +4537,7 @@ public TableStatsResult get_table_statistics_req(TableStatsRequest request) result = new TableStatsResult((cs == null || cs.getStatsObj() == null) ? Lists.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 ColumnStatistics get_partition_column_statistics(String dbName, String ta 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 ColumnStatistics get_partition_column_statistics(String dbName, String ta } 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 PartitionsStatsResult get_partitions_statistics_req(PartitionsStatsReques 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 lowerCaseColNames = new ArrayList(request.getColNames().size()); @@ -4594,7 +4595,7 @@ public PartitionsStatsResult get_partitions_statistics_req(PartitionsStatsReques } 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 boolean update_table_column_statistics(ColumnStatistics colStats) List 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 boolean update_table_column_statistics(ColumnStatistics colStats) 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 @@ private boolean updatePartitonColStats(Table tbl, ColumnStatistics colStats) List 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 @@ private boolean updatePartitonColStats(Table tbl, ColumnStatistics colStats) 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 boolean delete_partition_column_statistics(String dbName, String tableNam 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 boolean delete_partition_column_statistics(String dbName, String tableNam 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 boolean delete_table_column_statistics(String dbName, String tableName, S 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 AggrStats get_aggr_stats_for(PartitionsStatsRequest request) 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 lowerCaseColNames = new ArrayList(request.getColNames().size()); for (String colName : request.getColNames()) { @@ -6119,7 +6123,7 @@ public AggrStats get_aggr_stats_for(PartitionsStatsRequest request) lowerCaseColNames)); return aggrStats; } finally { - endFunction("get_partitions_statistics_req: ", aggrStats == null, null, request.getTblName()); + endFunction("get_aggr_stats_for", aggrStats == null, null, request.getTblName()); } }