Return-Path: Delivered-To: apmail-db-derby-commits-archive@www.apache.org Received: (qmail 43407 invoked from network); 13 Apr 2006 23:36:15 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (209.237.227.199) by minotaur.apache.org with SMTP; 13 Apr 2006 23:36:15 -0000 Received: (qmail 78106 invoked by uid 500); 13 Apr 2006 23:36:14 -0000 Delivered-To: apmail-db-derby-commits-archive@db.apache.org Received: (qmail 78080 invoked by uid 500); 13 Apr 2006 23:36:14 -0000 Mailing-List: contact derby-commits-help@db.apache.org; run by ezmlm Precedence: bulk list-help: list-unsubscribe: List-Post: Reply-To: "Derby Development" List-Id: Delivered-To: mailing list derby-commits@db.apache.org Received: (qmail 78069 invoked by uid 99); 13 Apr 2006 23:36:14 -0000 Received: from asf.osuosl.org (HELO asf.osuosl.org) (140.211.166.49) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 13 Apr 2006 16:36:14 -0700 X-ASF-Spam-Status: No, hits=-9.4 required=10.0 tests=ALL_TRUSTED,NO_REAL_NAME X-Spam-Check-By: apache.org Received: from [209.237.227.194] (HELO minotaur.apache.org) (209.237.227.194) by apache.org (qpsmtpd/0.29) with SMTP; Thu, 13 Apr 2006 16:36:13 -0700 Received: (qmail 43325 invoked by uid 65534); 13 Apr 2006 23:35:53 -0000 Message-ID: <20060413233553.43324.qmail@minotaur.apache.org> Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r393973 - in /db/derby/code/trunk/java/engine/org/apache/derby: iapi/types/ReaderToUTF8Stream.java impl/jdbc/EmbedPreparedStatement.java impl/jdbc/EmbedResultSet.java impl/jdbc/ReaderToUTF8Stream.java Date: Thu, 13 Apr 2006 23:35:52 -0000 To: derby-commits@db.apache.org From: djd@apache.org X-Mailer: svnmailer-1.0.7 X-Virus-Checked: Checked by ClamAV on apache.org X-Spam-Rating: minotaur.apache.org 1.6.2 0/1000/N Author: djd Date: Thu Apr 13 16:35:50 2006 New Revision: 393973 URL: http://svn.apache.org/viewcvs?rev=393973&view=rev Log: DERBY-438 (partial) Move ReaderToUTF8Stream.java from the JDBC implementation to the types package so that it can be used directly by SQLCLob. This class converts from a Reader (stream) format to the on-disk format for character types. Added: db/derby/code/trunk/java/engine/org/apache/derby/iapi/types/ReaderToUTF8Stream.java - copied, changed from r393881, db/derby/code/trunk/java/engine/org/apache/derby/impl/jdbc/ReaderToUTF8Stream.java Removed: db/derby/code/trunk/java/engine/org/apache/derby/impl/jdbc/ReaderToUTF8Stream.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/ReaderToUTF8Stream.java (from r393881, db/derby/code/trunk/java/engine/org/apache/derby/impl/jdbc/ReaderToUTF8Stream.java) URL: http://svn.apache.org/viewcvs/db/derby/code/trunk/java/engine/org/apache/derby/iapi/types/ReaderToUTF8Stream.java?p2=db/derby/code/trunk/java/engine/org/apache/derby/iapi/types/ReaderToUTF8Stream.java&p1=db/derby/code/trunk/java/engine/org/apache/derby/impl/jdbc/ReaderToUTF8Stream.java&r1=393881&r2=393973&rev=393973&view=diff ============================================================================== --- db/derby/code/trunk/java/engine/org/apache/derby/impl/jdbc/ReaderToUTF8Stream.java (original) +++ db/derby/code/trunk/java/engine/org/apache/derby/iapi/types/ReaderToUTF8Stream.java Thu Apr 13 16:35:50 2006 @@ -1,6 +1,6 @@ /* - Derby - Class org.apache.derby.impl.jdbc.ReaderToUTF8Stream + Derby - Class org.apache.derby.iapi.types.ReaderToUTF8Stream Copyright 2004 The Apache Software Foundation or its licensors, as applicable. @@ -18,7 +18,7 @@ */ -package org.apache.derby.impl.jdbc; +package org.apache.derby.iapi.types; import java.io.InputStream; import java.io.IOException; @@ -28,12 +28,12 @@ import org.apache.derby.iapi.reference.SQLState; import org.apache.derby.iapi.services.i18n.MessageService; import org.apache.derby.iapi.services.io.LimitReader; -import org.apache.derby.iapi.types.TypeId; /** - Converts a java.io.Reader to the on-disk UTF8 format used by Cloudscape. + Converts a java.io.Reader to the on-disk UTF8 format used by Derby + for character types. */ -final class ReaderToUTF8Stream +public final class ReaderToUTF8Stream extends InputStream { @@ -60,7 +60,7 @@ // is needed. private int colWidth; - ReaderToUTF8Stream(LimitReader reader,int length,int numCharsToTruncate) + public ReaderToUTF8Stream(LimitReader reader,int length,int numCharsToTruncate) { this.reader = reader; buffer = new byte[BUFSIZE]; 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=393973&r1=393972&r2=393973&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 Thu Apr 13 16:35:50 2006 @@ -35,6 +35,7 @@ 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.types.ReaderToUTF8Stream; 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=393973&r1=393972&r2=393973&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 Thu Apr 13 16:35:50 2006 @@ -39,6 +39,7 @@ import org.apache.derby.iapi.types.DataValueDescriptor; import org.apache.derby.iapi.types.RawToBinaryFormatStream; +import org.apache.derby.iapi.types.ReaderToUTF8Stream; import org.apache.derby.iapi.types.UserDataValue; import org.apache.derby.iapi.types.VariableSizeDataValue; import org.apache.derby.iapi.sql.ResultDescription;