Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Handle JDBC tests failure when parallel query is enforced. #2196

Merged
5 changes: 3 additions & 2 deletions test/JDBC/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -405,11 +405,12 @@ After building the modified PostgreSQL engine and Babelfish extensions using the
mvn test
```
5. If the expected output is different when run in parallel query mode and in normal mode, one can add a different expected output specially for parallel query mode in `expected/parallel_query/` folder. Additionally, one needs to add `-- parallel_query_expected` flag in the corresponding input file.
6. Cleanup all the objects, users, roles and databases created while running the tests:
6. If you want to have different SLA timeout when test runs in parallel query mode then use `-- sla_for_parallel_query_enforced` flag in the corresponding input file.
7. Cleanup all the objects, users, roles and databases created while running the tests:
```bash
./cleanup.sh
```
7. Please note that when you have completed testing with parallel query mode enabled, you should unset the `isParallelQueryMode` environment variable that was previously set to `true`. This ensures that all tests run in the normal Babelfish mode (without parallel query):
8. Please note that when you have completed testing with parallel query mode enabled, you should unset the `isParallelQueryMode` environment variable that was previously set to `true`. This ensures that all tests run in the normal Babelfish mode (without parallel query):
```bash
unset isParallelQueryMode
Expand Down
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
Loading