You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@accumulo.apache.org by ec...@apache.org on 2014/03/25 15:44:18 UTC

[1/5] git commit: ACCUMULO-2543 close the cacheblock

Repository: accumulo
Updated Branches:
  refs/heads/master 2412419af -> b40ce8e58


ACCUMULO-2543 close the cacheblock


Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo
Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/1970b58d
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/1970b58d
Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/1970b58d

Branch: refs/heads/master
Commit: 1970b58dbf0877cc425097e5895ac680432e0a6d
Parents: 9f6cc39
Author: Eric C. Newton <er...@gmail.com>
Authored: Tue Mar 25 10:37:52 2014 -0400
Committer: Eric C. Newton <er...@gmail.com>
Committed: Tue Mar 25 10:37:52 2014 -0400

----------------------------------------------------------------------
 .../java/org/apache/accumulo/core/file/rfile/BlockIndexTest.java  | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/accumulo/blob/1970b58d/core/src/test/java/org/apache/accumulo/core/file/rfile/BlockIndexTest.java
----------------------------------------------------------------------
diff --git a/core/src/test/java/org/apache/accumulo/core/file/rfile/BlockIndexTest.java b/core/src/test/java/org/apache/accumulo/core/file/rfile/BlockIndexTest.java
index 4a78fb7..f293718 100644
--- a/core/src/test/java/org/apache/accumulo/core/file/rfile/BlockIndexTest.java
+++ b/core/src/test/java/org/apache/accumulo/core/file/rfile/BlockIndexTest.java
@@ -112,6 +112,7 @@ public class BlockIndexTest {
       Assert.assertEquals(rk.getKey(), new Key(RFileTest.nf("", row + 1), "cf1", "cq1"));
 
     }
+    cacheBlock.close();
   }
 
   @Test
@@ -170,6 +171,6 @@ public class BlockIndexTest {
       
       Assert.assertTrue(rk.getKey().compareTo(seekKey) <= 0);
     }
-
+    cacheBlock.close();
   }
 }


[5/5] git commit: Merge branch '1.6.0-SNAPSHOT'

Posted by ec...@apache.org.
Merge branch '1.6.0-SNAPSHOT'


Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo
Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/b40ce8e5
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/b40ce8e5
Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/b40ce8e5

Branch: refs/heads/master
Commit: b40ce8e58c66012b02f4b27ab755ce1d4e769adc
Parents: 0f9eb88 fd99e24
Author: Eric C. Newton <er...@gmail.com>
Authored: Tue Mar 25 10:41:37 2014 -0400
Committer: Eric C. Newton <er...@gmail.com>
Committed: Tue Mar 25 10:41:37 2014 -0400

----------------------------------------------------------------------

----------------------------------------------------------------------



[4/5] git commit: Merge branch '1.5.2-SNAPSHOT' into 1.6.0-SNAPSHOT

Posted by ec...@apache.org.
Merge branch '1.5.2-SNAPSHOT' into 1.6.0-SNAPSHOT


Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo
Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/fd99e24d
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/fd99e24d
Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/fd99e24d

Branch: refs/heads/master
Commit: fd99e24dc32be49433476be85893138296ec5cbf
Parents: 1970b58 ba48f03
Author: Eric C. Newton <er...@gmail.com>
Authored: Tue Mar 25 10:41:22 2014 -0400
Committer: Eric C. Newton <er...@gmail.com>
Committed: Tue Mar 25 10:41:22 2014 -0400

----------------------------------------------------------------------

----------------------------------------------------------------------



[3/5] git commit: ACCUMULO-2543 close the cacheblock

Posted by ec...@apache.org.
ACCUMULO-2543 close the cacheblock


Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo
Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/ba48f030
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/ba48f030
Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/ba48f030

Branch: refs/heads/master
Commit: ba48f030b1c3f8b249b32f55e9a6b952da28c178
Parents: e6748a8
Author: Eric C. Newton <er...@gmail.com>
Authored: Tue Mar 25 10:37:52 2014 -0400
Committer: Eric C. Newton <er...@gmail.com>
Committed: Tue Mar 25 10:41:06 2014 -0400

----------------------------------------------------------------------
 .../java/org/apache/accumulo/core/file/rfile/BlockIndexTest.java  | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/accumulo/blob/ba48f030/core/src/test/java/org/apache/accumulo/core/file/rfile/BlockIndexTest.java
----------------------------------------------------------------------
diff --git a/core/src/test/java/org/apache/accumulo/core/file/rfile/BlockIndexTest.java b/core/src/test/java/org/apache/accumulo/core/file/rfile/BlockIndexTest.java
index 4a78fb7..f293718 100644
--- a/core/src/test/java/org/apache/accumulo/core/file/rfile/BlockIndexTest.java
+++ b/core/src/test/java/org/apache/accumulo/core/file/rfile/BlockIndexTest.java
@@ -112,6 +112,7 @@ public class BlockIndexTest {
       Assert.assertEquals(rk.getKey(), new Key(RFileTest.nf("", row + 1), "cf1", "cq1"));
 
     }
+    cacheBlock.close();
   }
 
   @Test
@@ -170,6 +171,6 @@ public class BlockIndexTest {
       
       Assert.assertTrue(rk.getKey().compareTo(seekKey) <= 0);
     }
-
+    cacheBlock.close();
   }
 }


[2/5] git commit: Merge branch '1.6.0-SNAPSHOT'

Posted by ec...@apache.org.
Merge branch '1.6.0-SNAPSHOT'


Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo
Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/0f9eb884
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/0f9eb884
Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/0f9eb884

Branch: refs/heads/master
Commit: 0f9eb884a65df02e6cebc6c2b9956e455d303cd5
Parents: 2412419 1970b58
Author: Eric C. Newton <er...@gmail.com>
Authored: Tue Mar 25 10:38:19 2014 -0400
Committer: Eric C. Newton <er...@gmail.com>
Committed: Tue Mar 25 10:38:19 2014 -0400

----------------------------------------------------------------------
 .../java/org/apache/accumulo/core/file/rfile/BlockIndexTest.java  | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)
----------------------------------------------------------------------