You are viewing a plain text version of this content. The canonical link for it is here.
Posted to derby-commits@db.apache.org by kr...@apache.org on 2008/01/07 11:34:28 UTC
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/
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));