db-derby-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From mi...@apache.org
Subject svn commit: r959701 - in /db/derby/code/trunk/java/engine/org/apache/derby/impl/store/access: btree/BTreeScan.java conglomerate/GenericScanController.java
Date Thu, 01 Jul 2010 15:46:54 GMT
Author: mikem
Date: Thu Jul  1 15:46:54 2010
New Revision: 959701

URL: http://svn.apache.org/viewvc?rev=959701&view=rev
Log:
DERBY-4690 Too few arguments when generating AM_RECORD_NOT_FOUND error

Fixed up arguments to the AM_RECORD_NOT_FOUND exception, the page number argument was missing.


Modified:
    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

Modified: db/derby/code/trunk/java/engine/org/apache/derby/impl/store/access/btree/BTreeScan.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/engine/org/apache/derby/impl/store/access/btree/BTreeScan.java?rev=959701&r1=959700&r2=959701&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 Thu Jul  1 15:46:54 2010
@@ -70,9 +70,9 @@ import org.apache.derby.iapi.store.acces
 public abstract class BTreeScan extends OpenBTree implements ScanManager
 {
 
-	/*
-	** Fields of BTreeScan
-	*/
+    /*
+    ** Fields of BTreeScan
+    */
 
     /**
      * init_startKeyValue, init_qualifier, and init_stopKeyValue all are used 
@@ -178,7 +178,7 @@ public abstract class BTreeScan extends 
     protected int stat_numdeleted_rows_visited  = 0;
 
     /**
-	 * What kind of row locks to get during the scan.
+     * What kind of row locks to get during the scan.
      **/
     protected int lock_operation;
 
@@ -192,20 +192,20 @@ public abstract class BTreeScan extends 
 
     /* Constructors for This class: */
 
-	public BTreeScan()
-	{
-	}
-
-	/*
-	** Private/Protected methods of This class, sorted alphabetically
-	*/
+    public BTreeScan()
+    {
+    }
+
+    /*
+    ** Private/Protected methods of This class, sorted alphabetically
+    */
 
     /**
      * Fetch the next N rows from the table.
      * <p>
      * Utility routine used by both fetchSet() and fetchNextGroup().
      *
-	 * @exception  StandardException  Standard exception policy.
+     * @exception  StandardException  Standard exception policy.
      **/
     abstract protected int fetchRows(
     BTreeRowPosition        pos,
@@ -223,23 +223,23 @@ public abstract class BTreeScan extends 
      * Basically save away input parameters describing qualifications for
      * the scan, and do some error checking.
      *
-	 * @exception  StandardException  Standard exception policy.
+     * @exception  StandardException  Standard exception policy.
      **/
-	private void initScanParams(
+    private void initScanParams(
     DataValueDescriptor[]   startKeyValue,
     int                     startSearchOperator,
     Qualifier               qualifier[][],
     DataValueDescriptor[]   stopKeyValue,
     int                     stopSearchOperator)
         throws StandardException
-	{
+    {
         // startKeyValue init.
-	    this.init_startKeyValue         = startKeyValue;
-		if (RowUtil.isRowEmpty(this.init_startKeyValue))
-			this.init_startKeyValue = null;
+        this.init_startKeyValue         = startKeyValue;
+        if (RowUtil.isRowEmpty(this.init_startKeyValue))
+            this.init_startKeyValue = null;
 
         // startSearchOperator init.
-	    this.init_startSearchOperator   = startSearchOperator;
+        this.init_startSearchOperator   = startSearchOperator;
 
         // qualifier init.
         if ((qualifier != null) && (qualifier .length == 0))
@@ -247,12 +247,12 @@ public abstract class BTreeScan extends 
         this.init_qualifier             = qualifier;
 
         // stopKeyValue init.
-	    this.init_stopKeyValue          = stopKeyValue;
+        this.init_stopKeyValue          = stopKeyValue;
         if (RowUtil.isRowEmpty(this.init_stopKeyValue))
             this.init_stopKeyValue = null;
 
         // stopSearchOperator init.
-	    this.init_stopSearchOperator    = stopSearchOperator;
+        this.init_stopSearchOperator    = stopSearchOperator;
 
         // reset the "current" position to starting condition.
         // RESOLVE (mmm) - "compile" this.
@@ -287,14 +287,14 @@ public abstract class BTreeScan extends 
                 // add in start columns
                 if (this.init_startKeyValue != null)
                 {
-					required_cols.grow(this.init_startKeyValue.length);
+                    required_cols.grow(this.init_startKeyValue.length);
                     for (int i = 0; i < this.init_startKeyValue.length; i++)
                         required_cols.set(i);
                 }
 
                 if (this.init_stopKeyValue != null)
                 {
-					required_cols.grow(this.init_stopKeyValue.length);
+                    required_cols.grow(this.init_stopKeyValue.length);
                     for (int i = 0; i < this.init_stopKeyValue.length; i++)
                         required_cols.set(i);
                 }
@@ -304,9 +304,9 @@ public abstract class BTreeScan extends 
 
                 required_cols_and_scan_list.and(init_scanColumnList);
 
-				// FormatableBitSet equals requires the two FormatableBitSets to be of same
-				// length.
-				required_cols.grow(init_scanColumnList.size());
+                // FormatableBitSet equals requires the two FormatableBitSets to be of same
+                // length.
+                required_cols.grow(init_scanColumnList.size());
 
                 if (!required_cols_and_scan_list.equals(required_cols))
                 {
@@ -320,8 +320,8 @@ public abstract class BTreeScan extends 
                         "\n;init_scanColumnList = " + init_scanColumnList);
                 }
             }
-		} 
-	}
+        } 
+    }
 
     /**
      * Position scan at "start" position for a forward scan.
@@ -331,13 +331,13 @@ public abstract class BTreeScan extends 
      * sets "current_slot" to the slot number.
      * <p>
      *
-	 * @exception  StandardException  Standard exception policy.
+     * @exception  StandardException  Standard exception policy.
      **/
     protected void positionAtStartForForwardScan(
     BTreeRowPosition    pos)
-		throws StandardException
-	{
-		boolean         exact;
+        throws StandardException
+    {
+        boolean         exact;
 
         // This routine should only be called from first next() call //
         if (SanityManager.DEBUG)
@@ -403,7 +403,7 @@ public abstract class BTreeScan extends 
                 // row.  However, if the search was exact, then we don't
                 // want to move the position on the first call to next.
                 // In that case, by decrementing the slot, the first call
-                // to next will put us back	on the starting row.
+                // to next will put us back on the starting row.
 
                 if (exact && init_startSearchOperator == ScanController.GE)
                 {
@@ -472,7 +472,7 @@ public abstract class BTreeScan extends 
 
         if (SanityManager.DEBUG)
             SanityManager.ASSERT(pos.current_leaf != null);
-	}
+    }
 
     /**
      * Position scan to 0 slot on next page.
@@ -483,7 +483,7 @@ public abstract class BTreeScan extends 
      *
      * @param pos           current row position of the scan.
      *
-	 * @exception  StandardException  Standard exception policy.
+     * @exception  StandardException  Standard exception policy.
      **/
     protected void positionAtNextPage(
     BTreeRowPosition    pos)
@@ -510,15 +510,15 @@ public abstract class BTreeScan extends 
         pos.current_rh          = null;
     }
 
-	/**
-	Position scan at "start" position.
-	<p>
+    /**
+    Position scan at "start" position.
+    <p>
     Positions the scan to the slot just before the first record to be returned
     from the scan.  Returns the start page latched, and sets "current_slot" to
     the slot number.
 
-	@exception  StandardException  Standard exception policy.
-	**/
+    @exception  StandardException  Standard exception policy.
+    **/
     abstract void positionAtStartPosition(
     BTreeRowPosition    pos)
         throws StandardException;
@@ -529,7 +529,7 @@ public abstract class BTreeScan extends 
      *
      * @param pos           current row position of the scan.
      *
-	 * @exception  StandardException  Standard exception policy.
+     * @exception  StandardException  Standard exception policy.
      **/
     protected void positionAtDoneScanFromClose(
     BTreeRowPosition    pos)
@@ -608,7 +608,7 @@ public abstract class BTreeScan extends 
      * @param row      The row with the same partial column list as the
      *                 row returned by the current scan.
      *
-	 * @exception  StandardException  Standard exception policy.
+     * @exception  StandardException  Standard exception policy.
      */
     protected boolean process_qualifier(
     DataValueDescriptor[]     row) 
@@ -772,13 +772,13 @@ public abstract class BTreeScan extends 
      *          missing_row_for_key_ok was false indicating that scan could
      *          only be positioned on the exact key match.
      *
-	 * @exception  StandardException  Standard exception policy.
+     * @exception  StandardException  Standard exception policy.
      **/
-	protected boolean reposition(
+    protected boolean reposition(
     BTreeRowPosition pos,
     boolean          missing_row_for_key_ok)
         throws StandardException
-	{
+    {
         // RESOLVE (mikem) - performance - we need to do a buffer manager
         // get for every row returned from the scan.  It may be better to
         // allow a reference to the page with no latch (ie. a fixed bit).
@@ -794,9 +794,9 @@ public abstract class BTreeScan extends 
         if (SanityManager.DEBUG)
         {
             if (pos.current_positionKey == null)
-            	SanityManager.THROWASSERT(
-                	"pos.current_rh  = (" + pos.current_rh + "), " +
-                	"pos.current_positionKey = (" + 
+                SanityManager.THROWASSERT(
+                    "pos.current_rh  = (" + pos.current_rh + "), " +
+                    "pos.current_positionKey = (" + 
                     pos.current_positionKey + ").");
         }
 
@@ -872,25 +872,25 @@ public abstract class BTreeScan extends 
         pos.current_positionKey = null;
 
         return(true);
-	}
+    }
 
-	/*
-	** Public Methods of BTreeScan
-	*/
+    /*
+    ** Public Methods of BTreeScan
+    */
 
 
-	/**
-	Initialize the scan for use.
-	<p>
-	Any changes to this method may have to be reflected in close as well.
+    /**
+    Initialize the scan for use.
+    <p>
+    Any changes to this method may have to be reflected in close as well.
     <p>
     The btree init opens the container (super.init), and stores away the
     state of the qualifiers.  The actual searching for the first position
     is delayed until the first next() call.
 
-	@exception  StandardException  Standard exception policy.
-	**/
-	public void init(
+    @exception  StandardException  Standard exception policy.
+    **/
+    public void init(
     TransactionManager              xact_manager,
     Transaction                     rawtran,
     boolean                         hold,
@@ -898,18 +898,18 @@ public abstract class BTreeScan extends 
     int                             lock_level,
     BTreeLockingPolicy              btree_locking_policy,
     FormatableBitSet                scanColumnList,
-    DataValueDescriptor[]		    startKeyValue,
+    DataValueDescriptor[]           startKeyValue,
     int                             startSearchOperator,
     Qualifier                       qualifier[][],
-    DataValueDescriptor[]		    stopKeyValue,
+    DataValueDescriptor[]           stopKeyValue,
     int                             stopSearchOperator,
     BTree                           conglomerate,
     LogicalUndo                     undo,
     StaticCompiledOpenConglomInfo   static_info,
     DynamicCompiledOpenConglomInfo  dynamic_info)
         throws StandardException
-	{
-		super.init(
+    {
+        super.init(
             xact_manager, xact_manager, (ContainerHandle) null, rawtran,
             hold,
             open_mode, lock_level, btree_locking_policy, 
@@ -921,14 +921,14 @@ public abstract class BTreeScan extends 
             ((open_mode & ContainerHandle.MODE_FORUPDATE) == 
                  ContainerHandle.MODE_FORUPDATE);
 
-		// Keep track of whether this scan should use update locks.
-		this.init_useUpdateLocks = 
+        // Keep track of whether this scan should use update locks.
+        this.init_useUpdateLocks = 
             ((open_mode &
                 ContainerHandle.MODE_USE_UPDATE_LOCKS) != 0);
 
-		this.init_hold                  = hold;
+        this.init_hold                  = hold;
 
-		this.init_template              = 
+        this.init_template              = 
             runtime_mem.get_template(getRawTran());
 
         this.init_scanColumnList        = scanColumnList;
@@ -977,24 +977,24 @@ public abstract class BTreeScan extends 
             this.lock_operation |= ConglomerateController.LOCK_UPDATE_LOCKS;
 
         // System.out.println("Btree scan: " + this);
-	}
+    }
 
 
 
-	/*
-	** Methods of ScanController
-	*/
+    /*
+    ** Methods of ScanController
+    */
 
     /**
     Close the scan.
     **/
     public void close()
         throws StandardException
-	{
+    {
         // Scan is closed, make sure no access to any state variables
         positionAtDoneScanFromClose(scan_position);
 
-		super.close();
+        super.close();
 
         // null out so that these object's can get GC'd earlier.
         this.init_rawtran       = null;
@@ -1004,17 +1004,17 @@ public abstract class BTreeScan extends 
         this.init_stopKeyValue  = null;
 
         this.getXactMgr().closeMe(this);
-	}
+    }
 
     /**
     Delete the row at the current position of the scan.
-	@see ScanController#delete
+    @see ScanController#delete
 
-	@exception  StandardException  Standard exception policy.
+    @exception  StandardException  Standard exception policy.
     **/
     public boolean delete()
-		throws StandardException
-	{
+        throws StandardException
+    {
         boolean     ret_val      = false;
 
         if (scan_state != SCAN_INPROGRESS)
@@ -1036,6 +1036,7 @@ public abstract class BTreeScan extends 
                 throw StandardException.newException(
                         SQLState.AM_RECORD_NOT_FOUND,
                         new Long(err_containerid),
+                        new Long(scan_position.current_rh.getPageNumber()),
                         new Long(scan_position.current_rh.getId()));
             }
 
@@ -1077,6 +1078,7 @@ public abstract class BTreeScan extends 
                         throw StandardException.newException(
                                 SQLState.AM_RECORD_NOT_FOUND,
                                 new Long(err_containerid),
+                                new Long(scan_position.current_rh.getPageNumber()),
                                 new Long(scan_position.current_rh.getId()));
                     }
                 }
@@ -1107,7 +1109,7 @@ public abstract class BTreeScan extends 
 
             // See if we just deleted the last row on the page, in a btree a
             // page with all rows still has 1 left - the control row.
-  	        // Do not reclaim the root page of the btree if there are no 
+            // Do not reclaim the root page of the btree if there are no 
             // children since we were doing too many post commit actions in a 
             // benchmark which does an insert/commit/delete/commit operations 
             // in a single user system.  Now with this change the work will 
@@ -1136,7 +1138,7 @@ public abstract class BTreeScan extends 
         }
 
         return(ret_val);
-	}
+    }
 
     /**
      * A call to allow client to indicate that current row does not qualify.
@@ -1153,7 +1155,7 @@ public abstract class BTreeScan extends 
      * This call should only be made while the scan is positioned on a current
      * valid row.
      *
-	 * @exception  StandardException  Standard exception policy.
+     * @exception  StandardException  Standard exception policy.
      **/
     public void didNotQualify()
         throws StandardException
@@ -1180,10 +1182,10 @@ public abstract class BTreeScan extends 
      * The results of a fetch() performed on a scan positioned on
      * a deleted row are undefined.
      * <p>
-	 * @exception StandardException Standard exception policy.
+     * @exception StandardException Standard exception policy.
     **/
     public boolean doesCurrentPositionQualify()
-		throws StandardException
+        throws StandardException
     {
         if (scan_state != SCAN_INPROGRESS)
             throw StandardException.newException(
@@ -1246,9 +1248,9 @@ public abstract class BTreeScan extends 
      * 
      * @exception  StandardException  Standard exception policy.
      */
-	private void fetch(DataValueDescriptor[] row, boolean qualify)
-		throws StandardException
-	{
+    private void fetch(DataValueDescriptor[] row, boolean qualify)
+        throws StandardException
+    {
         if (scan_state != SCAN_INPROGRESS)
             throw StandardException.newException(
                 SQLState.AM_SCAN_NOT_POSITIONED);
@@ -1270,6 +1272,7 @@ public abstract class BTreeScan extends 
                 throw StandardException.newException(
                         SQLState.AM_RECORD_NOT_FOUND,
                         new Long(err_containerid),
+                        new Long(scan_position.current_rh.getPageNumber()),
                         new Long(scan_position.current_rh.getId()));
             }
 
@@ -1311,8 +1314,8 @@ public abstract class BTreeScan extends 
             }
         }
 
-		return;
-	}
+        return;
+    }
 
     /**
      * @see org.apache.derby.iapi.store.access.ScanController#isHeldAfterCommit
@@ -1325,11 +1328,11 @@ public abstract class BTreeScan extends 
 
     /**
     Fetch the row at the current position of the Scan.
-	@see ScanController#fetch
+    @see ScanController#fetch
 
-	@exception  StandardException  Standard exception policy.
+    @exception  StandardException  Standard exception policy.
     **/
-	public void fetch(DataValueDescriptor[] row)
+    public void fetch(DataValueDescriptor[] row)
         throws StandardException
     {
         fetch(row, true);
@@ -1342,8 +1345,8 @@ public abstract class BTreeScan extends 
      * 
      * @exception  StandardException  Standard exception policy.
      */
-	public void fetchWithoutQualify(DataValueDescriptor[] row)
-		throws StandardException
+    public void fetchWithoutQualify(DataValueDescriptor[] row)
+        throws StandardException
     {
         fetch(row, false);
     }
@@ -1357,12 +1360,12 @@ public abstract class BTreeScan extends 
      *
      * @see ScanInfo
      *
-	 * @return The ScanInfo object which contains info about current scan.
+     * @return The ScanInfo object which contains info about current scan.
      *
-	 * @exception  StandardException  Standard exception policy.
+     * @exception  StandardException  Standard exception policy.
      **/
     public ScanInfo getScanInfo()
-		throws StandardException
+        throws StandardException
     {
         return(new BTreeScanInfo(this));
     }
@@ -1377,10 +1380,10 @@ public abstract class BTreeScan extends 
     The results of a fetch() performed on a scan positioned on
     a deleted row are undefined.
 
-	@exception StandardException Standard exception policy.
+    @exception StandardException Standard exception policy.
     **/
     public boolean isCurrentPositionDeleted()
-		throws StandardException
+        throws StandardException
     {
         boolean     ret_val;
 
@@ -1425,16 +1428,16 @@ public abstract class BTreeScan extends 
             }
         }
 
-		return(ret_val);
+        return(ret_val);
     }
 
     /**
      * Return whether this is a keyed conglomerate.
      * <p>
      *
-	 * @return whether this is a keyed conglomerate.
+     * @return whether this is a keyed conglomerate.
      **/
-	public boolean isKeyed()
+    public boolean isKeyed()
     {
         return(true);
     }
@@ -1453,13 +1456,13 @@ public abstract class BTreeScan extends 
 
     /**
     Move to the next position in the scan.
-	@see ScanController#next
+    @see ScanController#next
 
-	@exception  StandardException  Standard exception policy.
+    @exception  StandardException  Standard exception policy.
     **/
     public boolean next()
-		throws StandardException
-	{
+        throws StandardException
+    {
         // Turn this call into a group fetch of a 1 element group.
         fetchNext_one_slot_array[0] = runtime_mem.get_scratch_row(getRawTran());
         boolean ret_val = 
@@ -1479,11 +1482,11 @@ public abstract class BTreeScan extends 
     Fetch the row at the next position of the Scan.
 
     If there is a valid next position in the scan then
-	the value in the template storable row is replaced
-	with the value of the row at the current scan
-	position.  The columns of the template row must
-	be of the same type as the actual columns in the
-	underlying conglomerate.
+    the value in the template storable row is replaced
+    with the value of the row at the current scan
+    position.  The columns of the template row must
+    be of the same type as the actual columns in the
+    underlying conglomerate.
 
     The resulting contents of templateRow after a fetchNext() 
     which returns false is undefined.
@@ -1494,16 +1497,16 @@ public abstract class BTreeScan extends 
     the 2 calls if possible.
 
     @param row The template row into which the value
-	of the next position in the scan is to be stored.
+    of the next position in the scan is to be stored.
 
     @return True if there is a next position in the scan,
-	false if there isn't.
+    false if there isn't.
 
-	@exception StandardException Standard exception policy.
+    @exception StandardException Standard exception policy.
     **/
-	public boolean fetchNext(DataValueDescriptor[] row)
-		throws StandardException
-	{
+    public boolean fetchNext(DataValueDescriptor[] row)
+        throws StandardException
+    {
         boolean ret_val;
 
         // Turn this call into a group fetch of a 1 element group.
@@ -1573,7 +1576,7 @@ public abstract class BTreeScan extends 
      *           fetch interfaces: fetch, fetchNext(), fetchNextGroup(),
      *           and fetchSet().
      *
-	 * @return The number of qualifying rows found and copied into the 
+     * @return The number of qualifying rows found and copied into the 
      *         provided array of rows.  If 0 then the scan is complete, 
      *         otherwise the return value will be: 
      *         1 <= row_count <= row_array.length
@@ -1583,13 +1586,13 @@ public abstract class BTreeScan extends 
      *                          assumes that all entries in the array 
      *                          contain complete template rows.
      *
-	 * @exception  StandardException  Standard exception policy.
+     * @exception  StandardException  Standard exception policy.
      **/
     public int fetchNextGroup(
     DataValueDescriptor[][] row_array,
     RowLocation[]           rowloc_array)
         throws StandardException
-	{
+    {
         return(
             fetchRows(
                 scan_position,
@@ -1605,7 +1608,7 @@ public abstract class BTreeScan extends 
     RowLocation[]           old_rowloc_array,
     RowLocation[]           new_rowloc_array)
         throws StandardException
-	{
+    {
         // This interface is currently only used to move rows around in
         // a heap table, unused in btree's -- so not implemented.
 
@@ -1718,7 +1721,7 @@ public abstract class BTreeScan extends 
      *                          column in the row in the table of the scan).
      * @param hash_table        The java HashTable to load into.
      *
-	 * @exception  StandardException  Standard exception policy.
+     * @exception  StandardException  Standard exception policy.
      **/
     public void fetchSet(
     long                    max_rowcnt,
@@ -1747,44 +1750,44 @@ public abstract class BTreeScan extends 
     is reopened with the same "hold" and "forUpdate" parameters passed in
     the original openScan.  The previous template row continues to be used.
 
-	@param startKeyValue  An indexable row which holds a
-	(partial) key value which, in combination with the
-	startSearchOperator, defines the starting position of
-	the scan.  If null, the starting position of the scan
-	is the first row of the conglomerate.
+    @param startKeyValue  An indexable row which holds a
+    (partial) key value which, in combination with the
+    startSearchOperator, defines the starting position of
+    the scan.  If null, the starting position of the scan
+    is the first row of the conglomerate.
 
-	@param startSearchOperator an operator which defines
-	how the startKeyValue is to be searched for.  If
+    @param startSearchOperator an operator which defines
+    how the startKeyValue is to be searched for.  If
     startSearchOperation is ScanController.GE, the scan starts on
-	the first row which is greater than or equal to the
-	startKeyValue.  If startSearchOperation is ScanController.GT,
-	the scan starts on the first row whose key is greater than
-	startKeyValue.  The startSearchOperation parameter is
-	ignored if the startKeyValue parameter is null.
-
-	@param qualifier An array of qualifiers which, applied
-	to each key, restrict the rows returned by the scan.  Rows
-	for which any one of the qualifiers returns false are not
-	returned by the scan. If null, all rows are returned.
-
-	@param stopKeyValue  An indexable row which holds a
-	(partial) key value which, in combination with the
-	stopSearchOperator, defines the ending position of
-	the scan.  If null, the ending position of the scan
-	is the last row of the conglomerate.
-
-	@param stopSearchOperator an operator which defines
-	how the stopKeyValue is used to determine the scan stopping
-	position. If stopSearchOperation is ScanController.GE, the scan
-	stops just before the first row which is greater than or
-	equal to the stopKeyValue.  If stopSearchOperation is
-	ScanController.GT, the scan stops just before the first row whose
-	key is greater than	startKeyValue.  The stopSearchOperation
-	parameter is ignored if the stopKeyValue parameter is null.
+    the first row which is greater than or equal to the
+    startKeyValue.  If startSearchOperation is ScanController.GT,
+    the scan starts on the first row whose key is greater than
+    startKeyValue.  The startSearchOperation parameter is
+    ignored if the startKeyValue parameter is null.
+
+    @param qualifier An array of qualifiers which, applied
+    to each key, restrict the rows returned by the scan.  Rows
+    for which any one of the qualifiers returns false are not
+    returned by the scan. If null, all rows are returned.
+
+    @param stopKeyValue  An indexable row which holds a
+    (partial) key value which, in combination with the
+    stopSearchOperator, defines the ending position of
+    the scan.  If null, the ending position of the scan
+    is the last row of the conglomerate.
+
+    @param stopSearchOperator an operator which defines
+    how the stopKeyValue is used to determine the scan stopping
+    position. If stopSearchOperation is ScanController.GE, the scan
+    stops just before the first row which is greater than or
+    equal to the stopKeyValue.  If stopSearchOperation is
+    ScanController.GT, the scan stops just before the first row whose
+    key is greater than startKeyValue.  The stopSearchOperation
+    parameter is ignored if the stopKeyValue parameter is null.
 
-	@exception StandardException Standard exception policy.
+    @exception StandardException Standard exception policy.
     **/
-	public final void reopenScan(
+    public final void reopenScan(
     DataValueDescriptor[]   startKeyValue,
     int                     startSearchOperator,
     Qualifier               qualifier[][],
@@ -1845,21 +1848,21 @@ public abstract class BTreeScan extends 
     inserting more data, then continuing the scan is not guaranteed to see
     the new rows - they may be put in the "beginning" of the heap.
 
-	@param startRowLocation  An existing RowLocation within the conglomerate,
+    @param startRowLocation  An existing RowLocation within the conglomerate,
     at which to position the start of the scan.  The scan will begin at this
     location and continue forward until the end of the conglomerate.  
     Positioning at a non-existent RowLocation (ie. an invalid one or one that
     had been deleted), will result in an exception being thrown when the 
     first next operation is attempted.
 
-	@param qualifier An array of qualifiers which, applied
-	to each key, restrict the rows returned by the scan.  Rows
-	for which any one of the qualifiers returns false are not
-	returned by the scan. If null, all rows are returned.
+    @param qualifier An array of qualifiers which, applied
+    to each key, restrict the rows returned by the scan.  Rows
+    for which any one of the qualifiers returns false are not
+    returned by the scan. If null, all rows are returned.
 
-	@exception StandardException Standard exception policy.
+    @exception StandardException Standard exception policy.
     **/
-	public void reopenScanByRowLocation(
+    public void reopenScanByRowLocation(
     RowLocation startRowLocation,
     Qualifier   qualifier[][])
         throws StandardException
@@ -1868,55 +1871,55 @@ public abstract class BTreeScan extends 
                 SQLState.BTREE_UNIMPLEMENTED_FEATURE);
     }
 
-	/*
-	** Methods of ScanController, which are not supported by btree.
-	*/
-
-	/**
-	Fetch the location of the current position in the scan.
-	@see ScanController#fetchLocation
-
-	@exception  StandardException  Standard exception policy.
-	**/
-	public void fetchLocation(RowLocation templateLocation)
-		throws StandardException
-	{
+    /*
+    ** Methods of ScanController, which are not supported by btree.
+    */
+
+    /**
+    Fetch the location of the current position in the scan.
+    @see ScanController#fetchLocation
+
+    @exception  StandardException  Standard exception policy.
+    **/
+    public void fetchLocation(RowLocation templateLocation)
+        throws StandardException
+    {
         throw StandardException.newException(
                 SQLState.BTREE_UNIMPLEMENTED_FEATURE);
-	}
+    }
 
-	/**
-	Return a row location object of the correct type to be
-	used in calls to fetchLocation.
-	@see org.apache.derby.iapi.store.access.GenericScanController#newRowLocationTemplate
-
-	@exception  StandardException  Standard exception policy.
-	**/
-	public RowLocation newRowLocationTemplate()
-		throws StandardException
-	{
+    /**
+    Return a row location object of the correct type to be
+    used in calls to fetchLocation.
+    @see org.apache.derby.iapi.store.access.GenericScanController#newRowLocationTemplate
+
+    @exception  StandardException  Standard exception policy.
+    **/
+    public RowLocation newRowLocationTemplate()
+        throws StandardException
+    {
         throw StandardException.newException(
                 SQLState.BTREE_UNIMPLEMENTED_FEATURE);
-	}
+    }
 
     /**
     Replace the entire row at the current position of the scan.
 
     Unimplemented interface by btree, will throw an exception.
 
-	@see ScanController#replace
-	@exception  StandardException  Standard exception policy.
+    @see ScanController#replace
+    @exception  StandardException  Standard exception policy.
     **/
     public boolean replace(DataValueDescriptor[] row, FormatableBitSet validColumns)
-		throws StandardException
-	{
+        throws StandardException
+    {
         throw StandardException.newException(
                 SQLState.BTREE_UNIMPLEMENTED_FEATURE);
-	}
+    }
 
-	/*
-	** Methods of ScanManager
-	*/
+    /*
+    ** Methods of ScanManager
+    */
 
 
     /**
@@ -1924,7 +1927,7 @@ public abstract class BTreeScan extends 
     **/
     public boolean closeForEndTransaction(boolean closeHeldScan)
         throws StandardException
-	{
+    {
         if (!init_hold || closeHeldScan)
         {
             // Scan is closed, make sure no access to any state variables
@@ -1972,7 +1975,7 @@ public abstract class BTreeScan extends 
 
             return(false);
         }
-	}
+    }
 
     /**
      * Save the current scan position by key and release the latch on the leaf

Modified: db/derby/code/trunk/java/engine/org/apache/derby/impl/store/access/conglomerate/GenericScanController.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/engine/org/apache/derby/impl/store/access/conglomerate/GenericScanController.java?rev=959701&r1=959700&r2=959701&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 Thu Jul  1 15:46:54 2010
@@ -165,7 +165,7 @@ public abstract class GenericScanControl
      * provided by the calling code when doing a scan.
      * These are just saved values from what was initially input.
      **/
-	private FormatableBitSet                 init_scanColumnList;
+    private FormatableBitSet                 init_scanColumnList;
     private DataValueDescriptor[]   init_startKeyValue;
     private int                     init_startSearchOperator;
     private Qualifier[][]           init_qualifier;
@@ -235,7 +235,7 @@ public abstract class GenericScanControl
      */
 
     private final void repositionScanForUpateOper()
-		throws StandardException
+        throws StandardException
     {
         if (scan_state != SCAN_INPROGRESS)
             throw StandardException.newException(
@@ -247,6 +247,7 @@ public abstract class GenericScanControl
             throw StandardException.newException(
                     SQLState.AM_RECORD_NOT_FOUND, 
                     open_conglom.getContainer().getId(),
+                    new Long(scan_position.current_rh.getPageNumber()),
                     new Long(scan_position.current_rh.getId()));
         }
 
@@ -282,7 +283,7 @@ public abstract class GenericScanControl
      * It is used both for initialization of the ScanController and
      * by reopenScan().
      **/
-	protected void positionAtInitScan(
+    protected void positionAtInitScan(
     DataValueDescriptor[]   startKeyValue,
     int                     startSearchOperator,
     Qualifier               qualifier[][],
@@ -292,12 +293,12 @@ public abstract class GenericScanControl
         throws StandardException
     {
         // startKeyValue init.
-	    this.init_startKeyValue         = startKeyValue;
-		if (RowUtil.isRowEmpty(this.init_startKeyValue))
-			this.init_startKeyValue = null;
+        this.init_startKeyValue         = startKeyValue;
+        if (RowUtil.isRowEmpty(this.init_startKeyValue))
+            this.init_startKeyValue = null;
 
         // startSearchOperator init.
-	    this.init_startSearchOperator   = startSearchOperator;
+        this.init_startSearchOperator   = startSearchOperator;
 
         // qualifier init.
         if ((qualifier != null) && (qualifier .length == 0))
@@ -315,12 +316,12 @@ public abstract class GenericScanControl
               init_qualifier);
 
         // stopKeyValue init.
-	    this.init_stopKeyValue          = stopKeyValue;
+        this.init_stopKeyValue          = stopKeyValue;
         if (RowUtil.isRowEmpty(this.init_stopKeyValue))
             this.init_stopKeyValue = null;
 
         // stopSearchOperator init.
-	    this.init_stopSearchOperator    = stopSearchOperator;
+        this.init_stopSearchOperator    = stopSearchOperator;
 
         // reset the "current" position to starting condition.
         pos.init();
@@ -346,14 +347,14 @@ public abstract class GenericScanControl
                 // add in start columns
                 if (this.init_startKeyValue != null)
                 {
-					required_cols.grow(this.init_startKeyValue.length);
+                    required_cols.grow(this.init_startKeyValue.length);
                     for (int i = 0; i < this.init_startKeyValue.length; i++)
                         required_cols.set(i);
                 }
 
                 if (this.init_stopKeyValue != null)
                 {
-					required_cols.grow(this.init_stopKeyValue.length);
+                    required_cols.grow(this.init_stopKeyValue.length);
                     for (int i = 0; i < this.init_stopKeyValue.length; i++)
                         required_cols.set(i);
                 }
@@ -363,9 +364,9 @@ public abstract class GenericScanControl
 
                 required_cols_and_scan_list.and(init_scanColumnList);
 
-				// FormatableBitSet equals requires the two FormatableBitSets to be of same
-				// length.
-				required_cols.grow(init_scanColumnList.size());
+                // FormatableBitSet equals requires the two FormatableBitSets to be of same
+                // length.
+                required_cols.grow(init_scanColumnList.size());
 
                 if (!required_cols_and_scan_list.equals(required_cols))
                 {
@@ -379,7 +380,7 @@ public abstract class GenericScanControl
                         "\n;init_scanColumnList = " + init_scanColumnList);
                 }
             }
-		} 
+        } 
 
         // Scan is fully initialized and ready to go.
         scan_state = SCAN_INIT;
@@ -396,11 +397,11 @@ public abstract class GenericScanControl
      * position.  It will get the latch again on the current
      * scan position and set the slot to the current record handle.
      *
-	 * @exception  StandardException  Standard exception policy.
+     * @exception  StandardException  Standard exception policy.
      **/
     protected void positionAtResumeScan(
     RowPosition pos)
-		throws StandardException
+        throws StandardException
     {
         if (SanityManager.DEBUG)
         {
@@ -426,7 +427,7 @@ public abstract class GenericScanControl
      * row to be returned.
      * <p>
      *
-	 * @exception  StandardException  Standard exception policy.
+     * @exception  StandardException  Standard exception policy.
      **/
     protected void positionAtStartForForwardScan(
     RowPosition pos)
@@ -476,7 +477,7 @@ public abstract class GenericScanControl
     /**
      * Position scan to slot before first slot on next page.
      * <p>
-	 * @exception  StandardException  Standard exception policy.
+     * @exception  StandardException  Standard exception policy.
      **/
     protected void positionAtNextPage(
     RowPosition pos)
@@ -507,7 +508,7 @@ public abstract class GenericScanControl
     /**
      * Do any necessary work to complete the scan.
      *
-	 * @exception  StandardException  Standard exception policy.
+     * @exception  StandardException  Standard exception policy.
      **/
     protected void positionAtDoneScan(
     RowPosition pos)
@@ -526,7 +527,7 @@ public abstract class GenericScanControl
         this.scan_state = SCAN_DONE;
     }
 
-	public void reopenScanByRowLocation(
+    public void reopenScanByRowLocation(
     RowLocation startRowLocation,
     Qualifier qualifier[][])
         throws StandardException
@@ -546,7 +547,7 @@ public abstract class GenericScanControl
      * Designed so that extending classes can override and allocate 
      * implementation specific row position's.
      *
-	 * @exception  StandardException  Standard exception policy.
+     * @exception  StandardException  Standard exception policy.
      **/
     protected RowPosition allocateScanPosition()
         throws StandardException
@@ -559,7 +560,7 @@ public abstract class GenericScanControl
      * <p>
      * Utility routine used by both fetchSet() and fetchNextGroup().
      *
-	 * @exception  StandardException  Standard exception policy.
+     * @exception  StandardException  Standard exception policy.
      **/
     protected int fetchRows(
     DataValueDescriptor[][] row_array,
@@ -568,7 +569,7 @@ public abstract class GenericScanControl
     long                    max_rowcnt,
     int[]                   key_column_numbers)
         throws StandardException
-	{
+    {
         int                     ret_row_count           = 0;
         DataValueDescriptor[]   fetch_row               = null;
 
@@ -642,11 +643,11 @@ public abstract class GenericScanControl
         // (scan_position.current_page will be null).  
         // Along the way apply qualifiers to skip rows which don't qualify.
 
-		while (scan_position.current_page != null)
-		{
-			while ((scan_position.current_slot + 1) < 
+        while (scan_position.current_page != null)
+        {
+            while ((scan_position.current_slot + 1) < 
                     scan_position.current_page.recordCount())
-			{
+            {
                 // unlock the previous row.
                 if (scan_position.current_rh != null)
                 {
@@ -822,12 +823,12 @@ public abstract class GenericScanControl
                         return(ret_row_count);
                     }
                 }
-			}
+            }
 
             positionAtNextPage(scan_position);
 
             this.stat_numpages_visited++;
-		}
+        }
 
         // Reached last page of scan.
         positionAtDoneScan(scan_position);
@@ -835,7 +836,7 @@ public abstract class GenericScanControl
         // we need to decrement when we stop scan at the end of the table.
         this.stat_numpages_visited--;
 
-		return(ret_row_count);
+        return(ret_row_count);
     }
 
     /**
@@ -854,19 +855,19 @@ public abstract class GenericScanControl
     inserting more data, then continuing the scan is not guaranteed to see
     the new rows - they may be put in the "beginning" of the heap.
 
-	@param startRecordHandle  An existing RecordHandle within the conglomerate,
+    @param startRecordHandle  An existing RecordHandle within the conglomerate,
     at which to position the start of the scan.  The scan will begin at this
     location and continue forward until the end of the conglomerate.  
     Positioning at a non-existent RowLocation (ie. an invalid one or one that
     had been deleted), will result in an exception being thrown when the 
     first next operation is attempted.
 
-	@param qualifier An array of qualifiers which, applied
-	to each key, restrict the rows returned by the scan.  Rows
-	for which any one of the qualifiers returns false are not
-	returned by the scan. If null, all rows are returned.
+    @param qualifier An array of qualifiers which, applied
+    to each key, restrict the rows returned by the scan.  Rows
+    for which any one of the qualifiers returns false are not
+    returned by the scan. If null, all rows are returned.
 
-	@exception StandardException Standard exception policy.
+    @exception StandardException Standard exception policy.
     **/
     protected void reopenScanByRecordHandle(
     RecordHandle    startRecordHandle,
@@ -898,13 +899,13 @@ public abstract class GenericScanControl
      * Public Methods of This class:
      **************************************************************************
      */
-	public void init(
+    public void init(
     OpenConglomerate                open_conglom,
-	FormatableBitSet				scanColumnList,
-    DataValueDescriptor[]	        startKeyValue,
+    FormatableBitSet                scanColumnList,
+    DataValueDescriptor[]           startKeyValue,
     int                             startSearchOperator,
     Qualifier                       qualifier[][],
-    DataValueDescriptor[]	        stopKeyValue,
+    DataValueDescriptor[]           stopKeyValue,
     int                             stopSearchOperator)
         throws StandardException
     {
@@ -992,10 +993,10 @@ public abstract class GenericScanControl
     {
         super.close();
 
-		// If we are closed due to catching an error in the middle of init,
-		// xact_manager may not be set yet. 
-		if (open_conglom.getXactMgr() != null)
-			open_conglom.getXactMgr().closeMe(this);
+        // If we are closed due to catching an error in the middle of init,
+        // xact_manager may not be set yet. 
+        if (open_conglom.getXactMgr() != null)
+            open_conglom.getXactMgr().closeMe(this);
 
         // help the garbage collector.
         this.init_qualifier         = null;
@@ -1006,14 +1007,14 @@ public abstract class GenericScanControl
 
     public void close()
         throws StandardException
-	{
+    {
         // Finish the scan - this may release locks if read committed and scan
         // still holds some locks, and close comes before scan.next() returned
         // that scan was done.
         positionAtDoneScan(scan_position);
 
         closeScan();
-	}
+    }
 
     /**
      * Reopens the scan after it has been closed as part of a commit.
@@ -1057,7 +1058,7 @@ public abstract class GenericScanControl
     public boolean closeForEndTransaction(
     boolean closeHeldScan)
         throws StandardException
-	{
+    {
         if ((!open_conglom.getHold()) || closeHeldScan) 
         {
             // close the scan as part of the commit/abort
@@ -1084,15 +1085,15 @@ public abstract class GenericScanControl
 
             return(false);
         }
-	}
+    }
 
 
     /**
-	@see org.apache.derby.iapi.store.access.ScanController#delete
-	**/
+    @see org.apache.derby.iapi.store.access.ScanController#delete
+    **/
     public boolean delete()
-		throws StandardException
-	{
+        throws StandardException
+    {
         repositionScanForUpateOper();
 
         boolean ret_val = true;
@@ -1122,7 +1123,7 @@ public abstract class GenericScanControl
         scan_position.unlatch();
 
         return(ret_val);
-	}
+    }
 
 
     /**
@@ -1142,7 +1143,7 @@ public abstract class GenericScanControl
      * RESOLVE (mikem-05/29/98) - Implement this when we support levels of
      * concurrency less than serializable.
      *
-	 * @exception  StandardException  Standard exception policy.
+     * @exception  StandardException  Standard exception policy.
      **/
     public void didNotQualify()
         throws StandardException
@@ -1257,14 +1258,14 @@ public abstract class GenericScanControl
      *                          column in the row in the table of the scan).
      * @param hash_table        The java HashTable to load into.
      *
-	 * @exception  StandardException  Standard exception policy.
+     * @exception  StandardException  Standard exception policy.
      **/
     public void fetchSet(
     long                    max_rowcnt,
     int[]                   key_column_numbers,
     BackingStoreHashtable   hash_table)
         throws StandardException
-	{
+    {
         fetchRows(
             (DataValueDescriptor[][]) null,
             (RowLocation[]) null,
@@ -1282,44 +1283,44 @@ public abstract class GenericScanControl
     is reopened with the same "hold" and "forUpdate" parameters passed in
     the original openScan.  The previous template row continues to be used.
 
-	@param startKeyValue  An indexable row which holds a 
-	(partial) key value which, in combination with the
-	startSearchOperator, defines the starting position of
-	the scan.  If null, the starting position of the scan
-	is the first row of the conglomerate.
-	
-	@param startSearchOperator an operator which defines
-	how the startKeyValue is to be searched for.  If 
+    @param startKeyValue  An indexable row which holds a 
+    (partial) key value which, in combination with the
+    startSearchOperator, defines the starting position of
+    the scan.  If null, the starting position of the scan
+    is the first row of the conglomerate.
+    
+    @param startSearchOperator an operator which defines
+    how the startKeyValue is to be searched for.  If 
     startSearchOperator is ScanController.GE, the scan starts on
-	the first row which is greater than or equal to the 
-	startKeyValue.  If startSearchOperation is ScanController.GT,
-	the scan starts on the first row whose key is greater than
-	startKeyValue.  The startSearchOperation parameter is 
-	ignored if the startKeyValue parameter is null.
-
-	@param qualifier An array of qualifiers which, applied
-	to each key, restrict the rows returned by the scan.  Rows
-	for which any one of the qualifiers returns false are not
-	returned by the scan. If null, all rows are returned.
-
-	@param stopKeyValue  An indexable row which holds a 
-	(partial) key value which, in combination with the
-	stopSearchOperator, defines the ending position of
-	the scan.  If null, the ending position of the scan
-	is the last row of the conglomerate.
-	
-	@param stopSearchOperator an operator which defines
-	how the stopKeyValue is used to determine the scan stopping
-	position. If stopSearchOperation is ScanController.GE, the scan 
-	stops just before the first row which is greater than or
-	equal to the stopKeyValue.  If stopSearchOperation is
-	ScanController.GT, the scan stops just before the first row whose
-	key is greater than	startKeyValue.  The stopSearchOperation
-	parameter is ignored if the stopKeyValue parameter is null.
+    the first row which is greater than or equal to the 
+    startKeyValue.  If startSearchOperation is ScanController.GT,
+    the scan starts on the first row whose key is greater than
+    startKeyValue.  The startSearchOperation parameter is 
+    ignored if the startKeyValue parameter is null.
+
+    @param qualifier An array of qualifiers which, applied
+    to each key, restrict the rows returned by the scan.  Rows
+    for which any one of the qualifiers returns false are not
+    returned by the scan. If null, all rows are returned.
+
+    @param stopKeyValue  An indexable row which holds a 
+    (partial) key value which, in combination with the
+    stopSearchOperator, defines the ending position of
+    the scan.  If null, the ending position of the scan
+    is the last row of the conglomerate.
+    
+    @param stopSearchOperator an operator which defines
+    how the stopKeyValue is used to determine the scan stopping
+    position. If stopSearchOperation is ScanController.GE, the scan 
+    stops just before the first row which is greater than or
+    equal to the stopKeyValue.  If stopSearchOperation is
+    ScanController.GT, the scan stops just before the first row whose
+    key is greater than startKeyValue.  The stopSearchOperation
+    parameter is ignored if the stopKeyValue parameter is null.
 
-	@exception StandardException Standard exception policy.
+    @exception StandardException Standard exception policy.
     **/
-	public void reopenScan(
+    public void reopenScan(
     DataValueDescriptor[]   startKeyValue,
     int                     startSearchOperator,
     Qualifier               qualifier[][],
@@ -1345,13 +1346,13 @@ public abstract class GenericScanControl
     }
 
     /**
-	@see org.apache.derby.iapi.store.access.ScanController#replace
-	**/
+    @see org.apache.derby.iapi.store.access.ScanController#replace
+    **/
     public boolean replace(
     DataValueDescriptor[]   row, 
     FormatableBitSet                 validColumns)
-		throws StandardException
-	{
+        throws StandardException
+    {
         repositionScanForUpateOper();
 
         Page page = scan_position.current_page;
@@ -1388,7 +1389,7 @@ public abstract class GenericScanControl
         scan_position.unlatch();
 
         return(ret_val);
-	}
+    }
 
     /**
     Returns true if the current position of the scan still qualifies
@@ -1409,10 +1410,10 @@ public abstract class GenericScanControl
     The results of a fetch() performed on a scan positioned on 
     a deleted row are undefined.
 
-	@exception StandardException Standard exception policy.
+    @exception StandardException Standard exception policy.
     **/
     public boolean doesCurrentPositionQualify()
-		throws StandardException
+        throws StandardException
     {
         if (scan_state != SCAN_INPROGRESS)
             throw StandardException.newException(
@@ -1446,14 +1447,14 @@ public abstract class GenericScanControl
     /**
     Fetch the row at the current position of the Scan without applying the 
     qualifiers.
-	
+    
     @see org.apache.derby.iapi.store.access.ScanController#fetchWithoutQualify
-	**/
-	public void fetchWithoutQualify(DataValueDescriptor[] row)
-		throws StandardException
-	{
-		fetch(row, false);
-	}
+    **/
+    public void fetchWithoutQualify(DataValueDescriptor[] row)
+        throws StandardException
+    {
+        fetch(row, false);
+    }
 
     /**
      * @see org.apache.derby.iapi.store.access.ScanController#isHeldAfterCommit
@@ -1465,19 +1466,19 @@ public abstract class GenericScanControl
     }
 
 
-	
-	/**
+    
+    /**
     Fetch the row at the current position of the Scan.
 
     @see org.apache.derby.iapi.store.access.ScanController#fetch
-	**/
-	public void fetch(DataValueDescriptor[] row)
-		throws StandardException
-	{
-		fetch(row, true);
-	}
+    **/
+    public void fetch(DataValueDescriptor[] row)
+        throws StandardException
+    {
+        fetch(row, true);
+    }
 
-	/**
+    /**
     Fetch the row at the current position of the Scan.
 
     @param row The row into which the value of the current 
@@ -1486,10 +1487,10 @@ public abstract class GenericScanControl
     @param qualify Indicates whether the qualifiers should be applied.
 
     @exception StandardException Standard exception policy.
-	**/
-	private void fetch(DataValueDescriptor[] row, boolean qualify)
-		throws StandardException
-	{
+    **/
+    private void fetch(DataValueDescriptor[] row, boolean qualify)
+        throws StandardException
+    {
         if (scan_state != SCAN_INPROGRESS)
             throw StandardException.newException(
                     SQLState.AM_SCAN_NOT_POSITIONED);
@@ -1499,6 +1500,7 @@ public abstract class GenericScanControl
             throw StandardException.newException(
                     SQLState.AM_RECORD_NOT_FOUND, 
                     open_conglom.getContainer().getId(),
+                    new Long(scan_position.current_rh.getPageNumber()),
                     new Long(scan_position.current_rh.getId()));
         }
 
@@ -1532,24 +1534,25 @@ public abstract class GenericScanControl
             throw StandardException.newException(
                     SQLState.AM_RECORD_NOT_FOUND, 
                     open_conglom.getContainer().getId(),
+                    new Long(scan_position.current_rh.getPageNumber()),
                     new Long(scan_position.current_rh.getId()));
         }
 
         return;
-	}
+    }
 
-	/**
-	Fetch the location of the current position in the scan.
-	@see org.apache.derby.iapi.store.access.ScanController#fetchLocation
-
-	@exception  StandardException  Standard exception policy.
-	**/
-	public void fetchLocation(RowLocation templateLocation)
-		throws StandardException
-	{
+    /**
+    Fetch the location of the current position in the scan.
+    @see org.apache.derby.iapi.store.access.ScanController#fetchLocation
+
+    @exception  StandardException  Standard exception policy.
+    **/
+    public void fetchLocation(RowLocation templateLocation)
+        throws StandardException
+    {
         throw StandardException.newException(
                 SQLState.BTREE_UNIMPLEMENTED_FEATURE);
-	}
+    }
 
     /**
      * Return ScanInfo object which describes performance of scan.
@@ -1560,12 +1563,12 @@ public abstract class GenericScanControl
      *
      * @see ScanInfo
      *
-	 * @return The ScanInfo object which contains info about current scan.
+     * @return The ScanInfo object which contains info about current scan.
      *
-	 * @exception  StandardException  Standard exception policy.
+     * @exception  StandardException  Standard exception policy.
      **/
     public ScanInfo getScanInfo()
-		throws StandardException
+        throws StandardException
     {
         throw StandardException.newException(
                 SQLState.BTREE_UNIMPLEMENTED_FEATURE);
@@ -1583,10 +1586,10 @@ public abstract class GenericScanControl
     The results of a fetch() performed on a scan positioned on 
     a deleted row are undefined.
 
-	@exception StandardException Standard exception policy.
+    @exception StandardException Standard exception policy.
     **/
     public boolean isCurrentPositionDeleted()
-		throws StandardException
+        throws StandardException
     {
         if (scan_state != SCAN_INPROGRESS)
             throw StandardException.newException(



Mime
View raw message