Author: djd
Date: Wed Dec  5 08:25:58 2007
New Revision: 601395

URL: http://svn.apache.org/viewvc?rev=601395&view=rev
Log:
DERBY-3049 Remove final traces of language ResultSet.getResultDescription(). Method was being removed as the result description was not specific to the ResultSet and thus was confusing. The ResultDescription is specific to the statement and is available through the activation or prepared plan.

Modified:
    db/derby/code/trunk/java/engine/org/apache/derby/iapi/sql/ResultSet.java
    db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/DMLVTIResultSet.java
    db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/DeleteResultSet.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/NoPutResultSetImpl.java
    db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/NoRowsResultSetImpl.java
    db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/TemporaryRowHolderResultSet.java
    db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/UpdateResultSet.java

Modified: db/derby/code/trunk/java/engine/org/apache/derby/iapi/sql/ResultSet.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/engine/org/apache/derby/iapi/sql/ResultSet.java?rev=601395&r1=601394&r2=601395&view=diff
==============================================================================
--- db/derby/code/trunk/java/engine/org/apache/derby/iapi/sql/ResultSet.java (original)
+++ db/derby/code/trunk/java/engine/org/apache/derby/iapi/sql/ResultSet.java Wed Dec  5 08:25:58 2007
@@ -84,17 +84,6 @@
 	 * @return	The number of rows affect by the statement, so far.
 	 */
 	int	modifiedRowCount();
-
-	/**
-	 * Returns a ResultDescription object, which describes the results
-	 * of the statement this ResultSet is in. This will *not* be a
-	 * description of this particular ResultSet, if this is not the
-	 * outermost ResultSet.
-	 *
-	 * @return	A ResultDescription describing the results of the
-	 *		statement.
-	 */
-	ResultDescription	getResultDescription();
 	
 	Activation getActivation();
 

Modified: db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/DMLVTIResultSet.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/DMLVTIResultSet.java?rev=601395&r1=601394&r2=601395&view=diff
==============================================================================
--- db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/DMLVTIResultSet.java (original)
+++ db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/DMLVTIResultSet.java Wed Dec  5 08:25:58 2007
@@ -51,19 +51,9 @@
 	UpdatableVTIConstantAction	constants;
 	TransactionController 	tc;
 
-    ResultDescription 		resultDescription;
 	private int						numOpens;
 	boolean				firstExecute;
 
-	/**
-     * Returns the description of the inserted rows.
-     * REVISIT: Do we want this to return NULL instead?
-	 */
-	public ResultDescription getResultDescription()
-	{
-	    return resultDescription;
-	}
-
     /**
 	 *
 	 * @exception StandardException		Thrown on error
@@ -77,8 +67,6 @@
 		constants = (UpdatableVTIConstantAction) constantAction;
 
         tc = activation.getTransactionController();
-
-        resultDescription = sourceResultSet.getResultDescription();
 	}
 	
 	/**

Modified: db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/DeleteResultSet.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/DeleteResultSet.java?rev=601395&r1=601394&r2=601395&view=diff
==============================================================================
--- db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/DeleteResultSet.java (original)
+++ db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/DeleteResultSet.java Wed Dec  5 08:25:58 2007
@@ -81,15 +81,6 @@
 	ExecRow		deferredRLRow = null;
 	int	numberOfBaseColumns = 0;
 
-	/**
-     * Returns the description of the deleted rows.
-     * REVISIT: Do we want this to return NULL instead?
-	 */
-	public ResultDescription getResultDescription()
-	{
-	    return resultDescription;
-	}
-
     /*
      * class interface
      *
@@ -130,7 +121,7 @@
 		noTriggersOrFks = ((fkInfoArray == null) && (triggerInfo == null));
 		baseRowReadList = constants.getBaseRowReadList();
 		if(source != null)
-			resultDescription = source.getResultDescription();
+			resultDescription = activation.getResultDescription();
 		else
 			resultDescription = constants.resultDescription;
 

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=601395&r1=601394&r2=601395&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 Wed Dec  5 08:25:58 2007
@@ -97,7 +97,6 @@
 
 	// divined at run time
 
-    private	ResultDescription 		resultDescription;
 	private RowChanger 				rowChanger;
 
 	private	TransactionController 	tc;
@@ -167,15 +166,6 @@
 	private boolean					setIdentity;
 	
 
-	/**
-     * Returns the description of the inserted rows.
-     * REVISIT: Do we want this to return NULL instead?
-	 */
-	public ResultDescription getResultDescription()
-	{
-	    return resultDescription;
-	}
-
 	// TargetResultSet interface
 
 	/**
@@ -336,7 +326,7 @@
 				triggerInfo.hasTrigger(true, true) :
 				false;
 
-        resultDescription = sourceResultSet.getResultDescription();
+        ResultDescription resultDescription = activation.getResultDescription();
 
 		// Is this a bulkInsert or regular insert?
 		String insertMode = constants.getProperty("insertMode");

Modified: db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/NoPutResultSetImpl.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/NoPutResultSetImpl.java?rev=601395&r1=601394&r2=601395&view=diff
==============================================================================
--- db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/NoPutResultSetImpl.java (original)
+++ db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/NoPutResultSetImpl.java Wed Dec  5 08:25:58 2007
@@ -100,13 +100,6 @@
 	// NoPutResultSet interface
 
 	/**
-     * Returns the description of the table's rows
-	 */
-	public final ResultDescription getResultDescription() {
-	    return activation.getResultDescription();
-	}
-
-	/**
 		Return my cursor name for JDBC. Can be null.
 	*/
 	public String getCursorName() {

Modified: db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/NoRowsResultSetImpl.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/NoRowsResultSetImpl.java?rev=601395&r1=601394&r2=601395&view=diff
==============================================================================
--- db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/NoRowsResultSetImpl.java (original)
+++ db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/NoRowsResultSetImpl.java Wed Dec  5 08:25:58 2007
@@ -119,14 +119,6 @@
 	 * Returns zero.
 	 */
 	public int	modifiedRowCount() { return 0; }
-
-	/**
-	 * Returns null.
-	 */
-	public ResultDescription	getResultDescription()
-	{
-	    return (ResultDescription)null;
-	}
 	
 	public final Activation getActivation()
 	{

Modified: db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/TemporaryRowHolderResultSet.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/TemporaryRowHolderResultSet.java?rev=601395&r1=601394&r2=601395&view=diff
==============================================================================
--- db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/TemporaryRowHolderResultSet.java (original)
+++ db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/TemporaryRowHolderResultSet.java Wed Dec  5 08:25:58 2007
@@ -588,20 +588,6 @@
 	public int modifiedRowCount() { return 0;};
 
 	/**
-	 * Returns a ResultDescription object, which describes the results
-	 * of the statement this ResultSet is in. This will *not* be a
-	 * description of this particular ResultSet, if this is not the
-	 * outermost ResultSet.
-	 *
-	 * @return	A ResultDescription describing the results of the
-	 *		statement.
-	 */
-	public ResultDescription	getResultDescription()
-	{
-		return null;
-	}
-
-	/**
 	 * Tells the system that there will be calls to getNextRow().
 	 *
 	 * @exception StandardException		Thrown on failure

Modified: db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/UpdateResultSet.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/UpdateResultSet.java?rev=601395&r1=601394&r2=601395&view=diff
==============================================================================
--- db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/UpdateResultSet.java (original)
+++ db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/UpdateResultSet.java Wed Dec  5 08:25:58 2007
@@ -61,7 +61,6 @@
 	private ExecRow 					deferredSparseRow;
 	UpdateConstantAction		constants;
 	
-    private ResultDescription 		resultDescription;
 	private NoPutResultSet			source;
 	NoPutResultSet			savedSource;
 	private RowChanger				rowChanger;
@@ -97,14 +96,6 @@
 	boolean deferred;
 	boolean beforeUpdateCopyRequired = false;
 
-	/**
-     * Returns the description of the updated rows.
-     * REVISIT: Do we want this to return NULL instead?
-	 */
-	public ResultDescription getResultDescription()
-	{
-	    return resultDescription;
-	}
 
     /*
      * class interface
@@ -181,8 +172,9 @@
 		heapConglom = constants.conglomId;
 
 		baseRowReadList = constants.getBaseRowReadList();
+        ResultDescription resultDescription;
 		if(passedInRsd ==null)
-			resultDescription = source.getResultDescription();
+			resultDescription = activation.getResultDescription();
 		else
 			resultDescription = passedInRsd;
 		/*