Merge pull request #19 from Microsoft/dev

pull 6.4.0

Author: rene-ye

CHANGELOG.md

@@ -3,6 +3,22 @@ All notable changes to this project will be documented in this file.
 
 The format is based on [Keep a Changelog](http://keepachangelog.com/) 
 
+## [6.4.0] Stable Release
+### Added
+- Support added for AAD Integrated Authentication with ADAL4J on Windows/Linux/Mac OS [#603](https://github.com/Microsoft/mssql-jdbc/pull/603) 
+- Enable Recover after MSDTC is restarted [#581](https://github.com/Microsoft/mssql-jdbc/pull/581)
+- Added  Version Update configuration rules to project [#541](https://github.com/Microsoft/mssql-jdbc/pull/541)
+- JDK 9 Compatibility + JDBC 4.3 API support added to the driver [#601 (https://github.com/Microsoft/mssql-jdbc/pull/601)
+
+### Fixed Issues
+- Re-introduced Retry Logic for Prepared Statement Caching implementation and remove detect change context function [#618](https://github.com/Microsoft/mssql-jdbc/pull/618) and [#620](https://github.com/Microsoft/mssql-jdbc/pull/620)
+- Fixes for SonarQube Reported issues [#599](https://github.com/Microsoft/mssql-jdbc/pull/599)
+- Fixes for Random Assertion Errors [#597](https://github.com/Microsoft/mssql-jdbc/pull/597)
+
+### Changed
+- Updated Appveyor to use JDK9 building driver and running tests [#619](https://github.com/Microsoft/mssql-jdbc/pull/619)
+- JDK 7 compilation support removed from the driver [#601](https://github.com/Microsoft/mssql-jdbc/pull/601)
+
 ## [6.3.6] Preview Release
 ### Added
 - Added support for using database name as part of the key for handle cache [#561](https://github.com/Microsoft/mssql-jdbc/pull/561)

README.md

@@ -80,7 +80,7 @@ We're now on the Maven Central Repository. Add the following to your POM file to
 <dependency>
 	<groupId>com.microsoft.sqlserver</groupId>
 	<artifactId>mssql-jdbc</artifactId>
-	<version>6.2.2.jre8</version>
+	<version>6.4.0.jre9</version>
 </dependency>
 ```
 The driver can be downloaded from the [Microsoft Download Center](https://go.microsoft.com/fwlink/?linkid=852460).
@@ -120,14 +120,14 @@ Projects that require either of the two features need to explicitly declare the
 <dependency>
 	<groupId>com.microsoft.sqlserver</groupId>
 	<artifactId>mssql-jdbc</artifactId>
-	<version>6.3.6.jre8-preview</version>
+	<version>6.4.0.jre9</version>
 	<scope>compile</scope>
 </dependency>
 
 <dependency>
 	<groupId>com.microsoft.azure</groupId>
 	<artifactId>adal4j</artifactId>
-	<version>1.3.0</version>
+	<version>1.4.0</version>
 </dependency>
 ```
 
@@ -136,14 +136,14 @@ Projects that require either of the two features need to explicitly declare the
 <dependency>
 	<groupId>com.microsoft.sqlserver</groupId>
 	<artifactId>mssql-jdbc</artifactId>
-	<version>6.3.6.jre8-preview</version>
+	<version>6.4.0.jre9</version>
 	<scope>compile</scope>
 </dependency>
 
 <dependency>
 	<groupId>com.microsoft.azure</groupId>
 	<artifactId>adal4j</artifactId>
-	<version>1.3.0</version>
+	<version>1.4.0</version>
 </dependency>
 
 <dependency>
@@ -160,7 +160,7 @@ We love contributions from the community.  To help improve the quality of our co
 Thank you!
 
 ## Guidelines for Reporting Issues
-We appreciate you taking the time to test the driver, provide feedback and report any issues.  It would be extremely helpful if you:
+We appreciate you taking the time to test the driver, provide feedback and report any issues. It would be extremely helpful if you:
 
 - Report each issue as a new issue (but check first if it's already been reported)
 - Try to be detailed in your report. Useful information for good bug reports include:

appveyor.yml

@@ -4,7 +4,7 @@ init:
   - cmd: net start MSSQL$%SQL_Instance%
 
 environment:
-  JAVA_HOME: C:\Program Files\Java\jdk1.8.0
+  JAVA_HOME: C:\Program Files\Java\jdk9
   mssql_jdbc_test_connection_properties: jdbc:sqlserver://localhost:1433;instanceName=%SQL_Instance%;databaseName=master;username=sa;password=Password12!;
 
   matrix:
@@ -32,9 +32,9 @@ build_script:
   - keytool -importkeystore -srckeystore cert.pfx -srcstoretype pkcs12 -destkeystore clientcert.jks -deststoretype JKS -srcstorepass password -deststorepass password   
   - keytool -list -v -keystore clientcert.jks -storepass "password" > JavaKeyStore.txt
   - cd..
- # - mvn install -DskipTests=true -Dmaven.javadoc.skip=true -B -V -Pbuild41
- # - mvn install -DskipTests=true -Dmaven.javadoc.skip=true -B -V -Pbuild42
+  - mvn install -DskipTests=true -Dmaven.javadoc.skip=true -B -V -Pbuild43
+  - mvn install -DskipTests=true -Dmaven.javadoc.skip=true -B -V -Pbuild42
 
-#test_script:
-#  - mvn test -B -Pbuild41
-#  - mvn test -B -Pbuild42
+test_script:
+  - mvn test -B -Pbuild43
+  - mvn test -B -Pbuild42

pom.xml

@@ -5,7 +5,7 @@
 
 	<groupId>com.microsoft.sqlserver</groupId>
 	<artifactId>mssql-jdbc</artifactId>
-	<version>6.4.0-SNAPSHOT.${jreVersion}</version>
+	<version>6.4.0.${jreVersion}</version>
 	<packaging>jar</packaging>
 
 	<name>Microsoft JDBC Driver for SQL Server</name>

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

@@ -10,7 +10,7 @@
 
 final class SQLJdbcVersion {
     static final int major = 6;
-    static final int minor = 3;
-    static final int patch = 6;
+    static final int minor = 4;
+    static final int patch = 0;
     static final int build = 0;
 }

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

@@ -83,8 +83,6 @@
 
 // Note all the public functions in this class also need to be defined in SQLServerConnectionPoolProxy.
 public class SQLServerConnection implements ISQLServerConnection {
-    boolean contextIsAlreadyChanged = false;
-    boolean contextChanged = false;
 
     long timerExpire;
     boolean attemptRefreshTokenLocked = false;
@@ -276,15 +274,20 @@ static ParsedSQLCacheItem  parseAndCacheSQL(Sha1HashKey key, String sql) throws
         return cacheItem;
     }
 
+    /** Default size for prepared statement caches */
+    static final int DEFAULT_STATEMENT_POOLING_CACHE_SIZE = 0; 
+    
     /** Size of the  prepared statement handle cache */
-    private int statementPoolingCacheSize = 10;
+    private int statementPoolingCacheSize = DEFAULT_STATEMENT_POOLING_CACHE_SIZE;
 
-    /** Default size for prepared statement caches */
-    static final int DEFAULT_STATEMENT_POOLING_CACHE_SIZE = 10; 
     /** Cache of prepared statement handles */
     private ConcurrentLinkedHashMap<Sha1HashKey, PreparedStatementHandle> preparedStatementHandleCache;
     /** Cache of prepared statement parameter metadata */
     private ConcurrentLinkedHashMap<Sha1HashKey, SQLServerParameterMetaData> parameterMetadataCache;
+    /**
+     * Checks whether statement pooling is enabled or disabled. The default is set to true;
+     */
+    private boolean disableStatementPooling = true;
 
      /**
       * Find statement parameters.
@@ -925,17 +928,10 @@ final boolean attachConnId() {
             connectionlogger.severe(message);
             throw new UnsupportedOperationException(message);
         }
-
+        
         // Caching turned on?
-        if (0 < this.getStatementPoolingCacheSize()) {
-            preparedStatementHandleCache = new Builder<Sha1HashKey, PreparedStatementHandle>()
-                                            .maximumWeightedCapacity(getStatementPoolingCacheSize())
-                                            .listener(new PreparedStatementCacheEvictionListener())
-                                            .build();
-
-            parameterMetadataCache  = new Builder<Sha1HashKey, SQLServerParameterMetaData>()
-                                            .maximumWeightedCapacity(getStatementPoolingCacheSize())
-                                            .build();
+        if (!this.getDisableStatementPooling() && 0 < this.getStatementPoolingCacheSize()) {
+            prepareCache();
         }
     }
 
@@ -1437,10 +1433,8 @@ Connection connectInternal(Properties propsIn,
             sPropKey = SQLServerDriverBooleanProperty.DISABLE_STATEMENT_POOLING.toString();
             sPropValue = activeConnectionProperties.getProperty(sPropKey);
             if (null != sPropValue) {
-                // If disabled set cache size to 0 if disabled.
-                if(booleanPropertyOn(sPropKey, sPropValue))
-                    this.setStatementPoolingCacheSize(0);
-            }
+                setDisableStatementPooling(booleanPropertyOn(sPropKey, sPropValue));
+            } 
 
             sPropKey = SQLServerDriverBooleanProperty.INTEGRATED_SECURITY.toString();
             sPropValue = activeConnectionProperties.getProperty(sPropKey);
@@ -3080,8 +3074,6 @@ final void poolCloseEventNotify() throws SQLServerException {
         checkClosed();
         if (catalog != null) {
             connectionCommand("use " + Util.escapeSQLId(catalog), "setCatalog");
-            contextIsAlreadyChanged = true;
-            contextChanged = true;
             sCatalog = catalog;
         }
         loggerExternal.exiting(getClassNameLogging(), "setCatalog");
@@ -5692,14 +5684,34 @@ final void unprepareUnreferencedPreparedStatementHandles(boolean force) {
         }
     }
 
+    /**
+     * Returns true if statement pooling is disabled.
+     * 
+     * @return
+     */
+    public boolean getDisableStatementPooling() {
+        return this.disableStatementPooling;
+    }
+
+    /**
+     * Sets statement pooling to true or false;
+     * 
+     * @param value
+     */
+    public void setDisableStatementPooling(boolean value) {
+        this.disableStatementPooling = value;
+        if (!value && 0 < this.getStatementPoolingCacheSize()) {
+            prepareCache();
+        }
+    }
 
     /**
      * Returns the size of the prepared statement cache for this connection. A value less than 1 means no cache.
      * @return Returns the current setting per the description.
      */
     public int getStatementPoolingCacheSize() {
         return statementPoolingCacheSize;
-    }
+    }   
 
     /**
      * Returns the current number of pooled prepared statement handles.
@@ -5717,25 +5729,40 @@ public int getStatementHandleCacheEntryCount() {
      * @return Returns the current setting per the description.
      */
     public boolean isStatementPoolingEnabled() {
-        return null != preparedStatementHandleCache && 0 < this.getStatementPoolingCacheSize();
+        return null != preparedStatementHandleCache && 0 < this.getStatementPoolingCacheSize() && !this.getDisableStatementPooling();
     }
 
     /**
-     * Specifies the size of the prepared statement cache for this conection. A value less than 1 means no cache.
-     * @param value The new cache size.
+     * Specifies the size of the prepared statement cache for this connection. A value less than 1 means no cache.
+     * 
+     * @param value
+     *            The new cache size.
      * 
      */
     public void setStatementPoolingCacheSize(int value) {
-        if (value != this.statementPoolingCacheSize) {
-            value = Math.max(0, value);
-            statementPoolingCacheSize = value;
-
-            if (null != preparedStatementHandleCache)
-                preparedStatementHandleCache.setCapacity(value);
+        value = Math.max(0, value);
+        statementPoolingCacheSize = value;
 
-            if (null != parameterMetadataCache)
-                parameterMetadataCache.setCapacity(value);
+        if (!this.disableStatementPooling && value > 0) {
+            prepareCache();
         }
+        if (null != preparedStatementHandleCache)
+            preparedStatementHandleCache.setCapacity(value);
+
+        if (null != parameterMetadataCache)
+            parameterMetadataCache.setCapacity(value);
+    }
+
+    /**
+     * Internal method to prepare the cache handle
+     * @param value
+     */
+    private void prepareCache() {
+        preparedStatementHandleCache = new Builder<Sha1HashKey, PreparedStatementHandle>().maximumWeightedCapacity(getStatementPoolingCacheSize())
+                .listener(new PreparedStatementCacheEvictionListener()).build();
+
+        parameterMetadataCache = new Builder<Sha1HashKey, SQLServerParameterMetaData>().maximumWeightedCapacity(getStatementPoolingCacheSize())
+                .build();
     }
 
     /** Get a parameter metadata cache entry if statement pooling is enabled */
@@ -5788,12 +5815,6 @@ final void evictCachedPreparedStatementHandle(PreparedStatementHandle handle) {
     	preparedStatementHandleCache.remove(handle.getKey());
     }
 
-    final void clearCachedPreparedStatementHandle() {
-        if (null != preparedStatementHandleCache) {
-            preparedStatementHandleCache.clear();
-        }
-    }
-
     // Handle closing handles when removed from cache.
     final class PreparedStatementCacheEvictionListener implements EvictionListener<Sha1HashKey, PreparedStatementHandle> {
         public void onEviction(Sha1HashKey key, PreparedStatementHandle handle) {

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

@@ -169,8 +169,6 @@ public void run() {
             if (wrappedConnection.getConnectionLogger().isLoggable(Level.FINER))
                 wrappedConnection.getConnectionLogger().finer(toString() + " Connection proxy closed ");
 
-            // clear cached prepared statement handle on this connection
-            wrappedConnection.clearCachedPreparedStatementHandle();
             wrappedConnection.poolCloseEventNotify();
             wrappedConnection = null;
         }

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

@@ -744,7 +744,7 @@ public int getServerPreparedStatementDiscardThreshold() {
     }
 
     /**
-     * Specifies the size of the prepared statement cache for this conection. A value less than 1 means no cache.
+     * Specifies the size of the prepared statement cache for this connection. A value less than 1 means no cache.
      * 
      * @param statementPoolingCacheSize
      *            Changes the setting per the description.
@@ -754,14 +754,32 @@ public void setStatementPoolingCacheSize(int statementPoolingCacheSize) {
     }
 
     /**
-     * Returns the size of the prepared statement cache for this conection. A value less than 1 means no cache.
+     * Returns the size of the prepared statement cache for this connection. A value less than 1 means no cache.
      * 
      * @return Returns the current setting per the description.
      */
     public int getStatementPoolingCacheSize() {
         int defaultSize = SQLServerDriverIntProperty.STATEMENT_POOLING_CACHE_SIZE.getDefaultValue();
         return getIntProperty(connectionProps, SQLServerDriverIntProperty.STATEMENT_POOLING_CACHE_SIZE.toString(), defaultSize);
     }
+    
+    /**
+     * Sets the statement pooling to true or false
+     * @param disableStatementPooling
+     */
+    public void setDisableStatementPooling(boolean disableStatementPooling) {
+        setBooleanProperty(connectionProps, SQLServerDriverBooleanProperty.DISABLE_STATEMENT_POOLING.toString(), disableStatementPooling);       
+    }
+    
+    /**
+     * Returns true if statement pooling is disabled.
+     * @return
+     */
+    public boolean getDisableStatementPooling() {
+        boolean defaultValue = SQLServerDriverBooleanProperty.DISABLE_STATEMENT_POOLING.getDefaultValue();
+        return getBooleanProperty(connectionProps, SQLServerDriverBooleanProperty.DISABLE_STATEMENT_POOLING.toString(),
+                defaultValue);
+    }
 
     /**
      * Setting the socket timeout

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

@@ -340,14 +340,14 @@ public String toString() {
 
 enum SQLServerDriverBooleanProperty 
 {
-    DISABLE_STATEMENT_POOLING                 ("disableStatementPooling",                   false),
+    DISABLE_STATEMENT_POOLING                 ("disableStatementPooling",                   true),
     ENCRYPT                                   ("encrypt",                                   false), 
     INTEGRATED_SECURITY                       ("integratedSecurity",                        false),
     LAST_UPDATE_COUNT                         ("lastUpdateCount",                           true),
     MULTI_SUBNET_FAILOVER                     ("multiSubnetFailover",                       false),
     SERVER_NAME_AS_ACE                        ("serverNameAsACE",                           false),
     SEND_STRING_PARAMETERS_AS_UNICODE         ("sendStringParametersAsUnicode",             true),
-    SEND_TIME_AS_DATETIME                     ("sendTimeAsDatetime",                        false),
+    SEND_TIME_AS_DATETIME                     ("sendTimeAsDatetime",                        true),
     TRANSPARENT_NETWORK_IP_RESOLUTION         ("TransparentNetworkIPResolution",            true),
     TRUST_SERVER_CERTIFICATE                  ("trustServerCertificate",                    false),
     XOPEN_STATES                              ("xopenStates",                               false),