accumulo-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From e..@apache.org
Subject accumulo git commit: ACCUMULO-3406 fix filename parsing
Date Fri, 12 Dec 2014 20:11:25 GMT
Repository: accumulo
Updated Branches:
  refs/heads/1.6 0532b627b -> 0cbc8e5fd


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/1.6
Commit: 0cbc8e5fdef161215867b3de1440b8e83327a4db
Parents: 0532b62
Author: Eric C. Newton <eric.newton@gmail.com>
Authored: Fri Dec 12 15:10:38 2014 -0500
Committer: Eric C. Newton <eric.newton@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) {


Mime
View raw message