Tighten type of argument
Change-Id: I10acf305b48cfbec509bc0467af68644c5a8c5b3
Showing
1 changed file
with
5 additions
and
14 deletions
| ... | @@ -123,11 +123,12 @@ public class ConsistentResourceStore extends AbstractStore<ResourceEvent, Resour | ... | @@ -123,11 +123,12 @@ public class ConsistentResourceStore extends AbstractStore<ResourceEvent, Resour |
| 123 | TransactionalDiscreteResourceStore discreteTxStore = discreteStore.transactional(tx); | 123 | TransactionalDiscreteResourceStore discreteTxStore = discreteStore.transactional(tx); |
| 124 | TransactionalContinuousResourceStore continuousTxStore = continuousStore.transactional(tx); | 124 | TransactionalContinuousResourceStore continuousTxStore = continuousStore.transactional(tx); |
| 125 | for (Map.Entry<DiscreteResource, List<Resource>> entry : resourceMap.entrySet()) { | 125 | for (Map.Entry<DiscreteResource, List<Resource>> entry : resourceMap.entrySet()) { |
| 126 | - if (!lookup(discreteTxStore, continuousTxStore, entry.getKey().id()).isPresent()) { | 126 | + DiscreteResourceId parentId = entry.getKey().id(); |
| 127 | + if (!lookup(discreteTxStore, parentId).isPresent()) { | ||
| 127 | return abortTransaction(tx); | 128 | return abortTransaction(tx); |
| 128 | } | 129 | } |
| 129 | 130 | ||
| 130 | - if (!appendValues(discreteTxStore, continuousTxStore, entry.getKey().id(), entry.getValue())) { | 131 | + if (!appendValues(discreteTxStore, continuousTxStore, parentId, entry.getValue())) { |
| 131 | return abortTransaction(tx); | 132 | return abortTransaction(tx); |
| 132 | } | 133 | } |
| 133 | } | 134 | } |
| ... | @@ -413,19 +414,9 @@ public class ConsistentResourceStore extends AbstractStore<ResourceEvent, Resour | ... | @@ -413,19 +414,9 @@ public class ConsistentResourceStore extends AbstractStore<ResourceEvent, Resour |
| 413 | * @param id ID of resource to be checked | 414 | * @param id ID of resource to be checked |
| 414 | * @return the resource which is regarded as the same as the specified resource | 415 | * @return the resource which is regarded as the same as the specified resource |
| 415 | */ | 416 | */ |
| 416 | - // Naive implementation, which traverses all elements in the set when continuous resource | ||
| 417 | - // computational complexity: O(1) when discrete resource. O(n) when continuous resource | ||
| 418 | - // where n is the number of elements in the associated set | ||
| 419 | private Optional<Resource> lookup(TransactionalDiscreteResourceStore discreteTxStore, | 417 | private Optional<Resource> lookup(TransactionalDiscreteResourceStore discreteTxStore, |
| 420 | - TransactionalContinuousResourceStore continuousTxStore, | 418 | + DiscreteResourceId id) { |
| 421 | - ResourceId id) { | 419 | + return discreteTxStore.lookup(id); |
| 422 | - if (id instanceof DiscreteResourceId) { | ||
| 423 | - return discreteTxStore.lookup((DiscreteResourceId) id); | ||
| 424 | - } else if (id instanceof ContinuousResourceId) { | ||
| 425 | - return continuousTxStore.lookup((ContinuousResourceId) id); | ||
| 426 | - } else { | ||
| 427 | - return Optional.empty(); | ||
| 428 | - } | ||
| 429 | } | 420 | } |
| 430 | 421 | ||
| 431 | // internal use only | 422 | // internal use only | ... | ... |
-
Please register or login to post a comment