Alawn/Chronicle-Map
1
0
Fork 0
mirror of https://github.com/OpenHFT/Chronicle-Map.git synced 2021-09-13 01:26:12 +00:00
Code Releases Activity

Completely file disable locking if property is set, closes https://github.com/OpenHFT/Chronicle-Map/issues/276

Browse Source
This commit is contained in:
Ivan Rakov
2021-06-04 17:35:31 +03:00
parent c2be10fb3b
commit f87af8ad78
1 changed files with 7 additions and 34 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/main/java/net/openhft/chronicle/map/ChronicleMapBuilder.java
+7 -34
View File
@@ -54,7 +54,6 @@ import java.lang.reflect.InvocationTargetException;
import java.lang.reflect.Modifier;
import java.nio.ByteBuffer;
import java.nio.channels.FileChannel;
import java.nio.channels.FileLock;
import java.util.HashMap;
import java.util.Map;
import java.util.concurrent.ConcurrentHashMap;
@@ -480,32 +479,6 @@ public final class ChronicleMapBuilder<K, V> implements
return (long) v;
}
/**
* When Chronicle Maps are created using {@link #createPersistedTo(File)} or
* {@link #recoverPersistedTo(File, boolean)} or {@link
* #createOrRecoverPersistedTo(File, boolean)} methods, file lock on the Chronicle Map's file is
* acquired, that shouldn't be done from concurrent threads within the same JVM process. So
* creation of Chronicle Maps persisted to the same File should be synchronized across JVM's
* threads. Simple way would be to synchronize on some static (lock) object, but would serialize
* all Chronicle Maps creations (persisted to any files), ConcurrentHashMap#compute() gives more
* scalability. ConcurrentHashMap is used effectively for lock striping only, because the
* entries are not even landing the map, because compute() always returns null.
*/
private static void fileLockedIO(@NotNull final File file,
@NotNull final FileChannel fileChannel,
@NotNull final FileIOAction fileIOAction) {
FILE_LOCKING_CONTROL.compute(file, (k, v) -> {
try {
try (FileLock ignored = fileChannel.lock()) {
fileIOAction.fileIOAction();
}
return null;
} catch (IOException e) {
throw Jvm.rethrow(e);
}
});
}
private boolean isKeySizeKnown() {
return keyBuilder.sizeIsStaticallyKnown;
}
@@ -1722,7 +1695,9 @@ public final class ChronicleMapBuilder<K, V> implements
final AtomicBoolean newFile = new AtomicBoolean();
final FileChannel fileChannel = raf.getChannel();
fileLockedIO(canonicalFile, fileChannel, () -> {
FileLockUtil.acquireExclusiveFileLock(canonicalFile, fileChannel);
try {
if (raf.length() == 0) {
map.set(newMap());
headerBuffer.set(writeHeader(fileChannel, map.get()));
@@ -1730,7 +1705,10 @@ public final class ChronicleMapBuilder<K, V> implements
} else {
newFile.set(false);
}
});
}
finally {
FileLockUtil.releaseFileLock(canonicalFile);
}
if (newFile.get()) {
final int headerSize = headerBuffer.get().remaining();
@@ -2026,11 +2004,6 @@ public final class ChronicleMapBuilder<K, V> implements
private enum ChecksumEntries {YES, NO, IF_PERSISTED}
@FunctionalInterface
private interface FileIOAction {
void fileIOAction() throws IOException;
}
private static final class EntrySizeInfo {
private final double averageEntrySize;
private final int worstAlignment;