Fix #1417: Remove usage of Text from code creating mutations (#1439)
diff --git a/core/src/test/java/org/apache/accumulo/core/clientImpl/TabletLocatorImplTest.java b/core/src/test/java/org/apache/accumulo/core/clientImpl/TabletLocatorImplTest.java
index ed424dc..1dfbaae 100644
--- a/core/src/test/java/org/apache/accumulo/core/clientImpl/TabletLocatorImplTest.java
+++ b/core/src/test/java/org/apache/accumulo/core/clientImpl/TabletLocatorImplTest.java
@@ -228,7 +228,7 @@
String[] cvp = element.split("=");
String[] cols = cvp[0].split(":");
- mut.put(new Text(cols[0]), new Text(cols[1]), new Value(cvp[1]));
+ mut.put(cols[0], cols[1], cvp[1]);
}
return mut;
diff --git a/hadoop-mapreduce/src/test/java/org/apache/accumulo/hadoop/its/mapred/AccumuloInputFormatIT.java b/hadoop-mapreduce/src/test/java/org/apache/accumulo/hadoop/its/mapred/AccumuloInputFormatIT.java
index 2446556..74594b1 100644
--- a/hadoop-mapreduce/src/test/java/org/apache/accumulo/hadoop/its/mapred/AccumuloInputFormatIT.java
+++ b/hadoop-mapreduce/src/test/java/org/apache/accumulo/hadoop/its/mapred/AccumuloInputFormatIT.java
@@ -161,7 +161,7 @@
BatchWriter bw = c.createBatchWriter(table, new BatchWriterConfig());
for (int i = 0; i < 100; i++) {
Mutation m = new Mutation(new Text(String.format("%09x", i + 1)));
- m.put(new Text(), new Text(), new Value(String.format("%09x", i)));
+ m.put("", "", String.format("%09x", i));
bw.addMutation(m);
}
bw.close();
@@ -189,7 +189,7 @@
BatchWriter bw = c.createBatchWriter(TEST_TABLE_3, new BatchWriterConfig());
for (int i = 0; i < 100; i++) {
Mutation m = new Mutation(new Text(String.format("%09x", i + 1)));
- m.put(new Text(), new Text(), new Value(String.format("%09x", i)));
+ m.put("", "", String.format("%09x", i));
bw.addMutation(m);
}
bw.close();
diff --git a/hadoop-mapreduce/src/test/java/org/apache/accumulo/hadoop/its/mapred/AccumuloOutputFormatIT.java b/hadoop-mapreduce/src/test/java/org/apache/accumulo/hadoop/its/mapred/AccumuloOutputFormatIT.java
index 7502e11..ca16406 100644
--- a/hadoop-mapreduce/src/test/java/org/apache/accumulo/hadoop/its/mapred/AccumuloOutputFormatIT.java
+++ b/hadoop-mapreduce/src/test/java/org/apache/accumulo/hadoop/its/mapred/AccumuloOutputFormatIT.java
@@ -93,7 +93,7 @@
for (int i = 0; i < 3; i++) {
Mutation m = new Mutation(new Text(String.format("%08d", i)));
for (int j = 0; j < 3; j++) {
- m.put(new Text("cf1"), new Text("cq" + j), new Value(i + "_" + j));
+ m.put("cf1", "cq" + j, i + "_" + j);
}
writer.write(new Text(testName.getMethodName()), m);
}
@@ -211,7 +211,7 @@
BatchWriter bw = c.createBatchWriter(table1, new BatchWriterConfig());
for (int i = 0; i < 100; i++) {
Mutation m = new Mutation(new Text(String.format("%09x", i + 1)));
- m.put(new Text(), new Text(), new Value(String.format("%09x", i)));
+ m.put("", "", String.format("%09x", i));
bw.addMutation(m);
}
bw.close();
diff --git a/hadoop-mapreduce/src/test/java/org/apache/accumulo/hadoop/its/mapred/MultiTableInputFormatIT.java b/hadoop-mapreduce/src/test/java/org/apache/accumulo/hadoop/its/mapred/MultiTableInputFormatIT.java
index 71bc64d..bd8a2a9 100644
--- a/hadoop-mapreduce/src/test/java/org/apache/accumulo/hadoop/its/mapred/MultiTableInputFormatIT.java
+++ b/hadoop-mapreduce/src/test/java/org/apache/accumulo/hadoop/its/mapred/MultiTableInputFormatIT.java
@@ -137,10 +137,10 @@
BatchWriter bw2 = c.createBatchWriter(table2, new BatchWriterConfig());
for (int i = 0; i < 100; i++) {
Mutation t1m = new Mutation(new Text(String.format("%s_%09x", table1, i + 1)));
- t1m.put(new Text(), new Text(), new Value(String.format("%s_%09x", table1, i)));
+ t1m.put("", "", String.format("%s_%09x", table1, i));
bw.addMutation(t1m);
Mutation t2m = new Mutation(new Text(String.format("%s_%09x", table2, i + 1)));
- t2m.put(new Text(), new Text(), new Value(String.format("%s_%09x", table2, i)));
+ t2m.put("", "", String.format("%s_%09x", table2, i));
bw2.addMutation(t2m);
}
bw.close();
diff --git a/hadoop-mapreduce/src/test/java/org/apache/accumulo/hadoop/its/mapred/TokenFileIT.java b/hadoop-mapreduce/src/test/java/org/apache/accumulo/hadoop/its/mapred/TokenFileIT.java
index 31f1d32..3608887 100644
--- a/hadoop-mapreduce/src/test/java/org/apache/accumulo/hadoop/its/mapred/TokenFileIT.java
+++ b/hadoop-mapreduce/src/test/java/org/apache/accumulo/hadoop/its/mapred/TokenFileIT.java
@@ -158,7 +158,7 @@
BatchWriter bw = c.createBatchWriter(table1, new BatchWriterConfig());
for (int i = 0; i < 100; i++) {
Mutation m = new Mutation(new Text(String.format("%09x", i + 1)));
- m.put(new Text(), new Text(), new Value(String.format("%09x", i)));
+ m.put("", "", String.format("%09x", i));
bw.addMutation(m);
}
bw.close();
diff --git a/hadoop-mapreduce/src/test/java/org/apache/accumulo/hadoop/its/mapreduce/AccumuloInputFormatIT.java b/hadoop-mapreduce/src/test/java/org/apache/accumulo/hadoop/its/mapreduce/AccumuloInputFormatIT.java
index eaeffcd..d5e019b 100644
--- a/hadoop-mapreduce/src/test/java/org/apache/accumulo/hadoop/its/mapreduce/AccumuloInputFormatIT.java
+++ b/hadoop-mapreduce/src/test/java/org/apache/accumulo/hadoop/its/mapreduce/AccumuloInputFormatIT.java
@@ -337,7 +337,7 @@
BatchWriter bw = client.createBatchWriter(TEST_TABLE_1, new BatchWriterConfig());
for (int i = 0; i < 100; i++) {
Mutation m = new Mutation(new Text(String.format("%09x", i + 1)));
- m.put(new Text(), new Text(), new Value(String.format("%09x", i)));
+ m.put("", "", String.format("%09x", i));
bw.addMutation(m);
}
bw.close();
@@ -361,7 +361,7 @@
BatchWriter bw = client.createBatchWriter(TEST_TABLE_3, new BatchWriterConfig());
for (int i = 0; i < 100; i++) {
Mutation m = new Mutation(new Text(String.format("%09x", i + 1)));
- m.put(new Text(), new Text(), new Value(String.format("%09x", i)));
+ m.put("", "", String.format("%09x", i));
bw.addMutation(m);
}
bw.close();
@@ -392,7 +392,7 @@
BatchWriter bw = client.createBatchWriter(TEST_TABLE_2, new BatchWriterConfig());
for (int i = 0; i < 100; i++) {
Mutation m = new Mutation(new Text(String.format("%09x", i + 1)));
- m.put(new Text(), new Text(), new Value(String.format("%09x", i)));
+ m.put("", "", String.format("%09x", i));
bw.addMutation(m);
}
bw.close();
@@ -445,7 +445,7 @@
BatchWriter bw = client.createBatchWriter(table, new BatchWriterConfig());
for (int i = 0; i < 100; i++) {
Mutation m = new Mutation(new Text(String.format("%09x", i + 1)));
- m.put(new Text(), new Text(), new Value(String.format("%09x", i)));
+ m.put("", "", String.format("%09x", i));
bw.addMutation(m);
}
bw.close();
diff --git a/hadoop-mapreduce/src/test/java/org/apache/accumulo/hadoop/its/mapreduce/AccumuloOutputFormatIT.java b/hadoop-mapreduce/src/test/java/org/apache/accumulo/hadoop/its/mapreduce/AccumuloOutputFormatIT.java
index e9649c5..d20bed2 100644
--- a/hadoop-mapreduce/src/test/java/org/apache/accumulo/hadoop/its/mapreduce/AccumuloOutputFormatIT.java
+++ b/hadoop-mapreduce/src/test/java/org/apache/accumulo/hadoop/its/mapreduce/AccumuloOutputFormatIT.java
@@ -136,7 +136,7 @@
BatchWriter bw = c.createBatchWriter(table1, new BatchWriterConfig());
for (int i = 0; i < 100; i++) {
Mutation m = new Mutation(new Text(String.format("%09x", i + 1)));
- m.put(new Text(), new Text(), new Value(String.format("%09x", i)));
+ m.put("", "", String.format("%09x", i));
bw.addMutation(m);
}
bw.close();
diff --git a/hadoop-mapreduce/src/test/java/org/apache/accumulo/hadoop/its/mapreduce/MultiTableInputFormatIT.java b/hadoop-mapreduce/src/test/java/org/apache/accumulo/hadoop/its/mapreduce/MultiTableInputFormatIT.java
index c0d3c12..e36e8fe 100644
--- a/hadoop-mapreduce/src/test/java/org/apache/accumulo/hadoop/its/mapreduce/MultiTableInputFormatIT.java
+++ b/hadoop-mapreduce/src/test/java/org/apache/accumulo/hadoop/its/mapreduce/MultiTableInputFormatIT.java
@@ -137,10 +137,10 @@
BatchWriter bw2 = c.createBatchWriter(table2, new BatchWriterConfig());
for (int i = 0; i < 100; i++) {
Mutation t1m = new Mutation(new Text(String.format("%s_%09x", table1, i + 1)));
- t1m.put(new Text(), new Text(), new Value(String.format("%s_%09x", table1, i)));
+ t1m.put("", "", String.format("%s_%09x", table1, i));
bw.addMutation(t1m);
Mutation t2m = new Mutation(new Text(String.format("%s_%09x", table2, i + 1)));
- t2m.put(new Text(), new Text(), new Value(String.format("%s_%09x", table2, i)));
+ t2m.put("", "", String.format("%s_%09x", table2, i));
bw2.addMutation(t2m);
}
bw.close();
diff --git a/hadoop-mapreduce/src/test/java/org/apache/accumulo/hadoop/its/mapreduce/TokenFileIT.java b/hadoop-mapreduce/src/test/java/org/apache/accumulo/hadoop/its/mapreduce/TokenFileIT.java
index da54137..dcbd3af 100644
--- a/hadoop-mapreduce/src/test/java/org/apache/accumulo/hadoop/its/mapreduce/TokenFileIT.java
+++ b/hadoop-mapreduce/src/test/java/org/apache/accumulo/hadoop/its/mapreduce/TokenFileIT.java
@@ -152,7 +152,7 @@
BatchWriter bw = c.createBatchWriter(table1, new BatchWriterConfig());
for (int i = 0; i < 100; i++) {
Mutation m = new Mutation(new Text(String.format("%09x", i + 1)));
- m.put(new Text(), new Text(), new Value(String.format("%09x", i)));
+ m.put("", "", String.format("%09x", i));
bw.addMutation(m);
}
bw.close();
diff --git a/server/base/src/test/java/org/apache/accumulo/server/constraints/MetadataConstraintsTest.java b/server/base/src/test/java/org/apache/accumulo/server/constraints/MetadataConstraintsTest.java
index 7eacb97..53690df 100644
--- a/server/base/src/test/java/org/apache/accumulo/server/constraints/MetadataConstraintsTest.java
+++ b/server/base/src/test/java/org/apache/accumulo/server/constraints/MetadataConstraintsTest.java
@@ -89,7 +89,7 @@
assertEquals(Short.valueOf((short) 4), violations.get(0));
m = new Mutation(new Text("0;foo"));
- m.put(new Text("bad_column_name"), new Text(""), new Value("e"));
+ m.put("bad_column_name", "", "e");
violations = mc.check(createEnv(), m);
diff --git a/server/tserver/src/test/java/org/apache/accumulo/tserver/logger/LogFileTest.java b/server/tserver/src/test/java/org/apache/accumulo/tserver/logger/LogFileTest.java
index badf6b7..dcc2196 100644
--- a/server/tserver/src/test/java/org/apache/accumulo/tserver/logger/LogFileTest.java
+++ b/server/tserver/src/test/java/org/apache/accumulo/tserver/logger/LogFileTest.java
@@ -91,7 +91,7 @@
assertEquals(key.tabletId, 6);
assertEquals(key.tablet, tablet);
Mutation m = new ServerMutation(new Text("row"));
- m.put(new Text("cf"), new Text("cq"), new Value("value"));
+ m.put("cf", "cq", "value");
readWrite(MUTATION, 7, 8, null, null, new Mutation[] {m}, key, value);
assertEquals(key.event, MUTATION);
assertEquals(key.seq, 7);
diff --git a/test/src/main/java/org/apache/accumulo/test/InMemoryMapIT.java b/test/src/main/java/org/apache/accumulo/test/InMemoryMapIT.java
index 58c562c..bf34d11 100644
--- a/test/src/main/java/org/apache/accumulo/test/InMemoryMapIT.java
+++ b/test/src/main/java/org/apache/accumulo/test/InMemoryMapIT.java
@@ -51,7 +51,6 @@
import org.apache.accumulo.tserver.InMemoryMap;
import org.apache.accumulo.tserver.MemKey;
import org.apache.accumulo.tserver.NativeMap;
-import org.apache.hadoop.io.Text;
import org.easymock.EasyMock;
import org.junit.BeforeClass;
import org.junit.Rule;
@@ -114,7 +113,7 @@
@Test
public void testOneMutationOneKey() {
Mutation m = new Mutation("a");
- m.put(new Text("1cf"), new Text("1cq"), new Value("vala"));
+ m.put("1cf", "1cq", "vala");
assertEquivalentMutate(m);
}
@@ -123,7 +122,7 @@
public void testOneMutationManyKeys() {
Mutation m = new Mutation("a");
for (int i = 1; i < 6; i++) {
- m.put(new Text("2cf" + i), new Text("2cq" + i), new Value(Integer.toString(i)));
+ m.put("2cf" + i, "2cq" + i, Integer.toString(i));
}
assertEquivalentMutate(m);
@@ -134,7 +133,7 @@
Mutation m = new Mutation("a");
for (int i = 1; i <= 5; i++) {
// same keys
- m.put(new Text("3cf"), new Text("3cq"), new Value(Integer.toString(i)));
+ m.put("3cf", "3cq", Integer.toString(i));
}
assertEquivalentMutate(m);
@@ -143,9 +142,9 @@
@Test
public void testMultipleMutationsOneKey() {
Mutation m1 = new Mutation("a");
- m1.put(new Text("4cf"), new Text("4cq"), new Value("vala"));
+ m1.put("4cf", "4cq", "vala");
Mutation m2 = new Mutation("b");
- m2.put(new Text("4cf"), new Text("4cq"), new Value("vala"));
+ m2.put("4cf", "4cq", "vala");
assertEquivalentMutate(Arrays.asList(m1, m2));
}
@@ -153,9 +152,9 @@
@Test
public void testMultipleMutationsSameOneKey() {
Mutation m1 = new Mutation("a");
- m1.put(new Text("5cf"), new Text("5cq"), new Value("vala"));
+ m1.put("5cf", "5cq", "vala");
Mutation m2 = new Mutation("a");
- m2.put(new Text("5cf"), new Text("5cq"), new Value("vala"));
+ m2.put("5cf", "5cq", "vala");
assertEquivalentMutate(Arrays.asList(m1, m2));
}
@@ -164,11 +163,11 @@
public void testMutlipleMutationsMultipleKeys() {
Mutation m1 = new Mutation("a");
for (int i = 1; i < 6; i++) {
- m1.put(new Text("6cf" + i), new Text("6cq" + i), new Value(Integer.toString(i)));
+ m1.put("6cf" + i, "6cq" + i, Integer.toString(i));
}
Mutation m2 = new Mutation("b");
for (int i = 1; i < 3; i++) {
- m2.put(new Text("6cf" + i), new Text("6cq" + i), new Value(Integer.toString(i)));
+ m2.put("6cf" + i, "6cq" + i, Integer.toString(i));
}
assertEquivalentMutate(Arrays.asList(m1, m2));
@@ -178,11 +177,11 @@
public void testMultipleMutationsMultipleSameKeys() {
Mutation m1 = new Mutation("a");
for (int i = 1; i < 3; i++) {
- m1.put(new Text("7cf"), new Text("7cq"), new Value(Integer.toString(i)));
+ m1.put("7cf", "7cq", Integer.toString(i));
}
Mutation m2 = new Mutation("a");
for (int i = 1; i < 4; i++) {
- m2.put(new Text("7cf"), new Text("7cq"), new Value(Integer.toString(i)));
+ m2.put("7cf", "7cq", Integer.toString(i));
}
assertEquivalentMutate(Arrays.asList(m1, m2));
@@ -192,24 +191,24 @@
public void testMultipleMutationsMultipleKeysSomeSame() {
Mutation m1 = new Mutation("a");
for (int i = 1; i < 2; i++) {
- m1.put(new Text("8cf"), new Text("8cq"), new Value(Integer.toString(i)));
+ m1.put("8cf", "8cq", Integer.toString(i));
}
for (int i = 1; i < 3; i++) {
- m1.put(new Text("8cf" + i), new Text("8cq" + i), new Value(Integer.toString(i)));
+ m1.put("8cf" + i, "8cq" + i, Integer.toString(i));
}
for (int i = 1; i < 2; i++) {
- m1.put(new Text("8cf" + i), new Text("8cq" + i), new Value(Integer.toString(i)));
+ m1.put("8cf" + i, "8cq" + i, Integer.toString(i));
}
Mutation m2 = new Mutation("a");
for (int i = 1; i < 3; i++) {
- m2.put(new Text("8cf"), new Text("8cq"), new Value(Integer.toString(i)));
+ m2.put("8cf", "8cq", Integer.toString(i));
}
for (int i = 1; i < 4; i++) {
- m2.put(new Text("8cf" + i), new Text("8cq" + i), new Value(Integer.toString(i)));
+ m2.put("8cf" + i, "8cq" + i, Integer.toString(i));
}
Mutation m3 = new Mutation("b");
for (int i = 1; i < 3; i++) {
- m3.put(new Text("8cf" + i), new Text("8cq" + i), new Value(Integer.toString(i)));
+ m3.put("8cf" + i, "8cq" + i, Integer.toString(i));
}
assertEquivalentMutate(Arrays.asList(m1, m2, m3));
diff --git a/test/src/main/java/org/apache/accumulo/test/YieldScannersIT.java b/test/src/main/java/org/apache/accumulo/test/YieldScannersIT.java
index e6c86fa..4e9763d 100644
--- a/test/src/main/java/org/apache/accumulo/test/YieldScannersIT.java
+++ b/test/src/main/java/org/apache/accumulo/test/YieldScannersIT.java
@@ -70,7 +70,7 @@
for (int i = 0; i < 10; i++) {
byte[] row = {(byte) (START_ROW + i)};
Mutation m = new Mutation(new Text(row));
- m.put(new Text(), new Text(), new Value());
+ m.put("", "", "");
writer.addMutation(m);
}
writer.flush();
@@ -125,7 +125,7 @@
for (int i = 0; i < 10; i++) {
byte[] row = {(byte) (START_ROW + i)};
Mutation m = new Mutation(new Text(row));
- m.put(new Text(), new Text(), new Value());
+ m.put("", "", "");
writer.addMutation(m);
}
writer.flush();
diff --git a/test/src/main/java/org/apache/accumulo/test/functional/BadIteratorMincIT.java b/test/src/main/java/org/apache/accumulo/test/functional/BadIteratorMincIT.java
index f3ca01f..803d982 100644
--- a/test/src/main/java/org/apache/accumulo/test/functional/BadIteratorMincIT.java
+++ b/test/src/main/java/org/apache/accumulo/test/functional/BadIteratorMincIT.java
@@ -30,7 +30,6 @@
import org.apache.accumulo.core.client.IteratorSetting;
import org.apache.accumulo.core.client.Scanner;
import org.apache.accumulo.core.data.Mutation;
-import org.apache.accumulo.core.data.Value;
import org.apache.accumulo.core.iterators.IteratorUtil.IteratorScope;
import org.apache.accumulo.core.security.Authorizations;
import org.apache.accumulo.harness.AccumuloClusterHarness;
@@ -56,7 +55,7 @@
c.tableOperations().attachIterator(tableName, is, EnumSet.of(IteratorScope.minc));
try (BatchWriter bw = c.createBatchWriter(tableName)) {
Mutation m = new Mutation(new Text("r1"));
- m.put(new Text("acf"), new Text(tableName), new Value("1"));
+ m.put("acf", tableName, "1");
bw.addMutation(m);
}
@@ -89,7 +88,7 @@
c.tableOperations().attachIterator(tableName, is, EnumSet.of(IteratorScope.minc));
try (BatchWriter bw = c.createBatchWriter(tableName)) {
Mutation m = new Mutation(new Text("r2"));
- m.put(new Text("acf"), new Text(tableName), new Value("1"));
+ m.put("acf", tableName, "1");
bw.addMutation(m);
}
diff --git a/test/src/main/java/org/apache/accumulo/test/functional/BadLocalityGroupMincIT.java b/test/src/main/java/org/apache/accumulo/test/functional/BadLocalityGroupMincIT.java
index 4b46cb6..d78cb0a 100644
--- a/test/src/main/java/org/apache/accumulo/test/functional/BadLocalityGroupMincIT.java
+++ b/test/src/main/java/org/apache/accumulo/test/functional/BadLocalityGroupMincIT.java
@@ -64,7 +64,7 @@
try (BatchWriter bw = c.createBatchWriter(tableName)) {
Mutation m = new Mutation(new Text("r1"));
- m.put(new Text("acf"), new Text(tableName), new Value("1"));
+ m.put("acf", tableName, "1");
bw.addMutation(m);
}
diff --git a/test/src/main/java/org/apache/accumulo/test/functional/BatchScanSplitIT.java b/test/src/main/java/org/apache/accumulo/test/functional/BatchScanSplitIT.java
index e2ab241..7bef19c 100644
--- a/test/src/main/java/org/apache/accumulo/test/functional/BatchScanSplitIT.java
+++ b/test/src/main/java/org/apache/accumulo/test/functional/BatchScanSplitIT.java
@@ -69,7 +69,7 @@
try (BatchWriter bw = c.createBatchWriter(tableName)) {
for (int i = 0; i < numRows; i++) {
Mutation m = new Mutation(new Text(String.format("%09x", i)));
- m.put(new Text("cf1"), new Text("cq1"), new Value(String.format("%016x", numRows - i)));
+ m.put("cf1", "cq1", String.format("%016x", numRows - i));
bw.addMutation(m);
}
}
diff --git a/test/src/main/java/org/apache/accumulo/test/functional/BatchWriterFlushIT.java b/test/src/main/java/org/apache/accumulo/test/functional/BatchWriterFlushIT.java
index 83117d0..8587efa 100644
--- a/test/src/main/java/org/apache/accumulo/test/functional/BatchWriterFlushIT.java
+++ b/test/src/main/java/org/apache/accumulo/test/functional/BatchWriterFlushIT.java
@@ -85,7 +85,7 @@
Scanner scanner = client.createScanner(tableName, Authorizations.EMPTY)) {
Mutation m = new Mutation(new Text(String.format("r_%10d", 1)));
- m.put(new Text("cf"), new Text("cq"), new Value("1"));
+ m.put("cf", "cq", "1");
bw.addMutation(m);
sleepUninterruptibly(500, TimeUnit.MILLISECONDS);
@@ -116,7 +116,7 @@
int row = i * NUM_TO_FLUSH + j;
Mutation m = new Mutation(new Text(String.format("r_%10d", row)));
- m.put(new Text("cf"), new Text("cq"), new Value("" + row));
+ m.put("cf", "cq", "" + row);
bw.addMutation(m);
}
@@ -198,7 +198,7 @@
for (int j = 0; j < NUM_TO_FLUSH; j++) {
int row = i * NUM_TO_FLUSH + j;
Mutation m = new Mutation(new Text(String.format("%10d", row)));
- m.put(new Text("cf" + i), new Text("cq"), new Value("" + row));
+ m.put("cf" + i, "cq", "" + row);
data.add(m);
}
}
diff --git a/test/src/main/java/org/apache/accumulo/test/functional/BloomFilterIT.java b/test/src/main/java/org/apache/accumulo/test/functional/BloomFilterIT.java
index 716ea0a..b2f7d61 100644
--- a/test/src/main/java/org/apache/accumulo/test/functional/BloomFilterIT.java
+++ b/test/src/main/java/org/apache/accumulo/test/functional/BloomFilterIT.java
@@ -99,7 +99,7 @@
// test inserting an empty key
try (BatchWriter bw = c.createBatchWriter(tables[3])) {
Mutation m = new Mutation(new Text(""));
- m.put(new Text(""), new Text(""), new Value("foo1"));
+ m.put("", "", "foo1");
bw.addMutation(m);
}
c.tableOperations().flush(tables[3], null, null, true);
@@ -246,15 +246,15 @@
switch (depth) {
case 1:
m = new Mutation(new Text(key));
- m.put(new Text("cf"), new Text("cq"), new Value("" + i));
+ m.put("cf", "cq", "" + i);
break;
case 2:
m = new Mutation(new Text("row"));
- m.put(new Text(key), new Text("cq"), new Value("" + i));
+ m.put(key, "cq", "" + i);
break;
case 3:
m = new Mutation(new Text("row"));
- m.put(new Text("cf"), new Text(key), new Value("" + i));
+ m.put("cf", key, "" + i);
break;
}
bw.addMutation(m);
diff --git a/test/src/main/java/org/apache/accumulo/test/functional/ConcurrencyIT.java b/test/src/main/java/org/apache/accumulo/test/functional/ConcurrencyIT.java
index 0c0f7ea..29c826a 100644
--- a/test/src/main/java/org/apache/accumulo/test/functional/ConcurrencyIT.java
+++ b/test/src/main/java/org/apache/accumulo/test/functional/ConcurrencyIT.java
@@ -32,7 +32,6 @@
import org.apache.accumulo.core.client.TableNotFoundException;
import org.apache.accumulo.core.conf.Property;
import org.apache.accumulo.core.data.Mutation;
-import org.apache.accumulo.core.data.Value;
import org.apache.accumulo.core.iterators.IteratorUtil.IteratorScope;
import org.apache.accumulo.core.security.Authorizations;
import org.apache.accumulo.harness.AccumuloClusterHarness;
@@ -112,7 +111,7 @@
BatchWriter bw = c.createBatchWriter(tableName);
for (int i = 0; i < 50; i++) {
Mutation m = new Mutation(new Text(String.format("%06d", i)));
- m.put(new Text("cf1"), new Text("cq1"), new Value("foo"));
+ m.put("cf1", "cq1", "foo");
bw.addMutation(m);
}
bw.flush();
@@ -128,7 +127,7 @@
for (int i = 0; i < 50; i++) {
Mutation m = new Mutation(new Text(String.format("%06d", i)));
- m.put(new Text("cf1"), new Text("cq1"), new Value("foo"));
+ m.put("cf1", "cq1", "foo");
bw.addMutation(m);
}
diff --git a/test/src/main/java/org/apache/accumulo/test/functional/ConstraintIT.java b/test/src/main/java/org/apache/accumulo/test/functional/ConstraintIT.java
index 6d404b0..f85ef92 100644
--- a/test/src/main/java/org/apache/accumulo/test/functional/ConstraintIT.java
+++ b/test/src/main/java/org/apache/accumulo/test/functional/ConstraintIT.java
@@ -94,7 +94,7 @@
BatchWriter bw = client.createBatchWriter(tableName);
Mutation mut1 = new Mutation(new Text("r1"));
- mut1.put(new Text("cf1"), new Text("cq1"), new Value("123"));
+ mut1.put("cf1", "cq1", "123");
bw.addMutation(mut1);
@@ -105,7 +105,7 @@
// create a mutation with a non numeric value
Mutation mut2 = new Mutation(new Text("r1"));
- mut2.put(new Text("cf1"), new Text("cq1"), new Value("123a"));
+ mut2.put("cf1", "cq1", "123a");
bw.addMutation(mut2);
@@ -195,7 +195,7 @@
bw = client.createBatchWriter(tableName);
Mutation mut3 = new Mutation(new Text("r1"));
- mut3.put(new Text("cf1"), new Text("cq1"), new Value("foo"));
+ mut3.put("cf1", "cq1", "foo");
bw.addMutation(mut3);
@@ -260,7 +260,7 @@
private Mutation newMut(String row, String cf, String cq, String val) {
Mutation mut1 = new Mutation(new Text(row));
- mut1.put(new Text(cf), new Text(cq), new Value(val));
+ mut1.put(cf, cq, val);
return mut1;
}
diff --git a/test/src/main/java/org/apache/accumulo/test/functional/DeleteEverythingIT.java b/test/src/main/java/org/apache/accumulo/test/functional/DeleteEverythingIT.java
index cb2b12c..550f938 100644
--- a/test/src/main/java/org/apache/accumulo/test/functional/DeleteEverythingIT.java
+++ b/test/src/main/java/org/apache/accumulo/test/functional/DeleteEverythingIT.java
@@ -32,7 +32,6 @@
import org.apache.accumulo.core.conf.Property;
import org.apache.accumulo.core.data.Mutation;
import org.apache.accumulo.core.data.Range;
-import org.apache.accumulo.core.data.Value;
import org.apache.accumulo.core.security.Authorizations;
import org.apache.accumulo.harness.AccumuloClusterHarness;
import org.apache.accumulo.miniclusterImpl.MiniAccumuloConfigImpl;
@@ -88,7 +87,7 @@
c.tableOperations().create(tableName);
BatchWriter bw = c.createBatchWriter(tableName);
Mutation m = new Mutation(new Text("foo"));
- m.put(new Text("bar"), new Text("1910"), new Value("5"));
+ m.put("bar", "1910", "5");
bw.addMutation(m);
bw.flush();
diff --git a/test/src/main/java/org/apache/accumulo/test/functional/LargeRowIT.java b/test/src/main/java/org/apache/accumulo/test/functional/LargeRowIT.java
index 0d8c428..3393a72 100644
--- a/test/src/main/java/org/apache/accumulo/test/functional/LargeRowIT.java
+++ b/test/src/main/java/org/apache/accumulo/test/functional/LargeRowIT.java
@@ -170,7 +170,7 @@
r.nextBytes(rowData);
TestIngest.toPrintableChars(rowData);
Mutation mut = new Mutation(new Text(rowData));
- mut.put(new Text(""), new Text(""), new Value(Integer.toString(i)));
+ mut.put("", "", Integer.toString(i));
bw.addMutation(mut);
}
}
diff --git a/test/src/main/java/org/apache/accumulo/test/functional/PermissionsIT.java b/test/src/main/java/org/apache/accumulo/test/functional/PermissionsIT.java
index ce74956..2ca2ca5 100644
--- a/test/src/main/java/org/apache/accumulo/test/functional/PermissionsIT.java
+++ b/test/src/main/java/org/apache/accumulo/test/functional/PermissionsIT.java
@@ -615,7 +615,7 @@
// put in some initial data
try (BatchWriter writer = c.createBatchWriter(tableName)) {
Mutation m = new Mutation(new Text("row"));
- m.put(new Text("cf"), new Text("cq"), new Value("val"));
+ m.put("cf", "cq", "val");
writer.addMutation(m);
}
@@ -651,7 +651,7 @@
try {
try (BatchWriter bw = test_user_client.createBatchWriter(tableName)) {
m = new Mutation(new Text("row"));
- m.put(new Text("a"), new Text("b"), new Value("c"));
+ m.put("a", "b", "c");
bw.addMutation(m);
} catch (MutationsRejectedException e1) {
if (e1.getSecurityErrorCodes().size() > 0)
@@ -730,7 +730,7 @@
case WRITE:
try (BatchWriter bw = test_user_client.createBatchWriter(tableName)) {
Mutation m = new Mutation(new Text("row"));
- m.put(new Text("a"), new Text("b"), new Value("c"));
+ m.put("a", "b", "c");
bw.addMutation(m);
}
break;
diff --git a/test/src/main/java/org/apache/accumulo/test/functional/ScanIdIT.java b/test/src/main/java/org/apache/accumulo/test/functional/ScanIdIT.java
index 7332c37..ad17aba 100644
--- a/test/src/main/java/org/apache/accumulo/test/functional/ScanIdIT.java
+++ b/test/src/main/java/org/apache/accumulo/test/functional/ScanIdIT.java
@@ -372,7 +372,7 @@
Text rowId = new Text(String.format("%d", ((random.nextInt(10) * 100) + i)));
Mutation m = new Mutation(rowId);
- m.put(new Text("fam1"), new Text("count"), new Value(Integer.toString(i)));
+ m.put("fam1", "count", Integer.toString(i));
m.put(new Text("fam1"), new Text("positive"), vis,
new Value(Integer.toString(NUM_DATA_ROWS - i)));
m.put(new Text("fam1"), new Text("negative"), vis,
diff --git a/test/src/main/java/org/apache/accumulo/test/functional/ScanIteratorIT.java b/test/src/main/java/org/apache/accumulo/test/functional/ScanIteratorIT.java
index 760011b..de6c0ae 100644
--- a/test/src/main/java/org/apache/accumulo/test/functional/ScanIteratorIT.java
+++ b/test/src/main/java/org/apache/accumulo/test/functional/ScanIteratorIT.java
@@ -114,8 +114,8 @@
try (BatchWriter bw = c.createBatchWriter(tableName)) {
for (int i = 0; i < 1000; i++) {
Mutation m = new Mutation(new Text(String.format("%06d", i)));
- m.put(new Text("cf1"), new Text("cq1"), new Value(Integer.toString(1000 - i)));
- m.put(new Text("cf1"), new Text("cq2"), new Value(Integer.toString(i - 1000)));
+ m.put("cf1", "cq1", Integer.toString(1000 - i));
+ m.put("cf1", "cq2", Integer.toString(i - 1000));
bw.addMutation(m);
}
}
@@ -241,7 +241,7 @@
throws TableNotFoundException, MutationsRejectedException {
try (BatchWriter batchWriter = userC.createBatchWriter(tableName)) {
Mutation m = new Mutation("1");
- m.put(new Text("2"), new Text("3"), new Value(""));
+ m.put("2", "3", "");
batchWriter.addMutation(m);
batchWriter.flush();
}
diff --git a/test/src/main/java/org/apache/accumulo/test/functional/ScanSessionTimeOutIT.java b/test/src/main/java/org/apache/accumulo/test/functional/ScanSessionTimeOutIT.java
index 6e356af..1b09d75 100644
--- a/test/src/main/java/org/apache/accumulo/test/functional/ScanSessionTimeOutIT.java
+++ b/test/src/main/java/org/apache/accumulo/test/functional/ScanSessionTimeOutIT.java
@@ -104,7 +104,7 @@
for (int i = 0; i < 100000; i++) {
Mutation m = new Mutation(new Text(String.format("%08d", i)));
for (int j = 0; j < 3; j++)
- m.put(new Text("cf1"), new Text("cq" + j), new Value(i + "_" + j));
+ m.put("cf1", "cq" + j, i + "_" + j);
bw.addMutation(m);
}
diff --git a/test/src/main/java/org/apache/accumulo/test/functional/ServerSideErrorIT.java b/test/src/main/java/org/apache/accumulo/test/functional/ServerSideErrorIT.java
index a96c219..059bcd8 100644
--- a/test/src/main/java/org/apache/accumulo/test/functional/ServerSideErrorIT.java
+++ b/test/src/main/java/org/apache/accumulo/test/functional/ServerSideErrorIT.java
@@ -59,7 +59,7 @@
try (BatchWriter bw = c.createBatchWriter(tableName)) {
Mutation m = new Mutation(new Text("r1"));
- m.put(new Text("acf"), new Text("foo"), new Value(new byte[] {'1'}));
+ m.put("acf", "foo", new Value(new byte[] {'1'}));
bw.addMutation(m);
}
diff --git a/test/src/main/java/org/apache/accumulo/test/functional/SessionBlockVerifyIT.java b/test/src/main/java/org/apache/accumulo/test/functional/SessionBlockVerifyIT.java
index 31370c4..3760d8d 100644
--- a/test/src/main/java/org/apache/accumulo/test/functional/SessionBlockVerifyIT.java
+++ b/test/src/main/java/org/apache/accumulo/test/functional/SessionBlockVerifyIT.java
@@ -91,7 +91,7 @@
for (int i = 0; i < 1000; i++) {
Mutation m = new Mutation(new Text(String.format("%08d", i)));
for (int j = 0; j < 3; j++)
- m.put(new Text("cf1"), new Text("cq" + j), new Value(i + "_" + j));
+ m.put("cf1", "cq" + j, i + "_" + j);
bw.addMutation(m);
}
diff --git a/test/src/main/java/org/apache/accumulo/test/mapred/AccumuloInputFormatIT.java b/test/src/main/java/org/apache/accumulo/test/mapred/AccumuloInputFormatIT.java
index c64691c..70c2b13 100644
--- a/test/src/main/java/org/apache/accumulo/test/mapred/AccumuloInputFormatIT.java
+++ b/test/src/main/java/org/apache/accumulo/test/mapred/AccumuloInputFormatIT.java
@@ -165,7 +165,7 @@
try (BatchWriter bw = c.createBatchWriter(table)) {
for (int i = 0; i < 100; i++) {
Mutation m = new Mutation(new Text(String.format("%09x", i + 1)));
- m.put(new Text(), new Text(), new Value(String.format("%09x", i)));
+ m.put("", "", String.format("%09x", i));
bw.addMutation(m);
}
}
@@ -193,7 +193,7 @@
try (BatchWriter bw = c.createBatchWriter(TEST_TABLE_3)) {
for (int i = 0; i < 100; i++) {
Mutation m = new Mutation(new Text(String.format("%09x", i + 1)));
- m.put(new Text(), new Text(), new Value(String.format("%09x", i)));
+ m.put("", "", String.format("%09x", i));
bw.addMutation(m);
}
}
diff --git a/test/src/main/java/org/apache/accumulo/test/mapred/AccumuloMultiTableInputFormatIT.java b/test/src/main/java/org/apache/accumulo/test/mapred/AccumuloMultiTableInputFormatIT.java
index 6ff5f56..20251dd 100644
--- a/test/src/main/java/org/apache/accumulo/test/mapred/AccumuloMultiTableInputFormatIT.java
+++ b/test/src/main/java/org/apache/accumulo/test/mapred/AccumuloMultiTableInputFormatIT.java
@@ -158,10 +158,10 @@
BatchWriter bw2 = c.createBatchWriter(table2)) {
for (int i = 0; i < 100; i++) {
Mutation t1m = new Mutation(new Text(String.format("%s_%09x", table1, i + 1)));
- t1m.put(new Text(), new Text(), new Value(String.format("%s_%09x", table1, i)));
+ t1m.put("", "", String.format("%s_%09x", table1, i));
bw.addMutation(t1m);
Mutation t2m = new Mutation(new Text(String.format("%s_%09x", table2, i + 1)));
- t2m.put(new Text(), new Text(), new Value(String.format("%s_%09x", table2, i)));
+ t2m.put("", "", String.format("%s_%09x", table2, i));
bw2.addMutation(t2m);
}
}
diff --git a/test/src/main/java/org/apache/accumulo/test/mapred/AccumuloOutputFormatIT.java b/test/src/main/java/org/apache/accumulo/test/mapred/AccumuloOutputFormatIT.java
index f241c73..cefbfb2 100644
--- a/test/src/main/java/org/apache/accumulo/test/mapred/AccumuloOutputFormatIT.java
+++ b/test/src/main/java/org/apache/accumulo/test/mapred/AccumuloOutputFormatIT.java
@@ -102,7 +102,7 @@
for (int i = 0; i < 3; i++) {
Mutation m = new Mutation(new Text(String.format("%08d", i)));
for (int j = 0; j < 3; j++) {
- m.put(new Text("cf1"), new Text("cq" + j), new Value(i + "_" + j));
+ m.put("cf1", "cq" + j, i + "_" + j);
}
writer.write(new Text(testName.getMethodName()), m);
}
@@ -228,7 +228,7 @@
try (BatchWriter bw = c.createBatchWriter(table1)) {
for (int i = 0; i < 100; i++) {
Mutation m = new Mutation(new Text(String.format("%09x", i + 1)));
- m.put(new Text(), new Text(), new Value(String.format("%09x", i)));
+ m.put("", "", String.format("%09x", i));
bw.addMutation(m);
}
}
diff --git a/test/src/main/java/org/apache/accumulo/test/mapred/TokenFileIT.java b/test/src/main/java/org/apache/accumulo/test/mapred/TokenFileIT.java
index b76c7fb..7f0dc13 100644
--- a/test/src/main/java/org/apache/accumulo/test/mapred/TokenFileIT.java
+++ b/test/src/main/java/org/apache/accumulo/test/mapred/TokenFileIT.java
@@ -176,7 +176,7 @@
try (BatchWriter bw = c.createBatchWriter(table1)) {
for (int i = 0; i < 100; i++) {
Mutation m = new Mutation(new Text(String.format("%09x", i + 1)));
- m.put(new Text(), new Text(), new Value(String.format("%09x", i)));
+ m.put("", "", String.format("%09x", i));
bw.addMutation(m);
}
}
diff --git a/test/src/main/java/org/apache/accumulo/test/mapreduce/AccumuloMultiTableInputFormatIT.java b/test/src/main/java/org/apache/accumulo/test/mapreduce/AccumuloMultiTableInputFormatIT.java
index 33590f2..031bb2f 100644
--- a/test/src/main/java/org/apache/accumulo/test/mapreduce/AccumuloMultiTableInputFormatIT.java
+++ b/test/src/main/java/org/apache/accumulo/test/mapreduce/AccumuloMultiTableInputFormatIT.java
@@ -160,10 +160,10 @@
BatchWriter bw2 = c.createBatchWriter(table2, new BatchWriterConfig());
for (int i = 0; i < 100; i++) {
Mutation t1m = new Mutation(new Text(String.format("%s_%09x", table1, i + 1)));
- t1m.put(new Text(), new Text(), new Value(String.format("%s_%09x", table1, i)));
+ t1m.put("", "", String.format("%s_%09x", table1, i));
bw.addMutation(t1m);
Mutation t2m = new Mutation(new Text(String.format("%s_%09x", table2, i + 1)));
- t2m.put(new Text(), new Text(), new Value(String.format("%s_%09x", table2, i)));
+ t2m.put("", "", String.format("%s_%09x", table2, i));
bw2.addMutation(t2m);
}
bw.close();
diff --git a/test/src/main/java/org/apache/accumulo/test/mapreduce/AccumuloOutputFormatIT.java b/test/src/main/java/org/apache/accumulo/test/mapreduce/AccumuloOutputFormatIT.java
index 7f41d5a..72d667b 100644
--- a/test/src/main/java/org/apache/accumulo/test/mapreduce/AccumuloOutputFormatIT.java
+++ b/test/src/main/java/org/apache/accumulo/test/mapreduce/AccumuloOutputFormatIT.java
@@ -144,7 +144,7 @@
try (BatchWriter bw = client.createBatchWriter(table)) {
for (int i = 0; i < 100; i++) {
Mutation m = new Mutation(new Text(String.format("%09x", i + 1)));
- m.put(new Text(), new Text(), new Value(String.format("%09x", i)));
+ m.put("", "", String.format("%09x", i));
bw.addMutation(m);
}
}
diff --git a/test/src/main/java/org/apache/accumulo/test/mapreduce/TokenFileIT.java b/test/src/main/java/org/apache/accumulo/test/mapreduce/TokenFileIT.java
index 3a2ee32..6ecb674 100644
--- a/test/src/main/java/org/apache/accumulo/test/mapreduce/TokenFileIT.java
+++ b/test/src/main/java/org/apache/accumulo/test/mapreduce/TokenFileIT.java
@@ -182,7 +182,7 @@
BatchWriter bw = c.createBatchWriter(table1, new BatchWriterConfig());
for (int i = 0; i < 100; i++) {
Mutation m = new Mutation(new Text(String.format("%09x", i + 1)));
- m.put(new Text(), new Text(), new Value(String.format("%09x", i)));
+ m.put("", "", String.format("%09x", i));
bw.addMutation(m);
}
bw.close();
diff --git a/test/src/main/java/org/apache/accumulo/test/util/SlowOps.java b/test/src/main/java/org/apache/accumulo/test/util/SlowOps.java
index 3f37075d..0dc442f 100644
--- a/test/src/main/java/org/apache/accumulo/test/util/SlowOps.java
+++ b/test/src/main/java/org/apache/accumulo/test/util/SlowOps.java
@@ -133,7 +133,7 @@
// populate
for (int i = 0; i < NUM_DATA_ROWS; i++) {
Mutation m = new Mutation(new Text(String.format("%05d", i)));
- m.put(new Text("col" + ((i % 3) + 1)), new Text("qual"), new Value("junk"));
+ m.put("col" + ((i % 3) + 1), "qual", "junk");
bw.addMutation(m);
}
}
diff --git a/test/src/test/java/org/apache/accumulo/test/constraints/AlphaNumKeyConstraintTest.java b/test/src/test/java/org/apache/accumulo/test/constraints/AlphaNumKeyConstraintTest.java
index 94441d8..3c9fa08 100644
--- a/test/src/test/java/org/apache/accumulo/test/constraints/AlphaNumKeyConstraintTest.java
+++ b/test/src/test/java/org/apache/accumulo/test/constraints/AlphaNumKeyConstraintTest.java
@@ -24,7 +24,6 @@
import java.util.List;
import org.apache.accumulo.core.data.Mutation;
-import org.apache.accumulo.core.data.Value;
import org.apache.hadoop.io.Text;
import org.junit.Test;
@@ -35,12 +34,12 @@
@Test
public void test() {
Mutation goodMutation = new Mutation(new Text("Row1"));
- goodMutation.put(new Text("Colf2"), new Text("ColQ3"), new Value("value"));
+ goodMutation.put("Colf2", "ColQ3", "value");
assertNull(ankc.check(null, goodMutation));
// Check that violations are in row, cf, cq order
Mutation badMutation = new Mutation(new Text("Row#1"));
- badMutation.put(new Text("Colf$2"), new Text("Colq%3"), new Value("value"));
+ badMutation.put("Colf$2", "Colq%3", "value");
assertEquals(List.of(AlphaNumKeyConstraint.NON_ALPHA_NUM_ROW,
AlphaNumKeyConstraint.NON_ALPHA_NUM_COLF, AlphaNumKeyConstraint.NON_ALPHA_NUM_COLQ),
ankc.check(null, badMutation));
diff --git a/test/src/test/java/org/apache/accumulo/test/constraints/NumericValueConstraintTest.java b/test/src/test/java/org/apache/accumulo/test/constraints/NumericValueConstraintTest.java
index 5ef558a..c4fbf6e 100644
--- a/test/src/test/java/org/apache/accumulo/test/constraints/NumericValueConstraintTest.java
+++ b/test/src/test/java/org/apache/accumulo/test/constraints/NumericValueConstraintTest.java
@@ -22,7 +22,6 @@
import static org.junit.Assert.assertNull;
import org.apache.accumulo.core.data.Mutation;
-import org.apache.accumulo.core.data.Value;
import org.apache.hadoop.io.Text;
import org.junit.Test;
@@ -35,13 +34,13 @@
@Test
public void testCheck() {
Mutation goodMutation = new Mutation(new Text("r"));
- goodMutation.put(new Text("cf"), new Text("cq"), new Value("1234"));
+ goodMutation.put("cf", "cq", "1234");
assertNull(nvc.check(null, goodMutation));
// Check that multiple bad mutations result in one violation only
Mutation badMutation = new Mutation(new Text("r"));
- badMutation.put(new Text("cf"), new Text("cq"), new Value("foo1234"));
- badMutation.put(new Text("cf2"), new Text("cq2"), new Value("foo1234"));
+ badMutation.put("cf", "cq", "foo1234");
+ badMutation.put("cf2", "cq2", "foo1234");
assertEquals(NumericValueConstraint.NON_NUMERIC_VALUE,
Iterables.getOnlyElement(nvc.check(null, badMutation)).shortValue());
}
