Merge pull request #119 from JetBrains/adopt-orientdb-no-entityiterablebase

leostryuk · web-flow · commit cf4f9c6dc673 · 2024-11-27T16:10:28.000+01:00
Dropped EntityIterableBase usages
diff --git a/build.gradle b/build.gradle
@@ -1,6 +1,6 @@
 buildscript {
     ext.kotlin_version = '1.8.10'
-    ext.exodus_version = '9.9.126'
+    ext.exodus_version = '9.9.127'
     ext.dokka_version = '1.7.20'
     ext.log4j_version = '2.17.1'
     ext.google_truth_version = '1.4.2'
diff --git a/dnq-transient-store/src/main/kotlin/com/jetbrains/teamsys/dnq/association/AssociationSemantics.kt b/dnq-transient-store/src/main/kotlin/com/jetbrains/teamsys/dnq/association/AssociationSemantics.kt
@@ -19,6 +19,7 @@ import com.jetbrains.teamsys.dnq.database.*
 import jetbrains.exodus.database.TransientEntity
 import jetbrains.exodus.entitystore.Entity
 import jetbrains.exodus.entitystore.EntityIterable
+import jetbrains.exodus.entitystore.orientdb.iterate.OEntityIterableBase
 
 object AssociationSemantics {
 
@@ -38,13 +39,13 @@ object AssociationSemantics {
     @JvmStatic
     fun getToMany(e: Entity?, linkName: String): Iterable<Entity> {
         return e?.reattachTransient()?.getLinks(linkName)
-                ?: UniversalEmptyEntityIterable
+                ?: OEntityIterableBase.EMPTY
     }
 
     @JvmStatic
     fun getToMany(e: Entity?, linkNames: Set<String>): Iterable<Entity> {
         return e?.reattachTransient()?.getLinks(linkNames)
-                ?: UniversalEmptyEntityIterable
+                ?: OEntityIterableBase.EMPTY
     }
 
     /**
diff --git a/dnq-transient-store/src/main/kotlin/com/jetbrains/teamsys/dnq/database/AddedOrRemovedLinksFromSetTransientEntityIterable.kt b/dnq-transient-store/src/main/kotlin/com/jetbrains/teamsys/dnq/database/AddedOrRemovedLinksFromSetTransientEntityIterable.kt
@@ -21,6 +21,7 @@ import jetbrains.exodus.entitystore.Entity
 import jetbrains.exodus.entitystore.EntityIterable
 import jetbrains.exodus.entitystore.EntityIterator
 import jetbrains.exodus.entitystore.iterate.EntityIteratorWithPropId
+import jetbrains.exodus.entitystore.orientdb.iterate.OEntityIterableBase
 
 internal open class AddedOrRemovedLinksFromSetTransientEntityIterable(
         values: Set<TransientEntity>,
@@ -121,7 +122,7 @@ internal open class AddedOrRemovedLinksFromSetTransientEntityIterable(
             return if (!changedEntities.isEmpty()) {
                 AddedOrRemovedLinksFromSetTransientEntityIterable(changedEntities, removed, linkNames, changesLinks)
             } else {
-                UniversalEmptyEntityIterable
+                OEntityIterableBase.EMPTY
             }
         }
     }
diff --git a/dnq-transient-store/src/main/kotlin/com/jetbrains/teamsys/dnq/database/ReadonlyTransientEntityImpl.kt b/dnq-transient-store/src/main/kotlin/com/jetbrains/teamsys/dnq/database/ReadonlyTransientEntityImpl.kt
@@ -21,11 +21,8 @@ import jetbrains.exodus.database.TransientEntityStore
 import jetbrains.exodus.database.TransientStoreSession
 import jetbrains.exodus.entitystore.Entity
 import jetbrains.exodus.entitystore.EntityIterable
-import jetbrains.exodus.entitystore.iterate.EntityIterableBase
 import jetbrains.exodus.entitystore.orientdb.OEntity
-import jetbrains.exodus.entitystore.orientdb.OEntityId
-import jetbrains.exodus.entitystore.orientdb.OVertexEntity
-import jetbrains.exodus.entitystore.orientdb.asReadonly
+import jetbrains.exodus.entitystore.orientdb.iterate.OEntityIterableBase
 import java.io.File
 import java.io.InputStream
 
@@ -160,23 +157,23 @@ class ReadonlyTransientEntityImpl(change: TransientEntityChange?, snapshot: OEnt
                 override fun count() = this@asEntityIterable.size.toLong()
             }
         } else {
-            EntityIterableBase.EMPTY
+            OEntityIterableBase.EMPTY
         }
     }
 
     override fun getAddedLinks(linkNames: Set<String>): EntityIterable {
         return if (changedLinks.isNotEmpty()) {
             AddedOrRemovedLinksFromSetTransientEntityIterable.get(changedLinks, linkNames, removed = false)
         } else {
-            UniversalEmptyEntityIterable
+            OEntityIterableBase.EMPTY
         }
     }
 
     override fun getRemovedLinks(linkNames: Set<String>): EntityIterable {
         return if (changedLinks.isNotEmpty()) {
             AddedOrRemovedLinksFromSetTransientEntityIterable.get(changedLinks, linkNames, removed = true)
         } else {
-            UniversalEmptyEntityIterable
+            OEntityIterableBase.EMPTY
         }
     }
 
diff --git a/dnq-transient-store/src/main/kotlin/com/jetbrains/teamsys/dnq/database/TransientEntityImpl.kt b/dnq-transient-store/src/main/kotlin/com/jetbrains/teamsys/dnq/database/TransientEntityImpl.kt
@@ -18,12 +18,12 @@ package com.jetbrains.teamsys.dnq.database
 import jetbrains.exodus.ByteIterable
 import jetbrains.exodus.database.*
 import jetbrains.exodus.entitystore.*
-import jetbrains.exodus.entitystore.iterate.EntityIterableBase
 import jetbrains.exodus.entitystore.iterate.EntityIteratorWithPropId
 import jetbrains.exodus.entitystore.orientdb.OEntity
 import jetbrains.exodus.entitystore.orientdb.OEntityId
 import jetbrains.exodus.entitystore.orientdb.OStoreTransaction
 import jetbrains.exodus.entitystore.orientdb.OVertexEntity
+import jetbrains.exodus.entitystore.orientdb.iterate.OEntityIterableBase
 import java.io.File
 import java.io.InputStream
 
@@ -354,7 +354,7 @@ open class TransientEntityImpl : TransientEntity {
     }
 
     private fun getAddedRemovedLinks(name: String, removed: Boolean): EntityIterable {
-        if (isNew) return EntityIterableBase.EMPTY
+        if (isNew) return OEntityIterableBase.EMPTY
 
         return threadSessionOrThrow.transientChangesTracker
             .getChangedLinksDetailed(this)
@@ -366,7 +366,7 @@ open class TransientEntityImpl : TransientEntity {
                     getAddedWrapper(linkChange)
                 }
             }
-            ?: EntityIterableBase.EMPTY
+            ?: OEntityIterableBase.EMPTY
     }
 
     private fun concat(left: TransientEntityIterable?, right: TransientEntityIterable?) =
@@ -410,7 +410,7 @@ open class TransientEntityImpl : TransientEntity {
     }
 
     private fun getAddedRemovedLinks(linkNames: Set<String>, removed: Boolean): EntityIterable {
-        if (isNew) return UniversalEmptyEntityIterable
+        if (isNew) return OEntityIterableBase.EMPTY
 
         val changedLinksDetailed =
             threadSessionOrThrow.transientChangesTracker.getChangedLinksDetailed(this)
@@ -421,7 +421,7 @@ open class TransientEntityImpl : TransientEntity {
                 removed
             )
         } else {
-            UniversalEmptyEntityIterable
+            OEntityIterableBase.EMPTY
         }
     }
 
diff --git a/dnq-transient-store/src/main/kotlin/com/jetbrains/teamsys/dnq/database/TransientEntityIterable.kt b/dnq-transient-store/src/main/kotlin/com/jetbrains/teamsys/dnq/database/TransientEntityIterable.kt
@@ -20,7 +20,7 @@ import jetbrains.exodus.entitystore.Entity
 import jetbrains.exodus.entitystore.EntityIterable
 import jetbrains.exodus.entitystore.EntityIterator
 import jetbrains.exodus.entitystore.StoreTransaction
-import jetbrains.exodus.entitystore.iterate.EntityIterableBase
+import jetbrains.exodus.entitystore.orientdb.iterate.OEntityIterableBase
 import mu.KLogging
 
 /**
@@ -89,7 +89,7 @@ open class TransientEntityIterable(protected val values: Set<TransientEntity>) :
     }
 
     override fun take(number: Int): EntityIterable {
-        if (number == 0) return EntityIterableBase.EMPTY
+        if (number == 0) return OEntityIterableBase.EMPTY
 
         return TransientEntityIterable(
                 values.asSequence()
diff --git a/dnq-transient-store/src/main/kotlin/com/jetbrains/teamsys/dnq/database/TransientStoreUtil.kt b/dnq-transient-store/src/main/kotlin/com/jetbrains/teamsys/dnq/database/TransientStoreUtil.kt
@@ -21,9 +21,9 @@ import jetbrains.exodus.database.TransientEntity
 import jetbrains.exodus.database.TransientStoreSession
 import jetbrains.exodus.entitystore.Entity
 import jetbrains.exodus.entitystore.EntityIterable
-import jetbrains.exodus.entitystore.iterate.EntityIterableBase
 import jetbrains.exodus.entitystore.orientdb.OPersistentEntityStore
 import jetbrains.exodus.entitystore.orientdb.OVertexEntity
+import jetbrains.exodus.entitystore.orientdb.iterate.OEntityIterableBase
 
 /**
  * @author Vadim.Gurov
@@ -120,7 +120,7 @@ object TransientStoreUtil {
     fun getSize(iterable: Iterable<Entity>?): Int {
         return when {
             iterable == null -> 0
-            iterable === EntityIterableBase.EMPTY -> 0
+            iterable === OEntityIterableBase.EMPTY -> 0
             iterable is EntityIterable -> iterable.size().toInt()
             iterable is Collection<*> -> (iterable as Collection<*>).size
             else -> iterable.count()
diff --git a/dnq-transient-store/src/main/kotlin/com/jetbrains/teamsys/dnq/database/UniversalEmptyEntityIterable.kt b/dnq-transient-store/src/main/kotlin/com/jetbrains/teamsys/dnq/database/UniversalEmptyEntityIterable.kt
diff --git a/dnq/src/main/kotlin/kotlinx/dnq/query/FakeTransientEntities.kt b/dnq/src/main/kotlin/kotlinx/dnq/query/FakeTransientEntities.kt
@@ -22,7 +22,7 @@ import jetbrains.exodus.database.TransientEntityStore
 import jetbrains.exodus.entitystore.Entity
 import jetbrains.exodus.entitystore.EntityId
 import jetbrains.exodus.entitystore.EntityIterable
-import jetbrains.exodus.entitystore.iterate.EntityIterableBase
+import jetbrains.exodus.entitystore.orientdb.iterate.OEntityIterableBase
 import jetbrains.exodus.query.LinkEqual
 import jetbrains.exodus.query.NodeBase
 import jetbrains.exodus.query.PropertyEqual
@@ -379,7 +379,7 @@ internal class SearchingEntity(_type: String, _entityStore: TransientEntityStore
 
     override fun getLinks(linkName: String): EntityIterable {
         currentNodeName = linkName
-        return EntityIterableBase.EMPTY
+        return OEntityIterableBase.EMPTY
     }
 
     override fun setProperty(propertyName: String, value: Comparable<Nothing>): Boolean {
@@ -465,7 +465,7 @@ internal class MappingEntity(_type: String, _entityStore: TransientEntityStore)
         val node = XdModel.getOrThrow(_type)
         node.findLink(linkName).let {
             link = it ?: throw IllegalStateException("can't found model name for $linkName")
-            return EntityIterableBase.EMPTY
+            return OEntityIterableBase.EMPTY
         }
     }
 
diff --git a/dnq/src/main/kotlin/kotlinx/dnq/query/NodeBaseOperations.kt b/dnq/src/main/kotlin/kotlinx/dnq/query/NodeBaseOperations.kt
@@ -16,8 +16,7 @@
 package kotlinx.dnq.query
 
 import jetbrains.exodus.entitystore.Entity
-import jetbrains.exodus.entitystore.iterate.EntityIterableBase
-import jetbrains.exodus.entitystore.util.unsupported
+import jetbrains.exodus.entitystore.orientdb.iterate.OEntityIterableBase
 import jetbrains.exodus.query.*
 import jetbrains.exodus.query.metadata.ModelMetaData
 import kotlinx.dnq.XdEntity
@@ -357,7 +356,7 @@ object None : NodeBase() {
     override fun getClone(): NodeBase = this
 
     override fun instantiate(entityType: String?, queryEngine: QueryEngine?, metaData: ModelMetaData?, context: InstantiateContext): MutableIterable<Entity> {
-        return EntityIterableBase.EMPTY
+        return OEntityIterableBase.EMPTY
     }
 
     override fun equals(other: Any?): Boolean {

Original file line number	Diff line number	Diff line change
`@@ -21,6 +21,7 @@ import jetbrains.exodus.entitystore.Entity`
`21`	`21`	`import jetbrains.exodus.entitystore.EntityIterable`
`22`	`22`	`import jetbrains.exodus.entitystore.EntityIterator`
`23`	`23`	`import jetbrains.exodus.entitystore.iterate.EntityIteratorWithPropId`
	`24`	`+import jetbrains.exodus.entitystore.orientdb.iterate.OEntityIterableBase`
`24`	`25`
`25`	`26`	`internal open class AddedOrRemovedLinksFromSetTransientEntityIterable(`
`26`	`27`	`values: Set<TransientEntity>,`
`@@ -121,7 +122,7 @@ internal open class AddedOrRemovedLinksFromSetTransientEntityIterable(`
`121`	`122`	`return if (!changedEntities.isEmpty()) {`
`122`	`123`	`AddedOrRemovedLinksFromSetTransientEntityIterable(changedEntities, removed, linkNames, changesLinks)`
`123`	`124`	`} else {`
`124`		`- UniversalEmptyEntityIterable`
	`125`	`+ OEntityIterableBase.EMPTY`
`125`	`126`	`}`
`126`	`127`	`}`
`127`	`128`	`}`
Original file line number	Diff line number	Diff line change
`@@ -21,11 +21,8 @@ import jetbrains.exodus.database.TransientEntityStore`
`21`	`21`	`import jetbrains.exodus.database.TransientStoreSession`
`22`	`22`	`import jetbrains.exodus.entitystore.Entity`
`23`	`23`	`import jetbrains.exodus.entitystore.EntityIterable`
`24`		`-import jetbrains.exodus.entitystore.iterate.EntityIterableBase`
`25`	`24`	`import jetbrains.exodus.entitystore.orientdb.OEntity`
`26`		`-import jetbrains.exodus.entitystore.orientdb.OEntityId`
`27`		`-import jetbrains.exodus.entitystore.orientdb.OVertexEntity`
`28`		`-import jetbrains.exodus.entitystore.orientdb.asReadonly`
	`25`	`+import jetbrains.exodus.entitystore.orientdb.iterate.OEntityIterableBase`
`29`	`26`	`import java.io.File`
`30`	`27`	`import java.io.InputStream`
`31`	`28`
`@@ -160,23 +157,23 @@ class ReadonlyTransientEntityImpl(change: TransientEntityChange?, snapshot: OEnt`
`160`	`157`	`override fun count() = this@asEntityIterable.size.toLong()`
`161`	`158`	`}`
`162`	`159`	`} else {`
`163`		`- EntityIterableBase.EMPTY`
	`160`	`+ OEntityIterableBase.EMPTY`
`164`	`161`	`}`
`165`	`162`	`}`
`166`	`163`
`167`	`164`	`override fun getAddedLinks(linkNames: Set<String>): EntityIterable {`
`168`	`165`	`return if (changedLinks.isNotEmpty()) {`
`169`	`166`	`AddedOrRemovedLinksFromSetTransientEntityIterable.get(changedLinks, linkNames, removed = false)`
`170`	`167`	`} else {`
`171`		`- UniversalEmptyEntityIterable`
	`168`	`+ OEntityIterableBase.EMPTY`
`172`	`169`	`}`
`173`	`170`	`}`
`174`	`171`
`175`	`172`	`override fun getRemovedLinks(linkNames: Set<String>): EntityIterable {`
`176`	`173`	`return if (changedLinks.isNotEmpty()) {`
`177`	`174`	`AddedOrRemovedLinksFromSetTransientEntityIterable.get(changedLinks, linkNames, removed = true)`
`178`	`175`	`} else {`
`179`		`- UniversalEmptyEntityIterable`
	`176`	`+ OEntityIterableBase.EMPTY`
`180`	`177`	`}`
`181`	`178`	`}`
`182`	`179`
Original file line number	Diff line number	Diff line change
`@@ -18,12 +18,12 @@ package com.jetbrains.teamsys.dnq.database`
`18`	`18`	`import jetbrains.exodus.ByteIterable`
`19`	`19`	`import jetbrains.exodus.database.*`
`20`	`20`	`import jetbrains.exodus.entitystore.*`
`21`		`-import jetbrains.exodus.entitystore.iterate.EntityIterableBase`
`22`	`21`	`import jetbrains.exodus.entitystore.iterate.EntityIteratorWithPropId`
`23`	`22`	`import jetbrains.exodus.entitystore.orientdb.OEntity`
`24`	`23`	`import jetbrains.exodus.entitystore.orientdb.OEntityId`
`25`	`24`	`import jetbrains.exodus.entitystore.orientdb.OStoreTransaction`
`26`	`25`	`import jetbrains.exodus.entitystore.orientdb.OVertexEntity`
	`26`	`+import jetbrains.exodus.entitystore.orientdb.iterate.OEntityIterableBase`
`27`	`27`	`import java.io.File`
`28`	`28`	`import java.io.InputStream`
`29`	`29`
`@@ -354,7 +354,7 @@ open class TransientEntityImpl : TransientEntity {`
`354`	`354`	`}`
`355`	`355`
`356`	`356`	`private fun getAddedRemovedLinks(name: String, removed: Boolean): EntityIterable {`
`357`		`- if (isNew) return EntityIterableBase.EMPTY`
	`357`	`+ if (isNew) return OEntityIterableBase.EMPTY`
`358`	`358`
`359`	`359`	`return threadSessionOrThrow.transientChangesTracker`
`360`	`360`	`.getChangedLinksDetailed(this)`
`@@ -366,7 +366,7 @@ open class TransientEntityImpl : TransientEntity {`
`366`	`366`	`getAddedWrapper(linkChange)`
`367`	`367`	`}`
`368`	`368`	`}`
`369`		`- ?: EntityIterableBase.EMPTY`
	`369`	`+ ?: OEntityIterableBase.EMPTY`
`370`	`370`	`}`
`371`	`371`
`372`	`372`	`private fun concat(left: TransientEntityIterable?, right: TransientEntityIterable?) =`
`@@ -410,7 +410,7 @@ open class TransientEntityImpl : TransientEntity {`
`410`	`410`	`}`
`411`	`411`
`412`	`412`	`private fun getAddedRemovedLinks(linkNames: Set<String>, removed: Boolean): EntityIterable {`
`413`		`- if (isNew) return UniversalEmptyEntityIterable`
	`413`	`+ if (isNew) return OEntityIterableBase.EMPTY`
`414`	`414`
`415`	`415`	`val changedLinksDetailed =`
`416`	`416`	`threadSessionOrThrow.transientChangesTracker.getChangedLinksDetailed(this)`
`@@ -421,7 +421,7 @@ open class TransientEntityImpl : TransientEntity {`
`421`	`421`	`removed`
`422`	`422`	`)`
`423`	`423`	`} else {`
`424`		`- UniversalEmptyEntityIterable`
	`424`	`+ OEntityIterableBase.EMPTY`
`425`	`425`	`}`
`426`	`426`	`}`
`427`	`427`