SpringCloud/spring-cloud-app-broker
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Replacing InMemory Map data structure

Browse Source 
To avoid blocking from time to time: #313 this commit replaces the Map implementation by a ConcurrentSkipListMap, it might not be the most efficient way to store this information, but, considering the order of magnitude we are dealing with and, the fact that the reading time is around logaritmic, should be good enough for this use case.

[Finishes #313]
This commit is contained in:
Alberto Rios
2020-01-30 18:01:04 +01:00
committed by Roy Clarkson
parent d47b1502b9
commit f04ac8d380
4 changed files with 11 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
spring-cloud-app-broker-core/src/main/java/org/springframework/cloud/appbroker/state/InMemoryServiceInstanceBindingStateRepository.java
View File

@@ -20,18 +20,15 @@ import java.sql.Timestamp;
import java.time.Instant;
import java.util.Map;
import java.util.Objects;
import java.util.concurrent.ConcurrentHashMap;
import java.util.concurrent.ConcurrentSkipListMap;
import reactor.core.publisher.Mono;
import org.springframework.cloud.servicebroker.model.instance.OperationState;
/**
* @author Roy Clarkson
*/
public class InMemoryServiceInstanceBindingStateRepository implements ServiceInstanceBindingStateRepository {
private final Map<BindingKey, ServiceInstanceState> states = new ConcurrentHashMap<>();
private final Map<BindingKey, ServiceInstanceState> states = new ConcurrentSkipListMap<>();
@Override
public Mono<ServiceInstanceState> saveState(String serviceInstanceId, String bindingId, OperationState state,
@@ -76,7 +73,7 @@ public class InMemoryServiceInstanceBindingStateRepository implements ServiceIns
return Mono.fromCallable(() -> this.states.containsKey(bindingKey));
}
private static class BindingKey {
private static class BindingKey implements Comparable<BindingKey> {
private final String serviceInstanceId;
@@ -121,6 +118,12 @@ public class InMemoryServiceInstanceBindingStateRepository implements ServiceIns
'}';
}
@Override
public int compareTo(BindingKey other) {
int compare = this.serviceInstanceId.compareTo(other.serviceInstanceId);
return compare == 0 ? this.bindingId.compareTo(other.bindingId) : compare;
}
}
}

4
spring-cloud-app-broker-core/src/main/java/org/springframework/cloud/appbroker/state/InMemoryServiceInstanceStateRepository.java
View File

@@ -19,7 +19,7 @@ package org.springframework.cloud.appbroker.state;
import java.sql.Timestamp;
import java.time.Instant;
import java.util.Map;
import java.util.concurrent.ConcurrentHashMap;
import java.util.concurrent.ConcurrentSkipListMap;
import reactor.core.publisher.Mono;
@@ -27,7 +27,7 @@ import org.springframework.cloud.servicebroker.model.instance.OperationState;
public class InMemoryServiceInstanceStateRepository implements ServiceInstanceStateRepository {
private final Map<String, ServiceInstanceState> states = new ConcurrentHashMap<>();
private final Map<String, ServiceInstanceState> states = new ConcurrentSkipListMap<>();
@Override
public Mono<ServiceInstanceState> saveState(String serviceInstanceId, OperationState state, String description) {

3
spring-cloud-app-broker-core/src/test/java/org/springframework/cloud/appbroker/state/InMemoryServiceInstanceBindingStateRepositoryTest.java
View File

@@ -19,7 +19,6 @@ package org.springframework.cloud.appbroker.state;
import java.util.Calendar;
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Disabled;
import org.junit.jupiter.api.Test;
import reactor.core.publisher.Flux;
import reactor.core.scheduler.Schedulers;
@@ -29,8 +28,6 @@ import org.springframework.cloud.servicebroker.model.instance.OperationState;
import static org.assertj.core.api.Assertions.assertThat;
@Disabled
// See https://github.com/spring-cloud/spring-cloud-app-broker/issues/313
class InMemoryServiceInstanceBindingStateRepositoryTest {
private InMemoryServiceInstanceBindingStateRepository stateRepository;

3
spring-cloud-app-broker-core/src/test/java/org/springframework/cloud/appbroker/state/InMemoryServiceInstanceStateRepositoryTest.java
View File

@@ -19,7 +19,6 @@ package org.springframework.cloud.appbroker.state;
import java.util.Calendar;
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Disabled;
import org.junit.jupiter.api.Test;
import reactor.core.publisher.Flux;
import reactor.core.scheduler.Schedulers;
@@ -29,8 +28,6 @@ import org.springframework.cloud.servicebroker.model.instance.OperationState;
import static org.assertj.core.api.Assertions.assertThat;
@Disabled
// See https://github.com/spring-cloud/spring-cloud-app-broker/issues/313
class InMemoryServiceInstanceStateRepositoryTest {
private InMemoryServiceInstanceStateRepository stateRepository;