Version based connection reset using queries (babelfish-for-postgresq…

…l#3423) Resetting connection after each test instead of closing for versions > 16.6. Also disabling pg_hint for tests that left it open, as the enabled pg_hint setting leaks into other tests when resetting connections. We can expect 5-6 mins of improvements for version upgrade tests with base > 16.6 and dump-restore tests. For other version upgrade tests these improvements are around 2-3 mins. Key changes: Implemented connection reset for SQL servers (versions > 16.6) post-test. Replaced redundant 'isUpgradeTestMode' config variable with 'allowConnectionReset'. Eliminated dependency on GitHub Actions workflows to ensure consistent test behavior across environments. Optimized test execution to reduce overall completion time. Task: BABEL-5630 Signed-off-by: Siddharth Sengar [email protected]
amazon-aurora · Feb 17, 2025 · 9e5dd9b · 9e5dd9b
1 parent 061730b
commit 9e5dd9b
Show file tree

Hide file tree

Showing 33 changed files with 278 additions and 24 deletions.
diff --git a/.github/composite-actions/minor-version-upgrade-util/action.yml b/.github/composite-actions/minor-version-upgrade-util/action.yml
@@ -85,7 +85,6 @@ runs:
         tar_dir: ${{ matrix.upgrade-path.last_version }}
       run: |
         cd test/JDBC/
-        export isUpgradeTestMode=true
         if [[ ${{ inputs.server_collation_name }} != "default" ]]; then
           export serverCollationName=${{ inputs.server_collation_name }}
         fi

diff --git a/.github/composite-actions/run-verify-tests/action.yml b/.github/composite-actions/run-verify-tests/action.yml
@@ -41,7 +41,6 @@ runs:
         touch dummy_schedule
         echo "all" > dummy_schedule
         export scheduleFile=dummy_schedule
-        export isUpgradeTestMode=true
         if [[ ${{ inputs.server_collation_name }} != "default" ]]; then
           export serverCollationName=${{ inputs.server_collation_name }}
         fi

diff --git a/.github/composite-actions/setup-base-version/action.yml b/.github/composite-actions/setup-base-version/action.yml
@@ -186,7 +186,6 @@ runs:
           export serverCollationName=${{ inputs.server_collation_name }}
         fi
         if [[ "$migr_mode" == "multi-db" ]];then
-          export isUpgradeTestMode=true
           base_dir=${{ matrix.upgrade-path.path[0] }}
           if [[ "$base_dir" == *"latest"* || ${{ inputs.dump_restore }} == 'true' ]]; then
             base_dir="latest"
@@ -210,7 +209,6 @@ runs:
             exit 1
           fi
         done
-        export isUpgradeTestMode=true
         export inputFilesPath=input
         for filename in $(grep -v "^ignore.*\|^#.*\|^cmd.*\|^all.*\|^$" upgrade/$base_dir/schedule); do
           sed -i "s/\b$filename[ ]*\b$/$filename-vu-prepare/g" upgrade/$base_dir/schedule

diff --git a/test/JDBC/expected/BABEL-3291.out b/test/JDBC/expected/BABEL-3291.out
@@ -68,5 +68,13 @@ set babelfish_showplan_all off
 go
 
 -- cleanup
+select set_config('babelfishpg_tsql.enable_pg_hint', 'off', false);
+go
+~~START~~
+text
+off
+~~END~~
+
+
 drop table babel_3291_t1
 go
diff --git a/test/JDBC/expected/BABEL-3292.out b/test/JDBC/expected/BABEL-3292.out
@@ -1146,6 +1146,14 @@ set babelfish_showplan_all off
 go
 
 -- cleanup
+select set_config('babelfishpg_tsql.enable_pg_hint', 'off', false);
+go
+~~START~~
+text
+off
+~~END~~
+
+
 drop table babel_3292_schema.t1 
 go
 

diff --git a/test/JDBC/expected/BABEL-3293.out b/test/JDBC/expected/BABEL-3293.out
@@ -1227,6 +1227,14 @@ set babelfish_showplan_all off
 go
 
 -- cleanup
+select set_config('babelfishpg_tsql.enable_pg_hint', 'off', false);
+go
+~~START~~
+text
+off
+~~END~~
+
+
 drop table babel_3293_schema.t1 
 go
 

diff --git a/test/JDBC/expected/BABEL-3294.out b/test/JDBC/expected/BABEL-3294.out
@@ -188,5 +188,13 @@ set babelfish_showplan_all off
 go
 
 -- cleanup
+select set_config('babelfishpg_tsql.enable_pg_hint', 'off', false);
+go
+~~START~~
+text
+off
+~~END~~
+
+
 drop table babel_3294_t1
 go
diff --git a/test/JDBC/expected/BABEL-3295.out b/test/JDBC/expected/BABEL-3295.out
@@ -185,6 +185,14 @@ set babelfish_showplan_all off
 go
 
 -- cleanup
+select set_config('babelfishpg_tsql.enable_pg_hint', 'off', false);
+go
+~~START~~
+text
+off
+~~END~~
+
+
 drop table babel_3295_t1
 go
 

diff --git a/test/JDBC/expected/BABEL-3512.out b/test/JDBC/expected/BABEL-3512.out
@@ -900,6 +900,20 @@ Babelfish T-SQL Batch Parsing Time: 0.084 ms
 
 
 -- clean up 
+select set_config('babelfishpg_tsql.enable_pg_hint', 'off', false);
+go
+~~START~~
+text
+Query Text: select set_config('babelfishpg_tsql.enable_pg_hint', 'off', false)
+Result
+~~END~~
+
+~~START~~
+text
+Babelfish T-SQL Batch Parsing Time: 0.117 ms
+~~END~~
+
+
 SET babelfish_showplan_all OFF
 GO
 

diff --git a/test/JDBC/expected/BABEL-3513-vu-prepare.out b/test/JDBC/expected/BABEL-3513-vu-prepare.out
@@ -101,3 +101,9 @@ go
 
 exec sp_babelfish_configure 'enable_pg_hint', 'on', 'server'
 go
+
+exec sp_babelfish_configure 'enable_pg_hint', 'off', 'server'
+go
+
+exec sp_babelfish_configure 'enable_pg_hint', 'off'
+go
diff --git a/test/JDBC/expected/BABEL-3513_before_15_8_or_16_4-vu-prepare.out b/test/JDBC/expected/BABEL-3513_before_15_8_or_16_4-vu-prepare.out
@@ -86,3 +86,9 @@ go
 
 exec sp_babelfish_configure 'enable_pg_hint', 'on', 'server'
 go
+
+exec sp_babelfish_configure 'enable_pg_hint', 'off', 'server'
+go
+
+exec sp_babelfish_configure 'enable_pg_hint', 'off'
+go
diff --git a/test/JDBC/expected/BABEL-3592.out b/test/JDBC/expected/BABEL-3592.out
@@ -445,6 +445,20 @@ Babelfish T-SQL Batch Parsing Time: 0.080 ms
 
 
 -- clean up
+select set_config('babelfishpg_tsql.enable_pg_hint', 'off', false);
+go
+~~START~~
+text
+Query Text: select set_config('babelfishpg_tsql.enable_pg_hint', 'off', false)
+Result
+~~END~~
+
+~~START~~
+text
+Babelfish T-SQL Batch Parsing Time: 0.121 ms
+~~END~~
+
+
 set babelfish_showplan_all off
 go
 

diff --git a/test/JDBC/expected/parallel_query/BABEL-3291.out b/test/JDBC/expected/parallel_query/BABEL-3291.out
@@ -73,5 +73,13 @@ set babelfish_showplan_all off
 go
 
 -- cleanup
+select set_config('babelfishpg_tsql.enable_pg_hint', 'off', false);
+go
+~~START~~
+text
+off
+~~END~~
+
+
 drop table babel_3291_t1
 go
diff --git a/test/JDBC/expected/parallel_query/BABEL-3292.out b/test/JDBC/expected/parallel_query/BABEL-3292.out
@@ -1278,6 +1278,14 @@ set babelfish_showplan_all off
 go
 
 -- cleanup
+select set_config('babelfishpg_tsql.enable_pg_hint', 'off', false);
+go
+~~START~~
+text
+off
+~~END~~
+
+
 drop table babel_3292_schema.t1 
 go
 

diff --git a/test/JDBC/expected/parallel_query/BABEL-3293.out b/test/JDBC/expected/parallel_query/BABEL-3293.out
@@ -1334,6 +1334,14 @@ set babelfish_showplan_all off
 go
 
 -- cleanup
+select set_config('babelfishpg_tsql.enable_pg_hint', 'off', false);
+go
+~~START~~
+text
+off
+~~END~~
+
+
 drop table babel_3293_schema.t1 
 go
 

diff --git a/test/JDBC/expected/parallel_query/BABEL-3294.out b/test/JDBC/expected/parallel_query/BABEL-3294.out
@@ -188,5 +188,13 @@ set babelfish_showplan_all off
 go
 
 -- cleanup
+select set_config('babelfishpg_tsql.enable_pg_hint', 'off', false);
+go
+~~START~~
+text
+off
+~~END~~
+
+
 drop table babel_3294_t1
 go
diff --git a/test/JDBC/expected/parallel_query/BABEL-3295.out b/test/JDBC/expected/parallel_query/BABEL-3295.out
@@ -205,6 +205,14 @@ set babelfish_showplan_all off
 go
 
 -- cleanup
+select set_config('babelfishpg_tsql.enable_pg_hint', 'off', false);
+go
+~~START~~
+text
+off
+~~END~~
+
+
 drop table babel_3295_t1
 go
 

diff --git a/test/JDBC/expected/parallel_query/BABEL-3512.out b/test/JDBC/expected/parallel_query/BABEL-3512.out
@@ -992,6 +992,20 @@ Babelfish T-SQL Batch Parsing Time: 0.071 ms
 
 
 -- clean up 
+select set_config('babelfishpg_tsql.enable_pg_hint', 'off', false);
+go
+~~START~~
+text
+Query Text: select set_config('babelfishpg_tsql.enable_pg_hint', 'off', false)
+Result
+~~END~~
+
+~~START~~
+text
+Babelfish T-SQL Batch Parsing Time: 0.193 ms
+~~END~~
+
+
 SET babelfish_showplan_all OFF
 GO
 

diff --git a/test/JDBC/expected/parallel_query/BABEL-3513-vu-prepare.out b/test/JDBC/expected/parallel_query/BABEL-3513-vu-prepare.out
@@ -110,3 +110,9 @@ go
 
 exec sp_babelfish_configure 'enable_pg_hint', 'on', 'server'
 go
+
+exec sp_babelfish_configure 'enable_pg_hint', 'off', 'server'
+go
+
+exec sp_babelfish_configure 'enable_pg_hint', 'off'
+go
diff --git a/test/JDBC/expected/parallel_query/BABEL-3592.out b/test/JDBC/expected/parallel_query/BABEL-3592.out
@@ -452,6 +452,20 @@ Babelfish T-SQL Batch Parsing Time: 0.078 ms
 
 
 -- clean up
+select set_config('babelfishpg_tsql.enable_pg_hint', 'off', false);
+go
+~~START~~
+text
+Query Text: select set_config('babelfishpg_tsql.enable_pg_hint', 'off', false)
+Result
+~~END~~
+
+~~START~~
+text
+Babelfish T-SQL Batch Parsing Time: 0.193 ms
+~~END~~
+
+
 set babelfish_showplan_all off
 go
 

diff --git a/test/JDBC/input/pg_hint_plan/BABEL-3291.mix b/test/JDBC/input/pg_hint_plan/BABEL-3291.mix
@@ -35,5 +35,8 @@ set babelfish_showplan_all off
 go
 
 -- cleanup
-drop table babel_3291_t1
+select set_config('babelfishpg_tsql.enable_pg_hint', 'off', false);
 go
+
+drop table babel_3291_t1
+go
diff --git a/test/JDBC/input/pg_hint_plan/BABEL-3292.mix b/test/JDBC/input/pg_hint_plan/BABEL-3292.mix
@@ -276,6 +276,9 @@ set babelfish_showplan_all off
 go
 
 -- cleanup
+select set_config('babelfishpg_tsql.enable_pg_hint', 'off', false);
+go
+
 drop table babel_3292_schema.t1 
 go
 

diff --git a/test/JDBC/input/pg_hint_plan/BABEL-3293.mix b/test/JDBC/input/pg_hint_plan/BABEL-3293.mix
@@ -251,6 +251,9 @@ set babelfish_showplan_all off
 go
 
 -- cleanup
+select set_config('babelfishpg_tsql.enable_pg_hint', 'off', false);
+go
+
 drop table babel_3293_schema.t1 
 go
 
@@ -261,4 +264,4 @@ drop table babel_3293_t3
 go
 
 drop schema babel_3293_schema
-go
+go
diff --git a/test/JDBC/input/pg_hint_plan/BABEL-3294.mix b/test/JDBC/input/pg_hint_plan/BABEL-3294.mix
@@ -66,5 +66,8 @@ set babelfish_showplan_all off
 go
 
 -- cleanup
+select set_config('babelfishpg_tsql.enable_pg_hint', 'off', false);
+go
+
 drop table babel_3294_t1
 go
diff --git a/test/JDBC/input/pg_hint_plan/BABEL-3295.mix b/test/JDBC/input/pg_hint_plan/BABEL-3295.mix
@@ -66,6 +66,9 @@ set babelfish_showplan_all off
 go
 
 -- cleanup
+select set_config('babelfishpg_tsql.enable_pg_hint', 'off', false);
+go
+
 drop table babel_3295_t1
 go
 

diff --git a/test/JDBC/input/pg_hint_plan/BABEL-3512.mix b/test/JDBC/input/pg_hint_plan/BABEL-3512.mix
@@ -361,6 +361,9 @@ EXEC babel_3512_comment_test_2
 GO
 
 -- clean up 
+select set_config('babelfishpg_tsql.enable_pg_hint', 'off', false);
+go
+
 SET babelfish_showplan_all OFF
 GO
 

diff --git a/test/JDBC/input/pg_hint_plan/BABEL-3513-vu-prepare.mix b/test/JDBC/input/pg_hint_plan/BABEL-3513-vu-prepare.mix
@@ -49,3 +49,9 @@ go
 
 exec sp_babelfish_configure 'enable_pg_hint', 'on', 'server'
 go
+
+exec sp_babelfish_configure 'enable_pg_hint', 'off', 'server'
+go
+
+exec sp_babelfish_configure 'enable_pg_hint', 'off'
+go
diff --git a/test/JDBC/input/pg_hint_plan/BABEL-3513_before_15_8_or_16_4-vu-prepare.mix b/test/JDBC/input/pg_hint_plan/BABEL-3513_before_15_8_or_16_4-vu-prepare.mix
@@ -49,3 +49,9 @@ go
 
 exec sp_babelfish_configure 'enable_pg_hint', 'on', 'server'
 go
+
+exec sp_babelfish_configure 'enable_pg_hint', 'off', 'server'
+go
+
+exec sp_babelfish_configure 'enable_pg_hint', 'off'
+go
diff --git a/test/JDBC/input/pg_hint_plan/BABEL-3592.mix b/test/JDBC/input/pg_hint_plan/BABEL-3592.mix
@@ -182,6 +182,9 @@ EXEC babel_3592_proc_mixed_statements
 GO
 
 -- clean up
+select set_config('babelfishpg_tsql.enable_pg_hint', 'off', false);
+go
+
 set babelfish_showplan_all off
 go
-Original file line number
+Diff line change
@@ Expand Up / @@ -1146,6 +1146,14 @@ set babelfish_showplan_all off @@
     go
     -- cleanup
+    select set_config('babelfishpg_tsql.enable_pg_hint', 'off', false);
+    go
+    ~~START~~
+    text
+    off
+    ~~END~~
     drop table babel_3292_schema.t1
     go
@@ Expand Down @@