svn commit: r393579 - in /db/derby/code/trunk/java/engine/org/apache/derby: iapi/types/RawToBinaryFormatStream.java impl/jdbc/EmbedPreparedStatement.java impl/jdbc/EmbedResultSet.java impl/jdbc/RawToBinaryFormatStream.java

[dj...@apache.org]

Author: djd
Date: Wed Apr 12 12:02:51 2006
New Revision: 393579

URL: http://svn.apache.org/viewcvs?rev=393579&view=rev
Log:
DERBY-438 (partial) Move RawToBinaryStreamFormat.java from org.apache.derby.impl.jdbc to
org.apache.derby.iapi.types to allow its use in SQLBlob and SQLBinary (in a future commit).
This will allow the setting of the internal binary types from JDBC objects in a consistent manner.

Added:
    db/derby/code/trunk/java/engine/org/apache/derby/iapi/types/RawToBinaryFormatStream.java
      - copied, changed from r393570, db/derby/code/trunk/java/engine/org/apache/derby/impl/jdbc/RawToBinaryFormatStream.java
Removed:
    db/derby/code/trunk/java/engine/org/apache/derby/impl/jdbc/RawToBinaryFormatStream.java
Modified:
    db/derby/code/trunk/java/engine/org/apache/derby/impl/jdbc/EmbedPreparedStatement.java
    db/derby/code/trunk/java/engine/org/apache/derby/impl/jdbc/EmbedResultSet.java

Copied: db/derby/code/trunk/java/engine/org/apache/derby/iapi/types/RawToBinaryFormatStream.java (from r393570, db/derby/code/trunk/java/engine/org/apache/derby/impl/jdbc/RawToBinaryFormatStream.java)
URL: http://svn.apache.org/viewcvs/db/derby/code/trunk/java/engine/org/apache/derby/iapi/types/RawToBinaryFormatStream.java?p2=db/derby/code/trunk/java/engine/org/apache/derby/iapi/types/RawToBinaryFormatStream.java&p1=db/derby/code/trunk/java/engine/org/apache/derby/impl/jdbc/RawToBinaryFormatStream.java&r1=393570&r2=393579&rev=393579&view=diff
==============================================================================
--- db/derby/code/trunk/java/engine/org/apache/derby/impl/jdbc/RawToBinaryFormatStream.java (original)
+++ db/derby/code/trunk/java/engine/org/apache/derby/iapi/types/RawToBinaryFormatStream.java Wed Apr 12 12:02:51 2006
@@ -1,6 +1,6 @@
 /*
 
-   Derby - Class org.apache.derby.impl.jdbc.RawToBinaryFormatStream
+   Derby - Class org.apache.derby.iapi.types.RawToBinaryFormatStream
 
    Copyright 2004 The Apache Software Foundation or its licensors, as applicable.
 
@@ -18,10 +18,9 @@
 
  */
 
-package org.apache.derby.impl.jdbc;
+package org.apache.derby.iapi.types;
 
 import java.io.InputStream;
-import java.io.FilterInputStream;
 import java.io.IOException;
 import java.io.EOFException;
 
@@ -31,12 +30,12 @@
 
 /**
 	Stream that takes a raw input stream and converts it
-	to the format of the binary types by prepending the
+	to the on-disk format of the binary types by prepending the
 	length of the value. In this case 0 is always written.
     Note: This stream cannot be re-used. Once end of file is
     reached, the next read call will throw an EOFException
 */
-class RawToBinaryFormatStream extends LimitInputStream {
+public class RawToBinaryFormatStream extends LimitInputStream {
 
 	private int dummyBytes = 4;
     
@@ -48,7 +47,7 @@
 		@param	in Application's raw binary stream passed into JDBC layer
 		@param	length - length of the stream, if known, otherwise -1.
 	*/
-	RawToBinaryFormatStream(InputStream in, int length) {
+	public RawToBinaryFormatStream(InputStream in, int length) {
 		super(in);
 		if (length >= 0) {
 			setLimit(length);

Modified: db/derby/code/trunk/java/engine/org/apache/derby/impl/jdbc/EmbedPreparedStatement.java
URL: http://svn.apache.org/viewcvs/db/derby/code/trunk/java/engine/org/apache/derby/impl/jdbc/EmbedPreparedStatement.java?rev=393579&r1=393578&r2=393579&view=diff
==============================================================================
--- db/derby/code/trunk/java/engine/org/apache/derby/impl/jdbc/EmbedPreparedStatement.java (original)
+++ db/derby/code/trunk/java/engine/org/apache/derby/impl/jdbc/EmbedPreparedStatement.java Wed Apr 12 12:02:51 2006
@@ -34,6 +34,7 @@
 import org.apache.derby.iapi.sql.ResultDescription;
 import org.apache.derby.iapi.types.DataTypeDescriptor;
 import org.apache.derby.iapi.types.DataValueDescriptor;
+import org.apache.derby.iapi.types.RawToBinaryFormatStream;
 
 import org.apache.derby.iapi.error.StandardException;
 

Modified: db/derby/code/trunk/java/engine/org/apache/derby/impl/jdbc/EmbedResultSet.java
URL: http://svn.apache.org/viewcvs/db/derby/code/trunk/java/engine/org/apache/derby/impl/jdbc/EmbedResultSet.java?rev=393579&r1=393578&r2=393579&view=diff
==============================================================================
--- db/derby/code/trunk/java/engine/org/apache/derby/impl/jdbc/EmbedResultSet.java (original)
+++ db/derby/code/trunk/java/engine/org/apache/derby/impl/jdbc/EmbedResultSet.java Wed Apr 12 12:02:51 2006
@@ -38,6 +38,7 @@
 import org.apache.derby.iapi.sql.execute.CursorActivation;
 
 import org.apache.derby.iapi.types.DataValueDescriptor;
+import org.apache.derby.iapi.types.RawToBinaryFormatStream;
 import org.apache.derby.iapi.types.UserDataValue;
 import org.apache.derby.iapi.types.VariableSizeDataValue;
 import org.apache.derby.iapi.sql.ResultDescription;