accumulo-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From els...@apache.org
Subject [7/8] git commit: Merge branch '1.5' into 1.6
Date Mon, 27 Oct 2014 00:43:32 GMT
Merge branch '1.5' into 1.6


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

Branch: refs/heads/1.6
Commit: 8b93f5d18335e967f2adf73e0279d74bfbceac27
Parents: 87fbb4b 351c70e
Author: Josh Elser <elserj@apache.org>
Authored: Sun Oct 26 20:28:54 2014 -0400
Committer: Josh Elser <elserj@apache.org>
Committed: Sun Oct 26 20:28:54 2014 -0400

----------------------------------------------------------------------
 .../java/org/apache/accumulo/test/randomwalk/image/ScanMeta.java | 4 ++++
 1 file changed, 4 insertions(+)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/accumulo/blob/8b93f5d1/test/src/main/java/org/apache/accumulo/test/randomwalk/image/ScanMeta.java
----------------------------------------------------------------------
diff --cc test/src/main/java/org/apache/accumulo/test/randomwalk/image/ScanMeta.java
index 77c66ed,cda0a6d..7dfce66
--- a/test/src/main/java/org/apache/accumulo/test/randomwalk/image/ScanMeta.java
+++ b/test/src/main/java/org/apache/accumulo/test/randomwalk/image/ScanMeta.java
@@@ -76,9 -77,13 +76,13 @@@ public class ScanMeta extends Test 
      }
      
      log.debug("Found " + hashes.size() + " hashes starting at " + uuid);
+ 
+     if (hashes.isEmpty()) {
+       return;
+     }
      
      // use batch scanner to verify all of these exist in index
 -    BatchScanner indexScanner = conn.createBatchScanner(indexTableName, Constants.NO_AUTHS,
3);
 +    BatchScanner indexScanner = conn.createBatchScanner(indexTableName, Authorizations.EMPTY,
3);
      ArrayList<Range> ranges = new ArrayList<Range>();
      for (Text row : hashes.keySet()) {
        ranges.add(new Range(row));


Mime
View raw message