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 2007/03/12 09:28:49 UTC
svn commit: r517129 - in
/db/derby/code/trunk/java/engine/org/apache/derby/impl/store/access/btree:
./ index/
Author: kristwaa
Date: Mon Mar 12 01:28:47 2007
New Revision: 517129
URL: http://svn.apache.org/viewvc?view=rev&rev=517129
Log:
DERBY-2359 (2a): Rename methods starting with uppercase letters (Code cleanups for the org.apache.derby.impl.store.access.* packages).
Modified:
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/BTreeMaxScan.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/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/index/B2IFactory.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/B2IUndo.java
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=517129&r1=517128&r2=517129
==============================================================================
--- 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 Mon Mar 12 01:28:47 2007
@@ -121,7 +121,7 @@
try
{
- if ((controlRow = ControlRow.Get(open_btree, pageno)) == null)
+ if ((controlRow = ControlRow.get(open_btree, pageno)) == null)
return(false);
LeafControlRow leaf = (LeafControlRow) controlRow;
@@ -331,7 +331,7 @@
// Get the root page back, and perform a split following the
// to-be-inserted key. The split releases the root page latch.
- root = ControlRow.Get(split_open_btree, BTree.ROOTPAGEID);
+ root = ControlRow.get(split_open_btree, BTree.ROOTPAGEID);
if (SanityManager.DEBUG)
SanityManager.ASSERT(root.page.isLatched());
@@ -423,7 +423,7 @@
SanityManager.ASSERT(this.container != null);
targetleaf = (LeafControlRow)
- ControlRow.Get(this, BTree.ROOTPAGEID).search(sp);
+ ControlRow.get(this, BTree.ROOTPAGEID).search(sp);
// Row locking - first lock row previous to row being inserted:
@@ -742,7 +742,7 @@
{
// verify that the row inserted is >= than previous row.
int compare_result =
- ControlRow.CompareIndexRowFromPageToKey(
+ ControlRow.compareIndexRowFromPageToKey(
leaf,
insert_slot - 1,
scratch_template,
@@ -837,7 +837,7 @@
(ControlRow.SPLIT_FLAG_LAST_ON_PAGE |
ControlRow.SPLIT_FLAG_LAST_IN_TABLE));
- new_leaf = (LeafControlRow) ControlRow.Get(this, new_leaf_pageno);
+ new_leaf = (LeafControlRow) ControlRow.get(this, new_leaf_pageno);
// The leaf must be the rightmost leaf in the table, the first time
// the root grows from leaf to branch it will be a leaf with many
@@ -1173,7 +1173,7 @@
// Btree must just have been created and empty, so there must
// be one root leaf page which is empty except for the control row.
current_leaf =
- (LeafControlRow) ControlRow.Get(this, BTree.ROOTPAGEID);
+ (LeafControlRow) ControlRow.get(this, BTree.ROOTPAGEID);
int current_insert_slot = 1;
if (SanityManager.DEBUG)
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=517129&r1=517128&r2=517129
==============================================================================
--- 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 Mon Mar 12 01:28:47 2007
@@ -539,7 +539,7 @@
template, this, true);
control_row =
- ControlRow.Get(this, BTree.ROOTPAGEID).search(sp);
+ ControlRow.get(this, BTree.ROOTPAGEID).search(sp);
control_row.release();
control_row = null;
@@ -564,7 +564,7 @@
template, this, true);
control_row =
- ControlRow.Get(this, BTree.ROOTPAGEID).search(sp);
+ ControlRow.get(this, BTree.ROOTPAGEID).search(sp);
control_row.release();
control_row = null;
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=517129&r1=517128&r2=517129
==============================================================================
--- db/derby/code/trunk/java/engine/org/apache/derby/impl/store/access/btree/BTreeForwardScan.java (original)
+++ db/derby/code/trunk/java/engine/org/apache/derby/impl/store/access/btree/BTreeForwardScan.java Mon Mar 12 01:28:47 2007
@@ -336,7 +336,7 @@
// or partial match if partial key.
// ret < 0: key is less than row on page.
//
- int ret = ControlRow.CompareIndexRowToKey(
+ int ret = ControlRow.compareIndexRowToKey(
fetch_row,
init_stopKeyValue,
fetch_row.length,
Modified: db/derby/code/trunk/java/engine/org/apache/derby/impl/store/access/btree/BTreeMaxScan.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/engine/org/apache/derby/impl/store/access/btree/BTreeMaxScan.java?view=diff&rev=517129&r1=517128&r2=517129
==============================================================================
--- db/derby/code/trunk/java/engine/org/apache/derby/impl/store/access/btree/BTreeMaxScan.java (original)
+++ db/derby/code/trunk/java/engine/org/apache/derby/impl/store/access/btree/BTreeMaxScan.java Mon Mar 12 01:28:47 2007
@@ -298,7 +298,7 @@
{
// Find the starting page and row slot, must start at root and
// search either for leftmost leaf, or search for specific key.
- ControlRow root = ControlRow.Get(this, BTree.ROOTPAGEID);
+ ControlRow root = ControlRow.get(this, BTree.ROOTPAGEID);
// include search of tree in page visited stats.
stat_numpages_visited += root.getLevel() + 1;
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=517129&r1=517128&r2=517129
==============================================================================
--- 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 Mon Mar 12 01:28:47 2007
@@ -118,7 +118,7 @@
// Get the root page back, and perform a split following the
// to-be-inserted key. The split releases the root page latch.
- root = ControlRow.Get(open_btree, BTree.ROOTPAGEID);
+ root = ControlRow.get(open_btree, BTree.ROOTPAGEID);
root.shrinkFor(open_btree, shrink_row);
@@ -303,7 +303,7 @@
// The following can fail either if it can't get the latch or
// somehow the page requested no longer exists. In either case
// the post commit work will just skip it.
- control_row = ControlRow.GetNoWait(open_btree, pageno);
+ control_row = ControlRow.getNoWait(open_btree, pageno);
if (control_row != null)
{
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=517129&r1=517128&r2=517129
==============================================================================
--- 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 Mon Mar 12 01:28:47 2007
@@ -361,7 +361,7 @@
{
// Find the starting page and row slot, must start at root and
// search either for leftmost leaf, or search for specific key.
- ControlRow root = ControlRow.Get(this, BTree.ROOTPAGEID);
+ ControlRow root = ControlRow.get(this, BTree.ROOTPAGEID);
// include search of tree in page visited stats.
stat_numpages_visited += root.getLevel() + 1;
@@ -527,7 +527,7 @@
{
// Find the starting page and row slot, must start at root and
// search either for leftmost leaf, or search for specific key.
- ControlRow root = ControlRow.Get(this, BTree.ROOTPAGEID);
+ ControlRow root = ControlRow.get(this, BTree.ROOTPAGEID);
// include search of tree in page visited stats.
stat_numpages_visited += root.getLevel() + 1;
@@ -1077,7 +1077,7 @@
SanityManager.ASSERT(pos.current_scan_pageno != 0);
pos.current_leaf = (LeafControlRow)
- ControlRow.Get(this, pos.current_rh.getPageNumber());
+ ControlRow.get(this, pos.current_rh.getPageNumber());
pos.current_slot =
pos.current_leaf.page.getSlotNumber(pos.current_rh);
}
@@ -1104,7 +1104,7 @@
do
{
pos.current_leaf = (LeafControlRow)
- ControlRow.Get(this, BTree.ROOTPAGEID).search(sp);
+ ControlRow.get(this, BTree.ROOTPAGEID).search(sp);
if (sp.resultExact || missing_row_for_key_ok)
{
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=517129&r1=517128&r2=517129
==============================================================================
--- 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 Mon Mar 12 01:28:47 2007
@@ -144,7 +144,7 @@
* Perform page specific initialization.
* <p>
**/
- protected final void ControlRowInit()
+ protected final void controlRowInit()
{
child_pageno_buf = new SQLLongint();
}
@@ -212,7 +212,7 @@
// Get the root page back, and perform a split following the
// branch row which would not fit.
- ControlRow root = ControlRow.Get(open_btree, BTree.ROOTPAGEID);
+ ControlRow root = ControlRow.get(open_btree, BTree.ROOTPAGEID);
if (SanityManager.DEBUG)
SanityManager.ASSERT(root.page.isLatched());
@@ -621,7 +621,7 @@
growRoot(open_btree, template, this);
parent = (BranchControlRow)
- ControlRow.Get(open_btree, BTree.ROOTPAGEID);
+ ControlRow.get(open_btree, BTree.ROOTPAGEID);
return(parent.splitFor(
@@ -712,7 +712,7 @@
// Allocate a new branch page and link it to the
// right of the current page.
BranchControlRow newbranch =
- BranchControlRow.Allocate(open_btree, childpage,
+ BranchControlRow.allocate(open_btree, childpage,
this.getLevel(), parent);
newbranch.linkRight(open_btree, this);
@@ -835,7 +835,7 @@
// Decide whether we're following the current page or the new page.
BranchControlRow pagetofollow;
- if (CompareIndexRowToKey(
+ if (compareIndexRowToKey(
splitrow,
split_branch_row.getRow(),
split_branch_row.getRow().length - 1, 0,
@@ -1192,7 +1192,7 @@
// rows from the root, and remain at the old root's level.
// Its parent is the root.
branch =
- BranchControlRow.Allocate(
+ BranchControlRow.allocate(
open_btree, leftchild, root.getLevel(), root);
// Copy all the index rows from the root to the new branch.
@@ -1245,7 +1245,7 @@
*
* @exception StandardException Standard exception policy.
*/
- private static BranchControlRow Allocate(
+ private static BranchControlRow allocate(
OpenBTree open_btree,
ControlRow leftchild,
int level,
@@ -1411,7 +1411,7 @@
child_pageno_buf);
child_control_row =
- ControlRow.Get(open_btree, child_pageno_buf.getLong());
+ ControlRow.get(open_btree, child_pageno_buf.getLong());
}
return(child_control_row);
@@ -1431,7 +1431,7 @@
public ControlRow getLeftChild(OpenBTree open_btree)
throws StandardException
{
- return(ControlRow.Get(open_btree, this.getLeftChildPageno()));
+ return(ControlRow.get(open_btree, this.getLeftChildPageno()));
}
/**
@@ -1456,7 +1456,7 @@
// last branch row to find the rightmost child.
right_child =
(num_slots == 1 ?
- ControlRow.Get(open_btree, this.getLeftChildPageno()) :
+ ControlRow.get(open_btree, this.getLeftChildPageno()) :
getChildPageAtSlot(open_btree, (num_slots - 1)));
return(right_child);
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=517129&r1=517128&r2=517129
==============================================================================
--- 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 Mon Mar 12 01:28:47 2007
@@ -469,7 +469,7 @@
return null;
// Try to get the control row without waiting
- cr = ControlRow.GetNoWait(btree, pageno);
+ cr = ControlRow.getNoWait(btree, pageno);
if (cr == null)
throw new WaitError();
@@ -528,7 +528,7 @@
if (pageno == ContainerHandle.INVALID_PAGE_NUMBER)
return null;
else
- return ControlRow.Get(open_btree, pageno);
+ return ControlRow.get(open_btree, pageno);
}
// This method will have to update the row.
@@ -814,13 +814,13 @@
@exception StandardException Standard exception policy.
**/
- public static ControlRow Get(OpenBTree open_btree, long pageNumber)
+ public static ControlRow get(OpenBTree open_btree, long pageNumber)
throws StandardException
{
- return(ControlRow.Get(open_btree.container, pageNumber));
+ return(ControlRow.get(open_btree.container, pageNumber));
}
- public static ControlRow Get(ContainerHandle container, long pageNumber)
+ public static ControlRow get(ContainerHandle container, long pageNumber)
throws StandardException
{
if (SanityManager.DEBUG)
@@ -841,7 +841,7 @@
}
// Return the corresponding control row.
- return GetControlRowForPage(container, page);
+ return getControlRowForPage(container, page);
}
/**
@@ -850,7 +850,7 @@
@exception StandardException Standard exception policy.
**/
- public static ControlRow GetNoWait(
+ public static ControlRow getNoWait(
OpenBTree open_btree,
long pageNumber)
throws StandardException
@@ -863,10 +863,10 @@
// Got the page without waiting. Return the corresponding
// control row.
- return GetControlRowForPage(open_btree.container, page);
+ return getControlRowForPage(open_btree.container, page);
}
- protected static ControlRow GetControlRowForPage(
+ protected static ControlRow getControlRowForPage(
ContainerHandle container,
Page page)
throws StandardException
@@ -906,7 +906,7 @@
cr.page = page;
// call page specific initialization.
- cr.ControlRowInit();
+ cr.controlRowInit();
// cache this Control row with the page in the cache.
page.setAuxObject(cr);
@@ -1015,7 +1015,7 @@
{
// Compare the index row to the key.
compare_ret =
- CompareIndexRowFromPageToKey(
+ compareIndexRowFromPageToKey(
this,
midslot,
params.template, params.searchKey,
@@ -1145,7 +1145,7 @@
{
// Compare the index row to the key.
compare_ret =
- CompareIndexRowFromPageToKey(
+ compareIndexRowFromPageToKey(
this,
midslot,
params.template, params.searchKey,
@@ -1238,7 +1238,7 @@
@exception StandardException Standard exception policy.
**/
- public static int CompareIndexRowFromPageToKey(
+ public static int compareIndexRowFromPageToKey(
ControlRow indexpage,
int slot,
DataValueDescriptor[] indexrow,
@@ -1314,7 +1314,7 @@
return 0;
}
- public static int CompareIndexRowToKey(
+ public static int compareIndexRowToKey(
DataValueDescriptor[] indexrow,
DataValueDescriptor[] key,
int nCompareCols,
@@ -1457,7 +1457,7 @@
SanityManager.ASSERT(btree.getConglomerate().nUniqueColumns <=
btree.getConglomerate().nKeyFields);
int compare_result =
- CompareIndexRowToKey(
+ compareIndexRowToKey(
lesser, greater,
btree.getConglomerate().nUniqueColumns, 0,
btree.getConglomerate().ascDescInfo);
@@ -1522,7 +1522,7 @@
(FetchDescriptor) null, true);
int r =
- CompareIndexRowToKey(
+ compareIndexRowToKey(
left_lastrow, right_firstrow,
btree.getConglomerate().nUniqueColumns,
0, btree.getConglomerate().ascDescInfo);
@@ -1845,7 +1845,7 @@
* <p>
*
**/
- protected abstract void ControlRowInit();
+ protected abstract void controlRowInit();
/**
* Is the current page the leftmost leaf of tree?
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=517129&r1=517128&r2=517129
==============================================================================
--- 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 Mon Mar 12 01:28:47 2007
@@ -401,7 +401,7 @@
try
{
tree_height = open_btree.getHeight();
- root = ControlRow.Get(open_btree, BTree.ROOTPAGEID);
+ root = ControlRow.get(open_btree, BTree.ROOTPAGEID);
// Allocate a LevelInfo array with one entry per level of the tree.
level_info = new LevelInfo[tree_height];
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=517129&r1=517128&r2=517129
==============================================================================
--- 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 Mon Mar 12 01:28:47 2007
@@ -115,7 +115,7 @@
*
* @exception StandardException Standard exception policy.
*/
- private static LeafControlRow Allocate(
+ private static LeafControlRow allocate(
OpenBTree btree,
ControlRow parent)
throws StandardException
@@ -194,7 +194,7 @@
* Perform page specific initialization.
* <p>
**/
- protected final void ControlRowInit()
+ protected final void controlRowInit()
{
}
@@ -564,7 +564,7 @@
// At this point, this page has been unlatched. So code below this
// point must not access this object's fields.
- ControlRow new_root = ControlRow.Get(open_btree, BTree.ROOTPAGEID);
+ ControlRow new_root = ControlRow.get(open_btree, BTree.ROOTPAGEID);
return(
new_root.splitFor(open_btree, template, null, splitrow, flag));
@@ -663,7 +663,7 @@
// Create a new leaf page under the parent.
LeafControlRow newleaf =
- LeafControlRow.Allocate(open_btree, parent_page);
+ LeafControlRow.allocate(open_btree, parent_page);
// Now that we know the page number of the new child page update
// the branch row to be inserted with the correct value.
@@ -855,7 +855,7 @@
// Allocate a new leaf page under the existing leaf root.
- newleaf = LeafControlRow.Allocate(open_btree, leafroot);
+ newleaf = LeafControlRow.allocate(open_btree, leafroot);
// Test fail after allocation
if (SanityManager.DEBUG)
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=517129&r1=517128&r2=517129
==============================================================================
--- 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 Mon Mar 12 01:28:47 2007
@@ -286,7 +286,7 @@
if (SanityManager.DEBUG)
SanityManager.ASSERT(this.init_conglomerate.format_ids != null);
- root = ControlRow.Get(this, BTree.ROOTPAGEID);
+ root = ControlRow.get(this, BTree.ROOTPAGEID);
int actualpages = root.checkConsistency(this, null, true);
@@ -564,7 +564,7 @@
try
{
- root = ControlRow.Get(this, BTree.ROOTPAGEID);
+ root = ControlRow.get(this, BTree.ROOTPAGEID);
int height = root.getLevel() + 1;
@@ -611,7 +611,7 @@
"p_tree", "BTREE Dump: btree " + this.init_conglomerate);
}
- root = ControlRow.Get(this, BTree.ROOTPAGEID);
+ root = ControlRow.get(this, BTree.ROOTPAGEID);
root.printTree(this);
}
finally
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=517129&r1=517128&r2=517129
==============================================================================
--- 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 Mon Mar 12 01:28:47 2007
@@ -232,7 +232,7 @@
}
// The conglomerate is located in the control row on the root page.
- root = ControlRow.Get(container, BTree.ROOTPAGEID);
+ root = ControlRow.get(container, BTree.ROOTPAGEID);
if (SanityManager.DEBUG)
SanityManager.ASSERT(root.getPage().isLatched());
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=517129&r1=517128&r2=517129
==============================================================================
--- 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 Mon Mar 12 01:28:47 2007
@@ -377,7 +377,7 @@
// wait on the left page, which we could not get before.
prev_leaf = (LeafControlRow)
- ControlRow.Get(open_btree, previous_pageno);
+ ControlRow.get(open_btree, previous_pageno);
latches_released = true;
}
@@ -462,7 +462,7 @@
// wait on the left page, which we could not get before.
prev_leaf = (LeafControlRow)
- ControlRow.Get(open_btree, previous_pageno);
+ ControlRow.get(open_btree, previous_pageno);
latches_released = true;
}
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=517129&r1=517128&r2=517129
==============================================================================
--- 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 Mon Mar 12 01:28:47 2007
@@ -133,7 +133,7 @@
{
// Need Conglomerate to create templates - get from the root page.
- root = ControlRow.Get(container, BTree.ROOTPAGEID);
+ root = ControlRow.get(container, BTree.ROOTPAGEID);
if (SanityManager.DEBUG)
SanityManager.ASSERT(root.getPage().isLatched());
@@ -191,7 +191,7 @@
// Get the page where the record was originally, before splits
// could have possibly moved it.
- control_row = ControlRow.Get(open_btree, rechandle.getPageNumber());
+ control_row = ControlRow.get(open_btree, rechandle.getPageNumber());
// init compare_result, if record doesn't exist do the search
compare_result = 1;
@@ -218,7 +218,7 @@
// compare the 2 rows, and if they are the same then the raw
// store has the right page and record and there is no work to
// be done (this is usual case).
- compare_result = ControlRow.CompareIndexRowToKey(
+ compare_result = ControlRow.compareIndexRowToKey(
template, logged_index_row_template,
logged_index_row_template.length, 1,
open_btree.getColumnSortOrderInfo());
@@ -242,7 +242,7 @@
control_row.release();
control_row = null;
control_row =
- ControlRow.Get(open_btree, BTree.ROOTPAGEID).search(sp);
+ ControlRow.get(open_btree, BTree.ROOTPAGEID).search(sp);
if (!sp.resultExact)
{