JLANG-39 HCOLL-214 refactored builders (leaved a single builder class), fixes in DataValueBytesMarshallers implementation

This commit is contained in:
leventov
2014-12-11 20:31:57 +07:00
parent 5e5b969bf2
commit 872d34e230
51 changed files with 1661 additions and 2619 deletions
@@ -32,8 +32,6 @@ import java.util.Map;
import java.util.concurrent.TimeoutException;
import java.util.concurrent.atomic.AtomicInteger;
import static net.openhft.chronicle.map.ChronicleMapBuilder.of;
/**
* @author Rob Austin.
*/
@@ -43,14 +41,9 @@ class ReplicationHubFindByName<K> implements FindByName {
public static final int MAP_BY_NAME_CHANNEL = 1;
private final AtomicInteger nextFreeChannel = new AtomicInteger(2);
private final Map<String, ChronicleMapBuilderWithChannelId> map;
private final Map<String, MapInstanceConfig> map;
private final ReplicationHub replicationHub;
public static class ChronicleMapBuilderWithChannelId<K, V> implements Serializable {
ChronicleHashBuilder<K, ChronicleMap<K, V>, ?> chronicleMapBuilder;
int channelId;
}
/**
* @throws IOException
*/
@@ -61,34 +54,35 @@ class ReplicationHubFindByName<K> implements FindByName {
this.replicationHub = replicationHub;
ReplicationChannel channel = replicationHub.createChannel((short) MAP_BY_NAME_CHANNEL);
final MapEventListener<CharSequence, ChronicleMapBuilderWithChannelId> listener = new
MapEventListener<CharSequence, ChronicleMapBuilderWithChannelId>() {
final MapEventListener<CharSequence, MapInstanceConfig> listener =
new MapEventListener<CharSequence, MapInstanceConfig>() {
// creates a map based on the details that are sent to the map of builders
@Override
public void onPut(CharSequence key, ChronicleMapBuilderWithChannelId value,
ChronicleMapBuilderWithChannelId replacedValue) {
public void onPut(CharSequence key, MapInstanceConfig value,
MapInstanceConfig replacedValue) {
super.onPut(key, value, replacedValue);
boolean added = replacedValue == null;
if (!added || value == null)
return;
// establish the new map based on this channel ID
LOG.info("create new map for name=" + value.chronicleMapBuilder.name()
+ ",channelId=" + value.channelId);
LOG.info("create new map for name=" + value.name
+ ",channelId=" + value.channel.channelId());
try {
toReplicatedViaChannel(value.chronicleMapBuilder, value.channelId).create();
toReplicatedViaChannel(value.mapBuilder, value.channel.channelId()).create();
} catch (IllegalStateException e) {
// channel is already created
LOG.debug("while creating channel for name=" + value.chronicleMapBuilder.name()
+ ",channelId=" + value.channelId, e);
LOG.debug("while creating channel for name=" + value.name
+ ",channelId=" + value.channel.channelId(), e);
} catch (IOException e) {
LOG.error("", e);
}
}
};
this.map = (Map) of(CharSequence.class, ChronicleMapBuilderWithChannelId.class)
this.map = (Map) ChronicleMapBuilder
.of(CharSequence.class, MapInstanceConfig.class)
.entrySize(3000)
.entries(128)
.eventListener(listener)
@@ -99,34 +93,32 @@ class ReplicationHubFindByName<K> implements FindByName {
LOG.debug("map=" + map);
}
public <T extends ChronicleHash> T create(ChronicleMapBuilder<CharSequence, CharSequence> builder) throws IllegalArgumentException,
IOException, TimeoutException, InterruptedException {
public <T extends ChronicleHash> T create(
MapInstanceConfig<CharSequence, CharSequence> config)
throws IOException, TimeoutException, InterruptedException {
int withChannelId = nextFreeChannel.incrementAndGet();
ChronicleMapBuilderWithChannelId builderWithChannelId = new
ChronicleMapBuilderWithChannelId();
builderWithChannelId.channelId = withChannelId;
builderWithChannelId.chronicleMapBuilder = (ChronicleHashBuilder)builder;
map.put(builder.name(), builderWithChannelId);
map.put(config.name,
config.replicatedViaChannel(replicationHub.createChannel(withChannelId)));
return (T) get(builder.name()).chronicleMapBuilder.create();
return (T) get(config.name).mapBuilder.create();
}
public <T extends ChronicleHash> T from(String name) throws IllegalArgumentException,
IOException, TimeoutException, InterruptedException {
return (T) replicatedViaChannel(name).create();
return (T) get(name).create();
}
ChronicleMapBuilderWithChannelId get(String name) throws IllegalArgumentException,
MapInstanceConfig get(String name) throws IllegalArgumentException,
TimeoutException,
InterruptedException {
ChronicleMapBuilderWithChannelId chronicleMapBuilder = waitTillEntryReceived(5000, name);
if (chronicleMapBuilder == null)
MapInstanceConfig config = waitTillEntryReceived(5000, name);
if (config == null)
throw new IllegalArgumentException("A map name=" + name + " can not be found.");
return chronicleMapBuilder;
return config;
}
/**
@@ -135,23 +127,19 @@ class ReplicationHubFindByName<K> implements FindByName {
* @param timeOutMs timeout in milliseconds
* @throws InterruptedException
*/
private ChronicleMapBuilderWithChannelId waitTillEntryReceived(final int timeOutMs, String name) throws TimeoutException, InterruptedException {
private MapInstanceConfig waitTillEntryReceived(final int timeOutMs, String name)
throws TimeoutException, InterruptedException {
int t = 0;
for (; t < timeOutMs; t++) {
ChronicleMapBuilderWithChannelId builder = map.get(name);
MapInstanceConfig config = map.get(name);
if (builder != null)
return builder;
if (config != null)
return config;
Thread.sleep(1);
}
throw new TimeoutException("timed out wait for map name=" + name);
}
private ChronicleHashInstanceConfig replicatedViaChannel(String name) throws TimeoutException, InterruptedException {
ChronicleMapBuilderWithChannelId builder = get(name);
return toReplicatedViaChannel(builder.chronicleMapBuilder, builder.channelId);
}
/**
* similar to {@link ChronicleMapBuilder#createPersistedTo(File file) }
*
@@ -163,9 +151,10 @@ class ReplicationHubFindByName<K> implements FindByName {
* @throws IOException
* @see ChronicleMapBuilder#createPersistedTo(File file)
*/
public <T extends ChronicleHash> T createPersistedTo(String name, File file) throws IllegalArgumentException,
public <T extends ChronicleHash> T createPersistedTo(String name, File file)
throws IllegalArgumentException,
IOException, TimeoutException, InterruptedException {
return (T) replicatedViaChannel(name).persistedTo(file).create();
return (T) get(name).persistedTo(file).create();
}
private ChronicleHashInstanceConfig toReplicatedViaChannel(ChronicleMapBuilder builder) {