ExternalVendorCode/corda
1
0
Fork 0
mirror of https://github.com/corda/corda.git synced 2025-02-22 02:06:45 +00:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity

ENT-5384 Rename MAX_SQL_IN_CLAUSE_SET (#6414)

Browse Source 
Rename constant to `DEFAULT_SOFT_LOCKING_SQL_IN_CLAUSE_SIZE`
This commit is contained in:
Kyriakos Tharrouniatis 2020-07-01 09:31:12 +01:00 committed by GitHub
parent 18cd24c2b4
commit 5499e2c050
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
node/src/main/kotlin/net/corda/node/services/vault/NodeVaultService.kt
View File

@ -62,7 +62,7 @@ class NodeVaultService(
companion object { companion object {
private val log = contextLogger() private val log = contextLogger()
val MAX_SQL_IN_CLAUSE_SET = 16 const val DEFAULT_SOFT_LOCKING_SQL_IN_CLAUSE_SIZE = 16
/** /**
* Establish whether a given state is relevant to a node, given the node's public keys. * Establish whether a given state is relevant to a node, given the node's public keys.
@ -870,7 +870,7 @@ private fun CriteriaBuilder.executeUpdate(
var updatedRows = 0 var updatedRows = 0
it.asSequence() it.asSequence()
.map { stateRef -> PersistentStateRef(stateRef.txhash.bytes.toHexString(), stateRef.index) } .map { stateRef -> PersistentStateRef(stateRef.txhash.bytes.toHexString(), stateRef.index) }
.chunked(NodeVaultService.MAX_SQL_IN_CLAUSE_SET) .chunked(NodeVaultService.DEFAULT_SOFT_LOCKING_SQL_IN_CLAUSE_SIZE)
.forEach { persistentStateRefs -> .forEach { persistentStateRefs ->
updatedRows += doUpdate(persistentStateRefs) updatedRows += doUpdate(persistentStateRefs)
} }

10
node/src/test/kotlin/net/corda/node/services/vault/NodeVaultServiceTest.kt
View File

@ -416,7 +416,7 @@ class NodeVaultServiceTest {
} }
val softLockId = UUID.randomUUID() val softLockId = UUID.randomUUID()
val lockCount = NodeVaultService.MAX_SQL_IN_CLAUSE_SET * 2 val lockCount = NodeVaultService.DEFAULT_SOFT_LOCKING_SQL_IN_CLAUSE_SIZE * 2
database.transaction { database.transaction {
assertEquals(100, queryStates(SoftLockingType.UNLOCKED_ONLY).size) assertEquals(100, queryStates(SoftLockingType.UNLOCKED_ONLY).size)
val unconsumedStates = vaultService.queryBy<Cash.State>().states val unconsumedStates = vaultService.queryBy<Cash.State>().states
@ -429,18 +429,18 @@ class NodeVaultServiceTest {
assertEquals(lockCount, queryStates(SoftLockingType.LOCKED_ONLY).size) assertEquals(lockCount, queryStates(SoftLockingType.LOCKED_ONLY).size)
val unlockSet0 = mutableSetOf<StateRef>() val unlockSet0 = mutableSetOf<StateRef>()
for (i in 0 until NodeVaultService.MAX_SQL_IN_CLAUSE_SET + 1) { for (i in 0 until NodeVaultService.DEFAULT_SOFT_LOCKING_SQL_IN_CLAUSE_SIZE + 1) {
unlockSet0.add(lockSet[i]) unlockSet0.add(lockSet[i])
} }
vaultService.softLockRelease(softLockId, NonEmptySet.copyOf(unlockSet0)) vaultService.softLockRelease(softLockId, NonEmptySet.copyOf(unlockSet0))
assertEquals(NodeVaultService.MAX_SQL_IN_CLAUSE_SET - 1, queryStates(SoftLockingType.LOCKED_ONLY).size) assertEquals(NodeVaultService.DEFAULT_SOFT_LOCKING_SQL_IN_CLAUSE_SIZE - 1, queryStates(SoftLockingType.LOCKED_ONLY).size)
val unlockSet1 = mutableSetOf<StateRef>() val unlockSet1 = mutableSetOf<StateRef>()
for (i in NodeVaultService.MAX_SQL_IN_CLAUSE_SET + 1 until NodeVaultService.MAX_SQL_IN_CLAUSE_SET + 3) { for (i in NodeVaultService.DEFAULT_SOFT_LOCKING_SQL_IN_CLAUSE_SIZE + 1 until NodeVaultService.DEFAULT_SOFT_LOCKING_SQL_IN_CLAUSE_SIZE + 3) {
unlockSet1.add(lockSet[i]) unlockSet1.add(lockSet[i])
} }
vaultService.softLockRelease(softLockId, NonEmptySet.copyOf(unlockSet1)) vaultService.softLockRelease(softLockId, NonEmptySet.copyOf(unlockSet1))
assertEquals(NodeVaultService.MAX_SQL_IN_CLAUSE_SET - 1 - 2, queryStates(SoftLockingType.LOCKED_ONLY).size) assertEquals(NodeVaultService.DEFAULT_SOFT_LOCKING_SQL_IN_CLAUSE_SIZE - 1 - 2, queryStates(SoftLockingType.LOCKED_ONLY).size)
vaultService.softLockRelease(softLockId) // release the rest vaultService.softLockRelease(softLockId) // release the rest
assertEquals(100, queryStates(SoftLockingType.UNLOCKED_ONLY).size) assertEquals(100, queryStates(SoftLockingType.UNLOCKED_ONLY).size)