http://git-wip-us.apache.org/repos/asf/accumulo/blob/a4a45398/core/src/test/java/org/apache/accumulo/core/file/rfile/RFileTest.java ---------------------------------------------------------------------- diff --git a/core/src/test/java/org/apache/accumulo/core/file/rfile/RFileTest.java b/core/src/test/java/org/apache/accumulo/core/file/rfile/RFileTest.java index c700e6b..96f97e7 100644 --- a/core/src/test/java/org/apache/accumulo/core/file/rfile/RFileTest.java +++ b/core/src/test/java/org/apache/accumulo/core/file/rfile/RFileTest.java @@ -245,15 +245,15 @@ public class RFileTest { } } - static Key nk(String row, String cf, String cq, String cv, long ts) { + static Key newKey(String row, String cf, String cq, String cv, long ts) { return new Key(row.getBytes(), cf.getBytes(), cq.getBytes(), cv.getBytes(), ts); } - static Value nv(String val) { + static Value newValue(String val) { return new Value(val.getBytes()); } - static String nf(String prefix, int i) { + static String formatString(String prefix, int i) { return String.format(prefix + "%06d", i); } @@ -286,31 +286,31 @@ public class RFileTest { TestRFile trf = new TestRFile(conf); trf.openWriter(); - trf.writer.append(nk("r1", "cf1", "cq1", "L1", 55), nv("foo")); + trf.writer.append(newKey("r1", "cf1", "cq1", "L1", 55), newValue("foo")); trf.closeWriter(); trf.openReader(); // seek before everything trf.seek(null); assertTrue(trf.iter.hasTop()); - assertTrue(trf.iter.getTopKey().equals(nk("r1", "cf1", "cq1", "L1", 55))); - assertTrue(trf.iter.getTopValue().equals(nv("foo"))); + assertTrue(trf.iter.getTopKey().equals(newKey("r1", "cf1", "cq1", "L1", 55))); + assertTrue(trf.iter.getTopValue().equals(newValue("foo"))); trf.iter.next(); assertFalse(trf.iter.hasTop()); // seek after the key - trf.seek(nk("r2", "cf1", "cq1", "L1", 55)); + trf.seek(newKey("r2", "cf1", "cq1", "L1", 55)); assertFalse(trf.iter.hasTop()); // seek exactly to the key - trf.seek(nk("r1", "cf1", "cq1", "L1", 55)); + trf.seek(newKey("r1", "cf1", "cq1", "L1", 55)); assertTrue(trf.iter.hasTop()); - assertTrue(trf.iter.getTopKey().equals(nk("r1", "cf1", "cq1", "L1", 55))); - assertTrue(trf.iter.getTopValue().equals(nv("foo"))); + assertTrue(trf.iter.getTopKey().equals(newKey("r1", "cf1", "cq1", "L1", 55))); + assertTrue(trf.iter.getTopValue().equals(newValue("foo"))); trf.iter.next(); assertFalse(trf.iter.hasTop()); - assertEquals(nk("r1", "cf1", "cq1", "L1", 55), trf.reader.getLastKey()); + assertEquals(newKey("r1", "cf1", "cq1", "L1", 55), trf.reader.getLastKey()); trf.closeReader(); } @@ -330,26 +330,26 @@ public class RFileTest { ArrayList<Value> expectedValues = new ArrayList<>(10000); for (int row = 0; row < 4; row++) { - String rowS = nf("r_", row); + String rowS = formatString("r_", row); for (int cf = 0; cf < 4; cf++) { - String cfS = nf("cf_", cf); + String cfS = formatString("cf_", cf); for (int cq = 0; cq < 4; cq++) { - String cqS = nf("cq_", cq); + String cqS = formatString("cq_", cq); for (int cv = 'A'; cv < 'A' + 4; cv++) { String cvS = "" + (char) cv; for (int ts = 4; ts > 0; ts--) { - Key k = nk(rowS, cfS, cqS, cvS, ts); + Key k = newKey(rowS, cfS, cqS, cvS, ts); // check below ensures when all key sizes are same more than one index block is created assertEquals(27, k.getSize()); k.setDeleted(true); - Value v = nv("" + val); + Value v = newValue("" + val); trf.writer.append(k, v); expectedKeys.add(k); expectedValues.add(v); - k = nk(rowS, cfS, cqS, cvS, ts); + k = newKey(rowS, cfS, cqS, cvS, ts); assertEquals(27, k.getSize()); - v = nv("" + val); + v = newValue("" + val); trf.writer.append(k, v); expectedKeys.add(k); expectedValues.add(v); @@ -361,7 +361,7 @@ public class RFileTest { } } - // trf.writer.append(nk("r1","cf1","cq1","L1", 55), nv("foo")); + // trf.writer.append(newKey("r1","cf1","cq1","L1", 55), newValue("foo")); trf.closeWriter(); trf.openReader(); @@ -491,37 +491,37 @@ public class RFileTest { trf.openWriter(); - trf.writer.append(nk("r1", "cf1", "cq1", "L1", 55), nv("foo1")); + trf.writer.append(newKey("r1", "cf1", "cq1", "L1", 55), newValue("foo1")); try { - trf.writer.append(nk("r0", "cf1", "cq1", "L1", 55), nv("foo1")); + trf.writer.append(newKey("r0", "cf1", "cq1", "L1", 55), newValue("foo1")); assertFalse(true); } catch (IllegalStateException ioe) { } try { - trf.writer.append(nk("r1", "cf0", "cq1", "L1", 55), nv("foo1")); + trf.writer.append(newKey("r1", "cf0", "cq1", "L1", 55), newValue("foo1")); assertFalse(true); } catch (IllegalStateException ioe) { } try { - trf.writer.append(nk("r1", "cf1", "cq0", "L1", 55), nv("foo1")); + trf.writer.append(newKey("r1", "cf1", "cq0", "L1", 55), newValue("foo1")); assertFalse(true); } catch (IllegalStateException ioe) { } try { - trf.writer.append(nk("r1", "cf1", "cq1", "L0", 55), nv("foo1")); + trf.writer.append(newKey("r1", "cf1", "cq1", "L0", 55), newValue("foo1")); assertFalse(true); } catch (IllegalStateException ioe) { } try { - trf.writer.append(nk("r1", "cf1", "cq1", "L1", 56), nv("foo1")); + trf.writer.append(newKey("r1", "cf1", "cq1", "L1", 56), newValue("foo1")); assertFalse(true); } catch (IllegalStateException ioe) { @@ -534,25 +534,25 @@ public class RFileTest { TestRFile trf = new TestRFile(conf); trf.openWriter(); - trf.writer.append(nk("r1", "cf1", "cq1", "L1", 55), nv("foo1")); - trf.writer.append(nk("r1", "cf1", "cq4", "L1", 56), nv("foo2")); + trf.writer.append(newKey("r1", "cf1", "cq1", "L1", 55), newValue("foo1")); + trf.writer.append(newKey("r1", "cf1", "cq4", "L1", 56), newValue("foo2")); trf.closeWriter(); trf.openReader(); // test seeking between keys - trf.seek(nk("r1", "cf1", "cq3", "L1", 55)); + trf.seek(newKey("r1", "cf1", "cq3", "L1", 55)); assertTrue(trf.iter.hasTop()); - assertEquals(nk("r1", "cf1", "cq4", "L1", 56), trf.iter.getTopKey()); - assertEquals(nv("foo2"), trf.iter.getTopValue()); + assertEquals(newKey("r1", "cf1", "cq4", "L1", 56), trf.iter.getTopKey()); + assertEquals(newValue("foo2"), trf.iter.getTopValue()); // test seeking right before previous seek - trf.seek(nk("r1", "cf1", "cq0", "L1", 55)); + trf.seek(newKey("r1", "cf1", "cq0", "L1", 55)); assertTrue(trf.iter.hasTop()); - assertEquals(nk("r1", "cf1", "cq1", "L1", 55), trf.iter.getTopKey()); - assertEquals(nv("foo1"), trf.iter.getTopValue()); + assertEquals(newKey("r1", "cf1", "cq1", "L1", 55), trf.iter.getTopKey()); + assertEquals(newValue("foo1"), trf.iter.getTopValue()); - assertEquals(nk("r1", "cf1", "cq4", "L1", 56), trf.reader.getLastKey()); + assertEquals(newKey("r1", "cf1", "cq4", "L1", 56), trf.reader.getLastKey()); trf.closeReader(); } @@ -564,7 +564,7 @@ public class RFileTest { trf.openWriter(); for (int i = 0; i < 500; i++) { - trf.writer.append(nk(nf("r_", i), "cf1", "cq1", "L1", 55), nv("foo1")); + trf.writer.append(newKey(formatString("r_", i), "cf1", "cq1", "L1", 55), newValue("foo1")); } trf.closeWriter(); @@ -573,19 +573,19 @@ public class RFileTest { // repeatedly seek to locations before the first key in the file for (int i = 0; i < 10; i++) { - trf.seek(nk(nf("q_", i), "cf1", "cq1", "L1", 55)); + trf.seek(newKey(formatString("q_", i), "cf1", "cq1", "L1", 55)); assertTrue(trf.iter.hasTop()); - assertEquals(nk(nf("r_", 0), "cf1", "cq1", "L1", 55), trf.iter.getTopKey()); - assertEquals(nv("foo1"), trf.iter.getTopValue()); + assertEquals(newKey(formatString("r_", 0), "cf1", "cq1", "L1", 55), trf.iter.getTopKey()); + assertEquals(newValue("foo1"), trf.iter.getTopValue()); } // repeatedly seek to locations after the last key in the file for (int i = 0; i < 10; i++) { - trf.seek(nk(nf("s_", i), "cf1", "cq1", "L1", 55)); + trf.seek(newKey(formatString("s_", i), "cf1", "cq1", "L1", 55)); assertFalse(trf.iter.hasTop()); } - assertEquals(nk(nf("r_", 499), "cf1", "cq1", "L1", 55), trf.reader.getLastKey()); + assertEquals(newKey(formatString("r_", 499), "cf1", "cq1", "L1", 55), trf.reader.getLastKey()); trf.closeReader(); } @@ -598,7 +598,7 @@ public class RFileTest { trf.openWriter(); for (int i = 2; i < 50; i++) { - trf.writer.append(nk(nf("r_", i), "cf1", "cq1", "L1", 55), nv("foo" + i)); + trf.writer.append(newKey(formatString("r_", i), "cf1", "cq1", "L1", 55), newValue("foo" + i)); } trf.closeWriter(); @@ -606,38 +606,44 @@ public class RFileTest { trf.openReader(); // test that has top returns false when end of range reached - trf.iter.seek(new Range(nk(nf("r_", 3), "cf1", "cq1", "L1", 55), true, nk(nf("r_", 4), "cf1", "cq1", "L1", 55), false), EMPTY_COL_FAMS, false); + trf.iter.seek(new Range(newKey(formatString("r_", 3), "cf1", "cq1", "L1", 55), true, newKey(formatString("r_", 4), "cf1", "cq1", "L1", 55), false), + EMPTY_COL_FAMS, false); assertTrue(trf.iter.hasTop()); - assertTrue(trf.iter.getTopKey().equals(nk(nf("r_", 3), "cf1", "cq1", "L1", 55))); - assertEquals(nv("foo" + 3), trf.iter.getTopValue()); + assertTrue(trf.iter.getTopKey().equals(newKey(formatString("r_", 3), "cf1", "cq1", "L1", 55))); + assertEquals(newValue("foo" + 3), trf.iter.getTopValue()); trf.iter.next(); assertFalse(trf.iter.hasTop()); // test seeking to a range that is between two keys, should not return anything - trf.iter.seek(new Range(nk(nf("r_", 4) + "a", "cf1", "cq1", "L1", 55), true, nk(nf("r_", 4) + "b", "cf1", "cq1", "L1", 55), true), EMPTY_COL_FAMS, false); + trf.iter.seek(new Range(newKey(formatString("r_", 4) + "a", "cf1", "cq1", "L1", 55), true, newKey(formatString("r_", 4) + "b", "cf1", "cq1", "L1", 55), + true), EMPTY_COL_FAMS, false); assertFalse(trf.iter.hasTop()); // test seeking to another range after the previously seeked range, that is between the same two keys in the file // as the previously seeked range.... this test an optimization on RFile - trf.iter.seek(new Range(nk(nf("r_", 4) + "c", "cf1", "cq1", "L1", 55), true, nk(nf("r_", 4) + "d", "cf1", "cq1", "L1", 55), true), EMPTY_COL_FAMS, false); + trf.iter.seek(new Range(newKey(formatString("r_", 4) + "c", "cf1", "cq1", "L1", 55), true, newKey(formatString("r_", 4) + "d", "cf1", "cq1", "L1", 55), + true), EMPTY_COL_FAMS, false); assertFalse(trf.iter.hasTop()); - trf.iter.seek(new Range(nk(nf("r_", 4) + "e", "cf1", "cq1", "L1", 55), true, nk(nf("r_", 4) + "f", "cf1", "cq1", "L1", 55), true), EMPTY_COL_FAMS, false); + trf.iter.seek(new Range(newKey(formatString("r_", 4) + "e", "cf1", "cq1", "L1", 55), true, newKey(formatString("r_", 4) + "f", "cf1", "cq1", "L1", 55), + true), EMPTY_COL_FAMS, false); assertFalse(trf.iter.hasTop()); // now ensure we can seek somewhere, that triggering the optimization does not cause any problems - trf.iter.seek(new Range(nk(nf("r_", 5), "cf1", "cq1", "L1", 55), true, nk(nf("r_", 6), "cf1", "cq1", "L1", 55), false), EMPTY_COL_FAMS, false); + trf.iter.seek(new Range(newKey(formatString("r_", 5), "cf1", "cq1", "L1", 55), true, newKey(formatString("r_", 6), "cf1", "cq1", "L1", 55), false), + EMPTY_COL_FAMS, false); assertTrue(trf.iter.hasTop()); - assertTrue(trf.iter.getTopKey().equals(nk(nf("r_", 5), "cf1", "cq1", "L1", 55))); - assertEquals(nv("foo" + 5), trf.iter.getTopValue()); + assertTrue(trf.iter.getTopKey().equals(newKey(formatString("r_", 5), "cf1", "cq1", "L1", 55))); + assertEquals(newValue("foo" + 5), trf.iter.getTopValue()); trf.iter.next(); assertFalse(trf.iter.hasTop()); // test seeking to range that is before the beginning of the file - trf.iter.seek(new Range(nk(nf("r_", 0), "cf1", "cq1", "L1", 55), true, nk(nf("r_", 2), "cf1", "cq1", "L1", 55), false), EMPTY_COL_FAMS, false); + trf.iter.seek(new Range(newKey(formatString("r_", 0), "cf1", "cq1", "L1", 55), true, newKey(formatString("r_", 2), "cf1", "cq1", "L1", 55), false), + EMPTY_COL_FAMS, false); assertFalse(trf.iter.hasTop()); - assertEquals(nk(nf("r_", 49), "cf1", "cq1", "L1", 55), trf.reader.getLastKey()); + assertEquals(newKey(formatString("r_", 49), "cf1", "cq1", "L1", 55), trf.reader.getLastKey()); trf.reader.close(); } @@ -649,7 +655,7 @@ public class RFileTest { trf.openWriter(); for (int i = 0; i < 2500; i++) { - trf.writer.append(nk(nf("r_", i), "cf1", "cq1", "L1", 42), nv("foo" + i)); + trf.writer.append(newKey(formatString("r_", i), "cf1", "cq1", "L1", 42), newValue("foo" + i)); } trf.closeWriter(); @@ -657,23 +663,23 @@ public class RFileTest { // test seeking between each key forward for (int i = 0; i < 2499; i++) { - trf.seek(nk(nf("r_", i), "cf1", "cq1", "L1", 42).followingKey(PartialKey.ROW)); + trf.seek(newKey(formatString("r_", i), "cf1", "cq1", "L1", 42).followingKey(PartialKey.ROW)); assertTrue(trf.iter.hasTop()); - assertEquals(nk(nf("r_", i + 1), "cf1", "cq1", "L1", 42), trf.iter.getTopKey()); + assertEquals(newKey(formatString("r_", i + 1), "cf1", "cq1", "L1", 42), trf.iter.getTopKey()); } // test seeking between each key forward for (int i = 0; i < 2499; i += 2) { - trf.seek(nk(nf("r_", i), "cf1", "cq1", "L1", 42).followingKey(PartialKey.ROW)); + trf.seek(newKey(formatString("r_", i), "cf1", "cq1", "L1", 42).followingKey(PartialKey.ROW)); assertTrue(trf.iter.hasTop()); - assertEquals(nk(nf("r_", i + 1), "cf1", "cq1", "L1", 42), trf.iter.getTopKey()); + assertEquals(newKey(formatString("r_", i + 1), "cf1", "cq1", "L1", 42), trf.iter.getTopKey()); } // test seeking backwards between each key for (int i = 2498; i >= 0; i--) { - trf.seek(nk(nf("r_", i), "cf1", "cq1", "L1", 42).followingKey(PartialKey.ROW)); + trf.seek(newKey(formatString("r_", i), "cf1", "cq1", "L1", 42).followingKey(PartialKey.ROW)); assertTrue(trf.iter.hasTop()); - assertEquals(nk(nf("r_", i + 1), "cf1", "cq1", "L1", 42), trf.iter.getTopKey()); + assertEquals(newKey(formatString("r_", i + 1), "cf1", "cq1", "L1", 42), trf.iter.getTopKey()); } trf.closeReader(); @@ -684,7 +690,7 @@ public class RFileTest { trf.openWriter(); for (int i = 0; i < 2500; i++) { - trf.writer.append(nk(nf("r_", 0), nf("cf_", i), "cq1", "L1", 42), nv("foo" + i)); + trf.writer.append(newKey(formatString("r_", 0), formatString("cf_", i), "cq1", "L1", 42), newValue("foo" + i)); } trf.closeWriter(); @@ -692,23 +698,23 @@ public class RFileTest { // test seeking between each key forward for (int i = 0; i < 2499; i++) { - trf.seek(nk(nf("r_", 0), nf("cf_", i), "cq1", "L1", 42).followingKey(PartialKey.ROW_COLFAM)); + trf.seek(newKey(formatString("r_", 0), formatString("cf_", i), "cq1", "L1", 42).followingKey(PartialKey.ROW_COLFAM)); assertTrue(trf.iter.hasTop()); - assertEquals(nk(nf("r_", 0), nf("cf_", i + 1), "cq1", "L1", 42), trf.iter.getTopKey()); + assertEquals(newKey(formatString("r_", 0), formatString("cf_", i + 1), "cq1", "L1", 42), trf.iter.getTopKey()); } // test seeking between each key forward for (int i = 0; i < 2499; i += 2) { - trf.seek(nk(nf("r_", 0), nf("cf_", i), "cq1", "L1", 42).followingKey(PartialKey.ROW_COLFAM)); + trf.seek(newKey(formatString("r_", 0), formatString("cf_", i), "cq1", "L1", 42).followingKey(PartialKey.ROW_COLFAM)); assertTrue(trf.iter.hasTop()); - assertEquals(nk(nf("r_", 0), nf("cf_", i + 1), "cq1", "L1", 42), trf.iter.getTopKey()); + assertEquals(newKey(formatString("r_", 0), formatString("cf_", i + 1), "cq1", "L1", 42), trf.iter.getTopKey()); } // test seeking backwards between each key for (int i = 2498; i >= 0; i--) { - trf.seek(nk(nf("r_", 0), nf("cf_", i), "cq1", "L1", 42).followingKey(PartialKey.ROW_COLFAM)); + trf.seek(newKey(formatString("r_", 0), formatString("cf_", i), "cq1", "L1", 42).followingKey(PartialKey.ROW_COLFAM)); assertTrue(trf.iter.hasTop()); - assertEquals(nk(nf("r_", 0), nf("cf_", i + 1), "cq1", "L1", 42), trf.iter.getTopKey()); + assertEquals(newKey(formatString("r_", 0), formatString("cf_", i + 1), "cq1", "L1", 42), trf.iter.getTopKey()); } trf.closeReader(); @@ -719,7 +725,7 @@ public class RFileTest { trf.openWriter(); for (int i = 0; i < 2500; i++) { - trf.writer.append(nk(nf("r_", 0), nf("cf_", 0), nf("cq_", i), "L1", 42), nv("foo" + i)); + trf.writer.append(newKey(formatString("r_", 0), formatString("cf_", 0), formatString("cq_", i), "L1", 42), newValue("foo" + i)); } trf.closeWriter(); @@ -727,29 +733,29 @@ public class RFileTest { // test seeking between each key forward for (int i = 0; i < 2499; i++) { - trf.seek(nk(nf("r_", 0), nf("cf_", 0), nf("cq_", i), "L1", 42).followingKey(PartialKey.ROW_COLFAM_COLQUAL)); + trf.seek(newKey(formatString("r_", 0), formatString("cf_", 0), formatString("cq_", i), "L1", 42).followingKey(PartialKey.ROW_COLFAM_COLQUAL)); assertTrue(trf.iter.hasTop()); - assertEquals(nk(nf("r_", 0), nf("cf_", 0), nf("cq_", i + 1), "L1", 42), trf.iter.getTopKey()); + assertEquals(newKey(formatString("r_", 0), formatString("cf_", 0), formatString("cq_", i + 1), "L1", 42), trf.iter.getTopKey()); } // test seeking between each key forward for (int i = 0; i < 2499; i += 2) { - trf.seek(nk(nf("r_", 0), nf("cf_", 0), nf("cq_", i), "L1", 42).followingKey(PartialKey.ROW_COLFAM_COLQUAL)); + trf.seek(newKey(formatString("r_", 0), formatString("cf_", 0), formatString("cq_", i), "L1", 42).followingKey(PartialKey.ROW_COLFAM_COLQUAL)); assertTrue(trf.iter.hasTop()); - assertEquals(nk(nf("r_", 0), nf("cf_", 0), nf("cq_", i + 1), "L1", 42), trf.iter.getTopKey()); + assertEquals(newKey(formatString("r_", 0), formatString("cf_", 0), formatString("cq_", i + 1), "L1", 42), trf.iter.getTopKey()); } // test seeking backwards between each key for (int i = 2498; i >= 0; i--) { - trf.seek(nk(nf("r_", 0), nf("cf_", 0), nf("cq_", i), "L1", 42).followingKey(PartialKey.ROW_COLFAM_COLQUAL)); + trf.seek(newKey(formatString("r_", 0), formatString("cf_", 0), formatString("cq_", i), "L1", 42).followingKey(PartialKey.ROW_COLFAM_COLQUAL)); assertTrue(trf.iter.hasTop()); - assertEquals(nk(nf("r_", 0), nf("cf_", 0), nf("cq_", i + 1), "L1", 42), trf.iter.getTopKey()); + assertEquals(newKey(formatString("r_", 0), formatString("cf_", 0), formatString("cq_", i + 1), "L1", 42), trf.iter.getTopKey()); } trf.closeReader(); } - public static Set<ByteSequence> ncfs(String... colFams) { + public static Set<ByteSequence> newColFamByteSequence(String... colFams) { HashSet<ByteSequence> cfs = new HashSet<>(); for (String cf : colFams) { @@ -765,135 +771,135 @@ public class RFileTest { trf.openWriter(false); - trf.writer.startNewLocalityGroup("lg1", ncfs("cf1", "cf2")); + trf.writer.startNewLocalityGroup("lg1", newColFamByteSequence("cf1", "cf2")); - trf.writer.append(nk("0000", "cf1", "doe,john", "", 4), nv("1123 West Left st")); - trf.writer.append(nk("0002", "cf2", "doe,jane", "", 5), nv("1124 East Right st")); + trf.writer.append(newKey("0000", "cf1", "doe,john", "", 4), newValue("1123 West Left st")); + trf.writer.append(newKey("0002", "cf2", "doe,jane", "", 5), newValue("1124 East Right st")); - trf.writer.startNewLocalityGroup("lg2", ncfs("cf3", "cf4")); + trf.writer.startNewLocalityGroup("lg2", newColFamByteSequence("cf3", "cf4")); - trf.writer.append(nk("0001", "cf3", "buck,john", "", 4), nv("90 Slum st")); - trf.writer.append(nk("0003", "cf4", "buck,jane", "", 5), nv("09 Slum st")); + trf.writer.append(newKey("0001", "cf3", "buck,john", "", 4), newValue("90 Slum st")); + trf.writer.append(newKey("0003", "cf4", "buck,jane", "", 5), newValue("09 Slum st")); trf.writer.close(); trf.openReader(); // scan first loc group - Range r = new Range(nk("0000", "cf1", "doe,john", "", 4), true, nk("0003", "cf4", "buck,jane", "", 5), true); - trf.iter.seek(r, ncfs("cf1", "cf2"), true); + Range r = new Range(newKey("0000", "cf1", "doe,john", "", 4), true, newKey("0003", "cf4", "buck,jane", "", 5), true); + trf.iter.seek(r, newColFamByteSequence("cf1", "cf2"), true); assertEquals(1, trf.reader.getNumLocalityGroupsSeeked()); assertTrue(trf.iter.hasTop()); - assertTrue(trf.iter.getTopKey().equals(nk("0000", "cf1", "doe,john", "", 4))); - assertEquals(nv("1123 West Left st"), trf.iter.getTopValue()); + assertTrue(trf.iter.getTopKey().equals(newKey("0000", "cf1", "doe,john", "", 4))); + assertEquals(newValue("1123 West Left st"), trf.iter.getTopValue()); trf.iter.next(); assertTrue(trf.iter.hasTop()); - assertTrue(trf.iter.getTopKey().equals(nk("0002", "cf2", "doe,jane", "", 5))); - assertEquals(nv("1124 East Right st"), trf.iter.getTopValue()); + assertTrue(trf.iter.getTopKey().equals(newKey("0002", "cf2", "doe,jane", "", 5))); + assertEquals(newValue("1124 East Right st"), trf.iter.getTopValue()); trf.iter.next(); assertFalse(trf.iter.hasTop()); // scan second loc group - r = new Range(nk("0000", "cf1", "doe,john", "", 4), true, nk("0003", "cf4", "buck,jane", "", 5), true); - trf.iter.seek(r, ncfs("cf3", "cf4"), true); + r = new Range(newKey("0000", "cf1", "doe,john", "", 4), true, newKey("0003", "cf4", "buck,jane", "", 5), true); + trf.iter.seek(r, newColFamByteSequence("cf3", "cf4"), true); assertEquals(1, trf.reader.getNumLocalityGroupsSeeked()); assertTrue(trf.iter.hasTop()); - assertTrue(trf.iter.getTopKey().equals(nk("0001", "cf3", "buck,john", "", 4))); - assertEquals(nv("90 Slum st"), trf.iter.getTopValue()); + assertTrue(trf.iter.getTopKey().equals(newKey("0001", "cf3", "buck,john", "", 4))); + assertEquals(newValue("90 Slum st"), trf.iter.getTopValue()); trf.iter.next(); assertTrue(trf.iter.hasTop()); - assertTrue(trf.iter.getTopKey().equals(nk("0003", "cf4", "buck,jane", "", 5))); - assertEquals(nv("09 Slum st"), trf.iter.getTopValue()); + assertTrue(trf.iter.getTopKey().equals(newKey("0003", "cf4", "buck,jane", "", 5))); + assertEquals(newValue("09 Slum st"), trf.iter.getTopValue()); trf.iter.next(); assertFalse(trf.iter.hasTop()); // scan all loc groups - r = new Range(nk("0000", "cf1", "doe,john", "", 4), true, nk("0003", "cf4", "buck,jane", "", 5), true); + r = new Range(newKey("0000", "cf1", "doe,john", "", 4), true, newKey("0003", "cf4", "buck,jane", "", 5), true); trf.iter.seek(r, EMPTY_COL_FAMS, false); assertEquals(2, trf.reader.getNumLocalityGroupsSeeked()); assertTrue(trf.iter.hasTop()); - assertTrue(trf.iter.getTopKey().equals(nk("0000", "cf1", "doe,john", "", 4))); - assertEquals(nv("1123 West Left st"), trf.iter.getTopValue()); + assertTrue(trf.iter.getTopKey().equals(newKey("0000", "cf1", "doe,john", "", 4))); + assertEquals(newValue("1123 West Left st"), trf.iter.getTopValue()); trf.iter.next(); assertTrue(trf.iter.hasTop()); - assertTrue(trf.iter.getTopKey().equals(nk("0001", "cf3", "buck,john", "", 4))); - assertEquals(nv("90 Slum st"), trf.iter.getTopValue()); + assertTrue(trf.iter.getTopKey().equals(newKey("0001", "cf3", "buck,john", "", 4))); + assertEquals(newValue("90 Slum st"), trf.iter.getTopValue()); trf.iter.next(); assertTrue(trf.iter.hasTop()); - assertTrue(trf.iter.getTopKey().equals(nk("0002", "cf2", "doe,jane", "", 5))); - assertEquals(nv("1124 East Right st"), trf.iter.getTopValue()); + assertTrue(trf.iter.getTopKey().equals(newKey("0002", "cf2", "doe,jane", "", 5))); + assertEquals(newValue("1124 East Right st"), trf.iter.getTopValue()); trf.iter.next(); assertTrue(trf.iter.hasTop()); - assertTrue(trf.iter.getTopKey().equals(nk("0003", "cf4", "buck,jane", "", 5))); - assertEquals(nv("09 Slum st"), trf.iter.getTopValue()); + assertTrue(trf.iter.getTopKey().equals(newKey("0003", "cf4", "buck,jane", "", 5))); + assertEquals(newValue("09 Slum st"), trf.iter.getTopValue()); trf.iter.next(); assertFalse(trf.iter.hasTop()); // scan no loc groups - r = new Range(nk("0000", "cf1", "doe,john", "", 4), true, nk("0003", "cf4", "buck,jane", "", 5), true); - trf.iter.seek(r, ncfs("saint", "dogooder"), true); + r = new Range(newKey("0000", "cf1", "doe,john", "", 4), true, newKey("0003", "cf4", "buck,jane", "", 5), true); + trf.iter.seek(r, newColFamByteSequence("saint", "dogooder"), true); assertEquals(0, trf.reader.getNumLocalityGroupsSeeked()); assertFalse(trf.iter.hasTop()); // scan a subset of second locality group - r = new Range(nk("0000", "cf1", "doe,john", "", 4), true, nk("0003", "cf4", "buck,jane", "", 5), true); - trf.iter.seek(r, ncfs("cf4"), true); + r = new Range(newKey("0000", "cf1", "doe,john", "", 4), true, newKey("0003", "cf4", "buck,jane", "", 5), true); + trf.iter.seek(r, newColFamByteSequence("cf4"), true); assertEquals(1, trf.reader.getNumLocalityGroupsSeeked()); assertTrue(trf.iter.hasTop()); - assertTrue(trf.iter.getTopKey().equals(nk("0003", "cf4", "buck,jane", "", 5))); - assertEquals(nv("09 Slum st"), trf.iter.getTopValue()); + assertTrue(trf.iter.getTopKey().equals(newKey("0003", "cf4", "buck,jane", "", 5))); + assertEquals(newValue("09 Slum st"), trf.iter.getTopValue()); trf.iter.next(); assertFalse(trf.iter.hasTop()); // scan a subset of second locality group - r = new Range(nk("0000", "cf1", "doe,john", "", 4), true, nk("0003", "cf4", "buck,jane", "", 5), true); - trf.iter.seek(r, ncfs("cf3"), true); + r = new Range(newKey("0000", "cf1", "doe,john", "", 4), true, newKey("0003", "cf4", "buck,jane", "", 5), true); + trf.iter.seek(r, newColFamByteSequence("cf3"), true); assertEquals(1, trf.reader.getNumLocalityGroupsSeeked()); assertTrue(trf.iter.hasTop()); - assertTrue(trf.iter.getTopKey().equals(nk("0001", "cf3", "buck,john", "", 4))); - assertEquals(nv("90 Slum st"), trf.iter.getTopValue()); + assertTrue(trf.iter.getTopKey().equals(newKey("0001", "cf3", "buck,john", "", 4))); + assertEquals(newValue("90 Slum st"), trf.iter.getTopValue()); trf.iter.next(); assertFalse(trf.iter.hasTop()); // scan subset of first loc group - r = new Range(nk("0000", "cf1", "doe,john", "", 4), true, nk("0003", "cf4", "buck,jane", "", 5), true); - trf.iter.seek(r, ncfs("cf1"), true); + r = new Range(newKey("0000", "cf1", "doe,john", "", 4), true, newKey("0003", "cf4", "buck,jane", "", 5), true); + trf.iter.seek(r, newColFamByteSequence("cf1"), true); assertEquals(1, trf.reader.getNumLocalityGroupsSeeked()); assertTrue(trf.iter.hasTop()); - assertTrue(trf.iter.getTopKey().equals(nk("0000", "cf1", "doe,john", "", 4))); - assertEquals(nv("1123 West Left st"), trf.iter.getTopValue()); + assertTrue(trf.iter.getTopKey().equals(newKey("0000", "cf1", "doe,john", "", 4))); + assertEquals(newValue("1123 West Left st"), trf.iter.getTopValue()); trf.iter.next(); assertFalse(trf.iter.hasTop()); // scan subset of first loc group - r = new Range(nk("0000", "cf1", "doe,john", "", 4), true, nk("0003", "cf4", "buck,jane", "", 5), true); - trf.iter.seek(r, ncfs("cf2"), true); + r = new Range(newKey("0000", "cf1", "doe,john", "", 4), true, newKey("0003", "cf4", "buck,jane", "", 5), true); + trf.iter.seek(r, newColFamByteSequence("cf2"), true); assertEquals(1, trf.reader.getNumLocalityGroupsSeeked()); assertTrue(trf.iter.hasTop()); - assertTrue(trf.iter.getTopKey().equals(nk("0002", "cf2", "doe,jane", "", 5))); - assertEquals(nv("1124 East Right st"), trf.iter.getTopValue()); + assertTrue(trf.iter.getTopKey().equals(newKey("0002", "cf2", "doe,jane", "", 5))); + assertEquals(newValue("1124 East Right st"), trf.iter.getTopValue()); trf.iter.next(); assertFalse(trf.iter.hasTop()); // scan subset of all loc groups - r = new Range(nk("0000", "cf1", "doe,john", "", 4), true, nk("0003", "cf4", "buck,jane", "", 5), true); - trf.iter.seek(r, ncfs("cf1", "cf4"), true); + r = new Range(newKey("0000", "cf1", "doe,john", "", 4), true, newKey("0003", "cf4", "buck,jane", "", 5), true); + trf.iter.seek(r, newColFamByteSequence("cf1", "cf4"), true); assertEquals(2, trf.reader.getNumLocalityGroupsSeeked()); assertTrue(trf.iter.hasTop()); - assertTrue(trf.iter.getTopKey().equals(nk("0000", "cf1", "doe,john", "", 4))); - assertEquals(nv("1123 West Left st"), trf.iter.getTopValue()); + assertTrue(trf.iter.getTopKey().equals(newKey("0000", "cf1", "doe,john", "", 4))); + assertEquals(newValue("1123 West Left st"), trf.iter.getTopValue()); trf.iter.next(); assertTrue(trf.iter.hasTop()); - assertTrue(trf.iter.getTopKey().equals(nk("0003", "cf4", "buck,jane", "", 5))); - assertEquals(nv("09 Slum st"), trf.iter.getTopValue()); + assertTrue(trf.iter.getTopKey().equals(newKey("0003", "cf4", "buck,jane", "", 5))); + assertEquals(newValue("09 Slum st"), trf.iter.getTopValue()); trf.iter.next(); assertFalse(trf.iter.hasTop()); @@ -908,8 +914,8 @@ public class RFileTest { TestRFile trf = new TestRFile(conf); trf.openWriter(false); - trf.writer.startNewLocalityGroup("lg1", ncfs("cf1", "cf2")); - trf.writer.startNewLocalityGroup("lg2", ncfs("cf3", "cf4")); + trf.writer.startNewLocalityGroup("lg1", newColFamByteSequence("cf1", "cf2")); + trf.writer.startNewLocalityGroup("lg2", newColFamByteSequence("cf3", "cf4")); trf.writer.startDefaultLocalityGroup(); trf.writer.close(); @@ -923,22 +929,22 @@ public class RFileTest { trf = new TestRFile(conf); trf.openWriter(false); - trf.writer.startNewLocalityGroup("lg1", ncfs("cf1", "cf2")); - trf.writer.append(nk("0000", "cf1", "doe,john", "", 4), nv("1123 West Left st")); - trf.writer.append(nk("0002", "cf2", "doe,jane", "", 5), nv("1124 East Right st")); - trf.writer.startNewLocalityGroup("lg2", ncfs("cf3", "cf4")); + trf.writer.startNewLocalityGroup("lg1", newColFamByteSequence("cf1", "cf2")); + trf.writer.append(newKey("0000", "cf1", "doe,john", "", 4), newValue("1123 West Left st")); + trf.writer.append(newKey("0002", "cf2", "doe,jane", "", 5), newValue("1124 East Right st")); + trf.writer.startNewLocalityGroup("lg2", newColFamByteSequence("cf3", "cf4")); trf.writer.startDefaultLocalityGroup(); trf.writer.close(); trf.openReader(); trf.iter.seek(new Range(new Text(""), null), EMPTY_COL_FAMS, false); assertTrue(trf.iter.hasTop()); - assertTrue(trf.iter.getTopKey().equals(nk("0000", "cf1", "doe,john", "", 4))); - assertEquals(nv("1123 West Left st"), trf.iter.getTopValue()); + assertTrue(trf.iter.getTopKey().equals(newKey("0000", "cf1", "doe,john", "", 4))); + assertEquals(newValue("1123 West Left st"), trf.iter.getTopValue()); trf.iter.next(); assertTrue(trf.iter.hasTop()); - assertTrue(trf.iter.getTopKey().equals(nk("0002", "cf2", "doe,jane", "", 5))); - assertEquals(nv("1124 East Right st"), trf.iter.getTopValue()); + assertTrue(trf.iter.getTopKey().equals(newKey("0002", "cf2", "doe,jane", "", 5))); + assertEquals(newValue("1124 East Right st"), trf.iter.getTopValue()); trf.iter.next(); assertFalse(trf.iter.hasTop()); @@ -948,22 +954,22 @@ public class RFileTest { trf = new TestRFile(conf); trf.openWriter(false); - trf.writer.startNewLocalityGroup("lg1", ncfs("cf1", "cf2")); - trf.writer.startNewLocalityGroup("lg2", ncfs("cf3", "cf4")); - trf.writer.append(nk("0001", "cf3", "buck,john", "", 4), nv("90 Slum st")); - trf.writer.append(nk("0003", "cf4", "buck,jane", "", 5), nv("09 Slum st")); + trf.writer.startNewLocalityGroup("lg1", newColFamByteSequence("cf1", "cf2")); + trf.writer.startNewLocalityGroup("lg2", newColFamByteSequence("cf3", "cf4")); + trf.writer.append(newKey("0001", "cf3", "buck,john", "", 4), newValue("90 Slum st")); + trf.writer.append(newKey("0003", "cf4", "buck,jane", "", 5), newValue("09 Slum st")); trf.writer.startDefaultLocalityGroup(); trf.writer.close(); trf.openReader(); trf.iter.seek(new Range(new Text(""), null), EMPTY_COL_FAMS, false); assertTrue(trf.iter.hasTop()); - assertTrue(trf.iter.getTopKey().equals(nk("0001", "cf3", "buck,john", "", 4))); - assertEquals(nv("90 Slum st"), trf.iter.getTopValue()); + assertTrue(trf.iter.getTopKey().equals(newKey("0001", "cf3", "buck,john", "", 4))); + assertEquals(newValue("90 Slum st"), trf.iter.getTopValue()); trf.iter.next(); assertTrue(trf.iter.hasTop()); - assertTrue(trf.iter.getTopKey().equals(nk("0003", "cf4", "buck,jane", "", 5))); - assertEquals(nv("09 Slum st"), trf.iter.getTopValue()); + assertTrue(trf.iter.getTopKey().equals(newKey("0003", "cf4", "buck,jane", "", 5))); + assertEquals(newValue("09 Slum st"), trf.iter.getTopValue()); trf.iter.next(); assertFalse(trf.iter.hasTop()); @@ -973,22 +979,22 @@ public class RFileTest { trf = new TestRFile(conf); trf.openWriter(false); - trf.writer.startNewLocalityGroup("lg1", ncfs("cf1", "cf2")); - trf.writer.startNewLocalityGroup("lg2", ncfs("cf3", "cf4")); + trf.writer.startNewLocalityGroup("lg1", newColFamByteSequence("cf1", "cf2")); + trf.writer.startNewLocalityGroup("lg2", newColFamByteSequence("cf3", "cf4")); trf.writer.startDefaultLocalityGroup(); - trf.writer.append(nk("0007", "good citizen", "q,john", "", 4), nv("70 Apple st")); - trf.writer.append(nk("0008", "model citizen", "q,jane", "", 5), nv("81 Plum st")); + trf.writer.append(newKey("0007", "good citizen", "q,john", "", 4), newValue("70 Apple st")); + trf.writer.append(newKey("0008", "model citizen", "q,jane", "", 5), newValue("81 Plum st")); trf.writer.close(); trf.openReader(); trf.iter.seek(new Range(new Text(""), null), EMPTY_COL_FAMS, false); assertTrue(trf.iter.hasTop()); - assertTrue(trf.iter.getTopKey().equals(nk("0007", "good citizen", "q,john", "", 4))); - assertEquals(nv("70 Apple st"), trf.iter.getTopValue()); + assertTrue(trf.iter.getTopKey().equals(newKey("0007", "good citizen", "q,john", "", 4))); + assertEquals(newValue("70 Apple st"), trf.iter.getTopValue()); trf.iter.next(); assertTrue(trf.iter.hasTop()); - assertTrue(trf.iter.getTopKey().equals(nk("0008", "model citizen", "q,jane", "", 5))); - assertEquals(nv("81 Plum st"), trf.iter.getTopValue()); + assertTrue(trf.iter.getTopKey().equals(newKey("0008", "model citizen", "q,jane", "", 5))); + assertEquals(newValue("81 Plum st"), trf.iter.getTopValue()); trf.iter.next(); assertFalse(trf.iter.hasTop()); @@ -998,32 +1004,32 @@ public class RFileTest { trf = new TestRFile(conf); trf.openWriter(false); - trf.writer.startNewLocalityGroup("lg1", ncfs("cf1", "cf2")); - trf.writer.append(nk("0000", "cf1", "doe,john", "", 4), nv("1123 West Left st")); - trf.writer.append(nk("0002", "cf2", "doe,jane", "", 5), nv("1124 East Right st")); - trf.writer.startNewLocalityGroup("lg2", ncfs("cf3", "cf4")); + trf.writer.startNewLocalityGroup("lg1", newColFamByteSequence("cf1", "cf2")); + trf.writer.append(newKey("0000", "cf1", "doe,john", "", 4), newValue("1123 West Left st")); + trf.writer.append(newKey("0002", "cf2", "doe,jane", "", 5), newValue("1124 East Right st")); + trf.writer.startNewLocalityGroup("lg2", newColFamByteSequence("cf3", "cf4")); trf.writer.startDefaultLocalityGroup(); - trf.writer.append(nk("0007", "good citizen", "q,john", "", 4), nv("70 Apple st")); - trf.writer.append(nk("0008", "model citizen", "q,jane", "", 5), nv("81 Plum st")); + trf.writer.append(newKey("0007", "good citizen", "q,john", "", 4), newValue("70 Apple st")); + trf.writer.append(newKey("0008", "model citizen", "q,jane", "", 5), newValue("81 Plum st")); trf.writer.close(); trf.openReader(); trf.iter.seek(new Range(new Text(""), null), EMPTY_COL_FAMS, false); assertTrue(trf.iter.hasTop()); - assertTrue(trf.iter.getTopKey().equals(nk("0000", "cf1", "doe,john", "", 4))); - assertEquals(nv("1123 West Left st"), trf.iter.getTopValue()); + assertTrue(trf.iter.getTopKey().equals(newKey("0000", "cf1", "doe,john", "", 4))); + assertEquals(newValue("1123 West Left st"), trf.iter.getTopValue()); trf.iter.next(); assertTrue(trf.iter.hasTop()); - assertTrue(trf.iter.getTopKey().equals(nk("0002", "cf2", "doe,jane", "", 5))); - assertEquals(nv("1124 East Right st"), trf.iter.getTopValue()); + assertTrue(trf.iter.getTopKey().equals(newKey("0002", "cf2", "doe,jane", "", 5))); + assertEquals(newValue("1124 East Right st"), trf.iter.getTopValue()); trf.iter.next(); assertTrue(trf.iter.hasTop()); - assertTrue(trf.iter.getTopKey().equals(nk("0007", "good citizen", "q,john", "", 4))); - assertEquals(nv("70 Apple st"), trf.iter.getTopValue()); + assertTrue(trf.iter.getTopKey().equals(newKey("0007", "good citizen", "q,john", "", 4))); + assertEquals(newValue("70 Apple st"), trf.iter.getTopValue()); trf.iter.next(); assertTrue(trf.iter.hasTop()); - assertTrue(trf.iter.getTopKey().equals(nk("0008", "model citizen", "q,jane", "", 5))); - assertEquals(nv("81 Plum st"), trf.iter.getTopValue()); + assertTrue(trf.iter.getTopKey().equals(newKey("0008", "model citizen", "q,jane", "", 5))); + assertEquals(newValue("81 Plum st"), trf.iter.getTopValue()); trf.iter.next(); assertFalse(trf.iter.hasTop()); @@ -1037,17 +1043,17 @@ public class RFileTest { TestRFile trf = new TestRFile(conf); trf.openWriter(false); - trf.writer.startNewLocalityGroup("lg1", ncfs("3mod10")); + trf.writer.startNewLocalityGroup("lg1", newColFamByteSequence("3mod10")); for (int i = 3; i < 1024; i += 10) { - trf.writer.append(nk(nf("i", i), "3mod10", "", "", i + 2), nv("" + i)); + trf.writer.append(newKey(formatString("i", i), "3mod10", "", "", i + 2), newValue("" + i)); } - trf.writer.startNewLocalityGroup("lg2", ncfs("5mod10", "7mod10")); + trf.writer.startNewLocalityGroup("lg2", newColFamByteSequence("5mod10", "7mod10")); for (int i = 5; i < 1024;) { - trf.writer.append(nk(nf("i", i), "5mod10", "", "", i + 2), nv("" + i)); + trf.writer.append(newKey(formatString("i", i), "5mod10", "", "", i + 2), newValue("" + i)); i += 2; - trf.writer.append(nk(nf("i", i), "7mod10", "", "", i + 2), nv("" + i)); + trf.writer.append(newKey(formatString("i", i), "7mod10", "", "", i + 2), newValue("" + i)); i += 8; } @@ -1058,7 +1064,7 @@ public class RFileTest { if (m10 == 3 || m10 == 5 || m10 == 7) continue; - trf.writer.append(nk(nf("i", i), m10 + "mod10", "", "", i + 2), nv("" + i)); + trf.writer.append(newKey(formatString("i", i), m10 + "mod10", "", "", i + 2), newValue("" + i)); } trf.writer.close(); @@ -1069,26 +1075,26 @@ public class RFileTest { assertEquals(3, trf.reader.getNumLocalityGroupsSeeked()); for (int i = 0; i < 1024; i++) { assertTrue(trf.iter.hasTop()); - assertEquals(nk(nf("i", i), (i % 10) + "mod10", "", "", i + 2), trf.iter.getTopKey()); - assertEquals(nv("" + i), trf.iter.getTopValue()); + assertEquals(newKey(formatString("i", i), (i % 10) + "mod10", "", "", i + 2), trf.iter.getTopKey()); + assertEquals(newValue("" + i), trf.iter.getTopValue()); trf.iter.next(); } assertFalse(trf.iter.hasTop()); // try reading each of the 10 column families separately for (int m = 0; m < 10; m++) { - trf.iter.seek(new Range(new Key(), true, null, true), ncfs(m + "mod10"), true); + trf.iter.seek(new Range(new Key(), true, null, true), newColFamByteSequence(m + "mod10"), true); assertEquals(1, trf.reader.getNumLocalityGroupsSeeked()); for (int i = m; i < 1024; i += 10) { assertTrue(trf.iter.hasTop()); - assertEquals(nk(nf("i", i), (i % 10) + "mod10", "", "", i + 2), trf.iter.getTopKey()); - assertEquals(nv("" + i), trf.iter.getTopValue()); + assertEquals(newKey(formatString("i", i), (i % 10) + "mod10", "", "", i + 2), trf.iter.getTopKey()); + assertEquals(newValue("" + i), trf.iter.getTopValue()); trf.iter.next(); } assertFalse(trf.iter.hasTop()); // test excluding an individual column family - trf.iter.seek(new Range(new Key(), true, null, true), ncfs(m + "mod10"), false); + trf.iter.seek(new Range(new Key(), true, null, true), newColFamByteSequence(m + "mod10"), false); if (m == 3) assertEquals(2, trf.reader.getNumLocalityGroupsSeeked()); else @@ -1099,8 +1105,8 @@ public class RFileTest { continue; assertTrue(trf.iter.hasTop()); - assertEquals(nk(nf("i", i), (i % 10) + "mod10", "", "", i + 2), trf.iter.getTopKey()); - assertEquals(nv("" + i), trf.iter.getTopValue()); + assertEquals(newKey(formatString("i", i), (i % 10) + "mod10", "", "", i + 2), trf.iter.getTopKey()); + assertEquals(newValue("" + i), trf.iter.getTopValue()); trf.iter.next(); } assertFalse(trf.iter.hasTop()); @@ -1111,20 +1117,20 @@ public class RFileTest { // try reading from cloned reader at the same time as parent reader for (int m = 0; m < 9; m++) { - trf.iter.seek(new Range(new Key(), true, null, true), ncfs(m + "mod10"), true); + trf.iter.seek(new Range(new Key(), true, null, true), newColFamByteSequence(m + "mod10"), true); assertEquals(1, trf.reader.getNumLocalityGroupsSeeked()); - reader2.seek(new Range(new Key(), true, null, true), ncfs((m + 1) + "mod10"), true); + reader2.seek(new Range(new Key(), true, null, true), newColFamByteSequence((m + 1) + "mod10"), true); // assertEquals(1, reader2.getNumLocalityGroupsSeeked()); for (int i = m; i < 1024; i += 10) { // System.out.println(m+","+i); assertTrue(trf.iter.hasTop()); - assertEquals(nk(nf("i", i), (i % 10) + "mod10", "", "", i + 2), trf.iter.getTopKey()); - assertEquals(nv("" + i), trf.iter.getTopValue()); + assertEquals(newKey(formatString("i", i), (i % 10) + "mod10", "", "", i + 2), trf.iter.getTopKey()); + assertEquals(newValue("" + i), trf.iter.getTopValue()); trf.iter.next(); if (i + 1 < 1024) { assertTrue(reader2.hasTop()); - assertEquals(nk(nf("i", (i + 1)), ((i + 1) % 10) + "mod10", "", "", i + 3), reader2.getTopKey()); - assertEquals(nv("" + (i + 1)), reader2.getTopValue()); + assertEquals(newKey(formatString("i", (i + 1)), ((i + 1) % 10) + "mod10", "", "", i + 3), reader2.getTopKey()); + assertEquals(newValue("" + (i + 1)), reader2.getTopValue()); reader2.next(); } } @@ -1143,12 +1149,12 @@ public class RFileTest { trf.openWriter(false); - trf.writer.startNewLocalityGroup("lg1", ncfs("a", "b")); + trf.writer.startNewLocalityGroup("lg1", newColFamByteSequence("a", "b")); - trf.writer.append(nk("0007", "a", "cq1", "", 4), nv("1")); + trf.writer.append(newKey("0007", "a", "cq1", "", 4), newValue("1")); try { - trf.writer.append(nk("0009", "c", "cq1", "", 4), nv("1")); + trf.writer.append(newKey("0009", "c", "cq1", "", 4), newValue("1")); assertFalse(true); } catch (IllegalArgumentException ioe) { @@ -1160,8 +1166,8 @@ public class RFileTest { trf.iter.seek(new Range(), EMPTY_COL_FAMS, false); assertTrue(trf.iter.hasTop()); - assertEquals(nk("0007", "a", "cq1", "", 4), trf.iter.getTopKey()); - assertEquals(nv("1"), trf.iter.getTopValue()); + assertEquals(newKey("0007", "a", "cq1", "", 4), trf.iter.getTopKey()); + assertEquals(newValue("1"), trf.iter.getTopValue()); trf.iter.next(); assertFalse(trf.iter.hasTop()); @@ -1176,21 +1182,21 @@ public class RFileTest { trf.openWriter(false); - trf.writer.startNewLocalityGroup("lg1", ncfs("a", "b")); + trf.writer.startNewLocalityGroup("lg1", newColFamByteSequence("a", "b")); - trf.writer.append(nk("0007", "a", "cq1", "", 4), nv("1")); + trf.writer.append(newKey("0007", "a", "cq1", "", 4), newValue("1")); trf.writer.startDefaultLocalityGroup(); try { - trf.writer.append(nk("0008", "a", "cq1", "", 4), nv("1")); + trf.writer.append(newKey("0008", "a", "cq1", "", 4), newValue("1")); assertFalse(true); } catch (IllegalArgumentException ioe) { } try { - trf.writer.append(nk("0009", "b", "cq1", "", 4), nv("1")); + trf.writer.append(newKey("0009", "b", "cq1", "", 4), newValue("1")); assertFalse(true); } catch (IllegalArgumentException ioe) { @@ -1202,8 +1208,8 @@ public class RFileTest { trf.iter.seek(new Range(), EMPTY_COL_FAMS, false); assertTrue(trf.iter.hasTop()); - assertEquals(nk("0007", "a", "cq1", "", 4), trf.iter.getTopKey()); - assertEquals(nv("1"), trf.iter.getTopValue()); + assertEquals(newKey("0007", "a", "cq1", "", 4), trf.iter.getTopKey()); + assertEquals(newValue("1"), trf.iter.getTopValue()); trf.iter.next(); assertFalse(trf.iter.hasTop()); @@ -1219,7 +1225,7 @@ public class RFileTest { trf.writer.startDefaultLocalityGroup(); try { - trf.writer.startNewLocalityGroup("lg1", ncfs("a", "b")); + trf.writer.startNewLocalityGroup("lg1", newColFamByteSequence("a", "b")); assertFalse(true); } catch (IllegalStateException ioe) { @@ -1241,11 +1247,11 @@ public class RFileTest { trf.openWriter(false); - trf.writer.startNewLocalityGroup("lg1", ncfs("a", "b")); + trf.writer.startNewLocalityGroup("lg1", newColFamByteSequence("a", "b")); - trf.writer.append(nk("0007", "a", "cq1", "", 4), nv("1")); + trf.writer.append(newKey("0007", "a", "cq1", "", 4), newValue("1")); try { - trf.writer.startNewLocalityGroup("lg1", ncfs("b", "c")); + trf.writer.startNewLocalityGroup("lg1", newColFamByteSequence("b", "c")); assertFalse(true); } catch (IllegalArgumentException ioe) { @@ -1266,11 +1272,11 @@ public class RFileTest { trf.writer.startDefaultLocalityGroup(); for (int i = 0; i < 2048; i++) { - trf.writer.append(nk("r0000", "cf1", "cq1", "", 1), nv("" + i)); + trf.writer.append(newKey("r0000", "cf1", "cq1", "", 1), newValue("" + i)); } for (int i = 2048; i < 4096; i++) { - trf.writer.append(nk("r0001", "cf1", "cq1", "", 1), nv("" + i)); + trf.writer.append(newKey("r0001", "cf1", "cq1", "", 1), newValue("" + i)); } trf.writer.close(); @@ -1286,55 +1292,55 @@ public class RFileTest { assertTrue(count > 4); - trf.iter.seek(new Range(nk("r0000", "cf1", "cq1", "", 1), true, nk("r0001", "cf1", "cq1", "", 1), false), EMPTY_COL_FAMS, false); + trf.iter.seek(new Range(newKey("r0000", "cf1", "cq1", "", 1), true, newKey("r0001", "cf1", "cq1", "", 1), false), EMPTY_COL_FAMS, false); for (int i = 0; i < 2048; i++) { assertTrue(trf.iter.hasTop()); - assertEquals(nk("r0000", "cf1", "cq1", "", 1), trf.iter.getTopKey()); - assertEquals(nv("" + i), trf.iter.getTopValue()); + assertEquals(newKey("r0000", "cf1", "cq1", "", 1), trf.iter.getTopKey()); + assertEquals(newValue("" + i), trf.iter.getTopValue()); trf.iter.next(); } assertFalse(trf.iter.hasTop()); - trf.iter.seek(new Range(nk("r0000", "cf1", "cq1", "", 1), false, nk("r0001", "cf1", "cq1", "", 1), true), EMPTY_COL_FAMS, false); + trf.iter.seek(new Range(newKey("r0000", "cf1", "cq1", "", 1), false, newKey("r0001", "cf1", "cq1", "", 1), true), EMPTY_COL_FAMS, false); for (int i = 2048; i < 4096; i++) { assertTrue(trf.iter.hasTop()); - assertEquals(nk("r0001", "cf1", "cq1", "", 1), trf.iter.getTopKey()); - assertEquals(nv("" + i), trf.iter.getTopValue()); + assertEquals(newKey("r0001", "cf1", "cq1", "", 1), trf.iter.getTopKey()); + assertEquals(newValue("" + i), trf.iter.getTopValue()); trf.iter.next(); } assertFalse(trf.iter.hasTop()); - trf.iter.seek(new Range(nk("r0001", "cf1", "cq1", "", 1), true, nk("r0001", "cf1", "cq1", "", 1), true), EMPTY_COL_FAMS, false); + trf.iter.seek(new Range(newKey("r0001", "cf1", "cq1", "", 1), true, newKey("r0001", "cf1", "cq1", "", 1), true), EMPTY_COL_FAMS, false); for (int i = 2048; i < 4096; i++) { assertTrue(trf.iter.hasTop()); - assertEquals(nk("r0001", "cf1", "cq1", "", 1), trf.iter.getTopKey()); - assertEquals(nv("" + i), trf.iter.getTopValue()); + assertEquals(newKey("r0001", "cf1", "cq1", "", 1), trf.iter.getTopKey()); + assertEquals(newValue("" + i), trf.iter.getTopValue()); trf.iter.next(); } assertFalse(trf.iter.hasTop()); - trf.iter.seek(new Range(nk("r0002", "cf1", "cq1", "", 1), true, nk("r0002", "cf1", "cq1", "", 1), true), EMPTY_COL_FAMS, false); + trf.iter.seek(new Range(newKey("r0002", "cf1", "cq1", "", 1), true, newKey("r0002", "cf1", "cq1", "", 1), true), EMPTY_COL_FAMS, false); assertFalse(trf.iter.hasTop()); trf.iter.seek(new Range((Key) null, null), EMPTY_COL_FAMS, false); for (int i = 0; i < 2048; i++) { assertTrue(trf.iter.hasTop()); - assertEquals(nk("r0000", "cf1", "cq1", "", 1), trf.iter.getTopKey()); - assertEquals(nv("" + i), trf.iter.getTopValue()); + assertEquals(newKey("r0000", "cf1", "cq1", "", 1), trf.iter.getTopKey()); + assertEquals(newValue("" + i), trf.iter.getTopValue()); trf.iter.next(); } for (int i = 2048; i < 4096; i++) { assertTrue(trf.iter.hasTop()); - assertEquals(nk("r0001", "cf1", "cq1", "", 1), trf.iter.getTopKey()); - assertEquals(nv("" + i), trf.iter.getTopValue()); + assertEquals(newKey("r0001", "cf1", "cq1", "", 1), trf.iter.getTopKey()); + assertEquals(newValue("" + i), trf.iter.getTopValue()); trf.iter.next(); } @@ -1347,7 +1353,7 @@ public class RFileTest { return String.format("cf%06d", i); } - private Set<ByteSequence> t18ncfs(int... colFams) { + private Set<ByteSequence> t18newColFamByteSequence(int... colFams) { HashSet<ByteSequence> cfs = new HashSet<>(); for (int i : colFams) { cfs.add(new ArrayByteSequence(t18ncf(i))); @@ -1358,7 +1364,7 @@ public class RFileTest { private void t18Append(TestRFile trf, HashSet<ByteSequence> allCf, int i) throws IOException { String cf = t18ncf(i); - trf.writer.append(nk("r0000", cf, "cq1", "", 1), nv("" + i)); + trf.writer.append(newKey("r0000", cf, "cq1", "", 1), newValue("" + i)); allCf.add(new ArrayByteSequence(cf)); } @@ -1403,15 +1409,15 @@ public class RFileTest { HashSet<ByteSequence> allCf = new HashSet<>(); - trf.writer.startNewLocalityGroup("lg1", t18ncfs(0)); + trf.writer.startNewLocalityGroup("lg1", t18newColFamByteSequence(0)); for (int i = 0; i < 1; i++) t18Append(trf, allCf, i); - trf.writer.startNewLocalityGroup("lg2", t18ncfs(1, 2)); + trf.writer.startNewLocalityGroup("lg2", t18newColFamByteSequence(1, 2)); for (int i = 1; i < 3; i++) t18Append(trf, allCf, i); - trf.writer.startNewLocalityGroup("lg3", t18ncfs(3, 4, 5)); + trf.writer.startNewLocalityGroup("lg3", t18newColFamByteSequence(3, 4, 5)); for (int i = 3; i < 6; i++) t18Append(trf, allCf, i); @@ -1425,22 +1431,22 @@ public class RFileTest { trf.openReader(); - t18Verify(t18ncfs(0), trf.iter, trf.reader, allCf, 1, 3); + t18Verify(t18newColFamByteSequence(0), trf.iter, trf.reader, allCf, 1, 3); for (int i = 1; i < 10; i++) - t18Verify(t18ncfs(i), trf.iter, trf.reader, allCf, 1, 4); + t18Verify(t18newColFamByteSequence(i), trf.iter, trf.reader, allCf, 1, 4); - t18Verify(t18ncfs(max + 1), trf.iter, trf.reader, allCf, 1, 4); + t18Verify(t18newColFamByteSequence(max + 1), trf.iter, trf.reader, allCf, 1, 4); - t18Verify(t18ncfs(1, 2, 3, 4), trf.iter, trf.reader, allCf, 2, 3); - t18Verify(t18ncfs(1, 2, 3, 4, 5), trf.iter, trf.reader, allCf, 2, 2); + t18Verify(t18newColFamByteSequence(1, 2, 3, 4), trf.iter, trf.reader, allCf, 2, 3); + t18Verify(t18newColFamByteSequence(1, 2, 3, 4, 5), trf.iter, trf.reader, allCf, 2, 2); - t18Verify(t18ncfs(0, 1, 2, 3, 4), trf.iter, trf.reader, allCf, 3, 2); - t18Verify(t18ncfs(0, 1, 2, 3, 4, 5), trf.iter, trf.reader, allCf, 3, 1); - t18Verify(t18ncfs(0, 1, 2, 3, 4, 5, 6), trf.iter, trf.reader, allCf, 4, 1); + t18Verify(t18newColFamByteSequence(0, 1, 2, 3, 4), trf.iter, trf.reader, allCf, 3, 2); + t18Verify(t18newColFamByteSequence(0, 1, 2, 3, 4, 5), trf.iter, trf.reader, allCf, 3, 1); + t18Verify(t18newColFamByteSequence(0, 1, 2, 3, 4, 5, 6), trf.iter, trf.reader, allCf, 4, 1); - t18Verify(t18ncfs(0, 1), trf.iter, trf.reader, allCf, 2, 3); - t18Verify(t18ncfs(2, 3), trf.iter, trf.reader, allCf, 2, 4); - t18Verify(t18ncfs(5, 6), trf.iter, trf.reader, allCf, 2, 4); + t18Verify(t18newColFamByteSequence(0, 1), trf.iter, trf.reader, allCf, 2, 3); + t18Verify(t18newColFamByteSequence(2, 3), trf.iter, trf.reader, allCf, 2, 4); + t18Verify(t18newColFamByteSequence(5, 6), trf.iter, trf.reader, allCf, 2, 4); trf.closeReader(); } @@ -1453,10 +1459,10 @@ public class RFileTest { trf.openWriter(false); trf.openWriter(false); - trf.writer.startNewLocalityGroup("lg1", ncfs("cf1", "cf2")); - trf.writer.append(nk("0000", "cf1", "doe,john", "", 4), nv("1123 West Left st")); - trf.writer.append(nk("0002", "cf2", "doe,jane", "", 5), nv("1124 East Right st")); - trf.writer.startNewLocalityGroup("lg2", ncfs("cf3", "cf4")); + trf.writer.startNewLocalityGroup("lg1", newColFamByteSequence("cf1", "cf2")); + trf.writer.append(newKey("0000", "cf1", "doe,john", "", 4), newValue("1123 West Left st")); + trf.writer.append(newKey("0002", "cf2", "doe,jane", "", 5), newValue("1124 East Right st")); + trf.writer.startNewLocalityGroup("lg2", newColFamByteSequence("cf3", "cf4")); DataOutputStream dos = trf.writer.createMetaStore("count"); @@ -1475,8 +1481,8 @@ public class RFileTest { trf.iter.seek(new Range(), EMPTY_COL_FAMS, false); assertTrue(trf.iter.hasTop()); - assertTrue(trf.iter.getTopKey().equals(nk("0000", "cf1", "doe,john", "", 4))); - assertEquals(nv("1123 West Left st"), trf.iter.getTopValue()); + assertTrue(trf.iter.getTopKey().equals(newKey("0000", "cf1", "doe,john", "", 4))); + assertEquals(newValue("1123 West Left st"), trf.iter.getTopValue()); trf.iter.next(); DataInputStream in = trf.reader.getMetaStore("count"); @@ -1490,8 +1496,8 @@ public class RFileTest { in.close(); assertTrue(trf.iter.hasTop()); - assertTrue(trf.iter.getTopKey().equals(nk("0002", "cf2", "doe,jane", "", 5))); - assertEquals(nv("1124 East Right st"), trf.iter.getTopValue()); + assertTrue(trf.iter.getTopKey().equals(newKey("0002", "cf2", "doe,jane", "", 5))); + assertEquals(newValue("1124 East Right st"), trf.iter.getTopValue()); trf.iter.next(); assertFalse(trf.iter.hasTop()); @@ -1505,7 +1511,7 @@ public class RFileTest { trf.openWriter(); for (int i = 0; i < 2500; i++) { - trf.writer.append(nk(nf("r_", i), "cf1", "cq1", "L1", 42), nv("foo" + i)); + trf.writer.append(newKey(formatString("r_", i), "cf1", "cq1", "L1", 42), newValue("foo" + i)); } trf.closeWriter(); @@ -1518,7 +1524,7 @@ public class RFileTest { for (int count = 0; count < 100; count++) { int start = rand.nextInt(2300); - Range range = new Range(nk(nf("r_", start), "cf1", "cq1", "L1", 42), nk(nf("r_", start + 100), "cf1", "cq1", "L1", 42)); + Range range = new Range(newKey(formatString("r_", start), "cf1", "cq1", "L1", 42), newKey(formatString("r_", start + 100), "cf1", "cq1", "L1", 42)); trf.reader.seek(range, cfs, false); @@ -1526,24 +1532,24 @@ public class RFileTest { for (int j = 0; j < numToScan; j++) { assertTrue(trf.reader.hasTop()); - assertEquals(nk(nf("r_", start + j), "cf1", "cq1", "L1", 42), trf.reader.getTopKey()); + assertEquals(newKey(formatString("r_", start + j), "cf1", "cq1", "L1", 42), trf.reader.getTopKey()); trf.reader.next(); } assertTrue(trf.reader.hasTop()); - assertEquals(nk(nf("r_", start + numToScan), "cf1", "cq1", "L1", 42), trf.reader.getTopKey()); + assertEquals(newKey(formatString("r_", start + numToScan), "cf1", "cq1", "L1", 42), trf.reader.getTopKey()); // seek a little forward from the last range and read a few keys within the unconsumed portion of the last range int start2 = start + numToScan + rand.nextInt(3); int end2 = start2 + rand.nextInt(3); - range = new Range(nk(nf("r_", start2), "cf1", "cq1", "L1", 42), nk(nf("r_", end2), "cf1", "cq1", "L1", 42)); + range = new Range(newKey(formatString("r_", start2), "cf1", "cq1", "L1", 42), newKey(formatString("r_", end2), "cf1", "cq1", "L1", 42)); trf.reader.seek(range, cfs, false); for (int j = start2; j <= end2; j++) { assertTrue(trf.reader.hasTop()); - assertEquals(nk(nf("r_", j), "cf1", "cq1", "L1", 42), trf.reader.getTopKey()); + assertEquals(newKey(formatString("r_", j), "cf1", "cq1", "L1", 42), trf.reader.getTopKey()); trf.reader.next(); } @@ -1587,14 +1593,14 @@ public class RFileTest { for (int start : new int[] {0, 10, 100, 998}) { for (int cf = 1; cf <= 4; cf++) { if (start == 0) - iter.seek(new Range(), ncfs(nf("cf_", cf)), true); + iter.seek(new Range(), newColFamByteSequence(formatString("cf_", cf)), true); else - iter.seek(new Range(nf("r_", start), null), ncfs(nf("cf_", cf)), true); + iter.seek(new Range(formatString("r_", start), null), newColFamByteSequence(formatString("cf_", cf)), true); for (int i = start; i < 1000; i++) { assertTrue(iter.hasTop()); - assertEquals(nk(nf("r_", i), nf("cf_", cf), nf("cq_", 0), "", 1000 - i), iter.getTopKey()); - assertEquals(nv(i + ""), iter.getTopValue()); + assertEquals(newKey(formatString("r_", i), formatString("cf_", cf), formatString("cq_", 0), "", 1000 - i), iter.getTopKey()); + assertEquals(newValue(i + ""), iter.getTopValue()); iter.next(); } @@ -1602,15 +1608,15 @@ public class RFileTest { } if (start == 0) - iter.seek(new Range(), ncfs(), false); + iter.seek(new Range(), newColFamByteSequence(), false); else - iter.seek(new Range(nf("r_", start), null), ncfs(), false); + iter.seek(new Range(formatString("r_", start), null), newColFamByteSequence(), false); for (int i = start; i < 1000; i++) { for (int cf = 1; cf <= 4; cf++) { assertTrue(iter.hasTop()); - assertEquals(nk(nf("r_", i), nf("cf_", cf), nf("cq_", 0), "", 1000 - i), iter.getTopKey()); - assertEquals(nv(i + ""), iter.getTopValue()); + assertEquals(newKey(formatString("r_", i), formatString("cf_", cf), formatString("cq_", 0), "", 1000 - i), iter.getTopKey()); + assertEquals(newValue(i + ""), iter.getTopValue()); iter.next(); } }
http://git-wip-us.apache.org/repos/asf/accumulo/blob/a4a45398/core/src/test/java/org/apache/accumulo/core/file/rfile/RelativeKeyTest.java ---------------------------------------------------------------------- diff --git a/core/src/test/java/org/apache/accumulo/core/file/rfile/RelativeKeyTest.java b/core/src/test/java/org/apache/accumulo/core/file/rfile/RelativeKeyTest.java index 5e839e0..e6dfa9b 100644 --- a/core/src/test/java/org/apache/accumulo/core/file/rfile/RelativeKeyTest.java +++ b/core/src/test/java/org/apache/accumulo/core/file/rfile/RelativeKeyTest.java @@ -128,17 +128,17 @@ public class RelativeKeyTest { Key prev = null; int val = 0; for (int row = 0; row < 4; row++) { - String rowS = RFileTest.nf("r_", row); + String rowS = RFileTest.formatString("r_", row); for (int cf = 0; cf < 4; cf++) { - String cfS = RFileTest.nf("cf_", cf); + String cfS = RFileTest.formatString("cf_", cf); for (int cq = 0; cq < 4; cq++) { - String cqS = RFileTest.nf("cq_", cq); + String cqS = RFileTest.formatString("cq_", cq); for (int cv = 'A'; cv < 'A' + 4; cv++) { String cvS = "" + (char) cv; for (int ts = 4; ts > 0; ts--) { - Key k = RFileTest.nk(rowS, cfS, cqS, cvS, ts); + Key k = RFileTest.newKey(rowS, cfS, cqS, cvS, ts); k.setDeleted(true); - Value v = RFileTest.nv("" + val); + Value v = RFileTest.newValue("" + val); expectedPositions.add(out.size()); new RelativeKey(prev, k).write(out); prev = k; @@ -146,8 +146,8 @@ public class RelativeKeyTest { expectedKeys.add(k); expectedValues.add(v); - k = RFileTest.nk(rowS, cfS, cqS, cvS, ts); - v = RFileTest.nv("" + val); + k = RFileTest.newKey(rowS, cfS, cqS, cvS, ts); + v = RFileTest.newValue("" + val); expectedPositions.add(out.size()); new RelativeKey(prev, k).write(out); prev = k; http://git-wip-us.apache.org/repos/asf/accumulo/blob/a4a45398/core/src/test/java/org/apache/accumulo/core/iterators/AggregatingIteratorTest.java ---------------------------------------------------------------------- diff --git a/core/src/test/java/org/apache/accumulo/core/iterators/AggregatingIteratorTest.java b/core/src/test/java/org/apache/accumulo/core/iterators/AggregatingIteratorTest.java index 09064a5..8ee8497 100644 --- a/core/src/test/java/org/apache/accumulo/core/iterators/AggregatingIteratorTest.java +++ b/core/src/test/java/org/apache/accumulo/core/iterators/AggregatingIteratorTest.java @@ -69,31 +69,31 @@ public class AggregatingIteratorTest { } - static Key nk(int row, int colf, int colq, long ts, boolean deleted) { - Key k = nk(row, colf, colq, ts); + static Key newKey(int row, int colf, int colq, long ts, boolean deleted) { + Key k = newKey(row, colf, colq, ts); k.setDeleted(true); return k; } - static Key nk(int row, int colf, int colq, long ts) { - return new Key(nr(row), new Text(String.format("cf%03d", colf)), new Text(String.format("cq%03d", colq)), ts); + static Key newKey(int row, int colf, int colq, long ts) { + return new Key(newRow(row), new Text(String.format("cf%03d", colf)), new Text(String.format("cq%03d", colq)), ts); } - static Range nr(int row, int colf, int colq, long ts, boolean inclusive) { - return new Range(nk(row, colf, colq, ts), inclusive, null, true); + static Range newRow(int row, int colf, int colq, long ts, boolean inclusive) { + return new Range(newKey(row, colf, colq, ts), inclusive, null, true); } - static Range nr(int row, int colf, int colq, long ts) { - return nr(row, colf, colq, ts, true); + static Range newRow(int row, int colf, int colq, long ts) { + return newRow(row, colf, colq, ts, true); } - static void nkv(TreeMap<Key,Value> tm, int row, int colf, int colq, long ts, boolean deleted, String val) { - Key k = nk(row, colf, colq, ts); + static void newKeyValue(TreeMap<Key,Value> tm, int row, int colf, int colq, long ts, boolean deleted, String val) { + Key k = newKey(row, colf, colq, ts); k.setDeleted(deleted); tm.put(k, new Value(val.getBytes())); } - static Text nr(int row) { + static Text newRow(int row) { return new Text(String.format("r%03d", row)); } @@ -104,9 +104,9 @@ public class AggregatingIteratorTest { TreeMap<Key,Value> tm1 = new TreeMap<>(); // keys that do not aggregate - nkv(tm1, 1, 1, 1, 1, false, "2"); - nkv(tm1, 1, 1, 1, 2, false, "3"); - nkv(tm1, 1, 1, 1, 3, false, "4"); + newKeyValue(tm1, 1, 1, 1, 1, false, "2"); + newKeyValue(tm1, 1, 1, 1, 2, false, "3"); + newKeyValue(tm1, 1, 1, 1, 3, false, "4"); AggregatingIterator ai = new AggregatingIterator(); @@ -115,19 +115,19 @@ public class AggregatingIteratorTest { ai.seek(new Range(), EMPTY_COL_FAMS, false); assertTrue(ai.hasTop()); - assertEquals(nk(1, 1, 1, 3), ai.getTopKey()); + assertEquals(newKey(1, 1, 1, 3), ai.getTopKey()); assertEquals("4", ai.getTopValue().toString()); ai.next(); assertTrue(ai.hasTop()); - assertEquals(nk(1, 1, 1, 2), ai.getTopKey()); + assertEquals(newKey(1, 1, 1, 2), ai.getTopKey()); assertEquals("3", ai.getTopValue().toString()); ai.next(); assertTrue(ai.hasTop()); - assertEquals(nk(1, 1, 1, 1), ai.getTopKey()); + assertEquals(newKey(1, 1, 1, 1), ai.getTopKey()); assertEquals("2", ai.getTopValue().toString()); ai.next(); @@ -136,16 +136,16 @@ public class AggregatingIteratorTest { // try seeking - ai.seek(nr(1, 1, 1, 2), EMPTY_COL_FAMS, false); + ai.seek(newRow(1, 1, 1, 2), EMPTY_COL_FAMS, false); assertTrue(ai.hasTop()); - assertEquals(nk(1, 1, 1, 2), ai.getTopKey()); + assertEquals(newKey(1, 1, 1, 2), ai.getTopKey()); assertEquals("3", ai.getTopValue().toString()); ai.next(); assertTrue(ai.hasTop()); - assertEquals(nk(1, 1, 1, 1), ai.getTopKey()); + assertEquals(newKey(1, 1, 1, 1), ai.getTopKey()); assertEquals("2", ai.getTopValue().toString()); ai.next(); @@ -153,7 +153,7 @@ public class AggregatingIteratorTest { assertFalse(ai.hasTop()); // seek after everything - ai.seek(nr(1, 1, 1, 0), EMPTY_COL_FAMS, false); + ai.seek(newRow(1, 1, 1, 0), EMPTY_COL_FAMS, false); assertFalse(ai.hasTop()); @@ -165,9 +165,9 @@ public class AggregatingIteratorTest { TreeMap<Key,Value> tm1 = new TreeMap<>(); // keys that aggregate - nkv(tm1, 1, 1, 1, 1, false, "2"); - nkv(tm1, 1, 1, 1, 2, false, "3"); - nkv(tm1, 1, 1, 1, 3, false, "4"); + newKeyValue(tm1, 1, 1, 1, 1, false, "2"); + newKeyValue(tm1, 1, 1, 1, 2, false, "3"); + newKeyValue(tm1, 1, 1, 1, 3, false, "4"); AggregatingIterator ai = new AggregatingIterator(); @@ -179,7 +179,7 @@ public class AggregatingIteratorTest { ai.seek(new Range(), EMPTY_COL_FAMS, false); assertTrue(ai.hasTop()); - assertEquals(nk(1, 1, 1, 3), ai.getTopKey()); + assertEquals(newKey(1, 1, 1, 3), ai.getTopKey()); assertEquals("9", ai.getTopValue().toString()); ai.next(); @@ -188,10 +188,10 @@ public class AggregatingIteratorTest { // try seeking to the beginning of a key that aggregates - ai.seek(nr(1, 1, 1, 3), EMPTY_COL_FAMS, false); + ai.seek(newRow(1, 1, 1, 3), EMPTY_COL_FAMS, false); assertTrue(ai.hasTop()); - assertEquals(nk(1, 1, 1, 3), ai.getTopKey()); + assertEquals(newKey(1, 1, 1, 3), ai.getTopKey()); assertEquals("9", ai.getTopValue().toString()); ai.next(); @@ -199,20 +199,20 @@ public class AggregatingIteratorTest { assertFalse(ai.hasTop()); // try seeking the middle of a key the aggregates - ai.seek(nr(1, 1, 1, 2), EMPTY_COL_FAMS, false); + ai.seek(newRow(1, 1, 1, 2), EMPTY_COL_FAMS, false); assertFalse(ai.hasTop()); // try seeking to the end of a key the aggregates - ai.seek(nr(1, 1, 1, 1), EMPTY_COL_FAMS, false); + ai.seek(newRow(1, 1, 1, 1), EMPTY_COL_FAMS, false); assertFalse(ai.hasTop()); // try seeking before a key the aggregates - ai.seek(nr(1, 1, 1, 4), EMPTY_COL_FAMS, false); + ai.seek(newRow(1, 1, 1, 4), EMPTY_COL_FAMS, false); assertTrue(ai.hasTop()); - assertEquals(nk(1, 1, 1, 3), ai.getTopKey()); + assertEquals(newKey(1, 1, 1, 3), ai.getTopKey()); assertEquals("9", ai.getTopValue().toString()); ai.next(); @@ -227,13 +227,13 @@ public class AggregatingIteratorTest { TreeMap<Key,Value> tm1 = new TreeMap<>(); // keys that aggregate - nkv(tm1, 1, 1, 1, 1, false, "2"); - nkv(tm1, 1, 1, 1, 2, false, "3"); - nkv(tm1, 1, 1, 1, 3, false, "4"); + newKeyValue(tm1, 1, 1, 1, 1, false, "2"); + newKeyValue(tm1, 1, 1, 1, 2, false, "3"); + newKeyValue(tm1, 1, 1, 1, 3, false, "4"); // keys that do not aggregate - nkv(tm1, 2, 2, 1, 1, false, "2"); - nkv(tm1, 2, 2, 1, 2, false, "3"); + newKeyValue(tm1, 2, 2, 1, 1, false, "2"); + newKeyValue(tm1, 2, 2, 1, 2, false, "3"); AggregatingIterator ai = new AggregatingIterator(); @@ -245,19 +245,19 @@ public class AggregatingIteratorTest { ai.seek(new Range(), EMPTY_COL_FAMS, false); assertTrue(ai.hasTop()); - assertEquals(nk(1, 1, 1, 3), ai.getTopKey()); + assertEquals(newKey(1, 1, 1, 3), ai.getTopKey()); assertEquals("9", ai.getTopValue().toString()); ai.next(); assertTrue(ai.hasTop()); - assertEquals(nk(2, 2, 1, 2), ai.getTopKey()); + assertEquals(newKey(2, 2, 1, 2), ai.getTopKey()); assertEquals("3", ai.getTopValue().toString()); ai.next(); assertTrue(ai.hasTop()); - assertEquals(nk(2, 2, 1, 1), ai.getTopKey()); + assertEquals(newKey(2, 2, 1, 1), ai.getTopKey()); assertEquals("2", ai.getTopValue().toString()); ai.next(); @@ -265,23 +265,23 @@ public class AggregatingIteratorTest { assertFalse(ai.hasTop()); // seek after key that aggregates - ai.seek(nr(1, 1, 1, 2), EMPTY_COL_FAMS, false); + ai.seek(newRow(1, 1, 1, 2), EMPTY_COL_FAMS, false); assertTrue(ai.hasTop()); - assertEquals(nk(2, 2, 1, 2), ai.getTopKey()); + assertEquals(newKey(2, 2, 1, 2), ai.getTopKey()); assertEquals("3", ai.getTopValue().toString()); // seek before key that aggregates - ai.seek(nr(1, 1, 1, 4), EMPTY_COL_FAMS, false); + ai.seek(newRow(1, 1, 1, 4), EMPTY_COL_FAMS, false); assertTrue(ai.hasTop()); - assertEquals(nk(1, 1, 1, 3), ai.getTopKey()); + assertEquals(newKey(1, 1, 1, 3), ai.getTopKey()); assertEquals("9", ai.getTopValue().toString()); ai.next(); assertTrue(ai.hasTop()); - assertEquals(nk(2, 2, 1, 2), ai.getTopKey()); + assertEquals(newKey(2, 2, 1, 2), ai.getTopKey()); assertEquals("3", ai.getTopValue().toString()); } @@ -293,16 +293,16 @@ public class AggregatingIteratorTest { TreeMap<Key,Value> tm1 = new TreeMap<>(); // keys that do not aggregate - nkv(tm1, 0, 0, 1, 1, false, "7"); + newKeyValue(tm1, 0, 0, 1, 1, false, "7"); // keys that aggregate - nkv(tm1, 1, 1, 1, 1, false, "2"); - nkv(tm1, 1, 1, 1, 2, false, "3"); - nkv(tm1, 1, 1, 1, 3, false, "4"); + newKeyValue(tm1, 1, 1, 1, 1, false, "2"); + newKeyValue(tm1, 1, 1, 1, 2, false, "3"); + newKeyValue(tm1, 1, 1, 1, 3, false, "4"); // keys that do not aggregate - nkv(tm1, 2, 2, 1, 1, false, "2"); - nkv(tm1, 2, 2, 1, 2, false, "3"); + newKeyValue(tm1, 2, 2, 1, 1, false, "2"); + newKeyValue(tm1, 2, 2, 1, 2, false, "3"); AggregatingIterator ai = new AggregatingIterator(); @@ -314,25 +314,25 @@ public class AggregatingIteratorTest { ai.seek(new Range(), EMPTY_COL_FAMS, false); assertTrue(ai.hasTop()); - assertEquals(nk(0, 0, 1, 1), ai.getTopKey()); + assertEquals(newKey(0, 0, 1, 1), ai.getTopKey()); assertEquals("7", ai.getTopValue().toString()); ai.next(); assertTrue(ai.hasTop()); - assertEquals(nk(1, 1, 1, 3), ai.getTopKey()); + assertEquals(newKey(1, 1, 1, 3), ai.getTopKey()); assertEquals("9", ai.getTopValue().toString()); ai.next(); assertTrue(ai.hasTop()); - assertEquals(nk(2, 2, 1, 2), ai.getTopKey()); + assertEquals(newKey(2, 2, 1, 2), ai.getTopKey()); assertEquals("3", ai.getTopValue().toString()); ai.next(); assertTrue(ai.hasTop()); - assertEquals(nk(2, 2, 1, 1), ai.getTopKey()); + assertEquals(newKey(2, 2, 1, 1), ai.getTopKey()); assertEquals("2", ai.getTopValue().toString()); ai.next(); @@ -340,23 +340,23 @@ public class AggregatingIteratorTest { assertFalse(ai.hasTop()); // seek test - ai.seek(nr(0, 0, 1, 0), EMPTY_COL_FAMS, false); + ai.seek(newRow(0, 0, 1, 0), EMPTY_COL_FAMS, false); assertTrue(ai.hasTop()); - assertEquals(nk(1, 1, 1, 3), ai.getTopKey()); + assertEquals(newKey(1, 1, 1, 3), ai.getTopKey()); assertEquals("9", ai.getTopValue().toString()); ai.next(); assertTrue(ai.hasTop()); - assertEquals(nk(2, 2, 1, 2), ai.getTopKey()); + assertEquals(newKey(2, 2, 1, 2), ai.getTopKey()); assertEquals("3", ai.getTopValue().toString()); // seek after key that aggregates - ai.seek(nr(1, 1, 1, 2), EMPTY_COL_FAMS, false); + ai.seek(newRow(1, 1, 1, 2), EMPTY_COL_FAMS, false); assertTrue(ai.hasTop()); - assertEquals(nk(2, 2, 1, 2), ai.getTopKey()); + assertEquals(newKey(2, 2, 1, 2), ai.getTopKey()); assertEquals("3", ai.getTopValue().toString()); } @@ -368,13 +368,13 @@ public class AggregatingIteratorTest { // the exact same keys w/ different values TreeMap<Key,Value> tm1 = new TreeMap<>(); - nkv(tm1, 1, 1, 1, 1, false, "2"); + newKeyValue(tm1, 1, 1, 1, 1, false, "2"); TreeMap<Key,Value> tm2 = new TreeMap<>(); - nkv(tm2, 1, 1, 1, 1, false, "3"); + newKeyValue(tm2, 1, 1, 1, 1, false, "3"); TreeMap<Key,Value> tm3 = new TreeMap<>(); - nkv(tm3, 1, 1, 1, 1, false, "4"); + newKeyValue(tm3, 1, 1, 1, 1, false, "4"); AggregatingIterator ai = new AggregatingIterator(); Map<String,String> opts = new HashMap<>(); @@ -390,7 +390,7 @@ public class AggregatingIteratorTest { ai.seek(new Range(), EMPTY_COL_FAMS, false); assertTrue(ai.hasTop()); - assertEquals(nk(1, 1, 1, 1), ai.getTopKey()); + assertEquals(newKey(1, 1, 1, 1), ai.getTopKey()); assertEquals("9", ai.getTopValue().toString()); } @@ -400,9 +400,9 @@ public class AggregatingIteratorTest { TreeMap<Key,Value> tm1 = new TreeMap<>(); // keys that aggregate - nkv(tm1, 1, 1, 1, 1, false, "2"); - nkv(tm1, 1, 1, 1, 2, false, "3"); - nkv(tm1, 1, 1, 1, 3, false, "4"); + newKeyValue(tm1, 1, 1, 1, 1, false, "2"); + newKeyValue(tm1, 1, 1, 1, 2, false, "3"); + newKeyValue(tm1, 1, 1, 1, 3, false, "4"); AggregatingIterator ai = new AggregatingIterator(); @@ -414,7 +414,7 @@ public class AggregatingIteratorTest { // try seeking to the beginning of a key that aggregates - ai.seek(nr(1, 1, 1, 3, false), EMPTY_COL_FAMS, false); + ai.seek(newRow(1, 1, 1, 3, false), EMPTY_COL_FAMS, false); assertFalse(ai.hasTop()); @@ -427,9 +427,9 @@ public class AggregatingIteratorTest { TreeMap<Key,Value> tm1 = new TreeMap<>(); - nkv(tm1, 1, 1, 1, 2, true, ""); - nkv(tm1, 1, 1, 1, 3, false, "4"); - nkv(tm1, 1, 1, 1, 4, false, "3"); + newKeyValue(tm1, 1, 1, 1, 2, true, ""); + newKeyValue(tm1, 1, 1, 1, 3, false, "4"); + newKeyValue(tm1, 1, 1, 1, 4, false, "3"); AggregatingIterator ai = new AggregatingIterator(); @@ -439,29 +439,29 @@ public class AggregatingIteratorTest { ai.init(new SortedMapIterator(tm1), opts, new DefaultIteratorEnvironment()); - ai.seek(nr(1, 1, 1, 4, true), EMPTY_COL_FAMS, false); + ai.seek(newRow(1, 1, 1, 4, true), EMPTY_COL_FAMS, false); assertTrue(ai.hasTop()); - assertEquals(nk(1, 1, 1, 4), ai.getTopKey()); + assertEquals(newKey(1, 1, 1, 4), ai.getTopKey()); assertEquals("7", ai.getTopValue().toString()); ai.next(); assertTrue(ai.hasTop()); - assertEquals(nk(1, 1, 1, 2, true), ai.getTopKey()); + assertEquals(newKey(1, 1, 1, 2, true), ai.getTopKey()); assertEquals("", ai.getTopValue().toString()); ai.next(); assertFalse(ai.hasTop()); tm1 = new TreeMap<>(); - nkv(tm1, 1, 1, 1, 2, true, ""); + newKeyValue(tm1, 1, 1, 1, 2, true, ""); ai = new AggregatingIterator(); ai.init(new SortedMapIterator(tm1), opts, new DefaultIteratorEnvironment()); - ai.seek(nr(1, 1, 1, 4, true), EMPTY_COL_FAMS, false); + ai.seek(newRow(1, 1, 1, 4, true), EMPTY_COL_FAMS, false); assertTrue(ai.hasTop()); - assertEquals(nk(1, 1, 1, 2, true), ai.getTopKey()); + assertEquals(newKey(1, 1, 1, 2, true), ai.getTopKey()); assertEquals("", ai.getTopValue().toString()); ai.next(); http://git-wip-us.apache.org/repos/asf/accumulo/blob/a4a45398/core/src/test/java/org/apache/accumulo/core/iterators/FirstEntryInRowTest.java ---------------------------------------------------------------------- diff --git a/core/src/test/java/org/apache/accumulo/core/iterators/FirstEntryInRowTest.java b/core/src/test/java/org/apache/accumulo/core/iterators/FirstEntryInRowTest.java index 9a5174b..63bc2f4 100644 --- a/core/src/test/java/org/apache/accumulo/core/iterators/FirstEntryInRowTest.java +++ b/core/src/test/java/org/apache/accumulo/core/iterators/FirstEntryInRowTest.java @@ -37,16 +37,16 @@ public class FirstEntryInRowTest { private static final Map<String,String> EMPTY_MAP = new HashMap<>(); private static final Collection<ByteSequence> EMPTY_SET = new HashSet<>(); - private Key nk(String row, String cf, String cq, long time) { + private Key newKey(String row, String cf, String cq, long time) { return new Key(new Text(row), new Text(cf), new Text(cq), time); } - private Key nk(int row, int cf, int cq, long time) { - return nk(String.format("%06d", row), String.format("%06d", cf), String.format("%06d", cq), time); + private Key newKey(int row, int cf, int cq, long time) { + return newKey(String.format("%06d", row), String.format("%06d", cf), String.format("%06d", cq), time); } private void put(TreeMap<Key,Value> tm, String row, String cf, String cq, long time, Value val) { - tm.put(nk(row, cf, cq, time), val); + tm.put(newKey(row, cf, cq, time), val); } private void put(TreeMap<Key,Value> tm, String row, String cf, String cq, long time, String val) { @@ -54,19 +54,19 @@ public class FirstEntryInRowTest { } private void put(TreeMap<Key,Value> tm, int row, int cf, int cq, long time, int val) { - tm.put(nk(row, cf, cq, time), new Value((val + "").getBytes())); + tm.put(newKey(row, cf, cq, time), new Value((val + "").getBytes())); } - private void aten(FirstEntryInRowIterator rdi, String row, String cf, String cq, long time, String val) throws Exception { + private void testAndCallNext(FirstEntryInRowIterator rdi, String row, String cf, String cq, long time, String val) throws Exception { assertTrue(rdi.hasTop()); - assertEquals(nk(row, cf, cq, time), rdi.getTopKey()); + assertEquals(newKey(row, cf, cq, time), rdi.getTopKey()); assertEquals(val, rdi.getTopValue().toString()); rdi.next(); } - private void aten(FirstEntryInRowIterator rdi, int row, int cf, int cq, long time, int val) throws Exception { + private void testAndCallNext(FirstEntryInRowIterator rdi, int row, int cf, int cq, long time, int val) throws Exception { assertTrue(rdi.hasTop()); - assertEquals(nk(row, cf, cq, time), rdi.getTopKey()); + assertEquals(newKey(row, cf, cq, time), rdi.getTopKey()); assertEquals(val, Integer.parseInt(rdi.getTopValue().toString())); rdi.next(); } @@ -85,9 +85,9 @@ public class FirstEntryInRowTest { fei.init(new SortedMapIterator(tm1), EMPTY_MAP, null); fei.seek(new Range(), EMPTY_SET, false); - aten(fei, "r1", "cf1", "cq1", 5, "v1"); - aten(fei, "r2", "cf1", "cq1", 5, "v3"); - aten(fei, "r3", "cf3", "cq6", 5, "v6"); + testAndCallNext(fei, "r1", "cf1", "cq1", 5, "v1"); + testAndCallNext(fei, "r2", "cf1", "cq1", 5, "v3"); + testAndCallNext(fei, "r3", "cf3", "cq6", 5, "v6"); assertFalse(fei.hasTop()); } @@ -106,21 +106,21 @@ public class FirstEntryInRowTest { FirstEntryInRowIterator fei = new FirstEntryInRowIterator(); fei.init(new SortedMapIterator(tm1), EMPTY_MAP, null); - fei.seek(new Range(nk(0, 10, 0, 0), null), EMPTY_SET, false); - aten(fei, 1, 1, 3, 6, 1 * 1 * 3); - aten(fei, 2, 2, 3, 6, 2 * 2 * 3); - aten(fei, 3, 3, 3, 6, 3 * 3 * 3); - aten(fei, 4, 4, 3, 6, 4 * 4 * 3); + fei.seek(new Range(newKey(0, 10, 0, 0), null), EMPTY_SET, false); + testAndCallNext(fei, 1, 1, 3, 6, 1 * 1 * 3); + testAndCallNext(fei, 2, 2, 3, 6, 2 * 2 * 3); + testAndCallNext(fei, 3, 3, 3, 6, 3 * 3 * 3); + testAndCallNext(fei, 4, 4, 3, 6, 4 * 4 * 3); assertFalse(fei.hasTop()); - fei.seek(new Range(nk(1, 1, 3, 6), nk(3, 3, 3, 6)), EMPTY_SET, false); - aten(fei, 1, 1, 3, 6, 1 * 1 * 3); - aten(fei, 2, 2, 3, 6, 2 * 2 * 3); - aten(fei, 3, 3, 3, 6, 3 * 3 * 3); + fei.seek(new Range(newKey(1, 1, 3, 6), newKey(3, 3, 3, 6)), EMPTY_SET, false); + testAndCallNext(fei, 1, 1, 3, 6, 1 * 1 * 3); + testAndCallNext(fei, 2, 2, 3, 6, 2 * 2 * 3); + testAndCallNext(fei, 3, 3, 3, 6, 3 * 3 * 3); assertFalse(fei.hasTop()); - fei.seek(new Range(nk(1, 1, 3, 6), false, nk(3, 3, 3, 6), false), EMPTY_SET, false); - aten(fei, 2, 2, 3, 6, 2 * 2 * 3); + fei.seek(new Range(newKey(1, 1, 3, 6), false, newKey(3, 3, 3, 6), false), EMPTY_SET, false); + testAndCallNext(fei, 2, 2, 3, 6, 2 * 2 * 3); assertFalse(fei.hasTop()); } } http://git-wip-us.apache.org/repos/asf/accumulo/blob/a4a45398/core/src/test/java/org/apache/accumulo/core/iterators/IteratorUtilTest.java ---------------------------------------------------------------------- diff --git a/core/src/test/java/org/apache/accumulo/core/iterators/IteratorUtilTest.java b/core/src/test/java/org/apache/accumulo/core/iterators/IteratorUtilTest.java index 65deb63..e647a60 100644 --- a/core/src/test/java/org/apache/accumulo/core/iterators/IteratorUtilTest.java +++ b/core/src/test/java/org/apache/accumulo/core/iterators/IteratorUtilTest.java @@ -134,8 +134,8 @@ public class IteratorUtilTest { TreeMap<Key,Value> tm = new TreeMap<>(); - MultiIteratorTest.nkv(tm, 1, 0, false, "1"); - MultiIteratorTest.nkv(tm, 2, 0, false, "2"); + MultiIteratorTest.newKeyValue(tm, 1, 0, false, "1"); + MultiIteratorTest.newKeyValue(tm, 2, 0, false, "2"); SortedMapIterator source = new SortedMapIterator(tm); @@ -144,13 +144,13 @@ public class IteratorUtilTest { iter.seek(new Range(), EMPTY_COL_FAMS, false); assertTrue(iter.hasTop()); - assertTrue(iter.getTopKey().equals(MultiIteratorTest.nk(1, 0))); + assertTrue(iter.getTopKey().equals(MultiIteratorTest.newKey(1, 0))); assertTrue(iter.getTopValue().toString().equals("4")); iter.next(); assertTrue(iter.hasTop()); - assertTrue(iter.getTopKey().equals(MultiIteratorTest.nk(2, 0))); + assertTrue(iter.getTopKey().equals(MultiIteratorTest.newKey(2, 0))); assertTrue(iter.getTopValue().toString().equals("9")); iter.next(); @@ -166,8 +166,8 @@ public class IteratorUtilTest { TreeMap<Key,Value> tm = new TreeMap<>(); - MultiIteratorTest.nkv(tm, 1, 0, false, "1"); - MultiIteratorTest.nkv(tm, 2, 0, false, "2"); + MultiIteratorTest.newKeyValue(tm, 1, 0, false, "1"); + MultiIteratorTest.newKeyValue(tm, 2, 0, false, "2"); SortedMapIterator source = new SortedMapIterator(tm); @@ -176,13 +176,13 @@ public class IteratorUtilTest { iter.seek(new Range(), EMPTY_COL_FAMS, false); assertTrue(iter.hasTop()); - assertTrue(iter.getTopKey().equals(MultiIteratorTest.nk(1, 0))); + assertTrue(iter.getTopKey().equals(MultiIteratorTest.newKey(1, 0))); assertTrue(iter.getTopValue().toString().equals("1")); iter.next(); assertTrue(iter.hasTop()); - assertTrue(iter.getTopKey().equals(MultiIteratorTest.nk(2, 0))); + assertTrue(iter.getTopKey().equals(MultiIteratorTest.newKey(2, 0))); assertTrue(iter.getTopValue().toString().equals("2")); iter.next(); @@ -199,8 +199,8 @@ public class IteratorUtilTest { TreeMap<Key,Value> tm = new TreeMap<>(); - MultiIteratorTest.nkv(tm, 1, 0, false, "1"); - MultiIteratorTest.nkv(tm, 2, 0, false, "2"); + MultiIteratorTest.newKeyValue(tm, 1, 0, false, "1"); + MultiIteratorTest.newKeyValue(tm, 2, 0, false, "2"); SortedMapIterator source = new SortedMapIterator(tm); @@ -212,13 +212,13 @@ public class IteratorUtilTest { iter.seek(new Range(), EMPTY_COL_FAMS, false); assertTrue(iter.hasTop()); - assertTrue(iter.getTopKey().equals(MultiIteratorTest.nk(1, 0))); + assertTrue(iter.getTopKey().equals(MultiIteratorTest.newKey(1, 0))); assertTrue(iter.getTopValue().toString().equals("2")); iter.next(); assertTrue(iter.hasTop()); - assertTrue(iter.getTopKey().equals(MultiIteratorTest.nk(2, 0))); + assertTrue(iter.getTopKey().equals(MultiIteratorTest.newKey(2, 0))); assertTrue(iter.getTopValue().toString().equals("5")); iter.next(); @@ -238,8 +238,8 @@ public class IteratorUtilTest { TreeMap<Key,Value> tm = new TreeMap<>(); - MultiIteratorTest.nkv(tm, 1, 0, false, "1"); - MultiIteratorTest.nkv(tm, 2, 0, false, "2"); + MultiIteratorTest.newKeyValue(tm, 1, 0, false, "1"); + MultiIteratorTest.newKeyValue(tm, 2, 0, false, "2"); SortedMapIterator source = new SortedMapIterator(tm); @@ -248,13 +248,13 @@ public class IteratorUtilTest { iter.seek(new Range(), EMPTY_COL_FAMS, false); assertTrue(iter.hasTop()); - assertTrue(iter.getTopKey().equals(MultiIteratorTest.nk(1, 0))); + assertTrue(iter.getTopKey().equals(MultiIteratorTest.newKey(1, 0))); assertTrue(iter.getTopValue().toString().equals("64")); iter.next(); assertTrue(iter.hasTop()); - assertTrue(iter.getTopKey().equals(MultiIteratorTest.nk(2, 0))); + assertTrue(iter.getTopKey().equals(MultiIteratorTest.newKey(2, 0))); assertTrue(iter.getTopValue().toString().equals("81")); iter.next(); @@ -274,8 +274,8 @@ public class IteratorUtilTest { TreeMap<Key,Value> tm = new TreeMap<>(); - MultiIteratorTest.nkv(tm, 1, 850, false, "1"); - MultiIteratorTest.nkv(tm, 2, 950, false, "2"); + MultiIteratorTest.newKeyValue(tm, 1, 850, false, "1"); + MultiIteratorTest.newKeyValue(tm, 2, 950, false, "2"); SortedMapIterator source = new SortedMapIterator(tm); @@ -284,7 +284,7 @@ public class IteratorUtilTest { iter.seek(new Range(), EMPTY_COL_FAMS, false); assertTrue(iter.hasTop()); - assertTrue(iter.getTopKey().equals(MultiIteratorTest.nk(2, 950))); + assertTrue(iter.getTopKey().equals(MultiIteratorTest.newKey(2, 950))); iter.next(); assertFalse(iter.hasTop());
