db-derby-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From d..@apache.org
Subject svn commit: r293436 - in /db/derby/code/trunk/java/engine/org/apache/derby: iapi/store/access/RowUtil.java impl/store/access/btree/BTreeScan.java impl/store/access/conglomerate/GenericScanController.java impl/store/access/heap/Heap.java
Date Mon, 03 Oct 2005 19:10:54 GMT
Author: djd
Date: Mon Oct  3 12:10:50 2005
New Revision: 293436

URL: http://svn.apache.org/viewcvs?rev=293436&view=rev
Log:
DERBY-404 Remove buggy code from RowUtil.isRowEmpty and never used parameter and fix callers.

Modified:
    db/derby/code/trunk/java/engine/org/apache/derby/iapi/store/access/RowUtil.java
    db/derby/code/trunk/java/engine/org/apache/derby/impl/store/access/btree/BTreeScan.java
    db/derby/code/trunk/java/engine/org/apache/derby/impl/store/access/conglomerate/GenericScanController.java
    db/derby/code/trunk/java/engine/org/apache/derby/impl/store/access/heap/Heap.java

Modified: db/derby/code/trunk/java/engine/org/apache/derby/iapi/store/access/RowUtil.java
URL: http://svn.apache.org/viewcvs/db/derby/code/trunk/java/engine/org/apache/derby/iapi/store/access/RowUtil.java?rev=293436&r1=293435&r2=293436&view=diff
==============================================================================
--- db/derby/code/trunk/java/engine/org/apache/derby/iapi/store/access/RowUtil.java (original)
+++ db/derby/code/trunk/java/engine/org/apache/derby/iapi/store/access/RowUtil.java Mon Oct
 3 12:10:50 2005
@@ -243,14 +243,12 @@
 
 	/**
 		See if a row actually contains no columns.
-		Returns true if row is null, row.length is null,
-		or columnList is not null but has not bits set.
+		Returns true if row is null or row.length is zero.
 
-		@return true if no columns are selected in this row.
+		@return true if row is empty.
 	*/
 	public static boolean isRowEmpty(
-    DataValueDescriptor[]   row, 
-    FormatableBitSet                 columnList) 
+    DataValueDescriptor[]   row) 
     {
 
 		if (row == null)
@@ -259,14 +257,6 @@
 		if (row.length == 0)
 			return true;
 
-		if (columnList == null)
-			return false;
-
-		int size = columnList.getLength();
-		for (int i = 0; i < size; i--) {
-			if (columnList.isSet(i))
-				return true;
-		}
 		return false;
 	}
 

Modified: db/derby/code/trunk/java/engine/org/apache/derby/impl/store/access/btree/BTreeScan.java
URL: http://svn.apache.org/viewcvs/db/derby/code/trunk/java/engine/org/apache/derby/impl/store/access/btree/BTreeScan.java?rev=293436&r1=293435&r2=293436&view=diff
==============================================================================
--- db/derby/code/trunk/java/engine/org/apache/derby/impl/store/access/btree/BTreeScan.java
(original)
+++ db/derby/code/trunk/java/engine/org/apache/derby/impl/store/access/btree/BTreeScan.java
Mon Oct  3 12:10:50 2005
@@ -239,7 +239,7 @@
 	{
         // startKeyValue init.
 	    this.init_startKeyValue         = startKeyValue;
-		if (RowUtil.isRowEmpty(this.init_startKeyValue, (FormatableBitSet) null))
+		if (RowUtil.isRowEmpty(this.init_startKeyValue))
 			this.init_startKeyValue = null;
 
         // startSearchOperator init.
@@ -252,7 +252,7 @@
 
         // stopKeyValue init.
 	    this.init_stopKeyValue          = stopKeyValue;
-        if (RowUtil.isRowEmpty(this.init_stopKeyValue, (FormatableBitSet) null))
+        if (RowUtil.isRowEmpty(this.init_stopKeyValue))
             this.init_stopKeyValue = null;
 
         // stopSearchOperator init.

Modified: db/derby/code/trunk/java/engine/org/apache/derby/impl/store/access/conglomerate/GenericScanController.java
URL: http://svn.apache.org/viewcvs/db/derby/code/trunk/java/engine/org/apache/derby/impl/store/access/conglomerate/GenericScanController.java?rev=293436&r1=293435&r2=293436&view=diff
==============================================================================
--- db/derby/code/trunk/java/engine/org/apache/derby/impl/store/access/conglomerate/GenericScanController.java
(original)
+++ db/derby/code/trunk/java/engine/org/apache/derby/impl/store/access/conglomerate/GenericScanController.java
Mon Oct  3 12:10:50 2005
@@ -291,7 +291,7 @@
     {
         // startKeyValue init.
 	    this.init_startKeyValue         = startKeyValue;
-		if (RowUtil.isRowEmpty(this.init_startKeyValue, (FormatableBitSet) null))
+		if (RowUtil.isRowEmpty(this.init_startKeyValue))
 			this.init_startKeyValue = null;
 
         // startSearchOperator init.
@@ -313,7 +313,7 @@
 
         // stopKeyValue init.
 	    this.init_stopKeyValue          = stopKeyValue;
-        if (RowUtil.isRowEmpty(this.init_stopKeyValue, (FormatableBitSet) null))
+        if (RowUtil.isRowEmpty(this.init_stopKeyValue))
             this.init_stopKeyValue = null;
 
         // stopSearchOperator init.

Modified: db/derby/code/trunk/java/engine/org/apache/derby/impl/store/access/heap/Heap.java
URL: http://svn.apache.org/viewcvs/db/derby/code/trunk/java/engine/org/apache/derby/impl/store/access/heap/Heap.java?rev=293436&r1=293435&r2=293436&view=diff
==============================================================================
--- db/derby/code/trunk/java/engine/org/apache/derby/impl/store/access/heap/Heap.java (original)
+++ db/derby/code/trunk/java/engine/org/apache/derby/impl/store/access/heap/Heap.java Mon
Oct  3 12:10:50 2005
@@ -663,8 +663,8 @@
 	{
         // Heap scans do not suppport start and stop scan positions (these
         // only make sense for ordered storage structures).
-		if (!RowUtil.isRowEmpty(startKeyValue, (FormatableBitSet) null)
-			|| !RowUtil.isRowEmpty(stopKeyValue, (FormatableBitSet) null))
+		if (!RowUtil.isRowEmpty(startKeyValue)
+			|| !RowUtil.isRowEmpty(stopKeyValue))
 		{
             throw StandardException.newException(
                     SQLState.HEAP_UNIMPLEMENTED_FEATURE);



Mime
View raw message