Skip to content
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 0 additions & 9 deletions common/src/java/org/apache/hadoop/hive/common/JvmMetrics.java
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down Expand Up @@ -96,7 +95,6 @@ public void getMetrics(MetricsCollector collector, boolean all) {
getMemoryUsage(rb);
getGcUsage(rb);
getThreadUsage(rb);
getEventCounters(rb);
}

private void getMemoryUsage(MetricsRecordBuilder rb) {
Expand Down Expand Up @@ -201,11 +199,4 @@ public ThreadCountResult(int threadsNew, int threadsRunnable, int threadsBlocked
this.threadsTerminated = threadsTerminated;
}
}

private void getEventCounters(MetricsRecordBuilder rb) {
rb.addCounter(LogFatal, EventCounter.getFatal())
.addCounter(LogError, EventCounter.getError())
.addCounter(LogWarn, EventCounter.getWarn())
.addCounter(LogInfo, EventCounter.getInfo());
}
}
4 changes: 2 additions & 2 deletions pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -140,10 +140,10 @@
<guava.version>22.0</guava.version>
<groovy.version>2.4.21</groovy.version>
<h2database.version>2.2.220</h2database.version>
<hadoop.version>3.3.6</hadoop.version>
<hadoop.version>3.4.0</hadoop.version>
<hadoop.bin.path>${basedir}/${hive.path.to.root}/testutils/hadoop</hadoop.bin.path>
<hamcrest.version>1.3</hamcrest.version>
<hbase.version>2.5.6-hadoop3</hbase.version>
<hbase.version>2.5.10-hadoop3</hbase.version>
<hppc.version>0.7.2</hppc.version>
<!-- required for logging test to avoid including hbase which pulls disruptor transitively -->
<disruptor.version>3.3.7</disruptor.version>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -341,7 +341,7 @@ private void createOutputList(Set<String> 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<String> locations) {
private JSONArray listOutputEntities(HashSet<String> locations) throws JSONException {
List<String> listEntities = new ArrayList<>();
for(String loc : locations) {
DataLocation data = inputLocations.get(loc);
Expand Down
2 changes: 1 addition & 1 deletion standalone-metastore/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -79,7 +79,7 @@
</dropwizard-metrics-hadoop-metrics2-reporter.version>
<dropwizard.version>3.1.0</dropwizard.version>
<guava.version>22.0</guava.version>
<hadoop.version>3.3.6</hadoop.version>
<hadoop.version>3.4.0</hadoop.version>
<hikaricp.version>4.0.3</hikaricp.version>
<jackson.version>2.16.1</jackson.version>
<jexl.version>3.3</jexl.version>
Expand Down
2 changes: 1 addition & 1 deletion storage-api/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@
<maven.compiler.target>1.8</maven.compiler.target>
<commons-logging.version>1.1.3</commons-logging.version>
<guava.version>22.0</guava.version>
<hadoop.version>3.3.6</hadoop.version>
<hadoop.version>3.4.0</hadoop.version>
<junit.version>4.13.2</junit.version>
<junit.jupiter.version>5.6.3</junit.jupiter.version>
<junit.vintage.version>5.6.3</junit.vintage.version>
Expand Down
Loading