andreacavalli
/
strangedb-core
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Removed references locks

This commit is contained in:
Andrea Cavalli 2019-04-24 01:10:43 +02:00
parent 7fd7497464
commit f030a96608
2 changed files with 20 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
src/main/java/it/cavallium/strangedb/database/references/DatabaseReferencesMetadata.java
View File

@ -110,14 +110,9 @@ public class DatabaseReferencesMetadata implements IReferencesMetadata {
@Override @Override
public long newReference(long index, int size) throws IOException { public long newReference(long index, int size) throws IOException {
lock.writeLock().lock();
long newReference; long newReference;
try { newReference = firstFreeReference.getAndIncrement();
newReference = firstFreeReference.getAndIncrement(); cache.put(newReference, new ReferenceInfo(index, size, BLANK_DATA_CLEANER), true, true);
cache.put(newReference, new ReferenceInfo(index, size, BLANK_DATA_CLEANER), true);
} finally {
lock.writeLock().unlock();
}
return newReference; return newReference;
} }
@ -125,7 +120,7 @@ public class DatabaseReferencesMetadata implements IReferencesMetadata {
public void editReference(long reference, ReferenceInfo info) throws IOException { public void editReference(long reference, ReferenceInfo info) throws IOException {
lock.writeLock().lock(); lock.writeLock().lock();
try { try {
cache.put(reference, info, true); cache.put(reference, info, true, false);
} finally { } finally {
lock.writeLock().unlock(); lock.writeLock().unlock();
} }
@ -135,7 +130,7 @@ public class DatabaseReferencesMetadata implements IReferencesMetadata {
public void deleteReference(long reference) throws IOException { public void deleteReference(long reference) throws IOException {
lock.writeLock().lock(); lock.writeLock().lock();
try { try {
cache.put(reference, NONEXISTENT_REFERENCE_INFO, true); cache.put(reference, NONEXISTENT_REFERENCE_INFO, true, false);
} finally { } finally {
lock.writeLock().unlock(); lock.writeLock().unlock();
} }

21
src/main/java/it/cavallium/strangedb/database/references/DatabaseReferencesMetadataCache.java
View File

@ -44,20 +44,31 @@ public class DatabaseReferencesMetadataCache {
} }
} }
public void put(long reference, ReferenceInfo info, boolean modified) throws IOException { public void put(long reference, ReferenceInfo info, boolean isModified, boolean isNew) throws IOException {
if (closed) throw new IOException("Cache already closed!"); if (closed) throw new IOException("Cache already closed!");
lock.writeLock().lock(); if (isNew) {
lock.readLock().lock();
} else {
lock.writeLock().lock();
}
try { try {
if (info.getCleanerId() == 0) { if (info.getCleanerId() == 0) {
throw new IOException("Null cleaner id"); throw new IOException("Null cleaner id");
} }
referencesInfos.put(reference, info); referencesInfos.put(reference, info);
if (modified) { if (isModified) {
modifiedInfos.put(reference, info); modifiedInfos.put(reference, info);
} }
flush(); // If it's new you can't flush because you have only the read permission
if (!isNew) {
flush();
}
} finally { } finally {
lock.writeLock().unlock(); if (isNew) {
lock.readLock().unlock();
} else {
lock.writeLock().unlock();
}
} }
} }