-
Notifications
You must be signed in to change notification settings - Fork 77
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
refactor some code out of VaultWatcherService.kt
- Loading branch information
Showing
7 changed files
with
138 additions
and
114 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
25 changes: 25 additions & 0 deletions
25
...lection/src/main/kotlin/com.r3.corda.lib.tokens.selection/memory/services/IndexingType.kt
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,25 @@ | ||
| package com.r3.corda.lib.tokens.selection.memory.services | ||
|
|
||
| import com.r3.corda.lib.tokens.selection.memory.internal.Holder | ||
|
|
||
| enum class IndexingType(val ownerType: Class<out Holder>) { | ||
|
|
||
| EXTERNAL_ID(Holder.MappedIdentity::class.java), | ||
| PUBLIC_KEY(Holder.KeyIdentity::class.java); | ||
|
|
||
| companion object { | ||
| fun fromHolder(holder: Class<out Holder>): IndexingType { | ||
| return when (holder) { | ||
| Holder.MappedIdentity::class.java -> { | ||
| EXTERNAL_ID | ||
| } | ||
|
|
||
| Holder.KeyIdentity::class.java -> { | ||
| PUBLIC_KEY | ||
| } | ||
| else -> throw IllegalArgumentException("Unknown Holder type: $holder") | ||
| } | ||
| } | ||
| } | ||
|
|
||
| } |
75 changes: 75 additions & 0 deletions
75
...rc/main/kotlin/com.r3.corda.lib.tokens.selection/memory/services/ServiceHubAsyncLoader.kt
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,75 @@ | ||
| package com.r3.corda.lib.tokens.selection.memory.services | ||
|
|
||
| import com.r3.corda.lib.tokens.contracts.states.FungibleToken | ||
| import com.r3.corda.lib.tokens.selection.memory.config.InMemorySelectionConfig | ||
| import com.r3.corda.lib.tokens.selection.sortByTimeStampAscending | ||
| import io.github.classgraph.ClassGraph | ||
| import net.corda.core.node.AppServiceHub | ||
| import net.corda.core.node.services.Vault | ||
| import net.corda.core.node.services.queryBy | ||
| import net.corda.core.node.services.vault.DEFAULT_PAGE_NUM | ||
| import net.corda.core.node.services.vault.PageSpecification | ||
| import net.corda.core.node.services.vault.QueryCriteria | ||
| import net.corda.core.utilities.contextLogger | ||
| import java.util.concurrent.CompletableFuture | ||
| import java.util.concurrent.atomic.AtomicBoolean | ||
| import java.util.concurrent.atomic.AtomicInteger | ||
|
|
||
| class ServiceHubAsyncLoader(private val appServiceHub: AppServiceHub, | ||
| private val configOptions: InMemorySelectionConfig) : ((Vault.Update<FungibleToken>) -> Unit) -> Unit { | ||
|
|
||
|
|
||
| override fun invoke( | ||
| onVaultUpdate: (Vault.Update<FungibleToken>) -> Unit | ||
| ) { | ||
| LOG.info("Starting async token loading from vault") | ||
|
|
||
| val classGraph = ClassGraph() | ||
| classGraph.enableClassInfo() | ||
|
|
||
| val scanResultFuture = CompletableFuture.supplyAsync { | ||
| classGraph.scan() | ||
| } | ||
|
|
||
| scanResultFuture.thenApplyAsync { scanResult -> | ||
| val subclasses: Set<Class<out FungibleToken>> = scanResult.getSubclasses(FungibleToken::class.java.canonicalName) | ||
| .map { it.name } | ||
| .map { Class.forName(it) as Class<out FungibleToken> }.toSet() | ||
|
|
||
| val enrichedClasses = (subclasses - setOf(FungibleToken::class.java)) | ||
| LOG.info("Enriching token query with types: $enrichedClasses") | ||
|
|
||
| val shouldLoop = AtomicBoolean(true) | ||
| val pageNumber = AtomicInteger(DEFAULT_PAGE_NUM - 1) | ||
| val loadingFutures: List<CompletableFuture<Void>> = 0.until(configOptions.loadingThreads).map { | ||
| CompletableFuture.runAsync { | ||
| try { | ||
| while (shouldLoop.get()) { | ||
| val newlyLoadedStates = appServiceHub.vaultService.queryBy<FungibleToken>( | ||
| paging = PageSpecification(pageNumber = pageNumber.addAndGet(1), pageSize = configOptions.pageSize), | ||
| criteria = QueryCriteria.VaultQueryCriteria(contractStateTypes = subclasses), | ||
| sorting = sortByTimeStampAscending() | ||
| ).states.toSet() | ||
| onVaultUpdate(Vault.Update(emptySet(), newlyLoadedStates)) | ||
| LOG.info("publishing ${newlyLoadedStates.size} to async state loading callback") | ||
| shouldLoop.compareAndSet(true, newlyLoadedStates.isNotEmpty()) | ||
| LOG.debug("shouldLoop=${shouldLoop}") | ||
| if (configOptions.sleep > 0) { | ||
| Thread.sleep(configOptions.sleep.toLong() * 1000) | ||
| } | ||
| } | ||
| } catch (t: Throwable) { | ||
| LOG.error("Token Loading Failed due to: ", t) | ||
| } | ||
| } | ||
| } | ||
| CompletableFuture.allOf(*loadingFutures.toTypedArray()).thenRunAsync { | ||
| LOG.info("finished token loading") | ||
| } | ||
| } | ||
| } | ||
|
|
||
| companion object { | ||
| val LOG = contextLogger() | ||
| } | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.