Skip to content

Commit

Permalink
Handle JDBC tests failure when parallel query is enforced. (#2196)
Browse files Browse the repository at this point in the history
This PR handles the new failures JDBC test cases in parallel query in PG16. Majorly this commit does three things.

1. Expected output files of some tests got changed because of some tests input file got changed.
    1.1 pgr_select_distinct - input file got changed in pg16
    1.2 TestSQLQueries and BABEL-328-vu-verify - order of output rows got changed in pg16.
2. Some tests are hanging indefinitely in PG16. These tests are blocked from running and created a jira for these issues.
3. It adds flexibility to provide different SLA time for parallel query testing. User can now use flag
    sla_for_parallel_query_enforced to specify different SLA time to be considered when tests file runs with parallel
    query enforced.

Co-authored-by: Dipesh Dhameliya <[email protected]>
Signed-off-by: Sandeep Kumawat <[email protected]>
  • Loading branch information
skumawat2025 and Dipesh Dhameliya authored Jan 9, 2024
1 parent 91fc063 commit 33c6815
Show file tree
Hide file tree
Showing 8 changed files with 47 additions and 1,088 deletions.
16 changes: 8 additions & 8 deletions test/JDBC/expected/BABEL-328-vu-verify.out
Original file line number Diff line number Diff line change
Expand Up @@ -20,29 +20,29 @@ Sales
~~END~~


SELECT * FROM babel_328_vu_v3
SELECT * FROM babel_328_vu_v3 ORDER BY NAME
GO
~~START~~
varchar
Engineering
Administration
Sales
Sales
Engineering
Finance
Marketing
Sales
Sales
~~END~~


SELECT * FROM babel_328_vu_v4
SELECT * FROM babel_328_vu_v4 ORDER BY NAME
GO
~~START~~
varchar
Engineering
Administration
Sales
Sales
Engineering
Finance
Marketing
Sales
Sales
~~END~~


Expand Down
20 changes: 10 additions & 10 deletions test/JDBC/expected/TestSQLQueries.out
Original file line number Diff line number Diff line change
Expand Up @@ -593,35 +593,37 @@ int#!#int#!#text#!#int#!#int


#18 INNER JOIN
SELECT temp1.i, temp1.j, temp1.t, temp2.k FROM temp1 INNER JOIN temp2 ON temp1.i=temp2.i;
SELECT temp1.i, temp1.j, temp1.t, temp2.k FROM temp1 INNER JOIN temp2 ON temp1.i=temp2.i ORDER BY temp1.i;
~~START~~
int#!#int#!#text#!#int
0#!#<NULL>#!#zero#!#<NULL>
1#!#4#!#one#!#-1
2#!#3#!#two#!#2
2#!#3#!#two#!#4
2#!#3#!#two#!#2
3#!#2#!#three#!#-3
5#!#0#!#five#!#-5
5#!#0#!#five#!#-5
~~END~~

SELECT temp1.i, temp1.j, temp1.t, temp2.k FROM temp1 JOIN temp2 ON temp1.i=temp2.i;
SELECT temp1.i, temp1.j, temp1.t, temp2.k FROM temp1 JOIN temp2 ON temp1.i=temp2.i ORDER BY temp1.i;
~~START~~
int#!#int#!#text#!#int
0#!#<NULL>#!#zero#!#<NULL>
1#!#4#!#one#!#-1
2#!#3#!#two#!#2
2#!#3#!#two#!#4
2#!#3#!#two#!#2
3#!#2#!#three#!#-3
5#!#0#!#five#!#-5
5#!#0#!#five#!#-5
~~END~~


#19 LEFT JOIN
SELECT * FROM temp1 LEFT OUTER JOIN temp2 ON temp1.i=temp2.k;
SELECT * FROM temp1 LEFT OUTER JOIN temp2 ON temp1.i=temp2.k ORDER BY temp1.i;
~~START~~
int#!#int#!#text#!#int#!#int
<NULL>#!#0#!#zero#!#<NULL>#!#<NULL>
<NULL>#!#<NULL>#!#<NULL>#!#<NULL>#!#<NULL>
0#!#<NULL>#!#zero#!#<NULL>#!#0
1#!#4#!#one#!#<NULL>#!#<NULL>
2#!#3#!#two#!#2#!#2
Expand All @@ -631,24 +633,22 @@ int#!#int#!#text#!#int#!#int
6#!#6#!#six#!#<NULL>#!#<NULL>
7#!#7#!#seven#!#<NULL>#!#<NULL>
8#!#8#!#eight#!#<NULL>#!#<NULL>
<NULL>#!#<NULL>#!#<NULL>#!#<NULL>#!#<NULL>
<NULL>#!#0#!#zero#!#<NULL>#!#<NULL>
~~END~~


#20 RIGHT JOIN
SELECT * FROM temp1 RIGHT OUTER JOIN temp2 ON temp1.i=temp2.i;
SELECT * FROM temp1 RIGHT OUTER JOIN temp2 ON temp1.i=temp2.i ORDER BY temp1.i, temp2.k;
~~START~~
int#!#int#!#text#!#int#!#int
<NULL>#!#<NULL>#!#<NULL>#!#<NULL>#!#<NULL>
<NULL>#!#<NULL>#!#<NULL>#!#<NULL>#!#0
0#!#<NULL>#!#zero#!#0#!#<NULL>
1#!#4#!#one#!#1#!#-1
2#!#3#!#two#!#2#!#2
2#!#3#!#two#!#2#!#4
3#!#2#!#three#!#3#!#-3
5#!#0#!#five#!#5#!#-5
5#!#0#!#five#!#5#!#-5
<NULL>#!#<NULL>#!#<NULL>#!#<NULL>#!#<NULL>
<NULL>#!#<NULL>#!#<NULL>#!#<NULL>#!#0
~~END~~


Expand Down
176 changes: 0 additions & 176 deletions test/JDBC/expected/parallel_query/BABEL-328-vu-verify.out

This file was deleted.

Loading

0 comments on commit 33c6815

Please sign in to comment.