Return-Path: X-Original-To: apmail-accumulo-commits-archive@www.apache.org Delivered-To: apmail-accumulo-commits-archive@www.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 56E6D106E3 for ; Fri, 20 Sep 2013 21:01:26 +0000 (UTC) Received: (qmail 46286 invoked by uid 500); 20 Sep 2013 21:01:25 -0000 Delivered-To: apmail-accumulo-commits-archive@accumulo.apache.org Received: (qmail 46206 invoked by uid 500); 20 Sep 2013 21:01:25 -0000 Mailing-List: contact commits-help@accumulo.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@accumulo.apache.org Delivered-To: mailing list commits@accumulo.apache.org Received: (qmail 46176 invoked by uid 99); 20 Sep 2013 21:01:24 -0000 Received: from tyr.zones.apache.org (HELO tyr.zones.apache.org) (140.211.11.114) by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 20 Sep 2013 21:01:24 +0000 Received: by tyr.zones.apache.org (Postfix, from userid 65534) id 4A7788AF5BD; Fri, 20 Sep 2013 21:01:24 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: ecn@apache.org To: commits@accumulo.apache.org Date: Fri, 20 Sep 2013 21:01:24 -0000 Message-Id: <6e6ab4b3e5d341608fc5685e9e30ce64@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: [1/4] git commit: ACCUMULO-1.5.1-SNAPSHOT need to store location without full path Updated Branches: refs/heads/1.4.5-SNAPSHOT 8f35d25c6 -> cfc0e18ec refs/heads/1.5.1-SNAPSHOT 3c4f4f065 -> 032099e8b 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/2c9dee32 Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/2c9dee32 Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/2c9dee32 Branch: refs/heads/1.5.1-SNAPSHOT Commit: 2c9dee325c6407b6ce7221521ba536ec0f633061 Parents: 3c4f4f0 Author: Eric Newton Authored: Fri Sep 20 16:55:17 2013 -0400 Committer: Eric Newton Committed: Fri Sep 20 16:55:17 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/2c9dee32/server/src/main/java/org/apache/accumulo/server/tabletserver/Tablet.java ---------------------------------------------------------------------- diff --git a/server/src/main/java/org/apache/accumulo/server/tabletserver/Tablet.java b/server/src/main/java/org/apache/accumulo/server/tabletserver/Tablet.java index 4439e74..a3d3627 100644 --- a/server/src/main/java/org/apache/accumulo/server/tabletserver/Tablet.java +++ b/server/src/main/java/org/apache/accumulo/server/tabletserver/Tablet.java @@ -418,6 +418,8 @@ public class Tablet { private AtomicReference constraintChecker = new AtomicReference(); + private final String tabletDirectory; + private int writesInProgress = 0; private static final Logger log = Logger.getLogger(Tablet.class); @@ -1321,6 +1323,7 @@ public class Tablet { Set 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 = tabletServer.getTableConfiguration(extent); @@ -3624,7 +3627,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();