Merge lp:~pbeaman/akiban-server/persistit-3.2.9-changes into lp:~akiban-technologies/akiban-server/trunk

[Peter Beaman]

Minimal changes necessitated by Persistit Accumulator API changes proposed for Persistit 3.2.9. Note that the generic methods used by AccumulatorAdapter are deprecated in Persistit (and not removed specifically to avoid having to do more damage to the server code). Perhaps we should instead rethink the code structure, get rid of AccumulatorAdapter (or make one for each relevant subtype) and then get rid of the deprecated Persistit methods. Advice welcome.

[Nathan Williams (nwilliams)]

I have the code working in my branch fixing the logic, so I'll go ahead and incorporate the version bump there since it's touching a number of the same places.

Rethinking of AccumulatorAdapter is welcome, but I'd prefer another branch to reduce noise.

Unmerged revisions

2618. By Peter Beaman on 2013-04-10

Changes to support modified Accumulator API in Persistit 3.2.9

=== modified file 'pom.xml'
--- pom.xml	2013-04-05 15:56:11 +0000
+++ pom.xml	2013-04-10 21:15:25 +0000
@@ -100,7 +100,7 @@
         <dependency>
             <groupId>com.akiban</groupId>
             <artifactId>akiban-persistit</artifactId>
-            <version>3.2.8-SNAPSHOT</version>
+            <version>3.2.9-SNAPSHOT</version>
         </dependency>
         <dependency>
             <groupId>com.akiban</groupId>

=== modified file 'src/main/java/com/akiban/server/AccumulatorAdapter.java'
--- src/main/java/com/akiban/server/AccumulatorAdapter.java	2013-03-22 20:05:57 +0000
+++ src/main/java/com/akiban/server/AccumulatorAdapter.java	2013-04-10 21:15:25 +0000
@@ -32,13 +32,12 @@
     throws PersistitInterruptedException
     {
         Accumulator accumulator = getAccumulator(accumInfo, tree);
-        Transaction txn = getCurrentTrx(treeService);
-        return accumulator.getSnapshotValue(txn);
+        return accumulator.getSnapshotValue();
     }
 
     public static long updateAndGet(AccumInfo accumInfo, Exchange exchange, long value) {
         Accumulator accumulator = getAccumulator(accumInfo, exchange.getTree());
-        return accumulator.update(value, exchange.getTransaction());
+        return accumulator.update(value);
     }
     
     public static long getLiveValue(AccumInfo accumInfo, TreeService treeService, Tree tree)
@@ -48,11 +47,11 @@
     }
 
     public long getSnapshot() throws PersistitInterruptedException {
-        return accumulator.getSnapshotValue(getCurrentTrx());
+        return accumulator.getSnapshotValue();
     }
 
     public long updateAndGet(long value) {
-        return accumulator.update(value, getCurrentTrx());
+        return accumulator.update(value);
     }
 
     public long getLiveValue() {

=== modified file 'src/main/java/com/akiban/server/store/PersistitStoreSchemaManager.java'
--- src/main/java/com/akiban/server/store/PersistitStoreSchemaManager.java	2013-03-22 20:05:57 +0000
+++ src/main/java/com/akiban/server/store/PersistitStoreSchemaManager.java	2013-04-10 21:15:25 +0000
@@ -239,7 +239,6 @@
     private static final String DELAYED_TREE_KEY = "delayedTree";
 
     private static final int SCHEMA_GEN_ACCUM_INDEX = 0;
-    private static final Accumulator.Type SCHEMA_GEN_ACCUM_TYPE = Accumulator.Type.SEQ;
 
     // Changed from 1 to 2 due to incompatibility related to index row changes (see bug 985007)
     private static final int PROTOBUF_PSSM_VERSION = 2;
@@ -1474,7 +1473,7 @@
         final String SCHEMA = "pssm";
         Exchange ex = schemaTreeExchange(session, SCHEMA);
         try {
-            return ex.getTree().getAccumulator(SCHEMA_GEN_ACCUM_TYPE, SCHEMA_GEN_ACCUM_INDEX);
+            return ex.getTree().getSeqAccumulator(SCHEMA_GEN_ACCUM_INDEX);
         } finally {
             treeService.releaseExchange(session, ex);
         }
@@ -1482,7 +1481,7 @@
 
     private long getGenerationSnapshot(Session session) {
         try {
-            return getGenerationAccumulator(session).getSnapshotValue(treeService.getDb().getTransaction());
+            return getGenerationAccumulator(session).getSnapshotValue();
         } catch(PersistitException e) {
             throw wrapPersistitException(session, e);
         }
@@ -1491,7 +1490,7 @@
     private long getNextGeneration(Session session) {
         final int ACCUM_UPDATE_VALUE = 1;   // irrelevant for SEQ types
         try {
-            return getGenerationAccumulator(session).update(ACCUM_UPDATE_VALUE, treeService.getDb().getTransaction());
+            return getGenerationAccumulator(session).update(ACCUM_UPDATE_VALUE);
         } catch(PersistitException e) {
             throw wrapPersistitException(session, e);
         }