Repository: tajo Updated Branches: refs/heads/master f29c007a9 -> 1842ee194
TAJO-1934: Test failures in TestPgSQLQueryTests due to sort order. Closes #831 Signed-off-by: Jihoon Son <[email protected]> Project: http://git-wip-us.apache.org/repos/asf/tajo/repo Commit: http://git-wip-us.apache.org/repos/asf/tajo/commit/1842ee19 Tree: http://git-wip-us.apache.org/repos/asf/tajo/tree/1842ee19 Diff: http://git-wip-us.apache.org/repos/asf/tajo/diff/1842ee19 Branch: refs/heads/master Commit: 1842ee194b2dcb295ebf875a6193e295ac3974a8 Parents: f29c007 Author: Dongkyu Hwangbo <[email protected]> Authored: Tue Oct 20 16:49:26 2015 +0900 Committer: Jihoon Son <[email protected]> Committed: Tue Oct 20 16:50:04 2015 +0900 ---------------------------------------------------------------------- CHANGES | 3 +++ .../tajo/storage/pgsql/TestPgSQLQueryTests.java | 18 ++++++++++++++++++ .../TestPgSQLQueryTests/testBetweenDates.result | 2 +- .../TestPgSQLQueryTests/testBetweenNumbers.result | 2 +- .../TestPgSQLQueryTests/testCaseWhenFilter.result | 2 +- .../TestPgSQLQueryTests/testCtasToHdfs.result | 2 +- .../testFixedLengthFields.result | 2 +- .../testFunctionWithinFilter.result | 2 +- .../testInPredicateWithLiterals.result | 2 +- .../testInPredicateWithNumbers.result | 2 +- .../testProjectedColumns.result | 2 +- .../TestPgSQLQueryTests/testTPCH_Q3.result | 2 +- .../testVariableLengthFields.result | 2 +- 13 files changed, 32 insertions(+), 11 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/tajo/blob/1842ee19/CHANGES ---------------------------------------------------------------------- diff --git a/CHANGES b/CHANGES index fafe41b..57d72a5 100644 --- a/CHANGES +++ b/CHANGES @@ -35,6 +35,9 @@ Release 0.12.0 - unreleased TASKS + TAJO-1934: Test failures in TestPgSQLQueryTests due to sort order. + (Contributed by Dongkyu Hwangbo, committed by jihoon) + TAJO-1916: 'How to contribute' link is broken. (jihoon) TAJO-1907: Reduce the size of the INDEXES table's COLUMN_NAMES field. http://git-wip-us.apache.org/repos/asf/tajo/blob/1842ee19/tajo-storage/tajo-storage-pgsql/src/test/java/org/apache/tajo/storage/pgsql/TestPgSQLQueryTests.java ---------------------------------------------------------------------- diff --git a/tajo-storage/tajo-storage-pgsql/src/test/java/org/apache/tajo/storage/pgsql/TestPgSQLQueryTests.java b/tajo-storage/tajo-storage-pgsql/src/test/java/org/apache/tajo/storage/pgsql/TestPgSQLQueryTests.java index e394e1b..f706680 100644 --- a/tajo-storage/tajo-storage-pgsql/src/test/java/org/apache/tajo/storage/pgsql/TestPgSQLQueryTests.java +++ b/tajo-storage/tajo-storage-pgsql/src/test/java/org/apache/tajo/storage/pgsql/TestPgSQLQueryTests.java @@ -45,42 +45,49 @@ public class TestPgSQLQueryTests extends QueryTestCaseBase { @SimpleTest @Test + @Option(sort = true) public void testProjectedColumns() throws Exception { runSimpleTests(); } @SimpleTest @Test + @Option(sort = true) public void testFixedLengthFields() throws Exception { runSimpleTests(); } @SimpleTest @Test + @Option(sort = true) public void testVariableLengthFields() throws Exception { runSimpleTests(); } @SimpleTest @Test + @Option(sort = true) public void testDateTimeTypes() throws Exception { runSimpleTests(); } @SimpleTest @Test + @Option(sort = true) public void testTPCH_Q1() throws Exception { runSimpleTests(); } @SimpleTest @Test + @Option(sort = true) public void testTPCH_Q2_Part() throws Exception { runSimpleTests(); } @SimpleTest @Test + @Option(sort = true) public void testTPCH_Q2_Part_MixedStorage() throws Exception { // Manually enable broadcast feature try { @@ -104,6 +111,7 @@ public class TestPgSQLQueryTests extends QueryTestCaseBase { @SimpleTest @Test + @Option(sort = true) public void testTPCH_Q3() throws Exception { runSimpleTests(); } @@ -119,54 +127,63 @@ public class TestPgSQLQueryTests extends QueryTestCaseBase { @SimpleTest @Test + @Option(sort = true) public void testSimpleFilter() throws Exception { runSimpleTests(); } @SimpleTest @Test + @Option(sort = true) public void testInPredicateWithNumbers() throws Exception { runSimpleTests(); } @SimpleTest @Test + @Option(sort = true) public void testInPredicateWithLiterals() throws Exception { runSimpleTests(); } @SimpleTest @Test + @Option(sort = true) public void testBetweenNumbers() throws Exception { runSimpleTests(); } @SimpleTest @Test + @Option(sort = true) public void testBetweenDates() throws Exception { runSimpleTests(); } @SimpleTest @Test + @Option(sort = true) public void testCaseWhenFilter() throws Exception { runSimpleTests(); } @SimpleTest @Test + @Option(sort = true) public void testFunctionWithinFilter() throws Exception { runSimpleTests(); } @SimpleTest @Test + @Option(sort = true) public void testCountAsterisk() throws Exception { runSimpleTests(); } @SimpleTest @Test + @Option(sort = true) public void testCtasToHdfs() throws Exception { try { executeString("CREATE DATABASE pgtmp").close(); @@ -182,6 +199,7 @@ public class TestPgSQLQueryTests extends QueryTestCaseBase { @SimpleTest @Test + @Option(sort = true) public void testQueryWithConnProperties() throws Exception { Map<String, String> connProperties = new HashMap<>(); connProperties.put("user", "postgres"); http://git-wip-us.apache.org/repos/asf/tajo/blob/1842ee19/tajo-storage/tajo-storage-pgsql/src/test/resources/results/TestPgSQLQueryTests/testBetweenDates.result ---------------------------------------------------------------------- diff --git a/tajo-storage/tajo-storage-pgsql/src/test/resources/results/TestPgSQLQueryTests/testBetweenDates.result b/tajo-storage/tajo-storage-pgsql/src/test/resources/results/TestPgSQLQueryTests/testBetweenDates.result index a7f7d20..2f6e7a1 100644 --- a/tajo-storage/tajo-storage-pgsql/src/test/resources/results/TestPgSQLQueryTests/testBetweenDates.result +++ b/tajo-storage/tajo-storage-pgsql/src/test/resources/results/TestPgSQLQueryTests/testBetweenDates.result @@ -1,5 +1,5 @@ l_orderkey,l_partkey,l_suppkey,l_linenumber,l_quantity,l_extendedprice,l_discount,l_tax,l_returnflag,l_linestatus,l_shipdate,l_commitdate,l_receiptdate,l_shipinstruct,l_shipmode,l_comment ------------------------------- -1,1,7706,1,17.0,21168.23,0.04,0.02,N,O,1996-03-13,1996-02-12,1996-03-22,DELIVER IN PERSON,TRUCK,egular courts above the 1,1,7311,2,36.0,45983.16,0.09,0.06,N,O,1996-04-12,1996-02-28,1996-04-20,TAKE BACK RETURN,MAIL,ly final dependencies: slyly bold +1,1,7706,1,17.0,21168.23,0.04,0.02,N,O,1996-03-13,1996-02-12,1996-03-22,DELIVER IN PERSON,TRUCK,egular courts above the 2,2,1191,1,38.0,44694.46,0.0,0.05,N,O,1997-01-28,1997-01-14,1997-02-02,TAKE BACK RETURN,RAIL,ven requests. deposits breach a http://git-wip-us.apache.org/repos/asf/tajo/blob/1842ee19/tajo-storage/tajo-storage-pgsql/src/test/resources/results/TestPgSQLQueryTests/testBetweenNumbers.result ---------------------------------------------------------------------- diff --git a/tajo-storage/tajo-storage-pgsql/src/test/resources/results/TestPgSQLQueryTests/testBetweenNumbers.result b/tajo-storage/tajo-storage-pgsql/src/test/resources/results/TestPgSQLQueryTests/testBetweenNumbers.result index a7f7d20..2f6e7a1 100644 --- a/tajo-storage/tajo-storage-pgsql/src/test/resources/results/TestPgSQLQueryTests/testBetweenNumbers.result +++ b/tajo-storage/tajo-storage-pgsql/src/test/resources/results/TestPgSQLQueryTests/testBetweenNumbers.result @@ -1,5 +1,5 @@ l_orderkey,l_partkey,l_suppkey,l_linenumber,l_quantity,l_extendedprice,l_discount,l_tax,l_returnflag,l_linestatus,l_shipdate,l_commitdate,l_receiptdate,l_shipinstruct,l_shipmode,l_comment ------------------------------- -1,1,7706,1,17.0,21168.23,0.04,0.02,N,O,1996-03-13,1996-02-12,1996-03-22,DELIVER IN PERSON,TRUCK,egular courts above the 1,1,7311,2,36.0,45983.16,0.09,0.06,N,O,1996-04-12,1996-02-28,1996-04-20,TAKE BACK RETURN,MAIL,ly final dependencies: slyly bold +1,1,7706,1,17.0,21168.23,0.04,0.02,N,O,1996-03-13,1996-02-12,1996-03-22,DELIVER IN PERSON,TRUCK,egular courts above the 2,2,1191,1,38.0,44694.46,0.0,0.05,N,O,1997-01-28,1997-01-14,1997-02-02,TAKE BACK RETURN,RAIL,ven requests. deposits breach a http://git-wip-us.apache.org/repos/asf/tajo/blob/1842ee19/tajo-storage/tajo-storage-pgsql/src/test/resources/results/TestPgSQLQueryTests/testCaseWhenFilter.result ---------------------------------------------------------------------- diff --git a/tajo-storage/tajo-storage-pgsql/src/test/resources/results/TestPgSQLQueryTests/testCaseWhenFilter.result b/tajo-storage/tajo-storage-pgsql/src/test/resources/results/TestPgSQLQueryTests/testCaseWhenFilter.result index a7f7d20..2f6e7a1 100644 --- a/tajo-storage/tajo-storage-pgsql/src/test/resources/results/TestPgSQLQueryTests/testCaseWhenFilter.result +++ b/tajo-storage/tajo-storage-pgsql/src/test/resources/results/TestPgSQLQueryTests/testCaseWhenFilter.result @@ -1,5 +1,5 @@ l_orderkey,l_partkey,l_suppkey,l_linenumber,l_quantity,l_extendedprice,l_discount,l_tax,l_returnflag,l_linestatus,l_shipdate,l_commitdate,l_receiptdate,l_shipinstruct,l_shipmode,l_comment ------------------------------- -1,1,7706,1,17.0,21168.23,0.04,0.02,N,O,1996-03-13,1996-02-12,1996-03-22,DELIVER IN PERSON,TRUCK,egular courts above the 1,1,7311,2,36.0,45983.16,0.09,0.06,N,O,1996-04-12,1996-02-28,1996-04-20,TAKE BACK RETURN,MAIL,ly final dependencies: slyly bold +1,1,7706,1,17.0,21168.23,0.04,0.02,N,O,1996-03-13,1996-02-12,1996-03-22,DELIVER IN PERSON,TRUCK,egular courts above the 2,2,1191,1,38.0,44694.46,0.0,0.05,N,O,1997-01-28,1997-01-14,1997-02-02,TAKE BACK RETURN,RAIL,ven requests. deposits breach a http://git-wip-us.apache.org/repos/asf/tajo/blob/1842ee19/tajo-storage/tajo-storage-pgsql/src/test/resources/results/TestPgSQLQueryTests/testCtasToHdfs.result ---------------------------------------------------------------------- diff --git a/tajo-storage/tajo-storage-pgsql/src/test/resources/results/TestPgSQLQueryTests/testCtasToHdfs.result b/tajo-storage/tajo-storage-pgsql/src/test/resources/results/TestPgSQLQueryTests/testCtasToHdfs.result index dd34c54..804338c 100644 --- a/tajo-storage/tajo-storage-pgsql/src/test/resources/results/TestPgSQLQueryTests/testCtasToHdfs.result +++ b/tajo-storage/tajo-storage-pgsql/src/test/resources/results/TestPgSQLQueryTests/testCtasToHdfs.result @@ -1,7 +1,7 @@ l_orderkey,l_partkey,l_suppkey,l_linenumber,l_quantity,l_extendedprice,l_discount,l_tax,l_returnflag,l_linestatus,l_shipdate,l_commitdate,l_receiptdate,l_shipinstruct,l_shipmode,l_comment ------------------------------- -1,1,7706,1,17.0,21168.23,0.04,0.02,N,O,1996-03-13,1996-02-12,1996-03-22,DELIVER IN PERSON,TRUCK,egular courts above the 1,1,7311,2,36.0,45983.16,0.09,0.06,N,O,1996-04-12,1996-02-28,1996-04-20,TAKE BACK RETURN,MAIL,ly final dependencies: slyly bold +1,1,7706,1,17.0,21168.23,0.04,0.02,N,O,1996-03-13,1996-02-12,1996-03-22,DELIVER IN PERSON,TRUCK,egular courts above the 2,2,1191,1,38.0,44694.46,0.0,0.05,N,O,1997-01-28,1997-01-14,1997-02-02,TAKE BACK RETURN,RAIL,ven requests. deposits breach a 3,2,1798,1,45.0,54058.05,0.06,0.0,R,F,1994-02-02,1994-01-04,1994-02-23,NONE,AIR,ongside of the furiously brave acco 3,3,6540,2,49.0,46796.47,0.1,0.0,R,F,1993-11-09,1993-12-20,1993-11-24,TAKE BACK RETURN,RAIL,unusual accounts. eve http://git-wip-us.apache.org/repos/asf/tajo/blob/1842ee19/tajo-storage/tajo-storage-pgsql/src/test/resources/results/TestPgSQLQueryTests/testFixedLengthFields.result ---------------------------------------------------------------------- diff --git a/tajo-storage/tajo-storage-pgsql/src/test/resources/results/TestPgSQLQueryTests/testFixedLengthFields.result b/tajo-storage/tajo-storage-pgsql/src/test/resources/results/TestPgSQLQueryTests/testFixedLengthFields.result index ae8384d..47085e2 100644 --- a/tajo-storage/tajo-storage-pgsql/src/test/resources/results/TestPgSQLQueryTests/testFixedLengthFields.result +++ b/tajo-storage/tajo-storage-pgsql/src/test/resources/results/TestPgSQLQueryTests/testFixedLengthFields.result @@ -1,5 +1,5 @@ l_shipinstruct,l_shipmode ------------------------------- -TAKE BACK RETURN,RAIL NONE,AIR TAKE BACK RETURN,RAIL +TAKE BACK RETURN,RAIL http://git-wip-us.apache.org/repos/asf/tajo/blob/1842ee19/tajo-storage/tajo-storage-pgsql/src/test/resources/results/TestPgSQLQueryTests/testFunctionWithinFilter.result ---------------------------------------------------------------------- diff --git a/tajo-storage/tajo-storage-pgsql/src/test/resources/results/TestPgSQLQueryTests/testFunctionWithinFilter.result b/tajo-storage/tajo-storage-pgsql/src/test/resources/results/TestPgSQLQueryTests/testFunctionWithinFilter.result index a7f7d20..2f6e7a1 100644 --- a/tajo-storage/tajo-storage-pgsql/src/test/resources/results/TestPgSQLQueryTests/testFunctionWithinFilter.result +++ b/tajo-storage/tajo-storage-pgsql/src/test/resources/results/TestPgSQLQueryTests/testFunctionWithinFilter.result @@ -1,5 +1,5 @@ l_orderkey,l_partkey,l_suppkey,l_linenumber,l_quantity,l_extendedprice,l_discount,l_tax,l_returnflag,l_linestatus,l_shipdate,l_commitdate,l_receiptdate,l_shipinstruct,l_shipmode,l_comment ------------------------------- -1,1,7706,1,17.0,21168.23,0.04,0.02,N,O,1996-03-13,1996-02-12,1996-03-22,DELIVER IN PERSON,TRUCK,egular courts above the 1,1,7311,2,36.0,45983.16,0.09,0.06,N,O,1996-04-12,1996-02-28,1996-04-20,TAKE BACK RETURN,MAIL,ly final dependencies: slyly bold +1,1,7706,1,17.0,21168.23,0.04,0.02,N,O,1996-03-13,1996-02-12,1996-03-22,DELIVER IN PERSON,TRUCK,egular courts above the 2,2,1191,1,38.0,44694.46,0.0,0.05,N,O,1997-01-28,1997-01-14,1997-02-02,TAKE BACK RETURN,RAIL,ven requests. deposits breach a http://git-wip-us.apache.org/repos/asf/tajo/blob/1842ee19/tajo-storage/tajo-storage-pgsql/src/test/resources/results/TestPgSQLQueryTests/testInPredicateWithLiterals.result ---------------------------------------------------------------------- diff --git a/tajo-storage/tajo-storage-pgsql/src/test/resources/results/TestPgSQLQueryTests/testInPredicateWithLiterals.result b/tajo-storage/tajo-storage-pgsql/src/test/resources/results/TestPgSQLQueryTests/testInPredicateWithLiterals.result index a7f7d20..2f6e7a1 100644 --- a/tajo-storage/tajo-storage-pgsql/src/test/resources/results/TestPgSQLQueryTests/testInPredicateWithLiterals.result +++ b/tajo-storage/tajo-storage-pgsql/src/test/resources/results/TestPgSQLQueryTests/testInPredicateWithLiterals.result @@ -1,5 +1,5 @@ l_orderkey,l_partkey,l_suppkey,l_linenumber,l_quantity,l_extendedprice,l_discount,l_tax,l_returnflag,l_linestatus,l_shipdate,l_commitdate,l_receiptdate,l_shipinstruct,l_shipmode,l_comment ------------------------------- -1,1,7706,1,17.0,21168.23,0.04,0.02,N,O,1996-03-13,1996-02-12,1996-03-22,DELIVER IN PERSON,TRUCK,egular courts above the 1,1,7311,2,36.0,45983.16,0.09,0.06,N,O,1996-04-12,1996-02-28,1996-04-20,TAKE BACK RETURN,MAIL,ly final dependencies: slyly bold +1,1,7706,1,17.0,21168.23,0.04,0.02,N,O,1996-03-13,1996-02-12,1996-03-22,DELIVER IN PERSON,TRUCK,egular courts above the 2,2,1191,1,38.0,44694.46,0.0,0.05,N,O,1997-01-28,1997-01-14,1997-02-02,TAKE BACK RETURN,RAIL,ven requests. deposits breach a http://git-wip-us.apache.org/repos/asf/tajo/blob/1842ee19/tajo-storage/tajo-storage-pgsql/src/test/resources/results/TestPgSQLQueryTests/testInPredicateWithNumbers.result ---------------------------------------------------------------------- diff --git a/tajo-storage/tajo-storage-pgsql/src/test/resources/results/TestPgSQLQueryTests/testInPredicateWithNumbers.result b/tajo-storage/tajo-storage-pgsql/src/test/resources/results/TestPgSQLQueryTests/testInPredicateWithNumbers.result index a7f7d20..2f6e7a1 100644 --- a/tajo-storage/tajo-storage-pgsql/src/test/resources/results/TestPgSQLQueryTests/testInPredicateWithNumbers.result +++ b/tajo-storage/tajo-storage-pgsql/src/test/resources/results/TestPgSQLQueryTests/testInPredicateWithNumbers.result @@ -1,5 +1,5 @@ l_orderkey,l_partkey,l_suppkey,l_linenumber,l_quantity,l_extendedprice,l_discount,l_tax,l_returnflag,l_linestatus,l_shipdate,l_commitdate,l_receiptdate,l_shipinstruct,l_shipmode,l_comment ------------------------------- -1,1,7706,1,17.0,21168.23,0.04,0.02,N,O,1996-03-13,1996-02-12,1996-03-22,DELIVER IN PERSON,TRUCK,egular courts above the 1,1,7311,2,36.0,45983.16,0.09,0.06,N,O,1996-04-12,1996-02-28,1996-04-20,TAKE BACK RETURN,MAIL,ly final dependencies: slyly bold +1,1,7706,1,17.0,21168.23,0.04,0.02,N,O,1996-03-13,1996-02-12,1996-03-22,DELIVER IN PERSON,TRUCK,egular courts above the 2,2,1191,1,38.0,44694.46,0.0,0.05,N,O,1997-01-28,1997-01-14,1997-02-02,TAKE BACK RETURN,RAIL,ven requests. deposits breach a http://git-wip-us.apache.org/repos/asf/tajo/blob/1842ee19/tajo-storage/tajo-storage-pgsql/src/test/resources/results/TestPgSQLQueryTests/testProjectedColumns.result ---------------------------------------------------------------------- diff --git a/tajo-storage/tajo-storage-pgsql/src/test/resources/results/TestPgSQLQueryTests/testProjectedColumns.result b/tajo-storage/tajo-storage-pgsql/src/test/resources/results/TestPgSQLQueryTests/testProjectedColumns.result index bb3f58d..e858d4c 100644 --- a/tajo-storage/tajo-storage-pgsql/src/test/resources/results/TestPgSQLQueryTests/testProjectedColumns.result +++ b/tajo-storage/tajo-storage-pgsql/src/test/resources/results/TestPgSQLQueryTests/testProjectedColumns.result @@ -1,5 +1,5 @@ l_orderkey,l_shipdate ------------------------------- 2,1997-01-28 -3,1994-02-02 3,1993-11-09 +3,1994-02-02 http://git-wip-us.apache.org/repos/asf/tajo/blob/1842ee19/tajo-storage/tajo-storage-pgsql/src/test/resources/results/TestPgSQLQueryTests/testTPCH_Q3.result ---------------------------------------------------------------------- diff --git a/tajo-storage/tajo-storage-pgsql/src/test/resources/results/TestPgSQLQueryTests/testTPCH_Q3.result b/tajo-storage/tajo-storage-pgsql/src/test/resources/results/TestPgSQLQueryTests/testTPCH_Q3.result index 2ad8a05..386b650 100644 --- a/tajo-storage/tajo-storage-pgsql/src/test/resources/results/TestPgSQLQueryTests/testTPCH_Q3.result +++ b/tajo-storage/tajo-storage-pgsql/src/test/resources/results/TestPgSQLQueryTests/testTPCH_Q3.result @@ -1,5 +1,5 @@ l_orderkey,revenue,o_orderdate,o_shippriority ------------------------------- -3,92931.39000000001,1993-10-14,0 1,62166.1764,1996-01-02,0 2,44694.46,1996-12-01,0 +3,92931.39000000001,1993-10-14,0 http://git-wip-us.apache.org/repos/asf/tajo/blob/1842ee19/tajo-storage/tajo-storage-pgsql/src/test/resources/results/TestPgSQLQueryTests/testVariableLengthFields.result ---------------------------------------------------------------------- diff --git a/tajo-storage/tajo-storage-pgsql/src/test/resources/results/TestPgSQLQueryTests/testVariableLengthFields.result b/tajo-storage/tajo-storage-pgsql/src/test/resources/results/TestPgSQLQueryTests/testVariableLengthFields.result index 531402c..b354aa9 100644 --- a/tajo-storage/tajo-storage-pgsql/src/test/resources/results/TestPgSQLQueryTests/testVariableLengthFields.result +++ b/tajo-storage/tajo-storage-pgsql/src/test/resources/results/TestPgSQLQueryTests/testVariableLengthFields.result @@ -1,5 +1,5 @@ l_comment ------------------------------- -ven requests. deposits breach a ongside of the furiously brave acco unusual accounts. eve +ven requests. deposits breach a
