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

ENT-8983 - Postgres migration failure (#7408)

Browse Source 
* Set DB transaction isolation level only if its going to change; upgraded dependencies

* Removed duplicate changeset
This commit is contained in:
Chris Cochrane 2023-07-07 13:29:35 +01:00 committed by GitHub
parent 97d8549d4f
commit 0f2312a201
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
5 changed files with 8 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
common/logging/src/main/kotlin/net/corda/common/logging/Constants.kt
View File

@ -9,4 +9,4 @@ package net.corda.common.logging
* (originally added to source control for ease of use)
*/
internal const val CURRENT_MAJOR_RELEASE = "4.11-SNAPSHOT"
internal const val CURRENT_MAJOR_RELEASE = "4.11-SNAPSHOT"

6
constants.properties
View File

@ -78,9 +78,9 @@ mockitoKotlinVersion=1.6.0
hamkrestVersion=1.7.0.0
joptSimpleVersion=5.0.2
jansiVersion=1.18
hibernateVersion=5.6.5.Final
hibernateVersion=5.6.14.Final
# h2Version - Update docs if renamed or removed.
h2Version=2.1.212
h2Version=2.1.214
rxjavaVersion=1.3.8
dokkaVersion=0.10.1
eddsaVersion=0.3.0
@ -89,7 +89,7 @@ commonsCollectionsVersion=4.3
beanutilsVersion=1.9.4
shiroVersion=1.10.0
hikariVersion=3.3.1
liquibaseVersion=4.18.0
liquibaseVersion=4.20.0
dockerComposeRuleVersion=1.5.0
seleniumVersion=3.141.59
ghostdriverVersion=2.1.0

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

@ -29,7 +29,10 @@ class DatabaseTransaction(
val connection: Connection by lazy(LazyThreadSafetyMode.NONE) {
database.dataSource.connection.apply {
autoCommit = false
transactionIsolation = isolation
// only set the transaction isolation level if it's actually changed - setting isn't free.
if (transactionIsolation != isolation) {
transactionIsolation = isolation
}
}
}

14
node/src/main/resources/migration/node-notary.changelog-committed-transactions-table.xml
View File

@ -1,14 +0,0 @@
<?xml version="1.1" encoding="UTF-8" standalone="no"?>
<databaseChangeLog xmlns="http://www.liquibase.org/xml/ns/dbchangelog"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://www.liquibase.org/xml/ns/dbchangelog http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-3.5.xsd">
<changeSet author="R3.Corda" id="create-notary-committed-transactions-table">
<createTable tableName="node_notary_committed_txs">
<column name="transaction_id" type="NVARCHAR(64)">
<constraints nullable="false"/>
</column>
</createTable>
<addPrimaryKey columnNames="transaction_id" constraintName="node_notary_transactions_pkey" tableName="node_notary_committed_txs"/>
</changeSet>
</databaseChangeLog>

1
node/src/main/resources/migration/node-notary.changelog-master.xml
View File

@ -8,7 +8,6 @@
<include file="migration/node-notary.changelog-v1.xml"/>
<include file="migration/node-notary.changelog-v2.xml"/>
<include file="migration/node-notary.changelog-pkey.xml"/>
<include file="migration/node-notary.changelog-committed-transactions-table.xml" />
<include file="migration/node-notary.changelog-v3.xml" />
<include file="migration/node-notary.changelog-worker-logging.xml" />
<include file="migration/node-notary.changelog-v4.xml"/>