Merge pull request #120 from JetBrains/adopt-orientdb-with-new-init

Adopt orientdb with new init

Author: leostryuk

build.gradle

@@ -1,6 +1,6 @@
 buildscript {
     ext.kotlin_version = '1.8.10'
-    ext.exodus_version = '9.9.127'
+    ext.exodus_version = '9.9.129'
     ext.dokka_version = '1.7.20'
     ext.log4j_version = '2.17.1'
     ext.google_truth_version = '1.4.2'

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

@@ -16,18 +16,21 @@
 package kotlinx.dnq.store.container
 
 import com.jetbrains.teamsys.dnq.database.TransientEntityStoreImpl
-import com.orientechnologies.orient.core.config.OGlobalConfiguration
 import com.orientechnologies.orient.core.db.ODatabaseType
 import com.orientechnologies.orient.core.db.OrientDB
-import com.orientechnologies.orient.core.db.OrientDBConfig
+import com.orientechnologies.orient.core.db.OrientDBConfigBuilder
 import jetbrains.exodus.database.TransientEntityStore
+import jetbrains.exodus.entitystore.orientdb.ODatabaseConfig
 import jetbrains.exodus.entitystore.orientdb.ODatabaseProvider
 import jetbrains.exodus.entitystore.orientdb.ODatabaseProviderImpl
-import jetbrains.exodus.env.EnvironmentConfig
+import jetbrains.exodus.entitystore.orientdb.initOrientDbServer
 import java.io.File
 
 object StaticStoreContainer : StoreContainer {
     private var _store: TransientEntityStore? = null
+    var dbProvider: ODatabaseProvider? = null
+    var db: OrientDB? = null
+
 
     override var store: TransientEntityStore
         get() {
@@ -37,25 +40,22 @@ object StaticStoreContainer : StoreContainer {
             this._store = value
         }
 
-    fun init(dbFolder: File, entityStoreName: String, primary: Boolean = true, configure: EnvironmentConfig.() -> Unit = {}): TransientEntityStoreImpl {
+    fun init(dbFolder: File, entityStoreName: String, configure: OrientDBConfigBuilder.() -> Unit = {}): TransientEntityStoreImpl {
+        val config = ODatabaseConfig.builder()
+            .withUserName("admin")
+            .withPassword("admin")
+            .withDatabaseType(ODatabaseType.MEMORY)
+            .withDatabaseName("memory")
+            .withDatabaseRoot(dbFolder.absolutePath)
+            .tweakConfig(configure)
+            .build()
         //TODO use dbFolder
-        val builder = OrientDBConfig.builder()
-        builder.addConfig(OGlobalConfiguration.NON_TX_READS_WARNING_MODE, "SILENT")
+        db = initOrientDbServer(config)
 
-        val db = OrientDB("memory", builder.build())
-        val databaseType = ODatabaseType.MEMORY
-        db.createIfNotExists(entityStoreName, databaseType,"admin", "password", "admin")
-        dbProvider = ODatabaseProviderImpl(
-            db,
-            entityStoreName,
-            "admin",
-            "password",
-            databaseType,
-        )
+        dbProvider = ODatabaseProviderImpl(config, db!!)
         val store = createTransientEntityStore(dbProvider!!, entityStoreName)
         this.store = store
         return store
     }
 
-    var dbProvider: ODatabaseProvider? = null
 }

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

@@ -28,7 +28,6 @@ import jetbrains.exodus.entitystore.TransientChangesMultiplexer
 import jetbrains.exodus.entitystore.Where
 import jetbrains.exodus.entitystore.Where.SYNC_AFTER_FLUSH
 import jetbrains.exodus.entitystore.Where.SYNC_BEFORE_FLUSH_BEFORE_CONSTRAINTS
-import jetbrains.exodus.entitystore.orientdb.OPersistentEntityStore
 import jetbrains.exodus.util.IOUtil
 import kotlinx.dnq.link.OnDeletePolicy.CLEAR
 import kotlinx.dnq.listener.XdEntityListener
@@ -41,6 +40,7 @@ import kotlinx.dnq.simple.email
 import kotlinx.dnq.simple.min
 import kotlinx.dnq.store.container.StaticStoreContainer
 import kotlinx.dnq.util.initMetaData
+import mu.KLogging
 import org.junit.After
 import org.junit.Before
 import java.io.File
@@ -49,8 +49,9 @@ import java.nio.file.*
 import java.nio.file.attribute.BasicFileAttributes
 
 abstract class DBTest {
-    lateinit var store: TransientEntityStoreImpl
+    companion object : KLogging()
     lateinit var databaseHome: File
+    lateinit var store: TransientEntityStoreImpl
     val typeListeners = mutableListOf<Pair<XdEntityType<*>, XdEntityListener<*>>>()
     val instanceListeners = mutableListOf<Pair<XdEntity, XdEntityListener<*>>>()
 
@@ -148,8 +149,11 @@ abstract class DBTest {
         } catch (e: IOException) {
             throw RuntimeException(e)
         }
-
-        openStore()
+        try {
+            openStore()
+        } catch (e: Throwable){
+            logger.error("Failed to open the store", e)
+        }
     }
 
     open fun registerEntityTypes() {
@@ -163,15 +167,8 @@ abstract class DBTest {
     }
 
     fun openStore() {
-        store = StaticStoreContainer.init(databaseHome, "testDB") {
-            envCloseForcedly = true
-        }
-
-
-
+        store = StaticStoreContainer.init(databaseHome, "testDB")
         initMetaData(XdModel.hierarchy, store)
-
-
         val changesMultiplexer = TransientChangesMultiplexer()
         store.changesMultiplexer = changesMultiplexer
     }
@@ -186,8 +183,9 @@ abstract class DBTest {
                 eventsMultiplexer.removeListener(it.first.entity, it.second.asEntityListener())
             }
         }
-        StaticStoreContainer.dbProvider?.close()
         store.close()
+        StaticStoreContainer.db?.drop("OSystem")
+        StaticStoreContainer.dbProvider?.close()
     }
 
     protected fun createAsyncProcessor(): JobProcessor {

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

@@ -75,7 +75,6 @@ class BlobTest : DBTest() {
 
     @Test
     fun textReplay() {
-        store.persistentStore.config.maxInPlaceBlobSize = 0
 
         val user = transactional {
             transactional(isNew = true) { User.new() }
@@ -101,7 +100,6 @@ class BlobTest : DBTest() {
 
     @Test
     fun blobReplay() {
-        store.persistentStore.config.maxInPlaceBlobSize = 0
 
         val user = transactional {
             transactional(isNew = true) { User.new() }