Fix runtime generated code for HashJoinProbeTemplate. Use logger level ERROR when a fragment failure occurs
Project: http://git-wip-us.apache.org/repos/asf/incubator-drill/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-drill/commit/5484a552 Tree: http://git-wip-us.apache.org/repos/asf/incubator-drill/tree/5484a552 Diff: http://git-wip-us.apache.org/repos/asf/incubator-drill/diff/5484a552 Branch: refs/heads/master Commit: 5484a552c8252dc8ee283ad4d45285232f9d1ada Parents: 5c8061e Author: Mehant Baid <[email protected]> Authored: Tue May 27 15:46:09 2014 -0700 Committer: Jacques Nadeau <[email protected]> Committed: Wed May 28 09:17:13 2014 -0700 ---------------------------------------------------------------------- .../main/java/org/apache/drill/exec/ops/FragmentContext.java | 2 +- .../apache/drill/exec/physical/impl/join/HashJoinBatch.java | 6 ++---- .../drill/exec/physical/impl/join/HashJoinProbeTemplate.java | 6 ++++-- .../src/test/java/org/apache/drill/TestAltSortQueries.java | 1 - .../src/test/java/org/apache/drill/TestTpchDistributed.java | 1 - 5 files changed, 7 insertions(+), 9 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-drill/blob/5484a552/exec/java-exec/src/main/java/org/apache/drill/exec/ops/FragmentContext.java ---------------------------------------------------------------------- diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/ops/FragmentContext.java b/exec/java-exec/src/main/java/org/apache/drill/exec/ops/FragmentContext.java index 7812d11..7a82f1d 100644 --- a/exec/java-exec/src/main/java/org/apache/drill/exec/ops/FragmentContext.java +++ b/exec/java-exec/src/main/java/org/apache/drill/exec/ops/FragmentContext.java @@ -113,7 +113,7 @@ public class FragmentContext implements Closeable { } public void fail(Throwable cause) { - logger.debug("Fragment Context received failure. {}", cause); + logger.error("Fragment Context received failure. {}", cause); failed = true; failureCause = cause; } http://git-wip-us.apache.org/repos/asf/incubator-drill/blob/5484a552/exec/java-exec/src/main/java/org/apache/drill/exec/physical/impl/join/HashJoinBatch.java ---------------------------------------------------------------------- diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/physical/impl/join/HashJoinBatch.java b/exec/java-exec/src/main/java/org/apache/drill/exec/physical/impl/join/HashJoinBatch.java index 0edd3f0..2ea9339 100644 --- a/exec/java-exec/src/main/java/org/apache/drill/exec/physical/impl/join/HashJoinBatch.java +++ b/exec/java-exec/src/main/java/org/apache/drill/exec/physical/impl/join/HashJoinBatch.java @@ -414,12 +414,10 @@ public class HashJoinBatch extends AbstractRecordBatch<HashJoinPOP> { fieldId++; outputFieldId++; } - g.rotateBlock(); - g.getEvalBlock()._return(JExpr.TRUE); - recordCount = left.getRecordCount(); } - + g.rotateBlock(); + g.getEvalBlock()._return(JExpr.TRUE); HashJoinProbe hj = context.getImplementationClass(cg); http://git-wip-us.apache.org/repos/asf/incubator-drill/blob/5484a552/exec/java-exec/src/main/java/org/apache/drill/exec/physical/impl/join/HashJoinProbeTemplate.java ---------------------------------------------------------------------- diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/physical/impl/join/HashJoinProbeTemplate.java b/exec/java-exec/src/main/java/org/apache/drill/exec/physical/impl/join/HashJoinProbeTemplate.java index 9c5b76a..6e19934 100644 --- a/exec/java-exec/src/main/java/org/apache/drill/exec/physical/impl/join/HashJoinProbeTemplate.java +++ b/exec/java-exec/src/main/java/org/apache/drill/exec/physical/impl/join/HashJoinProbeTemplate.java @@ -177,7 +177,8 @@ public abstract class HashJoinProbeTemplate implements HashJoinProbe { // If we have a left outer join, project the keys if (joinType == JoinRelType.LEFT || joinType == JoinRelType.FULL) { - projectProbeRecord(recordsProcessed, outputRecords++); + boolean success = projectProbeRecord(recordsProcessed, outputRecords++); + assert success; } recordsProcessed++; } @@ -186,7 +187,8 @@ public abstract class HashJoinProbeTemplate implements HashJoinProbe { hjHelper.setRecordMatched(currentCompositeIdx); boolean success = projectBuildRecord(currentCompositeIdx, outputRecords); assert success; - projectProbeRecord(recordsProcessed, outputRecords); + success = projectProbeRecord(recordsProcessed, outputRecords); + assert success; outputRecords++; currentCompositeIdx = hjHelper.getNextIndex(currentCompositeIdx); http://git-wip-us.apache.org/repos/asf/incubator-drill/blob/5484a552/exec/java-exec/src/test/java/org/apache/drill/TestAltSortQueries.java ---------------------------------------------------------------------- diff --git a/exec/java-exec/src/test/java/org/apache/drill/TestAltSortQueries.java b/exec/java-exec/src/test/java/org/apache/drill/TestAltSortQueries.java index d0f1479..119bd48 100644 --- a/exec/java-exec/src/test/java/org/apache/drill/TestAltSortQueries.java +++ b/exec/java-exec/src/test/java/org/apache/drill/TestAltSortQueries.java @@ -52,7 +52,6 @@ public class TestAltSortQueries extends BaseTestQuery{ } @Test - @Ignore public void testJoinWithLimit() throws Exception{ test("SELECT\n" + " nations.N_NAME,\n" + http://git-wip-us.apache.org/repos/asf/incubator-drill/blob/5484a552/exec/java-exec/src/test/java/org/apache/drill/TestTpchDistributed.java ---------------------------------------------------------------------- diff --git a/exec/java-exec/src/test/java/org/apache/drill/TestTpchDistributed.java b/exec/java-exec/src/test/java/org/apache/drill/TestTpchDistributed.java index 927db9f..7a6982d 100644 --- a/exec/java-exec/src/test/java/org/apache/drill/TestTpchDistributed.java +++ b/exec/java-exec/src/test/java/org/apache/drill/TestTpchDistributed.java @@ -51,7 +51,6 @@ public class TestTpchDistributed extends BaseTestQuery{ } @Test - @Ignore public void tpch05() throws Exception{ testDistributed("queries/tpch/05.sql"); }
