db-derby-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From krist...@apache.org
Subject svn commit: r547657 - in /db/derby/code/trunk/java: engine/org/apache/derby/impl/jdbc/ testing/org/apache/derby/impl/jdbc/
Date Fri, 15 Jun 2007 12:41:47 GMT
Author: kristwaa
Date: Fri Jun 15 05:41:46 2007
New Revision: 547657

URL: http://svn.apache.org/viewvc?view=rev&rev=547657
Log:
DERBY-2827: Rename ClobStreamControl to TemporaryClob. Updated all affected classes.
Patch file: derby-2827-1a.diff

Added:
    db/derby/code/trunk/java/engine/org/apache/derby/impl/jdbc/TemporaryClob.java
      - copied, changed from r547586, db/derby/code/trunk/java/engine/org/apache/derby/impl/jdbc/ClobStreamControl.java
Removed:
    db/derby/code/trunk/java/engine/org/apache/derby/impl/jdbc/ClobStreamControl.java
Modified:
    db/derby/code/trunk/java/engine/org/apache/derby/impl/jdbc/ClobUtf8Writer.java
    db/derby/code/trunk/java/engine/org/apache/derby/impl/jdbc/EmbedClob.java
    db/derby/code/trunk/java/testing/org/apache/derby/impl/jdbc/BiggerTemporaryClobTest.java
    db/derby/code/trunk/java/testing/org/apache/derby/impl/jdbc/SmallTemporaryClobTest.java

Modified: db/derby/code/trunk/java/engine/org/apache/derby/impl/jdbc/ClobUtf8Writer.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/engine/org/apache/derby/impl/jdbc/ClobUtf8Writer.java?view=diff&rev=547657&r1=547656&r2=547657
==============================================================================
--- db/derby/code/trunk/java/engine/org/apache/derby/impl/jdbc/ClobUtf8Writer.java (original)
+++ db/derby/code/trunk/java/engine/org/apache/derby/impl/jdbc/ClobUtf8Writer.java Fri Jun
15 05:41:46 2007
@@ -35,7 +35,7 @@
  * Writer implementation for <code>Clob</code>.
  */
 final class ClobUtf8Writer extends Writer {
-    private ClobStreamControl control;    
+    private TemporaryClob control;    
     private long pos; // Position in characters.
     private boolean closed;
     
@@ -45,7 +45,7 @@
      * @param control worker object for the CLOB value
      * @param pos initial <b>byte</b> position in the CLOB value
      */
-    ClobUtf8Writer(ClobStreamControl control, long pos) {
+    ClobUtf8Writer(TemporaryClob control, long pos) {
         this.control = control;
         this.pos = pos;
         closed = false;

Modified: db/derby/code/trunk/java/engine/org/apache/derby/impl/jdbc/EmbedClob.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/engine/org/apache/derby/impl/jdbc/EmbedClob.java?view=diff&rev=547657&r1=547656&r2=547657
==============================================================================
--- db/derby/code/trunk/java/engine/org/apache/derby/impl/jdbc/EmbedClob.java (original)
+++ db/derby/code/trunk/java/engine/org/apache/derby/impl/jdbc/EmbedClob.java Fri Jun 15 05:41:46
2007
@@ -87,7 +87,7 @@
      */
     EmbedClob(EmbedConnection con) throws SQLException {
         super(con);
-        this.clob = new ClobStreamControl (con.getDBName(), this);
+        this.clob = new TemporaryClob (con.getDBName(), this);
         con.addLOBMapping (this);
     }
 
@@ -116,7 +116,7 @@
         // See if a String or a stream will be the source of the Clob.
         if (storeStream == null) {
             try {
-                clob = new ClobStreamControl(con.getDBName(),
+                clob = new TemporaryClob(con.getDBName(),
                         dvd.getString(), this);
             }
             catch (SQLException sqle) {
@@ -743,7 +743,7 @@
     private void makeWritableClobClone()
             throws IOException, SQLException {
         InternalClob toBeAbandoned = this.clob;
-        this.clob = ClobStreamControl.cloneClobContent(
+        this.clob = TemporaryClob.cloneClobContent(
                         getEmbedConnection().getDBName(),
                         this, toBeAbandoned);
         toBeAbandoned.release();
@@ -764,7 +764,7 @@
     private void makeWritableClobClone(long len)
             throws IOException, SQLException {
         InternalClob toBeAbandoned = this.clob;
-        this.clob = ClobStreamControl.cloneClobContent(
+        this.clob = TemporaryClob.cloneClobContent(
                         getEmbedConnection().getDBName(),
                         this, toBeAbandoned, len);
         toBeAbandoned.release();

Copied: db/derby/code/trunk/java/engine/org/apache/derby/impl/jdbc/TemporaryClob.java (from
r547586, db/derby/code/trunk/java/engine/org/apache/derby/impl/jdbc/ClobStreamControl.java)
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/engine/org/apache/derby/impl/jdbc/TemporaryClob.java?view=diff&rev=547657&p1=db/derby/code/trunk/java/engine/org/apache/derby/impl/jdbc/ClobStreamControl.java&r1=547586&p2=db/derby/code/trunk/java/engine/org/apache/derby/impl/jdbc/TemporaryClob.java&r2=547657
==============================================================================
--- db/derby/code/trunk/java/engine/org/apache/derby/impl/jdbc/ClobStreamControl.java (original)
+++ db/derby/code/trunk/java/engine/org/apache/derby/impl/jdbc/TemporaryClob.java Fri Jun
15 05:41:46 2007
@@ -1,6 +1,6 @@
 /*
 
-   Derby - Class org.apache.derby.impl.jdbc.ClobStreamControl
+   Derby - Class org.apache.derby.impl.jdbc.TemporaryClob
 
    Licensed to the Apache Software Foundation (ASF) under one
    or more contributor license agreements.  See the NOTICE file
@@ -38,7 +38,7 @@
  * Character positions given as input to methods in this class are always
  * 1-based. Byte positions are always 0-based.
  */
-final class ClobStreamControl implements InternalClob {
+final class TemporaryClob implements InternalClob {
 
     /**
      * Connection child assoicated with this Clob.
@@ -73,7 +73,7 @@
                                          ConnectionChild conChild,
                                          InternalClob clob)
             throws IOException, SQLException {
-        ClobStreamControl newClob = new ClobStreamControl(dbName, conChild);
+        TemporaryClob newClob = new TemporaryClob(dbName, conChild);
         newClob.copyClobContent(clob);
         return newClob;
     }
@@ -94,21 +94,21 @@
                                          InternalClob clob,
                                          long length)
             throws IOException, SQLException {
-        ClobStreamControl newClob = new ClobStreamControl(dbName, conChild);
+        TemporaryClob newClob = new TemporaryClob(dbName, conChild);
         newClob.copyClobContent(clob, length);
         return newClob;
     }
 
     /**
-     * Constructs a <code>ClobStreamControl</code> object used to perform
+     * Constructs a <code>TemporaryClob</code> object used to perform
      * operations on a CLOB value.
-     *
+     * 
      * @param dbName name of the database the CLOB value belongs to
      * @param conChild connection object used to obtain synchronization object
      * @throws NullPointerException if <code>conChild</code> is
      *      <code>null</code>
      */
-    ClobStreamControl (String dbName, ConnectionChild conChild) {
+    TemporaryClob (String dbName, ConnectionChild conChild) {
         if (conChild == null) {
             throw new NullPointerException("conChild cannot be <null>");
         }
@@ -146,14 +146,14 @@
     }
 
     /**
-     * Constructs a <code>ClobStreamControl</code> object and
+     * Constructs a <code>TemporaryClob</code> object and
      * initializes with a initial String.
-     *
+     * 
      * @param dbName name of the database the CLOB value belongs to
      * @param data initial value in String
      * @param conChild connection object used to obtain synchronization object
      */
-    ClobStreamControl (String dbName, String data, ConnectionChild conChild)
+    TemporaryClob (String dbName, String data, ConnectionChild conChild)
                           throws IOException, SQLException, StandardException {
         if (conChild == null) {
             throw new NullPointerException("conChild cannot be <null>");

Modified: db/derby/code/trunk/java/testing/org/apache/derby/impl/jdbc/BiggerTemporaryClobTest.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/testing/org/apache/derby/impl/jdbc/BiggerTemporaryClobTest.java?view=diff&rev=547657&r1=547656&r2=547657
==============================================================================
--- db/derby/code/trunk/java/testing/org/apache/derby/impl/jdbc/BiggerTemporaryClobTest.java
(original)
+++ db/derby/code/trunk/java/testing/org/apache/derby/impl/jdbc/BiggerTemporaryClobTest.java
Fri Jun 15 05:41:46 2007
@@ -52,7 +52,7 @@
         super.bytesPerChar = BYTES_PER_CHAR;
         EmbedStatement embStmt = (EmbedStatement)createStatement();
         EmbedConnection embCon =(EmbedConnection)getConnection();
-        iClob = new ClobStreamControl(embCon.getDBName(), embStmt);
+        iClob = new TemporaryClob(embCon.getDBName(), embStmt);
         transferData(
             new LoopingAlphabetReader(CLOBLENGTH, CharAlphabet.cjkSubset()),
             iClob.getWriter(1L),

Modified: db/derby/code/trunk/java/testing/org/apache/derby/impl/jdbc/SmallTemporaryClobTest.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/testing/org/apache/derby/impl/jdbc/SmallTemporaryClobTest.java?view=diff&rev=547657&r1=547656&r2=547657
==============================================================================
--- db/derby/code/trunk/java/testing/org/apache/derby/impl/jdbc/SmallTemporaryClobTest.java
(original)
+++ db/derby/code/trunk/java/testing/org/apache/derby/impl/jdbc/SmallTemporaryClobTest.java
Fri Jun 15 05:41:46 2007
@@ -54,7 +54,7 @@
         super.bytesPerChar = BYTES_PER_CHAR;
         EmbedStatement embStmt = (EmbedStatement)createStatement();
         EmbedConnection embCon =(EmbedConnection)getConnection();
-        iClob = new ClobStreamControl(embCon.getDBName(), embStmt);
+        iClob = new TemporaryClob(embCon.getDBName(), embStmt);
         transferData(
             new LoopingAlphabetReader(CLOBLENGTH, CharAlphabet.tamil()),
             iClob.getWriter(1L),



Mime
View raw message