fix: make sure to delete tree ridbag data when converting to embedded

Author: tglman

core/src/main/java/com/orientechnologies/orient/core/db/record/ridbag/ORidBag.java

@@ -43,6 +43,7 @@
 import com.orientechnologies.orient.core.serialization.serializer.record.OSerializationContextImpl;
 import com.orientechnologies.orient.core.serialization.serializer.record.binary.BytesContainer;
 import com.orientechnologies.orient.core.serialization.serializer.string.OStringBuilderSerializable;
+import com.orientechnologies.orient.core.storage.impl.local.paginated.ORecordSerializationContext;
 import com.orientechnologies.orient.core.storage.index.sbtreebonsai.local.OSBTreeBonsai;
 import com.orientechnologies.orient.core.storage.ridbag.ORemoteTreeRidBag;
 import com.orientechnologies.orient.core.storage.ridbag.sbtree.Change;
@@ -297,7 +298,9 @@ public int toStream(BytesContainer bytesContainer, OSerializationContext ctx)
 
   public void checkAndConvert() {
     ODatabaseDocumentInternal database = ODatabaseRecordThreadLocal.instance().getIfDefined();
-    if (database != null && !database.isRemote()) {
+    if (database != null
+        && !database.isRemote()
+        && ORecordSerializationContext.getContext() != null) {
       if (isEmbedded()
           && ODatabaseRecordThreadLocal.instance().get().getSbTreeCollectionManager() != null
           && delegate.size() >= topThreshold) {

core/src/main/java/com/orientechnologies/orient/core/storage/ridbag/sbtree/OSBTreeRidBag.java

@@ -840,9 +840,15 @@ public void clearChanges() {
 
   @Override
   public void requestDelete() {
-    final ORecordSerializationContext context = ORecordSerializationContext.getContext();
-    if (context != null && collectionPointer != null) {
-      context.push(new ORidBagDeleteSerializationOperation(this));
+    if (ODatabaseRecordThreadLocal.instance().isDefined()
+        && !ODatabaseRecordThreadLocal.instance().get().isRemote()) {
+      final ORecordSerializationContext context = ORecordSerializationContext.getContext();
+
+      if (context != null && collectionPointer != null) {
+        context.push(new ORidBagDeleteSerializationOperation(this));
+      } else {
+        throw new ODatabaseException("Cannot delete the ridbag in current context");
+      }
     }
   }
 

core/src/test/java/com/orientechnologies/orient/core/storage/ridbag/sbtree/ORidBagAtomicUpdateTest.java

@@ -2,11 +2,13 @@
 
 import com.orientechnologies.BaseMemoryDatabase;
 import com.orientechnologies.orient.core.config.OGlobalConfiguration;
+import com.orientechnologies.orient.core.db.document.ODatabaseDocumentEmbedded;
 import com.orientechnologies.orient.core.db.record.OIdentifiable;
 import com.orientechnologies.orient.core.db.record.ridbag.ORidBag;
 import com.orientechnologies.orient.core.exception.OConcurrentModificationException;
 import com.orientechnologies.orient.core.id.ORID;
 import com.orientechnologies.orient.core.record.impl.ODocument;
+import com.orientechnologies.orient.core.storage.index.sbtreebonsai.local.OSBTreeBonsai;
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.HashMap;
@@ -1138,6 +1140,62 @@ public void testFromSBTreeToEmbeddedRollback() {
     Assert.assertTrue(docsToAdd.isEmpty());
   }
 
+  @Test
+  public void testFromSBTreeToEmbedded() {
+    OGlobalConfiguration.RID_BAG_EMBEDDED_TO_SBTREEBONSAI_THRESHOLD.setValue(5);
+    OGlobalConfiguration.RID_BAG_SBTREEBONSAI_TO_EMBEDDED_THRESHOLD.setValue(7);
+
+    List<OIdentifiable> docsToAdd = new ArrayList<OIdentifiable>();
+
+    ODocument document = new ODocument();
+
+    ORidBag ridBag = new ORidBag();
+    document.field("ridBag", ridBag);
+    document.save(db.getClusterNameById(db.getDefaultClusterId()));
+
+    db.begin();
+
+    for (int i = 0; i < 10; i++) {
+      ODocument docToAdd = new ODocument();
+      docToAdd.save(db.getClusterNameById(db.getDefaultClusterId()));
+      ridBag.add(docToAdd);
+      docsToAdd.add(docToAdd);
+    }
+
+    document.save(db.getClusterNameById(db.getDefaultClusterId()));
+
+    db.commit();
+
+    Assert.assertEquals(docsToAdd.size(), 10);
+    Assert.assertTrue(!ridBag.isEmbedded());
+
+    document = db.load(document.getIdentity());
+    ridBag = document.field("ridBag");
+
+    db.begin();
+    OBonsaiCollectionPointer pointer =
+        ((OSBTreeRidBag) ridBag.getDelegate()).getCollectionPointer();
+    for (int i = 0; i < 4; i++) {
+      OIdentifiable docToRemove = docsToAdd.get(i);
+      ridBag.remove(docToRemove);
+    }
+
+    Assert.assertTrue(document.isDirty());
+
+    document.save(db.getClusterNameById(db.getDefaultClusterId()));
+    db.commit();
+
+    OSBTreeBonsai<OIdentifiable, Integer> btree =
+        ((ODatabaseDocumentEmbedded) db).getSbTreeCollectionManager().loadSBTree(pointer);
+
+    Assert.assertTrue(btree.isEmpty());
+
+    document = db.load(document.getIdentity());
+    ridBag = document.field("ridBag");
+
+    Assert.assertTrue(ridBag.isEmbedded());
+  }
+
   @Test
   public void testFromSBTreeToEmbeddedTxWithCME() {
     OGlobalConfiguration.RID_BAG_EMBEDDED_TO_SBTREEBONSAI_THRESHOLD.setValue(5);