You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@accumulo.apache.org by dl...@apache.org on 2016/04/12 15:58:45 UTC
[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 <el...@apache.org>
Authored: Tue Apr 5 11:19:48 2016 -0400
Committer: Josh Elser <el...@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");