db-derby-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From d..@apache.org
Subject svn commit: r424616 - in /db/derby/code/trunk/java/engine/org/apache/derby: iapi/sql/execute/ impl/sql/execute/
Date Sat, 22 Jul 2006 18:33:31 GMT
Author: djd
Date: Sat Jul 22 11:33:30 2006
New Revision: 424616

URL: http://svn.apache.org/viewvc?rev=424616&view=rev
Log:
Remove unused old modifiesTableUUID method from the ConstantAction hierarchy.

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/execute/DDLConstantAction.java
    db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/DDLSingleTableConstantAction.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/GrantRevokeConstantAction.java
    db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/SetConstraintsConstantAction.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/viewvc/db/derby/code/trunk/java/engine/org/apache/derby/iapi/sql/execute/ConstantAction.java?rev=424616&r1=424615&r2=424616&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 Jul 22 11:33:30 2006
@@ -48,18 +48,4 @@
 	 */
 	public void	executeConstantAction( Activation activation )
 						throws StandardException;
-
-
-	/**
-	 * Does this constant action modify the passed in table
-	 * uuid?  By modify we mean add or drop things tied to
-	 * this table (e.g. index, trigger, constraint).  Things
-	 * like views or spses that reference this table don't
-	 * count.
-	 *
-	 * @param tableId the other table id
-	 * 
-	 * @exception StandardException on error
-	 */
-	public boolean modifiesTableId(UUID tableId) throws StandardException;
 }

Modified: db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/DDLConstantAction.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/DDLConstantAction.java?rev=424616&r1=424615&r2=424616&view=diff
==============================================================================
--- db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/DDLConstantAction.java
(original)
+++ db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/DDLConstantAction.java
Sat Jul 22 11:33:30 2006
@@ -195,24 +195,6 @@
 		cc.close();
 	}
 
-	/**
-	 * Does this constant action modify the passed in table
-	 * uuid?  By modify we mean add or drop things tied to
-	 * this table (e.g. index, trigger, constraint).  Things
-	 * like views or spses that reference this table don't
-	 * count.
-	 *
-	 * @param tableId the table id
- 	 *
-	 * @exception StandardException on error
-	 */
-	public boolean modifiesTableId(UUID tableId) throws StandardException
-	{
-		// by default, assume we don't modify it
-		return false;
-	}
-
-
 	protected String constructToString(
 						String				statementType,
 						String              objectName)

Modified: db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/DDLSingleTableConstantAction.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/DDLSingleTableConstantAction.java?rev=424616&r1=424615&r2=424616&view=diff
==============================================================================
--- db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/DDLSingleTableConstantAction.java
(original)
+++ db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/DDLSingleTableConstantAction.java
Sat Jul 22 11:33:30 2006
@@ -41,25 +41,9 @@
 	 *
 	 * @param tableId the target table
 	 */
-	protected DDLSingleTableConstantAction(UUID tableId)
+	DDLSingleTableConstantAction(UUID tableId)
 	{
 		super();
 		this.tableId = tableId;
-	}
-
-	/**
-	 * Does this constant action modify the passed in table
-	 * uuid?  By modify we mean add or drop things tied to
-	 * this table (e.g. index, trigger, constraint).  Things
-	 * like views or spses that reference this table don't
-	 * count.
-	 *
-	 * @param tableId the table id
-	 */
-	public boolean modifiesTableId(UUID tableId)
-	{
-		return (this.tableId == null) ?
-			false :
-			this.tableId.equals(tableId);
 	}
 }

Modified: db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/GenericConstantAction.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/GenericConstantAction.java?rev=424616&r1=424615&r2=424616&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 Jul 22 11:33:30 2006
@@ -52,27 +52,6 @@
  */
 abstract class GenericConstantAction implements ConstantAction
 {
-	/**
-	 * Does this constant action modify the passed in table
-	 * uuid?  By modify we mean add or drop things tied to
-	 * this table (e.g. index, trigger, constraint).  Things
-	 * like views or spses that reference this table don't
-	 * count.
-	 *
-	 * @param tableId the other table id
-	 *
-	 * @exception   StandardException thrown on failure
-	 */
-	public boolean modifiesTableId(UUID tableId)
-		throws StandardException
-	{
-		if (SanityManager.DEBUG)
-		{
-			SanityManager.THROWASSERT("modifiesTableId() should have been implemented by a super class");
-		}
-		return false;
-	}
-
 	public final void readExternal(java.io.ObjectInput in ) {}
 	public final void writeExternal(java.io.ObjectOutput out) {}
 }

Modified: db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/GrantRevokeConstantAction.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/GrantRevokeConstantAction.java?rev=424616&r1=424615&r2=424616&view=diff
==============================================================================
--- db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/GrantRevokeConstantAction.java
(original)
+++ db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/GrantRevokeConstantAction.java
Sat Jul 22 11:33:30 2006
@@ -60,18 +60,4 @@
 	{
 		privileges.executeGrantRevoke( activation, grant, grantees);
 	}
-
-	/**
-	 * Does this constant action modify the passed in table
-	 * uuid?  By modify we mean add or drop things tied to
-	 * this table (e.g. index, trigger, constraint).
-	 * @param tableId the other table id
-	 *
-	 * @exception   StandardException thrown on failure
-	 */
-	public boolean modifiesTableId(UUID tableId)
-		throws StandardException
-	{
-		return false;
-	}
 }

Modified: db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/SetConstraintsConstantAction.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/SetConstraintsConstantAction.java?rev=424616&r1=424615&r2=424616&view=diff
==============================================================================
--- db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/SetConstraintsConstantAction.java
(original)
+++ db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/SetConstraintsConstantAction.java
Sat Jul 22 11:33:30 2006
@@ -482,49 +482,6 @@
 		return cdl;
 	}
 		
-	/**
-	 * Does this constant action modify the passed in table
-	 * uuid?  By modify we mean add or drop things tied to
-	 * this table (e.g. index, trigger, constraint).  Things
-	 * like views or spses that reference this table don't
-	 * count.
-	 * <p>
-	 * For SET CONSTRAINTS return true if it is SET CONSTRAINTS
-	 * ALL otherwise, compare the table ids.
-	 *
-	 * @param tableId the table id
-	 *
-	 * @exception StandardException on error
-	 */
-	public boolean modifiesTableId(UUID tableId) throws StandardException
-	{
-		if (tuuids != null) {
-			for (int i = 0; i < tuuids.length; i++) {
-				if (tableId.equals(tuuids[i]))
-					return true;
-			}
-			return false;
-		}
-
-		// assume SET CONSTRAINTS ALL touches this table
-		if ((cdl == null) || (cdl.size() == 0))
-		{
-			return true;
-		}
-
-		int cdlSize = cdl.size();
-		for (int index = 0; index < cdlSize; index++)
-		{
-			ConstraintDescriptor cd = cdl.elementAt(index);
-			if (cd.getTableId().equals(tableId))
-			{
-				return true;
-			}
-		}
-		
-		return false;
-	}
-
 	///////////////////////////////////////////////
 	//
 	// MISC

Modified: db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/UpdatableVTIConstantAction.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/UpdatableVTIConstantAction.java?rev=424616&r1=424615&r2=424616&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 Jul 22 11:33:30 2006
@@ -119,21 +119,6 @@
 	// INTERFACE METHODS
 
 	/**
-	 * Does this constant action modify the passed in table
-	 * uuid?  By modify we mean add or drop things tied to
-	 * this table (e.g. index, trigger, constraint).  Things
-	 * like views or spses that reference this table don't
-	 * count.
-	 *
-	 * @param tableId on error
-	 *
-	 */
-	public boolean modifiesTableId(UUID tableId)
-	{
-		return false;
-	}
-
-	/**
 	 * Get the formatID which corresponds to this class.
 	 *
 	 *	@return	the formatID of this class

Modified: db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/WriteCursorConstantAction.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/WriteCursorConstantAction.java?rev=424616&r1=424615&r2=424616&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 Jul 22 11:33:30 2006
@@ -408,22 +408,5 @@
 	{
 		return indexNames;
 	}
-
-	/**
-	 * Does this constant action modify the passed in table
-	 * uuid?  By modify we mean add or drop things tied to
-	 * this table (e.g. index, trigger, constraint).  Things
-	 * like views or spses that reference this table don't
-	 * count.
-	 *
-	 * @param tableId on error
-	 *
-	 */
-	public boolean modifiesTableId(UUID tableId)
-	{
-		return ((tableId != null) && (targetUUID != null)) ?
-			tableId.equals(targetUUID) :
-			false;
-	}
 }
  



Mime
View raw message