Merge remote-tracking branch 'origin/rid-set-sbtree' into rid-set-sbtree

andrii0lomakin · andrii0lomakin · commit 598dbd06fc86 · 2014-02-05T10:25:07.000+02:00
diff --git a/core/src/main/java/com/orientechnologies/orient/core/db/record/ORecordLazyMultiValue.java b/core/src/main/java/com/orientechnologies/orient/core/db/record/ORecordLazyMultiValue.java
@@ -24,6 +24,9 @@ public interface ORecordLazyMultiValue extends ODetachable, OSizeable {
 
   /**
    * Browse all the set to convert all the items into records.
+   * 
+   * It converts only items that already loaded into memory from storage. To convert records that will be fetched from disk later
+   * use {@link #setAutoConvertToRecord(boolean)}
    */
   public void convertLinks2Records();
 
@@ -38,4 +41,4 @@ public interface ORecordLazyMultiValue extends ODetachable, OSizeable {
 
   public void setAutoConvertToRecord(boolean convertToRecord);
 
-}
+}
diff --git a/core/src/main/java/com/orientechnologies/orient/core/db/record/ridbag/sbtree/OSBTreeRidBag.java b/core/src/main/java/com/orientechnologies/orient/core/db/record/ridbag/sbtree/OSBTreeRidBag.java
@@ -29,6 +29,7 @@
 import java.util.NavigableMap;
 import java.util.NoSuchElementException;
 import java.util.Set;
+import java.util.TreeMap;
 import java.util.UUID;
 import java.util.WeakHashMap;
 import java.util.concurrent.ConcurrentSkipListMap;
@@ -132,7 +133,14 @@ public Iterator<OIdentifiable> rawIterator() {
 
   @Override
   public void convertLinks2Records() {
-    throw new UnsupportedOperationException();
+    TreeMap<OIdentifiable, Change> newChanges = new TreeMap<OIdentifiable, Change>();
+    for (Map.Entry<OIdentifiable, Change> entry : changes.entrySet()) {
+      final OIdentifiable key = entry.getKey().getRecord();
+      newChanges.put((key == null) ? entry.getKey() : key, entry.getValue());
+    }
+
+    changes.clear();
+    changes.putAll(newChanges);
   }
 
   @Override
@@ -960,7 +968,7 @@ public Map<OIdentifiable, Change> deserializeChanges(byte[] stream, int offset)
         offset += Change.SIZE;
 
         final OIdentifiable identifiable;
-        if (rid.isTemporary())
+        if (rid.isTemporary() && rid.getRecord() != null)
           identifiable = rid.getRecord();
         else
           identifiable = rid;
diff --git a/graphdb/src/test/java/com/tinkerpop/blueprints/impls/orient/OrientCommitMT.java b/graphdb/src/test/java/com/tinkerpop/blueprints/impls/orient/OrientCommitMT.java
@@ -1,19 +1,29 @@
 package com.tinkerpop.blueprints.impls.orient;
 
-import com.orientechnologies.orient.core.config.OGlobalConfiguration;
-import com.orientechnologies.orient.core.id.ORID;
-import com.orientechnologies.orient.core.metadata.schema.OClass;
-import com.orientechnologies.orient.core.metadata.schema.OType;
-import com.tinkerpop.blueprints.Vertex;
-import org.junit.*;
-
 import java.io.File;
 import java.io.FileNotFoundException;
+import java.io.IOException;
 import java.io.PrintStream;
-import java.util.*;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Random;
 import java.util.concurrent.CountDownLatch;
 import java.util.concurrent.atomic.AtomicInteger;
 
+import org.junit.AfterClass;
+import org.junit.Assert;
+import org.junit.Before;
+import org.junit.Ignore;
+import org.junit.Test;
+
+import com.orientechnologies.orient.client.db.ODatabaseHelper;
+import com.orientechnologies.orient.client.remote.OServerAdmin;
+import com.orientechnologies.orient.core.config.OGlobalConfiguration;
+import com.orientechnologies.orient.core.id.ORID;
+import com.orientechnologies.orient.core.metadata.schema.OClass;
+import com.orientechnologies.orient.core.metadata.schema.OType;
+import com.tinkerpop.blueprints.Vertex;
+
 public class OrientCommitMT {
   public static final String              DB_URL           = "remote:localhost/avltreetest";
   public static final String              DB_USER          = "admin";
@@ -33,25 +43,41 @@ public class OrientCommitMT {
   final AtomicInteger                     idGenerator      = new AtomicInteger(1);
 
   private static Random                   random           = new Random();
-  private static final OrientGraphFactory factory          = new OrientGraphFactory(DB_URL);
-
-  @BeforeClass
-  public static void beforeClass() {
-    factory.setupPool(5, 10);
-    // OrientGraph graph = new OrientGraph(DB_URL, DB_USER, DB_PASSWORD);
-    // graph.drop();
-  }
+  private static OrientGraphFactory factory;
 
   @Before
-  public void setUp() {
+  public void setUp() throws IOException {
+    if (DB_URL.startsWith("remote:")) {
+      OServerAdmin serverAdmin = new OServerAdmin(DB_URL);
+      serverAdmin.connect("root", ODatabaseHelper.getServerRootPassword());
+
+      if (serverAdmin.existsDatabase("plocal")) {
+        serverAdmin.dropDatabase("plocal");
+      }
+      serverAdmin.createDatabase(DB_URL, "graph", "plocal");
+    } else {
+      OrientGraph graph = new OrientGraph(DB_URL, DB_USER, DB_PASSWORD);
+      graph.drop();
+    }
+    factory = new OrientGraphFactory(DB_URL).setupPool(5, 10);
+
     buildSchemaAndSeed();
     this.isValidData = true;
   }
 
   @AfterClass
-  public static void afterClass() {
-    // OrientGraph graph = new OrientGraph(DB_URL, DB_USER, DB_PASSWORD);
-    // graph.drop();
+  public static void afterClass() throws IOException {
+    if (DB_URL.startsWith("remote:")) {
+      OServerAdmin serverAdmin = new OServerAdmin(DB_URL);
+      serverAdmin.connect("root", ODatabaseHelper.getServerRootPassword());
+
+      if (serverAdmin.existsDatabase("plocal")) {
+        serverAdmin.dropDatabase("plocal");
+      }
+    } else {
+      OrientGraph graph = new OrientGraph(DB_URL, DB_USER, DB_PASSWORD);
+      graph.drop();
+    }
   }
 
   @Test
@@ -127,14 +153,6 @@ public String getFailureMessage() {
     return this.failureMessage;
   }
 
-  /**
-   * @param threadCount
-   *          - number of thread to run
-   * @param maxSleepTime
-   * @param maxOpCount
-   * @param initialCacheSize
-   * @param runtimeInMin
-   */
   private void executeTest(final int threadCount, final int maxSleepTime, final int maxOpCount, final int initialCacheSize,
       final int runtimeInMin) {
     CountDownLatch endLatch = new CountDownLatch(threadCount);
@@ -342,8 +360,9 @@ private boolean isInDatabase(final ORID id, OrientGraph orientGraph) throws Exce
      * operation in the temp cache.
      * 
      * @param tempCache
+     *          cached objects
      */
-    private void updateCache(final List<TempCacheObject> tempCache) {
+   private void updateCache(final List<TempCacheObject> tempCache) {
       for (TempCacheObject tempCacheObject : tempCache) {
         ORID id = tempCacheObject.getOrientId();
         Operation operation = tempCacheObject.getOperation();
@@ -463,13 +482,10 @@ public Integer getCustomId() {
       }
 
       public String toString() {
-        StringBuilder stringObject = new StringBuilder();
-        stringObject.append("Operation:").append(this.operation).append(", ORID:").append(this.orientId).append(", CustomId:")
-            .append(this.customId);
-        return stringObject.toString();
+        return "Operation:" + this.operation + ", ORID:" + this.orientId + ", CustomId:" + this.customId;
       }
 
-    }
+   }
   }
 
   /**
