diff --git a/common/src/java/org/apache/hadoop/hive/common/JvmMetrics.java b/common/src/java/org/apache/hadoop/hive/common/JvmMetrics.java index 6edf396288d8..521ea83525b4 100644 --- a/common/src/java/org/apache/hadoop/hive/common/JvmMetrics.java +++ b/common/src/java/org/apache/hadoop/hive/common/JvmMetrics.java @@ -20,7 +20,6 @@ import static org.apache.hadoop.hive.common.JvmMetricsInfo.*; -import org.apache.hadoop.log.metrics.EventCounter; import org.apache.hadoop.metrics2.MetricsCollector; import org.apache.hadoop.metrics2.MetricsInfo; import org.apache.hadoop.metrics2.MetricsRecordBuilder; @@ -96,7 +95,6 @@ public void getMetrics(MetricsCollector collector, boolean all) { getMemoryUsage(rb); getGcUsage(rb); getThreadUsage(rb); - getEventCounters(rb); } private void getMemoryUsage(MetricsRecordBuilder rb) { @@ -177,11 +175,4 @@ private void getThreadUsage(MetricsRecordBuilder rb) { .addGauge(ThreadsTimedWaiting, threadsTimedWaiting) .addGauge(ThreadsTerminated, threadsTerminated); } - - private void getEventCounters(MetricsRecordBuilder rb) { - rb.addCounter(LogFatal, EventCounter.getFatal()) - .addCounter(LogError, EventCounter.getError()) - .addCounter(LogWarn, EventCounter.getWarn()) - .addCounter(LogInfo, EventCounter.getInfo()); - } } diff --git a/pom.xml b/pom.xml index 2a2cc9e29ee9..f23498ef2bd7 100644 --- a/pom.xml +++ b/pom.xml @@ -140,7 +140,7 @@ 22.0 2.4.21 2.2.220 - 3.3.6 + 3.4.0 ${basedir}/${hive.path.to.root}/testutils/hadoop 1.3 2.5.6-hadoop3 diff --git a/standalone-metastore/metastore-server/src/main/java/org/apache/hadoop/hive/metastore/tools/metatool/MetaToolTaskListExtTblLocs.java b/standalone-metastore/metastore-server/src/main/java/org/apache/hadoop/hive/metastore/tools/metatool/MetaToolTaskListExtTblLocs.java index f9d34ee13f5d..6eccfb665452 100644 --- a/standalone-metastore/metastore-server/src/main/java/org/apache/hadoop/hive/metastore/tools/metatool/MetaToolTaskListExtTblLocs.java +++ b/standalone-metastore/metastore-server/src/main/java/org/apache/hadoop/hive/metastore/tools/metatool/MetaToolTaskListExtTblLocs.java @@ -341,7 +341,7 @@ private void createOutputList(Set locations, String outputDir, String db * Table-name followed by "*" indicates that all partitions are inside table location. * Otherwise, we record the number of partitions covered by table location. */ - private JSONArray listOutputEntities(HashSet locations) { + private JSONArray listOutputEntities(HashSet locations) throws JSONException { List listEntities = new ArrayList<>(); for(String loc : locations) { DataLocation data = inputLocations.get(loc); diff --git a/standalone-metastore/pom.xml b/standalone-metastore/pom.xml index 1081ad7b2f67..257d2d7b2e63 100644 --- a/standalone-metastore/pom.xml +++ b/standalone-metastore/pom.xml @@ -78,7 +78,7 @@ 3.1.0 22.0 - 3.3.6 + 3.4.0 4.0.3 2.16.1 3.3 diff --git a/storage-api/pom.xml b/storage-api/pom.xml index 44e0a91c3f3f..d05df58aa5bd 100644 --- a/storage-api/pom.xml +++ b/storage-api/pom.xml @@ -30,7 +30,7 @@ 1.8 1.1.3 22.0 - 3.3.6 + 3.4.0 4.13.2 5.6.3 5.6.3