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

Changed transaction notes type DB from 'blob' to 'text'

Browse Source
This commit is contained in:
Jose Coll
2016-10-31 15:07:34 +00:00
parent 2ce310050e
commit 96007cd777
2 changed files with 4 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
node/src/main/kotlin/com/r3corda/node/services/vault/NodeVaultService.kt
View File

@ -46,10 +46,10 @@ class NodeVaultService(private val services: ServiceHub) : SingletonSerializeAsT
private object TransactionNotesTable : JDBCHashedTable("${NODE_DATABASE_PREFIX}vault_txn_notes") { private object TransactionNotesTable : JDBCHashedTable("${NODE_DATABASE_PREFIX}vault_txn_notes") {
val txnId = secureHash("txnId") val txnId = secureHash("txnId")
val notes = blob("notes") val notes = text("notes")
} }
private val mutex = ThreadBox(object { private val mutex = ThreadBox(content = object {
val unconsumedStates = object : AbstractJDBCHashSet<StateRef, StatesSetTable>(StatesSetTable) { val unconsumedStates = object : AbstractJDBCHashSet<StateRef, StatesSetTable>(StatesSetTable) {
override fun elementFromRow(row: ResultRow): StateRef = StateRef(row[table.stateRef.txId], row[table.stateRef.index]) override fun elementFromRow(row: ResultRow): StateRef = StateRef(row[table.stateRef.txId], row[table.stateRef.index])
@ -65,7 +65,7 @@ class NodeVaultService(private val services: ServiceHub) : SingletonSerializeAsT
} }
override fun valueFromRow(row: ResultRow): Set<String> { override fun valueFromRow(row: ResultRow): Set<String> {
return deserializeFromBlob(row[table.notes]) return row[table.notes].split(delimiters = ";").toSet()
} }
override fun addKeyToInsert(insert: InsertStatement, entry: Map.Entry<SecureHash, Set<String>>, finalizables: MutableList<() -> Unit>) { override fun addKeyToInsert(insert: InsertStatement, entry: Map.Entry<SecureHash, Set<String>>, finalizables: MutableList<() -> Unit>) {
@ -73,7 +73,7 @@ class NodeVaultService(private val services: ServiceHub) : SingletonSerializeAsT
} }
override fun addValueToInsert(insert: InsertStatement, entry: Map.Entry<SecureHash, Set<String>>, finalizables: MutableList<() -> Unit>) { override fun addValueToInsert(insert: InsertStatement, entry: Map.Entry<SecureHash, Set<String>>, finalizables: MutableList<() -> Unit>) {
insert[table.notes] = serializeToBlob(entry.value, finalizables) insert[table.notes] = entry.value.joinToString(separator = ";")
} }
} }

1
node/src/test/kotlin/com/r3corda/node/services/NodeVaultServiceTest.kt
View File

@ -11,7 +11,6 @@ import com.r3corda.core.node.services.VaultService
import com.r3corda.core.transactions.SignedTransaction import com.r3corda.core.transactions.SignedTransaction
import com.r3corda.core.utilities.DUMMY_NOTARY import com.r3corda.core.utilities.DUMMY_NOTARY
import com.r3corda.core.utilities.LogHelper import com.r3corda.core.utilities.LogHelper
import com.r3corda.node.services.schema.NodeSchemaService
import com.r3corda.node.services.vault.NodeVaultService import com.r3corda.node.services.vault.NodeVaultService
import com.r3corda.node.utilities.configureDatabase import com.r3corda.node.utilities.configureDatabase
import com.r3corda.node.utilities.databaseTransaction import com.r3corda.node.utilities.databaseTransaction