db-derby-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From mi...@apache.org
Subject svn commit: r416485 - in /db/derby/code/trunk/java: drda/org/apache/derby/impl/drda/ testing/org/apache/derbyTesting/functionTests/master/ testing/org/apache/derbyTesting/functionTests/tests/derbynet/
Date Thu, 22 Jun 2006 22:13:42 GMT
Author: mikem
Date: Thu Jun 22 15:13:41 2006
New Revision: 416485

URL: http://svn.apache.org/viewvc?rev=416485&view=rev
Log:
DERBY-959, committing on behalf of  Sunitha Kambhampati.

Server changes to allow for query block size greater than 32k, as 
supported by the latest DRDA spec. 


Modified:
    db/derby/code/trunk/java/drda/org/apache/derby/impl/drda/CodePoint.java
    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
    db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/derbynet/testProtocol_app.properties

Modified: db/derby/code/trunk/java/drda/org/apache/derby/impl/drda/CodePoint.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/drda/org/apache/derby/impl/drda/CodePoint.java?rev=416485&r1=416484&r2=416485&view=diff
==============================================================================
--- db/derby/code/trunk/java/drda/org/apache/derby/impl/drda/CodePoint.java (original)
+++ db/derby/code/trunk/java/drda/org/apache/derby/impl/drda/CodePoint.java Thu Jun 22 15:13:41
2006
@@ -747,7 +747,7 @@
 
 	//---------------------QRYBLSZ min and maximum
 	static final int QRYBLKSZ_MIN = 512;
-	static final int QRYBLKSZ_MAX = 32767;
+	static final int QRYBLKSZ_MAX = 10*1024*1024;
 	static final int QRYROWSET_MAX = 32767;
 	static final int QRYROWSET_DEFAULT = -1;
 

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=416485&r1=416484&r2=416485&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
Thu Jun 22 15:13:41 2006
@@ -291,3 +291,7 @@
 PASSED
 Test explicitly closing implicitly closed cursor
 PASSED
+Test with 65535 query block size QRYBLKSZ  - DERBY-959
+PASSED
+Test 2 with 65535 query block size QRYBLKSZ  - DERBY-959
+PASSED

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=416485&r1=416484&r2=416485&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
Thu Jun 22 15:13:41 2006
@@ -1681,7 +1681,7 @@
 writeShort 1
 endDdm
 startDdm QRYBLKSZ
-writeInt 40000
+writeInt 10486784
 endDdm
 endDdm
 endDss
@@ -2680,7 +2680,7 @@
 createDssRequest
 startDdm EXCSQLSTT
 startDdm QRYBLKSZ
-writeInt 40000
+writeInt 10486784
 endDdm
 endDdm
 endDss
@@ -3281,6 +3281,106 @@
 // but JCC expects SQLCARD and we're nice guys...
 checkSQLCard 0 "     "
 endTest
+//
+DISPLAY "Test with 65535 query block size QRYBLKSZ  - DERBY-959"
+include values64kblksz.inc
+endTest
+// 
+DISPLAY "Test 2 with 65535 query block size QRYBLKSZ  - DERBY-959"
+include connect.inc
+// prepare statement
+createDssRequest
+startDdm PRPSQLSTT
+startDdm PKGNAMCSN
+writePaddedString "test" 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 "     "
+// execute query
+createDssRequest
+startDdm OPNQRY
+startDdm PKGNAMCSN
+writePaddedString "test" 18
+writePaddedString "rdbcolid" 18
+writePaddedString "pkgid"  18
+writeBytes "0x0101010101010101"
+writeShort 1
+endDdm
+writeScalar1Byte QRYCLSIMP 1
+startDdm QRYBLKSZ
+writeInt 65535
+endDdm
+endDdm
+endDss
+flush
+readReplyDss
+readLengthAndCodepoint OPNQRYRM
+skipBytes
+readReplyDss
+readLengthAndCodepoint QRYDSC
+skipBytes
+// fetch data
+createDssRequest
+startDdm CNTQRY
+startDdm PKGNAMCSN
+writePaddedString "test" 18
+writePaddedString "rdbcolid" 18
+writePaddedString "pkgid"  18
+writeBytes "0x0101010101010101"
+writeShort 1
+endDdm
+startDdm QRYBLKSZ
+writeInt 65535
+endDdm
+startDdm QRYINSID
+writeInt 0
+writeInt 1
+endDdm
+endDdm
+endDss
+flush
+readReplyDss
+readLengthAndCodepoint QRYDTA
+skipBytes
+// all rows are fetched, cursor is implicitly closed on server
+// close result set explicitly
+createDssRequest
+startDdm CLSQRY
+startDdm PKGNAMCSN
+writePaddedString "test" 18
+writePaddedString "rdbcolid" 18
+writePaddedString "pkgid"  18
+writeBytes "0x0101010101010101"
+writeShort 1
+endDdm
+startDdm QRYINSID
+writeInt 0
+writeInt 1
+endDdm
+endDdm
+endDss
+flush
+// DRDA says QRYNOPRM is to be expected here
+//readReplyDss
+//readLengthAndCodepoint QRYNOPRM
+// but JCC expects SQLCARD and we're nice guys...
+checkSQLCard 0 "     "
+endTest
+//
+//
 //
 completeTest
 //

Modified: db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/derbynet/testProtocol_app.properties
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/derbynet/testProtocol_app.properties?rev=416485&r1=416484&r2=416485&view=diff
==============================================================================
--- db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/derbynet/testProtocol_app.properties
(original)
+++ db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/derbynet/testProtocol_app.properties
Thu Jun 22 15:13:41 2006
@@ -20,7 +20,7 @@
 database=jdbc:derby:wombat;create=true
 derby.optimizer.noTimeout=true
 
-supportfiles=tests/derbynet/protocol.tests,tests/derbynet/excsat_accsecrd1.inc,tests/derbynet/excsat_accsecrd2.inc,tests/derbynet/excsat_secchk.inc,tests/derbynet/connect.inc,tests/derbynet/values1.inc
+supportfiles=tests/derbynet/protocol.tests,tests/derbynet/excsat_accsecrd1.inc,tests/derbynet/excsat_accsecrd2.inc,tests/derbynet/excsat_secchk.inc,tests/derbynet/connect.inc,tests/derbynet/values1.inc,tests/derbynet/values64kblksz.inc
 
 # disable security manager for now - needs investigating
 noSecurityManager=true



Mime
View raw message