You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@accumulo.apache.org by ec...@apache.org on 2014/10/29 15:45:14 UTC
[2/2] git commit: ACCUMULO-3263 more cleanup
ACCUMULO-3263 more cleanup
Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo
Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/1abb8629
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/1abb8629
Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/1abb8629
Branch: refs/heads/1.6
Commit: 1abb8629096a7d007339684d61d5dc504bf0461f
Parents: 309d9eb
Author: Eric C. Newton <er...@gmail.com>
Authored: Wed Oct 29 10:42:07 2014 -0400
Committer: Eric C. Newton <er...@gmail.com>
Committed: Wed Oct 29 10:42:07 2014 -0400
----------------------------------------------------------------------
.../test/RewriteTabletDirectoriesIT.java | 22 ++++++++++----------
1 file changed, 11 insertions(+), 11 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/accumulo/blob/1abb8629/test/src/test/java/org/apache/accumulo/test/RewriteTabletDirectoriesIT.java
----------------------------------------------------------------------
diff --git a/test/src/test/java/org/apache/accumulo/test/RewriteTabletDirectoriesIT.java b/test/src/test/java/org/apache/accumulo/test/RewriteTabletDirectoriesIT.java
index d989789..f2efa11 100644
--- a/test/src/test/java/org/apache/accumulo/test/RewriteTabletDirectoriesIT.java
+++ b/test/src/test/java/org/apache/accumulo/test/RewriteTabletDirectoriesIT.java
@@ -24,18 +24,17 @@ import java.util.Map.Entry;
import java.util.SortedSet;
import java.util.TreeSet;
-import org.apache.accumulo.core.util.ColumnFQ;
-import org.apache.accumulo.core.data.Mutation;
-import org.apache.accumulo.core.client.BatchWriter;
-import org.apache.accumulo.core.security.TablePermission;
import org.apache.accumulo.core.client.BatchScanner;
+import org.apache.accumulo.core.client.BatchWriter;
import org.apache.accumulo.core.client.Connector;
import org.apache.accumulo.core.conf.Property;
import org.apache.accumulo.core.data.Key;
+import org.apache.accumulo.core.data.Mutation;
import org.apache.accumulo.core.data.Value;
import org.apache.accumulo.core.metadata.MetadataTable;
-import org.apache.accumulo.core.metadata.schema.MetadataSchema;
+import org.apache.accumulo.core.metadata.schema.MetadataSchema.TabletsSection;
import org.apache.accumulo.core.security.Authorizations;
+import org.apache.accumulo.core.security.TablePermission;
import org.apache.accumulo.minicluster.impl.MiniAccumuloConfigImpl;
import org.apache.accumulo.server.init.Initialize;
import org.apache.accumulo.server.util.Admin;
@@ -46,6 +45,8 @@ import org.apache.hadoop.fs.Path;
import org.apache.hadoop.fs.RawLocalFileSystem;
import org.apache.hadoop.io.Text;
import org.junit.Test;
+
+import static org.apache.accumulo.core.metadata.schema.MetadataSchema.TabletsSection.ServerColumnFamily.DIRECTORY_COLUMN;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertTrue;
@@ -89,10 +90,9 @@ public class RewriteTabletDirectoriesIT extends ConfigurableMacIT {
c.tableOperations().addSplits(tableName, splits);
BatchScanner scanner = c.createBatchScanner(MetadataTable.NAME, Authorizations.EMPTY, 1);
- ColumnFQ DC = MetadataSchema.TabletsSection.ServerColumnFamily.DIRECTORY_COLUMN;
- DC.fetch(scanner);
+ DIRECTORY_COLUMN.fetch(scanner);
String tableId = c.tableOperations().tableIdMap().get(tableName);
- scanner.setRanges(Collections.singletonList(MetadataSchema.TabletsSection.getRange(tableId)));
+ scanner.setRanges(Collections.singletonList(TabletsSection.getRange(tableId)));
// verify the directory entries are all on v1, make a few entries relative
bw = c.createBatchWriter(MetadataTable.NAME, null);
int count = 0;
@@ -101,8 +101,9 @@ public class RewriteTabletDirectoriesIT extends ConfigurableMacIT {
count++;
if (count % 2 == 0) {
String parts[] = entry.getValue().toString().split("/");
- Mutation m = new Mutation(entry.getKey().getRow());
- m.put(DC.getColumnFamily(), DC.getColumnQualifier(), new Value(("/" + parts[parts.length - 1]).getBytes()));
+ Key key = entry.getKey();
+ Mutation m = new Mutation(key.getRow());
+ m.put(key.getColumnFamily(), key.getColumnQualifier(), new Value((Path.SEPARATOR + parts[parts.length - 1]).getBytes()));
bw.addMutation(m);
}
}
@@ -111,7 +112,6 @@ public class RewriteTabletDirectoriesIT extends ConfigurableMacIT {
// This should fail: only one volume
assertEquals(1, cluster.exec(RandomizeVolumes.class, "-z", cluster.getZooKeepers(), "-i", c.getInstance().getInstanceName(), "-t", tableName).waitFor());
-
cluster.stop();