Clear prepared statement handle before reconnect #2364

lukasaignerrsg · 2024-03-25T11:07:14Z

This fix clears the SQLServerPreparedStatement.prepStmtHandle before reconnecting.
The provided interface can also be used for other objects that need to handle reconnecting.

One test fails: PropertyTest.testRetryCount:54->testInvalidPropertyOverBrokenConnection:46 Unexpected error message occurred!Eine bestehende Verbindung wurde softwaregesteuert
durch den Hostcomputer abgebrochen
This might be due to the system being German. The test also failed before the fix.

lukasaignerrsg · 2024-03-25T11:09:12Z

@lukasaignerrsg please read the following Contributor License Agreement(CLA). If you agree with the CLA, please reply with the following information.
@microsoft-github-policy-service agree [company="{your company}"]
Options:

(default - no company specified) I have sole ownership of intellectual property rights to my Submissions and I am not making Submissions in the course of work for my employer.
@microsoft-github-policy-service agree
(when company given) I am making Submissions in the course of work for my employer (or my employer has intellectual property rights in my Submissions by contract or applicable law). I have permission from my employer to make Submissions and enter into this Agreement on behalf of my employer. By signing below, the defined term “You” includes me and my employer.
@microsoft-github-policy-service agree company="Microsoft"
Contributor License Agreement

@microsoft-github-policy-service agree company="Raiffeisen Software GmbH"

codecov · 2024-03-25T11:25:37Z

Codecov Report

Attention: Patch coverage is 73.23944% with 19 lines in your changes are missing coverage. Please review.

Project coverage is 50.13%. Comparing base (c74a51e) to head (6d5258b).
Report is 11 commits behind head on main.

❗ Current head 6d5258b differs from pull request most recent head aee03c1. Consider uploading reports for the commit aee03c1 to get more accurate results

Files	Patch %	Lines
...a/com/microsoft/sqlserver/jdbc/SQLServerError.java	0.00%	6 Missing ⚠️
...in/java/com/microsoft/sqlserver/jdbc/IOBuffer.java	50.00%	3 Missing and 1 partial ⚠️
...oft/sqlserver/jdbc/SQLServerBulkCSVFileRecord.java	80.00%	3 Missing and 1 partial ⚠️
.../microsoft/sqlserver/jdbc/SQLServerConnection.java	86.66%	2 Missing ⚠️
...rc/main/java/com/microsoft/sqlserver/jdbc/dtv.java	33.33%	1 Missing and 1 partial ⚠️
...oft/sqlserver/jdbc/SQLServerPreparedStatement.java	87.50%	0 Missing and 1 partial ⚠️

Additional details and impacted files

@@             Coverage Diff              @@
##               main    #2364      +/-   ##
============================================
+ Coverage     50.03%   50.13%   +0.09%     
- Complexity     3804     3828      +24     
============================================
  Files           145      145              
  Lines         33304    33360      +56     
  Branches       5641     5655      +14     
============================================
+ Hits          16665    16726      +61     
+ Misses        14248    14242       -6     
- Partials       2391     2392       +1

☔ View full report in Codecov by Sentry.
📢 Have feedback on the report? Share it here.

lilgreenbird · 2024-03-26T19:35:16Z

hi @lukasaignerrsg

thank you for submitting this I have marked this for review

barryw-mssql · 2024-04-02T17:18:17Z

src/main/java/com/microsoft/sqlserver/jdbc/SQLServerPreparedStatement.java

+    private void clearPrepStmtHandle(){
+        prepStmtHandle = 0;
+        cachedPreparedStatementHandle = null;
+        if(getStatementLogger().isLoggable(Level.FINER)){


Minor formatting issue. Should have a space preceeding the initila if statement brace and after the closing brace

Suggested change

if(getStatementLogger().isLoggable(Level.FINER)){

if (getStatementLogger().isLoggable(Level.FINER)){

pls run formatter on all files

lilgreenbird · 2024-04-02T21:17:35Z

ignore failing pipelines it's an issue in our test lab

Jeffery-Wasty · 2024-04-02T21:32:33Z

src/main/java/com/microsoft/sqlserver/jdbc/SQLServerPreparedStatement.java

+    private void clearPrepStmtHandle(){
+        prepStmtHandle = 0;
+        cachedPreparedStatementHandle = null;
+        if(getStatementLogger().isLoggable(Level.FINER)){


Suggested change

if(getStatementLogger().isLoggable(Level.FINER)){

if (getStatementLogger().isLoggable(Level.FINER)){

…QLServer docker image tag to `2022-CU14-ubuntu-22.04` ### What changes were proposed in this pull request? This PR aims to upgrade `mssql-jdbc` to 12.8.0.jre11 and MySQLServer docker image to `mcr.microsoft.com/mssql/server:2022-CU14-ubuntu-22.04`. ### Why are the changes needed? This is the latest stable version of `mssql-jdbc`, related release notes: https://github.com/microsoft/mssql-jdbc/releases/tag/v12.7.0 https://github.com/microsoft/mssql-jdbc/releases/tag/v12.7.1 https://github.com/microsoft/mssql-jdbc/releases/tag/v12.8.0 Some fixed issues: - Fix to ensure metadata returned follows JDBC data type specs microsoft/mssql-jdbc#2326 - Added token cache map to fix use of unintended auth token for subsequent connections microsoft/mssql-jdbc#2341 - Clear prepared statement handle before reconnect microsoft/mssql-jdbc#2364 - Reset socketTimeout to original value after a successful connection open microsoft/mssql-jdbc#2355 - Clear prepared statement cache when resetting statement pool connection microsoft/mssql-jdbc#2361 - Fixed ClassLoader leak of ActivityCorrelator ThreadLocal microsoft/mssql-jdbc#2366 ### Does this PR introduce _any_ user-facing change? No. ### How was this patch tested? Pass GA. ### Was this patch authored or co-authored using generative AI tooling? No. Closes #47569 from wayneguow/ms_12_8. Authored-by: Wei Guo <guow93@gmail.com> Signed-off-by: Dongjoon Hyun <dhyun@apple.com>

…QLServer docker image tag to `2022-CU14-ubuntu-22.04` ### What changes were proposed in this pull request? This PR aims to upgrade `mssql-jdbc` to 12.8.0.jre11 and MySQLServer docker image to `mcr.microsoft.com/mssql/server:2022-CU14-ubuntu-22.04`. ### Why are the changes needed? This is the latest stable version of `mssql-jdbc`, related release notes: https://github.com/microsoft/mssql-jdbc/releases/tag/v12.7.0 https://github.com/microsoft/mssql-jdbc/releases/tag/v12.7.1 https://github.com/microsoft/mssql-jdbc/releases/tag/v12.8.0 Some fixed issues: - Fix to ensure metadata returned follows JDBC data type specs microsoft/mssql-jdbc#2326 - Added token cache map to fix use of unintended auth token for subsequent connections microsoft/mssql-jdbc#2341 - Clear prepared statement handle before reconnect microsoft/mssql-jdbc#2364 - Reset socketTimeout to original value after a successful connection open microsoft/mssql-jdbc#2355 - Clear prepared statement cache when resetting statement pool connection microsoft/mssql-jdbc#2361 - Fixed ClassLoader leak of ActivityCorrelator ThreadLocal microsoft/mssql-jdbc#2366 ### Does this PR introduce _any_ user-facing change? No. ### How was this patch tested? Pass GA. ### Was this patch authored or co-authored using generative AI tooling? No. Closes apache#47569 from wayneguow/ms_12_8. Authored-by: Wei Guo <guow93@gmail.com> Signed-off-by: Dongjoon Hyun <dhyun@apple.com>

lukasaignerrsg added 2 commits March 25, 2024 09:52

Merge branch 'main' into bugfix/2352

231040a

clear prepared statement handle before reconnect

a9612ce

fix verifiedMethodNames

ac38ef1

HeinzHuberRsg mentioned this pull request Mar 26, 2024

Wrong handles used in SQLServerPreparedStatement after reconnect of connection #2352

Closed

lilgreenbird requested review from Jeffery-Wasty and tkyc March 26, 2024 19:35

lilgreenbird requested a review from barryw-mssql March 26, 2024 19:36

lilgreenbird changed the title ~~Bugfix/2352~~ Clear prepared statement handle before reconnect Mar 26, 2024

lilgreenbird linked an issue Mar 26, 2024 that may be closed by this pull request

Wrong handles used in SQLServerPreparedStatement after reconnect of connection #2352

Closed

lilgreenbird added this to the 12.7.0 milestone Mar 26, 2024

tkyc previously approved these changes Apr 1, 2024

View reviewed changes

barryw-mssql reviewed Apr 2, 2024

View reviewed changes

lilgreenbird previously approved these changes Apr 2, 2024

View reviewed changes

Jeffery-Wasty requested changes Apr 2, 2024

View reviewed changes

Jeffery-Wasty previously approved these changes Apr 3, 2024

View reviewed changes

Jeffery-Wasty self-requested a review April 3, 2024 00:47

formatting

aee03c1

lukasaignerrsg dismissed stale reviews from Jeffery-Wasty, lilgreenbird, and tkyc via aee03c1 April 3, 2024 05:40

Jeffery-Wasty approved these changes Apr 3, 2024

View reviewed changes

tkyc approved these changes Apr 3, 2024

View reviewed changes

Jeffery-Wasty linked an issue Apr 3, 2024 that may be closed by this pull request

[QUESTION] "Could not find prepared statement with handle 1" - probably, it was fixed? #2362

Closed

Jeffery-Wasty mentioned this pull request Apr 3, 2024

[QUESTION] "Could not find prepared statement with handle 1" - probably, it was fixed? #2362

Closed

lilgreenbird approved these changes Apr 3, 2024

View reviewed changes

lilgreenbird merged commit 51ca5a0 into microsoft:main Apr 3, 2024
17 checks passed

Jeffery-Wasty added a commit that referenced this pull request May 17, 2024

Backport #2364

4b89dd4

Jeffery-Wasty mentioned this pull request May 17, 2024

[Backport] Clear prepared statement handle before reconnect (2364) #2422

Merged

Jeffery-Wasty added a commit that referenced this pull request May 22, 2024

Backport #2364 (#2422)

8b9afec

Eng-Fouad mentioned this pull request Aug 1, 2024

Bump Microsoft SQL Server JDBC driver to 12.8.0 quarkusio/quarkus#42261

Merged

wayneguow mentioned this pull request Aug 1, 2024

[SPARK-49080][SQL][TEST] Upgrade mssql-jdbc to 12.8.0.jre11 and MsSQLServer docker image tag to 2022-CU14-ubuntu-22.04 apache/spark#47569

Closed

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Clear prepared statement handle before reconnect #2364

Clear prepared statement handle before reconnect #2364

lukasaignerrsg commented Mar 25, 2024

lukasaignerrsg commented Mar 25, 2024

codecov bot commented Mar 25, 2024 •

edited

Loading

lilgreenbird commented Mar 26, 2024

barryw-mssql Apr 2, 2024

Jeffery-Wasty Apr 2, 2024

lilgreenbird Apr 2, 2024

lilgreenbird commented Apr 2, 2024

Jeffery-Wasty Apr 2, 2024

	if(getStatementLogger().isLoggable(Level.FINER)){
	if (getStatementLogger().isLoggable(Level.FINER)){

Clear prepared statement handle before reconnect #2364

Clear prepared statement handle before reconnect #2364

Conversation

lukasaignerrsg commented Mar 25, 2024

lukasaignerrsg commented Mar 25, 2024

codecov bot commented Mar 25, 2024 • edited Loading

Codecov Report

lilgreenbird commented Mar 26, 2024

barryw-mssql Apr 2, 2024

Choose a reason for hiding this comment

Jeffery-Wasty Apr 2, 2024

Choose a reason for hiding this comment

lilgreenbird Apr 2, 2024

Choose a reason for hiding this comment

lilgreenbird commented Apr 2, 2024

Jeffery-Wasty Apr 2, 2024

Choose a reason for hiding this comment

codecov bot commented Mar 25, 2024 •

edited

Loading