antville/helma
antville/helma
1
1
Fork 0
Code Issues 5 Pull requests 7 Projects Releases 5 Activity Actions

Consistently update subnodeCount in add/remove methods, and fix bug where size() returns wrong result.

Browse source
This commit is contained in:
hns 2009-05-27 11:59:15 +00:00
parent 3b25f65602
commit 3401440d3b
1 changed files with 21 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

22
src/helma/objectmodel/db/SegmentedSubnodeList.java
View file

@ -36,7 +36,14 @@ public class SegmentedSubnodeList extends SubnodeList {
* @param obj element to be inserted. * @param obj element to be inserted.
*/ */
public synchronized boolean add(Object obj) { public synchronized boolean add(Object obj) {
if (!hasRelationalNodes() || segments == null) {
return super.add(obj);
}
if (subnodeCount == -1) {
update();
}
subnodeCount++; subnodeCount++;
segments[segments.length - 1].length += 1;
return list.add(obj); return list.add(obj);
} }
/** /**
@ -49,6 +56,10 @@ public class SegmentedSubnodeList extends SubnodeList {
super.add(index, obj); super.add(index, obj);
return; return;
} }
if (subnodeCount == -1) {
update();
}
subnodeCount++;
list.add(index, obj); list.add(index, obj);
// shift segment indices by one // shift segment indices by one
int s = getSegment(index); int s = getSegment(index);
@ -108,12 +119,16 @@ public class SegmentedSubnodeList extends SubnodeList {
if (!hasRelationalNodes() || segments == null) { if (!hasRelationalNodes() || segments == null) {
return super.remove(index); return super.remove(index);
} }
if (subnodeCount == -1) {
update();
}
Object removed = list.remove(index); Object removed = list.remove(index);
int s = getSegment(index); int s = getSegment(index);
segments[s].length -= 1; segments[s].length -= 1;
for (int i = s + 1; i < segments.length; i++) { for (int i = s + 1; i < segments.length; i++) {
segments[i].startIndex -= 1; segments[i].startIndex -= 1;
} }
subnodeCount--;
return removed; return removed;
} }
@ -125,6 +140,9 @@ public class SegmentedSubnodeList extends SubnodeList {
if (!hasRelationalNodes() || segments == null) { if (!hasRelationalNodes() || segments == null) {
return super.remove(object); return super.remove(object);
} }
if (subnodeCount == -1) {
update();
}
int index = indexOf(object); int index = indexOf(object);
if (index > -1) { if (index > -1) {
list.remove(object); list.remove(object);
@ -133,6 +151,7 @@ public class SegmentedSubnodeList extends SubnodeList {
for (int i = s + 1; i < segments.length; i++) { for (int i = s + 1; i < segments.length; i++) {
segments[i].startIndex -= 1; segments[i].startIndex -= 1;
} }
subnodeCount--;
return true; return true;
} }
return false; return false;
@ -189,6 +208,7 @@ public class SegmentedSubnodeList extends SubnodeList {
protected synchronized void update() { protected synchronized void update() {
if (!hasRelationalNodes()) { if (!hasRelationalNodes()) {
super.update(); super.update();
return;
} }
// also reload if the type mapping has changed. // also reload if the type mapping has changed.
long lastChange = getLastSubnodeChange(); long lastChange = getLastSubnodeChange();
@ -216,7 +236,7 @@ public class SegmentedSubnodeList extends SubnodeList {
} }
public int size() { public int size() {
if (!hasRelationalNodes()) { if (!hasRelationalNodes() || segments == null) {
return super.size(); return super.size();
} }