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/12/12 21:11:48 UTC
[1/2] accumulo git commit: ACCUMULO-3406 fix filename parsing
Repository: accumulo
Updated Branches:
refs/heads/master 0904e5944 -> 8b21fc8a7
ACCUMULO-3406 fix filename parsing
Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo
Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/0cbc8e5f
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/0cbc8e5f
Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/0cbc8e5f
Branch: refs/heads/master
Commit: 0cbc8e5fdef161215867b3de1440b8e83327a4db
Parents: 0532b62
Author: Eric C. Newton <er...@gmail.com>
Authored: Fri Dec 12 15:10:38 2014 -0500
Committer: Eric C. Newton <er...@gmail.com>
Committed: Fri Dec 12 15:10:38 2014 -0500
----------------------------------------------------------------------
.../java/org/apache/accumulo/gc/SimpleGarbageCollector.java | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/accumulo/blob/0cbc8e5f/server/gc/src/main/java/org/apache/accumulo/gc/SimpleGarbageCollector.java
----------------------------------------------------------------------
diff --git a/server/gc/src/main/java/org/apache/accumulo/gc/SimpleGarbageCollector.java b/server/gc/src/main/java/org/apache/accumulo/gc/SimpleGarbageCollector.java
index 8d8cc42..0b733f1 100644
--- a/server/gc/src/main/java/org/apache/accumulo/gc/SimpleGarbageCollector.java
+++ b/server/gc/src/main/java/org/apache/accumulo/gc/SimpleGarbageCollector.java
@@ -425,10 +425,10 @@ public class SimpleGarbageCollector implements Iface {
synchronized (SimpleGarbageCollector.this) {
++status.current.errors;
}
- String parts[] = delete.split("/");
+ String parts[] = fullPath.toString().split(Constants.ZTABLES)[1].split("/");
if (parts.length > 2) {
- String tableId = parts[parts.length - 3];
- String tabletDir = parts[parts.length - 2];
+ String tableId = parts[1];
+ String tabletDir = parts[2];
TableManager.getInstance().updateTableStateCache(tableId);
TableState tableState = TableManager.getInstance().getTableState(tableId);
if (tableState != null && tableState != TableState.DELETING) {
[2/2] accumulo git commit: Merge branch '1.6'
Posted by ec...@apache.org.
Merge branch '1.6'
Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo
Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/8b21fc8a
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/8b21fc8a
Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/8b21fc8a
Branch: refs/heads/master
Commit: 8b21fc8a744a059763a25e4d61b8952625bf2d88
Parents: 0904e59 0cbc8e5
Author: Eric C. Newton <er...@gmail.com>
Authored: Fri Dec 12 15:11:13 2014 -0500
Committer: Eric C. Newton <er...@gmail.com>
Committed: Fri Dec 12 15:11:13 2014 -0500
----------------------------------------------------------------------
.../java/org/apache/accumulo/gc/SimpleGarbageCollector.java | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/accumulo/blob/8b21fc8a/server/gc/src/main/java/org/apache/accumulo/gc/SimpleGarbageCollector.java
----------------------------------------------------------------------