accumulo-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From e..@apache.org
Subject git commit: ACCUMULO-1629 file references between tables no longer use the "../" indirection
Date Mon, 05 Aug 2013 12:56:15 GMT
Updated Branches:
  refs/heads/master ae62af822 -> 4c51fb26d


ACCUMULO-1629 file references between tables no longer use the "../" indirection


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

Branch: refs/heads/master
Commit: 4c51fb26d8b84e22a887317d3c0449ee5dedf51c
Parents: ae62af8
Author: Eric Newton <ecn@apache.org>
Authored: Mon Aug 5 08:56:11 2013 -0400
Committer: Eric Newton <ecn@apache.org>
Committed: Mon Aug 5 08:56:11 2013 -0400

----------------------------------------------------------------------
 .../apache/accumulo/server/master/tableOps/DeleteTable.java    | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/accumulo/blob/4c51fb26/server/src/main/java/org/apache/accumulo/server/master/tableOps/DeleteTable.java
----------------------------------------------------------------------
diff --git a/server/src/main/java/org/apache/accumulo/server/master/tableOps/DeleteTable.java
b/server/src/main/java/org/apache/accumulo/server/master/tableOps/DeleteTable.java
index 47700c5..6f3b49a 100644
--- a/server/src/main/java/org/apache/accumulo/server/master/tableOps/DeleteTable.java
+++ b/server/src/main/java/org/apache/accumulo/server/master/tableOps/DeleteTable.java
@@ -126,18 +126,18 @@ class CleanUp extends MasterRepo {
     int refCount = 0;
     
     try {
-      // look for other tables that references this tables files
+      // look for other tables that references this table's files
       Connector conn = master.getConnector();
       BatchScanner bs = conn.createBatchScanner(MetadataTable.NAME, Authorizations.EMPTY,
8);
       try {
         bs.setRanges(Collections.singleton(MetadataSchema.TabletsSection.getRange()));
         bs.fetchColumnFamily(DataFileColumnFamily.NAME);
         IteratorSetting cfg = new IteratorSetting(40, "grep", GrepIterator.class);
-        GrepIterator.setTerm(cfg, "../" + tableId + "/");
+        GrepIterator.setTerm(cfg, "/" + tableId + "/");
         bs.addScanIterator(cfg);
         
         for (Entry<Key,Value> entry : bs) {
-          if (entry.getKey().getColumnQualifier().toString().startsWith("../" + tableId +
"/")) {
+          if (entry.getKey().getColumnQualifier().toString().contains("/" + tableId + "/"))
{
             refCount++;
           }
         }


Mime
View raw message