Merge pull request #266 from JetBrains/graph-store-XD-1201

Graph store xd 1201
JetBrains · Mar 7, 2025 · 5a1a7a4 · 5a1a7a4
2 parents 5a557e2 + 8f26ff3
commit 5a1a7a4
Show file tree

Hide file tree

Showing 9 changed files with 59 additions and 13 deletions.
diff --git a/...tore/src/main/kotlin/jetbrains/exodus/entitystore/youtrackdb/YTDBPersistentEntityStore.kt b/...tore/src/main/kotlin/jetbrains/exodus/entitystore/youtrackdb/YTDBPersistentEntityStore.kt
@@ -173,6 +173,10 @@ class YTDBPersistentEntityStore(
         currentTx.renameOClass(oldEntityTypeName, newEntityTypeName)
     }
 
+    override fun deleteEntityType(entityTypeName: String) {
+        val currentTx = requireActiveTransaction()
+        currentTx.deleteOClass(entityTypeName)
+    }
 
     override fun getAndCheckCurrentTransaction(): StoreTransaction {
         return requireActiveTransaction()

diff --git a/entity-store/src/main/kotlin/jetbrains/exodus/entitystore/youtrackdb/YTDBSchemaBuddy.kt b/entity-store/src/main/kotlin/jetbrains/exodus/entitystore/youtrackdb/YTDBSchemaBuddy.kt
@@ -57,6 +57,8 @@ interface YTDBSchemaBuddy {
 
     fun renameOClass(session: DatabaseSession, oldName: String, newName: String)
 
+    fun deleteOClass(session: DatabaseSession, name: String)
+
     fun getOrCreateEdgeClass(
         session: DatabaseSession,
         linkName: String,
@@ -119,6 +121,15 @@ class YTDBSchemaBuddyImpl(
         }
     }
 
+    override fun deleteOClass(session: DatabaseSession, name: String) {
+        session.executeInASeparateSessionIfCurrentHasTransaction(dbProvider) { sessionToWork ->
+            val targetClass = sessionToWork.schema.getClass(name)
+            if (targetClass != null){
+                sessionToWork.schema.dropClass(name)
+            }
+        }
+    }
+
     override fun getOrCreateEdgeClass(
         session: DatabaseSession,
         linkName: String,

diff --git a/entity-store/src/main/kotlin/jetbrains/exodus/entitystore/youtrackdb/YTDBStoreTransaction.kt b/entity-store/src/main/kotlin/jetbrains/exodus/entitystore/youtrackdb/YTDBStoreTransaction.kt
@@ -78,4 +78,5 @@ interface YTDBStoreTransaction : StoreTransaction {
     ): SchemaClass
 
     fun bindResultSet(resultSet: ResultSet)
+    fun deleteOClass(entityTypeName: String)
 }
diff --git a/...store/src/main/kotlin/jetbrains/exodus/entitystore/youtrackdb/YTDBStoreTransactionImpl.kt b/...store/src/main/kotlin/jetbrains/exodus/entitystore/youtrackdb/YTDBStoreTransactionImpl.kt
@@ -493,6 +493,11 @@ class YTDBStoreTransactionImpl(
         schemaBuddy.renameOClass(session, oldName, newName)
     }
 
+    override fun deleteOClass(entityTypeName: String) {
+        requireActiveTransaction()
+        schemaBuddy.deleteOClass(session, entityTypeName)
+    }
+
     override fun getOrCreateEdgeClass(
         linkName: String,
         outClassName: String,
@@ -524,6 +529,8 @@ class YTDBStoreTransactionImpl(
         return schemaBuddy.getType(session, entityTypeId)
     }
 
+
+
     override fun bindResultSet(resultSet: ResultSet) {
         resultSets.add(resultSet)
     }

diff --git a/entity-store/src/test/kotlin/jetbrains/exodus/entitystore/youtrackdb/OPersistentStoreTest.kt b/entity-store/src/test/kotlin/jetbrains/exodus/entitystore/youtrackdb/OPersistentStoreTest.kt
@@ -260,6 +260,20 @@ class OPersistentStoreTest : OTestMixin {
         }
     }
 
+    @Test
+    fun `can delete entityType`(){
+        youTrackDb.withSession { session->
+            Assert.assertNotNull(session.getClass(Issues.CLASS))
+        }
+        youTrackDb.createIssue("trista")
+        youTrackDb.withStoreTx {
+            youTrackDb.store.deleteEntityType(Issues.CLASS)
+        }
+        youTrackDb.withSession { session->
+            Assert.assertNull(session.getClass(Issues.CLASS))
+        }
+    }
+
     @Test
     fun `requireOEntityId works correctly with different types of EntityId`() {
         val issueId = youTrackDb.createIssue("trista").id

diff --git a/openAPI/src/main/java/jetbrains/exodus/entitystore/PersistentEntityStore.java b/openAPI/src/main/java/jetbrains/exodus/entitystore/PersistentEntityStore.java
@@ -17,10 +17,7 @@
 
 import jetbrains.exodus.backup.Backupable;
 import jetbrains.exodus.bindings.ComparableBinding;
-import jetbrains.exodus.core.execution.JobProcessor;
-import jetbrains.exodus.core.execution.MultiThreadDelegatingJobProcessor;
 import jetbrains.exodus.env.Environment;
-import jetbrains.exodus.management.Statistics;
 import org.jetbrains.annotations.NotNull;
 
 /**
@@ -155,6 +152,8 @@ void registerCustomPropertyType(@NotNull final StoreTransaction txn,
      */
     void renameEntityType(@NotNull String oldEntityTypeName, @NotNull String newEntityTypeName);
 
+    void deleteEntityType(@NotNull String entityTypeName);
+
     @NotNull
     StoreTransaction getAndCheckCurrentTransaction();
 

diff --git a/...nt-entity-store/src/main/java/jetbrains/exodus/entitystore/PersistentEntityStoreImpl.java b/...nt-entity-store/src/main/java/jetbrains/exodus/entitystore/PersistentEntityStoreImpl.java
@@ -2152,6 +2152,7 @@ public void remove() { // don't give a damn
         );
     }
 
+    @Override
     public void deleteEntityType(@NotNull final String entityTypeName) {
         final PersistentStoreTransaction txn = getAndCheckCurrentTransaction();
         final int entityTypeId = entityTypes.delete(txn, entityTypeName);

diff --git a/query/src/main/kotlin/jetbrains/exodus/query/QueryEngine.kt b/query/src/main/kotlin/jetbrains/exodus/query/QueryEngine.kt
@@ -49,16 +49,13 @@ open class QueryEngine(val modelMetaData: ModelMetaData?, val persistentStore: P
     open fun query(entityType: String, tree: NodeBase): EntityIterable = query(null, entityType, tree)
 
     open fun query(instance: Iterable<Entity>?, entityType: String, tree: NodeBase): EntityIterable {
-        return when (instance) {
-            null -> tree.instantiate(entityType, this, modelMetaData, NodeBase.InstantiateContext()) as EntityIterable
-            is EntityIterable -> {
-                if (tree is Sort){
+        return when {
+            modelMetaData != null && modelMetaData.getEntityMetaData(entityType) == null -> YTDBEntityIterableBase.EMPTY
+            instance == null -> tree.instantiate(entityType, this, modelMetaData, NodeBase.InstantiateContext()) as EntityIterable
+            instance is EntityIterable -> {
+                if (tree is Sort) {
                     val sorted = tree.applySort(entityType, instance, sortEngine!!)
-                    if (sorted !is EntityIterable){
-                        InMemoryEntityIterable(sorted, txn = persistentStore.andCheckCurrentTransaction, this)
-                    } else {
-                        sorted
-                    }
+                    sorted as? EntityIterable ?: InMemoryEntityIterable(sorted, txn = persistentStore.andCheckCurrentTransaction, this)
                 } else {
                     instance.intersect(
                         tree.instantiate(
@@ -202,7 +199,7 @@ open class QueryEngine(val modelMetaData: ModelMetaData?, val persistentStore: P
      */
     internal open fun inMemoryIntersect(left: Iterable<Entity>, right: Iterable<Entity>): Iterable<Entity> {
         val ids: EntityIdSet
-        val sequence: kotlin.sequences.Sequence<Entity>
+        val sequence: Sequence<Entity>
 
         val txn = persistentStore.andCheckCurrentTransaction
         if (left is YTDBEntityIterable) {

diff --git a/query/src/test/kotlin/jetbrains/exodus/query/OperationsWithEmptyIterableTest.kt b/query/src/test/kotlin/jetbrains/exodus/query/OperationsWithEmptyIterableTest.kt
@@ -20,6 +20,7 @@ import jetbrains.exodus.entitystore.youtrackdb.iterate.YTDBEntityOfTypeIterable
 import jetbrains.exodus.entitystore.youtrackdb.testutil.*
 import jetbrains.exodus.query.metadata.entity
 import jetbrains.exodus.query.metadata.oModel
+import org.junit.Assert
 import org.junit.Rule
 import org.junit.Test
 import kotlin.test.assertEquals
@@ -52,6 +53,17 @@ class OperationsWithEmptyIterableTest : OTestMixin {
         }
     }
 
+    @Test
+    fun `query for non existent class should return empty YTDBEmpty`(){
+        val model = givenModel()
+        val engine = QueryEngine(model, youTrackDb.store)
+        withStoreTx {
+            val iterable = engine.queryGetAll("HAHAHA_NOSUCH_CLASS")
+            Assert.assertEquals(iterable.size(), 0)
+        }
+    }
+
+
     private fun givenModel() = oModel(youTrackDb.provider) {
         entity(BaseUser.CLASS)
         entity(User.CLASS, BaseUser.CLASS)