Return-Path: Delivered-To: apmail-db-derby-commits-archive@www.apache.org Received: (qmail 48124 invoked from network); 7 Jan 2008 10:34:50 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.2) by minotaur.apache.org with SMTP; 7 Jan 2008 10:34:50 -0000 Received: (qmail 80522 invoked by uid 500); 7 Jan 2008 10:34:39 -0000 Delivered-To: apmail-db-derby-commits-archive@db.apache.org Received: (qmail 80499 invoked by uid 500); 7 Jan 2008 10:34:39 -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 80488 invoked by uid 99); 7 Jan 2008 10:34:39 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 07 Jan 2008 02:34:39 -0800 X-ASF-Spam-Status: No, hits=-100.0 required=10.0 tests=ALL_TRUSTED 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; Mon, 07 Jan 2008 10:34:24 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id A0DAE1A9850; Mon, 7 Jan 2008 02:34:29 -0800 (PST) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r609558 - in /db/derby/code/trunk/java/engine/org/apache/derby: iapi/store/access/conglomerate/ impl/store/access/ impl/store/access/btree/ impl/store/access/btree/index/ impl/store/access/heap/ Date: Mon, 07 Jan 2008 10:34:28 -0000 To: derby-commits@db.apache.org From: kristwaa@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20080107103429.A0DAE1A9850@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: kristwaa Date: Mon Jan 7 02:34:25 2008 New Revision: 609558 URL: http://svn.apache.org/viewvc?rev=609558&view=rev Log: DERBY-2359: Code cleanups for the org.apache.derby.impl.store.access.* packages. Removed unused argument from method getDynamicCompiledConglomInfo in interface Conglomerate. Patch file: derby-2359-5a-Conglomerate_API_change.diff Modified: db/derby/code/trunk/java/engine/org/apache/derby/iapi/store/access/conglomerate/Conglomerate.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/btree/BTree.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/B2IForwardScan.java db/derby/code/trunk/java/engine/org/apache/derby/impl/store/access/heap/Heap.java Modified: db/derby/code/trunk/java/engine/org/apache/derby/iapi/store/access/conglomerate/Conglomerate.java URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/engine/org/apache/derby/iapi/store/access/conglomerate/Conglomerate.java?rev=609558&r1=609557&r2=609558&view=diff ============================================================================== --- db/derby/code/trunk/java/engine/org/apache/derby/iapi/store/access/conglomerate/Conglomerate.java (original) +++ db/derby/code/trunk/java/engine/org/apache/derby/iapi/store/access/conglomerate/Conglomerate.java Mon Jan 7 02:34:25 2008 @@ -221,12 +221,9 @@ * * @return The dynamic information. * - * @param conglomId The identifier of the conglomerate to open. - * * @exception StandardException Standard exception policy. **/ - public DynamicCompiledOpenConglomInfo getDynamicCompiledConglomInfo( - long conglomId) + public DynamicCompiledOpenConglomInfo getDynamicCompiledConglomInfo() throws StandardException; /** 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?rev=609558&r1=609557&r2=609558&view=diff ============================================================================== --- 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 Mon Jan 7 02:34:25 2008 @@ -694,7 +694,7 @@ { return( findExistingConglomerate( - conglomId).getDynamicCompiledConglomInfo(conglomId)); + conglomId).getDynamicCompiledConglomInfo()); } 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?rev=609558&r1=609557&r2=609558&view=diff ============================================================================== --- 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 Mon Jan 7 02:34:25 2008 @@ -540,12 +540,9 @@ * * @return The dynamic information. * - * @param conglomId The identifier of the conglomerate to open. - * * @exception StandardException Standard exception policy. **/ - public DynamicCompiledOpenConglomInfo getDynamicCompiledConglomInfo( - long conglomId) + public DynamicCompiledOpenConglomInfo getDynamicCompiledConglomInfo() throws StandardException { return(new OpenConglomerateScratchSpace(format_ids, collation_ids)); 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?rev=609558&r1=609557&r2=609558&view=diff ============================================================================== --- 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 Mon Jan 7 02:34:25 2008 @@ -100,8 +100,7 @@ static_info.base_table_static_info, /* TODO - maintain a dynamic info for this */ ((Conglomerate) static_info.getConglom()). - getDynamicCompiledConglomInfo( - conglomerate.baseConglomerateId)); + getDynamicCompiledConglomInfo()); } else { 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?rev=609558&r1=609557&r2=609558&view=diff ============================================================================== --- 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 Mon Jan 7 02:34:25 2008 @@ -223,8 +223,7 @@ static_info.base_table_static_info, /* TODO - maintain a dynamic info for this */ ((Conglomerate) static_info.getConglom()). - getDynamicCompiledConglomInfo( - conglomerate.baseConglomerateId)); + getDynamicCompiledConglomInfo()); } else { 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?rev=609558&r1=609557&r2=609558&view=diff ============================================================================== --- db/derby/code/trunk/java/engine/org/apache/derby/impl/store/access/heap/Heap.java (original) +++ db/derby/code/trunk/java/engine/org/apache/derby/impl/store/access/heap/Heap.java Mon Jan 7 02:34:25 2008 @@ -575,12 +575,9 @@ * * @return The dynamic information. * - * @param conglomId The identifier of the conglomerate to open. - * * @exception StandardException Standard exception policy. **/ - public DynamicCompiledOpenConglomInfo getDynamicCompiledConglomInfo( - long conglomId) + public DynamicCompiledOpenConglomInfo getDynamicCompiledConglomInfo() throws StandardException { return(new OpenConglomerateScratchSpace(format_ids, collation_ids));