Improvements in Database Metadata to prevent Statement leaks and enhance Statement caching#806
Merged
cheenamalhotra merged 9 commits intomicrosoft:devfrom Oct 27, 2018
Conversation
Codecov Report
@@ Coverage Diff @@
## dev #806 +/- ##
============================================
- Coverage 48.58% 48.57% -0.01%
+ Complexity 2794 2791 -3
============================================
Files 116 116
Lines 27879 27890 +11
Branches 4651 4652 +1
============================================
+ Hits 13545 13548 +3
- Misses 12124 12141 +17
+ Partials 2210 2201 -9
Continue to review full report at Codecov.
|
Member
Author
|
Jars for testing : mssql-jdbc-PR806.zip |
peterbae
reviewed
Oct 22, 2018
peterbae
reviewed
Oct 22, 2018
ulvii
reviewed
Oct 25, 2018
| SQLServerResultSet rsMoreMetaData = (!connection | ||
| .getServerSupportsColumnEncryption() ? statementMoreMetadata | ||
| .executeQueryInternal("select collation_name from sys.columns where " | ||
| + "object_id=OBJECT_ID('" + Util.escapeSingleQuotes(destinationTableName) + "') " |
Contributor
There was a problem hiding this comment.
This is less readable to me. Maybe you could only "if else" the query string?
Member
Author
There was a problem hiding this comment.
Then we can't place it in try with resources block. Also will need another try block, and finally block to manually close it.
I don't see any issues - its a simple ternary operator.
Contributor
There was a problem hiding this comment.
Suggested change
| + "object_id=OBJECT_ID('" + Util.escapeSingleQuotes(destinationTableName) + "') " | |
| /** | |
| * Returns the column metadata for the destination table (and saves it for later) | |
| */ | |
| private void getDestinationMetadata() throws SQLServerException { | |
| if (null == destinationTableName) { | |
| SQLServerException.makeFromDriverError(null, null, | |
| SQLServerException.getErrString("R_invalidDestinationTable"), null, false); | |
| } | |
| SQLServerResultSet rs = null; | |
| SQLServerStatement stmt = null; | |
| String metaDataQuery = null; | |
| String bulkCopyEncrytionType = null; | |
| String escapedTableName = Util.escapeSingleQuotes(destinationTableName); | |
| try { | |
| if (null != destinationTableMetadata) { | |
| rs = (SQLServerResultSet) destinationTableMetadata; | |
| } else { | |
| stmt = (SQLServerStatement) connection.createStatement(ResultSet.TYPE_FORWARD_ONLY, | |
| ResultSet.CONCUR_READ_ONLY, connection.getHoldability(), stmtColumnEncriptionSetting); | |
| // Get destination metadata | |
| rs = stmt.executeQueryInternal( | |
| "sp_executesql N'SET FMTONLY ON SELECT * FROM " + escapedTableName + " '"); | |
| } | |
| destColumnCount = rs.getMetaData().getColumnCount(); | |
| destColumnMetadata = new HashMap<>(); | |
| destCekTable = rs.getCekTable(); | |
| if (connection.getServerSupportsColumnEncryption()) { | |
| metaDataQuery = "select collation_name, encryption_type from sys.columns where " | |
| + "object_id=OBJECT_ID('" + escapedTableName + "') " + "order by column_id ASC"; | |
| } else { | |
| metaDataQuery = "select collation_name from sys.columns where " + "object_id=OBJECT_ID('" | |
| + escapedTableName + "') " + "order by column_id ASC"; | |
| } | |
| try (SQLServerStatement statementMoreMetadata = (SQLServerStatement) connection.createStatement(); | |
| SQLServerResultSet rsMoreMetaData = statementMoreMetadata.executeQueryInternal(metaDataQuery)) { | |
| for (int i = 1; i <= destColumnCount; ++i) { | |
| if (rsMoreMetaData.next()) { | |
| if (connection.getServerSupportsColumnEncryption()) { | |
| bulkCopyEncrytionType = rsMoreMetaData.getString("encryption_type"); | |
| } | |
| destColumnMetadata.put(i, new BulkColumnMetaData(rs.getColumn(i), bulkCopyEncrytionType, null)); | |
| } else { | |
| destColumnMetadata.put(i, new BulkColumnMetaData(rs.getColumn(i))); | |
| } | |
| } | |
| } | |
| } catch (SQLException e) { | |
| // Unable to retrieve metadata for destination | |
| throw new SQLServerException(SQLServerException.getErrString("R_unableRetrieveColMeta"), e); | |
| } finally { | |
| if (null != rs) | |
| rs.close(); | |
| if (null != stmt) | |
| stmt.close(); | |
| } | |
| } |
Contributor
There was a problem hiding this comment.
Please consider the suggestion above.
peterbae
approved these changes
Oct 26, 2018
rene-ye
approved these changes
Oct 26, 2018
lilgreenbird
approved these changes
Oct 26, 2018
ulvii
approved these changes
Oct 27, 2018
cheenamalhotra
changed the title
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
6 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
This PR introduces below changes to SQLServerDatabaseMetadata: