ACCUMULO-1.5.1-SNAPSHOT need to store location without full path
Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/cfc0e18e Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/cfc0e18e Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/cfc0e18e Branch: refs/heads/1.5.1-SNAPSHOT Commit: cfc0e18ec40648d3a75eca7c57058dbf0ed34811 Parents: 8f35d25 Author: Eric Newton <eric.new...@gmail.com> Authored: Fri Sep 20 16:55:17 2013 -0400 Committer: Eric Newton <eric.new...@gmail.com> Committed: Fri Sep 20 17:00:03 2013 -0400 ---------------------------------------------------------------------- .../java/org/apache/accumulo/server/tabletserver/Tablet.java | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/accumulo/blob/cfc0e18e/src/server/src/main/java/org/apache/accumulo/server/tabletserver/Tablet.java ---------------------------------------------------------------------- diff --git a/src/server/src/main/java/org/apache/accumulo/server/tabletserver/Tablet.java b/src/server/src/main/java/org/apache/accumulo/server/tabletserver/Tablet.java index 8da2297..ef4f27a 100644 --- a/src/server/src/main/java/org/apache/accumulo/server/tabletserver/Tablet.java +++ b/src/server/src/main/java/org/apache/accumulo/server/tabletserver/Tablet.java @@ -406,6 +406,8 @@ public class Tablet { private AtomicReference<ConstraintChecker> constraintChecker = new AtomicReference<ConstraintChecker>(); + private final String tabletDirectory; + private int writesInProgress = 0; private static final Logger log = Logger.getLogger(Tablet.class); @@ -1331,6 +1333,7 @@ public class Tablet { Set<String> scanFiles, long initFlushID, long initCompactID) throws IOException { this.location = new Path(ServerConstants.getTablesDir() + "/" + extent.getTableId().toString() + location.toString()); this.lastLocation = lastLocation; + this.tabletDirectory = location.toString(); this.conf = conf; this.acuTableConf = ServerConfiguration.getTableConfiguration(extent.getTableId().toString()); @@ -3538,7 +3541,7 @@ public class Tablet { log.log(TLevel.TABLET_HIST, extent + " split " + low + " " + high); - newTablets.put(high, new SplitInfo(location.toString(), highDatafileSizes, time, lastFlushID, lastCompactID)); + newTablets.put(high, new SplitInfo(tabletDirectory, highDatafileSizes, time, lastFlushID, lastCompactID)); newTablets.put(low, new SplitInfo(lowDirectory, lowDatafileSizes, time, lastFlushID, lastCompactID)); long t2 = System.currentTimeMillis();
