Author: billie Date: Tue Aug 7 19:03:56 2012 New Revision: 1370432 URL: http://svn.apache.org/viewvc?rev=1370432&view=rev Log: ACCUMULO-718 changed static methods to instance methods for ColumnFQ
Modified: accumulo/trunk/core/src/main/java/org/apache/accumulo/core/client/mapreduce/InputFormatBase.java accumulo/trunk/core/src/main/java/org/apache/accumulo/core/data/KeyExtent.java accumulo/trunk/core/src/main/java/org/apache/accumulo/core/util/ColumnFQ.java accumulo/trunk/core/src/main/java/org/apache/accumulo/core/util/Merge.java accumulo/trunk/core/src/main/java/org/apache/accumulo/core/util/MetadataTable.java accumulo/trunk/core/src/main/java/org/apache/accumulo/core/util/shell/commands/GetSplitsCommand.java accumulo/trunk/server/src/main/java/org/apache/accumulo/server/gc/SimpleGarbageCollector.java accumulo/trunk/server/src/main/java/org/apache/accumulo/server/master/Master.java accumulo/trunk/server/src/main/java/org/apache/accumulo/server/master/state/MetaDataTableScanner.java accumulo/trunk/server/src/main/java/org/apache/accumulo/server/master/tableOps/CompactRange.java accumulo/trunk/server/src/main/java/org/apache/accumulo/server/test/functional/FunctionalTest.java accumulo/trunk/server/src/main/java/org/apache/accumulo/server/test/performance/metadata/MetadataBatchScanTest.java accumulo/trunk/server/src/main/java/org/apache/accumulo/server/util/CheckForMetadataProblems.java accumulo/trunk/server/src/main/java/org/apache/accumulo/server/util/MetadataTable.java accumulo/trunk/server/src/main/java/org/apache/accumulo/server/util/TabletIterator.java accumulo/trunk/server/src/test/java/org/apache/accumulo/server/constraints/MetadataConstraintsTest.java accumulo/trunk/server/src/test/java/org/apache/accumulo/server/master/TestMergeState.java accumulo/trunk/server/src/test/java/org/apache/accumulo/server/util/CloneTest.java accumulo/trunk/server/src/test/java/org/apache/accumulo/server/util/TabletIteratorTest.java Modified: accumulo/trunk/core/src/main/java/org/apache/accumulo/core/client/mapreduce/InputFormatBase.java URL: http://svn.apache.org/viewvc/accumulo/trunk/core/src/main/java/org/apache/accumulo/core/client/mapreduce/InputFormatBase.java?rev=1370432&r1=1370431&r2=1370432&view=diff ============================================================================== --- accumulo/trunk/core/src/main/java/org/apache/accumulo/core/client/mapreduce/InputFormatBase.java (original) +++ accumulo/trunk/core/src/main/java/org/apache/accumulo/core/client/mapreduce/InputFormatBase.java Tue Aug 7 19:03:56 2012 @@ -72,7 +72,6 @@ import org.apache.accumulo.core.security import org.apache.accumulo.core.security.TablePermission; import org.apache.accumulo.core.security.thrift.AuthInfo; import org.apache.accumulo.core.util.ArgumentChecker; -import org.apache.accumulo.core.util.ColumnFQ; import org.apache.accumulo.core.util.Pair; import org.apache.accumulo.core.util.TextUtil; import org.apache.accumulo.core.util.UtilWaitThread; @@ -858,7 +857,7 @@ public abstract class InputFormatBase<K, Range metadataRange = new Range(new KeyExtent(new Text(tableId), startRow, null).getMetadataEntry(), true, null, false); Scanner scanner = conn.createScanner(Constants.METADATA_TABLE_NAME, Constants.NO_AUTHS); - ColumnFQ.fetch(scanner, Constants.METADATA_PREV_ROW_COLUMN); + Constants.METADATA_PREV_ROW_COLUMN.fetch(scanner); scanner.fetchColumnFamily(Constants.METADATA_LAST_LOCATION_COLUMN_FAMILY); scanner.fetchColumnFamily(Constants.METADATA_CURRENT_LOCATION_COLUMN_FAMILY); scanner.fetchColumnFamily(Constants.METADATA_FUTURE_LOCATION_COLUMN_FAMILY); Modified: accumulo/trunk/core/src/main/java/org/apache/accumulo/core/data/KeyExtent.java URL: http://svn.apache.org/viewvc/accumulo/trunk/core/src/main/java/org/apache/accumulo/core/data/KeyExtent.java?rev=1370432&r1=1370431&r2=1370432&view=diff ============================================================================== --- accumulo/trunk/core/src/main/java/org/apache/accumulo/core/data/KeyExtent.java (original) +++ accumulo/trunk/core/src/main/java/org/apache/accumulo/core/data/KeyExtent.java Tue Aug 7 19:03:56 2012 @@ -42,7 +42,6 @@ import java.util.WeakHashMap; import org.apache.accumulo.core.Constants; import org.apache.accumulo.core.data.thrift.TKeyExtent; import org.apache.accumulo.core.util.ByteBufferUtil; -import org.apache.accumulo.core.util.ColumnFQ; import org.apache.accumulo.core.util.TextUtil; import org.apache.hadoop.io.BinaryComparable; import org.apache.hadoop.io.Text; @@ -396,7 +395,7 @@ public class KeyExtent implements Writab public static Mutation getPrevRowUpdateMutation(KeyExtent ke) { Mutation m = new Mutation(ke.getMetadataEntry()); - ColumnFQ.put(m, Constants.METADATA_PREV_ROW_COLUMN, encodePrevEndRow(ke.getPrevEndRow())); + Constants.METADATA_PREV_ROW_COLUMN.put(m, encodePrevEndRow(ke.getPrevEndRow())); return m; } Modified: accumulo/trunk/core/src/main/java/org/apache/accumulo/core/util/ColumnFQ.java URL: http://svn.apache.org/viewvc/accumulo/trunk/core/src/main/java/org/apache/accumulo/core/util/ColumnFQ.java?rev=1370432&r1=1370431&r2=1370432&view=diff ============================================================================== --- accumulo/trunk/core/src/main/java/org/apache/accumulo/core/util/ColumnFQ.java (original) +++ accumulo/trunk/core/src/main/java/org/apache/accumulo/core/util/ColumnFQ.java Tue Aug 7 19:03:56 2012 @@ -60,18 +60,18 @@ public class ColumnFQ implements Compara return new Column(TextUtil.getBytes(colf), TextUtil.getBytes(colq), null); } - public static void fetch(ScannerBase sb, ColumnFQ cfq) { - sb.fetchColumn(cfq.colf, cfq.colq); + public void fetch(ScannerBase sb) { + sb.fetchColumn(colf, colq); } - public static void put(Mutation m, ColumnFQ cfq, Value v) { - m.put(cfq.colf, cfq.colq, v); + public void put(Mutation m, Value v) { + m.put(colf, colq, v); } - public static void putDelete(Mutation m, ColumnFQ cfq) { - m.putDelete(cfq.colf, cfq.colq); + public void putDelete(Mutation m) { + m.putDelete(colf, colq); } - + @Override public boolean equals(Object o) { if (!(o instanceof ColumnFQ)) Modified: accumulo/trunk/core/src/main/java/org/apache/accumulo/core/util/Merge.java URL: http://svn.apache.org/viewvc/accumulo/trunk/core/src/main/java/org/apache/accumulo/core/util/Merge.java?rev=1370432&r1=1370431&r2=1370432&view=diff ============================================================================== --- accumulo/trunk/core/src/main/java/org/apache/accumulo/core/util/Merge.java (original) +++ accumulo/trunk/core/src/main/java/org/apache/accumulo/core/util/Merge.java Tue Aug 7 19:03:56 2012 @@ -243,7 +243,7 @@ public class Merge { } scanner.setRange(new KeyExtent(new Text(tableId), end, start).toMetadataRange()); scanner.fetchColumnFamily(Constants.METADATA_DATAFILE_COLUMN_FAMILY); - ColumnFQ.fetch(scanner, Constants.METADATA_PREV_ROW_COLUMN); + Constants.METADATA_PREV_ROW_COLUMN.fetch(scanner); final Iterator<Entry<Key,Value>> iterator = scanner.iterator(); Iterator<Size> result = new Iterator<Size>() { Modified: accumulo/trunk/core/src/main/java/org/apache/accumulo/core/util/MetadataTable.java URL: http://svn.apache.org/viewvc/accumulo/trunk/core/src/main/java/org/apache/accumulo/core/util/MetadataTable.java?rev=1370432&r1=1370431&r2=1370432&view=diff ============================================================================== --- accumulo/trunk/core/src/main/java/org/apache/accumulo/core/util/MetadataTable.java (original) +++ accumulo/trunk/core/src/main/java/org/apache/accumulo/core/util/MetadataTable.java Tue Aug 7 19:03:56 2012 @@ -211,7 +211,7 @@ public class MetadataTable { if (columns != null) { for (ColumnFQ column : columns) - ColumnFQ.fetch(scanner, column); + column.fetch(scanner); } scanner.setRange(new Range(new Key(startRow), true, new Key(endRow).followingKey(PartialKey.ROW), false)); @@ -236,7 +236,7 @@ public class MetadataTable { Scanner scanner = instance.getConnector(credentials.user, credentials.password).createScanner(Constants.METADATA_TABLE_NAME, Constants.NO_AUTHS); - ColumnFQ.fetch(scanner, Constants.METADATA_PREV_ROW_COLUMN); + Constants.METADATA_PREV_ROW_COLUMN.fetch(scanner); scanner.fetchColumnFamily(Constants.METADATA_CURRENT_LOCATION_COLUMN_FAMILY); // position at first entry in metadata table for given table Modified: accumulo/trunk/core/src/main/java/org/apache/accumulo/core/util/shell/commands/GetSplitsCommand.java URL: http://svn.apache.org/viewvc/accumulo/trunk/core/src/main/java/org/apache/accumulo/core/util/shell/commands/GetSplitsCommand.java?rev=1370432&r1=1370431&r2=1370432&view=diff ============================================================================== --- accumulo/trunk/core/src/main/java/org/apache/accumulo/core/util/shell/commands/GetSplitsCommand.java (original) +++ accumulo/trunk/core/src/main/java/org/apache/accumulo/core/util/shell/commands/GetSplitsCommand.java Tue Aug 7 19:03:56 2012 @@ -31,7 +31,6 @@ import org.apache.accumulo.core.data.Key import org.apache.accumulo.core.data.KeyExtent; import org.apache.accumulo.core.data.Range; import org.apache.accumulo.core.data.Value; -import org.apache.accumulo.core.util.ColumnFQ; import org.apache.accumulo.core.util.TextUtil; import org.apache.accumulo.core.util.format.BinaryFormatter; import org.apache.accumulo.core.util.shell.Shell; @@ -70,7 +69,7 @@ public class GetSplitsCommand extends Co } } else { final Scanner scanner = shellState.getConnector().createScanner(Constants.METADATA_TABLE_NAME, Constants.NO_AUTHS); - ColumnFQ.fetch(scanner, Constants.METADATA_PREV_ROW_COLUMN); + Constants.METADATA_PREV_ROW_COLUMN.fetch(scanner); final Text start = new Text(shellState.getConnector().tableOperations().tableIdMap().get(tableName)); final Text end = new Text(start); end.append(new byte[] {'<'}, 0, 1); Modified: accumulo/trunk/server/src/main/java/org/apache/accumulo/server/gc/SimpleGarbageCollector.java URL: http://svn.apache.org/viewvc/accumulo/trunk/server/src/main/java/org/apache/accumulo/server/gc/SimpleGarbageCollector.java?rev=1370432&r1=1370431&r2=1370432&view=diff ============================================================================== --- accumulo/trunk/server/src/main/java/org/apache/accumulo/server/gc/SimpleGarbageCollector.java (original) +++ accumulo/trunk/server/src/main/java/org/apache/accumulo/server/gc/SimpleGarbageCollector.java Tue Aug 7 19:03:56 2012 @@ -56,7 +56,6 @@ import org.apache.accumulo.core.data.Ran import org.apache.accumulo.core.data.Value; import org.apache.accumulo.core.file.FileOperations; import org.apache.accumulo.core.file.FileUtil; -import org.apache.accumulo.core.gc.thrift.GCMonitorService; import org.apache.accumulo.core.gc.thrift.GCMonitorService.Iface; import org.apache.accumulo.core.gc.thrift.GCMonitorService.Processor; import org.apache.accumulo.core.gc.thrift.GCStatus; @@ -64,7 +63,6 @@ import org.apache.accumulo.core.gc.thrif import org.apache.accumulo.core.master.state.tables.TableState; import org.apache.accumulo.core.security.thrift.AuthInfo; import org.apache.accumulo.core.util.CachedConfiguration; -import org.apache.accumulo.core.util.ColumnFQ; import org.apache.accumulo.core.util.NamingThreadFactory; import org.apache.accumulo.core.util.ServerServices; import org.apache.accumulo.core.util.ServerServices.Service; @@ -503,7 +501,7 @@ public class SimpleGarbageCollector impl scanner.clearColumns(); scanner.fetchColumnFamily(Constants.METADATA_DATAFILE_COLUMN_FAMILY); scanner.fetchColumnFamily(Constants.METADATA_SCANFILE_COLUMN_FAMILY); - ColumnFQ.fetch(scanner, Constants.METADATA_DIRECTORY_COLUMN); + Constants.METADATA_DIRECTORY_COLUMN.fetch(scanner); TabletIterator tabletIterator = new TabletIterator(scanner, Constants.METADATA_KEYSPACE, false, true); Modified: accumulo/trunk/server/src/main/java/org/apache/accumulo/server/master/Master.java URL: http://svn.apache.org/viewvc/accumulo/trunk/server/src/main/java/org/apache/accumulo/server/master/Master.java?rev=1370432&r1=1370431&r2=1370432&view=diff ============================================================================== --- accumulo/trunk/server/src/main/java/org/apache/accumulo/server/master/Master.java (original) +++ accumulo/trunk/server/src/main/java/org/apache/accumulo/server/master/Master.java Tue Aug 7 19:03:56 2012 @@ -86,7 +86,6 @@ import org.apache.accumulo.core.security import org.apache.accumulo.core.security.thrift.ThriftSecurityException; import org.apache.accumulo.core.util.ByteBufferUtil; import org.apache.accumulo.core.util.CachedConfiguration; -import org.apache.accumulo.core.util.ColumnFQ; import org.apache.accumulo.core.util.Daemon; import org.apache.accumulo.core.util.UtilWaitThread; import org.apache.accumulo.core.zookeeper.ZooUtil; @@ -618,8 +617,8 @@ public class Master implements LiveTServ try { Connector conn = getConnector(); Scanner scanner = new IsolatedScanner(conn.createScanner(Constants.METADATA_TABLE_NAME, Constants.NO_AUTHS)); - ColumnFQ.fetch(scanner, Constants.METADATA_FLUSH_COLUMN); - ColumnFQ.fetch(scanner, Constants.METADATA_DIRECTORY_COLUMN); + Constants.METADATA_FLUSH_COLUMN.fetch(scanner); + Constants.METADATA_DIRECTORY_COLUMN.fetch(scanner); scanner.fetchColumnFamily(Constants.METADATA_CURRENT_LOCATION_COLUMN_FAMILY); scanner.fetchColumnFamily(Constants.METADATA_LOG_COLUMN_FAMILY); scanner.setRange(new KeyExtent(new Text(tableId), null, ByteBufferUtil.toText(startRow)).toMetadataRange()); @@ -1581,8 +1580,8 @@ public class Master implements LiveTServ range.getEndRow()), true); Scanner scanner = conn.createScanner(Constants.METADATA_TABLE_NAME, Constants.NO_AUTHS); scanner.setRange(deleteRange); - ColumnFQ.fetch(scanner, Constants.METADATA_DIRECTORY_COLUMN); - ColumnFQ.fetch(scanner, Constants.METADATA_TIME_COLUMN); + Constants.METADATA_DIRECTORY_COLUMN.fetch(scanner); + Constants.METADATA_TIME_COLUMN.fetch(scanner); scanner.fetchColumnFamily(Constants.METADATA_DATAFILE_COLUMN_FAMILY); scanner.fetchColumnFamily(Constants.METADATA_CURRENT_LOCATION_COLUMN_FAMILY); Set<String> datafiles = new TreeSet<String>(); @@ -1620,8 +1619,8 @@ public class Master implements LiveTServ bw = conn.createBatchWriter(Constants.METADATA_TABLE_NAME, 1000l, 100l, 1); try { Mutation m = new Mutation(followingTablet.getMetadataEntry()); - ColumnFQ.put(m, Constants.METADATA_PREV_ROW_COLUMN, KeyExtent.encodePrevEndRow(range.getPrevEndRow())); - ColumnFQ.putDelete(m, Constants.METADATA_CHOPPED_COLUMN); + Constants.METADATA_PREV_ROW_COLUMN.put(m, KeyExtent.encodePrevEndRow(range.getPrevEndRow())); + Constants.METADATA_CHOPPED_COLUMN.putDelete(m); bw.addMutation(m); bw.flush(); } finally { @@ -1661,9 +1660,9 @@ public class Master implements LiveTServ bw = conn.createBatchWriter(Constants.METADATA_TABLE_NAME, 1000000L, 1000L, 1); Scanner scanner = conn.createScanner(Constants.METADATA_TABLE_NAME, Constants.NO_AUTHS); scanner.setRange(scanRange); - ColumnFQ.fetch(scanner, Constants.METADATA_PREV_ROW_COLUMN); - ColumnFQ.fetch(scanner, Constants.METADATA_TIME_COLUMN); - ColumnFQ.fetch(scanner, Constants.METADATA_DIRECTORY_COLUMN); + Constants.METADATA_PREV_ROW_COLUMN.fetch(scanner); + Constants.METADATA_TIME_COLUMN.fetch(scanner); + Constants.METADATA_DIRECTORY_COLUMN.fetch(scanner); scanner.fetchColumnFamily(Constants.METADATA_DATAFILE_COLUMN_FAMILY); Mutation m = new Mutation(stopRow); String maxLogicalTime = null; @@ -1691,7 +1690,7 @@ public class Master implements LiveTServ if (range.isMeta()) last = last.clip(Constants.METADATA_ROOT_TABLET_KEYSPACE); scanner.setRange(last); - ColumnFQ.fetch(scanner, Constants.METADATA_TIME_COLUMN); + Constants.METADATA_TIME_COLUMN.fetch(scanner); for (Entry<Key,Value> entry : scanner) { if (Constants.METADATA_TIME_COLUMN.hasColumns(entry.getKey())) { maxLogicalTime = TabletTime.maxMetadataTime(maxLogicalTime, entry.getValue().toString()); @@ -1699,7 +1698,7 @@ public class Master implements LiveTServ } if (maxLogicalTime != null) - ColumnFQ.put(m, Constants.METADATA_TIME_COLUMN, new Value(maxLogicalTime.getBytes())); + Constants.METADATA_TIME_COLUMN.put(m, new Value(maxLogicalTime.getBytes())); if (!m.getUpdates().isEmpty()) { bw.addMutation(m); @@ -1724,7 +1723,7 @@ public class Master implements LiveTServ // Clean-up the last chopped marker m = new Mutation(stopRow); - ColumnFQ.putDelete(m, Constants.METADATA_CHOPPED_COLUMN); + Constants.METADATA_CHOPPED_COLUMN.putDelete(m); bw.addMutation(m); bw.flush(); @@ -1774,7 +1773,7 @@ public class Master implements LiveTServ try { Connector conn = getConnector(); Scanner scanner = conn.createScanner(Constants.METADATA_TABLE_NAME, Constants.NO_AUTHS); - ColumnFQ.fetch(scanner, Constants.METADATA_PREV_ROW_COLUMN); + Constants.METADATA_PREV_ROW_COLUMN.fetch(scanner); KeyExtent start = new KeyExtent(range.getTableId(), range.getEndRow(), null); scanner.setRange(new Range(start.getMetadataEntry(), null)); Iterator<Entry<Key,Value>> iterator = scanner.iterator(); @@ -1859,7 +1858,7 @@ public class Master implements LiveTServ private void cleanupMutations() throws AccumuloException, AccumuloSecurityException, TableNotFoundException { Connector connector = getConnector(); Scanner scanner = connector.createScanner(Constants.METADATA_TABLE_NAME, Constants.NO_AUTHS); - ColumnFQ.fetch(scanner, Constants.METADATA_PREV_ROW_COLUMN); + Constants.METADATA_PREV_ROW_COLUMN.fetch(scanner); Set<KeyExtent> found = new HashSet<KeyExtent>(); for (Entry<Key,Value> entry : scanner) { KeyExtent extent = new KeyExtent(entry.getKey().getRow(), entry.getValue()); Modified: accumulo/trunk/server/src/main/java/org/apache/accumulo/server/master/state/MetaDataTableScanner.java URL: http://svn.apache.org/viewvc/accumulo/trunk/server/src/main/java/org/apache/accumulo/server/master/state/MetaDataTableScanner.java?rev=1370432&r1=1370431&r2=1370432&view=diff ============================================================================== --- accumulo/trunk/server/src/main/java/org/apache/accumulo/server/master/state/MetaDataTableScanner.java (original) +++ accumulo/trunk/server/src/main/java/org/apache/accumulo/server/master/state/MetaDataTableScanner.java Tue Aug 7 19:03:56 2012 @@ -41,7 +41,6 @@ import org.apache.accumulo.core.data.Ran import org.apache.accumulo.core.data.Value; import org.apache.accumulo.core.iterators.user.WholeRowIterator; import org.apache.accumulo.core.security.thrift.AuthInfo; -import org.apache.accumulo.core.util.ColumnFQ; import org.apache.hadoop.io.Text; import org.apache.log4j.Logger; @@ -65,7 +64,7 @@ public class MetaDataTableScanner implem } static public void configureScanner(ScannerBase scanner, CurrentState state) { - ColumnFQ.fetch(scanner, Constants.METADATA_PREV_ROW_COLUMN); + Constants.METADATA_PREV_ROW_COLUMN.fetch(scanner); scanner.fetchColumnFamily(Constants.METADATA_CURRENT_LOCATION_COLUMN_FAMILY); scanner.fetchColumnFamily(Constants.METADATA_FUTURE_LOCATION_COLUMN_FAMILY); scanner.fetchColumnFamily(Constants.METADATA_LOG_COLUMN_FAMILY); Modified: accumulo/trunk/server/src/main/java/org/apache/accumulo/server/master/tableOps/CompactRange.java URL: http://svn.apache.org/viewvc/accumulo/trunk/server/src/main/java/org/apache/accumulo/server/master/tableOps/CompactRange.java?rev=1370432&r1=1370431&r2=1370432&view=diff ============================================================================== --- accumulo/trunk/server/src/main/java/org/apache/accumulo/server/master/tableOps/CompactRange.java (original) +++ accumulo/trunk/server/src/main/java/org/apache/accumulo/server/master/tableOps/CompactRange.java Tue Aug 7 19:03:56 2012 @@ -40,7 +40,6 @@ import org.apache.accumulo.core.iterator import org.apache.accumulo.core.master.state.tables.TableState; import org.apache.accumulo.core.tabletserver.thrift.IteratorConfig; import org.apache.accumulo.core.tabletserver.thrift.TIteratorSetting; -import org.apache.accumulo.core.util.ColumnFQ; import org.apache.accumulo.fate.Repo; import org.apache.accumulo.fate.zookeeper.IZooReaderWriter; import org.apache.accumulo.fate.zookeeper.ZooReaderWriter.Mutator; @@ -88,8 +87,8 @@ class CompactionDriver extends MasterRep range = range.clip(new Range(Constants.ROOT_TABLET_EXTENT.getMetadataEntry(), false, null, true)); scanner.setRange(range); - ColumnFQ.fetch(scanner, Constants.METADATA_COMPACT_COLUMN); - ColumnFQ.fetch(scanner, Constants.METADATA_DIRECTORY_COLUMN); + Constants.METADATA_COMPACT_COLUMN.fetch(scanner); + Constants.METADATA_DIRECTORY_COLUMN.fetch(scanner); scanner.fetchColumnFamily(Constants.METADATA_CURRENT_LOCATION_COLUMN_FAMILY); // TODO since not using tablet iterator, are there any issues w/ splits merges? Modified: accumulo/trunk/server/src/main/java/org/apache/accumulo/server/test/functional/FunctionalTest.java URL: http://svn.apache.org/viewvc/accumulo/trunk/server/src/main/java/org/apache/accumulo/server/test/functional/FunctionalTest.java?rev=1370432&r1=1370431&r2=1370432&view=diff ============================================================================== --- accumulo/trunk/server/src/main/java/org/apache/accumulo/server/test/functional/FunctionalTest.java (original) +++ accumulo/trunk/server/src/main/java/org/apache/accumulo/server/test/functional/FunctionalTest.java Tue Aug 7 19:03:56 2012 @@ -41,7 +41,6 @@ import org.apache.accumulo.core.data.Mut import org.apache.accumulo.core.data.Range; import org.apache.accumulo.core.data.Value; import org.apache.accumulo.core.security.thrift.AuthInfo; -import org.apache.accumulo.core.util.ColumnFQ; import org.apache.accumulo.server.conf.ServerConfiguration; import org.apache.accumulo.start.classloader.AccumuloClassLoader; import org.apache.commons.cli.BasicParser; @@ -227,7 +226,7 @@ public abstract class FunctionalTest { String tableId = Tables.getNameToIdMap(getInstance()).get(tableName); scanner.setRange(new Range(new Text(tableId + ";"), true, new Text(tableId + "<"), true)); scanner.fetchColumnFamily(Constants.METADATA_DATAFILE_COLUMN_FAMILY); - ColumnFQ.fetch(scanner, Constants.METADATA_PREV_ROW_COLUMN); + Constants.METADATA_PREV_ROW_COLUMN.fetch(scanner); HashMap<Text,Integer> tabletFileCounts = new HashMap<Text,Integer>(); Modified: accumulo/trunk/server/src/main/java/org/apache/accumulo/server/test/performance/metadata/MetadataBatchScanTest.java URL: http://svn.apache.org/viewvc/accumulo/trunk/server/src/main/java/org/apache/accumulo/server/test/performance/metadata/MetadataBatchScanTest.java?rev=1370432&r1=1370431&r2=1370432&view=diff ============================================================================== --- accumulo/trunk/server/src/main/java/org/apache/accumulo/server/test/performance/metadata/MetadataBatchScanTest.java (original) +++ accumulo/trunk/server/src/main/java/org/apache/accumulo/server/test/performance/metadata/MetadataBatchScanTest.java Tue Aug 7 19:03:56 2012 @@ -36,7 +36,6 @@ import org.apache.accumulo.core.data.Mut import org.apache.accumulo.core.data.Range; import org.apache.accumulo.core.data.Value; import org.apache.accumulo.core.util.AddressUtil; -import org.apache.accumulo.core.util.ColumnFQ; import org.apache.accumulo.core.util.Stat; import org.apache.accumulo.server.master.state.TServerInstance; import org.apache.accumulo.server.security.SecurityConstants; @@ -100,7 +99,7 @@ public class MetadataBatchScanTest { String dir = "/t-" + UUID.randomUUID(); - ColumnFQ.put(mut, Constants.METADATA_DIRECTORY_COLUMN, new Value(dir.getBytes())); + Constants.METADATA_DIRECTORY_COLUMN.put(mut, new Value(dir.getBytes())); for (int i = 0; i < 5; i++) { mut.put(Constants.METADATA_DATAFILE_COLUMN_FAMILY, new Text(dir + "/00000_0000" + i + ".map"), new Value("10000,1000000".getBytes())); @@ -170,7 +169,7 @@ public class MetadataBatchScanTest { BatchScanner bs = connector.createBatchScanner(Constants.METADATA_TABLE_NAME, Constants.NO_AUTHS, 1); bs.fetchColumnFamily(Constants.METADATA_CURRENT_LOCATION_COLUMN_FAMILY); - ColumnFQ.fetch(bs, Constants.METADATA_PREV_ROW_COLUMN); + Constants.METADATA_PREV_ROW_COLUMN.fetch(bs); bs.setRanges(ranges); Modified: accumulo/trunk/server/src/main/java/org/apache/accumulo/server/util/CheckForMetadataProblems.java URL: http://svn.apache.org/viewvc/accumulo/trunk/server/src/main/java/org/apache/accumulo/server/util/CheckForMetadataProblems.java?rev=1370432&r1=1370431&r2=1370432&view=diff ============================================================================== --- accumulo/trunk/server/src/main/java/org/apache/accumulo/server/util/CheckForMetadataProblems.java (original) +++ accumulo/trunk/server/src/main/java/org/apache/accumulo/server/util/CheckForMetadataProblems.java Tue Aug 7 19:03:56 2012 @@ -37,7 +37,6 @@ import org.apache.accumulo.core.data.Val import org.apache.accumulo.core.security.thrift.AuthInfo; import org.apache.accumulo.core.tabletserver.thrift.ConstraintViolationException; import org.apache.accumulo.core.util.CachedConfiguration; -import org.apache.accumulo.core.util.ColumnFQ; import org.apache.accumulo.server.client.HdfsZooInstance; import org.apache.accumulo.server.conf.ServerConfiguration; import org.apache.hadoop.fs.FileSystem; @@ -119,7 +118,7 @@ public class CheckForMetadataProblems { } scanner.setRange(Constants.METADATA_KEYSPACE); - ColumnFQ.fetch(scanner, Constants.METADATA_PREV_ROW_COLUMN); + Constants.METADATA_PREV_ROW_COLUMN.fetch(scanner); scanner.fetchColumnFamily(Constants.METADATA_CURRENT_LOCATION_COLUMN_FAMILY); Text colf = new Text(); Modified: accumulo/trunk/server/src/main/java/org/apache/accumulo/server/util/MetadataTable.java URL: http://svn.apache.org/viewvc/accumulo/trunk/server/src/main/java/org/apache/accumulo/server/util/MetadataTable.java?rev=1370432&r1=1370431&r2=1370432&view=diff ============================================================================== --- accumulo/trunk/server/src/main/java/org/apache/accumulo/server/util/MetadataTable.java (original) +++ accumulo/trunk/server/src/main/java/org/apache/accumulo/server/util/MetadataTable.java Tue Aug 7 19:03:56 2012 @@ -111,7 +111,7 @@ public class MetadataTable extends org.a } public static void putLockID(ZooLock zooLock, Mutation m) { - ColumnFQ.put(m, Constants.METADATA_LOCK_COLUMN, new Value(zooLock.getLockID().serialize(ZooUtil.getRoot(HdfsZooInstance.getInstance()) + "/").getBytes())); + Constants.METADATA_LOCK_COLUMN.put(m, new Value(zooLock.getLockID().serialize(ZooUtil.getRoot(HdfsZooInstance.getInstance()) + "/").getBytes())); } public static void update(AuthInfo credentials, Mutation m) { @@ -190,7 +190,7 @@ public class MetadataTable extends org.a if (dfv.getNumEntries() > 0) { m.put(Constants.METADATA_DATAFILE_COLUMN_FAMILY, new Text(path), new Value(dfv.encode())); - ColumnFQ.put(m, Constants.METADATA_TIME_COLUMN, new Value(time.getBytes())); + Constants.METADATA_TIME_COLUMN.put(m, new Value(time.getBytes())); // stuff in this location TServerInstance self = getTServerInstance(address, zooLock); self.putLastLocation(m); @@ -210,7 +210,7 @@ public class MetadataTable extends org.a if (mergeFile != null) m.putDelete(Constants.METADATA_DATAFILE_COLUMN_FAMILY, new Text(mergeFile)); - ColumnFQ.put(m, Constants.METADATA_FLUSH_COLUMN, new Value((flushId + "").getBytes())); + Constants.METADATA_FLUSH_COLUMN.put(m, new Value((flushId + "").getBytes())); update(credentials, zooLock, m); @@ -232,7 +232,7 @@ public class MetadataTable extends org.a public static void updateTabletFlushID(KeyExtent extent, long flushID, AuthInfo credentials, ZooLock zooLock) { if (!extent.isRootTablet()) { Mutation m = new Mutation(extent.getMetadataEntry()); - ColumnFQ.put(m, Constants.METADATA_FLUSH_COLUMN, new Value((flushID + "").getBytes())); + Constants.METADATA_FLUSH_COLUMN.put(m, new Value((flushID + "").getBytes())); update(credentials, zooLock, m); } } @@ -240,7 +240,7 @@ public class MetadataTable extends org.a public static void updateTabletCompactID(KeyExtent extent, long compactID, AuthInfo credentials, ZooLock zooLock) { if (!extent.isRootTablet()) { Mutation m = new Mutation(extent.getMetadataEntry()); - ColumnFQ.put(m, Constants.METADATA_COMPACT_COLUMN, new Value((compactID + "").getBytes())); + Constants.METADATA_COMPACT_COLUMN.put(m, new Value((compactID + "").getBytes())); update(credentials, zooLock, m); } } @@ -254,15 +254,15 @@ public class MetadataTable extends org.a m.put(Constants.METADATA_DATAFILE_COLUMN_FAMILY, file, new Value(entry.getValue().encode())); m.put(Constants.METADATA_BULKFILE_COLUMN_FAMILY, file, new Value(tidBytes)); } - ColumnFQ.put(m, Constants.METADATA_TIME_COLUMN, new Value(time.getBytes())); + Constants.METADATA_TIME_COLUMN.put(m, new Value(time.getBytes())); update(credentials, zooLock, m); } public static void addTablet(KeyExtent extent, String path, AuthInfo credentials, char timeType, ZooLock lock) { Mutation m = extent.getPrevRowUpdateMutation(); - ColumnFQ.put(m, Constants.METADATA_DIRECTORY_COLUMN, new Value(path.getBytes())); - ColumnFQ.put(m, Constants.METADATA_TIME_COLUMN, new Value((timeType + "0").getBytes())); + Constants.METADATA_DIRECTORY_COLUMN.put(m, new Value(path.getBytes())); + Constants.METADATA_TIME_COLUMN.put(m, new Value((timeType + "0").getBytes())); update(credentials, lock, m); } @@ -379,12 +379,12 @@ public class MetadataTable extends org.a Map<String,Long> bulkLoadedFiles, AuthInfo credentials, String time, long lastFlushID, long lastCompactID, ZooLock zooLock) { Mutation m = extent.getPrevRowUpdateMutation(); - ColumnFQ.put(m, Constants.METADATA_DIRECTORY_COLUMN, new Value(path.getBytes())); - ColumnFQ.put(m, Constants.METADATA_TIME_COLUMN, new Value(time.getBytes())); + Constants.METADATA_DIRECTORY_COLUMN.put(m, new Value(path.getBytes())); + Constants.METADATA_TIME_COLUMN.put(m, new Value(time.getBytes())); if (lastFlushID > 0) - ColumnFQ.put(m, Constants.METADATA_FLUSH_COLUMN, new Value(("" + lastFlushID).getBytes())); + Constants.METADATA_FLUSH_COLUMN.put(m, new Value(("" + lastFlushID).getBytes())); if (lastCompactID > 0) - ColumnFQ.put(m, Constants.METADATA_COMPACT_COLUMN, new Value(("" + lastCompactID).getBytes())); + Constants.METADATA_COMPACT_COLUMN.put(m, new Value(("" + lastCompactID).getBytes())); if (location != null) { m.put(Constants.METADATA_CURRENT_LOCATION_COLUMN_FAMILY, location.asColumnQualifier(), location.asMutationValue()); @@ -406,19 +406,19 @@ public class MetadataTable extends org.a public static void splitTablet(KeyExtent extent, Text oldPrevEndRow, double splitRatio, AuthInfo credentials, ZooLock zooLock) { Mutation m = extent.getPrevRowUpdateMutation(); // - ColumnFQ.put(m, Constants.METADATA_SPLIT_RATIO_COLUMN, new Value(Double.toString(splitRatio).getBytes())); + Constants.METADATA_SPLIT_RATIO_COLUMN.put(m, new Value(Double.toString(splitRatio).getBytes())); - ColumnFQ.put(m, Constants.METADATA_OLD_PREV_ROW_COLUMN, KeyExtent.encodePrevEndRow(oldPrevEndRow)); - ColumnFQ.putDelete(m, Constants.METADATA_CHOPPED_COLUMN); + Constants.METADATA_OLD_PREV_ROW_COLUMN.put(m, KeyExtent.encodePrevEndRow(oldPrevEndRow)); + Constants.METADATA_CHOPPED_COLUMN.putDelete(m); update(credentials, zooLock, m); } public static void finishSplit(Text metadataEntry, Map<String,DataFileValue> datafileSizes, List<String> highDatafilesToRemove, AuthInfo credentials, ZooLock zooLock) { Mutation m = new Mutation(metadataEntry); - ColumnFQ.putDelete(m, Constants.METADATA_SPLIT_RATIO_COLUMN); - ColumnFQ.putDelete(m, Constants.METADATA_OLD_PREV_ROW_COLUMN); - ColumnFQ.putDelete(m, Constants.METADATA_CHOPPED_COLUMN); + Constants.METADATA_SPLIT_RATIO_COLUMN.putDelete(m); + Constants.METADATA_OLD_PREV_ROW_COLUMN.putDelete(m); + Constants.METADATA_CHOPPED_COLUMN.putDelete(m); for (Entry<String,DataFileValue> entry : datafileSizes.entrySet()) { m.put(Constants.METADATA_DATAFILE_COLUMN_FAMILY, new Text(entry.getKey()), new Value(entry.getValue().encode())); @@ -462,7 +462,7 @@ public class MetadataTable extends org.a m.put(Constants.METADATA_DATAFILE_COLUMN_FAMILY, new Text(path), new Value(size.encode())); if (compactionId != null) - ColumnFQ.put(m, Constants.METADATA_COMPACT_COLUMN, new Value(("" + compactionId).getBytes())); + Constants.METADATA_COMPACT_COLUMN.put(m, new Value(("" + compactionId).getBytes())); TServerInstance self = getTServerInstance(address, zooLock); self.putLastLocation(m); @@ -669,7 +669,7 @@ public class MetadataTable extends org.a if (insertDeletes) { ms.fetchColumnFamily(Constants.METADATA_DATAFILE_COLUMN_FAMILY); - ColumnFQ.fetch(ms, Constants.METADATA_DIRECTORY_COLUMN); + Constants.METADATA_DIRECTORY_COLUMN.fetch(ms); for (Entry<Key,Value> cell : ms) { Key key = cell.getKey(); @@ -1008,8 +1008,8 @@ public class MetadataTable extends org.a mscanner.fetchColumnFamily(Constants.METADATA_CURRENT_LOCATION_COLUMN_FAMILY); mscanner.fetchColumnFamily(Constants.METADATA_LAST_LOCATION_COLUMN_FAMILY); mscanner.fetchColumnFamily(Constants.METADATA_CLONED_COLUMN_FAMILY); - ColumnFQ.fetch(mscanner, Constants.METADATA_PREV_ROW_COLUMN); - ColumnFQ.fetch(mscanner, Constants.METADATA_TIME_COLUMN); + Constants.METADATA_PREV_ROW_COLUMN.fetch(mscanner); + Constants.METADATA_TIME_COLUMN.fetch(mscanner); return mscanner; } @@ -1157,7 +1157,7 @@ public class MetadataTable extends org.a Key k = entry.getKey(); Mutation m = new Mutation(k.getRow()); m.putDelete(k.getColumnFamily(), k.getColumnQualifier()); - ColumnFQ.put(m, Constants.METADATA_DIRECTORY_COLUMN, new Value(FastFormat.toZeroPaddedString(dirCount++, 8, 16, "/c-".getBytes()))); + Constants.METADATA_DIRECTORY_COLUMN.put(m, new Value(FastFormat.toZeroPaddedString(dirCount++, 8, 16, "/c-".getBytes()))); bw.addMutation(m); } @@ -1167,7 +1167,7 @@ public class MetadataTable extends org.a public static void chopped(KeyExtent extent, ZooLock zooLock) { Mutation m = new Mutation(extent.getMetadataEntry()); - ColumnFQ.put(m, Constants.METADATA_CHOPPED_COLUMN, new Value("chopped".getBytes())); + Constants.METADATA_CHOPPED_COLUMN.put(m, new Value("chopped".getBytes())); update(SecurityConstants.getSystemCredentials(), zooLock, m); } Modified: accumulo/trunk/server/src/main/java/org/apache/accumulo/server/util/TabletIterator.java URL: http://svn.apache.org/viewvc/accumulo/trunk/server/src/main/java/org/apache/accumulo/server/util/TabletIterator.java?rev=1370432&r1=1370431&r2=1370432&view=diff ============================================================================== --- accumulo/trunk/server/src/main/java/org/apache/accumulo/server/util/TabletIterator.java (original) +++ accumulo/trunk/server/src/main/java/org/apache/accumulo/server/util/TabletIterator.java Tue Aug 7 19:03:56 2012 @@ -18,11 +18,11 @@ package org.apache.accumulo.server.util; import java.util.Iterator; import java.util.Map; +import java.util.Map.Entry; import java.util.NoSuchElementException; import java.util.Set; import java.util.SortedMap; import java.util.TreeMap; -import java.util.Map.Entry; import org.apache.accumulo.core.Constants; import org.apache.accumulo.core.client.Scanner; @@ -31,7 +31,6 @@ import org.apache.accumulo.core.data.Key import org.apache.accumulo.core.data.PartialKey; import org.apache.accumulo.core.data.Range; import org.apache.accumulo.core.data.Value; -import org.apache.accumulo.core.util.ColumnFQ; import org.apache.accumulo.core.util.UtilWaitThread; import org.apache.hadoop.io.Text; import org.apache.log4j.Logger; @@ -94,8 +93,8 @@ public class TabletIterator implements I this.scanner = s; this.range = range; this.scanner.setRange(range); - ColumnFQ.fetch(scanner, Constants.METADATA_PREV_ROW_COLUMN); - ColumnFQ.fetch(scanner, Constants.METADATA_DIRECTORY_COLUMN); + Constants.METADATA_PREV_ROW_COLUMN.fetch(scanner); + Constants.METADATA_DIRECTORY_COLUMN.fetch(scanner); this.iter = s.iterator(); this.returnPrevEndRow = returnPrevEndRow; this.returnDir = returnDir; Modified: accumulo/trunk/server/src/test/java/org/apache/accumulo/server/constraints/MetadataConstraintsTest.java URL: http://svn.apache.org/viewvc/accumulo/trunk/server/src/test/java/org/apache/accumulo/server/constraints/MetadataConstraintsTest.java?rev=1370432&r1=1370431&r2=1370432&view=diff ============================================================================== --- accumulo/trunk/server/src/test/java/org/apache/accumulo/server/constraints/MetadataConstraintsTest.java (original) +++ accumulo/trunk/server/src/test/java/org/apache/accumulo/server/constraints/MetadataConstraintsTest.java Tue Aug 7 19:03:56 2012 @@ -25,8 +25,6 @@ import org.apache.accumulo.core.Constant import org.apache.accumulo.core.conf.AccumuloConfiguration; import org.apache.accumulo.core.data.Mutation; import org.apache.accumulo.core.data.Value; -import org.apache.accumulo.core.util.ColumnFQ; -import org.apache.accumulo.server.constraints.MetadataConstraints; import org.apache.hadoop.io.Text; import org.apache.log4j.Level; import org.apache.log4j.Logger; @@ -38,7 +36,7 @@ public class MetadataConstraintsTest { public void testCheck() { Logger.getLogger(AccumuloConfiguration.class).setLevel(Level.ERROR); Mutation m = new Mutation(new Text("0;foo")); - ColumnFQ.put(m, Constants.METADATA_PREV_ROW_COLUMN, new Value("1foo".getBytes())); + Constants.METADATA_PREV_ROW_COLUMN.put(m, new Value("1foo".getBytes())); MetadataConstraints mc = new MetadataConstraints(); @@ -49,7 +47,7 @@ public class MetadataConstraintsTest { assertEquals(Short.valueOf((short) 3), violations.get(0)); m = new Mutation(new Text("0:foo")); - ColumnFQ.put(m, Constants.METADATA_PREV_ROW_COLUMN, new Value("1poo".getBytes())); + Constants.METADATA_PREV_ROW_COLUMN.put(m, new Value("1poo".getBytes())); violations = mc.check(null, m); @@ -67,7 +65,7 @@ public class MetadataConstraintsTest { assertEquals(Short.valueOf((short) 2), violations.get(0)); m = new Mutation(new Text("!!<")); - ColumnFQ.put(m, Constants.METADATA_PREV_ROW_COLUMN, new Value("1poo".getBytes())); + Constants.METADATA_PREV_ROW_COLUMN.put(m, new Value("1poo".getBytes())); violations = mc.check(null, m); @@ -77,7 +75,7 @@ public class MetadataConstraintsTest { assertEquals(Short.valueOf((short) 5), violations.get(1)); m = new Mutation(new Text("0;foo")); - ColumnFQ.put(m, Constants.METADATA_PREV_ROW_COLUMN, new Value("".getBytes())); + Constants.METADATA_PREV_ROW_COLUMN.put(m, new Value("".getBytes())); violations = mc.check(null, m); @@ -86,21 +84,21 @@ public class MetadataConstraintsTest { assertEquals(Short.valueOf((short) 6), violations.get(0)); m = new Mutation(new Text("0;foo")); - ColumnFQ.put(m, Constants.METADATA_PREV_ROW_COLUMN, new Value("bar".getBytes())); + Constants.METADATA_PREV_ROW_COLUMN.put(m, new Value("bar".getBytes())); violations = mc.check(null, m); assertEquals(null, violations); m = new Mutation(new Text("!0<")); - ColumnFQ.put(m, Constants.METADATA_PREV_ROW_COLUMN, new Value("bar".getBytes())); + Constants.METADATA_PREV_ROW_COLUMN.put(m, new Value("bar".getBytes())); violations = mc.check(null, m); assertEquals(null, violations); m = new Mutation(new Text("!1<")); - ColumnFQ.put(m, Constants.METADATA_PREV_ROW_COLUMN, new Value("bar".getBytes())); + Constants.METADATA_PREV_ROW_COLUMN.put(m, new Value("bar".getBytes())); violations = mc.check(null, m); Modified: accumulo/trunk/server/src/test/java/org/apache/accumulo/server/master/TestMergeState.java URL: http://svn.apache.org/viewvc/accumulo/trunk/server/src/test/java/org/apache/accumulo/server/master/TestMergeState.java?rev=1370432&r1=1370431&r2=1370432&view=diff ============================================================================== --- accumulo/trunk/server/src/test/java/org/apache/accumulo/server/master/TestMergeState.java (original) +++ accumulo/trunk/server/src/test/java/org/apache/accumulo/server/master/TestMergeState.java Tue Aug 7 19:03:56 2012 @@ -35,7 +35,6 @@ import org.apache.accumulo.core.data.Mut import org.apache.accumulo.core.data.Range; import org.apache.accumulo.core.data.Value; import org.apache.accumulo.core.security.thrift.AuthInfo; -import org.apache.accumulo.core.util.ColumnFQ; import org.apache.accumulo.server.master.state.Assignment; import org.apache.accumulo.server.master.state.CurrentState; import org.apache.accumulo.server.master.state.MergeInfo; @@ -100,7 +99,7 @@ public class TestMergeState { Text split = new Text(s); Mutation prevRow = KeyExtent.getPrevRowUpdateMutation(new KeyExtent(tableId, split, pr)); prevRow.put(Constants.METADATA_CURRENT_LOCATION_COLUMN_FAMILY, new Text("123456"), new Value("127.0.0.1:1234".getBytes())); - ColumnFQ.put(prevRow, Constants.METADATA_CHOPPED_COLUMN, new Value("junk".getBytes())); + Constants.METADATA_CHOPPED_COLUMN.put(prevRow, new Value("junk".getBytes())); bw.addMutation(prevRow); pr = split; } @@ -126,8 +125,8 @@ public class TestMergeState { // Create the hole // Split the tablet at one end of the range Mutation m = new KeyExtent(tableId, new Text("t"), new Text("p")).getPrevRowUpdateMutation(); - ColumnFQ.put(m, Constants.METADATA_SPLIT_RATIO_COLUMN, new Value("0.5".getBytes())); - ColumnFQ.put(m, Constants.METADATA_OLD_PREV_ROW_COLUMN, KeyExtent.encodePrevEndRow(new Text("o"))); + Constants.METADATA_SPLIT_RATIO_COLUMN.put(m, new Value("0.5".getBytes())); + Constants.METADATA_OLD_PREV_ROW_COLUMN.put(m, KeyExtent.encodePrevEndRow(new Text("o"))); update(connector, m); // do the state check @@ -148,7 +147,7 @@ public class TestMergeState { // finish the split KeyExtent tablet = new KeyExtent(tableId, new Text("p"), new Text("o")); m = tablet.getPrevRowUpdateMutation(); - ColumnFQ.put(m, Constants.METADATA_SPLIT_RATIO_COLUMN, new Value("0.5".getBytes())); + Constants.METADATA_SPLIT_RATIO_COLUMN.put(m, new Value("0.5".getBytes())); update(connector, m); metaDataStateStore.setLocations(Collections.singletonList(new Assignment(tablet, state.someTServer))); @@ -158,7 +157,7 @@ public class TestMergeState { // chop it m = tablet.getPrevRowUpdateMutation(); - ColumnFQ.put(m, Constants.METADATA_CHOPPED_COLUMN, new Value("junk".getBytes())); + Constants.METADATA_CHOPPED_COLUMN.put(m, new Value("junk".getBytes())); update(connector, m); stats = scan(state, metaDataStateStore); Modified: accumulo/trunk/server/src/test/java/org/apache/accumulo/server/util/CloneTest.java URL: http://svn.apache.org/viewvc/accumulo/trunk/server/src/test/java/org/apache/accumulo/server/util/CloneTest.java?rev=1370432&r1=1370431&r2=1370432&view=diff ============================================================================== --- accumulo/trunk/server/src/test/java/org/apache/accumulo/server/util/CloneTest.java (original) +++ accumulo/trunk/server/src/test/java/org/apache/accumulo/server/util/CloneTest.java Tue Aug 7 19:03:56 2012 @@ -30,9 +30,6 @@ import org.apache.accumulo.core.data.Key import org.apache.accumulo.core.data.KeyExtent; import org.apache.accumulo.core.data.Mutation; import org.apache.accumulo.core.data.Value; -import org.apache.accumulo.core.util.ColumnFQ; -import org.apache.accumulo.server.util.MetadataTable; -import org.apache.accumulo.server.util.TabletIterator; import org.apache.hadoop.io.Text; public class CloneTest extends TestCase { @@ -44,8 +41,8 @@ public class CloneTest extends TestCase KeyExtent ke = new KeyExtent(new Text("0"), null, null); Mutation mut = ke.getPrevRowUpdateMutation(); - ColumnFQ.put(mut, Constants.METADATA_TIME_COLUMN, new Value("M0".getBytes())); - ColumnFQ.put(mut, Constants.METADATA_DIRECTORY_COLUMN, new Value("/default_tablet".getBytes())); + Constants.METADATA_TIME_COLUMN.put(mut, new Value("M0".getBytes())); + Constants.METADATA_DIRECTORY_COLUMN.put(mut, new Value("/default_tablet".getBytes())); BatchWriter bw1 = conn.createBatchWriter(Constants.METADATA_TABLE_NAME, 10000000, 60000l, 1); @@ -72,8 +69,8 @@ public class CloneTest extends TestCase KeyExtent ke = new KeyExtent(new Text("0"), null, null); Mutation mut = ke.getPrevRowUpdateMutation(); - ColumnFQ.put(mut, Constants.METADATA_TIME_COLUMN, new Value("M0".getBytes())); - ColumnFQ.put(mut, Constants.METADATA_DIRECTORY_COLUMN, new Value("/default_tablet".getBytes())); + Constants.METADATA_TIME_COLUMN.put(mut, new Value("M0".getBytes())); + Constants.METADATA_DIRECTORY_COLUMN.put(mut, new Value("/default_tablet".getBytes())); mut.put(Constants.METADATA_DATAFILE_COLUMN_FAMILY.toString(), "/default_tablet/0_0.rf", "1,200"); BatchWriter bw1 = conn.createBatchWriter(Constants.METADATA_TABLE_NAME, 10000000, 60000l, 1); @@ -210,9 +207,9 @@ public class CloneTest extends TestCase private static Mutation deleteTablet(String tid, String endRow, String prevRow, String dir, String file) throws Exception { KeyExtent ke = new KeyExtent(new Text(tid), endRow == null ? null : new Text(endRow), prevRow == null ? null : new Text(prevRow)); Mutation mut = new Mutation(ke.getMetadataEntry()); - ColumnFQ.putDelete(mut, Constants.METADATA_PREV_ROW_COLUMN); - ColumnFQ.putDelete(mut, Constants.METADATA_TIME_COLUMN); - ColumnFQ.putDelete(mut, Constants.METADATA_DIRECTORY_COLUMN); + Constants.METADATA_PREV_ROW_COLUMN.putDelete(mut); + Constants.METADATA_TIME_COLUMN.putDelete(mut); + Constants.METADATA_DIRECTORY_COLUMN.putDelete(mut); mut.putDelete(Constants.METADATA_DATAFILE_COLUMN_FAMILY.toString(), file); return mut; @@ -222,8 +219,8 @@ public class CloneTest extends TestCase KeyExtent ke = new KeyExtent(new Text(tid), endRow == null ? null : new Text(endRow), prevRow == null ? null : new Text(prevRow)); Mutation mut = ke.getPrevRowUpdateMutation(); - ColumnFQ.put(mut, Constants.METADATA_TIME_COLUMN, new Value("M0".getBytes())); - ColumnFQ.put(mut, Constants.METADATA_DIRECTORY_COLUMN, new Value(dir.getBytes())); + Constants.METADATA_TIME_COLUMN.put(mut, new Value("M0".getBytes())); + Constants.METADATA_DIRECTORY_COLUMN.put(mut, new Value(dir.getBytes())); mut.put(Constants.METADATA_DATAFILE_COLUMN_FAMILY.toString(), file, "10,200"); return mut; Modified: accumulo/trunk/server/src/test/java/org/apache/accumulo/server/util/TabletIteratorTest.java URL: http://svn.apache.org/viewvc/accumulo/trunk/server/src/test/java/org/apache/accumulo/server/util/TabletIteratorTest.java?rev=1370432&r1=1370431&r2=1370432&view=diff ============================================================================== --- accumulo/trunk/server/src/test/java/org/apache/accumulo/server/util/TabletIteratorTest.java (original) +++ accumulo/trunk/server/src/test/java/org/apache/accumulo/server/util/TabletIteratorTest.java Tue Aug 7 19:03:56 2012 @@ -30,8 +30,6 @@ import org.apache.accumulo.core.data.Key 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.util.ColumnFQ; -import org.apache.accumulo.server.util.TabletIterator; import org.apache.accumulo.server.util.TabletIterator.TabletDeletedException; import org.apache.hadoop.io.Text; @@ -80,11 +78,11 @@ public class TabletIteratorTest extends KeyExtent ke1 = new KeyExtent(new Text("0"), new Text("m"), null); Mutation mut1 = ke1.getPrevRowUpdateMutation(); - ColumnFQ.put(mut1, Constants.METADATA_DIRECTORY_COLUMN, new Value("/d1".getBytes())); + Constants.METADATA_DIRECTORY_COLUMN.put(mut1, new Value("/d1".getBytes())); KeyExtent ke2 = new KeyExtent(new Text("0"), null, null); Mutation mut2 = ke2.getPrevRowUpdateMutation(); - ColumnFQ.put(mut2, Constants.METADATA_DIRECTORY_COLUMN, new Value("/d2".getBytes())); + Constants.METADATA_DIRECTORY_COLUMN.put(mut2, new Value("/d2".getBytes())); BatchWriter bw1 = conn.createBatchWriter(Constants.METADATA_TABLE_NAME, 10000000, 60000l, 1); bw1.addMutation(mut1);