Skip to content

Commit 6cb60e8

Browse files
authored
Merge branch 'adopt-orientdb' into adopt-orientdb-bump-xodus
2 parents 21adf1b + efc1983 commit 6cb60e8

File tree

2 files changed

+7
-2
lines changed

2 files changed

+7
-2
lines changed

dnq/src/main/kotlin/kotlinx/dnq/store/container/StaticStoreContainer.kt

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,7 @@ import com.orientechnologies.orient.core.db.ODatabaseType
2121
import com.orientechnologies.orient.core.db.OrientDB
2222
import com.orientechnologies.orient.core.db.OrientDBConfig
2323
import jetbrains.exodus.database.TransientEntityStore
24+
import jetbrains.exodus.entitystore.orientdb.ODatabaseProvider
2425
import jetbrains.exodus.entitystore.orientdb.ODatabaseProviderImpl
2526
import jetbrains.exodus.env.EnvironmentConfig
2627
import java.io.File
@@ -44,15 +45,17 @@ object StaticStoreContainer : StoreContainer {
4445
val db = OrientDB("memory", builder.build())
4546
val databaseType = ODatabaseType.MEMORY
4647
db.createIfNotExists(entityStoreName, databaseType,"admin", "password", "admin")
47-
val dbProvider = ODatabaseProviderImpl(
48+
dbProvider = ODatabaseProviderImpl(
4849
db,
4950
entityStoreName,
5051
"admin",
5152
"password",
5253
databaseType,
5354
)
54-
val store = createTransientEntityStore(dbProvider, entityStoreName)
55+
val store = createTransientEntityStore(dbProvider!!, entityStoreName)
5556
this.store = store
5657
return store
5758
}
59+
60+
var dbProvider: ODatabaseProvider? = null
5861
}

dnq/src/test/kotlin/kotlinx/dnq/DBTest.kt

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,7 @@ import jetbrains.exodus.entitystore.TransientChangesMultiplexer
2828
import jetbrains.exodus.entitystore.Where
2929
import jetbrains.exodus.entitystore.Where.SYNC_AFTER_FLUSH
3030
import jetbrains.exodus.entitystore.Where.SYNC_BEFORE_FLUSH_BEFORE_CONSTRAINTS
31+
import jetbrains.exodus.entitystore.orientdb.OPersistentEntityStore
3132
import jetbrains.exodus.util.IOUtil
3233
import kotlinx.dnq.link.OnDeletePolicy.CLEAR
3334
import kotlinx.dnq.listener.XdEntityListener
@@ -185,6 +186,7 @@ abstract class DBTest {
185186
eventsMultiplexer.removeListener(it.first.entity, it.second.asEntityListener())
186187
}
187188
}
189+
StaticStoreContainer.dbProvider?.close()
188190
store.close()
189191
}
190192

0 commit comments

Comments
 (0)