Merge pull request #104 from JetBrains/adopt-orientdb-support-origina…

…l-blob-lazy-wait-for-build-for-internity Adopt orientdb support original blob lazy wait for build for internity
JetBrains · Sep 9, 2024 · 7077c28 · 7077c28
2 parents b2b97fd + 84760eb
commit 7077c28
Show file tree

Hide file tree

Showing 2 changed files with 20 additions and 5 deletions.
diff --git a/...in/kotlin/com/jetbrains/teamsys/dnq/database/TransientEntityOriginalValuesProviderImpl.kt b/...in/kotlin/com/jetbrains/teamsys/dnq/database/TransientEntityOriginalValuesProviderImpl.kt
@@ -16,6 +16,8 @@
 package com.jetbrains.teamsys.dnq.database
 
 import com.orientechnologies.orient.core.db.ODatabaseSession
+import com.orientechnologies.orient.core.db.record.OIdentifiable
+import com.orientechnologies.orient.core.id.ORID
 import com.orientechnologies.orient.core.record.OVertex
 import com.orientechnologies.orient.core.record.impl.ORecordBytes
 import jetbrains.exodus.database.LinkChangeType
@@ -47,7 +49,13 @@ class TransientEntityOriginalValuesProviderImpl(private val session: TransientSt
         val session = ODatabaseSession.getActiveSession()
         val id = e.entity.id.asOId()
         val oVertex = session.load<OVertex>(id)
-        val blobHolder = oVertex.getPropertyOnLoadValue<ORecordBytes?>(blobName)
+        val blobHolderOrId = oVertex.getPropertyOnLoadValue<OIdentifiable?>(blobName)
+        var blobHolder: ORecordBytes? = null
+        if (blobHolderOrId !is ORecordBytes && blobHolderOrId is ORID) {
+            blobHolder = session.load(blobHolderOrId)
+        } else if (blobHolderOrId is ORecordBytes) {
+            blobHolder = blobHolderOrId
+        }
         return blobHolder?.toStream()?.let {
             UTFUtil.readUTF((it).inputStream())
         }
@@ -57,9 +65,15 @@ class TransientEntityOriginalValuesProviderImpl(private val session: TransientSt
         val session = ODatabaseSession.getActiveSession()
         val id = e.entity.id.asOId()
         val oVertex = session.load<OVertex>(id)
-        val blobHolder = oVertex.getPropertyOnLoadValue<ORecordBytes?>(blobName)
-        return blobHolder?.let {
-            ByteArrayInputStream(blobHolder.toStream())
+        var blobHolder: ORecordBytes? = null
+        val blobHolderOrId = oVertex.getPropertyOnLoadValue<OIdentifiable?>(blobName)
+        if (blobHolderOrId !is ORecordBytes && blobHolderOrId is ORID) {
+            blobHolder = session.load(blobHolderOrId)
+        } else if (blobHolderOrId is ORecordBytes) {
+            blobHolder = blobHolderOrId as ORecordBytes
+        }
+        return blobHolder?.toStream()?.let {
+            ByteArrayInputStream(it)
         }
     }
 

diff --git a/...ransient-store/src/main/kotlin/com/jetbrains/teamsys/dnq/database/TransientSessionImpl.kt b/...ransient-store/src/main/kotlin/com/jetbrains/teamsys/dnq/database/TransientSessionImpl.kt
@@ -93,7 +93,8 @@ class TransientSessionImpl(
 
     override val entitiesUpdater = TransientEntitiesUpdaterImpl(this)
 
-    override val originalValuesProvider:TransientEntityOriginalValuesProvider = TransientEntityOriginalValuesProviderImpl(this)
+    override val originalValuesProvider: TransientEntityOriginalValuesProvider =
+        TransientEntityOriginalValuesProviderImpl(this)
 
     override val transientChangesTracker: TransientChangesTracker
         get() {