[Bigdata-commit] SF.net SVN: bigdata:[4569] branches/QUADS_QUERY_BRANCH/bigdata/src

[<tho...@us...>]

Revision: 4569
          http://bigdata.svn.sourceforge.net/bigdata/?rev=4569&view=rev
Author:   thompsonbry
Date:     2011-05-28 20:16:58 +0000 (Sat, 28 May 2011)

Log Message:
-----------
Bug fix to distributed transaction service snapshot introduced by the INT64_BRANCH

Modified Paths:
--------------
    branches/QUADS_QUERY_BRANCH/bigdata/src/java/com/bigdata/service/DistributedTransactionService.java
    branches/QUADS_QUERY_BRANCH/bigdata/src/test/com/bigdata/service/TestSnapshotHelper.java

Modified: branches/QUADS_QUERY_BRANCH/bigdata/src/java/com/bigdata/service/DistributedTransactionService.java
===================================================================
--- branches/QUADS_QUERY_BRANCH/bigdata/src/java/com/bigdata/service/DistributedTransactionService.java	2011-05-28 18:46:31 UTC (rev 4568)
+++ branches/QUADS_QUERY_BRANCH/bigdata/src/java/com/bigdata/service/DistributedTransactionService.java	2011-05-28 20:16:58 UTC (rev 4569)
@@ -308,7 +308,7 @@
             try {
 
                 // read most recent image.
-                final int entryCount = SnapshotHelper.read(commitTimeIndex,
+                final long entryCount = SnapshotHelper.read(commitTimeIndex,
                         file);
 
                 log.warn("Read snapshot: entryCount=" + entryCount + ", file="
@@ -459,7 +459,7 @@
      */
     public static class SnapshotHelper {
 
-        static public int read(CommitTimeIndex ndx, File file)
+        static public long read(CommitTimeIndex ndx, File file)
                 throws IOException {
 
             final FileInputStream is = new FileInputStream(file);
@@ -480,10 +480,10 @@
 
         }
         
-        static public int read(CommitTimeIndex ndx, DataInputStream is)
+        static public long read(CommitTimeIndex ndx, DataInputStream is)
                 throws IOException {
 
-            final int n = is.readInt();
+            final long n = is.readLong();
 
             for (int i = 0; i < n; i++) {
 

Modified: branches/QUADS_QUERY_BRANCH/bigdata/src/test/com/bigdata/service/TestSnapshotHelper.java
===================================================================
--- branches/QUADS_QUERY_BRANCH/bigdata/src/test/com/bigdata/service/TestSnapshotHelper.java	2011-05-28 18:46:31 UTC (rev 4568)
+++ branches/QUADS_QUERY_BRANCH/bigdata/src/test/com/bigdata/service/TestSnapshotHelper.java	2011-05-28 20:16:58 UTC (rev 4569)
@@ -62,19 +62,20 @@
 
         final File testFile = File.createTempFile(getName(), ".snapshot");
         
-        if (!testFile.delete()) {
+        try {
+        
+            if (!testFile.delete()) {
 
-            fail("Could not delete test file: " + testFile);
+                fail("Could not delete test file: " + testFile);
+                
+            }
             
-        }
-        
-        try {
-        
             // test empty snapshot.
             {
                 // populate and write.
                 {
-                    CommitTimeIndex ndx = CommitTimeIndex.createTransient();
+                    
+                    final CommitTimeIndex ndx = CommitTimeIndex.createTransient();
 
                     SnapshotHelper.write(ndx, testFile);
                 }
@@ -82,7 +83,7 @@
                 // read and verify.
                 {
 
-                    CommitTimeIndex ndx = CommitTimeIndex.createTransient();
+                    final CommitTimeIndex ndx = CommitTimeIndex.createTransient();
 
                     SnapshotHelper.read(ndx, testFile);
                     
@@ -99,23 +100,28 @@
                 
                 // populate and write.
                 {
-                    CommitTimeIndex ndx = CommitTimeIndex.createTransient();
+                    final CommitTimeIndex ndx = CommitTimeIndex.createTransient();
 
                     ndx.add(10L);
 
                     ndx.add(20L);
                     
-                    SnapshotHelper.write(ndx, testFile);
+                    final long nwritten = SnapshotHelper.write(ndx, testFile);
+                    
+                    assertEquals(2L, nwritten);
+                    
                 }
 
                 // read and verify.
                 {
 
-                    CommitTimeIndex ndx = CommitTimeIndex.createTransient();
+                    final CommitTimeIndex ndx = CommitTimeIndex.createTransient();
 
-                    SnapshotHelper.read(ndx, testFile);
+                    final long nread = SnapshotHelper.read(ndx, testFile);
+
+                    assertEquals(2L, nread);
                     
-                    assertEquals(new long[]{10,20},toArray(ndx));
+                    assertEquals(new long[] { 10, 20 }, toArray(ndx));
                     
                 }
 
@@ -137,7 +143,7 @@
      * 
      * @return The array.
      */
-    long[] toArray(CommitTimeIndex ndx) {
+    long[] toArray(final CommitTimeIndex ndx) {
         
         synchronized(ndx) {
             


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.