accumulo-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From els...@apache.org
Subject [07/50] [abbrv] git commit: ACCUMULO-378 Only set the Replication table combiner on the status and work columns (unnecessary for order columns)
Date Wed, 21 May 2014 01:59:26 GMT
ACCUMULO-378 Only set the Replication table combiner on the status and work columns (unnecessary
for order columns)


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

Branch: refs/heads/ACCUMULO-378
Commit: 005b59f3d84963d25ee091dca0f525bd09b14042
Parents: f97f13a
Author: Josh Elser <elserj@apache.org>
Authored: Thu May 15 22:06:38 2014 -0400
Committer: Josh Elser <elserj@apache.org>
Committed: Thu May 15 22:06:38 2014 -0400

----------------------------------------------------------------------
 .../org/apache/accumulo/server/replication/ReplicationTable.java | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/accumulo/blob/005b59f3/server/base/src/main/java/org/apache/accumulo/server/replication/ReplicationTable.java
----------------------------------------------------------------------
diff --git a/server/base/src/main/java/org/apache/accumulo/server/replication/ReplicationTable.java
b/server/base/src/main/java/org/apache/accumulo/server/replication/ReplicationTable.java
index df73604..622ec10 100644
--- a/server/base/src/main/java/org/apache/accumulo/server/replication/ReplicationTable.java
+++ b/server/base/src/main/java/org/apache/accumulo/server/replication/ReplicationTable.java
@@ -16,6 +16,7 @@
  */
 package org.apache.accumulo.server.replication;
 
+import java.util.Arrays;
 import java.util.Collections;
 import java.util.EnumSet;
 import java.util.Map;
@@ -28,6 +29,7 @@ import org.apache.accumulo.core.client.BatchWriter;
 import org.apache.accumulo.core.client.BatchWriterConfig;
 import org.apache.accumulo.core.client.Connector;
 import org.apache.accumulo.core.client.IteratorSetting;
+import org.apache.accumulo.core.client.IteratorSetting.Column;
 import org.apache.accumulo.core.client.Scanner;
 import org.apache.accumulo.core.client.TableExistsException;
 import org.apache.accumulo.core.client.TableNotFoundException;
@@ -117,7 +119,7 @@ public class ReplicationTable extends org.apache.accumulo.core.client.replicatio
     if (!iterators.containsKey(COMBINER_NAME)) {
       // Set our combiner and combine all columns
       IteratorSetting setting = new IteratorSetting(30, COMBINER_NAME, StatusCombiner.class);
-      Combiner.setCombineAllColumns(setting, true);
+      Combiner.setColumns(setting, Arrays.asList(new Column(StatusSection.NAME), new Column(WorkSection.NAME)));
       try {
         tops.attachIterator(NAME, setting);
       } catch (AccumuloSecurityException | AccumuloException | TableNotFoundException e)
{


Mime
View raw message