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

Consistent database tables naming convention. (#2064)

Browse Source 
* Added explicit table names (mostly for join tables).
* Shorten or alter name of 2 tables backing notaries.
* Change a compound index declaration to one column index.
This commit is contained in:
szymonsztuka 2017-11-15 18:35:26 +00:00 committed by GitHub
parent 8e18e1ba2a
commit b423fea537
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 14 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
core/src/main/kotlin/net/corda/core/internal/schemas/NodeInfoSchema.kt
View File

@ -32,6 +32,7 @@ object NodeInfoSchemaV1 : MappedSchema(
@Column(name = "addresses") @Column(name = "addresses")
@OneToMany(cascade = arrayOf(CascadeType.ALL), orphanRemoval = true) @OneToMany(cascade = arrayOf(CascadeType.ALL), orphanRemoval = true)
@JoinColumn(name = "node_info_id")
val addresses: List<NodeInfoSchemaV1.DBHostAndPort>, val addresses: List<NodeInfoSchemaV1.DBHostAndPort>,
@Column(name = "legal_identities_certs") @Column(name = "legal_identities_certs")
@ -69,6 +70,7 @@ object NodeInfoSchemaV1 : MappedSchema(
) : Serializable ) : Serializable
@Entity @Entity
@Table(name = "node_info_hosts")
data class DBHostAndPort( data class DBHostAndPort(
@EmbeddedId @EmbeddedId
private val pk: PKHostAndPort private val pk: PKHostAndPort

2
node/src/main/kotlin/net/corda/node/services/transactions/BFTNonValidatingNotaryService.kt
View File

@ -95,7 +95,7 @@ class BFTNonValidatingNotaryService(override val services: ServiceHubInternal,
} }
@Entity @Entity
@Table(name = "${NODE_DATABASE_PREFIX}bft_smart_notary_committed_states") @Table(name = "${NODE_DATABASE_PREFIX}bft_committed_states")
class PersistedCommittedState(id: PersistentStateRef, consumingTxHash: String, consumingIndex: Int, party: PersistentUniquenessProvider.PersistentParty) class PersistedCommittedState(id: PersistentStateRef, consumingTxHash: String, consumingIndex: Int, party: PersistentUniquenessProvider.PersistentParty)
: PersistentUniquenessProvider.PersistentUniqueness(id, consumingTxHash, consumingIndex, party) : PersistentUniquenessProvider.PersistentUniqueness(id, consumingTxHash, consumingIndex, party)

3
node/src/main/kotlin/net/corda/node/services/transactions/RaftUniquenessProvider.kt
View File

@ -29,6 +29,7 @@ import net.corda.core.utilities.loggerFor
import net.corda.node.services.config.RaftConfig import net.corda.node.services.config.RaftConfig
import net.corda.node.utilities.AppendOnlyPersistentMap import net.corda.node.utilities.AppendOnlyPersistentMap
import net.corda.node.utilities.CordaPersistence import net.corda.node.utilities.CordaPersistence
import net.corda.node.utilities.NODE_DATABASE_PREFIX
import net.corda.nodeapi.config.NodeSSLConfiguration import net.corda.nodeapi.config.NodeSSLConfiguration
import net.corda.nodeapi.config.SSLConfiguration import net.corda.nodeapi.config.SSLConfiguration
import java.nio.file.Path import java.nio.file.Path
@ -67,7 +68,7 @@ class RaftUniquenessProvider(private val transportConfiguration: NodeSSLConfigur
} }
@Entity @Entity
@Table(name = "notary_committed_states") @Table(name = "${NODE_DATABASE_PREFIX}raft_committed_states")
class RaftState( class RaftState(
@Id @Id
@Column(name = "id") @Column(name = "id")

11
node/src/main/kotlin/net/corda/node/services/vault/VaultSchema.kt
View File

@ -73,6 +73,10 @@ object VaultSchemaV1 : MappedSchema(schemaFamily = VaultSchema.javaClass, versio
/** X500Name of participant parties **/ /** X500Name of participant parties **/
@ElementCollection @ElementCollection
@CollectionTable(name = "vault_linear_states_parts",
joinColumns = arrayOf(
JoinColumn(name = "output_index", referencedColumnName = "output_index"),
JoinColumn(name = "transaction_id", referencedColumnName = "transaction_id")))
@Column(name = "participants") @Column(name = "participants")
var participants: MutableSet<AbstractParty>? = null, var participants: MutableSet<AbstractParty>? = null,
// Reason for not using Set is described here: // Reason for not using Set is described here:
@ -100,6 +104,10 @@ object VaultSchemaV1 : MappedSchema(schemaFamily = VaultSchema.javaClass, versio
/** X500Name of participant parties **/ /** X500Name of participant parties **/
@ElementCollection @ElementCollection
@CollectionTable(name = "vault_fungible_states_parts",
joinColumns = arrayOf(
JoinColumn(name = "output_index", referencedColumnName = "output_index"),
JoinColumn(name = "transaction_id", referencedColumnName = "transaction_id")))
@Column(name = "participants") @Column(name = "participants")
var participants: MutableSet<AbstractParty>? = null, var participants: MutableSet<AbstractParty>? = null,
@ -138,8 +146,7 @@ object VaultSchemaV1 : MappedSchema(schemaFamily = VaultSchema.javaClass, versio
@Entity @Entity
@Table(name = "vault_transaction_notes", @Table(name = "vault_transaction_notes",
indexes = arrayOf(Index(name = "seq_no_index", columnList = "seq_no"), indexes = arrayOf(Index(name = "transaction_id_index", columnList = "transaction_id")))
Index(name = "transaction_id_index", columnList = "transaction_id")))
class VaultTxnNote( class VaultTxnNote(
@Id @Id
@GeneratedValue @GeneratedValue