Repository: tez Updated Branches: refs/heads/master 04d609e7f -> 67243a0a4
TEZ-3439. Tez joinvalidate fails when first input argument size is bigger than the second. (Hui Cao via hitesh) Project: http://git-wip-us.apache.org/repos/asf/tez/repo Commit: http://git-wip-us.apache.org/repos/asf/tez/commit/67243a0a Tree: http://git-wip-us.apache.org/repos/asf/tez/tree/67243a0a Diff: http://git-wip-us.apache.org/repos/asf/tez/diff/67243a0a Branch: refs/heads/master Commit: 67243a0a4e6a5c9eaf8afa64cb00f7d92831c8ac Parents: 04d609e Author: Hitesh Shah <hit...@apache.org> Authored: Tue Oct 18 15:11:21 2016 -0700 Committer: Hitesh Shah <hit...@apache.org> Committed: Tue Oct 18 15:11:21 2016 -0700 ---------------------------------------------------------------------- CHANGES.txt | 3 +++ .../src/main/java/org/apache/tez/examples/JoinValidate.java | 6 ++++-- 2 files changed, 7 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/tez/blob/67243a0a/CHANGES.txt ---------------------------------------------------------------------- diff --git a/CHANGES.txt b/CHANGES.txt index 3a00779..e8e328f 100644 --- a/CHANGES.txt +++ b/CHANGES.txt @@ -7,6 +7,7 @@ INCOMPATIBLE CHANGES ALL CHANGES: + TEZ-3439. Tez joinvalidate fails when first input argument size is bigger than the second. TEZ-3430. Make split sorting optional. TEZ-3466. Tez classpath building to mimic mapreduce classpath building. TEZ-3453. Correct the downloaded ATS dag data location for analyzer. @@ -127,6 +128,7 @@ INCOMPATIBLE CHANGES ALL CHANGES: + TEZ-3439. Tez joinvalidate fails when first input argument size is bigger than the second. TEZ-3464. Fix findbugs warnings in tez-dag mainLoop TEZ-3330. Propagate additional config parameters when running MR jobs via Tez. TEZ-3335. DAG client thinks app is still running when app status is null @@ -623,6 +625,7 @@ INCOMPATIBLE CHANGES ALL CHANGES: + TEZ-3439. Tez joinvalidate fails when first input argument size is bigger than the second. TEZ-3464. Fix findbugs warnings in tez-dag mainLoop TEZ-3335. DAG client thinks app is still running when app status is null TEZ-3460. Fix precommit release audit warning. http://git-wip-us.apache.org/repos/asf/tez/blob/67243a0a/tez-examples/src/main/java/org/apache/tez/examples/JoinValidate.java ---------------------------------------------------------------------- diff --git a/tez-examples/src/main/java/org/apache/tez/examples/JoinValidate.java b/tez-examples/src/main/java/org/apache/tez/examples/JoinValidate.java index f9358bf..d4f79fe 100644 --- a/tez-examples/src/main/java/org/apache/tez/examples/JoinValidate.java +++ b/tez-examples/src/main/java/org/apache/tez/examples/JoinValidate.java @@ -235,6 +235,7 @@ public class JoinValidate extends TezExampleBase { Preconditions.checkState(rhsReaderRaw instanceof KeyValuesReader); KeyValuesReader lhsReader = (KeyValuesReader) lhsReaderRaw; KeyValuesReader rhsReader = (KeyValuesReader) rhsReaderRaw; + boolean rhsReaderEnd = false; TezCounter lhsMissingKeyCounter = getContext().getCounters().findCounter(COUNTER_GROUP_NAME, MISSING_KEY_COUNTER_NAME); @@ -248,12 +249,13 @@ public class JoinValidate extends TezExampleBase { } else { lhsMissingKeyCounter.increment(1); LOG.info("ExtraKey in lhs: " + lhsReader.getClass()); + rhsReaderEnd = true; break; } } - if (rhsReader.next()) { + if (!rhsReaderEnd && rhsReader.next()) { lhsMissingKeyCounter.increment(1); - LOG.info("ExtraKey in rhs: " + lhsReader.getClass()); + LOG.info("ExtraKey in rhs: " + rhsReader.getClass()); } } }