db-derby-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From krist...@apache.org
Subject svn commit: r628679 - in /db/derby/code/trunk/java/client/org/apache/derby/client: am/Connection.java net/NetConnection.java net/NetConnectionReply.java
Date Mon, 18 Feb 2008 10:56:30 GMT
Author: kristwaa
Date: Mon Feb 18 02:56:23 2008
New Revision: 628679

URL: http://svn.apache.org/viewvc?rev=628679&view=rev
Log:
DERBY-3421: Remove unused code for caching of connect bytes.
Patch file: derby-3421-1b-removal.diff

Modified:
    db/derby/code/trunk/java/client/org/apache/derby/client/am/Connection.java
    db/derby/code/trunk/java/client/org/apache/derby/client/net/NetConnection.java
    db/derby/code/trunk/java/client/org/apache/derby/client/net/NetConnectionReply.java

Modified: db/derby/code/trunk/java/client/org/apache/derby/client/am/Connection.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/client/org/apache/derby/client/am/Connection.java?rev=628679&r1=628678&r2=628679&view=diff
==============================================================================
--- db/derby/code/trunk/java/client/org/apache/derby/client/am/Connection.java (original)
+++ db/derby/code/trunk/java/client/org/apache/derby/client/am/Connection.java Mon Feb 18
02:56:23 2008
@@ -139,7 +139,6 @@
     public int clientSSLMode_ = ClientBaseDataSource.SSL_OFF;
 
     java.util.Hashtable clientCursorNameCache_ = new java.util.Hashtable();
-    public boolean canUseCachedConnectBytes_ = false;
     public int commBufferSize_ = 32767;
 
     // indicates if a deferred reset connection is required

Modified: db/derby/code/trunk/java/client/org/apache/derby/client/net/NetConnection.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/client/org/apache/derby/client/net/NetConnection.java?rev=628679&r1=628678&r2=628679&view=diff
==============================================================================
--- db/derby/code/trunk/java/client/org/apache/derby/client/net/NetConnection.java (original)
+++ db/derby/code/trunk/java/client/org/apache/derby/client/net/NetConnection.java Mon Feb
18 02:56:23 2008
@@ -57,10 +57,6 @@
     // For XA Transaction
     protected int pendingEndXACallinfoOffset_ = -1;
 
-
-    // byte[] to save the connect flows for connection reset
-    protected byte[] cachedConnectBytes_ = null;
-    protected boolean wroteConnectFromCache_ = false;
     //-----------------------------state------------------------------------------
 
     // these variables store the manager levels for the connection.
@@ -870,108 +866,79 @@
                 netAgent_.typdef_);
     }
 
-    private void cacheConnectBytes(int beginOffset, int endOffset) {
-        int length = endOffset - beginOffset;
-        cachedConnectBytes_ = new byte[length];
-        netAgent_.netConnectionRequest_.finalizePreviousChainedDss(false);
-        System.arraycopy(netAgent_.netConnectionRequest_.bytes_,
-                beginOffset,
-                cachedConnectBytes_,
-                0,
-                length);
-        netAgent_.netConnectionRequest_.setDssLengthLocation(netAgent_.netConnectionRequest_.offset_);
-    }
-
     private void readSecurityCheckAndAccessRdb() throws SqlException {
         netAgent_.netConnectionReply_.readSecurityCheck(this);
         netAgent_.netConnectionReply_.readAccessDatabase(this);
     }
 
     void writeDeferredReset() throws SqlException {
-        if (canUseCachedConnectBytes_ && cachedConnectBytes_ != null &&
-                (securityMechanism_ == NetConfiguration.SECMEC_USRIDPWD ||
-                securityMechanism_ == NetConfiguration.SECMEC_USRIDONL)) {
-            writeDeferredResetFromCache();
-            wroteConnectFromCache_ = true;
-        } else {
-            int beginOffset = netAgent_.netConnectionRequest_.offset_;
-            int endOffset = 0;
-            // NetConfiguration.SECMEC_USRIDPWD
-            if (securityMechanism_ == NetConfiguration.SECMEC_USRIDPWD) {
-                writeAllConnectCommandsChained(NetConfiguration.SECMEC_USRIDPWD,
+        // NetConfiguration.SECMEC_USRIDPWD
+        if (securityMechanism_ == NetConfiguration.SECMEC_USRIDPWD) {
+            writeAllConnectCommandsChained(NetConfiguration.SECMEC_USRIDPWD,
+                    user_,
+                    getDeferredResetPassword());
+        }
+        // NetConfiguration.SECMEC_USRIDONL
+        else if (securityMechanism_ == NetConfiguration.SECMEC_USRIDONL) {
+            writeAllConnectCommandsChained(NetConfiguration.SECMEC_USRIDONL,
+                    user_,
+                    null);  //password
+        }
+        // Either NetConfiguration.SECMEC_USRENCPWD,
+        // NetConfiguration.SECMEC_EUSRIDPWD or
+        // NetConfiguration.SECMEC_USRSSBPWD
+        else {
+            if (securityMechanism_ == NetConfiguration.SECMEC_USRSSBPWD)
+                initializeClientSeed();
+            else // SECMEC_USRENCPWD, SECMEC_EUSRIDPWD
+                initializePublicKeyForEncryption();
+
+            // Set the resetConnectionAtFirstSql_ to false to avoid going in an
+            // infinite loop, since all the flow methods call beginWriteChain which then
+            // calls writeDeferredResetConnection where the check for resetConnectionAtFirstSql_
+            // is done. By setting the resetConnectionAtFirstSql_ to false will avoid calling
the
+            // writeDeferredReset method again.
+            resetConnectionAtFirstSql_ = false;
+
+            if (securityMechanism_ == NetConfiguration.SECMEC_USRSSBPWD)
+                flowSeedExchange(securityMechanism_, sourceSeed_);
+            else // SECMEC_USRENCPWD, SECMEC_EUSRIDPWD
+                flowServerAttributesAndKeyExchange(securityMechanism_, publicKey_);
+
+            agent_.beginWriteChainOutsideUOW();
+
+            // Reset the resetConnectionAtFirstSql_ to true since we are done
+            // with the flow method.
+            resetConnectionAtFirstSql_ = true;
+
+            // NetConfiguration.SECMEC_USRENCPWD
+            if (securityMechanism_ == NetConfiguration.SECMEC_USRENCPWD) {
+                writeSecurityCheckAndAccessRdb(NetConfiguration.SECMEC_USRENCPWD,
                         user_,
-                        getDeferredResetPassword());
-                endOffset = netAgent_.netConnectionRequest_.offset_;
-                cacheConnectBytes(beginOffset, endOffset);
+                        null, //password
+                        null, //encryptedUserid
+                        encryptedPasswordForUSRENCPWD(getDeferredResetPassword()));
             }
-            // NetConfiguration.SECMEC_USRIDONL
-            else if (securityMechanism_ == NetConfiguration.SECMEC_USRIDONL) {
-                writeAllConnectCommandsChained(NetConfiguration.SECMEC_USRIDONL,
+            // NetConfiguration.SECMEC_USRSSBPWD
+            else if (securityMechanism_ == NetConfiguration.SECMEC_USRSSBPWD) {
+                writeSecurityCheckAndAccessRdb(NetConfiguration.SECMEC_USRSSBPWD,
                         user_,
-                        null);  //password
-                endOffset = netAgent_.netConnectionRequest_.offset_;
-                cacheConnectBytes(beginOffset, endOffset);
+                        null,
+                        null,
+                        passwordSubstituteForUSRSSBPWD(getDeferredResetPassword()));
             }
-            // Either NetConfiguration.SECMEC_USRENCPWD,
-            // NetConfiguration.SECMEC_EUSRIDPWD or
-            // NetConfiguration.SECMEC_USRSSBPWD
-            else {
-                if (securityMechanism_ == NetConfiguration.SECMEC_USRSSBPWD)
-                    initializeClientSeed();
-                else // SECMEC_USRENCPWD, SECMEC_EUSRIDPWD
-                    initializePublicKeyForEncryption();
-
-                // Set the resetConnectionAtFirstSql_ to false to avoid going in an
-                // infinite loop, since all the flow methods call beginWriteChain which then
-                // calls writeDeferredResetConnection where the check for resetConnectionAtFirstSql_
-                // is done. By setting the resetConnectionAtFirstSql_ to false will avoid
calling the
-                // writeDeferredReset method again.
-                resetConnectionAtFirstSql_ = false;
-
-                if (securityMechanism_ == NetConfiguration.SECMEC_USRSSBPWD)
-                    flowSeedExchange(securityMechanism_, sourceSeed_);
-                else // SECMEC_USRENCPWD, SECMEC_EUSRIDPWD
-                    flowServerAttributesAndKeyExchange(securityMechanism_, publicKey_);
-
-                agent_.beginWriteChainOutsideUOW();
-
-                // Reset the resetConnectionAtFirstSql_ to true since we are done
-                // with the flow method.
-                resetConnectionAtFirstSql_ = true;
-
-                // NetConfiguration.SECMEC_USRENCPWD
-                if (securityMechanism_ == NetConfiguration.SECMEC_USRENCPWD) {
-                    writeSecurityCheckAndAccessRdb(NetConfiguration.SECMEC_USRENCPWD,
-                            user_,
-                            null, //password
-                            null, //encryptedUserid
-                            encryptedPasswordForUSRENCPWD(getDeferredResetPassword()));
-                }
-                // NetConfiguration.SECMEC_USRSSBPWD
-                else if (securityMechanism_ == NetConfiguration.SECMEC_USRSSBPWD) {
-                    writeSecurityCheckAndAccessRdb(NetConfiguration.SECMEC_USRSSBPWD,
-                            user_,
-                            null,
-                            null,
-                            passwordSubstituteForUSRSSBPWD(getDeferredResetPassword()));
-                }
-                else {  // NetConfiguration.SECMEC_EUSRIDPWD
-                    writeSecurityCheckAndAccessRdb(NetConfiguration.SECMEC_EUSRIDPWD,
-                            null, //user
-                            null, //password
-                            encryptedUseridForEUSRIDPWD(),
-                            encryptedPasswordForEUSRIDPWD(getDeferredResetPassword()));
-                }
+            else {  // NetConfiguration.SECMEC_EUSRIDPWD
+                writeSecurityCheckAndAccessRdb(NetConfiguration.SECMEC_EUSRIDPWD,
+                        null, //user
+                        null, //password
+                        encryptedUseridForEUSRIDPWD(),
+                        encryptedPasswordForEUSRIDPWD(getDeferredResetPassword()));
             }
         }
     }
 
     void readDeferredReset() throws SqlException {
         resetConnectionAtFirstSql_ = false;
-        if (wroteConnectFromCache_) {
-            netAgent_.netConnectionReply_.verifyDeferredReset();
-            return;
-        }
         // either NetConfiguration.SECMEC_USRIDPWD or NetConfiguration.SECMEC_USRIDONL
         if (securityMechanism_ == NetConfiguration.SECMEC_USRIDPWD ||
                 securityMechanism_ == NetConfiguration.SECMEC_USRIDONL) {
@@ -1521,19 +1488,6 @@
         }
         return array;
     }
-
-    private void writeDeferredResetFromCache() {
-        int length = cachedConnectBytes_.length;
-        System.arraycopy(cachedConnectBytes_,
-                0,
-                netAgent_.netConnectionRequest_.bytes_,
-                netAgent_.netConnectionRequest_.offset_,
-                length);
-        netAgent_.netConnectionRequest_.offset_ += length;
-        netAgent_.netConnectionRequest_.setDssLengthLocation(netAgent_.netConnectionRequest_.offset_);
-        netAgent_.netConnectionRequest_.setCorrelationID(4);
-    }
-
 
     public void writeCommitSubstitute_() throws SqlException {
         netAgent_.connectionRequest_.writeCommitSubstitute(this);

Modified: db/derby/code/trunk/java/client/org/apache/derby/client/net/NetConnectionReply.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/client/org/apache/derby/client/net/NetConnectionReply.java?rev=628679&r1=628678&r2=628679&view=diff
==============================================================================
--- db/derby/code/trunk/java/client/org/apache/derby/client/net/NetConnectionReply.java (original)
+++ db/derby/code/trunk/java/client/org/apache/derby/client/net/NetConnectionReply.java Mon
Feb 18 02:56:23 2008
@@ -57,18 +57,6 @@
         agent_.checkForChainBreakingException_();
     }
 
-    void verifyDeferredReset() throws SqlException {
-        readDssHeader();
-        verifyConnectReply(CodePoint.EXCSATRD);
-        readDssHeader();
-        verifyConnectReply(CodePoint.ACCSECRD);
-        readDssHeader();
-        verifyConnectReply(CodePoint.SECCHKRM);
-        readDssHeader();
-        verifyConnectReply(CodePoint.ACCRDBRM);
-        agent_.checkForChainBreakingException_();
-    }
-
     void verifyConnectReply(int codept) throws SqlException {
         if (peekCodePoint() != codept) {
             parseConnectError();



Mime
View raw message