Fix compilation issues

This commit is contained in:
leventov
2015-06-15 22:00:06 +03:00
parent 413f016898
commit 0c73a072eb
7 changed files with 10 additions and 58 deletions
@@ -194,7 +194,8 @@ public abstract class VanillaChronicleHash<K, KI, MKI extends MetaBytesInterop<K
}
public final void createMappedStoreAndSegments(File file) throws IOException {
OS.warnOnWindows(sizeInBytes());
// TODO this method had been moved -- not clear where
//OS.warnOnWindows(sizeInBytes());
createMappedStoreAndSegments(new MappedStore(file, FileChannel.MapMode.READ_WRITE,
sizeInBytes(), BytesMarshallableSerializer.create()));
}
@@ -18,7 +18,7 @@
package net.openhft.chronicle.map;
import net.openhft.chronicle.core.util.CloseablesManager;
import net.openhft.chronicle.core.io.CloseablesManager;
import net.openhft.chronicle.hash.replication.ReplicableEntry;
import net.openhft.chronicle.hash.replication.ThrottlingConfig;
import net.openhft.lang.io.ByteBufferBytes;
@@ -1360,9 +1360,10 @@ public final class ChronicleMapBuilder<K, V> implements
try {
// pushingToMapEventListener();
VanillaChronicleMap<K, ?, ?, V, ?, ?, ?> map = newMap(singleHashReplication, channel);
if(OS.warnOnWindows(map.sizeInBytes())){
throw new IllegalStateException("Windows cannot support this configuration");
}
// TODO this method had been moved
// if(OS.warnOnWindows(map.sizeInBytes())){
// throw new IllegalStateException("Windows cannot support this configuration");
// }
BytesStore bytesStore = new DirectStore(JDKObjectSerializer.INSTANCE,
map.sizeInBytes(), true);
map.createMappedStoreAndSegments(bytesStore);
@@ -1,51 +0,0 @@
package net.openhft.chronicle.map;
import net.openhft.chronicle.network.connection.AbstactStatelessClient;
import net.openhft.chronicle.network.connection.ClientWiredStatelessTcpConnectionHub;
import net.openhft.chronicle.wire.CoreFields;
import net.openhft.chronicle.wire.ParameterizeWireKey;
import net.openhft.chronicle.wire.ValueIn;
import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable;
import java.util.function.Function;
/**
* Created by Rob Austin
*/
public abstract class MapStatelessClient<E extends ParameterizeWireKey> extends AbstactStatelessClient<E> {
/**
* @param channelName
* @param hub
* @param type the type of wire handler for example "MAP" or "QUEUE"
* @param cid used by proxies such as the entry-set
*/
public MapStatelessClient(@NotNull String channelName,
@NotNull ClientWiredStatelessTcpConnectionHub hub,
@NotNull String type,
long cid) {
super(channelName, hub, type, cid);
}
@Nullable
protected <R> R proxyReturnTypedObject(
@NotNull final E eventId,
R usingValue,
@NotNull final Class<R> resultType,
@Nullable Object... args) {
Function<ValueIn, R> consumerIn = resultType == CharSequence.class && usingValue != null
? f -> {
f.textTo((StringBuilder) usingValue);
return usingValue;
}
: f -> f.object(resultType);
return proxyReturnWireConsumerInOut(eventId,
CoreFields.reply,
toParameters(eventId, args),
consumerIn);
}
}
@@ -442,7 +442,7 @@ public class ReplicatedChronicleMap<K, KI, MKI extends MetaBytesInterop<K, ? sup
try (CompiledReplicatedMapQueryContext<K, KI, MKI, V, VI, MVI, R, ?> remoteOpContext =
mapContext()) {
remoteOpContext.initReplicationInput(source);
//remoteOpContext.processReplicatedEvent();
remoteOpContext.processReplicatedEvent();
}
}
@@ -19,7 +19,7 @@
package net.openhft.chronicle.map;
import net.openhft.chronicle.bytes.IORuntimeException;
import net.openhft.chronicle.core.util.CloseablesManager;
import net.openhft.chronicle.core.io.CloseablesManager;
import net.openhft.chronicle.hash.Data;
import net.openhft.chronicle.hash.function.SerializableFunction;
import net.openhft.chronicle.hash.impl.util.BuildVersion;