TAJO-866: COUNT DISTINCT with other aggregation function throws ClassCastException. (Hyoungjun Kim via hyunsik)
Closes #36 Project: http://git-wip-us.apache.org/repos/asf/tajo/repo Commit: http://git-wip-us.apache.org/repos/asf/tajo/commit/26265c06 Tree: http://git-wip-us.apache.org/repos/asf/tajo/tree/26265c06 Diff: http://git-wip-us.apache.org/repos/asf/tajo/diff/26265c06 Branch: refs/heads/window_function Commit: 26265c0609324b52f8e22bf803fddfa1413cf3a4 Parents: 48c6d1a Author: Hyunsik Choi <[email protected]> Authored: Wed Jun 25 16:57:04 2014 +0900 Committer: Hyunsik Choi <[email protected]> Committed: Wed Jun 25 16:57:15 2014 +0900 ---------------------------------------------------------------------- CHANGES | 3 ++ .../tajo/engine/function/builtin/AvgDouble.java | 7 +++- .../tajo/engine/function/builtin/AvgLong.java | 11 +++--- .../tajo/engine/query/TestGroupByQuery.java | 35 ++++++++++++++++++++ .../apache/tajo/engine/query/TestJoinQuery.java | 7 ++++ .../testLeftOuterJoinWithEmptyTable5.sql | 11 ++++++ .../testLeftOuterJoinWithEmptyTable5.result | 4 +++ 7 files changed, 72 insertions(+), 6 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/tajo/blob/26265c06/CHANGES ---------------------------------------------------------------------- diff --git a/CHANGES b/CHANGES index b740008..c10dbdf 100644 --- a/CHANGES +++ b/CHANGES @@ -74,6 +74,9 @@ Release 0.9.0 - unreleased BUG FIXES + TAJO-866: COUNT DISTINCT with other aggregation function throws + ClassCastException. (Hyoungjun Kim via hyunsik) + TAJO-882: CLI hangs when a error occurs in the GlobalPlanner. (Hyoungjun Kim via hyunsik) http://git-wip-us.apache.org/repos/asf/tajo/blob/26265c06/tajo-core/src/main/java/org/apache/tajo/engine/function/builtin/AvgDouble.java ---------------------------------------------------------------------- diff --git a/tajo-core/src/main/java/org/apache/tajo/engine/function/builtin/AvgDouble.java b/tajo-core/src/main/java/org/apache/tajo/engine/function/builtin/AvgDouble.java index df5cc80..493c098 100644 --- a/tajo-core/src/main/java/org/apache/tajo/engine/function/builtin/AvgDouble.java +++ b/tajo-core/src/main/java/org/apache/tajo/engine/function/builtin/AvgDouble.java @@ -24,6 +24,7 @@ import org.apache.tajo.common.TajoDataTypes.DataType; import org.apache.tajo.common.TajoDataTypes.Type; import org.apache.tajo.datum.Datum; import org.apache.tajo.datum.DatumFactory; +import org.apache.tajo.datum.NullDatum; import org.apache.tajo.datum.ProtobufDatum; import org.apache.tajo.engine.function.AggFunction; import org.apache.tajo.engine.function.FunctionContext; @@ -64,7 +65,11 @@ public class AvgDouble extends AggFunction { @Override public void merge(FunctionContext ctx, Tuple part) { AvgContext avgCtx = (AvgContext) ctx; - ProtobufDatum datum = (ProtobufDatum) part.get(0); + Datum d = part.get(0); + if (d instanceof NullDatum) { + return; + } + ProtobufDatum datum = (ProtobufDatum) d; AvgDoubleProto proto = (AvgDoubleProto) datum.get(); avgCtx.sum += proto.getSum(); avgCtx.count += proto.getCount(); http://git-wip-us.apache.org/repos/asf/tajo/blob/26265c06/tajo-core/src/main/java/org/apache/tajo/engine/function/builtin/AvgLong.java ---------------------------------------------------------------------- diff --git a/tajo-core/src/main/java/org/apache/tajo/engine/function/builtin/AvgLong.java b/tajo-core/src/main/java/org/apache/tajo/engine/function/builtin/AvgLong.java index 5bb5ff9..4794f4d 100644 --- a/tajo-core/src/main/java/org/apache/tajo/engine/function/builtin/AvgLong.java +++ b/tajo-core/src/main/java/org/apache/tajo/engine/function/builtin/AvgLong.java @@ -22,10 +22,7 @@ import org.apache.tajo.catalog.CatalogUtil; import org.apache.tajo.catalog.Column; import org.apache.tajo.common.TajoDataTypes.DataType; import org.apache.tajo.common.TajoDataTypes.Type; -import org.apache.tajo.datum.Datum; -import org.apache.tajo.datum.DatumFactory; -import org.apache.tajo.datum.Float8Datum; -import org.apache.tajo.datum.ProtobufDatum; +import org.apache.tajo.datum.*; import org.apache.tajo.engine.function.AggFunction; import org.apache.tajo.engine.function.FunctionContext; import org.apache.tajo.engine.function.annotation.Description; @@ -63,7 +60,11 @@ public class AvgLong extends AggFunction<Float8Datum> { @Override public void merge(FunctionContext ctx, Tuple part) { AvgContext avgCtx = (AvgContext) ctx; - ProtobufDatum datum = (ProtobufDatum) part.get(0); + Datum d = part.get(0); + if (d instanceof NullDatum) { + return; + } + ProtobufDatum datum = (ProtobufDatum) d; AvgLongProto proto = (AvgLongProto) datum.get(); avgCtx.sum += proto.getSum(); avgCtx.count += proto.getCount(); http://git-wip-us.apache.org/repos/asf/tajo/blob/26265c06/tajo-core/src/test/java/org/apache/tajo/engine/query/TestGroupByQuery.java ---------------------------------------------------------------------- diff --git a/tajo-core/src/test/java/org/apache/tajo/engine/query/TestGroupByQuery.java b/tajo-core/src/test/java/org/apache/tajo/engine/query/TestGroupByQuery.java index d06b65f..b5fd9f1 100644 --- a/tajo-core/src/test/java/org/apache/tajo/engine/query/TestGroupByQuery.java +++ b/tajo-core/src/test/java/org/apache/tajo/engine/query/TestGroupByQuery.java @@ -21,11 +21,18 @@ package org.apache.tajo.engine.query; import org.apache.tajo.IntegrationTest; import org.apache.tajo.QueryTestCaseBase; import org.apache.tajo.TajoConstants; +import org.apache.tajo.TajoTestingCluster; +import org.apache.tajo.catalog.Schema; +import org.apache.tajo.common.TajoDataTypes.Type; +import org.apache.tajo.storage.StorageConstants; +import org.apache.tajo.util.KeyValueSet; import org.junit.Test; import org.junit.experimental.categories.Category; import java.sql.ResultSet; +import static org.junit.Assert.assertEquals; + @Category(IntegrationTest.class) public class TestGroupByQuery extends QueryTestCaseBase { @@ -253,6 +260,34 @@ public class TestGroupByQuery extends QueryTestCaseBase { res = executeFile("testDistinctAggregation_case8.sql"); assertResultSet(res, "testDistinctAggregation_case8.result"); res.close(); + + // case9 + KeyValueSet tableOptions = new KeyValueSet(); + tableOptions.put(StorageConstants.CSVFILE_DELIMITER, StorageConstants.DEFAULT_FIELD_DELIMITER); + tableOptions.put(StorageConstants.CSVFILE_NULL, "\\\\N"); + + Schema schema = new Schema(); + schema.addColumn("id", Type.TEXT); + schema.addColumn("code", Type.TEXT); + schema.addColumn("qty", Type.INT4); + schema.addColumn("qty2", Type.FLOAT8); + String[] data = new String[]{ "1|a|3|3.0", "1|a|4|4.0", "1|b|5|5.0", "2|a|1|6.0", "2|c|2|7.0", "2|d|3|8.0" }; + TajoTestingCluster.createTable("table10", schema, tableOptions, data); + + res = executeString("select id, count(distinct code), " + + "avg(qty), min(qty), max(qty), sum(qty), " + + "cast(avg(qty2) as INT8), cast(min(qty2) as INT8), cast(max(qty2) as INT8), cast(sum(qty2) as INT8) " + + "from table10 group by id"); + String result = resultSetToString(res); + + String expected = "id,?count,?avg_1,?min_2,?max_3,?sum_4,?cast_5,?cast_6,?cast_7,?cast_8\n" + + "-------------------------------\n" + + "1,2,4.0,0,5,12,4,0,5,12\n" + + "2,3,2.0,0,3,6,7,0,8,21\n"; + + assertEquals(expected, result); + + executeString("DROP TABLE table10 PURGE").close(); } @Test http://git-wip-us.apache.org/repos/asf/tajo/blob/26265c06/tajo-core/src/test/java/org/apache/tajo/engine/query/TestJoinQuery.java ---------------------------------------------------------------------- diff --git a/tajo-core/src/test/java/org/apache/tajo/engine/query/TestJoinQuery.java b/tajo-core/src/test/java/org/apache/tajo/engine/query/TestJoinQuery.java index f1d7f8d..100b9ff 100644 --- a/tajo-core/src/test/java/org/apache/tajo/engine/query/TestJoinQuery.java +++ b/tajo-core/src/test/java/org/apache/tajo/engine/query/TestJoinQuery.java @@ -347,6 +347,13 @@ public class TestJoinQuery extends QueryTestCaseBase { } @Test + public final void testLeftOuterJoinWithEmptyTable5() throws Exception { + ResultSet res = executeQuery(); + assertResultSet(res); + cleanupQuery(res); + } + + @Test public final void testRightOuterJoinWithEmptyTable1() throws Exception { ResultSet res = executeQuery(); assertResultSet(res); http://git-wip-us.apache.org/repos/asf/tajo/blob/26265c06/tajo-core/src/test/resources/queries/TestJoinQuery/testLeftOuterJoinWithEmptyTable5.sql ---------------------------------------------------------------------- diff --git a/tajo-core/src/test/resources/queries/TestJoinQuery/testLeftOuterJoinWithEmptyTable5.sql b/tajo-core/src/test/resources/queries/TestJoinQuery/testLeftOuterJoinWithEmptyTable5.sql new file mode 100644 index 0000000..d4ef649 --- /dev/null +++ b/tajo-core/src/test/resources/queries/TestJoinQuery/testLeftOuterJoinWithEmptyTable5.sql @@ -0,0 +1,11 @@ +select + l_linenumber, + sum(empty_orders.o_orderkey), + max(empty_orders.o_orderstatus), + max(empty_orders.o_orderdate), + avg(l_quantity), + sum(l_quantity) +from + lineitem left outer join empty_orders on l_orderkey = o_orderkey + group by l_linenumber +order by l_linenumber ; \ No newline at end of file http://git-wip-us.apache.org/repos/asf/tajo/blob/26265c06/tajo-core/src/test/resources/results/TestJoinQuery/testLeftOuterJoinWithEmptyTable5.result ---------------------------------------------------------------------- diff --git a/tajo-core/src/test/resources/results/TestJoinQuery/testLeftOuterJoinWithEmptyTable5.result b/tajo-core/src/test/resources/results/TestJoinQuery/testLeftOuterJoinWithEmptyTable5.result new file mode 100644 index 0000000..f1d80e4 --- /dev/null +++ b/tajo-core/src/test/resources/results/TestJoinQuery/testLeftOuterJoinWithEmptyTable5.result @@ -0,0 +1,4 @@ +l_linenumber,?sum,?max_1,?max_2,?avg_3,?sum_4 +------------------------------- +1,0,,,33.333333333333336,100.0 +2,0,,,42.5,85.0 \ No newline at end of file
