You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@drill.apache.org by jn...@apache.org on 2016/12/20 04:27:31 UTC
[2/8] drill git commit: DRILL-5117: Compile error when query a json
file with 1000+columns
DRILL-5117: Compile error when query a json file with 1000+columns
close apache/drill#686
Project: http://git-wip-us.apache.org/repos/asf/drill/repo
Commit: http://git-wip-us.apache.org/repos/asf/drill/commit/810198b1
Tree: http://git-wip-us.apache.org/repos/asf/drill/tree/810198b1
Diff: http://git-wip-us.apache.org/repos/asf/drill/diff/810198b1
Branch: refs/heads/master
Commit: 810198b18bfbe38712256c58b102bca079d934c1
Parents: 417ae93
Author: Serhii-Harnyk <se...@gmail.com>
Authored: Thu Dec 8 20:08:34 2016 +0000
Committer: Jinfeng Ni <jn...@apache.org>
Committed: Mon Dec 19 14:49:15 2016 -0800
----------------------------------------------------------------------
.../src/main/java/org/apache/drill/exec/expr/SizedJBlock.java | 5 ++++-
.../org/apache/drill/exec/compile/TestLargeFileCompilation.java | 4 ----
2 files changed, 4 insertions(+), 5 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/drill/blob/810198b1/exec/java-exec/src/main/java/org/apache/drill/exec/expr/SizedJBlock.java
----------------------------------------------------------------------
diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/expr/SizedJBlock.java b/exec/java-exec/src/main/java/org/apache/drill/exec/expr/SizedJBlock.java
index cf110c6..5d806a3 100644
--- a/exec/java-exec/src/main/java/org/apache/drill/exec/expr/SizedJBlock.java
+++ b/exec/java-exec/src/main/java/org/apache/drill/exec/expr/SizedJBlock.java
@@ -32,7 +32,10 @@ public class SizedJBlock {
public SizedJBlock(JBlock block) {
this.block = block;
- this.count = 0;
+ // Project, Filter and Aggregator receives JBlock, using ClassGenerator.addExpr() method,
+ // but the Copier is doing kind of short-cut handling, by accessing the eval() and setup() directly.
+ // To take into account JBlocks, that were filled in Copier, sets count to 1.
+ this.count = 1;
}
public JBlock getBlock() {
http://git-wip-us.apache.org/repos/asf/drill/blob/810198b1/exec/java-exec/src/test/java/org/apache/drill/exec/compile/TestLargeFileCompilation.java
----------------------------------------------------------------------
diff --git a/exec/java-exec/src/test/java/org/apache/drill/exec/compile/TestLargeFileCompilation.java b/exec/java-exec/src/test/java/org/apache/drill/exec/compile/TestLargeFileCompilation.java
index 6c7fd9a..f892471 100644
--- a/exec/java-exec/src/test/java/org/apache/drill/exec/compile/TestLargeFileCompilation.java
+++ b/exec/java-exec/src/test/java/org/apache/drill/exec/compile/TestLargeFileCompilation.java
@@ -20,7 +20,6 @@ package org.apache.drill.exec.compile;
import org.apache.drill.BaseTestQuery;
import org.apache.drill.common.util.TestTools;
import org.apache.drill.exec.ExecConstants;
-import org.junit.Ignore;
import org.junit.Rule;
import org.junit.Test;
import org.junit.rules.TestRule;
@@ -129,14 +128,12 @@ public class TestLargeFileCompilation extends BaseTestQuery {
}
@Test
- @Ignore("DRILL-1808")
public void testEXTERNAL_SORT() throws Exception {
testNoResult("alter session set `%s`='JDK'", QueryClassLoader.JAVA_COMPILER_OPTION);
testNoResult(ITERATION_COUNT, LARGE_QUERY_ORDER_BY);
}
@Test
- @Ignore("DRILL-1808")
public void testTOP_N_SORT() throws Exception {
testNoResult("alter session set `%s`='JDK'", QueryClassLoader.JAVA_COMPILER_OPTION);
testNoResult(ITERATION_COUNT, LARGE_QUERY_ORDER_BY_WITH_LIMIT);
@@ -153,5 +150,4 @@ public class TestLargeFileCompilation extends BaseTestQuery {
testNoResult("alter session set `%s`='JDK'", QueryClassLoader.JAVA_COMPILER_OPTION);
testNoResult(ITERATION_COUNT, LARGE_QUERY_SELECT_LIST);
}
-
}