db-derby-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From kahat...@apache.org
Subject svn commit: r961271 - in /db/derby/code/trunk/java: drda/org/apache/derby/impl/drda/ testing/org/apache/derbyTesting/functionTests/master/ testing/org/apache/derbyTesting/functionTests/master/ibm14/ testing/org/apache/derbyTesting/functionTests/tests/d...
Date Wed, 07 Jul 2010 07:32:55 GMT
Author: kahatlen
Date: Wed Jul  7 07:32:55 2010
New Revision: 961271

URL: http://svn.apache.org/viewvc?rev=961271&view=rev
Log:
DERBY-1425: testProtocol hangs with 10.1 client talking to 10.2 server

Clear more fields in DDMReader's initialize() method to prevent old
state from being kept and affecting subsequent sessions.

Modified:
    db/derby/code/trunk/java/drda/org/apache/derby/impl/drda/DDMReader.java
    db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/ibm14/testProtocol.out
    db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/testProtocol.out
    db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/derbynet/protocol.tests

Modified: db/derby/code/trunk/java/drda/org/apache/derby/impl/drda/DDMReader.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/drda/org/apache/derby/impl/drda/DDMReader.java?rev=961271&r1=961270&r2=961271&view=diff
==============================================================================
--- db/derby/code/trunk/java/drda/org/apache/derby/impl/drda/DDMReader.java (original)
+++ db/derby/code/trunk/java/drda/org/apache/derby/impl/drda/DDMReader.java Wed Jul  7 07:32:55
2010
@@ -220,6 +220,8 @@ class DDMReader
 		prevCorrelationID = DssConstants.CORRELATION_ID_UNKNOWN;
 		dssCorrelationID = DssConstants.CORRELATION_ID_UNKNOWN;
 		this.dssTrace = dssTrace;
+		dssIsChainedWithDiffID = false;
+		dssIsChainedWithSameID = false;
 	}
 
 	// Switch the ccsidManager to the UTF-8 instance

Modified: db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/ibm14/testProtocol.out
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/ibm14/testProtocol.out?rev=961271&r1=961270&r2=961271&view=diff
==============================================================================
--- db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/ibm14/testProtocol.out
(original)
+++ db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/ibm14/testProtocol.out
Wed Jul  7 07:32:55 2010
@@ -239,6 +239,8 @@ PASSED
 Test closing an already closed statement
 Removing second close until JCC issue with sending double close is resolve
 PASSED
+Execute VALUES 1 without reading final QRYDTA
+PASSED
 Test for too large value for OUTEXP in EXCSQLSTT
 PASSED
 Test for invalid OUTEXP in EXCSQLSTT

Modified: db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/testProtocol.out
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/testProtocol.out?rev=961271&r1=961270&r2=961271&view=diff
==============================================================================
--- db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/testProtocol.out
(original)
+++ db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/testProtocol.out
Wed Jul  7 07:32:55 2010
@@ -239,6 +239,8 @@ PASSED
 Test closing an already closed statement
 Removing second close until JCC issue with sending double close is resolve
 PASSED
+Execute VALUES 1 without reading final QRYDTA
+PASSED
 Test for too large value for OUTEXP in EXCSQLSTT
 PASSED
 Test for invalid OUTEXP in EXCSQLSTT

Modified: db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/derbynet/protocol.tests
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/derbynet/protocol.tests?rev=961271&r1=961270&r2=961271&view=diff
==============================================================================
--- db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/derbynet/protocol.tests
(original)
+++ db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/derbynet/protocol.tests
Wed Jul  7 07:32:55 2010
@@ -2719,6 +2719,60 @@ DISPLAY "Removing second close until JCC
 //readLengthAndCodepoint QRYNOPRM
 endTest
 //
+// DERBY-1425: Perform a VALUES 1 statement without reading the final DSS
+// with a QRYDTA. Stopping in the middle of a DSS chain used to get DDMReader
+// into a bad state that reinitialization didn't get it out of, and it made
+// the next test case hang.
+DISPLAY "Execute VALUES 1 without reading final QRYDTA"
+include connect.inc
+createDssRequest
+startDdm PRPSQLSTT
+startDdm PKGNAMCSN
+writePaddedString "wombat" 18
+writePaddedString "rdbcolid" 18
+writePaddedString "pkgid"  18
+writeBytes "0x0101010101010101"
+writeShort 1
+endDdm
+endDdm
+endDss
+createDssObject
+startDdm SQLSTT
+writeByte 0	// null indicator
+writeEncodedLDString "values(1)" "UTF-8" 4
+writeByte 255 // null indicator
+endDdm
+endDss
+flush
+checkSQLCard 0 "     "
+createDssRequest
+startDdm OPNQRY
+startDdm PKGNAMCSN
+writePaddedString "wombat" 18
+writePaddedString "rdbcolid" 18
+writePaddedString "pkgid"  18
+writeBytes "0x0101010101010101"
+writeShort 1
+endDdm
+startDdm QRYBLKSZ
+writeInt 32767
+endDdm
+endDdm
+endDss
+flush
+readReplyDss
+readLengthAndCodepoint OPNQRYRM
+skipBytes
+readReplyDss
+readLengthAndCodepoint QRYDSC
+skipBytes
+// Don't read QRYDTA, instead just end test. This used to make the next
+// test case hang because DDMReader got into a bad state.
+//readReplyDss
+//readLengthAndCodepoint QRYDTA
+//skipBytes
+endTest
+//
 DISPLAY "Test for too large value for OUTEXP in EXCSQLSTT"
 include connect.inc
 createDssRequest



Mime
View raw message