bradford 02/01/15 09:22:23
Modified: java/src/org/apache/xindice/core/filer BTree.java
Log:
Added branch navigation changes suggested by Vadim Gritsenko
Revision Changes Path
1.2 +7 -13
xml-xindice/java/src/org/apache/xindice/core/filer/BTree.java
Index: BTree.java
===================================================================
RCS file:
/home/cvs/xml-xindice/java/src/org/apache/xindice/core/filer/BTree.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- BTree.java 6 Dec 2001 21:00:12 -0000 1.1
+++ BTree.java 15 Jan 2002 17:22:23 -0000 1.2
@@ -56,7 +56,7 @@
* information on the Apache Software Foundation, please see
* <http://www.apache.org/>.
*
- * $Id: BTree.java,v 1.1 2001/12/06 21:00:12 bradford Exp $
+ * $Id: BTree.java,v 1.2 2002/01/15 17:22:23 bradford Exp $
*/
import org.apache.xindice.core.*;
@@ -553,8 +553,7 @@
int idx = Arrays.binarySearch(values, value);
switch ( ph.getStatus() ) {
case BRANCH:
- if ( idx < 0 )
- idx = -(idx+1);
+ idx = idx < 0 ? -(idx+1) : idx+1;
return getChildNode(idx).removeValue(value);
case LEAF:
@@ -580,8 +579,7 @@
switch ( ph.getStatus() ) {
case BRANCH:
- if ( idx < 0 )
- idx = -(idx+1);
+ idx = idx < 0 ? -(idx+1) : idx+1;
return getChildNode(idx).addValue(value, pointer);
case LEAF:
@@ -623,8 +621,7 @@
boolean split = ph.getDataLen()+6+value.getLength() >
fileHeader.getWorkSize();
int idx = Arrays.binarySearch(values, value);
- if ( idx < 0 )
- idx = -(idx+1);
+ idx = idx < 0 ? -(idx+1) : idx+1;
setValues(insertArrayValue(values, value, idx));
setPointers(insertArrayLong(ptrs, rightPointer, idx+1));
@@ -727,8 +724,7 @@
switch ( ph.getStatus() ) {
case BRANCH:
- if ( idx < 0 )
- idx = -(idx+1);
+ idx = idx < 0 ? -(idx+1) : idx+1;
return getChildNode(idx).findValue(value);
case LEAF:
@@ -753,10 +749,8 @@
switch ( ph.getStatus() ) {
case BRANCH:
- if ( leftIdx < 0 )
- leftIdx = -(leftIdx+1);
- if ( rightIdx < 0 )
- rightIdx = -(rightIdx+1);
+ leftIdx = leftIdx < 0 ? -(leftIdx+1) : leftIdx+1;
+ rightIdx = rightIdx < 0 ? -(rightIdx+1) : rightIdx+1;
switch ( query.getOperator() ) {
case IndexQuery.BWX:
