Merge branch '1.6' into 1.7
Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/89d69f60 Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/89d69f60 Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/89d69f60 Branch: refs/heads/master Commit: 89d69f60ce78f910158995fbe1c9eb89a47090e4 Parents: 1f28ee7 deef535 Author: Eric C. Newton <eric.new...@gmail.com> Authored: Tue Oct 20 16:14:56 2015 -0400 Committer: Eric C. Newton <eric.new...@gmail.com> Committed: Tue Oct 20 16:14:56 2015 -0400 ---------------------------------------------------------------------- .../accumulo/gc/GarbageCollectionAlgorithm.java | 16 +++++++++------- .../accumulo/gc/GarbageCollectionEnvironment.java | 6 ++++-- .../apache/accumulo/gc/SimpleGarbageCollector.java | 10 ++++------ .../apache/accumulo/gc/GarbageCollectionTest.java | 5 ++--- 4 files changed, 19 insertions(+), 18 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/accumulo/blob/89d69f60/server/gc/src/main/java/org/apache/accumulo/gc/GarbageCollectionAlgorithm.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/accumulo/blob/89d69f60/server/gc/src/main/java/org/apache/accumulo/gc/GarbageCollectionEnvironment.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/accumulo/blob/89d69f60/server/gc/src/main/java/org/apache/accumulo/gc/SimpleGarbageCollector.java ---------------------------------------------------------------------- diff --cc server/gc/src/main/java/org/apache/accumulo/gc/SimpleGarbageCollector.java index 037023a,3ab95a7..1daafcb --- a/server/gc/src/main/java/org/apache/accumulo/gc/SimpleGarbageCollector.java +++ b/server/gc/src/main/java/org/apache/accumulo/gc/SimpleGarbageCollector.java @@@ -248,9 -277,9 +247,9 @@@ public class SimpleGarbageCollector ext range = new Range(new Key(continueRow).followingKey(PartialKey.ROW), true, range.getEndKey(), range.isEndKeyInclusive()); } - Scanner scanner = instance.getConnector(credentials.getPrincipal(), credentials.getToken()).createScanner(tableName, Authorizations.EMPTY); + Scanner scanner = getConnector().createScanner(tableName, Authorizations.EMPTY); scanner.setRange(range); - List<String> result = new ArrayList<String>(); + result.clear(); // find candidates for deletion; chop off the prefix for (Entry<Key,Value> entry : scanner) { String cand = entry.getKey().getRow().toString().substring(MetadataSchema.DeletesSection.getRowPrefix().length()); http://git-wip-us.apache.org/repos/asf/accumulo/blob/89d69f60/server/gc/src/test/java/org/apache/accumulo/gc/GarbageCollectionTest.java ---------------------------------------------------------------------- diff --cc server/gc/src/test/java/org/apache/accumulo/gc/GarbageCollectionTest.java index 544bd69,2953d07..1548fa1 --- a/server/gc/src/test/java/org/apache/accumulo/gc/GarbageCollectionTest.java +++ b/server/gc/src/test/java/org/apache/accumulo/gc/GarbageCollectionTest.java @@@ -53,12 -49,10 +53,11 @@@ public class GarbageCollectionTest ArrayList<String> deletes = new ArrayList<String>(); ArrayList<String> tablesDirsToDelete = new ArrayList<String>(); + TreeMap<String,Status> filesToReplicate = new TreeMap<String,Status>(); @Override - public List<String> getCandidates(String continuePoint) { + public boolean getCandidates(String continuePoint, List<String> ret) { Iterator<String> iter = candidates.tailSet(continuePoint, false).iterator(); - ArrayList<String> ret = new ArrayList<String>(); while (iter.hasNext() && ret.size() < 3) { ret.add(iter.next()); }
