Repository: drill Updated Branches: refs/heads/master 447b093cd -> c8a78409d
DRILL-4443: MIN/MAX on VARCHAR throw a NullPointerException Project: http://git-wip-us.apache.org/repos/asf/drill/repo Commit: http://git-wip-us.apache.org/repos/asf/drill/commit/c8a78409 Tree: http://git-wip-us.apache.org/repos/asf/drill/tree/c8a78409 Diff: http://git-wip-us.apache.org/repos/asf/drill/diff/c8a78409 Branch: refs/heads/master Commit: c8a78409d9472b84eaa7fba719842c08302c81c3 Parents: 447b093 Author: adeneche <[email protected]> Authored: Fri Feb 26 13:41:36 2016 -0800 Committer: adeneche <[email protected]> Committed: Tue Mar 8 07:08:42 2016 +0100 ---------------------------------------------------------------------- .../src/main/codegen/templates/VarCharAggrFunctions1.java | 1 + .../org/apache/drill/exec/fn/impl/TestAggregateFunctions.java | 5 ++++- exec/java-exec/src/test/resources/agg/4443.csv | 2 ++ 3 files changed, 7 insertions(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/drill/blob/c8a78409/exec/java-exec/src/main/codegen/templates/VarCharAggrFunctions1.java ---------------------------------------------------------------------- diff --git a/exec/java-exec/src/main/codegen/templates/VarCharAggrFunctions1.java b/exec/java-exec/src/main/codegen/templates/VarCharAggrFunctions1.java index 14cea5b..11b20b1 100644 --- a/exec/java-exec/src/main/codegen/templates/VarCharAggrFunctions1.java +++ b/exec/java-exec/src/main/codegen/templates/VarCharAggrFunctions1.java @@ -137,6 +137,7 @@ public static class ${type.inputType}${aggrtype.className} implements DrillAggFu @Override public void reset() { value = new ObjectHolder(); + value.obj = new org.apache.drill.exec.expr.fn.impl.DrillByteArray(); init.value = 0; nonNullCount.value = 0; } http://git-wip-us.apache.org/repos/asf/drill/blob/c8a78409/exec/java-exec/src/test/java/org/apache/drill/exec/fn/impl/TestAggregateFunctions.java ---------------------------------------------------------------------- diff --git a/exec/java-exec/src/test/java/org/apache/drill/exec/fn/impl/TestAggregateFunctions.java b/exec/java-exec/src/test/java/org/apache/drill/exec/fn/impl/TestAggregateFunctions.java index 009fe51..43e206e 100644 --- a/exec/java-exec/src/test/java/org/apache/drill/exec/fn/impl/TestAggregateFunctions.java +++ b/exec/java-exec/src/test/java/org/apache/drill/exec/fn/impl/TestAggregateFunctions.java @@ -19,7 +19,6 @@ package org.apache.drill.exec.fn.impl; import org.apache.drill.BaseTestQuery; import org.apache.drill.PlanTestBase; -import org.apache.drill.common.types.TypeProtos; import org.apache.drill.common.util.TestTools; import org.junit.Ignore; import org.junit.Test; @@ -457,4 +456,8 @@ public class TestAggregateFunctions extends BaseTestQuery { .build().run(); } + @Test + public void test4443() throws Exception { + test("SELECT MIN(columns[1]) FROM dfs_test.`%s/agg/4443.csv` GROUP BY columns[0]", TEST_RES_PATH); + } } http://git-wip-us.apache.org/repos/asf/drill/blob/c8a78409/exec/java-exec/src/test/resources/agg/4443.csv ---------------------------------------------------------------------- diff --git a/exec/java-exec/src/test/resources/agg/4443.csv b/exec/java-exec/src/test/resources/agg/4443.csv new file mode 100644 index 0000000..bf85e26 --- /dev/null +++ b/exec/java-exec/src/test/resources/agg/4443.csv @@ -0,0 +1,2 @@ +a,1 +b,2 \ No newline at end of file
