From 5499e2c050266d6a95dfb2075a8d2ebd47e0c188 Mon Sep 17 00:00:00 2001 From: Kyriakos Tharrouniatis Date: Wed, 1 Jul 2020 09:31:12 +0100 Subject: [PATCH] ENT-5384 Rename MAX_SQL_IN_CLAUSE_SET (#6414) Rename constant to `DEFAULT_SOFT_LOCKING_SQL_IN_CLAUSE_SIZE` --- .../net/corda/node/services/vault/NodeVaultService.kt | 4 ++-- .../corda/node/services/vault/NodeVaultServiceTest.kt | 10 +++++----- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/node/src/main/kotlin/net/corda/node/services/vault/NodeVaultService.kt b/node/src/main/kotlin/net/corda/node/services/vault/NodeVaultService.kt index 6dfd3b6e04..ad7d80059d 100644 --- a/node/src/main/kotlin/net/corda/node/services/vault/NodeVaultService.kt +++ b/node/src/main/kotlin/net/corda/node/services/vault/NodeVaultService.kt @@ -62,7 +62,7 @@ class NodeVaultService( companion object { 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. @@ -870,7 +870,7 @@ private fun CriteriaBuilder.executeUpdate( var updatedRows = 0 it.asSequence() .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 -> updatedRows += doUpdate(persistentStateRefs) } diff --git a/node/src/test/kotlin/net/corda/node/services/vault/NodeVaultServiceTest.kt b/node/src/test/kotlin/net/corda/node/services/vault/NodeVaultServiceTest.kt index 320137e8b4..f2f141cac5 100644 --- a/node/src/test/kotlin/net/corda/node/services/vault/NodeVaultServiceTest.kt +++ b/node/src/test/kotlin/net/corda/node/services/vault/NodeVaultServiceTest.kt @@ -416,7 +416,7 @@ class NodeVaultServiceTest { } 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 { assertEquals(100, queryStates(SoftLockingType.UNLOCKED_ONLY).size) val unconsumedStates = vaultService.queryBy().states @@ -429,18 +429,18 @@ class NodeVaultServiceTest { assertEquals(lockCount, queryStates(SoftLockingType.LOCKED_ONLY).size) val unlockSet0 = mutableSetOf() - 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]) } 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() - 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]) } 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 assertEquals(100, queryStates(SoftLockingType.UNLOCKED_ONLY).size)