Return-Path: 
 <commits-return-17855-apmail-accumulo-commits-archive=accumulo.apache.org@accumulo.apache.org>
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 9C26E19C30
	for <apmail-accumulo-commits-archive@www.apache.org>;
 Tue, 12 Apr 2016 13:58:19 +0000 (UTC)
Received: (qmail 39071 invoked by uid 500); 12 Apr 2016 13:58:19 -0000
Delivered-To: apmail-accumulo-commits-archive@accumulo.apache.org
Received: (qmail 38993 invoked by uid 500); 12 Apr 2016 13:58:19 -0000
Mailing-List: contact commits-help@accumulo.apache.org; run by ezmlm
Precedence: bulk
List-Help: <mailto:commits-help@accumulo.apache.org>
List-Unsubscribe: <mailto:commits-unsubscribe@accumulo.apache.org>
List-Post: <mailto:commits@accumulo.apache.org>
List-Id: <commits.accumulo.apache.org>
Reply-To: dev@accumulo.apache.org
Delivered-To: mailing list commits@accumulo.apache.org
Received: (qmail 38036 invoked by uid 99); 12 Apr 2016 13:58:18 -0000
Received: from git1-us-west.apache.org (HELO git1-us-west.apache.org)
 (140.211.11.23)
    by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 12 Apr 2016 13:58:18 +0000
Received: by git1-us-west.apache.org (ASF Mail Server at
 git1-us-west.apache.org, from userid 33)
	id C9AB1E02DA; Tue, 12 Apr 2016 13:58:18 +0000 (UTC)
Content-Type: text/plain; charset="us-ascii"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
From: dlmarion@apache.org
To: commits@accumulo.apache.org
Date: Tue, 12 Apr 2016 13:58:45 -0000
Message-Id: <af39dc2cdcb44abba2128075793792c5@git.apache.org>
In-Reply-To: <28ce56b801f84481baae935b546b14cd@git.apache.org>
References: <28ce56b801f84481baae935b546b14cd@git.apache.org>
X-Mailer: ASF-Git Admin Mailer
Subject: [28/39] accumulo git commit: Merge branch '1.7'

Merge branch '1.7'


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

Branch: refs/heads/ACCUMULO-4173
Commit: 52318429a609ffa72fbce621134a111ef7bd4bac
Parents: 8839fe5 f7a24d7
Author: Josh Elser <elserj@apache.org>
Authored: Tue Apr 5 11:19:48 2016 -0400
Committer: Josh Elser <elserj@apache.org>
Committed: Tue Apr 5 11:23:01 2016 -0400

----------------------------------------------------------------------
 .../core/client/impl/TabletServerBatchWriter.java      | 13 ++++++++++---
 1 file changed, 10 insertions(+), 3 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/accumulo/blob/52318429/core/src/main/java/org/apache/accumulo/core/client/impl/TabletServerBatchWriter.java
----------------------------------------------------------------------
diff --cc core/src/main/java/org/apache/accumulo/core/client/impl/TabletServerBatchWriter.java
index 35281d6,77d8307..459d230
--- a/core/src/main/java/org/apache/accumulo/core/client/impl/TabletServerBatchWriter.java
+++ b/core/src/main/java/org/apache/accumulo/core/client/impl/TabletServerBatchWriter.java
@@@ -843,10 -847,15 +845,15 @@@ public class TabletServerBatchWriter 
          try {
  
            long count = 0;
-           for (List<Mutation> list : mutationBatch.values()) {
-             count += list.size();
+ 
 -          Set<Text> tableIds = new TreeSet<Text>();
++          Set<String> tableIds = new TreeSet<>();
+           for (Map.Entry<KeyExtent,List<Mutation>> entry : mutationBatch.entrySet()) {
+             count += entry.getValue().size();
+             tableIds.add(entry.getKey().getTableId());
            }
-           String msg = "sending " + String.format("%,d", count) + " mutations to " + String.format("%,d", mutationBatch.size()) + " tablets at " + location;
+ 
+           String msg = "sending " + String.format("%,d", count) + " mutations to " + String.format("%,d", mutationBatch.size()) + " tablets at " + location
+               + " tids: [" + Joiner.on(',').join(tableIds) + ']';
            Thread.currentThread().setName(msg);
  
            Span span = Trace.start("sendMutations");