db-derby-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From d..@apache.org
Subject svn commit: r598468 - /db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/
Date Mon, 26 Nov 2007 23:57:10 GMT
Author: djd
Date: Mon Nov 26 15:57:08 2007
New Revision: 598468

URL: http://svn.apache.org/viewvc?rev=598468&view=rev
Log:
Remove unused argument (always passed as null) from BasicNoPutResultSetImpl.getCompactRow()

Modified:
    db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/BasicNoPutResultSetImpl.java
    db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/BulkTableScanResultSet.java
    db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/DependentResultSet.java
    db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/DistinctScanResultSet.java
    db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/HashScanResultSet.java
    db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/IndexRowToBaseRowResultSet.java
    db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/LastIndexKeyResultSet.java
    db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/TableScanResultSet.java

Modified: db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/BasicNoPutResultSetImpl.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/BasicNoPutResultSetImpl.java?rev=598468&r1=598467&r2=598468&view=diff
==============================================================================
--- db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/BasicNoPutResultSetImpl.java
(original)
+++ db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/BasicNoPutResultSetImpl.java
Mon Nov 26 15:57:08 2007
@@ -881,21 +881,12 @@
 	 * @param candidate		The row to get the columns from
 	 * @param accessedCols	A bit map of the columns that are accessed in
 	 *						the candidate row
-	 * @param otherCols		An bit map of other column ids - this is used
-	 *						in case columns from an index row will be
-	 *						copied into a heap row - in this case, we
-	 *						need to be sure there are enough columns in
-	 *						the compact row. This parameter is null if
-	 *						columns will not be copied from an index row
-	 *						to a compact heap row. The column numbers in
-	 *						the bit map are zero-based.
 	 * @param isKeyed		Tells whether to return a ValueRow or an IndexRow
 	 *
 	 * @return		A compact row.
 	 */
 	protected ExecRow getCompactRow(ExecRow candidate,
 									FormatableBitSet accessedCols,
-									FormatableBitSet otherCols,
 									boolean isKeyed)
 									throws StandardException
 	{
@@ -910,19 +901,7 @@
 		}
 		else
 		{
-			FormatableBitSet allCols;
-
-			if (otherCols == null)
-			{
-				allCols = accessedCols;
-			}
-			else
-			{
-				allCols = new FormatableBitSet(accessedCols);
-				allCols.or(otherCols);
-			}
-
-			int numCols = allCols.getNumBitsSet();
+			int numCols = accessedCols.getNumBitsSet();
 			baseColumnMap = new int[numCols];
 
 			if (compactRow == null)
@@ -940,9 +919,9 @@
 			}
 
 			int position = 0;
-			for (int i = allCols.anySetBit();
+			for (int i = accessedCols.anySetBit();
 					i != -1;
-					i = allCols.anySetBit(i))
+					i = accessedCols.anySetBit(i))
 			{
 				// Stop looking if there are columns beyond the columns
 				// in the candidate row. This can happen due to the
@@ -998,9 +977,9 @@
 	}
 
 
-	protected final void setCompatRow(ExecRow compactRow, Object[] sourceRow) {
+	protected final void setCompatRow(ExecRow compactRow, DataValueDescriptor[] sourceRow) {
 
-		Object[] destRow = compactRow.getRowArray();
+		DataValueDescriptor[] destRow = compactRow.getRowArray();
 		int[] lbcm = baseColumnMap;
 
 		for (int i = 0; i < lbcm.length; i++)

Modified: db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/BulkTableScanResultSet.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/BulkTableScanResultSet.java?rev=598468&r1=598467&r2=598468&view=diff
==============================================================================
--- db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/BulkTableScanResultSet.java
(original)
+++ db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/BulkTableScanResultSet.java
Mon Nov 26 15:57:08 2007
@@ -272,7 +272,6 @@
 				currentRow =
 					getCompactRow(candidate,
 									accessedCols,
-									(FormatableBitSet) null,
 									isKeyed);
 			}
 

Modified: db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/DependentResultSet.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/DependentResultSet.java?rev=598468&r1=598467&r2=598468&view=diff
==============================================================================
--- db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/DependentResultSet.java
(original)
+++ db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/DependentResultSet.java
Mon Nov 26 15:57:08 2007
@@ -334,7 +334,7 @@
 		if (currentRow == null)
 		{
 			currentRow =
-				getCompactRow(candidate, accessedCols, (FormatableBitSet) null, isKeyed);
+				getCompactRow(candidate, accessedCols, isKeyed);
 		} 
 
 		baseRowLocation = (RowLocation) indexRow.getColumn(indexRow.getRowArray().length);

Modified: db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/DistinctScanResultSet.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/DistinctScanResultSet.java?rev=598468&r1=598467&r2=598468&view=diff
==============================================================================
--- db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/DistinctScanResultSet.java
(original)
+++ db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/DistinctScanResultSet.java
Mon Nov 26 15:57:08 2007
@@ -31,6 +31,7 @@
 
 import org.apache.derby.iapi.store.access.Qualifier;
 import org.apache.derby.iapi.store.access.StaticCompiledOpenConglomInfo;
+import org.apache.derby.iapi.types.DataValueDescriptor;
 
 import java.util.Enumeration;
 
@@ -96,7 +97,6 @@
 	public ExecRow getNextRowCore() throws StandardException
 	{
 	    ExecRow result = null;
-		Object[] columns = null;
 
 		beginTime = getCurrentTimeMillis();
 	    if ( isOpen )
@@ -109,7 +109,7 @@
 
 			if (element.hasMoreElements())
 			{
-				columns = (Object[]) element.nextElement();
+                DataValueDescriptor[] columns = (DataValueDescriptor[]) element.nextElement();
 
 				setCompatRow(compactRow, columns);
 

Modified: db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/HashScanResultSet.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/HashScanResultSet.java?rev=598468&r1=598467&r2=598468&view=diff
==============================================================================
--- db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/HashScanResultSet.java
(original)
+++ db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/HashScanResultSet.java
Mon Nov 26 15:57:08 2007
@@ -204,7 +204,7 @@
             getLanguageConnectionContext().getRunTimeStatisticsMode();
 
 		compactRow =
-				getCompactRow(candidate, accessedCols, (FormatableBitSet) null, false);
+				getCompactRow(candidate, accessedCols, false);
 		recordConstructorTime();
     }
 

Modified: db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/IndexRowToBaseRowResultSet.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/IndexRowToBaseRowResultSet.java?rev=598468&r1=598467&r2=598468&view=diff
==============================================================================
--- db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/IndexRowToBaseRowResultSet.java
(original)
+++ db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/IndexRowToBaseRowResultSet.java
Mon Nov 26 15:57:08 2007
@@ -163,8 +163,7 @@
 		// variable compactRow which can be accessed through
 		// inheritance. Hence we need not collect the return value
 		// of the method.
-		getCompactRow(resultRow, accessedAllCols, 
-					  (FormatableBitSet)null, false);
+		getCompactRow(resultRow, accessedAllCols, false);
 
 		/* If there's no partial row bit map, then we want the entire
 		 * row, otherwise we need to diddle with the row array so that

Modified: db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/LastIndexKeyResultSet.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/LastIndexKeyResultSet.java?rev=598468&r1=598467&r2=598468&view=diff
==============================================================================
--- db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/LastIndexKeyResultSet.java
(original)
+++ db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/LastIndexKeyResultSet.java
Mon Nov 26 15:57:08 2007
@@ -201,7 +201,7 @@
 					candidateCopy.getRowArray()))
 		{
 			currentRow =
-			  getCompactRow(candidateCopy, accessedCols, (FormatableBitSet) null, true);
+			  getCompactRow(candidateCopy, accessedCols, true);
 			setCurrentRow(currentRow);
 		}
 		else

Modified: db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/TableScanResultSet.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/TableScanResultSet.java?rev=598468&r1=598467&r2=598468&view=diff
==============================================================================
--- db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/TableScanResultSet.java
(original)
+++ db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/TableScanResultSet.java
Mon Nov 26 15:57:08 2007
@@ -614,7 +614,7 @@
 		if (currentRow == null || scanRepositioned)
 		{
 			currentRow =
-				getCompactRow(candidate, accessedCols, (FormatableBitSet) null, isKeyed);
+				getCompactRow(candidate, accessedCols, isKeyed);
 		}
 
 		beginTime = getCurrentTimeMillis();
@@ -965,7 +965,7 @@
 
 		result = (ExecRow) resultRowAllocator.invoke(activation);
 		currentRow = 
-            getCompactRow(result, accessedCols, (FormatableBitSet) null, isKeyed);
+            getCompactRow(result, accessedCols, isKeyed);
 
         try
         {



Mime
View raw message