accumulo-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From els...@apache.org
Subject [09/50] [abbrv] git commit: ACCUMULO-2819 Fix the unit test to not expect that all columns are combined in replication table (only status and work)
Date Wed, 21 May 2014 01:59:28 GMT
ACCUMULO-2819 Fix the unit test to not expect that all columns are combined in replication
table (only status and work)


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

Branch: refs/heads/ACCUMULO-378
Commit: 934f1ee8e2e9ef8da50c343cee870b7d031fd112
Parents: f312cf1
Author: Josh Elser <elserj@apache.org>
Authored: Fri May 16 12:07:29 2014 -0400
Committer: Josh Elser <elserj@apache.org>
Committed: Fri May 16 12:07:29 2014 -0400

----------------------------------------------------------------------
 .../accumulo/server/replication/ReplicationTableTest.java      | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/accumulo/blob/934f1ee8/server/base/src/test/java/org/apache/accumulo/server/replication/ReplicationTableTest.java
----------------------------------------------------------------------
diff --git a/server/base/src/test/java/org/apache/accumulo/server/replication/ReplicationTableTest.java
b/server/base/src/test/java/org/apache/accumulo/server/replication/ReplicationTableTest.java
index 1b3cd58..74202be 100644
--- a/server/base/src/test/java/org/apache/accumulo/server/replication/ReplicationTableTest.java
+++ b/server/base/src/test/java/org/apache/accumulo/server/replication/ReplicationTableTest.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;
@@ -23,11 +24,14 @@ import java.util.Set;
 
 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.admin.TableOperations;
 import org.apache.accumulo.core.client.mock.MockInstance;
 import org.apache.accumulo.core.client.security.tokens.PasswordToken;
 import org.apache.accumulo.core.iterators.Combiner;
 import org.apache.accumulo.core.iterators.IteratorUtil.IteratorScope;
+import org.apache.accumulo.core.replication.ReplicationSchema.StatusSection;
+import org.apache.accumulo.core.replication.ReplicationSchema.WorkSection;
 import org.apache.hadoop.io.Text;
 import org.junit.Assert;
 import org.junit.Before;
@@ -100,7 +104,7 @@ public class ReplicationTableTest {
 
     // Needs to be set below versioning
     IteratorSetting expected = new IteratorSetting(30, ReplicationTable.COMBINER_NAME, StatusCombiner.class);
-    Combiner.setCombineAllColumns(expected, true);
+    Combiner.setColumns(expected, Arrays.asList(new Column(StatusSection.NAME), new Column(WorkSection.NAME)));
     IteratorSetting setting = tops.getIteratorSetting(ReplicationTable.NAME, ReplicationTable.COMBINER_NAME,
IteratorScope.scan);
 
     Assert.assertEquals(expected, setting);


Mime
View raw message