You are viewing a plain text version of this content. The canonical link for it is here.
Posted to derby-commits@db.apache.org by dj...@apache.org on 2006/01/07 18:33:22 UTC
svn commit: r366859 - in /db/derby/code/trunk/java/engine/org/apache/derby:
iapi/sql/execute/ impl/sql/ impl/sql/execute/
Author: djd
Date: Sat Jan 7 09:33:17 2006
New Revision: 366859
URL: http://svn.apache.org/viewcvs?rev=366859&view=rev
Log:
Cleanup related to ConstantAction class hierachy in preparation
for splitting the implementation hierachy into constant actions
and DML constants.
Remove uptoDate method which always returned true and unused interface KeyToBaseRowConstantAction
and some other unused implementation methods and constants.
Removed:
db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/KeyToBaseRowConstantAction.java
Modified:
db/derby/code/trunk/java/engine/org/apache/derby/iapi/sql/execute/ConstantAction.java
db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/GenericPreparedStatement.java
db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/GenericConstantAction.java
db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/UpdatableVTIConstantAction.java
db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/WriteCursorConstantAction.java
Modified: db/derby/code/trunk/java/engine/org/apache/derby/iapi/sql/execute/ConstantAction.java
URL: http://svn.apache.org/viewcvs/db/derby/code/trunk/java/engine/org/apache/derby/iapi/sql/execute/ConstantAction.java?rev=366859&r1=366858&r2=366859&view=diff
==============================================================================
--- db/derby/code/trunk/java/engine/org/apache/derby/iapi/sql/execute/ConstantAction.java (original)
+++ db/derby/code/trunk/java/engine/org/apache/derby/iapi/sql/execute/ConstantAction.java Sat Jan 7 09:33:17 2006
@@ -39,11 +39,6 @@
public interface ConstantAction
{
-
- /* Types of Statistics commands */
- public static final int STATISTICSTIMING = 1;
- public static final int RUNTIMESTATISTICS = 2;
-
/**
* Run the ConstantAction.
*
@@ -67,14 +62,4 @@
* @exception StandardException on error
*/
public boolean modifiesTableId(UUID tableId) throws StandardException;
-
- /**
- * Reports whether these constants are up-to-date. This returns true
- * for homogenous Cloudscape/Cloudsync. For the Plugin, this may
- * return false;
- *
- * @return true if these constants are up-to-date
- * false otherwise
- */
- public boolean upToDate() throws StandardException;
}
Modified: db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/GenericPreparedStatement.java
URL: http://svn.apache.org/viewcvs/db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/GenericPreparedStatement.java?rev=366859&r1=366858&r2=366859&view=diff
==============================================================================
--- db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/GenericPreparedStatement.java (original)
+++ db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/GenericPreparedStatement.java Sat Jan 7 09:33:17 2006
@@ -198,16 +198,7 @@
public synchronized boolean upToDate()
throws StandardException
{
- boolean upToDate = isValid && (activationClass != null) && !compilingStatement;
-
- // this if for the Plugin
- if ( executionConstants != null )
- {
- boolean constantsUpToDate = executionConstants.upToDate();
- upToDate = upToDate && constantsUpToDate;
- }
-
- return upToDate;
+ return isValid && (activationClass != null) && !compilingStatement;
}
public void rePrepare(LanguageConnectionContext lcc)
Modified: db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/GenericConstantAction.java
URL: http://svn.apache.org/viewcvs/db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/GenericConstantAction.java?rev=366859&r1=366858&r2=366859&view=diff
==============================================================================
--- db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/GenericConstantAction.java (original)
+++ db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/GenericConstantAction.java Sat Jan 7 09:33:17 2006
@@ -75,30 +75,4 @@
public final void readExternal(java.io.ObjectInput in ) {}
public final void writeExternal(java.io.ObjectOutput out) {}
-
-
- /**
- * Reports whether these constants are up-to-date. This returns true
- * for homogenous Cloudscape/Cloudsync. For the Plugin, this may
- * return false;
- *
- * @return true if these constants are up-to-date
- * false otherwise
- */
- public final boolean upToDate() throws StandardException
- { return true; }
-
-/* protected final void writeFormatableArray(FormatableHashtable fh, String tag, Object[] array)
- {
- fh.put(tag, array == null ? null : new FormatableArrayHolder(array));
- }
-
- protected final Object[] readFormatableArray(FormatableHashtable fh, String tag, Class type)
- {
- FormatableArrayHolder fah = (FormatableArrayHolder)fh.get(tag);
- return (fah != null) ?
- fah.getArray(type) :
- null;
- }
- */
}
Modified: db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/UpdatableVTIConstantAction.java
URL: http://svn.apache.org/viewcvs/db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/UpdatableVTIConstantAction.java?rev=366859&r1=366858&r2=366859&view=diff
==============================================================================
--- db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/UpdatableVTIConstantAction.java (original)
+++ db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/UpdatableVTIConstantAction.java Sat Jan 7 09:33:17 2006
@@ -140,17 +140,6 @@
*/
public int getTypeFormatId() { return StoredFormatIds.UPDATABLE_VTI_CONSTANT_ACTION_V01_ID; }
-
- /**
- * NOP routine. The work is done in subclass.
- *
- * @see ConstantAction#executeConstantAction
- *
- * @exception StandardException Thrown on failure
- */
- public void executeConstantAction( Activation activation )
- throws StandardException { }
-
// CLASS METHODS
}
Modified: db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/WriteCursorConstantAction.java
URL: http://svn.apache.org/viewcvs/db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/WriteCursorConstantAction.java?rev=366859&r1=366858&r2=366859&view=diff
==============================================================================
--- db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/WriteCursorConstantAction.java (original)
+++ db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/WriteCursorConstantAction.java Sat Jan 7 09:33:17 2006
@@ -229,18 +229,6 @@
//
///////////////////////////////////////////////////////////////////
-
- /**
- * Reports whether these constants are up-to-date. This returns true
- * for homogenous Cloudscape/Cloudsync. For the Plugin, this may
- * return false;
- *
- * @return true if these constants are up-to-date
- * false otherwise
- */
- public boolean upToDate()
- { return true; }
-
/**
* NOP routine. The work is done in InsertResultSet.
*
@@ -248,7 +236,7 @@
*
* @exception StandardException Thrown on failure
*/
- public void executeConstantAction( Activation activation )
+ public final void executeConstantAction( Activation activation )
throws StandardException { }
// Formatable methods