ExternalVendorCode/corda
1
0
Fork 0
mirror of https://github.com/corda/corda.git synced 2024-12-30 17:57:02 +00:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity

Transaction creation performance (#303) (#320)

Browse Source 
* Default autoCommit to false, remove setting of autocommit and only set isolationLevel if it's changed.

* Set default transaction isolation from database config
This commit is contained in:
Christian Sailer 2018-01-09 17:17:10 +00:00 committed by GitHub
parent 0c646ff662
commit 40edc286f5
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 13 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
node-api/src/main/kotlin/net/corda/nodeapi/internal/persistence/CordaPersistence.kt
View File

@ -35,7 +35,8 @@ enum class TransactionIsolationLevel {
/** /**
* The JDBC constant value of the same name but prefixed with TRANSACTION_ defined in [java.sql.Connection]. * The JDBC constant value of the same name but prefixed with TRANSACTION_ defined in [java.sql.Connection].
*/ */
val jdbcValue: Int = java.sql.Connection::class.java.getField("TRANSACTION_$name").get(null) as Int val jdbcString = "TRANSACTION_$name"
val jdbcValue: Int = java.sql.Connection::class.java.getField(jdbcString).get(null) as Int
} }
class CordaPersistence( class CordaPersistence(

4
node-api/src/main/kotlin/net/corda/nodeapi/internal/persistence/DatabaseTransaction.kt
View File

@ -20,10 +20,12 @@ class DatabaseTransaction(
cordaPersistence.dataSource.connection cordaPersistence.dataSource.connection
.apply { .apply {
_connectionCreated = true _connectionCreated = true
autoCommit = false // only set the transaction isolation level if it's actually changed - setting isn't free.
if (transactionIsolation != isolation) {
transactionIsolation = isolation transactionIsolation = isolation
} }
} }
}
private val sessionDelegate = lazy { private val sessionDelegate = lazy {
val session = cordaPersistence.entityManagerFactory.withOptions().connection(connection).openSession() val session = cordaPersistence.entityManagerFactory.withOptions().connection(connection).openSession()

7
node/src/main/kotlin/net/corda/node/services/config/NodeConfiguration.kt
View File

@ -135,6 +135,13 @@ data class NodeConfigurationImpl(
require(security == null || rpcUsers.isEmpty()) { require(security == null || rpcUsers.isEmpty()) {
"Cannot specify both 'rpcUsers' and 'security' in configuration" "Cannot specify both 'rpcUsers' and 'security' in configuration"
} }
// ensure our datasource configuration is sane
require(dataSourceProperties.get("autoCommit") != true) { "Datbase auto commit cannot be enabled, Corda requires transactional behaviour" }
dataSourceProperties.set("autoCommit", false)
if (dataSourceProperties.get("transactionIsolation") == null) {
dataSourceProperties["transactionIsolation"] = database.transactionIsolationLevel.jdbcString
}
} }
} }