From 7b0e0628c80339638070c8d26aee6b72349b6635 Mon Sep 17 00:00:00 2001 From: PJ Fanning Date: Wed, 7 Sep 2022 09:05:23 +0100 Subject: [PATCH] more avro related code that needs changes --- .../apache/hadoop/tools/rumen/JobBuilder.java | 18 +++++++++--------- .../hadoop/tools/rumen/JobHistoryUtils.java | 6 +++--- .../apache/hadoop/tools/rumen/LoggedTask.java | 8 ++++---- .../hadoop/tools/rumen/LoggedTaskAttempt.java | 8 ++++---- 4 files changed, 20 insertions(+), 20 deletions(-) diff --git a/hadoop-tools/hadoop-rumen/src/main/java/org/apache/hadoop/tools/rumen/JobBuilder.java b/hadoop-tools/hadoop-rumen/src/main/java/org/apache/hadoop/tools/rumen/JobBuilder.java index 1213e6a46f4492..dcb6bed166df9b 100644 --- a/hadoop-tools/hadoop-rumen/src/main/java/org/apache/hadoop/tools/rumen/JobBuilder.java +++ b/hadoop-tools/hadoop-rumen/src/main/java/org/apache/hadoop/tools/rumen/JobBuilder.java @@ -89,7 +89,7 @@ public class JobBuilder { private Map allHosts = new HashMap(); - private org.apache.hadoop.mapreduce.jobhistory.JhCounters EMPTY_COUNTERS = + private final static org.apache.hadoop.mapreduce.jobhistory.JhCounters EMPTY_COUNTERS = new org.apache.hadoop.mapreduce.jobhistory.JhCounters(); /** @@ -460,7 +460,7 @@ private void processTaskFinishedEvent(TaskFinishedEvent event) { } task.setFinishTime(event.getFinishTime()); task.setTaskStatus(getPre21Value(event.getTaskStatus())); - task.incorporateCounters(((TaskFinished) event.getDatum()).counters); + task.incorporateCounters(((TaskFinished) event.getDatum()).getCounters()); } private void processTaskFailedEvent(TaskFailedEvent event) { @@ -472,7 +472,7 @@ private void processTaskFailedEvent(TaskFailedEvent event) { task.setFinishTime(event.getFinishTime()); task.setTaskStatus(getPre21Value(event.getTaskStatus())); TaskFailed t = (TaskFailed)(event.getDatum()); - task.putDiagnosticInfo(t.error.toString()); + task.putDiagnosticInfo(t.getError().toString()); // killed task wouldn't have failed attempt. if (t.getFailedDueToAttempt() != null) { task.putFailedDueToAttemptId(t.getFailedDueToAttempt().toString()); @@ -542,7 +542,7 @@ private void processTaskAttemptFinishedEvent(TaskAttemptFinishedEvent event) { } attempt.setFinishTime(event.getFinishTime()); attempt - .incorporateCounters(((TaskAttemptFinished) event.getDatum()).counters); + .incorporateCounters(((TaskAttemptFinished) event.getDatum()).getCounters()); } private void processReduceAttemptFinishedEvent( @@ -568,7 +568,7 @@ private void processReduceAttemptFinishedEvent( attempt.setShuffleFinished(event.getShuffleFinishTime()); attempt.setSortFinished(event.getSortFinishTime()); attempt - .incorporateCounters(((ReduceAttemptFinished) event.getDatum()).counters); + .incorporateCounters(((ReduceAttemptFinished) event.getDatum()).getCounters()); attempt.arraySetClockSplits(event.getClockSplits()); attempt.arraySetCpuUsages(event.getCpuUsages()); attempt.arraySetVMemKbytes(event.getVMemKbytes()); @@ -596,7 +596,7 @@ private void processMapAttemptFinishedEvent(MapAttemptFinishedEvent event) { // is redundant, but making this will add future-proofing. attempt.setFinishTime(event.getFinishTime()); attempt - .incorporateCounters(((MapAttemptFinished) event.getDatum()).counters); + .incorporateCounters(((MapAttemptFinished) event.getDatum()).getCounters()); attempt.arraySetClockSplits(event.getClockSplits()); attempt.arraySetCpuUsages(event.getCpuUsages()); attempt.arraySetVMemKbytes(event.getVMemKbytes()); @@ -661,11 +661,11 @@ private void processJobFinishedEvent(JobFinishedEvent event) { JobFinished job = (JobFinished)event.getDatum(); Map countersMap = - JobHistoryUtils.extractCounters(job.totalCounters); + JobHistoryUtils.extractCounters(job.getTotalCounters()); result.putTotalCounters(countersMap); - countersMap = JobHistoryUtils.extractCounters(job.mapCounters); + countersMap = JobHistoryUtils.extractCounters(job.getMapCounters()); result.putMapCounters(countersMap); - countersMap = JobHistoryUtils.extractCounters(job.reduceCounters); + countersMap = JobHistoryUtils.extractCounters(job.getReduceCounters()); result.putReduceCounters(countersMap); } diff --git a/hadoop-tools/hadoop-rumen/src/main/java/org/apache/hadoop/tools/rumen/JobHistoryUtils.java b/hadoop-tools/hadoop-rumen/src/main/java/org/apache/hadoop/tools/rumen/JobHistoryUtils.java index 6ae87bbd40a110..34ef95f3378588 100644 --- a/hadoop-tools/hadoop-rumen/src/main/java/org/apache/hadoop/tools/rumen/JobHistoryUtils.java +++ b/hadoop-tools/hadoop-rumen/src/main/java/org/apache/hadoop/tools/rumen/JobHistoryUtils.java @@ -157,9 +157,9 @@ static boolean isJobConfXml(String fileName) { static Map extractCounters(JhCounters counters) { Map countersMap = new HashMap(); if (counters != null) { - for (JhCounterGroup group : counters.groups) { - for (JhCounter counter : group.counts) { - countersMap.put(counter.name.toString(), counter.value); + for (JhCounterGroup group : counters.getGroups()) { + for (JhCounter counter : group.getCounts()) { + countersMap.put(counter.getName().toString(), counter.getValue()); } } } diff --git a/hadoop-tools/hadoop-rumen/src/main/java/org/apache/hadoop/tools/rumen/LoggedTask.java b/hadoop-tools/hadoop-rumen/src/main/java/org/apache/hadoop/tools/rumen/LoggedTask.java index 4ae33a76617fb4..2308e586900bb4 100644 --- a/hadoop-tools/hadoop-rumen/src/main/java/org/apache/hadoop/tools/rumen/LoggedTask.java +++ b/hadoop-tools/hadoop-rumen/src/main/java/org/apache/hadoop/tools/rumen/LoggedTask.java @@ -268,11 +268,11 @@ private static void incorporateCounter(SetField thunk, JhCounters counters, String counterName) { counterName = canonicalizeCounterName(counterName); - for (JhCounterGroup group : counters.groups) { - for (JhCounter counter : group.counts) { + for (JhCounterGroup group : counters.getGroups()) { + for (JhCounter counter : group.getCounts()) { if (counterName - .equals(canonicalizeCounterName(counter.name.toString()))) { - thunk.set(counter.value); + .equals(canonicalizeCounterName(counter.getName().toString()))) { + thunk.set(counter.getValue()); return; } } diff --git a/hadoop-tools/hadoop-rumen/src/main/java/org/apache/hadoop/tools/rumen/LoggedTaskAttempt.java b/hadoop-tools/hadoop-rumen/src/main/java/org/apache/hadoop/tools/rumen/LoggedTaskAttempt.java index 5c6abd372c081c..c4ca962b6e69f1 100644 --- a/hadoop-tools/hadoop-rumen/src/main/java/org/apache/hadoop/tools/rumen/LoggedTaskAttempt.java +++ b/hadoop-tools/hadoop-rumen/src/main/java/org/apache/hadoop/tools/rumen/LoggedTaskAttempt.java @@ -636,11 +636,11 @@ private static void incorporateCounter(SetField thunk, JhCounters counters, String counterName) { counterName = canonicalizeCounterName(counterName); - for (JhCounterGroup group : counters.groups) { - for (JhCounter counter : group.counts) { + for (JhCounterGroup group : counters.getGroups()) { + for (JhCounter counter : group.getCounts()) { if (counterName - .equals(canonicalizeCounterName(counter.name.toString()))) { - thunk.set(counter.value); + .equals(canonicalizeCounterName(counter.getName().toString()))) { + thunk.set(counter.getValue()); return; } }