Return-Path: X-Original-To: apmail-db-derby-commits-archive@www.apache.org Delivered-To: apmail-db-derby-commits-archive@www.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id DF71792BD for ; Thu, 22 Dec 2011 13:16:48 +0000 (UTC) Received: (qmail 67822 invoked by uid 500); 22 Dec 2011 13:16:48 -0000 Delivered-To: apmail-db-derby-commits-archive@db.apache.org Received: (qmail 67802 invoked by uid 500); 22 Dec 2011 13:16:48 -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 67795 invoked by uid 99); 22 Dec 2011 13:16:48 -0000 Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 22 Dec 2011 13:16:48 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=5.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 22 Dec 2011 13:16:41 +0000 Received: from eris.apache.org (localhost [127.0.0.1]) by eris.apache.org (Postfix) with ESMTP id C2A4C23888FD; Thu, 22 Dec 2011 13:16:18 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1222215 - in /db/derby/code/trunk/java: engine/org/apache/derby/catalog/ engine/org/apache/derby/catalog/types/ engine/org/apache/derby/iapi/services/io/ engine/org/apache/derby/iapi/sql/ engine/org/apache/derby/iapi/sql/execute/ engine/or... Date: Thu, 22 Dec 2011 13:16:16 -0000 To: derby-commits@db.apache.org From: rhillegas@apache.org X-Mailer: svnmailer-1.0.8-patched Message-Id: <20111222131618.C2A4C23888FD@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: rhillegas Date: Thu Dec 22 13:16:15 2011 New Revision: 1222215 URL: http://svn.apache.org/viewvc?rev=1222215&view=rev Log: DERBY-866: Remove SQLPassword internal data type. Removed: db/derby/code/trunk/java/engine/org/apache/derby/iapi/types/SQLPassword.java Modified: db/derby/code/trunk/java/engine/org/apache/derby/catalog/SystemProcedures.java db/derby/code/trunk/java/engine/org/apache/derby/catalog/types/BaseTypeIdImpl.java db/derby/code/trunk/java/engine/org/apache/derby/catalog/types/TypesImplInstanceGetter.java db/derby/code/trunk/java/engine/org/apache/derby/iapi/services/io/RegisteredFormatIds.java db/derby/code/trunk/java/engine/org/apache/derby/iapi/services/io/StoredFormatIds.java db/derby/code/trunk/java/engine/org/apache/derby/iapi/sql/Activation.java db/derby/code/trunk/java/engine/org/apache/derby/iapi/sql/ParameterValueSet.java db/derby/code/trunk/java/engine/org/apache/derby/iapi/sql/execute/ExecRow.java db/derby/code/trunk/java/engine/org/apache/derby/iapi/types/DataType.java db/derby/code/trunk/java/engine/org/apache/derby/iapi/types/DataTypeDescriptor.java db/derby/code/trunk/java/engine/org/apache/derby/iapi/types/DataValueDescriptor.java db/derby/code/trunk/java/engine/org/apache/derby/iapi/types/DataValueFactory.java db/derby/code/trunk/java/engine/org/apache/derby/iapi/types/DataValueFactoryImpl.java db/derby/code/trunk/java/engine/org/apache/derby/iapi/types/ReaderToUTF8Stream.java db/derby/code/trunk/java/engine/org/apache/derby/iapi/types/SQLChar.java db/derby/code/trunk/java/engine/org/apache/derby/iapi/types/SQLRef.java db/derby/code/trunk/java/engine/org/apache/derby/iapi/types/SQLVarchar.java db/derby/code/trunk/java/engine/org/apache/derby/iapi/types/StringDataValue.java db/derby/code/trunk/java/engine/org/apache/derby/iapi/types/TypeId.java db/derby/code/trunk/java/engine/org/apache/derby/iapi/types/XML.java db/derby/code/trunk/java/engine/org/apache/derby/impl/jdbc/EmbedPreparedStatement.java db/derby/code/trunk/java/engine/org/apache/derby/impl/services/daemon/IndexStatisticsDaemonImpl.java db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/GenericActivationHolder.java db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/GenericParameter.java db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/GenericParameterValueSet.java db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/catalog/DataDictionaryImpl.java db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/CharTypeCompiler.java db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/SQLToJavaValueNode.java db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/TypeCompilerFactoryImpl.java db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/BaseActivation.java db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/BasicSortObserver.java db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/CardinalityCounter.java db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/IndexValueRow.java db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/InsertResultSet.java db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/RIBulkChecker.java db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/RowUtil.java db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/TemporaryRowHolderImpl.java db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/ValueRow.java db/derby/code/trunk/java/testing/org/apache/derbyTesting/unitTests/store/T_AccessRow.java Modified: db/derby/code/trunk/java/engine/org/apache/derby/catalog/SystemProcedures.java URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/engine/org/apache/derby/catalog/SystemProcedures.java?rev=1222215&r1=1222214&r2=1222215&view=diff ============================================================================== --- db/derby/code/trunk/java/engine/org/apache/derby/catalog/SystemProcedures.java (original) +++ db/derby/code/trunk/java/engine/org/apache/derby/catalog/SystemProcedures.java Thu Dec 22 13:16:15 2011 @@ -2046,7 +2046,7 @@ public class SystemProcedures { public static void SYSCS_CREATE_USER ( String userName, - char[] password + String password ) throws SQLException { @@ -2066,7 +2066,7 @@ public class SystemProcedures { */ dd.startWriting(lcc); - UserDescriptor userDescriptor = makeUserDescriptor( lcc, userName, password ); + UserDescriptor userDescriptor = makeUserDescriptor( lcc, userName, password.toCharArray() ); dd.addDescriptor( userDescriptor, null, DataDictionary.SYSUSERS_CATALOG_NUM, false, tc ); @@ -2104,7 +2104,7 @@ public class SystemProcedures { public static void SYSCS_RESET_PASSWORD ( String userName, - char[] password + String password ) throws SQLException { @@ -2124,7 +2124,7 @@ public class SystemProcedures { */ dd.startWriting(lcc); - UserDescriptor userDescriptor = makeUserDescriptor( lcc, userName, password ); + UserDescriptor userDescriptor = makeUserDescriptor( lcc, userName, password.toCharArray() ); dd.updateUser( userDescriptor, tc ); @@ -2136,7 +2136,7 @@ public class SystemProcedures { */ public static void SYSCS_MODIFY_PASSWORD ( - char[] password + String password ) throws SQLException { Modified: db/derby/code/trunk/java/engine/org/apache/derby/catalog/types/BaseTypeIdImpl.java URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/engine/org/apache/derby/catalog/types/BaseTypeIdImpl.java?rev=1222215&r1=1222214&r2=1222215&view=diff ============================================================================== --- db/derby/code/trunk/java/engine/org/apache/derby/catalog/types/BaseTypeIdImpl.java (original) +++ db/derby/code/trunk/java/engine/org/apache/derby/catalog/types/BaseTypeIdImpl.java Thu Dec 22 13:16:15 2011 @@ -185,7 +185,6 @@ public class BaseTypeIdImpl implements F break; case StoredFormatIds.CHAR_TYPE_ID_IMPL: - case StoredFormatIds.PASSWORD_TYPE_ID_IMPL: case StoredFormatIds.VARCHAR_TYPE_ID_IMPL: case StoredFormatIds.BLOB_TYPE_ID_IMPL: case StoredFormatIds.CLOB_TYPE_ID_IMPL: @@ -403,12 +402,6 @@ public class BaseTypeIdImpl implements F JDBCTypeId = Types.VARCHAR; break; - case StoredFormatIds.PASSWORD_TYPE_ID_IMPL: - schemaName = null; - unqualifiedName = TypeId.PASSWORD_NAME; - JDBCTypeId = Types.VARCHAR; - break; - case StoredFormatIds.LONGVARCHAR_TYPE_ID_IMPL: schemaName = null; unqualifiedName = TypeId.LONGVARCHAR_NAME; Modified: db/derby/code/trunk/java/engine/org/apache/derby/catalog/types/TypesImplInstanceGetter.java URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/engine/org/apache/derby/catalog/types/TypesImplInstanceGetter.java?rev=1222215&r1=1222214&r2=1222215&view=diff ============================================================================== --- db/derby/code/trunk/java/engine/org/apache/derby/catalog/types/TypesImplInstanceGetter.java (original) +++ db/derby/code/trunk/java/engine/org/apache/derby/catalog/types/TypesImplInstanceGetter.java Thu Dec 22 13:16:15 2011 @@ -38,7 +38,6 @@ public class TypesImplInstanceGetter ext case StoredFormatIds.REAL_TYPE_ID_IMPL: case StoredFormatIds.REF_TYPE_ID_IMPL: case StoredFormatIds.CHAR_TYPE_ID_IMPL: - case StoredFormatIds.PASSWORD_TYPE_ID_IMPL: case StoredFormatIds.VARCHAR_TYPE_ID_IMPL: case StoredFormatIds.LONGVARCHAR_TYPE_ID_IMPL: case StoredFormatIds.BIT_TYPE_ID_IMPL: Modified: db/derby/code/trunk/java/engine/org/apache/derby/iapi/services/io/RegisteredFormatIds.java URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/engine/org/apache/derby/iapi/services/io/RegisteredFormatIds.java?rev=1222215&r1=1222214&r2=1222215&view=diff ============================================================================== --- db/derby/code/trunk/java/engine/org/apache/derby/iapi/services/io/RegisteredFormatIds.java (original) +++ db/derby/code/trunk/java/engine/org/apache/derby/iapi/services/io/RegisteredFormatIds.java Thu Dec 22 13:16:15 2011 @@ -536,8 +536,5 @@ String[] TwoByte = { /* 472 */ "org.apache.derby.impl.sql.catalog.CoreDDFinderClassInfo", /* 473 */ "org.apache.derby.impl.sql.catalog.CoreDDFinderClassInfo", /* 474 */ "org.apache.derby.catalog.types.UDTAliasInfo", - /* 475 */ null, - /* 476 */ "org.apache.derby.catalog.types.TypesImplInstanceGetter", - /* 477 */ "org.apache.derby.iapi.types.DTSClassInfo", //InstanceGetter }; } Modified: db/derby/code/trunk/java/engine/org/apache/derby/iapi/services/io/StoredFormatIds.java URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/engine/org/apache/derby/iapi/services/io/StoredFormatIds.java?rev=1222215&r1=1222214&r2=1222215&view=diff ============================================================================== --- db/derby/code/trunk/java/engine/org/apache/derby/iapi/services/io/StoredFormatIds.java (original) +++ db/derby/code/trunk/java/engine/org/apache/derby/iapi/services/io/StoredFormatIds.java Thu Dec 22 13:16:15 2011 @@ -257,18 +257,6 @@ public interface StoredFormatIds { (MIN_ID_2 + 265); /** - class org.apache.derby.iapi.types.PasswordTypeId - */ - static public final int PASSWORD_TYPE_ID = - (MIN_ID_2 + 475); - - /** - class org.apache.derby.catalog.types.PasswordTypeIdImpl - */ - static public final int PASSWORD_TYPE_ID_IMPL = - (MIN_ID_2 + 476); - - /** class org.apache.derby.iapi.types.VarcharTypeId */ static public final int VARCHAR_TYPE_ID = @@ -1529,9 +1517,6 @@ public interface StoredFormatIds { public static final int SQL_LONGINT_ID = (MIN_ID_2 + 84); - public static final int SQL_PASSWORD_ID = - (MIN_ID_2 + 477); - public static final int SQL_VARCHAR_ID = (MIN_ID_2 + 85); @@ -1919,7 +1904,7 @@ public interface StoredFormatIds { * Make sure this is updated when a new module is added */ public static final int MAX_ID_2 = - (MIN_ID_2 + 477); + (MIN_ID_2 + 474); // DO NOT USE 4 BYTE IDS ANYMORE static public final int MAX_ID_4 = Modified: db/derby/code/trunk/java/engine/org/apache/derby/iapi/sql/Activation.java URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/engine/org/apache/derby/iapi/sql/Activation.java?rev=1222215&r1=1222214&r2=1222215&view=diff ============================================================================== --- db/derby/code/trunk/java/engine/org/apache/derby/iapi/sql/Activation.java (original) +++ db/derby/code/trunk/java/engine/org/apache/derby/iapi/sql/Activation.java Thu Dec 22 13:16:15 2011 @@ -299,7 +299,7 @@ public interface Activation extends Depe @return A RowLocation template for the conglomerate */ - public RowLocation getRowLocationTemplate(int itemNumber) throws StandardException; + public RowLocation getRowLocationTemplate(int itemNumber); /** Get the number of subqueries in the entire query. Modified: db/derby/code/trunk/java/engine/org/apache/derby/iapi/sql/ParameterValueSet.java URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/engine/org/apache/derby/iapi/sql/ParameterValueSet.java?rev=1222215&r1=1222214&r2=1222215&view=diff ============================================================================== --- db/derby/code/trunk/java/engine/org/apache/derby/iapi/sql/ParameterValueSet.java (original) +++ db/derby/code/trunk/java/engine/org/apache/derby/iapi/sql/ParameterValueSet.java Thu Dec 22 13:16:15 2011 @@ -138,7 +138,7 @@ public interface ParameterValueSet * * @return ParameterValueSet A clone of the ParameterValueSet and its contents. */ - ParameterValueSet getClone() throws StandardException; + ParameterValueSet getClone(); /** * Validate the parameters. This is done for situations where Modified: db/derby/code/trunk/java/engine/org/apache/derby/iapi/sql/execute/ExecRow.java URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/engine/org/apache/derby/iapi/sql/execute/ExecRow.java?rev=1222215&r1=1222214&r2=1222215&view=diff ============================================================================== --- db/derby/code/trunk/java/engine/org/apache/derby/iapi/sql/execute/ExecRow.java (original) +++ db/derby/code/trunk/java/engine/org/apache/derby/iapi/sql/execute/ExecRow.java Thu Dec 22 13:16:15 2011 @@ -21,7 +21,6 @@ package org.apache.derby.iapi.sql.execute; -import org.apache.derby.iapi.error.StandardException; import org.apache.derby.iapi.services.io.FormatableBitSet; import org.apache.derby.iapi.sql.Row; import org.apache.derby.iapi.types.DataValueDescriptor; @@ -40,7 +39,7 @@ public interface ExecRow extends Row { * * @return Row A clone of the Row and its contents. */ - ExecRow getClone() throws StandardException; + ExecRow getClone(); /** * Clone the Row. The cloned row will contain clones of the @@ -51,7 +50,7 @@ public interface ExecRow extends Row { * * @return Row A clone of the Row and its contents. */ - ExecRow getClone(FormatableBitSet clonedCols) throws StandardException; + ExecRow getClone(FormatableBitSet clonedCols); /** * Get a new row with the same columns type as this one, containing nulls. @@ -71,14 +70,14 @@ public interface ExecRow extends Row { * * @param columnPosition (1 based) */ - DataValueDescriptor cloneColumn(int columnPosition) throws StandardException; + DataValueDescriptor cloneColumn(int columnPosition); /** Get a clone of the array form of the row that Access expects. @see ExecRow#getRowArray */ - public DataValueDescriptor[] getRowArrayClone() throws StandardException; + public DataValueDescriptor[] getRowArrayClone(); /** Return the array of objects that the store needs. Modified: db/derby/code/trunk/java/engine/org/apache/derby/iapi/types/DataType.java URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/engine/org/apache/derby/iapi/types/DataType.java?rev=1222215&r1=1222214&r2=1222215&view=diff ============================================================================== --- db/derby/code/trunk/java/engine/org/apache/derby/iapi/types/DataType.java (original) +++ db/derby/code/trunk/java/engine/org/apache/derby/iapi/types/DataType.java Thu Dec 22 13:16:15 2011 @@ -643,7 +643,7 @@ public abstract class DataType * * @return A shallow clone. */ - public DataValueDescriptor cloneHolder() throws StandardException { + public DataValueDescriptor cloneHolder() { return cloneValue(false); } Modified: db/derby/code/trunk/java/engine/org/apache/derby/iapi/types/DataTypeDescriptor.java URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/engine/org/apache/derby/iapi/types/DataTypeDescriptor.java?rev=1222215&r1=1222214&r2=1222215&view=diff ============================================================================== --- db/derby/code/trunk/java/engine/org/apache/derby/iapi/types/DataTypeDescriptor.java (original) +++ db/derby/code/trunk/java/engine/org/apache/derby/iapi/types/DataTypeDescriptor.java Thu Dec 22 13:16:15 2011 @@ -199,16 +199,6 @@ public final class DataTypeDescriptor im StringDataValue.COLLATION_DERIVATION_IMPLICIT).getCatalogType(); } - /** - * Get the descriptor for an internal PASSWORD type. - */ - public static TypeDescriptor getPasswordDataTypeDescriptor( boolean isNullable ) - { - BaseTypeIdImpl baseTypeID = new BaseTypeIdImpl( StoredFormatIds.PASSWORD_TYPE_ID_IMPL ); - - return new TypeDescriptorImpl( baseTypeID, isNullable, TypeId.VARCHAR_MAXWIDTH ); - } - /** * Get a descriptor that corresponds to a builtin JDBC type. * Modified: db/derby/code/trunk/java/engine/org/apache/derby/iapi/types/DataValueDescriptor.java URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/engine/org/apache/derby/iapi/types/DataValueDescriptor.java?rev=1222215&r1=1222214&r2=1222215&view=diff ============================================================================== --- db/derby/code/trunk/java/engine/org/apache/derby/iapi/types/DataValueDescriptor.java (original) +++ db/derby/code/trunk/java/engine/org/apache/derby/iapi/types/DataValueDescriptor.java Thu Dec 22 13:16:15 2011 @@ -326,7 +326,7 @@ public interface DataValueDescriptor ext * * @return A clone of this descriptor, which shares the internal state. */ - public DataValueDescriptor cloneHolder() throws StandardException; + public DataValueDescriptor cloneHolder(); /** * Clone this DataValueDescriptor. Results in a new object @@ -347,7 +347,7 @@ public interface DataValueDescriptor ext * value as this. */ public abstract DataValueDescriptor cloneValue( - boolean forceMaterialization) throws StandardException; + boolean forceMaterialization); /** * Recycle this DataValueDescriptor if possible. Create and return a new Modified: db/derby/code/trunk/java/engine/org/apache/derby/iapi/types/DataValueFactory.java URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/engine/org/apache/derby/iapi/types/DataValueFactory.java?rev=1222215&r1=1222214&r2=1222215&view=diff ============================================================================== --- db/derby/code/trunk/java/engine/org/apache/derby/iapi/types/DataValueFactory.java (original) +++ db/derby/code/trunk/java/engine/org/apache/derby/iapi/types/DataValueFactory.java Thu Dec 22 13:16:15 2011 @@ -615,12 +615,6 @@ public interface DataValueFactory StringDataValue getNullVarchar(StringDataValue dataValue); /** - * Get a PASSWORD with a SQL null value. - * - */ - StringDataValue getNullPassword(StringDataValue dataValue); - - /** * Get a SQL VARCHAR set to NULL with collation set to collationType. * If the supplied value is null then get a new value, * otherwise set it to null and return that value. Modified: db/derby/code/trunk/java/engine/org/apache/derby/iapi/types/DataValueFactoryImpl.java URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/engine/org/apache/derby/iapi/types/DataValueFactoryImpl.java?rev=1222215&r1=1222214&r2=1222215&view=diff ============================================================================== --- db/derby/code/trunk/java/engine/org/apache/derby/iapi/types/DataValueFactoryImpl.java (original) +++ db/derby/code/trunk/java/engine/org/apache/derby/iapi/types/DataValueFactoryImpl.java Thu Dec 22 13:16:15 2011 @@ -806,11 +806,6 @@ abstract class DataValueFactoryImpl impl } } - public StringDataValue getNullPassword(StringDataValue dataValue) - { - return new SQLPassword(); - } - /** * Get a SQL VARCHAR set to NULL with collation set to collationType. * If the supplied value is null then get a new value, @@ -1161,7 +1156,6 @@ abstract class DataValueFactoryImpl impl case StoredFormatIds.SQL_TIME_ID: return new SQLTime(); case StoredFormatIds.SQL_TIMESTAMP_ID: return new SQLTimestamp(); case StoredFormatIds.SQL_TINYINT_ID: return new SQLTinyint(); - case StoredFormatIds.SQL_PASSWORD_ID: return new SQLPassword(); case StoredFormatIds.SQL_VARCHAR_ID: return new SQLVarchar(); case StoredFormatIds.SQL_LONGVARCHAR_ID: return new SQLLongvarchar(); case StoredFormatIds.SQL_VARBIT_ID: return new SQLVarbit(); Modified: db/derby/code/trunk/java/engine/org/apache/derby/iapi/types/ReaderToUTF8Stream.java URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/engine/org/apache/derby/iapi/types/ReaderToUTF8Stream.java?rev=1222215&r1=1222214&r2=1222215&view=diff ============================================================================== --- db/derby/code/trunk/java/engine/org/apache/derby/iapi/types/ReaderToUTF8Stream.java (original) +++ db/derby/code/trunk/java/engine/org/apache/derby/iapi/types/ReaderToUTF8Stream.java Thu Dec 22 13:16:15 2011 @@ -140,7 +140,6 @@ public final class ReaderToUTF8Stream SanityManager.ASSERT(typeName != null && ( typeName.equals(TypeId.CHAR_NAME) || typeName.equals(TypeId.VARCHAR_NAME) || - typeName.equals(TypeId.PASSWORD_NAME) || typeName.equals(TypeId.CLOB_NAME)) || typeName.equals(TypeId.LONGVARCHAR_NAME)); } Modified: db/derby/code/trunk/java/engine/org/apache/derby/iapi/types/SQLChar.java URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/engine/org/apache/derby/iapi/types/SQLChar.java?rev=1222215&r1=1222214&r2=1222215&view=diff ============================================================================== --- db/derby/code/trunk/java/engine/org/apache/derby/iapi/types/SQLChar.java (original) +++ db/derby/code/trunk/java/engine/org/apache/derby/iapi/types/SQLChar.java Thu Dec 22 13:16:15 2011 @@ -235,7 +235,27 @@ public class SQLChar */ public SQLChar( char[] val ) { - setAndZeroOldValue( val ); + if ( val == null ) + { + value = null; + } + else + { + int length = val.length; + char[] localCopy = new char[ length ]; + System.arraycopy( val, 0, localCopy, 0, length ); + + copyState + ( + null, + localCopy, + length, + null, + null, + null, + null + ); + } } /************************************************************************** @@ -269,55 +289,16 @@ public class SQLChar *

*/ public char[] getRawDataAndZeroIt() - throws StandardException { - if ( isNull() ) { return null; } + if ( rawData == null ) { return null; } - char[] sourceValue = (rawData == null) ? getCharArray() : rawData; - - int length = sourceValue.length; + int length = rawData.length; char[] retval = new char[ length ]; - System.arraycopy( sourceValue, 0, retval, 0, length ); - - Arrays.fill( sourceValue, (char) 0 ); + System.arraycopy( rawData, 0, retval, 0, length ); - setAndZeroOldValue( sourceValue ); - - return retval; - } - - /** - *

- * This is a special setter for forcing this SQLChar to carry a password. - * See the discussion of passwords on DERBY-866. This zeroes the old - * character array and pokes in the new value. - *

- */ - public void setAndZeroOldValue( char[] val ) - { zeroRawData(); - if ( val == null ) - { - value = null; - } - else - { - int length = val.length; - char[] localCopy = new char[ length ]; - System.arraycopy( val, 0, localCopy, 0, length ); - - copyState - ( - null, - localCopy, - length, - null, - null, - null, - null - ); - } + return retval; } /** @@ -1417,8 +1398,7 @@ readingLoop: * difference of this method from cloneValue is this method does not * objectify a stream. */ - public DataValueDescriptor cloneHolder() throws StandardException - { + public DataValueDescriptor cloneHolder() { if ((stream == null) && (_clobValue == null)) { return cloneValue(false); } @@ -1435,7 +1415,6 @@ readingLoop: /** @see DataValueDescriptor#cloneValue */ public DataValueDescriptor cloneValue(boolean forceMaterialization) - throws StandardException { try { Modified: db/derby/code/trunk/java/engine/org/apache/derby/iapi/types/SQLRef.java URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/engine/org/apache/derby/iapi/types/SQLRef.java?rev=1222215&r1=1222214&r2=1222215&view=diff ============================================================================== --- db/derby/code/trunk/java/engine/org/apache/derby/iapi/types/SQLRef.java (original) +++ db/derby/code/trunk/java/engine/org/apache/derby/iapi/types/SQLRef.java Thu Dec 22 13:16:15 2011 @@ -190,7 +190,6 @@ public class SQLRef extends DataType imp /** @see DataValueDescriptor#cloneValue */ public DataValueDescriptor cloneValue(boolean forceMaterialization) - throws StandardException { /* In order to avoid a throws clause nightmare, we only call * the constructors which do not have a throws clause. Modified: db/derby/code/trunk/java/engine/org/apache/derby/iapi/types/SQLVarchar.java URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/engine/org/apache/derby/iapi/types/SQLVarchar.java?rev=1222215&r1=1222214&r2=1222215&view=diff ============================================================================== --- db/derby/code/trunk/java/engine/org/apache/derby/iapi/types/SQLVarchar.java (original) +++ db/derby/code/trunk/java/engine/org/apache/derby/iapi/types/SQLVarchar.java Thu Dec 22 13:16:15 2011 @@ -57,7 +57,6 @@ public class SQLVarchar /** @see DataValueDescriptor#cloneValue */ public DataValueDescriptor cloneValue(boolean forceMaterialization) - throws StandardException { try { Modified: db/derby/code/trunk/java/engine/org/apache/derby/iapi/types/StringDataValue.java URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/engine/org/apache/derby/iapi/types/StringDataValue.java?rev=1222215&r1=1222214&r2=1222215&view=diff ============================================================================== --- db/derby/code/trunk/java/engine/org/apache/derby/iapi/types/StringDataValue.java (original) +++ db/derby/code/trunk/java/engine/org/apache/derby/iapi/types/StringDataValue.java Thu Dec 22 13:16:15 2011 @@ -195,15 +195,6 @@ public interface StringDataValue extends */ public char[] getCharArray() throws StandardException; - /** - * Gets the enclosed character array and zeroes it. Used for covering - * our tracks as we ship a password across the system. We want the - * passwords to be smudged out as soon as possible so that they - * can't be memory-sniffed. - */ - public char[] getRawDataAndZeroIt() throws StandardException; - - /** * Gets either SQLChar/SQLVarchar/SQLLongvarchar/SQLClob(base classes) or * CollatorSQLChar/CollatorSQLVarchar/CollatorSQLLongvarch/CollatorSQLClob Modified: db/derby/code/trunk/java/engine/org/apache/derby/iapi/types/TypeId.java URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/engine/org/apache/derby/iapi/types/TypeId.java?rev=1222215&r1=1222214&r2=1222215&view=diff ============================================================================== --- db/derby/code/trunk/java/engine/org/apache/derby/iapi/types/TypeId.java (original) +++ db/derby/code/trunk/java/engine/org/apache/derby/iapi/types/TypeId.java Thu Dec 22 13:16:15 2011 @@ -150,7 +150,6 @@ public final class TypeId public static final String NUMERIC_NAME = "NUMERIC"; public static final String DECIMAL_NAME = "DECIMAL"; public static final String CHAR_NAME = "CHAR"; - public static final String PASSWORD_NAME = "PASSWORD"; public static final String VARCHAR_NAME = "VARCHAR"; public static final String LONGVARCHAR_NAME = "LONG VARCHAR"; public static final String DATE_NAME = "DATE"; @@ -211,7 +210,6 @@ public final class TypeId public static final int CLOB_PRECEDENCE = 14; public static final int LONGVARCHAR_PRECEDENCE = 12; public static final int VARCHAR_PRECEDENCE = 10; - public static final int PASSWORD_PRECEDENCE = 200; public static final int CHAR_PRECEDENCE = 0; /* @@ -247,8 +245,6 @@ public final class TypeId StoredFormatIds.DOUBLE_TYPE_ID, StoredFormatIds.DOUBLE_TYPE_ID_IMPL); private static final TypeId DECIMAL_ID = new TypeId(StoredFormatIds.DECIMAL_TYPE_ID, new DecimalTypeIdImpl(false)); private static final TypeId NUMERIC_ID = new TypeId(StoredFormatIds.DECIMAL_TYPE_ID, new DecimalTypeIdImpl(true)); - public static final TypeId PASSWORD_ID = create( - StoredFormatIds.PASSWORD_TYPE_ID, StoredFormatIds.PASSWORD_TYPE_ID_IMPL); private static final TypeId VARCHAR_ID = create( StoredFormatIds.VARCHAR_TYPE_ID, StoredFormatIds.VARCHAR_TYPE_ID_IMPL); private static final TypeId DATE_ID = create( @@ -645,12 +641,6 @@ public final class TypeId public static TypeId getTypeId(TypeDescriptor catalogType) { TypeDescriptorImpl tdi = (TypeDescriptorImpl) catalogType; - - if ( tdi.getTypeId().getTypeFormatId() == StoredFormatIds.PASSWORD_TYPE_ID_IMPL ) - { - return PASSWORD_ID; - } - final int jdbcType = catalogType.getJDBCTypeId(); TypeId typeId = TypeId.getBuiltInTypeId(jdbcType); if (typeId != null) @@ -685,7 +675,6 @@ public final class TypeId private boolean isLongConcatableTypeId; private boolean isNumericTypeId; private boolean isRefTypeId; - private boolean isPasswordTypeId; private boolean isStringTypeId; private boolean isFloatingPointTypeId; private boolean isRealTypeId; @@ -922,15 +911,6 @@ public final class TypeId isLOBTypeId = true; break; - case StoredFormatIds.PASSWORD_TYPE_ID: - typePrecedence = PASSWORD_PRECEDENCE; - javaTypeName = "char[]"; - maxMaxWidth = TypeId.VARCHAR_MAXWIDTH; - isStringTypeId = true; - isPasswordTypeId = true; - isConcatableTypeId = true; - break; - case StoredFormatIds.VARCHAR_TYPE_ID: typePrecedence = VARCHAR_PRECEDENCE; javaTypeName = "java.lang.String"; @@ -1048,16 +1028,6 @@ public final class TypeId } /** - * Does this TypeId represent a TypeId for a PASSWORD. - * - * @return Whether or not this TypeId represents a TypeId for a PASSWORD. - */ - public boolean isPasswordTypeId() - { - return isPasswordTypeId; - } - - /** * Does this TypeId represent a TypeId for a StringDataType. * * @return Whether or not this TypeId represents a TypeId for a StringDataType. @@ -1501,9 +1471,6 @@ public final class TypeId case StoredFormatIds.VARCHAR_TYPE_ID: return new SQLVarchar(); - case StoredFormatIds.PASSWORD_TYPE_ID: - return new SQLPassword(); - case StoredFormatIds.XML_TYPE_ID: return new XML(); Modified: db/derby/code/trunk/java/engine/org/apache/derby/iapi/types/XML.java URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/engine/org/apache/derby/iapi/types/XML.java?rev=1222215&r1=1222214&r2=1222215&view=diff ============================================================================== --- db/derby/code/trunk/java/engine/org/apache/derby/iapi/types/XML.java (original) +++ db/derby/code/trunk/java/engine/org/apache/derby/iapi/types/XML.java Thu Dec 22 13:16:15 2011 @@ -163,9 +163,7 @@ public class XML * underlying source data */ private XML(SQLChar val, int xmlType, boolean seqWithAttr, - boolean materialize) - throws StandardException - { + boolean materialize) { xmlStringValue = (val == null ? null : (SQLChar)val.cloneValue(materialize)); setXType(xmlType); @@ -180,9 +178,7 @@ public class XML /** * @see DataValueDescriptor#cloneValue */ - public DataValueDescriptor cloneValue(boolean forceMaterialization) - throws StandardException - { + public DataValueDescriptor cloneValue(boolean forceMaterialization) { return new XML(xmlStringValue, getXType(), hasTopLevelAttr(), forceMaterialization); } Modified: db/derby/code/trunk/java/engine/org/apache/derby/impl/jdbc/EmbedPreparedStatement.java URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/engine/org/apache/derby/impl/jdbc/EmbedPreparedStatement.java?rev=1222215&r1=1222214&r2=1222215&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 Dec 22 13:16:15 2011 @@ -1034,28 +1034,24 @@ public abstract class EmbedPreparedState * @exception SQLException if a database-access error occurs. */ public void addBatch() throws SQLException { - checkStatus(); - - // need to synchronize to ensure that two threads - // don't both create a Vector at the same time. This - // would lead to one of the set of parameters being thrown - // away - synchronized (getConnectionSynchronization()) { - if (batchStatements == null) - batchStatements = new Vector(); + checkStatus(); - try { - //get a clone of the parameterValueSet and save it in the vector - //which will be used later on at the time of batch execution. - //This way we will get a copy of the current statement's parameter - //values rather than a pointer to the statement's parameter value - //set which will change with every new statement in the batch. - batchStatements.add(getParms().getClone()); - clearParameters(); - } catch (StandardException t) { - throw EmbedResultSet.noStateChangeException(t); - } - } + // need to synchronized to ensure that two threads + // don't both create a Vector at the same time. This + // would lead to one of the set of parameters being thrown + // away + synchronized (getConnectionSynchronization()) { + if (batchStatements == null) + batchStatements = new Vector(); + + //get a clone of the parameterValueSet and save it in the vector + //which will be used later on at the time of batch execution. + //This way we will get a copy of the current statement's parameter + //values rather than a pointer to the statement's parameter value + //set which will change with every new statement in the batch. + batchStatements.add(getParms().getClone()); + clearParameters(); + } } boolean executeBatchElement(Object batchElement) throws SQLException, StandardException { Modified: db/derby/code/trunk/java/engine/org/apache/derby/impl/services/daemon/IndexStatisticsDaemonImpl.java URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/engine/org/apache/derby/impl/services/daemon/IndexStatisticsDaemonImpl.java?rev=1222215&r1=1222214&r2=1222215&view=diff ============================================================================== --- db/derby/code/trunk/java/engine/org/apache/derby/impl/services/daemon/IndexStatisticsDaemonImpl.java (original) +++ db/derby/code/trunk/java/engine/org/apache/derby/impl/services/daemon/IndexStatisticsDaemonImpl.java Thu Dec 22 13:16:15 2011 @@ -1204,9 +1204,7 @@ public class IndexStatisticsDaemonImpl * * @param ir index row (template) */ - public KeyComparator(ExecIndexRow ir) - throws StandardException - { + public KeyComparator(ExecIndexRow ir) { rowBufferArray = new DataValueDescriptor[FETCH_SIZE][]; rowBufferArray[0] = ir.getRowArray(); // 1 gets old objects. lastUniqueKey = ir.getRowArrayClone(); Modified: db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/GenericActivationHolder.java URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/GenericActivationHolder.java?rev=1222215&r1=1222214&r2=1222215&view=diff ============================================================================== --- db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/GenericActivationHolder.java (original) +++ db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/GenericActivationHolder.java Thu Dec 22 13:16:15 2011 @@ -421,7 +421,6 @@ final public class GenericActivationHold * @see Activation#getRowLocationTemplate */ public RowLocation getRowLocationTemplate(int itemNumber) - throws StandardException { return ac.getRowLocationTemplate(itemNumber); } Modified: db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/GenericParameter.java URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/GenericParameter.java?rev=1222215&r1=1222214&r2=1222215&view=diff ============================================================================== --- db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/GenericParameter.java (original) +++ db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/GenericParameter.java Thu Dec 22 13:16:15 2011 @@ -124,7 +124,6 @@ final class GenericParameter * @return a new generic parameter. */ public GenericParameter getClone(GenericParameterValueSet pvs) - throws StandardException { GenericParameter gpClone = new GenericParameter(pvs, isReturnOutputParameter); gpClone.initialize(this.getValue().cloneValue(false), Modified: db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/GenericParameterValueSet.java URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/GenericParameterValueSet.java?rev=1222215&r1=1222214&r2=1222215&view=diff ============================================================================== --- db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/GenericParameterValueSet.java (original) +++ db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/GenericParameterValueSet.java Thu Dec 22 13:16:15 2011 @@ -79,7 +79,6 @@ final class GenericParameterValueSet imp ** Construct a pvs by cloning a pvs. */ private GenericParameterValueSet(int numParms, GenericParameterValueSet pvs) - throws StandardException { this.hasReturnOutputParam = pvs.hasReturnOutputParam; this.ci = pvs.ci; @@ -327,7 +326,6 @@ final class GenericParameterValueSet imp public ParameterValueSet getClone() - throws StandardException { return(new GenericParameterValueSet(parms.length, this)); } Modified: db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/catalog/DataDictionaryImpl.java URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/catalog/DataDictionaryImpl.java?rev=1222215&r1=1222214&r2=1222215&view=diff ============================================================================== --- db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/catalog/DataDictionaryImpl.java (original) +++ db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/catalog/DataDictionaryImpl.java Thu Dec 22 13:16:15 2011 @@ -13048,7 +13048,7 @@ public final class DataDictionaryImpl TypeDescriptor[] arg_types = { CATALOG_TYPE_SYSTEM_IDENTIFIER, - DataTypeDescriptor.getPasswordDataTypeDescriptor( false ) + DataTypeDescriptor.getCatalogType( Types.VARCHAR, 32672 ) }; createSystemProcedureOrFunction @@ -13079,7 +13079,7 @@ public final class DataDictionaryImpl TypeDescriptor[] arg_types = { CATALOG_TYPE_SYSTEM_IDENTIFIER, - DataTypeDescriptor.getPasswordDataTypeDescriptor( false ) + DataTypeDescriptor.getCatalogType( Types.VARCHAR, 32672 ) }; createSystemProcedureOrFunction @@ -13109,7 +13109,7 @@ public final class DataDictionaryImpl // procedure argument types TypeDescriptor[] arg_types = { - DataTypeDescriptor.getPasswordDataTypeDescriptor( false ) + DataTypeDescriptor.getCatalogType( Types.VARCHAR, 32672 ) }; createSystemProcedureOrFunction Modified: db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/CharTypeCompiler.java URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/CharTypeCompiler.java?rev=1222215&r1=1222214&r2=1222215&view=diff ============================================================================== --- db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/CharTypeCompiler.java (original) +++ db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/CharTypeCompiler.java Thu Dec 22 13:16:15 2011 @@ -147,9 +147,6 @@ public final class CharTypeCompiler exte case StoredFormatIds.VARCHAR_TYPE_ID: return "getNullVarchar"; - case StoredFormatIds.PASSWORD_TYPE_ID: - return "getNullPassword"; - default: if (SanityManager.DEBUG) { Modified: db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/SQLToJavaValueNode.java URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/SQLToJavaValueNode.java?rev=1222215&r1=1222214&r2=1222215&view=diff ============================================================================== --- db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/SQLToJavaValueNode.java (original) +++ db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/SQLToJavaValueNode.java Thu Dec 22 13:16:15 2011 @@ -433,23 +433,12 @@ public class SQLToJavaValueNode extends if (returnsNullOnNullState != null) generateReturnsNullOnNullCheck(mbex); - if ( value.getTypeId().isPasswordTypeId() ) - { - // if we are setting a password, make sure we zero out the value - // that was passed in so that it can't be memory-sniffed - - mbex.callMethod(VMOpcode.INVOKEINTERFACE, ClassName.StringDataValue, "getRawDataAndZeroIt", - "char[]", 0); - } - else - { - /* Call getObject() to get the right type of Java value */ - mbex.callMethod(VMOpcode.INVOKEINTERFACE, ClassName.DataValueDescriptor, "getObject", - "java.lang.Object", 0); - - mbex.cast(value.getTypeId().getCorrespondingJavaTypeName()); - } - } + /* Call getObject() to get the right type of Java value */ + mbex.callMethod(VMOpcode.INVOKEINTERFACE, ClassName.DataValueDescriptor, "getObject", + "java.lang.Object", 0); + + mbex.cast(value.getTypeId().getCorrespondingJavaTypeName()); + } } /** Modified: db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/TypeCompilerFactoryImpl.java URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/TypeCompilerFactoryImpl.java?rev=1222215&r1=1222214&r2=1222215&view=diff ============================================================================== --- db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/TypeCompilerFactoryImpl.java (original) +++ db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/TypeCompilerFactoryImpl.java Thu Dec 22 13:16:15 2011 @@ -45,7 +45,6 @@ public class TypeCompilerFactoryImpl imp static TypeCompiler bitTypeCompiler; static TypeCompiler booleanTypeCompiler; static TypeCompiler charTypeCompiler; - static TypeCompiler passwordTypeCompiler; static TypeCompiler decimalTypeCompiler ; static TypeCompiler doubleTypeCompiler ; static TypeCompiler intTypeCompiler ; @@ -82,14 +81,6 @@ public class TypeCompilerFactoryImpl imp { String sqlTypeName; - if ( typeId.isPasswordTypeId() ) - { - return passwordTypeCompiler = - getAnInstance(PACKAGE_NAME + "CharTypeCompiler", - passwordTypeCompiler, - typeId); - } - switch (typeId.getJDBCTypeId()) { case Types.BINARY: Modified: db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/BaseActivation.java URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/BaseActivation.java?rev=1222215&r1=1222214&r2=1222215&view=diff ============================================================================== --- db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/BaseActivation.java (original) +++ db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/BaseActivation.java Thu Dec 22 13:16:15 2011 @@ -314,7 +314,6 @@ public abstract class BaseActivation imp @return A RowLocation template for the conglomerate */ public RowLocation getRowLocationTemplate(int itemNumber) - throws StandardException { if (SanityManager.DEBUG) { Modified: db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/BasicSortObserver.java URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/BasicSortObserver.java?rev=1222215&r1=1222214&r2=1222215&view=diff ============================================================================== --- db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/BasicSortObserver.java (original) +++ db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/BasicSortObserver.java Thu Dec 22 13:16:15 2011 @@ -135,7 +135,6 @@ public class BasicSortObserver implement private DataValueDescriptor[] getClone(DataValueDescriptor[] origArray) - throws StandardException { /* If the free list is not empty, then * get an DataValueDescriptor[] from there and swap Modified: db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/CardinalityCounter.java URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/CardinalityCounter.java?rev=1222215&r1=1222214&r2=1222215&view=diff ============================================================================== --- db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/CardinalityCounter.java (original) +++ db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/CardinalityCounter.java Thu Dec 22 13:16:15 2011 @@ -99,7 +99,6 @@ public class CardinalityCounter implemen } private DataValueDescriptor[] clone(DataValueDescriptor[] clonee) - throws StandardException { DataValueDescriptor[] cloned; Modified: db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/IndexValueRow.java URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/IndexValueRow.java?rev=1222215&r1=1222214&r2=1222215&view=diff ============================================================================== --- db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/IndexValueRow.java (original) +++ db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/IndexValueRow.java Thu Dec 22 13:16:15 2011 @@ -69,8 +69,7 @@ class IndexValueRow implements ExecIndex @see ExecRow#getRowArray */ - public DataValueDescriptor[] getRowArrayClone() - throws StandardException + public DataValueDescriptor[] getRowArrayClone() { return valueRow.getRowArrayClone(); } @@ -94,11 +93,11 @@ class IndexValueRow implements ExecIndex } // position is 1-based - public ExecRow getClone() throws StandardException { + public ExecRow getClone() { return new IndexValueRow(valueRow.getClone()); } - public ExecRow getClone(FormatableBitSet clonedCols) throws StandardException { + public ExecRow getClone(FormatableBitSet clonedCols) { return new IndexValueRow(valueRow.getClone(clonedCols)); } @@ -115,7 +114,6 @@ class IndexValueRow implements ExecIndex // position is 1-based public DataValueDescriptor cloneColumn(int columnPosition) - throws StandardException { return valueRow.cloneColumn(columnPosition); } Modified: db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/InsertResultSet.java URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/InsertResultSet.java?rev=1222215&r1=1222214&r2=1222215&view=diff ============================================================================== --- db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/InsertResultSet.java (original) +++ db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/InsertResultSet.java Thu Dec 22 13:16:15 2011 @@ -2439,7 +2439,7 @@ class InsertResultSet extends DMLWriteRe this.row = row; } - public Object invoke(Object ref) throws StandardException + public Object invoke(Object ref) { return row.getClone(); } Modified: db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/RIBulkChecker.java URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/RIBulkChecker.java?rev=1222215&r1=1222214&r2=1222215&view=diff ============================================================================== --- db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/RIBulkChecker.java (original) +++ db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/RIBulkChecker.java Thu Dec 22 13:16:15 2011 @@ -105,7 +105,6 @@ public class RIBulkChecker ConglomerateController unreferencedCC, ExecRow firstRowToFail ) - throws StandardException { this.referencedKeyScan = referencedKeyScan; this.foreignKeyScan = foreignKeyScan; Modified: db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/RowUtil.java URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/RowUtil.java?rev=1222215&r1=1222214&r2=1222215&view=diff ============================================================================== --- db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/RowUtil.java (original) +++ db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/RowUtil.java Thu Dec 22 13:16:15 2011 @@ -69,7 +69,6 @@ public class RowUtil @param count Clone this number of columns. */ public static void copyCloneColumns(ExecRow to, ExecRow from, int count) - throws StandardException { for (int ix = 1; ix <= count; ix++) { Modified: db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/TemporaryRowHolderImpl.java URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/TemporaryRowHolderImpl.java?rev=1222215&r1=1222214&r2=1222215&view=diff ============================================================================== --- db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/TemporaryRowHolderImpl.java (original) +++ db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/TemporaryRowHolderImpl.java Thu Dec 22 13:16:15 2011 @@ -200,7 +200,6 @@ class TemporaryRowHolderImpl implements * Beetle 4896. */ private ExecRow cloneRow(ExecRow inputRow) - throws StandardException { DataValueDescriptor[] cols = inputRow.getRowArray(); int ncols = cols.length; Modified: db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/ValueRow.java URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/ValueRow.java?rev=1222215&r1=1222214&r2=1222215&view=diff ============================================================================== --- db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/ValueRow.java (original) +++ db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/ValueRow.java Thu Dec 22 13:16:15 2011 @@ -21,7 +21,6 @@ package org.apache.derby.impl.sql.execute; -import org.apache.derby.iapi.error.StandardException; import org.apache.derby.iapi.services.io.FormatableBitSet; import org.apache.derby.iapi.sql.execute.ExecRow; import org.apache.derby.iapi.types.DataValueDescriptor; @@ -103,13 +102,12 @@ public class ValueRow implements ExecRow */ // position is 1-based - public ExecRow getClone() throws StandardException + public ExecRow getClone() { return getClone((FormatableBitSet) null); } public ExecRow getClone(FormatableBitSet clonedCols) - throws StandardException { int numColumns = column.length; @@ -170,7 +168,6 @@ public class ValueRow implements ExecRow // position is 1-based public final DataValueDescriptor cloneColumn(int columnPosition) - throws StandardException { return column[columnPosition -1].cloneValue(false); } @@ -210,8 +207,7 @@ public class ValueRow implements ExecRow @see ExecRow#getRowArray */ - public DataValueDescriptor[] getRowArrayClone() - throws StandardException + public DataValueDescriptor[] getRowArrayClone() { int numColumns = column.length; DataValueDescriptor[] columnClones = new DataValueDescriptor[numColumns]; Modified: db/derby/code/trunk/java/testing/org/apache/derbyTesting/unitTests/store/T_AccessRow.java URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/testing/org/apache/derbyTesting/unitTests/store/T_AccessRow.java?rev=1222215&r1=1222214&r2=1222215&view=diff ============================================================================== --- db/derby/code/trunk/java/testing/org/apache/derbyTesting/unitTests/store/T_AccessRow.java (original) +++ db/derby/code/trunk/java/testing/org/apache/derbyTesting/unitTests/store/T_AccessRow.java Thu Dec 22 13:16:15 2011 @@ -126,9 +126,7 @@ public class T_AccessRow return column; } - public DataValueDescriptor[] getRowArrayClone() - throws StandardException - { + public DataValueDescriptor[] getRowArrayClone() { DataValueDescriptor[] retval = new DataValueDescriptor[column.length]; for (int index = 0; index < column.length; index++) retval[index] = column[index].cloneValue(false);