diff options
Diffstat (limited to 'exec/java-exec')
-rw-r--r-- | exec/java-exec/src/main/java/org/apache/drill/exec/physical/impl/union/UnionAllRecordBatch.java | 4 | ||||
-rw-r--r-- | exec/java-exec/src/test/java/org/apache/drill/TestUnionAll.java | 32 | ||||
-rw-r--r-- | exec/java-exec/src/test/resources/testframework/testUnionAllQueries/q18_1.tsv (renamed from exec/java-exec/src/test/resources/testframework/testUnionAllQueries/q18.tsv) | 0 | ||||
-rw-r--r-- | exec/java-exec/src/test/resources/testframework/testUnionAllQueries/q18_2.tsv | 13 | ||||
-rw-r--r-- | exec/java-exec/src/test/resources/testframework/testUnionAllQueries/q18_3.tsv | 13 |
5 files changed, 57 insertions, 5 deletions
diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/physical/impl/union/UnionAllRecordBatch.java b/exec/java-exec/src/main/java/org/apache/drill/exec/physical/impl/union/UnionAllRecordBatch.java index d7ea3bb7d..66bc3e35a 100644 --- a/exec/java-exec/src/main/java/org/apache/drill/exec/physical/impl/union/UnionAllRecordBatch.java +++ b/exec/java-exec/src/main/java/org/apache/drill/exec/physical/impl/union/UnionAllRecordBatch.java @@ -400,9 +400,9 @@ public class UnionAllRecordBatch extends AbstractRecordBatch<UnionAll> { throw new SchemaChangeException("Schema change detected in the left input of Union-All. This is not currently supported"); } - upstream = IterOutcome.OK; + iterOutcome = IterOutcome.OK; // fall through - case OK: + case OK: unionAllRecordBatch.setCurrentRecordBatch(leftSide.getRecordBatch()); upstream = iterOutcome; return upstream; diff --git a/exec/java-exec/src/test/java/org/apache/drill/TestUnionAll.java b/exec/java-exec/src/test/java/org/apache/drill/TestUnionAll.java index 72f52e98f..5f98d905f 100644 --- a/exec/java-exec/src/test/java/org/apache/drill/TestUnionAll.java +++ b/exec/java-exec/src/test/java/org/apache/drill/TestUnionAll.java @@ -375,15 +375,41 @@ public class TestUnionAll extends BaseTestQuery{ String rootDate = FileUtils.getResourceAsFile("/store/json/dateData.json").toURI().toString(); String rootTimpStmp = FileUtils.getResourceAsFile("/store/json/timeStmpData.json").toURI().toString(); - String query = String.format( + String query1 = String.format( "(select max(key) as key from dfs_test.`%s` " + "union all " + "select key from dfs_test.`%s`)", rootDate, rootTimpStmp); + String query2 = String.format( + "select key from dfs_test.`%s` " + + "union all " + + "select max(key) as key from dfs_test.`%s`", rootDate, rootTimpStmp); + + String query3 = String.format( + "select key from dfs_test.`%s` " + + "union all " + + "select max(key) as key from dfs_test.`%s`", rootDate, rootTimpStmp); + testBuilder() - .sqlQuery(query) + .sqlQuery(query1) + .unOrdered() + .csvBaselineFile("testframework/testUnionAllQueries/q18_1.tsv") + .baselineTypes(TypeProtos.MinorType.VARCHAR) + .baselineColumns("key") + .build().run(); + + testBuilder() + .sqlQuery(query2) + .unOrdered() + .csvBaselineFile("testframework/testUnionAllQueries/q18_2.tsv") + .baselineTypes(TypeProtos.MinorType.VARCHAR) + .baselineColumns("key") + .build().run(); + + testBuilder() + .sqlQuery(query3) .unOrdered() - .csvBaselineFile("testframework/testUnionAllQueries/q18.tsv") + .csvBaselineFile("testframework/testUnionAllQueries/q18_3.tsv") .baselineTypes(TypeProtos.MinorType.VARCHAR) .baselineColumns("key") .build().run(); diff --git a/exec/java-exec/src/test/resources/testframework/testUnionAllQueries/q18.tsv b/exec/java-exec/src/test/resources/testframework/testUnionAllQueries/q18_1.tsv index ccf0d3544..ccf0d3544 100644 --- a/exec/java-exec/src/test/resources/testframework/testUnionAllQueries/q18.tsv +++ b/exec/java-exec/src/test/resources/testframework/testUnionAllQueries/q18_1.tsv diff --git a/exec/java-exec/src/test/resources/testframework/testUnionAllQueries/q18_2.tsv b/exec/java-exec/src/test/resources/testframework/testUnionAllQueries/q18_2.tsv new file mode 100644 index 000000000..123efc659 --- /dev/null +++ b/exec/java-exec/src/test/resources/testframework/testUnionAllQueries/q18_2.tsv @@ -0,0 +1,13 @@ +2009-03-03 +2001-08-27 +2011-07-26 +1970-09-02 +1983-04-24 +2007-02-01 +1977-08-03 +1962-05-14 +1950-02-16 +1983-09-05 +2000-09-09 +1960-08-18 +2015-03-26 19:04:55.544
\ No newline at end of file diff --git a/exec/java-exec/src/test/resources/testframework/testUnionAllQueries/q18_3.tsv b/exec/java-exec/src/test/resources/testframework/testUnionAllQueries/q18_3.tsv new file mode 100644 index 000000000..123efc659 --- /dev/null +++ b/exec/java-exec/src/test/resources/testframework/testUnionAllQueries/q18_3.tsv @@ -0,0 +1,13 @@ +2009-03-03 +2001-08-27 +2011-07-26 +1970-09-02 +1983-04-24 +2007-02-01 +1977-08-03 +1962-05-14 +1950-02-16 +1983-09-05 +2000-09-09 +1960-08-18 +2015-03-26 19:04:55.544
\ No newline at end of file |