You are viewing a plain text version of this content. The canonical link for it is here.
Posted to derby-commits@db.apache.org by ka...@apache.org on 2007/03/26 09:31:26 UTC

svn commit: r522442 - /db/derby/code/trunk/java/engine/org/apache/derby/impl/store/access/btree/BTreeForwardScan.java

Author: kahatlen
Date: Mon Mar 26 00:31:23 2007
New Revision: 522442

URL: http://svn.apache.org/viewvc?view=rev&rev=522442
Log:
DERBY-2359: Removed a workaround for a problem in mssdk302

Modified:
    db/derby/code/trunk/java/engine/org/apache/derby/impl/store/access/btree/BTreeForwardScan.java

Modified: db/derby/code/trunk/java/engine/org/apache/derby/impl/store/access/btree/BTreeForwardScan.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/engine/org/apache/derby/impl/store/access/btree/BTreeForwardScan.java?view=diff&rev=522442&r1=522441&r2=522442
==============================================================================
--- db/derby/code/trunk/java/engine/org/apache/derby/impl/store/access/btree/BTreeForwardScan.java (original)
+++ db/derby/code/trunk/java/engine/org/apache/derby/impl/store/access/btree/BTreeForwardScan.java Mon Mar 26 00:31:23 2007
@@ -27,22 +27,14 @@
 
 import org.apache.derby.iapi.error.StandardException;
 
-import org.apache.derby.iapi.store.access.conglomerate.LogicalUndo;
-import org.apache.derby.iapi.store.access.conglomerate.TransactionManager;
-
-import org.apache.derby.iapi.store.access.DynamicCompiledOpenConglomInfo;
-import org.apache.derby.iapi.store.access.Qualifier;
 import org.apache.derby.iapi.store.access.ScanController;
-import org.apache.derby.iapi.store.access.StaticCompiledOpenConglomInfo;
 
 import org.apache.derby.iapi.store.raw.Page;
 import org.apache.derby.iapi.store.raw.RecordHandle;
-import org.apache.derby.iapi.store.raw.Transaction;
 
 import org.apache.derby.iapi.types.DataValueDescriptor;
 import org.apache.derby.iapi.types.RowLocation;
 
-import org.apache.derby.iapi.services.io.FormatableBitSet;
 import org.apache.derby.iapi.store.access.BackingStoreHashtable;
 
 /**
@@ -78,64 +70,6 @@
 	{
         positionAtStartForForwardScan(pos);
 	}
-
-	///////////////////////////////////////////////
-	// 
-	// RESOLVE (jamie): i had to add these simple
-	// super.init() super.close() calls to get mssdk302
-	// to work.  I could not determine what the problem
-	// is.  For the time being, please don't remove
-	// them even though they don't appear to serve a
-	// useful purpose.
-	// 
-	///////////////////////////////////////////////
-	
-	/**
-	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(
-    TransactionManager              xact_manager,
-    Transaction                     rawtran,
-    boolean                         hold,
-    int                             open_mode,
-    int                             lock_level,
-    BTreeLockingPolicy              btree_locking_policy,
-    FormatableBitSet                         scanColumnList,
-    DataValueDescriptor[]	        startKeyValue,
-    int                             startSearchOperator,
-    Qualifier                       qualifier[][],
-    DataValueDescriptor[]	        stopKeyValue,
-    int                             stopSearchOperator,
-    BTree                           conglomerate,
-    LogicalUndo                     undo,
-    StaticCompiledOpenConglomInfo   static_info,
-    DynamicCompiledOpenConglomInfo  dynamic_info)
-        throws StandardException
-	{
-		super.init(
-            xact_manager, rawtran, hold, open_mode, lock_level,
-            btree_locking_policy, scanColumnList, startKeyValue,
-            startSearchOperator, qualifier, stopKeyValue,
-			stopSearchOperator, conglomerate, undo, static_info, dynamic_info);
-	}
-
-    /**
-    Close the scan.
-    **/
-    public void close()
-        throws StandardException
-	{
-		super.close();
-	}
-
 
     /**
      * Fetch the next N rows from the table.