Return-Path: Delivered-To: apmail-db-derby-commits-archive@www.apache.org Received: (qmail 26712 invoked from network); 22 Feb 2007 14:45:38 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.2) by minotaur.apache.org with SMTP; 22 Feb 2007 14:45:38 -0000 Received: (qmail 5078 invoked by uid 500); 22 Feb 2007 14:45:46 -0000 Delivered-To: apmail-db-derby-commits-archive@db.apache.org Received: (qmail 5015 invoked by uid 500); 22 Feb 2007 14:45:46 -0000 Mailing-List: contact derby-commits-help@db.apache.org; run by ezmlm Precedence: bulk list-help: list-unsubscribe: List-Post: Reply-To: "Derby Development" List-Id: Delivered-To: mailing list derby-commits@db.apache.org Received: (qmail 5004 invoked by uid 99); 22 Feb 2007 14:45:46 -0000 Received: from herse.apache.org (HELO herse.apache.org) (140.211.11.133) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 22 Feb 2007 06:45:46 -0800 X-ASF-Spam-Status: No, hits=-99.5 required=10.0 tests=ALL_TRUSTED,NO_REAL_NAME X-Spam-Check-By: apache.org Received: from [140.211.11.3] (HELO eris.apache.org) (140.211.11.3) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 22 Feb 2007 06:45:34 -0800 Received: by eris.apache.org (Postfix, from userid 65534) id 9C7C01A981A; Thu, 22 Feb 2007 06:45:14 -0800 (PST) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r510538 [1/2] - in /db/derby/code/trunk/java/engine/org/apache/derby/impl/store/access: ./ btree/ btree/index/ conglomerate/ heap/ sort/ Date: Thu, 22 Feb 2007 14:45:09 -0000 To: derby-commits@db.apache.org From: kristwaa@apache.org X-Mailer: svnmailer-1.1.0 Message-Id: <20070222144514.9C7C01A981A@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: kristwaa Date: Thu Feb 22 06:45:04 2007 New Revision: 510538 URL: http://svn.apache.org/viewvc?view=rev&rev=510538 Log: DERBY-2359 (partial): Removed unused imports (from impl.store.access.*), moved a few blocks of class JavaDoc and fully qualified class-names in some @see tags. Modified: db/derby/code/trunk/java/engine/org/apache/derby/impl/store/access/BackingStoreHashTableFromScan.java db/derby/code/trunk/java/engine/org/apache/derby/impl/store/access/CacheableConglomerate.java db/derby/code/trunk/java/engine/org/apache/derby/impl/store/access/PC_XenaVersion.java db/derby/code/trunk/java/engine/org/apache/derby/impl/store/access/PropertyConglomerate.java db/derby/code/trunk/java/engine/org/apache/derby/impl/store/access/RAMAccessManager.java db/derby/code/trunk/java/engine/org/apache/derby/impl/store/access/RAMTransaction.java db/derby/code/trunk/java/engine/org/apache/derby/impl/store/access/RAMTransactionContext.java db/derby/code/trunk/java/engine/org/apache/derby/impl/store/access/RllRAMAccessManager.java db/derby/code/trunk/java/engine/org/apache/derby/impl/store/access/StorableFormatId.java db/derby/code/trunk/java/engine/org/apache/derby/impl/store/access/btree/BTree.java db/derby/code/trunk/java/engine/org/apache/derby/impl/store/access/btree/BTreeController.java db/derby/code/trunk/java/engine/org/apache/derby/impl/store/access/btree/BTreeCostController.java db/derby/code/trunk/java/engine/org/apache/derby/impl/store/access/btree/BTreeForwardScan.java db/derby/code/trunk/java/engine/org/apache/derby/impl/store/access/btree/BTreeLockingPolicy.java db/derby/code/trunk/java/engine/org/apache/derby/impl/store/access/btree/BTreePostCommit.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/btree/BranchControlRow.java db/derby/code/trunk/java/engine/org/apache/derby/impl/store/access/btree/BranchRow.java db/derby/code/trunk/java/engine/org/apache/derby/impl/store/access/btree/ControlRow.java db/derby/code/trunk/java/engine/org/apache/derby/impl/store/access/btree/D_BTreeController.java db/derby/code/trunk/java/engine/org/apache/derby/impl/store/access/btree/LeafControlRow.java db/derby/code/trunk/java/engine/org/apache/derby/impl/store/access/btree/OpenBTree.java db/derby/code/trunk/java/engine/org/apache/derby/impl/store/access/btree/SearchParameters.java db/derby/code/trunk/java/engine/org/apache/derby/impl/store/access/btree/index/B2I.java db/derby/code/trunk/java/engine/org/apache/derby/impl/store/access/btree/index/B2IController.java db/derby/code/trunk/java/engine/org/apache/derby/impl/store/access/btree/index/B2ICostController.java db/derby/code/trunk/java/engine/org/apache/derby/impl/store/access/btree/index/B2IFactory.java db/derby/code/trunk/java/engine/org/apache/derby/impl/store/access/btree/index/B2IForwardScan.java db/derby/code/trunk/java/engine/org/apache/derby/impl/store/access/btree/index/B2IMaxScan.java db/derby/code/trunk/java/engine/org/apache/derby/impl/store/access/btree/index/B2INoLocking.java db/derby/code/trunk/java/engine/org/apache/derby/impl/store/access/btree/index/B2IRowLocking1.java db/derby/code/trunk/java/engine/org/apache/derby/impl/store/access/btree/index/B2IRowLocking2.java db/derby/code/trunk/java/engine/org/apache/derby/impl/store/access/btree/index/B2IRowLocking3.java db/derby/code/trunk/java/engine/org/apache/derby/impl/store/access/btree/index/B2IRowLockingRR.java db/derby/code/trunk/java/engine/org/apache/derby/impl/store/access/btree/index/B2IStaticCompiledInfo.java db/derby/code/trunk/java/engine/org/apache/derby/impl/store/access/btree/index/B2ITableLocking3.java db/derby/code/trunk/java/engine/org/apache/derby/impl/store/access/btree/index/B2IUndo.java db/derby/code/trunk/java/engine/org/apache/derby/impl/store/access/conglomerate/BinaryOrderableWrapper.java db/derby/code/trunk/java/engine/org/apache/derby/impl/store/access/conglomerate/ConglomerateUtil.java db/derby/code/trunk/java/engine/org/apache/derby/impl/store/access/conglomerate/GenericConglomerate.java db/derby/code/trunk/java/engine/org/apache/derby/impl/store/access/conglomerate/GenericConglomerateController.java db/derby/code/trunk/java/engine/org/apache/derby/impl/store/access/conglomerate/GenericController.java db/derby/code/trunk/java/engine/org/apache/derby/impl/store/access/conglomerate/GenericCostController.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/conglomerate/OpenConglomerate.java db/derby/code/trunk/java/engine/org/apache/derby/impl/store/access/heap/D_HeapController.java db/derby/code/trunk/java/engine/org/apache/derby/impl/store/access/heap/Heap.java db/derby/code/trunk/java/engine/org/apache/derby/impl/store/access/heap/HeapCompressScan.java db/derby/code/trunk/java/engine/org/apache/derby/impl/store/access/heap/HeapConglomerateFactory.java db/derby/code/trunk/java/engine/org/apache/derby/impl/store/access/heap/HeapCostController.java db/derby/code/trunk/java/engine/org/apache/derby/impl/store/access/heap/HeapPostCommit.java db/derby/code/trunk/java/engine/org/apache/derby/impl/store/access/heap/HeapRowLocation.java db/derby/code/trunk/java/engine/org/apache/derby/impl/store/access/heap/HeapScan.java db/derby/code/trunk/java/engine/org/apache/derby/impl/store/access/sort/ExternalSortFactory.java db/derby/code/trunk/java/engine/org/apache/derby/impl/store/access/sort/MergeInserter.java db/derby/code/trunk/java/engine/org/apache/derby/impl/store/access/sort/MergeScan.java db/derby/code/trunk/java/engine/org/apache/derby/impl/store/access/sort/MergeScanRowSource.java db/derby/code/trunk/java/engine/org/apache/derby/impl/store/access/sort/MergeSort.java db/derby/code/trunk/java/engine/org/apache/derby/impl/store/access/sort/Scan.java db/derby/code/trunk/java/engine/org/apache/derby/impl/store/access/sort/SortBuffer.java db/derby/code/trunk/java/engine/org/apache/derby/impl/store/access/sort/SortBufferRowSource.java db/derby/code/trunk/java/engine/org/apache/derby/impl/store/access/sort/SortBufferScan.java db/derby/code/trunk/java/engine/org/apache/derby/impl/store/access/sort/SortScan.java Modified: db/derby/code/trunk/java/engine/org/apache/derby/impl/store/access/BackingStoreHashTableFromScan.java URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/engine/org/apache/derby/impl/store/access/BackingStoreHashTableFromScan.java?view=diff&rev=510538&r1=510537&r2=510538 ============================================================================== --- db/derby/code/trunk/java/engine/org/apache/derby/impl/store/access/BackingStoreHashTableFromScan.java (original) +++ db/derby/code/trunk/java/engine/org/apache/derby/impl/store/access/BackingStoreHashTableFromScan.java Thu Feb 22 06:45:04 2007 @@ -21,8 +21,6 @@ package org.apache.derby.impl.store.access; -import org.apache.derby.iapi.services.sanity.SanityManager; - import org.apache.derby.iapi.error.StandardException; import org.apache.derby.iapi.store.access.conglomerate.ScanManager; Modified: db/derby/code/trunk/java/engine/org/apache/derby/impl/store/access/CacheableConglomerate.java URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/engine/org/apache/derby/impl/store/access/CacheableConglomerate.java?view=diff&rev=510538&r1=510537&r2=510538 ============================================================================== --- db/derby/code/trunk/java/engine/org/apache/derby/impl/store/access/CacheableConglomerate.java (original) +++ db/derby/code/trunk/java/engine/org/apache/derby/impl/store/access/CacheableConglomerate.java Thu Feb 22 06:45:04 2007 @@ -21,9 +21,7 @@ package org.apache.derby.impl.store.access; -import java.util.Properties; import org.apache.derby.iapi.services.cache.Cacheable; -import org.apache.derby.iapi.services.cache.CacheManager; import org.apache.derby.iapi.services.sanity.SanityManager; import org.apache.derby.iapi.error.StandardException; import org.apache.derby.iapi.store.access.conglomerate.Conglomerate; @@ -89,7 +87,7 @@ @exception StandardException Standard Cloudscape Policy - @see CacheManager#find + @see org.apache.derby.iapi.services.cache.CacheManager#find */ public Cacheable setIdentity(Object key) throws StandardException @@ -128,7 +126,7 @@ * @exception StandardException If forCreate is true and the object cannot * be created. * - * @see CacheManager#create + * @see org.apache.derby.iapi.services.cache.CacheManager#create **/ public Cacheable createIdentity(Object key, Object createParameter) throws StandardException Modified: db/derby/code/trunk/java/engine/org/apache/derby/impl/store/access/PC_XenaVersion.java URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/engine/org/apache/derby/impl/store/access/PC_XenaVersion.java?view=diff&rev=510538&r1=510537&r2=510538 ============================================================================== --- db/derby/code/trunk/java/engine/org/apache/derby/impl/store/access/PC_XenaVersion.java (original) +++ db/derby/code/trunk/java/engine/org/apache/derby/impl/store/access/PC_XenaVersion.java Thu Feb 22 06:45:04 2007 @@ -22,21 +22,15 @@ package org.apache.derby.impl.store.access; import org.apache.derby.iapi.reference.SQLState; -import org.apache.derby.iapi.reference.Property; -import org.apache.derby.iapi.reference.ClassName; -import org.apache.derby.iapi.services.io.FormatIdUtil; import org.apache.derby.iapi.services.io.StoredFormatIds; import org.apache.derby.iapi.services.io.Formatable; import org.apache.derby.iapi.error.StandardException; import org.apache.derby.iapi.sql.dictionary.DataDictionary; import org.apache.derby.iapi.store.access.TransactionController; -import org.apache.derby.iapi.services.property.PropertyUtil; -import org.apache.derby.catalog.UUID; + import java.io.IOException; import java.io.ObjectInput; import java.io.ObjectOutput; -import java.io.StreamCorruptedException; -import java.util.Enumeration; import java.util.Properties; public class PC_XenaVersion implements Formatable Modified: db/derby/code/trunk/java/engine/org/apache/derby/impl/store/access/PropertyConglomerate.java URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/engine/org/apache/derby/impl/store/access/PropertyConglomerate.java?view=diff&rev=510538&r1=510537&r2=510538 ============================================================================== --- db/derby/code/trunk/java/engine/org/apache/derby/impl/store/access/PropertyConglomerate.java (original) +++ db/derby/code/trunk/java/engine/org/apache/derby/impl/store/access/PropertyConglomerate.java Thu Feb 22 06:45:04 2007 @@ -26,13 +26,10 @@ import org.apache.derby.iapi.reference.SQLState; import org.apache.derby.iapi.types.UserType; -import org.apache.derby.impl.store.access.UTF; -import org.apache.derby.impl.store.access.UTFQualifier; import org.apache.derby.iapi.services.io.FormatableBitSet; import org.apache.derby.iapi.services.io.FormatableHashtable; import org.apache.derby.iapi.services.locks.ShExLockable; import org.apache.derby.iapi.services.locks.ShExQual; -import org.apache.derby.iapi.services.daemon.Serviceable; import org.apache.derby.iapi.services.locks.C_LockFactory; import org.apache.derby.iapi.services.locks.Latch; import org.apache.derby.iapi.services.locks.LockFactory; @@ -48,7 +45,6 @@ import org.apache.derby.iapi.store.access.AccessFactoryGlobals; import org.apache.derby.iapi.store.access.ConglomerateController; import org.apache.derby.iapi.services.property.PropertyFactory; -import org.apache.derby.iapi.services.property.PropertySetCallback; import org.apache.derby.iapi.store.access.Qualifier; import org.apache.derby.iapi.store.access.ScanController; import org.apache.derby.iapi.store.access.TransactionController; Modified: db/derby/code/trunk/java/engine/org/apache/derby/impl/store/access/RAMAccessManager.java URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/engine/org/apache/derby/impl/store/access/RAMAccessManager.java?view=diff&rev=510538&r1=510537&r2=510538 ============================================================================== --- db/derby/code/trunk/java/engine/org/apache/derby/impl/store/access/RAMAccessManager.java (original) +++ db/derby/code/trunk/java/engine/org/apache/derby/impl/store/access/RAMAccessManager.java Thu Feb 22 06:45:04 2007 @@ -35,7 +35,6 @@ import org.apache.derby.iapi.services.property.PropertySetCallback; import org.apache.derby.iapi.services.sanity.SanityManager; -import org.apache.derby.iapi.services.io.FormatIdUtil; import org.apache.derby.iapi.error.StandardException; @@ -59,7 +58,6 @@ import org.apache.derby.catalog.UUID; -import org.apache.derby.iapi.services.io.FormatableHashtable; import org.apache.derby.iapi.reference.SQLState; import org.apache.derby.iapi.reference.Attribute; @@ -68,7 +66,6 @@ import java.util.Hashtable; import java.util.Properties; -import java.io.File; import java.io.Serializable; Modified: db/derby/code/trunk/java/engine/org/apache/derby/impl/store/access/RAMTransaction.java URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/engine/org/apache/derby/impl/store/access/RAMTransaction.java?view=diff&rev=510538&r1=510537&r2=510538 ============================================================================== --- db/derby/code/trunk/java/engine/org/apache/derby/impl/store/access/RAMTransaction.java (original) +++ db/derby/code/trunk/java/engine/org/apache/derby/impl/store/access/RAMTransaction.java Thu Feb 22 06:45:04 2007 @@ -54,7 +54,6 @@ import org.apache.derby.iapi.store.access.GroupFetchScanController; import org.apache.derby.iapi.store.access.Qualifier; import org.apache.derby.iapi.store.access.RowLocationRetRowSource; -import org.apache.derby.iapi.store.access.RowSource; import org.apache.derby.iapi.store.access.ScanController; import org.apache.derby.iapi.store.access.SortController; import org.apache.derby.iapi.store.access.SortCostController; @@ -85,10 +84,8 @@ import java.io.Serializable; - // debugging import org.apache.derby.iapi.services.stream.HeaderPrintWriter; -import org.apache.derby.iapi.services.stream.InfoStreams; public class RAMTransaction implements XATransactionController, TransactionManager Modified: db/derby/code/trunk/java/engine/org/apache/derby/impl/store/access/RAMTransactionContext.java URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/engine/org/apache/derby/impl/store/access/RAMTransactionContext.java?view=diff&rev=510538&r1=510537&r2=510538 ============================================================================== --- db/derby/code/trunk/java/engine/org/apache/derby/impl/store/access/RAMTransactionContext.java (original) +++ db/derby/code/trunk/java/engine/org/apache/derby/impl/store/access/RAMTransactionContext.java Thu Feb 22 06:45:04 2007 @@ -21,13 +21,14 @@ package org.apache.derby.impl.store.access; -import org.apache.derby.iapi.services.sanity.SanityManager; +import org.apache.derby.iapi.error.ExceptionSeverity; import org.apache.derby.iapi.error.StandardException; -import org.apache.derby.iapi.store.access.TransactionController; -import org.apache.derby.iapi.services.context.ContextManager; +import org.apache.derby.iapi.services.context.ContextManager; import org.apache.derby.iapi.services.context.ContextImpl; -import org.apache.derby.iapi.error.ExceptionSeverity; + +import org.apache.derby.iapi.services.sanity.SanityManager; + final class RAMTransactionContext extends ContextImpl { /** Modified: db/derby/code/trunk/java/engine/org/apache/derby/impl/store/access/RllRAMAccessManager.java URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/engine/org/apache/derby/impl/store/access/RllRAMAccessManager.java?view=diff&rev=510538&r1=510537&r2=510538 ============================================================================== --- db/derby/code/trunk/java/engine/org/apache/derby/impl/store/access/RllRAMAccessManager.java (original) +++ db/derby/code/trunk/java/engine/org/apache/derby/impl/store/access/RllRAMAccessManager.java Thu Feb 22 06:45:04 2007 @@ -21,20 +21,10 @@ package org.apache.derby.impl.store.access; -import org.apache.derby.iapi.services.monitor.Monitor; - import org.apache.derby.iapi.error.StandardException; - -import org.apache.derby.iapi.store.access.AccessFactoryGlobals; -import org.apache.derby.iapi.store.access.TransactionController; - -import org.apache.derby.iapi.store.raw.LockingPolicy; - -import org.apache.derby.iapi.services.property.PropertyUtil; - -import java.util.Properties; - import org.apache.derby.iapi.reference.Property; +import org.apache.derby.iapi.services.property.PropertyUtil; +import org.apache.derby.iapi.store.access.TransactionController; /** Modified: db/derby/code/trunk/java/engine/org/apache/derby/impl/store/access/StorableFormatId.java URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/engine/org/apache/derby/impl/store/access/StorableFormatId.java?view=diff&rev=510538&r1=510537&r2=510538 ============================================================================== --- db/derby/code/trunk/java/engine/org/apache/derby/impl/store/access/StorableFormatId.java (original) +++ db/derby/code/trunk/java/engine/org/apache/derby/impl/store/access/StorableFormatId.java Thu Feb 22 06:45:04 2007 @@ -24,23 +24,17 @@ import org.apache.derby.iapi.reference.SQLState; import org.apache.derby.iapi.services.io.ArrayInputStream; - -import org.apache.derby.iapi.services.sanity.SanityManager; - -import org.apache.derby.iapi.services.io.Storable; - import org.apache.derby.iapi.services.io.FormatIdUtil; import org.apache.derby.iapi.services.io.StoredFormatIds; -import org.apache.derby.iapi.error.StandardException; - -import org.apache.derby.iapi.types.DataValueDescriptor; +import org.apache.derby.iapi.services.sanity.SanityManager; -import org.apache.derby.iapi.types.Orderable; +import org.apache.derby.iapi.error.StandardException; import org.apache.derby.iapi.services.cache.ClassSize; import org.apache.derby.iapi.types.DataType; +import org.apache.derby.iapi.types.DataValueDescriptor; import java.sql.ResultSet; import java.sql.SQLException; Modified: db/derby/code/trunk/java/engine/org/apache/derby/impl/store/access/btree/BTree.java URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/engine/org/apache/derby/impl/store/access/btree/BTree.java?view=diff&rev=510538&r1=510537&r2=510538 ============================================================================== --- db/derby/code/trunk/java/engine/org/apache/derby/impl/store/access/btree/BTree.java (original) +++ db/derby/code/trunk/java/engine/org/apache/derby/impl/store/access/btree/BTree.java Thu Feb 22 06:45:04 2007 @@ -21,59 +21,42 @@ package org.apache.derby.impl.store.access.btree; - import org.apache.derby.iapi.reference.SQLState; import org.apache.derby.iapi.services.io.ArrayInputStream; import org.apache.derby.iapi.services.io.FormatableBitSet; -import org.apache.derby.iapi.services.monitor.Monitor; import org.apache.derby.iapi.services.sanity.SanityManager; import org.apache.derby.iapi.services.io.FormatIdUtil; import org.apache.derby.iapi.services.io.Storable; -import org.apache.derby.iapi.services.stream.InfoStreams; - - import org.apache.derby.iapi.error.StandardException; -import org.apache.derby.iapi.store.access.conglomerate.Conglomerate; -import org.apache.derby.iapi.store.access.conglomerate.ScanManager; import org.apache.derby.iapi.store.access.conglomerate.TransactionManager; import org.apache.derby.iapi.store.access.ConglomerateController; import org.apache.derby.iapi.store.access.DynamicCompiledOpenConglomInfo; -import org.apache.derby.iapi.store.access.Qualifier; import org.apache.derby.iapi.store.access.RowLocationRetRowSource; -import org.apache.derby.iapi.store.access.RowUtil; -import org.apache.derby.iapi.store.access.ScanController; import org.apache.derby.iapi.store.access.StaticCompiledOpenConglomInfo; -import org.apache.derby.iapi.store.access.TransactionController; import org.apache.derby.iapi.store.raw.LockingPolicy; -import org.apache.derby.iapi.store.raw.Page; import org.apache.derby.iapi.store.raw.RawStoreFactory; -import org.apache.derby.iapi.store.raw.RecordHandle; import org.apache.derby.iapi.store.raw.ContainerHandle; import org.apache.derby.iapi.store.raw.Transaction; import org.apache.derby.iapi.store.raw.ContainerKey; import org.apache.derby.iapi.types.DataValueDescriptor; -import org.apache.derby.iapi.types.RowLocation; - import org.apache.derby.impl.store.access.conglomerate.ConglomerateUtil; import org.apache.derby.impl.store.access.conglomerate.GenericConglomerate; import org.apache.derby.impl.store.access.conglomerate.OpenConglomerateScratchSpace; import org.apache.derby.impl.store.access.conglomerate.TemplateRow; - import java.io.IOException; import java.io.ObjectOutput; import java.io.ObjectInput; import java.util.Properties; - /** A b-tree object corresponds to an instance of a b-tree conglomerate. It @@ -503,7 +486,7 @@ /** Drop this btree. This must be done by a concrete implementation. - @see Conglomerate#drop + @see org.apache.derby.iapi.store.access.conglomerate.Conglomerate#drop @exception StandardException Standard exception policy. **/ @@ -512,7 +495,7 @@ /** Load a b-tree. This must be done by a concrete implementation. - @see Conglomerate#load + @see org.apache.derby.iapi.store.access.conglomerate.Conglomerate#load @exception StandardException Standard exception policy. **/ @@ -567,7 +550,7 @@ /** Open a b-tree controller. This must be done by a concrete implementation. - @see Conglomerate#open + @see org.apache.derby.iapi.store.access.conglomerate.Conglomerate#open @exception StandardException Standard exception policy. **/ Modified: db/derby/code/trunk/java/engine/org/apache/derby/impl/store/access/btree/BTreeController.java URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/engine/org/apache/derby/impl/store/access/btree/BTreeController.java?view=diff&rev=510538&r1=510537&r2=510538 ============================================================================== --- db/derby/code/trunk/java/engine/org/apache/derby/impl/store/access/btree/BTreeController.java (original) +++ db/derby/code/trunk/java/engine/org/apache/derby/impl/store/access/btree/BTreeController.java Thu Feb 22 06:45:04 2007 @@ -21,17 +21,13 @@ package org.apache.derby.impl.store.access.btree; -import java.io.IOException; import java.util.Properties; import org.apache.derby.iapi.reference.SQLState; import org.apache.derby.iapi.services.sanity.SanityManager; -import org.apache.derby.iapi.services.io.Storable; - import org.apache.derby.iapi.error.StandardException; -import org.apache.derby.iapi.store.access.conglomerate.Conglomerate; 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.AccessFactoryGlobals; @@ -39,7 +35,6 @@ import org.apache.derby.iapi.store.access.DynamicCompiledOpenConglomInfo; import org.apache.derby.iapi.store.access.RowLocationRetRowSource; import org.apache.derby.iapi.store.access.RowUtil; -import org.apache.derby.iapi.store.access.ScanController; import org.apache.derby.iapi.store.access.StaticCompiledOpenConglomInfo; import org.apache.derby.iapi.store.access.TransactionController; @@ -47,7 +42,6 @@ import org.apache.derby.iapi.store.raw.FetchDescriptor; import org.apache.derby.iapi.store.raw.LockingPolicy; 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; @@ -58,8 +52,6 @@ import org.apache.derby.impl.store.access.conglomerate.ConglomerateUtil; import org.apache.derby.impl.store.access.conglomerate.TemplateRow; - - /** A b-tree controller corresponds to an instance of an open b-tree conglomerate. @@ -1155,7 +1147,7 @@ * conglomerate, then raise * SQLState.STORE_CONGLOMERATE_DUPLICATE_KEY_EXCEPTION. * - * @see Conglomerate#load + * @see org.apache.derby.iapi.store.access.conglomerate.Conglomerate#load **/ public long load( TransactionManager xact_manager, Modified: db/derby/code/trunk/java/engine/org/apache/derby/impl/store/access/btree/BTreeCostController.java URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/engine/org/apache/derby/impl/store/access/btree/BTreeCostController.java?view=diff&rev=510538&r1=510537&r2=510538 ============================================================================== --- db/derby/code/trunk/java/engine/org/apache/derby/impl/store/access/btree/BTreeCostController.java (original) +++ db/derby/code/trunk/java/engine/org/apache/derby/impl/store/access/btree/BTreeCostController.java Thu Feb 22 06:45:04 2007 @@ -33,22 +33,17 @@ import org.apache.derby.iapi.store.access.conglomerate.TransactionManager; import org.apache.derby.iapi.store.access.DynamicCompiledOpenConglomInfo; -import org.apache.derby.iapi.store.access.RowUtil; import org.apache.derby.iapi.store.access.ScanController; import org.apache.derby.iapi.store.access.StoreCostController; import org.apache.derby.iapi.store.access.StoreCostResult; -import org.apache.derby.iapi.store.access.TransactionController; import org.apache.derby.iapi.store.raw.ContainerHandle; -import org.apache.derby.iapi.store.raw.LockingPolicy; -import org.apache.derby.iapi.store.raw.RawStoreFactory; 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 java.util.Properties; @@ -74,7 +69,7 @@ conglomerate, thus allowing concurrent access to the table by a executing query while another query is optimizing.

-@see TransactionController#openStoreCost +@see org.apache.derby.iapi.store.access.TransactionController#openStoreCost **/ @@ -289,7 +284,7 @@ * * @exception StandardException Standard exception policy. * - * @see RowUtil + * @see org.apache.derby.iapi.store.access.RowUtil **/ public double getFetchFromRowLocationCost( FormatableBitSet validColumns, @@ -345,7 +340,7 @@ * * @exception StandardException Standard exception policy. * - * @see RowUtil + * @see org.apache.derby.iapi.store.access.RowUtil **/ public double getFetchFromFullKeyCost( FormatableBitSet validColumns, @@ -502,7 +497,7 @@ * * @exception StandardException Standard exception policy. * - * @see RowUtil + * @see org.apache.derby.iapi.store.access.RowUtil **/ public void getScanCost( int scan_type, 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=510538&r1=510537&r2=510538 ============================================================================== --- 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 Thu Feb 22 06:45:04 2007 @@ -24,35 +24,23 @@ import org.apache.derby.iapi.reference.SQLState; import org.apache.derby.iapi.services.sanity.SanityManager; -import org.apache.derby.iapi.services.io.Storable; import org.apache.derby.iapi.error.StandardException; -import org.apache.derby.iapi.store.access.conglomerate.Conglomerate; import org.apache.derby.iapi.store.access.conglomerate.LogicalUndo; -import org.apache.derby.iapi.store.access.conglomerate.ScanManager; 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.RowUtil; import org.apache.derby.iapi.store.access.ScanController; -import org.apache.derby.iapi.store.access.ScanInfo; import org.apache.derby.iapi.store.access.StaticCompiledOpenConglomInfo; -import org.apache.derby.iapi.store.access.TransactionController; -import org.apache.derby.iapi.store.raw.ContainerHandle; -import org.apache.derby.iapi.store.raw.LockingPolicy; 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.impl.store.access.conglomerate.ConglomerateUtil; -import org.apache.derby.impl.store.access.conglomerate.TemplateRow; import org.apache.derby.iapi.services.io.FormatableBitSet; import org.apache.derby.iapi.store.access.BackingStoreHashtable; Modified: db/derby/code/trunk/java/engine/org/apache/derby/impl/store/access/btree/BTreeLockingPolicy.java URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/engine/org/apache/derby/impl/store/access/btree/BTreeLockingPolicy.java?view=diff&rev=510538&r1=510537&r2=510538 ============================================================================== --- db/derby/code/trunk/java/engine/org/apache/derby/impl/store/access/btree/BTreeLockingPolicy.java (original) +++ db/derby/code/trunk/java/engine/org/apache/derby/impl/store/access/btree/BTreeLockingPolicy.java Thu Feb 22 06:45:04 2007 @@ -23,16 +23,9 @@ import org.apache.derby.iapi.error.StandardException; -import org.apache.derby.iapi.store.access.conglomerate.TransactionManager; - -import org.apache.derby.iapi.store.access.ConglomerateController; - import org.apache.derby.iapi.store.raw.FetchDescriptor; -import org.apache.derby.iapi.store.raw.Page; -import org.apache.derby.iapi.store.raw.RecordHandle; import org.apache.derby.iapi.types.DataValueDescriptor; - import org.apache.derby.iapi.types.RowLocation; /** Modified: db/derby/code/trunk/java/engine/org/apache/derby/impl/store/access/btree/BTreePostCommit.java URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/engine/org/apache/derby/impl/store/access/btree/BTreePostCommit.java?view=diff&rev=510538&r1=510537&r2=510538 ============================================================================== --- db/derby/code/trunk/java/engine/org/apache/derby/impl/store/access/btree/BTreePostCommit.java (original) +++ db/derby/code/trunk/java/engine/org/apache/derby/impl/store/access/btree/BTreePostCommit.java Thu Feb 22 06:45:04 2007 @@ -23,7 +23,6 @@ import org.apache.derby.iapi.services.context.ContextManager; import org.apache.derby.iapi.services.daemon.Serviceable; -import org.apache.derby.iapi.services.monitor.Monitor; import org.apache.derby.iapi.services.sanity.SanityManager; import org.apache.derby.iapi.error.StandardException; @@ -35,18 +34,14 @@ 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.Qualifier; - import org.apache.derby.iapi.store.raw.ContainerHandle; import org.apache.derby.iapi.store.raw.FetchDescriptor; import org.apache.derby.iapi.store.raw.LockingPolicy; 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.services.io.FormatableBitSet; import org.apache.derby.iapi.reference.SQLState; /** 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?view=diff&rev=510538&r1=510537&r2=510538 ============================================================================== --- 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 Feb 22 06:45:04 2007 @@ -24,7 +24,6 @@ import org.apache.derby.iapi.reference.SQLState; import org.apache.derby.iapi.services.sanity.SanityManager; -import org.apache.derby.iapi.services.io.Storable; import org.apache.derby.iapi.error.StandardException; @@ -35,13 +34,11 @@ import org.apache.derby.iapi.store.access.ConglomerateController; import org.apache.derby.iapi.store.access.DynamicCompiledOpenConglomInfo; -import org.apache.derby.iapi.store.access.GenericScanController; import org.apache.derby.iapi.store.access.Qualifier; import org.apache.derby.iapi.store.access.RowUtil; import org.apache.derby.iapi.store.access.ScanController; import org.apache.derby.iapi.store.access.ScanInfo; import org.apache.derby.iapi.store.access.StaticCompiledOpenConglomInfo; -import org.apache.derby.iapi.store.access.TransactionController; import org.apache.derby.iapi.store.raw.ContainerHandle; import org.apache.derby.iapi.store.raw.FetchDescriptor; @@ -54,7 +51,6 @@ import org.apache.derby.iapi.types.RowLocation; -import org.apache.derby.impl.store.access.conglomerate.ConglomerateUtil; import org.apache.derby.impl.store.access.conglomerate.TemplateRow; import org.apache.derby.iapi.services.io.FormatableBitSet; @@ -2197,7 +2193,7 @@ /** Return a row location object of the correct type to be used in calls to fetchLocation. - @see GenericScanController#newRowLocationTemplate + @see org.apache.derby.iapi.store.access.GenericScanController#newRowLocationTemplate @exception StandardException Standard exception policy. **/ Modified: db/derby/code/trunk/java/engine/org/apache/derby/impl/store/access/btree/BranchControlRow.java URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/engine/org/apache/derby/impl/store/access/btree/BranchControlRow.java?view=diff&rev=510538&r1=510537&r2=510538 ============================================================================== --- db/derby/code/trunk/java/engine/org/apache/derby/impl/store/access/btree/BranchControlRow.java (original) +++ db/derby/code/trunk/java/engine/org/apache/derby/impl/store/access/btree/BranchControlRow.java Thu Feb 22 06:45:04 2007 @@ -23,8 +23,6 @@ import org.apache.derby.iapi.reference.SQLState; -import org.apache.derby.iapi.services.io.FormatIdUtil; -import org.apache.derby.iapi.services.io.Storable; import org.apache.derby.iapi.services.io.StoredFormatIds; import org.apache.derby.iapi.services.sanity.SanityManager; @@ -34,9 +32,6 @@ import org.apache.derby.iapi.store.access.conglomerate.LogicalUndo; import org.apache.derby.iapi.store.access.AccessFactoryGlobals; -import org.apache.derby.iapi.store.access.Qualifier; -import org.apache.derby.iapi.store.access.RowUtil; -import org.apache.derby.iapi.store.access.ScanController; import org.apache.derby.iapi.store.raw.ContainerHandle; import org.apache.derby.iapi.store.raw.FetchDescriptor; Modified: db/derby/code/trunk/java/engine/org/apache/derby/impl/store/access/btree/BranchRow.java URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/engine/org/apache/derby/impl/store/access/btree/BranchRow.java?view=diff&rev=510538&r1=510537&r2=510538 ============================================================================== --- db/derby/code/trunk/java/engine/org/apache/derby/impl/store/access/btree/BranchRow.java (original) +++ db/derby/code/trunk/java/engine/org/apache/derby/impl/store/access/btree/BranchRow.java Thu Feb 22 06:45:04 2007 @@ -22,7 +22,6 @@ package org.apache.derby.impl.store.access.btree; import org.apache.derby.iapi.services.sanity.SanityManager; -import org.apache.derby.iapi.services.io.Storable; import org.apache.derby.iapi.error.StandardException; @@ -31,10 +30,7 @@ import org.apache.derby.iapi.store.raw.ContainerHandle; import org.apache.derby.iapi.types.DataValueDescriptor; - import org.apache.derby.iapi.types.SQLLongint; -import org.apache.derby.iapi.services.io.FormatableBitSet; - /** * Implements row which is stored in the branch pages of a btree. A non-suffix Modified: db/derby/code/trunk/java/engine/org/apache/derby/impl/store/access/btree/ControlRow.java URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/engine/org/apache/derby/impl/store/access/btree/ControlRow.java?view=diff&rev=510538&r1=510537&r2=510538 ============================================================================== --- db/derby/code/trunk/java/engine/org/apache/derby/impl/store/access/btree/ControlRow.java (original) +++ db/derby/code/trunk/java/engine/org/apache/derby/impl/store/access/btree/ControlRow.java Thu Feb 22 06:45:04 2007 @@ -21,19 +21,14 @@ package org.apache.derby.impl.store.access.btree; -import java.io.PrintStream; import org.apache.derby.iapi.services.monitor.Monitor; import org.apache.derby.iapi.services.sanity.SanityManager; -import org.apache.derby.iapi.services.io.FormatIdUtil; -import org.apache.derby.iapi.services.io.Storable; import org.apache.derby.iapi.services.io.TypedFormat; import org.apache.derby.iapi.error.StandardException; -import org.apache.derby.iapi.store.access.conglomerate.LogicalUndo; - import org.apache.derby.iapi.store.access.Qualifier; import org.apache.derby.iapi.store.access.RowUtil; @@ -47,7 +42,6 @@ import org.apache.derby.iapi.types.SQLLongint; import org.apache.derby.impl.store.access.StorableFormatId; - import org.apache.derby.iapi.services.io.FormatableBitSet; Modified: db/derby/code/trunk/java/engine/org/apache/derby/impl/store/access/btree/D_BTreeController.java URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/engine/org/apache/derby/impl/store/access/btree/D_BTreeController.java?view=diff&rev=510538&r1=510537&r2=510538 ============================================================================== --- db/derby/code/trunk/java/engine/org/apache/derby/impl/store/access/btree/D_BTreeController.java (original) +++ db/derby/code/trunk/java/engine/org/apache/derby/impl/store/access/btree/D_BTreeController.java Thu Feb 22 06:45:04 2007 @@ -21,20 +21,10 @@ package org.apache.derby.impl.store.access.btree; -import org.apache.derby.iapi.reference.Property; - -import org.apache.derby.iapi.services.context.ContextManager; -import org.apache.derby.iapi.services.diag.Diagnosticable; import org.apache.derby.iapi.services.diag.DiagnosticableGeneric; import org.apache.derby.iapi.services.diag.DiagnosticUtil; -import org.apache.derby.iapi.services.monitor.Monitor; import org.apache.derby.iapi.services.sanity.SanityManager; -import org.apache.derby.iapi.db.Database; import org.apache.derby.iapi.error.StandardException; -import org.apache.derby.iapi.store.access.AccessFactory; -import org.apache.derby.iapi.store.access.ConglomerateController; -import org.apache.derby.iapi.store.access.TransactionController; -import org.apache.derby.iapi.store.raw.ContainerHandle; import org.apache.derby.iapi.store.raw.Page; import java.util.Properties; Modified: db/derby/code/trunk/java/engine/org/apache/derby/impl/store/access/btree/LeafControlRow.java URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/engine/org/apache/derby/impl/store/access/btree/LeafControlRow.java?view=diff&rev=510538&r1=510537&r2=510538 ============================================================================== --- db/derby/code/trunk/java/engine/org/apache/derby/impl/store/access/btree/LeafControlRow.java (original) +++ db/derby/code/trunk/java/engine/org/apache/derby/impl/store/access/btree/LeafControlRow.java Thu Feb 22 06:45:04 2007 @@ -23,28 +23,21 @@ import org.apache.derby.iapi.reference.SQLState; import org.apache.derby.iapi.services.sanity.SanityManager; -import org.apache.derby.iapi.services.io.FormatIdUtil; import org.apache.derby.iapi.services.io.StoredFormatIds; -import org.apache.derby.iapi.services.io.TypedFormat; import org.apache.derby.iapi.error.StandardException; import org.apache.derby.iapi.store.access.conglomerate.LogicalUndo; import org.apache.derby.iapi.store.access.AccessFactoryGlobals; import org.apache.derby.iapi.store.access.ConglomerateController; -import org.apache.derby.iapi.store.access.Qualifier; -import org.apache.derby.iapi.store.access.RowUtil; -import org.apache.derby.iapi.store.access.ScanController; import org.apache.derby.iapi.store.raw.ContainerHandle; import org.apache.derby.iapi.store.raw.FetchDescriptor; 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 java.io.PrintStream; import org.apache.derby.iapi.services.io.FormatableBitSet; /** Modified: db/derby/code/trunk/java/engine/org/apache/derby/impl/store/access/btree/OpenBTree.java URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/engine/org/apache/derby/impl/store/access/btree/OpenBTree.java?view=diff&rev=510538&r1=510537&r2=510538 ============================================================================== --- db/derby/code/trunk/java/engine/org/apache/derby/impl/store/access/btree/OpenBTree.java (original) +++ db/derby/code/trunk/java/engine/org/apache/derby/impl/store/access/btree/OpenBTree.java Thu Feb 22 06:45:04 2007 @@ -27,13 +27,9 @@ import org.apache.derby.iapi.reference.SQLState; -import org.apache.derby.iapi.store.access.conglomerate.Conglomerate; 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.ConglomerateController; 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.TransactionController; import org.apache.derby.iapi.store.access.SpaceInfo; import org.apache.derby.iapi.store.raw.ContainerHandle; @@ -42,8 +38,6 @@ 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.impl.store.access.conglomerate.OpenConglomerateScratchSpace; Modified: db/derby/code/trunk/java/engine/org/apache/derby/impl/store/access/btree/SearchParameters.java URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/engine/org/apache/derby/impl/store/access/btree/SearchParameters.java?view=diff&rev=510538&r1=510537&r2=510538 ============================================================================== --- db/derby/code/trunk/java/engine/org/apache/derby/impl/store/access/btree/SearchParameters.java (original) +++ db/derby/code/trunk/java/engine/org/apache/derby/impl/store/access/btree/SearchParameters.java Thu Feb 22 06:45:04 2007 @@ -21,13 +21,10 @@ package org.apache.derby.impl.store.access.btree; -import java.io.PrintStream; - import org.apache.derby.iapi.services.sanity.SanityManager; import org.apache.derby.iapi.error.StandardException; -import org.apache.derby.iapi.store.access.ScanController; import org.apache.derby.iapi.store.access.RowUtil; import org.apache.derby.iapi.types.DataValueDescriptor; Modified: db/derby/code/trunk/java/engine/org/apache/derby/impl/store/access/btree/index/B2I.java URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/engine/org/apache/derby/impl/store/access/btree/index/B2I.java?view=diff&rev=510538&r1=510537&r2=510538 ============================================================================== --- db/derby/code/trunk/java/engine/org/apache/derby/impl/store/access/btree/index/B2I.java (original) +++ db/derby/code/trunk/java/engine/org/apache/derby/impl/store/access/btree/index/B2I.java Thu Feb 22 06:45:04 2007 @@ -21,7 +21,6 @@ package org.apache.derby.impl.store.access.btree.index; - import java.io.ObjectOutput; import java.io.ObjectInput; import java.io.IOException; @@ -34,7 +33,6 @@ import org.apache.derby.iapi.services.sanity.SanityManager; import org.apache.derby.iapi.error.StandardException; -import org.apache.derby.iapi.store.access.conglomerate.Conglomerate; import org.apache.derby.iapi.store.access.conglomerate.LogicalUndo; import org.apache.derby.iapi.store.access.conglomerate.ScanManager; import org.apache.derby.iapi.store.access.conglomerate.TransactionManager; @@ -43,19 +41,15 @@ import org.apache.derby.iapi.store.access.Qualifier; import org.apache.derby.iapi.types.RowLocation; import org.apache.derby.iapi.store.access.RowLocationRetRowSource; -import org.apache.derby.iapi.store.access.ScanController; import org.apache.derby.iapi.store.access.StaticCompiledOpenConglomInfo; import org.apache.derby.iapi.store.access.StoreCostController; import org.apache.derby.iapi.store.access.TransactionController; import org.apache.derby.iapi.store.access.ColumnOrdering; -import org.apache.derby.iapi.services.io.FormatIdUtil; import org.apache.derby.iapi.services.io.StoredFormatIds; import org.apache.derby.iapi.store.raw.ContainerHandle; import org.apache.derby.iapi.store.raw.LockingPolicy; -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; @@ -63,13 +57,13 @@ import org.apache.derby.impl.store.access.btree.BTree; import org.apache.derby.impl.store.access.btree.BTreeLockingPolicy; import org.apache.derby.impl.store.access.btree.LeafControlRow; -import org.apache.derby.impl.store.access.btree.ControlRow; import org.apache.derby.impl.store.access.btree.OpenBTree; -import org.apache.derby.impl.store.access.btree.WaitError; -import org.apache.derby.impl.store.access.conglomerate.ConglomerateUtil; import org.apache.derby.iapi.services.io.FormatableBitSet; import org.apache.derby.iapi.services.cache.ClassSize; + +// For JavaDoc references (i.e. @see) +import org.apache.derby.iapi.store.access.conglomerate.Conglomerate; /* * @format_id ACCESS_B2I_V1_ID Modified: db/derby/code/trunk/java/engine/org/apache/derby/impl/store/access/btree/index/B2IController.java URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/engine/org/apache/derby/impl/store/access/btree/index/B2IController.java?view=diff&rev=510538&r1=510537&r2=510538 ============================================================================== --- db/derby/code/trunk/java/engine/org/apache/derby/impl/store/access/btree/index/B2IController.java (original) +++ db/derby/code/trunk/java/engine/org/apache/derby/impl/store/access/btree/index/B2IController.java Thu Feb 22 06:45:04 2007 @@ -21,17 +21,13 @@ package org.apache.derby.impl.store.access.btree.index; -import java.io.IOException; -import java.util.Properties; import org.apache.derby.iapi.services.sanity.SanityManager; import org.apache.derby.iapi.error.StandardException; import org.apache.derby.iapi.store.access.conglomerate.Conglomerate; import org.apache.derby.iapi.store.access.conglomerate.TransactionManager; import org.apache.derby.iapi.store.access.ConglomerateController; import org.apache.derby.iapi.store.access.DynamicCompiledOpenConglomInfo; -import org.apache.derby.iapi.store.access.Qualifier; import org.apache.derby.iapi.types.RowLocation; -import org.apache.derby.iapi.store.access.ScanController; import org.apache.derby.iapi.store.access.TransactionController; import org.apache.derby.iapi.store.access.ConglomerateController; import org.apache.derby.iapi.store.raw.ContainerHandle; @@ -42,10 +38,6 @@ import org.apache.derby.impl.store.access.btree.BTreeController; import org.apache.derby.impl.store.access.btree.BTreeLockingPolicy; - -import org.apache.derby.impl.store.access.conglomerate.ConglomerateUtil; - -import org.apache.derby.iapi.services.io.FormatableBitSet; /** * Controller used to insert rows into a secondary index. Modified: db/derby/code/trunk/java/engine/org/apache/derby/impl/store/access/btree/index/B2ICostController.java URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/engine/org/apache/derby/impl/store/access/btree/index/B2ICostController.java?view=diff&rev=510538&r1=510537&r2=510538 ============================================================================== --- db/derby/code/trunk/java/engine/org/apache/derby/impl/store/access/btree/index/B2ICostController.java (original) +++ db/derby/code/trunk/java/engine/org/apache/derby/impl/store/access/btree/index/B2ICostController.java Thu Feb 22 06:45:04 2007 @@ -21,16 +21,9 @@ package org.apache.derby.impl.store.access.btree.index; -import java.io.IOException; -import java.util.Properties; import org.apache.derby.iapi.services.sanity.SanityManager; import org.apache.derby.iapi.error.StandardException; -import org.apache.derby.iapi.store.access.conglomerate.Conglomerate; import org.apache.derby.iapi.store.access.conglomerate.TransactionManager; -import org.apache.derby.iapi.store.access.ConglomerateController; -import org.apache.derby.iapi.store.access.Qualifier; -import org.apache.derby.iapi.types.RowLocation; -import org.apache.derby.iapi.store.access.ScanController; import org.apache.derby.iapi.store.raw.Transaction; Modified: db/derby/code/trunk/java/engine/org/apache/derby/impl/store/access/btree/index/B2IFactory.java URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/engine/org/apache/derby/impl/store/access/btree/index/B2IFactory.java?view=diff&rev=510538&r1=510537&r2=510538 ============================================================================== --- db/derby/code/trunk/java/engine/org/apache/derby/impl/store/access/btree/index/B2IFactory.java (original) +++ db/derby/code/trunk/java/engine/org/apache/derby/impl/store/access/btree/index/B2IFactory.java Thu Feb 22 06:45:04 2007 @@ -27,37 +27,24 @@ import org.apache.derby.iapi.services.monitor.ModuleControl; import org.apache.derby.iapi.services.monitor.Monitor; -import org.apache.derby.iapi.services.property.PropertyUtil; import org.apache.derby.iapi.services.sanity.SanityManager; -import org.apache.derby.iapi.services.io.FormatIdUtil; import org.apache.derby.catalog.UUID; import org.apache.derby.iapi.services.uuid.UUIDFactory; import org.apache.derby.iapi.error.StandardException; import org.apache.derby.iapi.store.access.conglomerate.Conglomerate; import org.apache.derby.iapi.store.access.conglomerate.ConglomerateFactory; -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.AccessFactory; import org.apache.derby.iapi.store.access.ColumnOrdering; -import org.apache.derby.iapi.store.access.ConglomerateController; -import org.apache.derby.iapi.store.access.DynamicCompiledOpenConglomInfo; -import org.apache.derby.iapi.store.access.ScanController; -import org.apache.derby.iapi.store.access.TransactionController; import org.apache.derby.iapi.store.raw.ContainerKey; import org.apache.derby.iapi.store.raw.ContainerHandle; import org.apache.derby.iapi.store.raw.LockingPolicy; -import org.apache.derby.iapi.store.raw.Transaction; import org.apache.derby.iapi.types.DataValueDescriptor; import org.apache.derby.impl.store.access.btree.BTree; -import org.apache.derby.impl.store.access.btree.BranchControlRow; import org.apache.derby.impl.store.access.btree.ControlRow; -import org.apache.derby.impl.store.access.btree.BTreeController; -import org.apache.derby.impl.store.access.btree.LeafControlRow; -import org.apache.derby.impl.store.access.btree.OpenBTree; /** Modified: db/derby/code/trunk/java/engine/org/apache/derby/impl/store/access/btree/index/B2IForwardScan.java URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/engine/org/apache/derby/impl/store/access/btree/index/B2IForwardScan.java?view=diff&rev=510538&r1=510537&r2=510538 ============================================================================== --- db/derby/code/trunk/java/engine/org/apache/derby/impl/store/access/btree/index/B2IForwardScan.java (original) +++ db/derby/code/trunk/java/engine/org/apache/derby/impl/store/access/btree/index/B2IForwardScan.java Thu Feb 22 06:45:04 2007 @@ -21,17 +21,12 @@ package org.apache.derby.impl.store.access.btree.index; -import org.apache.derby.iapi.services.sanity.SanityManager; - import org.apache.derby.iapi.error.StandardException; import org.apache.derby.iapi.store.access.conglomerate.Conglomerate; import org.apache.derby.iapi.store.access.conglomerate.TransactionManager; import org.apache.derby.iapi.store.access.ConglomerateController; import org.apache.derby.iapi.store.access.DynamicCompiledOpenConglomInfo; -import org.apache.derby.iapi.store.access.GenericScanController; 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.access.TransactionController; import org.apache.derby.iapi.store.raw.ContainerHandle; @@ -40,15 +35,13 @@ 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.impl.store.access.btree.BTreeController; import org.apache.derby.impl.store.access.btree.BTreeLockingPolicy; import org.apache.derby.impl.store.access.btree.BTreeForwardScan; -import org.apache.derby.impl.store.access.conglomerate.ConglomerateUtil; +// For JavaDoc references (i.e. @see) +import org.apache.derby.iapi.store.access.GenericScanController; /** Modified: db/derby/code/trunk/java/engine/org/apache/derby/impl/store/access/btree/index/B2IMaxScan.java URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/engine/org/apache/derby/impl/store/access/btree/index/B2IMaxScan.java?view=diff&rev=510538&r1=510537&r2=510538 ============================================================================== --- db/derby/code/trunk/java/engine/org/apache/derby/impl/store/access/btree/index/B2IMaxScan.java (original) +++ db/derby/code/trunk/java/engine/org/apache/derby/impl/store/access/btree/index/B2IMaxScan.java Thu Feb 22 06:45:04 2007 @@ -24,13 +24,10 @@ import org.apache.derby.iapi.services.sanity.SanityManager; import org.apache.derby.iapi.error.StandardException; -import org.apache.derby.iapi.store.access.conglomerate.Conglomerate; import org.apache.derby.iapi.store.access.conglomerate.TransactionManager; import org.apache.derby.iapi.store.access.ConglomerateController; import org.apache.derby.iapi.store.access.DynamicCompiledOpenConglomInfo; -import org.apache.derby.iapi.store.access.GenericScanController; import org.apache.derby.iapi.store.access.Qualifier; -import org.apache.derby.iapi.types.RowLocation; import org.apache.derby.iapi.store.access.ScanController; import org.apache.derby.iapi.store.access.StaticCompiledOpenConglomInfo; import org.apache.derby.iapi.store.access.TransactionController; @@ -42,11 +39,11 @@ import org.apache.derby.iapi.services.io.FormatableBitSet; -import org.apache.derby.impl.store.access.btree.BTreeController; import org.apache.derby.impl.store.access.btree.BTreeLockingPolicy; import org.apache.derby.impl.store.access.btree.BTreeMaxScan; -import org.apache.derby.impl.store.access.conglomerate.ConglomerateUtil; +// For JavaDoc references (i.e. @see) +import org.apache.derby.iapi.store.access.GenericScanController; /** Scan used to find maximum value in the secondary index. Modified: db/derby/code/trunk/java/engine/org/apache/derby/impl/store/access/btree/index/B2INoLocking.java URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/engine/org/apache/derby/impl/store/access/btree/index/B2INoLocking.java?view=diff&rev=510538&r1=510537&r2=510538 ============================================================================== --- db/derby/code/trunk/java/engine/org/apache/derby/impl/store/access/btree/index/B2INoLocking.java (original) +++ db/derby/code/trunk/java/engine/org/apache/derby/impl/store/access/btree/index/B2INoLocking.java Thu Feb 22 06:45:04 2007 @@ -21,18 +21,13 @@ package org.apache.derby.impl.store.access.btree.index; -import org.apache.derby.iapi.services.sanity.SanityManager; - import org.apache.derby.iapi.error.StandardException; import org.apache.derby.iapi.store.access.ConglomerateController; import org.apache.derby.iapi.types.RowLocation; -import org.apache.derby.iapi.store.access.TransactionController; import org.apache.derby.iapi.store.raw.FetchDescriptor; import org.apache.derby.iapi.store.raw.LockingPolicy; -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; @@ -43,8 +38,6 @@ import org.apache.derby.impl.store.access.btree.LeafControlRow; import org.apache.derby.impl.store.access.btree.OpenBTree; import org.apache.derby.impl.store.access.btree.BTreeRowPosition; -import org.apache.derby.impl.store.access.btree.WaitError; - /** Modified: db/derby/code/trunk/java/engine/org/apache/derby/impl/store/access/btree/index/B2IRowLocking1.java URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/engine/org/apache/derby/impl/store/access/btree/index/B2IRowLocking1.java?view=diff&rev=510538&r1=510537&r2=510538 ============================================================================== --- db/derby/code/trunk/java/engine/org/apache/derby/impl/store/access/btree/index/B2IRowLocking1.java (original) +++ db/derby/code/trunk/java/engine/org/apache/derby/impl/store/access/btree/index/B2IRowLocking1.java Thu Feb 22 06:45:04 2007 @@ -21,20 +21,13 @@ package org.apache.derby.impl.store.access.btree.index; -import org.apache.derby.iapi.services.sanity.SanityManager; - import org.apache.derby.iapi.error.StandardException; -import org.apache.derby.iapi.store.access.conglomerate.TransactionManager; - import org.apache.derby.iapi.store.access.ConglomerateController; import org.apache.derby.iapi.types.RowLocation; -import org.apache.derby.iapi.store.access.TransactionController; import org.apache.derby.iapi.store.raw.FetchDescriptor; import org.apache.derby.iapi.store.raw.LockingPolicy; -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; @@ -42,10 +35,7 @@ import org.apache.derby.impl.store.access.btree.BTree; import org.apache.derby.impl.store.access.btree.BTreeLockingPolicy; import org.apache.derby.impl.store.access.btree.BTreeRowPosition; -import org.apache.derby.impl.store.access.btree.ControlRow; -import org.apache.derby.impl.store.access.btree.LeafControlRow; import org.apache.derby.impl.store.access.btree.OpenBTree; -import org.apache.derby.impl.store.access.btree.WaitError; /** Modified: db/derby/code/trunk/java/engine/org/apache/derby/impl/store/access/btree/index/B2IRowLocking2.java URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/engine/org/apache/derby/impl/store/access/btree/index/B2IRowLocking2.java?view=diff&rev=510538&r1=510537&r2=510538 ============================================================================== --- db/derby/code/trunk/java/engine/org/apache/derby/impl/store/access/btree/index/B2IRowLocking2.java (original) +++ db/derby/code/trunk/java/engine/org/apache/derby/impl/store/access/btree/index/B2IRowLocking2.java Thu Feb 22 06:45:04 2007 @@ -25,26 +25,14 @@ import org.apache.derby.iapi.error.StandardException; -import org.apache.derby.iapi.store.access.conglomerate.TransactionManager; - import org.apache.derby.iapi.store.access.ConglomerateController; -import org.apache.derby.iapi.types.RowLocation; -import org.apache.derby.iapi.store.access.TransactionController; import org.apache.derby.iapi.store.raw.LockingPolicy; -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.impl.store.access.btree.BTree; import org.apache.derby.impl.store.access.btree.BTreeLockingPolicy; import org.apache.derby.impl.store.access.btree.BTreeRowPosition; -import org.apache.derby.impl.store.access.btree.ControlRow; -import org.apache.derby.impl.store.access.btree.LeafControlRow; import org.apache.derby.impl.store.access.btree.OpenBTree; -import org.apache.derby.impl.store.access.btree.WaitError; /** Modified: db/derby/code/trunk/java/engine/org/apache/derby/impl/store/access/btree/index/B2IRowLocking3.java URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/engine/org/apache/derby/impl/store/access/btree/index/B2IRowLocking3.java?view=diff&rev=510538&r1=510537&r2=510538 ============================================================================== --- db/derby/code/trunk/java/engine/org/apache/derby/impl/store/access/btree/index/B2IRowLocking3.java (original) +++ db/derby/code/trunk/java/engine/org/apache/derby/impl/store/access/btree/index/B2IRowLocking3.java Thu Feb 22 06:45:04 2007 @@ -29,12 +29,10 @@ import org.apache.derby.iapi.store.access.ConglomerateController; -import org.apache.derby.iapi.store.access.RowUtil; import org.apache.derby.iapi.store.access.TransactionController; import org.apache.derby.iapi.store.raw.FetchDescriptor; import org.apache.derby.iapi.store.raw.LockingPolicy; -import org.apache.derby.iapi.store.raw.Page; import org.apache.derby.iapi.store.raw.RecordHandle; import org.apache.derby.iapi.store.raw.Transaction; Modified: db/derby/code/trunk/java/engine/org/apache/derby/impl/store/access/btree/index/B2IRowLockingRR.java URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/engine/org/apache/derby/impl/store/access/btree/index/B2IRowLockingRR.java?view=diff&rev=510538&r1=510537&r2=510538 ============================================================================== --- db/derby/code/trunk/java/engine/org/apache/derby/impl/store/access/btree/index/B2IRowLockingRR.java (original) +++ db/derby/code/trunk/java/engine/org/apache/derby/impl/store/access/btree/index/B2IRowLockingRR.java Thu Feb 22 06:45:04 2007 @@ -25,16 +25,11 @@ import org.apache.derby.iapi.error.StandardException; -import org.apache.derby.iapi.store.access.conglomerate.TransactionManager; - import org.apache.derby.iapi.store.access.ConglomerateController; import org.apache.derby.iapi.types.RowLocation; -import org.apache.derby.iapi.store.access.TransactionController; import org.apache.derby.iapi.store.raw.FetchDescriptor; import org.apache.derby.iapi.store.raw.LockingPolicy; -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; @@ -42,10 +37,7 @@ import org.apache.derby.impl.store.access.btree.BTree; import org.apache.derby.impl.store.access.btree.BTreeLockingPolicy; import org.apache.derby.impl.store.access.btree.BTreeRowPosition; -import org.apache.derby.impl.store.access.btree.ControlRow; -import org.apache.derby.impl.store.access.btree.LeafControlRow; import org.apache.derby.impl.store.access.btree.OpenBTree; -import org.apache.derby.impl.store.access.btree.WaitError; /** Modified: db/derby/code/trunk/java/engine/org/apache/derby/impl/store/access/btree/index/B2IStaticCompiledInfo.java URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/engine/org/apache/derby/impl/store/access/btree/index/B2IStaticCompiledInfo.java?view=diff&rev=510538&r1=510537&r2=510538 ============================================================================== --- db/derby/code/trunk/java/engine/org/apache/derby/impl/store/access/btree/index/B2IStaticCompiledInfo.java (original) +++ db/derby/code/trunk/java/engine/org/apache/derby/impl/store/access/btree/index/B2IStaticCompiledInfo.java Thu Feb 22 06:45:04 2007 @@ -23,20 +23,14 @@ import org.apache.derby.iapi.services.io.ArrayInputStream; -import org.apache.derby.iapi.services.monitor.Monitor; - -import org.apache.derby.iapi.services.io.FormatIdUtil; import org.apache.derby.iapi.services.io.StoredFormatIds; import org.apache.derby.iapi.error.StandardException; -import org.apache.derby.iapi.store.access.conglomerate.Conglomerate; - import org.apache.derby.iapi.store.access.StaticCompiledOpenConglomInfo; import org.apache.derby.iapi.store.access.TransactionController; import org.apache.derby.iapi.types.DataValueDescriptor; - import java.io.IOException; import java.io.ObjectInput; Modified: db/derby/code/trunk/java/engine/org/apache/derby/impl/store/access/btree/index/B2ITableLocking3.java URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/engine/org/apache/derby/impl/store/access/btree/index/B2ITableLocking3.java?view=diff&rev=510538&r1=510537&r2=510538 ============================================================================== --- db/derby/code/trunk/java/engine/org/apache/derby/impl/store/access/btree/index/B2ITableLocking3.java (original) +++ db/derby/code/trunk/java/engine/org/apache/derby/impl/store/access/btree/index/B2ITableLocking3.java Thu Feb 22 06:45:04 2007 @@ -21,25 +21,12 @@ package org.apache.derby.impl.store.access.btree.index; -import org.apache.derby.iapi.services.sanity.SanityManager; - -import org.apache.derby.iapi.error.StandardException; - import org.apache.derby.iapi.store.access.ConglomerateController; -import org.apache.derby.iapi.types.RowLocation; -import org.apache.derby.iapi.store.access.TransactionController; import org.apache.derby.iapi.store.raw.LockingPolicy; -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.impl.store.access.btree.BTree; -import org.apache.derby.impl.store.access.btree.BTreeLockingPolicy; -import org.apache.derby.impl.store.access.btree.ControlRow; -import org.apache.derby.impl.store.access.btree.LeafControlRow; import org.apache.derby.impl.store.access.btree.OpenBTree; -import org.apache.derby.impl.store.access.btree.WaitError; /** Modified: db/derby/code/trunk/java/engine/org/apache/derby/impl/store/access/btree/index/B2IUndo.java URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/engine/org/apache/derby/impl/store/access/btree/index/B2IUndo.java?view=diff&rev=510538&r1=510537&r2=510538 ============================================================================== --- db/derby/code/trunk/java/engine/org/apache/derby/impl/store/access/btree/index/B2IUndo.java (original) +++ db/derby/code/trunk/java/engine/org/apache/derby/impl/store/access/btree/index/B2IUndo.java Thu Feb 22 06:45:04 2007 @@ -28,7 +28,6 @@ import org.apache.derby.iapi.services.sanity.SanityManager; import org.apache.derby.iapi.services.io.Formatable; -import org.apache.derby.iapi.services.io.FormatIdUtil; import org.apache.derby.iapi.services.io.StoredFormatIds; import org.apache.derby.iapi.error.StandardException; @@ -37,13 +36,10 @@ import org.apache.derby.iapi.store.access.RowUtil; 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.TransactionController; import org.apache.derby.iapi.store.raw.ContainerHandle; import org.apache.derby.iapi.store.raw.FetchDescriptor; -import org.apache.derby.iapi.store.raw.LockingPolicy; import org.apache.derby.iapi.store.raw.LogicalUndoable; import org.apache.derby.iapi.store.raw.Page; import org.apache.derby.iapi.store.raw.RecordHandle; @@ -62,8 +58,6 @@ import java.io.IOException; import java.io.ObjectOutput; import org.apache.derby.iapi.services.io.LimitObjectInput; - -import org.apache.derby.iapi.services.io.FormatableBitSet; /** * @format_id ACCESS_B2IUNDO_V1_ID Modified: db/derby/code/trunk/java/engine/org/apache/derby/impl/store/access/conglomerate/BinaryOrderableWrapper.java URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/engine/org/apache/derby/impl/store/access/conglomerate/BinaryOrderableWrapper.java?view=diff&rev=510538&r1=510537&r2=510538 ============================================================================== --- db/derby/code/trunk/java/engine/org/apache/derby/impl/store/access/conglomerate/BinaryOrderableWrapper.java (original) +++ db/derby/code/trunk/java/engine/org/apache/derby/impl/store/access/conglomerate/BinaryOrderableWrapper.java Thu Feb 22 06:45:04 2007 @@ -21,7 +21,6 @@ package org.apache.derby.impl.store.access.conglomerate; - import org.apache.derby.iapi.services.io.ArrayInputStream; import org.apache.derby.iapi.services.sanity.SanityManager; @@ -29,11 +28,8 @@ import org.apache.derby.iapi.services.io.Storable; import org.apache.derby.iapi.services.io.TypedFormat; -import org.apache.derby.iapi.error.StandardException; - import org.apache.derby.iapi.store.access.BinaryOrderable; -import java.io.Externalizable; import java.io.ObjectOutput; import java.io.ObjectInput; import java.io.IOException; Modified: db/derby/code/trunk/java/engine/org/apache/derby/impl/store/access/conglomerate/ConglomerateUtil.java URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/engine/org/apache/derby/impl/store/access/conglomerate/ConglomerateUtil.java?view=diff&rev=510538&r1=510537&r2=510538 ============================================================================== --- db/derby/code/trunk/java/engine/org/apache/derby/impl/store/access/conglomerate/ConglomerateUtil.java (original) +++ db/derby/code/trunk/java/engine/org/apache/derby/impl/store/access/conglomerate/ConglomerateUtil.java Thu Feb 22 06:45:04 2007 @@ -27,12 +27,7 @@ import org.apache.derby.iapi.services.io.Formatable; import org.apache.derby.iapi.services.io.FormatIdUtil; -import org.apache.derby.iapi.error.StandardException; - -import org.apache.derby.iapi.store.access.Qualifier; import org.apache.derby.iapi.store.access.RowUtil; -import org.apache.derby.iapi.store.access.TransactionController; -import org.apache.derby.iapi.store.raw.ContainerHandle; import org.apache.derby.iapi.store.raw.FetchDescriptor; import org.apache.derby.iapi.store.raw.Page; import org.apache.derby.iapi.store.raw.RawStoreFactory; @@ -40,13 +35,10 @@ import org.apache.derby.iapi.types.DataValueDescriptor; -import org.apache.derby.iapi.services.io.FormatableBitSet; - import java.io.IOException; import java.io.ObjectInput; import java.io.ObjectOutput; -import java.util.Hashtable; import java.util.Properties; /** Modified: db/derby/code/trunk/java/engine/org/apache/derby/impl/store/access/conglomerate/GenericConglomerate.java URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/engine/org/apache/derby/impl/store/access/conglomerate/GenericConglomerate.java?view=diff&rev=510538&r1=510537&r2=510538 ============================================================================== --- db/derby/code/trunk/java/engine/org/apache/derby/impl/store/access/conglomerate/GenericConglomerate.java (original) +++ db/derby/code/trunk/java/engine/org/apache/derby/impl/store/access/conglomerate/GenericConglomerate.java Thu Feb 22 06:45:04 2007 @@ -30,7 +30,6 @@ import org.apache.derby.iapi.store.access.conglomerate.Conglomerate; import org.apache.derby.iapi.types.DataValueDescriptor; -import org.apache.derby.iapi.types.Orderable; import org.apache.derby.iapi.types.DataType; Modified: db/derby/code/trunk/java/engine/org/apache/derby/impl/store/access/conglomerate/GenericConglomerateController.java URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/engine/org/apache/derby/impl/store/access/conglomerate/GenericConglomerateController.java?view=diff&rev=510538&r1=510537&r2=510538 ============================================================================== --- db/derby/code/trunk/java/engine/org/apache/derby/impl/store/access/conglomerate/GenericConglomerateController.java (original) +++ db/derby/code/trunk/java/engine/org/apache/derby/impl/store/access/conglomerate/GenericConglomerateController.java Thu Feb 22 06:45:04 2007 @@ -27,30 +27,19 @@ import org.apache.derby.iapi.error.StandardException; -import org.apache.derby.iapi.store.access.conglomerate.Conglomerate; 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.ConglomerateController; -import org.apache.derby.iapi.store.access.DynamicCompiledOpenConglomInfo; import org.apache.derby.iapi.store.access.Qualifier; import org.apache.derby.iapi.store.access.RowUtil; -import org.apache.derby.iapi.store.access.SpaceInfo; -import org.apache.derby.iapi.store.raw.ContainerHandle; import org.apache.derby.iapi.store.raw.FetchDescriptor; -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 java.util.Properties; - /** **/ Modified: db/derby/code/trunk/java/engine/org/apache/derby/impl/store/access/conglomerate/GenericController.java URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/engine/org/apache/derby/impl/store/access/conglomerate/GenericController.java?view=diff&rev=510538&r1=510537&r2=510538 ============================================================================== --- db/derby/code/trunk/java/engine/org/apache/derby/impl/store/access/conglomerate/GenericController.java (original) +++ db/derby/code/trunk/java/engine/org/apache/derby/impl/store/access/conglomerate/GenericController.java Thu Feb 22 06:45:04 2007 @@ -27,27 +27,13 @@ import org.apache.derby.iapi.error.StandardException; -import org.apache.derby.iapi.store.access.conglomerate.Conglomerate; -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.ConglomerateController; -import org.apache.derby.iapi.store.access.DynamicCompiledOpenConglomInfo; -import org.apache.derby.iapi.store.access.RowUtil; import org.apache.derby.iapi.store.access.SpaceInfo; import org.apache.derby.iapi.store.raw.ContainerHandle; -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.RowLocation; -import org.apache.derby.iapi.services.io.FormatableBitSet; - import java.util.Properties; - /** **/ Modified: db/derby/code/trunk/java/engine/org/apache/derby/impl/store/access/conglomerate/GenericCostController.java URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/engine/org/apache/derby/impl/store/access/conglomerate/GenericCostController.java?view=diff&rev=510538&r1=510537&r2=510538 ============================================================================== --- db/derby/code/trunk/java/engine/org/apache/derby/impl/store/access/conglomerate/GenericCostController.java (original) +++ db/derby/code/trunk/java/engine/org/apache/derby/impl/store/access/conglomerate/GenericCostController.java Thu Feb 22 06:45:04 2007 @@ -26,15 +26,9 @@ import org.apache.derby.iapi.reference.SQLState; import org.apache.derby.iapi.store.access.StoreCostController; -import org.apache.derby.iapi.store.access.StoreCostResult; - -import org.apache.derby.iapi.types.DataValueDescriptor; - -import org.apache.derby.impl.sql.execute.RowUtil; import org.apache.derby.iapi.services.io.FormatableBitSet; - /** A Generic class which implements the basic functionality needed for a cost @@ -122,7 +116,7 @@ * * @exception StandardException Standard exception policy. * - * @see RowUtil + * @see org.apache.derby.iapi.store.access.RowUtil **/ public double getFetchFromFullKeyCost( FormatableBitSet validColumns, 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?view=diff&rev=510538&r1=510537&r2=510538 ============================================================================== --- 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 Feb 22 06:45:04 2007 @@ -27,40 +27,28 @@ import org.apache.derby.iapi.error.StandardException; -import org.apache.derby.iapi.store.access.conglomerate.Conglomerate; import org.apache.derby.iapi.store.access.conglomerate.LogicalUndo; import org.apache.derby.iapi.store.access.conglomerate.ScanManager; -import org.apache.derby.iapi.store.access.conglomerate.TransactionManager; -import org.apache.derby.iapi.store.access.ConglomerateController; -import org.apache.derby.iapi.store.access.DynamicCompiledOpenConglomInfo; import org.apache.derby.iapi.store.access.Qualifier; import org.apache.derby.iapi.store.access.RowUtil; -import org.apache.derby.iapi.store.access.ScanController; import org.apache.derby.iapi.store.access.ScanInfo; -import org.apache.derby.iapi.store.access.SpaceInfo; import org.apache.derby.iapi.store.raw.ContainerHandle; import org.apache.derby.iapi.store.raw.FetchDescriptor; import org.apache.derby.iapi.store.raw.LockingPolicy; 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.store.access.Qualifier; import org.apache.derby.iapi.types.DataValueDescriptor; -import org.apache.derby.iapi.types.Orderable; import org.apache.derby.iapi.types.RowLocation; - import org.apache.derby.iapi.store.access.BackingStoreHashtable; import org.apache.derby.iapi.services.io.FormatableBitSet; -import java.util.Properties; - - /** Generic class implementing shared ScanController methods. @@ -1099,7 +1087,7 @@ /** - @see ScanController#delete + @see org.apache.derby.iapi.store.access.ScanController#delete **/ public boolean delete() throws StandardException @@ -1353,7 +1341,7 @@ } /** - @see ScanController#replace + @see org.apache.derby.iapi.store.access.ScanController#replace **/ public boolean replace( DataValueDescriptor[] row, @@ -1454,7 +1442,7 @@ Fetch the row at the current position of the Scan without applying the qualifiers. - @see ScanController#fetchWithoutQualify + @see org.apache.derby.iapi.store.access.ScanController#fetchWithoutQualify **/ public void fetchWithoutQualify(DataValueDescriptor[] row) throws StandardException @@ -1465,7 +1453,7 @@ /** Fetch the row at the current position of the Scan. - @see ScanController#fetch + @see org.apache.derby.iapi.store.access.ScanController#fetch **/ public void fetch(DataValueDescriptor[] row) throws StandardException @@ -1536,7 +1524,7 @@ /** Fetch the location of the current position in the scan. - @see ScanController#fetchLocation + @see org.apache.derby.iapi.store.access.ScanController#fetchLocation @exception StandardException Standard exception policy. **/ Modified: db/derby/code/trunk/java/engine/org/apache/derby/impl/store/access/conglomerate/OpenConglomerate.java URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/engine/org/apache/derby/impl/store/access/conglomerate/OpenConglomerate.java?view=diff&rev=510538&r1=510537&r2=510538 ============================================================================== --- db/derby/code/trunk/java/engine/org/apache/derby/impl/store/access/conglomerate/OpenConglomerate.java (original) +++ db/derby/code/trunk/java/engine/org/apache/derby/impl/store/access/conglomerate/OpenConglomerate.java Thu Feb 22 06:45:04 2007 @@ -30,19 +30,14 @@ import org.apache.derby.iapi.store.access.conglomerate.Conglomerate; import org.apache.derby.iapi.store.access.conglomerate.TransactionManager; -import org.apache.derby.iapi.store.access.ConglomPropertyQueryable; -import org.apache.derby.iapi.store.access.ConglomerateController; import org.apache.derby.iapi.store.access.DynamicCompiledOpenConglomInfo; -import org.apache.derby.iapi.store.access.Qualifier; import org.apache.derby.iapi.store.access.RowUtil; import org.apache.derby.iapi.store.access.SpaceInfo; import org.apache.derby.iapi.store.access.TransactionController; import org.apache.derby.iapi.store.raw.ContainerHandle; -import org.apache.derby.iapi.store.raw.FetchDescriptor; import org.apache.derby.iapi.store.raw.LockingPolicy; 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; Modified: db/derby/code/trunk/java/engine/org/apache/derby/impl/store/access/heap/D_HeapController.java URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/engine/org/apache/derby/impl/store/access/heap/D_HeapController.java?view=diff&rev=510538&r1=510537&r2=510538 ============================================================================== --- db/derby/code/trunk/java/engine/org/apache/derby/impl/store/access/heap/D_HeapController.java (original) +++ db/derby/code/trunk/java/engine/org/apache/derby/impl/store/access/heap/D_HeapController.java Thu Feb 22 06:45:04 2007 @@ -26,10 +26,8 @@ import org.apache.derby.iapi.error.StandardException; import org.apache.derby.iapi.store.raw.ContainerHandle; import org.apache.derby.iapi.store.raw.Page; -import org.apache.derby.iapi.services.diag.Diagnosticable; import org.apache.derby.iapi.services.diag.DiagnosticableGeneric; import org.apache.derby.iapi.services.diag.DiagnosticUtil; - import java.util.Properties; Modified: db/derby/code/trunk/java/engine/org/apache/derby/impl/store/access/heap/Heap.java URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/engine/org/apache/derby/impl/store/access/heap/Heap.java?view=diff&rev=510538&r1=510537&r2=510538 ============================================================================== --- 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 Thu Feb 22 06:45:04 2007 @@ -34,7 +34,6 @@ import org.apache.derby.iapi.services.sanity.SanityManager; -import org.apache.derby.iapi.services.io.Formatable; import org.apache.derby.iapi.services.io.FormatIdUtil; import org.apache.derby.iapi.services.io.Storable; import org.apache.derby.iapi.services.io.StoredFormatIds; @@ -63,22 +62,15 @@ import org.apache.derby.iapi.store.raw.Transaction; import org.apache.derby.iapi.store.raw.Page; import org.apache.derby.iapi.store.raw.RawStoreFactory; -import org.apache.derby.iapi.store.raw.RecordHandle; import org.apache.derby.iapi.types.DataValueDescriptor; import org.apache.derby.iapi.services.cache.ClassSize; -import org.apache.derby.iapi.types.DataType; - import org.apache.derby.impl.store.access.conglomerate.ConglomerateUtil; import org.apache.derby.impl.store.access.conglomerate.GenericConglomerate; import org.apache.derby.impl.store.access.conglomerate.OpenConglomerate; import org.apache.derby.impl.store.access.conglomerate.OpenConglomerateScratchSpace; - -import java.sql.ResultSet; -import java.sql.SQLException; - /** * @format_id ACCESS_HEAP_V1_ID Modified: db/derby/code/trunk/java/engine/org/apache/derby/impl/store/access/heap/HeapCompressScan.java URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/engine/org/apache/derby/impl/store/access/heap/HeapCompressScan.java?view=diff&rev=510538&r1=510537&r2=510538 ============================================================================== --- db/derby/code/trunk/java/engine/org/apache/derby/impl/store/access/heap/HeapCompressScan.java (original) +++ db/derby/code/trunk/java/engine/org/apache/derby/impl/store/access/heap/HeapCompressScan.java Thu Feb 22 06:45:04 2007 @@ -21,55 +21,24 @@ package org.apache.derby.impl.store.access.heap; - -/** - - A heap scan object represents an instance of an scan on a heap conglomerate. - -**/ - -import org.apache.derby.iapi.reference.SQLState; - import org.apache.derby.iapi.services.sanity.SanityManager; -import org.apache.derby.iapi.services.io.Storable; - import org.apache.derby.iapi.error.StandardException; -import org.apache.derby.iapi.store.access.conglomerate.Conglomerate; -import org.apache.derby.iapi.store.access.conglomerate.LogicalUndo; -import org.apache.derby.iapi.store.access.conglomerate.ScanManager; -import org.apache.derby.iapi.store.access.conglomerate.TransactionManager; - -import org.apache.derby.iapi.store.access.ConglomerateController; -import org.apache.derby.iapi.store.access.DynamicCompiledOpenConglomInfo; -import org.apache.derby.iapi.store.access.Qualifier; -import org.apache.derby.iapi.store.access.RowUtil; -import org.apache.derby.iapi.store.access.ScanInfo; -import org.apache.derby.iapi.store.access.ScanController; import org.apache.derby.iapi.store.access.SpaceInfo; -import org.apache.derby.iapi.store.access.TransactionController; -import org.apache.derby.iapi.types.RowLocation; +import org.apache.derby.impl.store.access.conglomerate.RowPosition; import org.apache.derby.iapi.store.raw.ContainerHandle; -import org.apache.derby.iapi.store.raw.LockingPolicy; -import org.apache.derby.iapi.store.raw.Transaction; import org.apache.derby.iapi.store.raw.Page; import org.apache.derby.iapi.store.raw.RecordHandle; import org.apache.derby.iapi.types.DataValueDescriptor; +import org.apache.derby.iapi.types.RowLocation; -import org.apache.derby.impl.store.access.conglomerate.ConglomerateUtil; -import org.apache.derby.impl.store.access.conglomerate.GenericScanController; -import org.apache.derby.impl.store.access.conglomerate.RowPosition; - -import org.apache.derby.iapi.store.access.BackingStoreHashtable; -import org.apache.derby.iapi.services.io.FormatableBitSet; - -import java.util.Hashtable; -import java.util.Vector; - +/** + * A heap scan object represents an instance of a scan on a heap conglomerate. + */ class HeapCompressScan extends HeapScan {