stepus53/dhfs
1
0
Fork 0
mirror of https://github.com/usatiuk/dhfs.git synced 2025-10-29 04:57:48 +01:00
Code Issues Packages Projects Releases Wiki Activity

slightly nicer tx dependency tracking

Browse Source
This commit is contained in:
Stepan Usatiuk
2024-12-07 16:58:23 +01:00
parent aa69ae13a4
commit b92877025f
6 changed files with 141 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

53
dhfs-parent/objects/src/main/java/com/usatiuk/dhfs/objects/JObjectManager.java
View File

@@ -24,6 +24,7 @@ import java.util.concurrent.locks.ReentrantReadWriteLock;
// Manages all access to com.usatiuk.objects.common.runtime.JData objects.
// In particular, it serves as a source of truth for what is committed to the backing storage.
// All data goes through it, it is responsible for transaction atomicity
// TODO: persistent tx id
@ApplicationScoped
public class JObjectManager {
@Inject
@@ -173,28 +174,26 @@ public class JObjectManager {
var toFlush = new LinkedList<TxRecord.TxObjectRecordWrite<?>>();
var toPut = new LinkedList<TxRecord.TxObjectRecordNew<?>>();
var toLock = new ArrayList<TxRecord.TxObjectRecordOptimistic<?>>();
var toLock = new ArrayList<TransactionObject<?>>();
var dependencies = new LinkedList<TransactionObject<?>>();
Log.trace("Committing transaction " + tx.getId());
// For existing objects:
// Check that their version is not higher than the version of transaction being committed
// TODO: check deletions, inserts
try {
for (var entry : tx.drain()) {
Log.trace("Processing entry " + entry.toString());
for (var entry : tx.writes()) {
Log.trace("Processing write " + entry.toString());
switch (entry) {
case TxRecord.TxObjectRecordCopyLock<?> copy -> {
toUnlock.add(copy.original().lock().writeLock()::unlock);
dependencies.add(copy.original());
if (copy.copy().isModified()) {
toFlush.add(copy);
}
toFlush.add(copy);
}
case TxRecord.TxObjectRecordOptimistic<?> copy -> {
toLock.add(copy);
dependencies.add(copy.original());
if (copy.copy().isModified()) {
toFlush.add(copy);
}
toLock.add(copy.original());
toFlush.add(copy);
}
case TxRecord.TxObjectRecordNew<?> created -> {
toPut.add(created);
@@ -203,21 +202,35 @@ public class JObjectManager {
}
}
toLock.sort(Comparator.comparingInt(a -> System.identityHashCode(a.original())));
for (var entry : tx.reads().entrySet()) {
Log.trace("Processing read " + entry.toString());
switch (entry.getValue()) {
case ReadTrackingObjectSource.TxReadObjectNone<?> none -> {
// TODO: Check this
}
case ReadTrackingObjectSource.TxReadObjectSome<?>(var obj) -> {
toLock.add(obj);
dependencies.add(obj);
}
default -> throw new IllegalStateException("Unexpected value: " + entry);
}
}
toLock.sort(Comparator.comparingInt(System::identityHashCode));
for (var record : toLock) {
Log.trace("Locking " + record.toString());
var got = getLocked(record.original().data().getClass(), record.original().data().getKey(), true);
var got = getLocked(record.data().getClass(), record.data().getKey(), true);
if (got == null) {
throw new IllegalStateException("Object " + record.original().data().getKey() + " not found");
throw new IllegalStateException("Object " + record.data().getKey() + " not found");
}
toUnlock.add(got.wrapper().lock.writeLock()::unlock);
if (got.obj() != record.original().data()) {
throw new IllegalStateException("Object changed during transaction: " + got.obj() + " vs " + record.original().data());
if (got.obj() != record.data()) {
throw new IllegalStateException("Object changed during transaction: " + got.obj() + " vs " + record.data());
}
}
@@ -244,9 +257,13 @@ public class JObjectManager {
}
for (var record : toFlush) {
if (!record.copy().isModified()) {
Log.trace("Not changed " + record.toString());
continue;
}
Log.trace("Flushing changed " + record.toString());
var current = _objects.get(record.original().data().getKey());
assert record.copy().isModified();
var newWrapper = new JDataWrapper<>(record.copy().wrapped());
newWrapper.lock.writeLock().lock();

2
dhfs-parent/objects/src/main/java/com/usatiuk/dhfs/objects/TransactionManagerImpl.java
View File

@@ -45,7 +45,7 @@ public class TransactionManagerImpl implements TransactionManager {
@Override
public void rollback() {
var tx = _currentTransaction.get();
for (var o : tx.drain()) {
for (var o : tx.writes()) {
switch (o) {
case TxRecord.TxObjectRecordCopyLock<?> r -> r.original().lock().writeLock().unlock();
default -> {

83
dhfs-parent/objects/src/main/java/com/usatiuk/dhfs/objects/transaction/ReadTrackingObjectSource.java Normal file
View File

@@ -0,0 +1,83 @@
package com.usatiuk.dhfs.objects.transaction;
import com.usatiuk.objects.common.runtime.JData;
import com.usatiuk.objects.common.runtime.JObjectKey;
import java.util.Collections;
import java.util.HashMap;
import java.util.Map;
import java.util.Optional;
public class ReadTrackingObjectSource implements TransactionObjectSource {
private final TransactionObjectSource _delegate;
public interface TxReadObject<T extends JData> {}
public record TxReadObjectNone<T extends JData>() implements TxReadObject<T> {}
public record TxReadObjectSome<T extends JData>(TransactionObject<T> obj) implements TxReadObject<T> {}
private final Map<JObjectKey, TxReadObject<?>> _readSet = new HashMap<>();
public ReadTrackingObjectSource(TransactionObjectSource delegate) {
_delegate = delegate;
}
public Map<JObjectKey, TxReadObject<?>> getRead() {
return Collections.unmodifiableMap(_readSet);
}
@Override
public <T extends JData> Optional<TransactionObject<T>> get(Class<T> type, JObjectKey key) {
var got = _readSet.get(key);
if (got == null) {
var read = _delegate.get(type, key);
if (read.isPresent()) {
_readSet.put(key, new TxReadObjectSome<>(read.get()));
} else {
_readSet.put(key, new TxReadObjectNone<>());
}
return read;
}
return switch (got) {
case TxReadObjectNone<?> none -> Optional.empty();
case TxReadObjectSome<?> some -> {
if (type.isInstance(some.obj().data())) {
yield Optional.of((TransactionObject<T>) some.obj());
} else {
yield Optional.empty();
}
}
default -> throw new IllegalStateException("Unexpected value: " + got);
};
}
@Override
public <T extends JData> Optional<TransactionObject<T>> getWriteLocked(Class<T> type, JObjectKey key) {
var got = _readSet.get(key);
if (got == null) {
var read = _delegate.getWriteLocked(type, key);
if (read.isPresent()) {
_readSet.put(key, new TxReadObjectSome<>(read.get()));
} else {
_readSet.put(key, new TxReadObjectNone<>());
}
return read;
}
return switch (got) {
case TxReadObjectNone<?> none -> Optional.empty();
case TxReadObjectSome<?> some -> {
if (type.isInstance(some.obj().data())) {
yield Optional.of((TransactionObject<T>) some.obj());
} else {
yield Optional.empty();
}
}
default -> throw new IllegalStateException("Unexpected value: " + got);
};
}
}

11
dhfs-parent/objects/src/main/java/com/usatiuk/dhfs/objects/transaction/TransactionFactoryImpl.java
View File

@@ -18,13 +18,13 @@ public class TransactionFactoryImpl implements TransactionFactory {
private class TransactionImpl implements TransactionPrivate {
@Getter(AccessLevel.PUBLIC)
private final long _id;
private final TransactionObjectSource _source;
private final ReadTrackingObjectSource _source;
private final Map<JObjectKey, TxRecord.TxObjectRecord<?>> _objects = new HashMap<>();
private TransactionImpl(long id, TransactionObjectSource source) {
_id = id;
_source = source;
_source = new ReadTrackingObjectSource(source);
}
@Override
@@ -75,9 +75,14 @@ public class TransactionFactoryImpl implements TransactionFactory {
}
@Override
public Collection<TxRecord.TxObjectRecord<?>> drain() {
public Collection<TxRecord.TxObjectRecord<?>> writes() {
return Collections.unmodifiableCollection(_objects.values());
}
@Override
public Map<JObjectKey, ReadTrackingObjectSource.TxReadObject<?>> reads() {
return _source.getRead();
}
}
@Override

9
dhfs-parent/objects/src/main/java/com/usatiuk/dhfs/objects/transaction/TransactionPrivate.java
View File

@@ -1,8 +1,13 @@
package com.usatiuk.dhfs.objects.transaction;
import com.usatiuk.objects.common.runtime.JObjectKey;
import java.util.Collection;
import java.util.Map;
// The transaction interface actually used by user code to retrieve objects
public interface TransactionPrivate extends Transaction{
Collection<TxRecord.TxObjectRecord<?>> drain();
public interface TransactionPrivate extends Transaction {
Collection<TxRecord.TxObjectRecord<?>> writes();
Map<JObjectKey, ReadTrackingObjectSource.TxReadObject<?>> reads();
}

7
dhfs-parent/objects/src/main/java/com/usatiuk/dhfs/objects/transaction/TxRecord.java
View File

@@ -9,6 +9,13 @@ public class TxRecord {
T getIfStrategyCompatible(JObjectKey key, LockingStrategy strategy);
}
public record TxObjectRecordMissing<T extends JData>(JObjectKey key) implements TxObjectRecord<T> {
@Override
public T getIfStrategyCompatible(JObjectKey key, LockingStrategy strategy) {
return null;
}
}
public interface TxObjectRecordWrite<T extends JData> extends TxObjectRecord<T> {
TransactionObject<T> original();