From 068e80de15a882470813c1cbac09df1cc9d87a21 Mon Sep 17 00:00:00 2001 From: cotton-ben Date: Sun, 3 May 2020 06:32:18 -0400 Subject: [PATCH] clarifying small nuances in jeremy's coding of the "Will Chronicle accommodate the 'dirty read intolerant' ACID zealots" --- .../map/acid/ChronicleAcidIsolation.java | 2 - .../acid/ChronicleAcidIsolationGovernor.java | 51 ++++++++++++------- .../fromdocs/acid/DirtyReadIntolerant.java | 2 +- .../map/fromdocs/acid/DirtyReadOffender.java | 16 +++--- .../map/fromdocs/acid/DirtyReadVictim.java | 2 +- 5 files changed, 43 insertions(+), 30 deletions(-) diff --git a/src/main/java/net/openhft/chronicle/map/acid/ChronicleAcidIsolation.java b/src/main/java/net/openhft/chronicle/map/acid/ChronicleAcidIsolation.java index 4a8cc66ff..380066313 100644 --- a/src/main/java/net/openhft/chronicle/map/acid/ChronicleAcidIsolation.java +++ b/src/main/java/net/openhft/chronicle/map/acid/ChronicleAcidIsolation.java @@ -12,7 +12,5 @@ public interface ChronicleAcidIsolation extends java.sql.Connection{ int REPEATABLE_READS_MANDATORY = ChronicleAcidIsolation.TRANSACTION_REPEATABLE_READ; int PHANTOM_READ_INTOLERANT = ChronicleAcidIsolation.TRANSACTION_SERIALIZABLE; - - } diff --git a/src/main/java/net/openhft/chronicle/map/acid/ChronicleAcidIsolationGovernor.java b/src/main/java/net/openhft/chronicle/map/acid/ChronicleAcidIsolationGovernor.java index 814535f06..fa5854366 100644 --- a/src/main/java/net/openhft/chronicle/map/acid/ChronicleAcidIsolationGovernor.java +++ b/src/main/java/net/openhft/chronicle/map/acid/ChronicleAcidIsolationGovernor.java @@ -15,30 +15,34 @@ import java.util.Properties; import java.util.concurrent.Executor; public class ChronicleAcidIsolationGovernor implements ChronicleAcidIsolation { - private int transactionIsolation; - private ChronicleMap transactionIsolationMap; //to demo in same JVM at first - private ChronicleMap compositeChronicleMap; //hacked in + + private ChronicleMap transactionIsolationMap; + private ChronicleMap compositeChronicleMap; //hacked in, not generic private String priorCusip; private Double priorCoupon; public synchronized void put(String cusip, BondVOInterface bond) throws Exception { + + ChronicleMap cMap = this.getCompositeChronicleMap(); this.priorCusip = cusip; - this.priorCoupon = this.getCompositeChronicleMap().get(cusip).getCoupon(); - this.getTransactionIsolationMap().put(Thread.currentThread(), this.getTransactionIsolation()); - bond.setCoupon(priorCoupon + 0.5); + this.priorCoupon = cMap.get(cusip).getCoupon(); + + bond.setCoupon(priorCoupon + 0.001); this.getCompositeChronicleMap().put(cusip, bond); } //here is where the drama happens - public synchronized BondVOInterface get(String cusip) throws InterruptedException { + public synchronized BondVOInterface get(String cusip) throws Exception { BondVOInterface b = null; - if (this.getTransactionIsolationMap().size() > 1) { //other ACID transactions are active - if (this.getTransactionIsolationMap().get(Thread.currentThread()) <= ChronicleAcidIsolation.DIRTY_READ_OPTIMISTIC) { + Thread tx = Thread.currentThread(); + ChronicleMap txMap = this.getTransactionIsolationMap(); + if (txMap.size() > 1) { //other ACID transactions are active + if (txMap.get(tx) <= ChronicleAcidIsolation.DIRTY_READ_OPTIMISTIC) { b = this.compositeChronicleMap.get(cusip); - } else if (this.getTransactionIsolationMap().get(Thread.currentThread()) >= ChronicleAcidIsolation.DIRTY_READ_INTOLERANT) { + } else if (txMap.get(tx) >= ChronicleAcidIsolation.DIRTY_READ_INTOLERANT) { this.wait(); b = this.compositeChronicleMap.get(cusip); } @@ -50,6 +54,7 @@ public class ChronicleAcidIsolationGovernor implements ChronicleAcidIsolation { } public ChronicleMap getTransactionIsolationMap() { + return transactionIsolationMap; } @@ -58,24 +63,34 @@ public class ChronicleAcidIsolationGovernor implements ChronicleAcidIsolation { } public ChronicleMap getCompositeChronicleMap() { + return compositeChronicleMap; } - public void setCompositeChronicleMap(ChronicleMap compositeChronicleMap) { - this.compositeChronicleMap = compositeChronicleMap; + public void setCompositeChronicleMap(ChronicleMap ccm) { + + this.compositeChronicleMap = ccm; } @Override public void setTransactionIsolation(int level) throws SQLException { - this.transactionIsolation = level; + + this.getTransactionIsolationMap().put( + Thread.currentThread(), + level + ); } @Override public int getTransactionIsolation() throws SQLException { - return this.transactionIsolation; + + int iL = this.getTransactionIsolationMap().get(Thread.currentThread()); + return(iL); } + @Override public synchronized void commit() throws SQLException { + this.getTransactionIsolationMap().remove(Thread.currentThread()); this.notifyAll(); @@ -89,6 +104,10 @@ public class ChronicleAcidIsolationGovernor implements ChronicleAcidIsolation { this.getTransactionIsolationMap().remove(Thread.currentThread()); this.notifyAll(); } + // rest of these java.sql.Connection methods remain unimplemented ... + // pedantics are too + // intense. In the real world, even in Captital Markets 'dirty read' intolerance + // is likely the only isolation level Chronicle would accommodate. @Override @@ -113,10 +132,6 @@ public class ChronicleAcidIsolationGovernor implements ChronicleAcidIsolation { } - // rest of these java.sql.Connection methods remain unimplemented ... - // pedantics are too - // intense. In the real world, even in Captital Markets 'dirty read' intolerance - // is likely the only isolation level Chronicle would accommodate. @Override public Statement createStatement() throws SQLException { diff --git a/src/test/java/net/openhft/chronicle/map/fromdocs/acid/DirtyReadIntolerant.java b/src/test/java/net/openhft/chronicle/map/fromdocs/acid/DirtyReadIntolerant.java index bf77c124a..725ca1245 100644 --- a/src/test/java/net/openhft/chronicle/map/fromdocs/acid/DirtyReadIntolerant.java +++ b/src/test/java/net/openhft/chronicle/map/fromdocs/acid/DirtyReadIntolerant.java @@ -19,7 +19,7 @@ import static net.openhft.chronicle.values.Values.newNativeReference; public class DirtyReadIntolerant { - public static void main(String... ignored) throws IOException, SQLException { + public static void main(String... ignored) throws Exception { ChronicleMap operand = DirtyReadIntolerant.acquireChronicleMapOperand( diff --git a/src/test/java/net/openhft/chronicle/map/fromdocs/acid/DirtyReadOffender.java b/src/test/java/net/openhft/chronicle/map/fromdocs/acid/DirtyReadOffender.java index 095893dd4..f8dcd720a 100644 --- a/src/test/java/net/openhft/chronicle/map/fromdocs/acid/DirtyReadOffender.java +++ b/src/test/java/net/openhft/chronicle/map/fromdocs/acid/DirtyReadOffender.java @@ -10,14 +10,14 @@ import static net.openhft.chronicle.values.Values.newNativeReference; public class DirtyReadOffender implements Runnable { - ChronicleAcidIsolationGovernor craig; + ChronicleAcidIsolationGovernor chraig; public ChronicleAcidIsolationGovernor getCraig() { - return craig; + return chraig; } public void setCraig(ChronicleAcidIsolationGovernor craig) { - this.craig = craig; + this.chraig = craig; } @@ -26,14 +26,14 @@ public class DirtyReadOffender implements Runnable { try { BondVOInterface bond = newNativeReference(BondVOInterface.class); - craig.getCompositeChronicleMap().acquireUsing("369604101", bond); - craig.setTransactionIsolation(ChronicleAcidIsolation.LOWEST_LATENCY); + chraig.getCompositeChronicleMap().acquireUsing("369604101", bond); + chraig.setTransactionIsolation(ChronicleAcidIsolation.LOWEST_LATENCY); bond.setCoupon(4.55); - craig.put("369604101",bond); - craig.commit(); + chraig.put("369604101",bond); + chraig.commit(); } catch (Exception throwables) { try { - craig.rollback(); + chraig.rollback(); } catch (SQLException e) { e.printStackTrace(); } diff --git a/src/test/java/net/openhft/chronicle/map/fromdocs/acid/DirtyReadVictim.java b/src/test/java/net/openhft/chronicle/map/fromdocs/acid/DirtyReadVictim.java index f5901380b..b574e6b9a 100644 --- a/src/test/java/net/openhft/chronicle/map/fromdocs/acid/DirtyReadVictim.java +++ b/src/test/java/net/openhft/chronicle/map/fromdocs/acid/DirtyReadVictim.java @@ -27,7 +27,7 @@ public class DirtyReadVictim implements Runnable { BondVOInterface bond = newNativeReference(BondVOInterface.class); craig.getCompositeChronicleMap().acquireUsing("369604101", bond); - craig.setTransactionIsolation(ChronicleAcidIsolation.DIRTY_READ_INTOLERANT); //start tx + craig.setTransactionIsolation(ChronicleAcidIsolation.DIRTY_READ_INTOLERANT); bond = craig.getCompositeChronicleMap().get("369604101"); Double coupon = bond.getCoupon(); craig.commit();