ExternalVendorCode/corda
1
0
Fork 0
mirror of https://github.com/corda/corda.git synced 2025-01-18 18:56:28 +00:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity

Merging forward updates from release/os/4.11 to release/os/4.12 - 2023-09-27

Browse Source
This commit is contained in:
r3-build 2023-09-27 13:03:06 +00:00
commit 19346cb0ed
3 changed files with 15 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
node/src/integration-test-slow/kotlin/net/corda/node/flows/FinalityFlowErrorHandlingTest.kt
View File

@ -94,7 +94,7 @@ class GetFlowTransaction(private val txId: SecureHash) : FlowLogic<Pair<String,
rs.getString(4) // TransactionStatus
}
}
val receiverPartyId = serviceHub.jdbcSession().prepareStatement("select * from node_sender_distribution_records where transaction_id = ?")
val receiverPartyId = serviceHub.jdbcSession().prepareStatement("select * from node_sender_distr_recs where transaction_id = ?")
.apply { setString(1, txId.toString()) }
.use { ps ->
ps.executeQuery().use { rs ->

4
node/src/main/kotlin/net/corda/node/services/persistence/DBTransactionStorageLedgerRecovery.kt
View File

@ -54,7 +54,7 @@ class DBTransactionStorageLedgerRecovery(private val database: CordaPersistence,
@CordaSerializable
@Entity
@Table(name = "${NODE_DATABASE_PREFIX}sender_distribution_records")
@Table(name = "${NODE_DATABASE_PREFIX}sender_distr_recs")
data class DBSenderDistributionRecord(
@EmbeddedId
var compositeKey: PersistentKey,
@ -77,7 +77,7 @@ class DBTransactionStorageLedgerRecovery(private val database: CordaPersistence,
@CordaSerializable
@Entity
@Table(name = "${NODE_DATABASE_PREFIX}receiver_distribution_records")
@Table(name = "${NODE_DATABASE_PREFIX}receiver_distr_recs")
class DBReceiverDistributionRecord(
@EmbeddedId
var compositeKey: PersistentKey,

24
node/src/main/resources/migration/node-core.changelog-v25.xml
View File

@ -11,7 +11,7 @@
</changeSet>
<changeSet author="R3.Corda" id="create_sender_distribution_records_table">
<createTable tableName="node_sender_distribution_records">
<createTable tableName="node_sender_distr_recs">
<column name="timestamp" type="TIMESTAMP">
<constraints nullable="false"/>
</column>
@ -30,13 +30,13 @@
</createTable>
</changeSet>
<changeSet author="R3.Corda" id="node_sender_distribution_records_pkey">
<addPrimaryKey columnNames="peer_party_id, timestamp, timestamp_discriminator" constraintName="node_sender_distribution_records_pkey"
tableName="node_sender_distribution_records"/>
<changeSet author="R3.Corda" id="node_sender_distr_recs_pkey">
<addPrimaryKey columnNames="peer_party_id, timestamp, timestamp_discriminator" constraintName="node_sender_distr_recs_pkey"
tableName="node_sender_distr_recs"/>
</changeSet>
<changeSet author="R3.Corda" id="create_receiver_distribution_records_table">
<createTable tableName="node_receiver_distribution_records">
<createTable tableName="node_receiver_distr_recs">
<column name="timestamp" type="TIMESTAMP">
<constraints nullable="false"/>
</column>
@ -58,9 +58,9 @@
</createTable>
</changeSet>
<changeSet author="R3.Corda" id="node_receiver_distribution_records_pkey">
<addPrimaryKey columnNames="peer_party_id, timestamp, timestamp_discriminator" constraintName="node_receiver_distribution_records_pkey"
tableName="node_receiver_distribution_records"/>
<changeSet author="R3.Corda" id="node_receiver_distr_recs_pkey">
<addPrimaryKey columnNames="peer_party_id, timestamp, timestamp_discriminator" constraintName="node_receiver_distr_recs_pkey"
tableName="node_receiver_distr_recs"/>
</changeSet>
<changeSet author="R3.Corda" id="create_recovery_party_info_table">
@ -79,14 +79,14 @@
</changeSet>
<changeSet author="R3.Corda" id="FK__sender_distribution_records__peer_party_id">
<addForeignKeyConstraint baseColumnNames="peer_party_id" baseTableName="node_sender_distribution_records"
constraintName="FK__sender_distribution_records__peer_party_id"
<addForeignKeyConstraint baseColumnNames="peer_party_id" baseTableName="node_sender_distr_recs"
constraintName="FK__send_distr__peer_party_id"
referencedColumnNames="party_id" referencedTableName="node_recovery_party_info"/>
</changeSet>
<changeSet author="R3.Corda" id="FK__receiver_distribution_records__peer_party_id">
<addForeignKeyConstraint baseColumnNames="peer_party_id" baseTableName="node_receiver_distribution_records"
constraintName="FK__receiver_distribution_records__peer_party_id"
<addForeignKeyConstraint baseColumnNames="peer_party_id" baseTableName="node_receiver_distr_recs"
constraintName="FK__recv_distr__peer_party_id"
referencedColumnNames="party_id" referencedTableName="node_recovery_party_info"/>
</changeSet>