Changeset 19674

Timestamp:

02/08/12 09:39:42 (4 months ago)

Author:

sys

Message:

Tree en cours...

Location:

trunk/Jav_Orient

Files:

• src/eu/scenari/orient/recordstruct/lib/base/StructList.java (modified) (1 diff)
• src/eu/scenari/orient/recordstruct/value/ValueListImmutableFixed.java (modified) (4 diffs)
• src/eu/scenari/orient/tree/impl/Tree.java (modified) (2 diffs)
• src/eu/scenari/orient/tree/impl/TreeNode.java (modified) (1 diff)
• src/eu/scenari/orient/tree/impl/TreeRake.java (modified) (2 diffs)
• test/eu/scenari/orient/tree/FactorySequentialLong.java (modified) (3 diffs)
• test/eu/scenari/orient/tree/TreeBasicTest.java (modified) (5 diffs)
• test/eu/scenari/orient/tree/perf/MVRBTreePerfTest.java (added)

trunk/Jav_Orient/src/eu/scenari/orient/recordstruct/lib/base/StructList.java

@@ -49 +49 @@
 import eu.scenari.orient.recordstruct.struct.StructAbstract;
 
-public class StructList extends StructAbstract<ValueList> implements IStructList<ValueList> {
+public class StructList extends StructAbstract<ValueList<?>> implements IStructList<ValueList<?>> {
 
         public StructList(int pCoreStructId) {

trunk/Jav_Orient/src/eu/scenari/orient/recordstruct/value/ValueListImmutableFixed.java

@@ -86 +86 @@
 
                 public E get(int pIndex) {
+                        assert (pIndex >= 0 && pIndex < fToIndex);
                         return ValueListImmutableFixed.this.get(fFromIndex + pIndex);
                 }
@@ -105 +106 @@
 
                 public void add(int pIndex, E pElt) {
+                        assert (pIndex >= 0 && pIndex <= fToIndex);
                         fToIndex++;
                         ValueListImmutableFixed.this.add(fFromIndex + pIndex, pElt);
@@ -110 +112 @@
 
                 public boolean addAll(int pIndex, Collection<? extends E> pC) {
+                        assert (pIndex >= 0 && pIndex <= fToIndex);
                         fToIndex += pC.size();
                         return ValueListImmutableFixed.this.addAll(fFromIndex + pIndex, pC);
@@ -115 +118 @@
 
                 public E set(int pIndex, E pElement) {
+                        assert (pIndex >= 0 && pIndex < fToIndex);
                         return ValueListImmutableFixed.this.set(fFromIndex + pIndex, pElement);
                 }
 
                 public E remove(int pIndex) {
+                        assert (pIndex >= 0 && pIndex < fToIndex);
                         fToIndex--;
                         return ValueListImmutableFixed.this.remove(fFromIndex + pIndex);

trunk/Jav_Orient/src/eu/scenari/orient/tree/impl/Tree.java

@@ -228 +228 @@
 
         public V get(Object pKey) {
-                return fRoot.findSlot(pKey).get(pKey);
+                TreeSlot<K, V> vSlot = fRoot.findSlot(pKey);
+                return vSlot != null ? vSlot.get(pKey) : null;
         }
 
         public boolean containsKey(Object pKey) {
-                return fRoot.findSlot(pKey).indexOf(pKey) >= 0;
+                TreeSlot<K, V> vSlot = fRoot.findSlot(pKey);
+                return vSlot != null ? vSlot.indexOf(pKey) >= 0 : false;
         }
 
         public V put(K pKey, V pValue) {
                 TreeSlot<K, V> vSlot = fRoot.findSlot(pKey);
+                if (vSlot == null) vSlot = fRoot.findFirstSlot();
                 ITreeSlotProvider<K, V> vSlotProvider = vSlot.getProvider();
                 int vCurrentOffset = vSlot.indexOf(pKey);
@@ -259 +262 @@
         public V remove(Object pKey) {
                 TreeSlot<K, V> vSlot = fRoot.findSlot(pKey);
+                if (vSlot == null) return null;
                 int vOffset = vSlot.indexOf(pKey);
                 if (vOffset < 0) return null;

trunk/Jav_Orient/src/eu/scenari/orient/tree/impl/TreeNode.java

@@ -43 +43 @@
 
         public K getKey(int pOffset) {
-                return fProvider.getKey(0);
+                return fProvider.getKey(pOffset);
         }
 

trunk/Jav_Orient/src/eu/scenari/orient/tree/impl/TreeRake.java

@@ -187 +187 @@
 
         public TreeSlot<K, V> findSlot(Object pKey) {
+                int vLast = -1;
                 int vLow = 0;
                 int vHigh = fProvider.getSize() - 1;
-                while (vLow < vHigh) {
+                while (vLow <= vHigh) {
                         int vMid = (vLow + vHigh) >>> 1;
                         K vMidKey = getKey(vMid);
                         int vCmp = fTree.fComparator.compare(vMidKey, (K) pKey);
                         if (vCmp < 0) {
+                                vLast = vMid;
                                 vLow = vMid + 1;
                         } else if (vCmp > 0) {
@@ -202 +204 @@
                         }
                 }
-                return getNode(vLow).findSlot(pKey);
+                return vLast >= 0 ? getNode(vLast).findSlot(pKey) : null;
         }
 

trunk/Jav_Orient/test/eu/scenari/orient/tree/FactorySequentialLong.java

@@ -11 +11 @@
 public class FactorySequentialLong implements IKeyFactory<Long>, IValueFactory<Long> {
 
+        protected long fStartValue = 1;
+
         protected Random fRandom = new Random();
 
-        protected AtomicLong fCounter = new AtomicLong(1);
+        protected AtomicLong fCounter = new AtomicLong(fStartValue);
 
         public Long newKey() {
@@ -29 +31 @@
         public Iterator<Long> creationOrderIterator() {
                 return new IteratorBufferedNextBase<Long>() {
-                        protected long fLast = 1;
+                        protected long fLast = fStartValue;
 
                         public boolean hasNext() {
@@ -35 +37 @@
                                 if (fNext != null) return true;
                                 //Cherche à renseigner fNext
-                                if (fLast <= fCounter.get()) {
+                                if (fLast < fCounter.get()) {
                                         fNext = fLast++;
                                 }

trunk/Jav_Orient/test/eu/scenari/orient/tree/TreeBasicTest.java

@@ -39 +39 @@
 package eu.scenari.orient.tree;
 
+import java.util.Iterator;
 import java.util.Map;
 
@@ -54 +55 @@
 import eu.scenari.orient.recordstruct.types.TypesBase;
 import eu.scenari.orient.test.TestDbAbstract;
+import eu.scenari.orient.tree.impl.IBalancingLayout;
 
 public class TreeBasicTest extends TestDbAbstract {
 
-        public static final TreeStorageConfig TREECONFIG = new TreeStorageConfig().setKeysStruct(TypesBase.LIST_LONG).setValuesStruct(TypesBase.LIST_LONG);
+        public static final TreeStorageConfig TREECONFIG = new TreeStorageConfig().setKeysStruct(TypesBase.LIST_LONG).setValuesStruct(TypesBase.LIST_LONG).setSizeStored(false).setBalancingLayout(IBalancingLayout.DEFAULT_BALANCED_INCREMENTAL_INSERT);
 
         public static final StructTree TREE_LONG_LONG = new StructTree(new ExtendedStructId(1, 1), "trreeLongLong").setTreeConfig(TREECONFIG);
 
-        protected FactorySequentialLong fFactory = new FactorySequentialLong();
+        protected FactorySequentialLong fFactorySeqLong = new FactorySequentialLong();
 
         @Override
@@ -78 +80 @@
                 Map<Long, Long> vTree = vRecord.getValue().getPojo();
                 for (int i = 1; i <= vSize; i++) {
-                        Long vKey = fFactory.newKey();
-                        vTree.put(vKey, fFactory.newValueFor(vKey));
+                        Long vKey = fFactorySeqLong.newKey();
+                        vTree.put(vKey, fFactorySeqLong.newValueFor(vKey));
                         vRecord.save();
                         Assert.assertEquals(i, vTree.size());
@@ -91 +93 @@
                 Assert.assertEquals(vSize, vTree.size());
                 checkAllEntries(vTree);
+
         }
 
@@ -96 +99 @@
                 int vCount = 0;
                 for (Map.Entry<Long, Long> vEntry : pTree.entrySet()) {
-                        fFactory.checkValueForKey(vEntry.getKey(), vEntry.getValue());
+                        fFactorySeqLong.checkValueForKey(vEntry.getKey(), vEntry.getValue());
                         vCount++;
                 }
                 Assert.assertEquals(pTree.size(), vCount);
+                for (Iterator<Long> vIt = fFactorySeqLong.creationOrderIterator(); vIt.hasNext();) {
+                        Long vKey = vIt.next();
+                        fFactorySeqLong.checkValueForKey(vKey, pTree.get(vKey));
+                }
+
         }