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

Fix for the issue when using setMaxRows() with SHOWPLAN ON #666

Merged
merged 5 commits into from
Apr 5, 2018

Conversation

ulvii
Copy link
Contributor

@ulvii ulvii commented Mar 26, 2018

#661.

The fix is to Ignore the column metadata in connectionCommand(), because execution plan information is returned when SHOWPLAN is ON.

@ulvii
Copy link
Contributor Author

ulvii commented Mar 26, 2018

Attaching the jars that are built on top of the PR.
pr666_jars.zip

@codecov-io
Copy link

codecov-io commented Mar 27, 2018

Codecov Report

Merging #666 into dev will increase coverage by 0.06%.
The diff coverage is 25%.

Impacted file tree graph

@@             Coverage Diff              @@
##                dev     #666      +/-   ##
============================================
+ Coverage     48.05%   48.12%   +0.06%     
- Complexity     2577     2578       +1     
============================================
  Files           113      113              
  Lines         26579    26582       +3     
  Branches       4432     4433       +1     
============================================
+ Hits          12773    12793      +20     
+ Misses        11684    11661      -23     
- Partials       2122     2128       +6
Flag Coverage Δ Complexity Δ
#JDBC42 48.03% <25%> (+0.11%) 2575 <0> (+7) ⬆️
#JDBC43 47.94% <25%> (-0.01%) 2571 <0> (+1)
Impacted Files Coverage Δ Complexity Δ
...n/java/com/microsoft/sqlserver/jdbc/tdsparser.java 67.54% <25%> (-0.93%) 0 <0> (ø)
...n/java/com/microsoft/sqlserver/jdbc/Parameter.java 62.55% <0%> (-0.21%) 63% <0%> (ø)
...om/microsoft/sqlserver/jdbc/SQLServerBulkCopy.java 52.54% <0%> (-0.13%) 238% <0%> (-3%)
...rc/main/java/com/microsoft/sqlserver/jdbc/dtv.java 63.35% <0%> (-0.13%) 0% <0%> (ø)
...c/main/java/com/microsoft/sqlserver/jdbc/Util.java 61.35% <0%> (+0.43%) 89% <0%> (+1%) ⬆️
...in/java/com/microsoft/sqlserver/jdbc/IOBuffer.java 54.23% <0%> (+0.59%) 0% <0%> (ø) ⬇️
...om/microsoft/sqlserver/jdbc/SimpleInputStream.java 52.59% <0%> (+1.48%) 12% <0%> (+1%) ⬆️
...om/microsoft/sqlserver/jdbc/ReaderInputStream.java 44.94% <0%> (+2.24%) 16% <0%> (+2%) ⬆️

Continue to review full report at Codecov.

Legend - Click here to learn more
Δ = absolute <relative> (impact), ø = not affected, ? = missing data
Powered by Codecov. Last update c1aa43b...25da122. Read the comment docs.

@ulvii ulvii added this to the 6.5.1 milestone Mar 30, 2018
@peterbae peterbae added this to Under Peer Review in MSSQL JDBC Apr 3, 2018
Copy link
Contributor

@peterbae peterbae left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Looks good to me.

@ulvii ulvii merged commit 92af829 into microsoft:dev Apr 5, 2018
MSSQL JDBC automation moved this from Under Peer Review to Closed/Merged PRs Apr 5, 2018
@ulvii ulvii deleted the issue661 branch April 5, 2018 00:16
rene-ye pushed a commit to rene-ye/mssql-jdbc that referenced this pull request Apr 6, 2018
…#666)

* Dont throw exception for colmetadata token

* Adding a comment

* Update comment

* Adding a warning message

* remove ignoreLengthPrefixedToken
rene-ye added a commit that referenced this pull request Apr 6, 2018
* Added more information to error messages

To help debug an irreproducable/random mismatch error if it occurs in the future.

* Fix for the issue when using setMaxRows() with SHOWPLAN ON (#666)

* Dont throw exception for colmetadata token

* Adding a comment

* Update comment

* Adding a warning message

* remove ignoreLengthPrefixedToken

* Fix for uncaught/unhandled exception (#664)

* Added more information to error messages

To help debug an irreproducable/random mismatch error if it occurs in the future.

* Revert "Added information to error message"

This reverts commit 25301e6.

* Fix for #659

Added error handling logic for special cases.

* Read message length

Read the message length instead of reading until terminating character

* Unsigned byte update

Message length is an unsigned byte, converting before using.

* Removed clunky hex conversions

convert the byte straight to an int and use existing constants instead of making new ones

* Narrowed trigger conditions

fixed an issue where column names who had the hex token 'AA' would cause an error to be thrown.

* Spacing fixes

* Added test case

* spacing adjustment

* Edited test drop procedures

Changed IF EXISTS DROP commands to be compatible with sql server 2008

* github spacing misalignment fixes

* Changed test condition

now only runs on compatible database or higher

* Removed error check

Removed a previous implementation in favor of one that changes the TDS parser

* tdsreader change

* removing test for now

* enabled tests

* github spacing fix

* removed array import

* removed "arrays" instead of "array"

* spacing changes

* Use Socket instead of SocketChannel when multiSubnetFailover=true (#662)

* Upped SQL Server requirement to 2017

* Removing Exception Test

Implement a more generic and compatible test in the future

* Removed imports

Used in removed test
cheenamalhotra pushed a commit that referenced this pull request Apr 6, 2018
* Added more information to error messages

To help debug an irreproducable/random mismatch error if it occurs in the future.

* Fix for the issue when using setMaxRows() with SHOWPLAN ON (#666)

* Dont throw exception for colmetadata token

* Adding a comment

* Update comment

* Adding a warning message

* remove ignoreLengthPrefixedToken

* Fix for uncaught/unhandled exception (#664)

* Added more information to error messages

To help debug an irreproducable/random mismatch error if it occurs in the future.

* Revert "Added information to error message"

This reverts commit 25301e6.

* Fix for #659

Added error handling logic for special cases.

* Read message length

Read the message length instead of reading until terminating character

* Unsigned byte update

Message length is an unsigned byte, converting before using.

* Removed clunky hex conversions

convert the byte straight to an int and use existing constants instead of making new ones

* Narrowed trigger conditions

fixed an issue where column names who had the hex token 'AA' would cause an error to be thrown.

* Spacing fixes

* Added test case

* spacing adjustment

* Edited test drop procedures

Changed IF EXISTS DROP commands to be compatible with sql server 2008

* github spacing misalignment fixes

* Changed test condition

now only runs on compatible database or higher

* Removed error check

Removed a previous implementation in favor of one that changes the TDS parser

* tdsreader change

* removing test for now

* enabled tests

* github spacing fix

* removed array import

* removed "arrays" instead of "array"

* spacing changes

* Use Socket instead of SocketChannel when multiSubnetFailover=true (#662)

* Upped SQL Server requirement to 2017

* Removing Exception Test

Implement a more generic and compatible test in the future

* Removed imports

Used in removed test

* Change in preperation for 6.5.1 preview release

* Removed SNAPSHOT from POM

* Added missing link

* Update CHANGELOG.md

* Update CHANGELOG.md

* Update CHANGELOG.md

* Update CHANGELOG.md
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
MSSQL JDBC
  
Closed/Merged PRs
Development

Successfully merging this pull request may close these issues.

None yet

4 participants