You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@accumulo.apache.org by vi...@apache.org on 2013/06/24 23:34:25 UTC
svn commit: r1496226 [12/13] - in /accumulo/branches/ACCUMULO-CURATOR: ./
assemble/ conf/examples/1GB/native-standalone/
conf/examples/1GB/standalone/ conf/examples/2GB/native-standalone/
conf/examples/2GB/standalone/ conf/examples/3GB/native-standalon...
Propchange: accumulo/branches/ACCUMULO-CURATOR/src/
------------------------------------------------------------------------------
Reverse-merged /accumulo/trunk/src:r1478775
Merged /accumulo/trunk/src:r1491852-1496190
Merged /accumulo/branches/1.4/src:r1382578-1382612,1382614-1388119,1388121-1388628,1388630-1393867,1393869-1396064,1396066-1396571,1396573-1396615,1396617-1396757,1396759-1396771,1396773-1397047,1397049-1397112,1397114-1397116,1397118-1397175,1397177-1397188,1397190-1397382,1397384-1397699,1397701-1397920,1397922-1398285,1398287-1398307,1398309-1398392,1398394-1398398,1398400-1398437,1398439-1398513,1398515-1398800,1398802-1399210,1399212-1399716,1399718-1400975,1400977-1402570,1402572-1402681,1402683-1407300,1407302-1423031,1423033-1423628,1423630-1427863,1427865-1450270,1450272-1451699,1451701-1455609,1455611-1455638,1455640-1455979,1455981-1461547,1461549-1465686,1465688-1466198,1466200-1466258,1466260-1466626,1466628-1468530,1468532-1468957,1468959-1480032,1480034-1482988,1482990-1483953,1483955-1492947,1495439
Merged /incubator/accumulo/trunk/src:r1178656-1201898
Merged /incubator/accumulo/branches/1.4/src:r1201899-1201901
Merged /accumulo/branches/1.5/src:r1488056-1488357,1488359-1492948,1493894,1494361,1494372,1495072,1495441
Modified: accumulo/branches/ACCUMULO-CURATOR/start/src/main/java/org/apache/accumulo/start/classloader/AccumuloClassLoader.java
URL: http://svn.apache.org/viewvc/accumulo/branches/ACCUMULO-CURATOR/start/src/main/java/org/apache/accumulo/start/classloader/AccumuloClassLoader.java?rev=1496226&r1=1496225&r2=1496226&view=diff
==============================================================================
--- accumulo/branches/ACCUMULO-CURATOR/start/src/main/java/org/apache/accumulo/start/classloader/AccumuloClassLoader.java (original)
+++ accumulo/branches/ACCUMULO-CURATOR/start/src/main/java/org/apache/accumulo/start/classloader/AccumuloClassLoader.java Mon Jun 24 21:34:20 2013
@@ -25,7 +25,10 @@ import java.net.URISyntaxException;
import java.net.URL;
import java.net.URLClassLoader;
import java.util.ArrayList;
+import java.util.Collections;
import java.util.Map;
+import java.util.Set;
+import java.util.TreeSet;
import java.util.regex.Matcher;
import java.util.regex.Pattern;
@@ -45,6 +48,7 @@ public class AccumuloClassLoader {
public static final String CLASSPATH_PROPERTY_NAME = "general.classpaths";
+ /* @formatter:off */
public static final String ACCUMULO_CLASSPATH_VALUE =
"$ACCUMULO_HOME/conf,\n" +
"$ACCUMULO_HOME/lib/[^.].*.jar,\n" +
@@ -57,6 +61,10 @@ public class AccumuloClassLoader {
"$HADOOP_PREFIX/share/hadoop/hdfs/.*.jar,\n" +
"$HADOOP_PREFIX/share/hadoop/mapreduce/.*.jar,\n"
;
+ /* @formatter:on */
+
+ public static final String MAVEN_PROJECT_BASEDIR_PROPERTY_NAME = "general.maven.project.basedir";
+ public static final String DEFAULT_MAVEN_PROJECT_BASEDIR_VALUE = "";
private static String SITE_CONF;
@@ -208,6 +216,8 @@ public class AccumuloClassLoader {
return new ArrayList<URL>();
String[] cps = replaceEnvVars(cp, System.getenv()).split(",");
ArrayList<URL> urls = new ArrayList<URL>();
+ for (String classpath : getMavenClasspaths())
+ addUrl(classpath, urls);
for (String classpath : cps) {
if (!classpath.startsWith("#")) {
addUrl(classpath, urls);
@@ -216,6 +226,27 @@ public class AccumuloClassLoader {
return urls;
}
+ private static Set<String> getMavenClasspaths() {
+ String baseDirname = AccumuloClassLoader.getAccumuloString(MAVEN_PROJECT_BASEDIR_PROPERTY_NAME, DEFAULT_MAVEN_PROJECT_BASEDIR_VALUE);
+ if (baseDirname == null || baseDirname.trim().isEmpty())
+ return Collections.emptySet();
+ Set<String> paths = new TreeSet<String>();
+ findMavenTargetClasses(paths, new File(baseDirname.trim()), 0);
+ return paths;
+ }
+
+ private static void findMavenTargetClasses(Set<String> paths, File file, int depth) {
+ if (depth > 3)
+ return;
+ if (file.isDirectory()) {
+ File[] children = file.listFiles();
+ for (File child : children)
+ findMavenTargetClasses(paths, child, depth + 1);
+ } else if ("pom.xml".equals(file.getName())) {
+ paths.add(file.getParentFile().getAbsolutePath() + File.separator + "target" + File.separator + "classes");
+ }
+ }
+
public static synchronized ClassLoader getClassLoader() throws IOException {
if (classloader == null) {
ArrayList<URL> urls = findAccumuloURLs();
Modified: accumulo/branches/ACCUMULO-CURATOR/test/src/main/java/org/apache/accumulo/test/GCLotsOfCandidatesTest.java
URL: http://svn.apache.org/viewvc/accumulo/branches/ACCUMULO-CURATOR/test/src/main/java/org/apache/accumulo/test/GCLotsOfCandidatesTest.java?rev=1496226&r1=1496225&r2=1496226&view=diff
==============================================================================
--- accumulo/branches/ACCUMULO-CURATOR/test/src/main/java/org/apache/accumulo/test/GCLotsOfCandidatesTest.java (original)
+++ accumulo/branches/ACCUMULO-CURATOR/test/src/main/java/org/apache/accumulo/test/GCLotsOfCandidatesTest.java Mon Jun 24 21:34:20 2013
@@ -16,8 +16,6 @@
*/
package org.apache.accumulo.test;
-import org.apache.accumulo.core.Constants;
-import org.apache.accumulo.server.cli.ClientOpts;
import org.apache.accumulo.core.cli.BatchWriterOpts;
import org.apache.accumulo.core.client.AccumuloException;
import org.apache.accumulo.core.client.AccumuloSecurityException;
@@ -28,6 +26,8 @@ import org.apache.accumulo.core.client.T
import org.apache.accumulo.core.data.Mutation;
import org.apache.accumulo.core.data.Value;
import org.apache.accumulo.core.security.TablePermission;
+import org.apache.accumulo.core.util.MetadataTable;
+import org.apache.accumulo.server.cli.ClientOpts;
import org.apache.hadoop.io.Text;
public class GCLotsOfCandidatesTest {
@@ -37,12 +37,12 @@ public class GCLotsOfCandidatesTest {
opts.parseArgs(GCLotsOfCandidatesTest.class.getName(), args, bwOpts);
Connector conn = opts.getConnector();
- conn.securityOperations().grantTablePermission(conn.whoami(), Constants.METADATA_TABLE_NAME, TablePermission.WRITE);
- BatchWriter bw = conn.createBatchWriter(Constants.METADATA_TABLE_NAME, bwOpts.getBatchWriterConfig());
+ conn.securityOperations().grantTablePermission(conn.whoami(), MetadataTable.NAME, TablePermission.WRITE);
+ BatchWriter bw = conn.createBatchWriter(MetadataTable.NAME, bwOpts.getBatchWriterConfig());
for (int i = 0; i < 100000; ++i) {
final Text emptyText = new Text("");
- Text row = new Text(String.format("%s%s%020d%s", Constants.METADATA_DELETE_FLAG_PREFIX, "/", i,
+ Text row = new Text(String.format("%s%s%020d%s", MetadataTable.DELETED_RANGE.getStartKey().getRow().toString(), "/", i,
"aaaaaaaaaabbbbbbbbbbccccccccccddddddddddeeeeeeeeeeffffffffffgggggggggghhhhhhhhhhiiiiiiiiiijjjjjjjjjj"));
Mutation delFlag = new Mutation(row);
delFlag.put(emptyText, emptyText, new Value(new byte[] {}));
Modified: accumulo/branches/ACCUMULO-CURATOR/test/src/main/java/org/apache/accumulo/test/QueryMetadataTable.java
URL: http://svn.apache.org/viewvc/accumulo/branches/ACCUMULO-CURATOR/test/src/main/java/org/apache/accumulo/test/QueryMetadataTable.java?rev=1496226&r1=1496225&r2=1496226&view=diff
==============================================================================
--- accumulo/branches/ACCUMULO-CURATOR/test/src/main/java/org/apache/accumulo/test/QueryMetadataTable.java (original)
+++ accumulo/branches/ACCUMULO-CURATOR/test/src/main/java/org/apache/accumulo/test/QueryMetadataTable.java Mon Jun 24 21:34:20 2013
@@ -24,7 +24,6 @@ import java.util.concurrent.ExecutorServ
import java.util.concurrent.Executors;
import java.util.concurrent.TimeUnit;
-import org.apache.accumulo.core.Constants;
import org.apache.accumulo.core.cli.ScannerOpts;
import org.apache.accumulo.core.client.AccumuloException;
import org.apache.accumulo.core.client.AccumuloSecurityException;
@@ -36,6 +35,8 @@ 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.security.Authorizations;
+import org.apache.accumulo.core.util.MetadataTable;
import org.apache.accumulo.server.cli.ClientOpts;
import org.apache.accumulo.server.client.HdfsZooInstance;
import org.apache.hadoop.io.Text;
@@ -55,12 +56,13 @@ public class QueryMetadataTable {
this.row = row;
}
+ @Override
public void run() {
try {
KeyExtent extent = new KeyExtent(row, (Text) null);
Connector connector = HdfsZooInstance.getInstance().getConnector(principal, token);
- Scanner mdScanner = connector.createScanner(Constants.METADATA_TABLE_NAME, Constants.NO_AUTHS);
+ Scanner mdScanner = connector.createScanner(MetadataTable.NAME, Authorizations.EMPTY);
Text row = extent.getMetadataEntry();
mdScanner.setRange(new Range(row));
@@ -84,9 +86,9 @@ public class QueryMetadataTable {
}
static class Opts extends ClientOpts {
- @Parameter(names="--numQueries", description="number of queries to run")
+ @Parameter(names = "--numQueries", description = "number of queries to run")
int numQueries = 1;
- @Parameter(names="--numThreads", description="number of threads used to run the queries")
+ @Parameter(names = "--numThreads", description = "number of threads used to run the queries")
int numThreads = 1;
}
@@ -96,9 +98,9 @@ public class QueryMetadataTable {
opts.parseArgs(QueryMetadataTable.class.getName(), args, scanOpts);
Connector connector = opts.getConnector();
- Scanner scanner = connector.createScanner(Constants.METADATA_TABLE_NAME, opts.auths);
+ Scanner scanner = connector.createScanner(MetadataTable.NAME, opts.auths);
scanner.setBatchSize(scanOpts.scanBatchSize);
- Text mdrow = new Text(KeyExtent.getMetadataEntry(new Text(Constants.METADATA_TABLE_ID), null));
+ Text mdrow = new Text(KeyExtent.getMetadataEntry(new Text(MetadataTable.ID), null));
HashSet<Text> rowSet = new HashSet<Text>();
@@ -109,12 +111,12 @@ public class QueryMetadataTable {
if (count % 72 == 0) {
System.out.printf(" %,d%n", count);
}
- if (entry.getKey().compareRow(mdrow) == 0 && entry.getKey().getColumnFamily().compareTo(Constants.METADATA_CURRENT_LOCATION_COLUMN_FAMILY) == 0) {
+ if (entry.getKey().compareRow(mdrow) == 0 && entry.getKey().getColumnFamily().compareTo(MetadataTable.CURRENT_LOCATION_COLUMN_FAMILY) == 0) {
System.out.println(entry.getKey() + " " + entry.getValue());
location = entry.getValue().toString();
}
- if (!entry.getKey().getRow().toString().startsWith(Constants.METADATA_TABLE_ID))
+ if (!entry.getKey().getRow().toString().startsWith(MetadataTable.ID))
rowSet.add(entry.getKey().getRow());
count++;
}
Modified: accumulo/branches/ACCUMULO-CURATOR/test/src/main/java/org/apache/accumulo/test/continuous/ContinuousStatsCollector.java
URL: http://svn.apache.org/viewvc/accumulo/branches/ACCUMULO-CURATOR/test/src/main/java/org/apache/accumulo/test/continuous/ContinuousStatsCollector.java?rev=1496226&r1=1496225&r2=1496226&view=diff
==============================================================================
--- accumulo/branches/ACCUMULO-CURATOR/test/src/main/java/org/apache/accumulo/test/continuous/ContinuousStatsCollector.java (original)
+++ accumulo/branches/ACCUMULO-CURATOR/test/src/main/java/org/apache/accumulo/test/continuous/ContinuousStatsCollector.java Mon Jun 24 21:34:20 2013
@@ -22,9 +22,6 @@ import java.util.Map.Entry;
import java.util.Timer;
import java.util.TimerTask;
-import org.apache.accumulo.trace.instrument.Tracer;
-import org.apache.accumulo.core.Constants;
-import org.apache.accumulo.server.cli.ClientOnRequiredTable;
import org.apache.accumulo.core.cli.ScannerOpts;
import org.apache.accumulo.core.client.Connector;
import org.apache.accumulo.core.client.IteratorSetting;
@@ -40,13 +37,17 @@ import org.apache.accumulo.core.master.t
import org.apache.accumulo.core.master.thrift.TableInfo;
import org.apache.accumulo.core.master.thrift.TabletServerStatus;
import org.apache.accumulo.core.util.CachedConfiguration;
+import org.apache.accumulo.core.util.MetadataTable;
import org.apache.accumulo.core.util.Stat;
import org.apache.accumulo.server.ServerConstants;
+import org.apache.accumulo.server.cli.ClientOnRequiredTable;
+import org.apache.accumulo.server.fs.VolumeManager;
+import org.apache.accumulo.server.fs.VolumeManagerImpl;
import org.apache.accumulo.server.monitor.Monitor;
import org.apache.accumulo.server.security.SecurityConstants;
+import org.apache.accumulo.trace.instrument.Tracer;
import org.apache.hadoop.conf.Configuration;
import org.apache.hadoop.fs.ContentSummary;
-import org.apache.hadoop.fs.FileSystem;
import org.apache.hadoop.fs.Path;
import org.apache.hadoop.io.Text;
import org.apache.hadoop.mapred.ClusterStatus;
@@ -88,9 +89,9 @@ public class ContinuousStatsCollector {
private String getTabletStats() throws Exception {
Connector conn = opts.getConnector();
- Scanner scanner = conn.createScanner(Constants.METADATA_TABLE_NAME, opts.auths);
+ Scanner scanner = conn.createScanner(MetadataTable.NAME, opts.auths);
scanner.setBatchSize(scanBatchSize);
- scanner.fetchColumnFamily(Constants.METADATA_DATAFILE_COLUMN_FAMILY);
+ scanner.fetchColumnFamily(MetadataTable.DATAFILE_COLUMN_FAMILY);
scanner.addScanIterator(new IteratorSetting(1000, "cfc", ColumnFamilyCounter.class.getName()));
scanner.setRange(new KeyExtent(new Text(tableId), null, null).toMetadataRange());
@@ -110,15 +111,21 @@ public class ContinuousStatsCollector {
}
private String getFSStats() throws Exception {
- FileSystem fs = FileSystem.get(CachedConfiguration.getInstance());
- Path acudir = new Path(ServerConstants.getTablesDir());
- ContentSummary contentSummary = fs.getContentSummary(acudir);
-
- Path tableDir = new Path(ServerConstants.getTablesDir() + "/" + tableId);
- ContentSummary contentSummary2 = fs.getContentSummary(tableDir);
+ VolumeManager fs = VolumeManagerImpl.get();
+ long length1 = 0, dcount1 = 0, fcount1 = 0;
+ long length2 = 0, dcount2 = 0, fcount2 = 0;
+ for (String dir : ServerConstants.getTablesDirs()) {
+ ContentSummary contentSummary = fs.getContentSummary(new Path(dir));
+ length1 += contentSummary.getLength();
+ dcount1 += contentSummary.getDirectoryCount();
+ fcount1 += contentSummary.getFileCount();
+ contentSummary = fs.getContentSummary(new Path(dir, tableId));
+ length2 += contentSummary.getLength();
+ dcount2 += contentSummary.getDirectoryCount();
+ fcount2 += contentSummary.getFileCount();
+ }
- return "" + contentSummary.getLength() + " " + contentSummary.getDirectoryCount() + " " + contentSummary.getFileCount() + " "
- + contentSummary2.getLength() + " " + contentSummary2.getDirectoryCount() + " " + contentSummary2.getFileCount();
+ return "" + length1 + " " + dcount1 + " " + fcount1 + " " + length2 + " " + dcount2 + " " + fcount2;
}
private String getACUStats() throws Exception {
Modified: accumulo/branches/ACCUMULO-CURATOR/test/src/main/java/org/apache/accumulo/test/continuous/ContinuousWalk.java
URL: http://svn.apache.org/viewvc/accumulo/branches/ACCUMULO-CURATOR/test/src/main/java/org/apache/accumulo/test/continuous/ContinuousWalk.java?rev=1496226&r1=1496225&r2=1496226&view=diff
==============================================================================
--- accumulo/branches/ACCUMULO-CURATOR/test/src/main/java/org/apache/accumulo/test/continuous/ContinuousWalk.java (original)
+++ accumulo/branches/ACCUMULO-CURATOR/test/src/main/java/org/apache/accumulo/test/continuous/ContinuousWalk.java Mon Jun 24 21:34:20 2013
@@ -26,15 +26,14 @@ import java.util.Map.Entry;
import java.util.Random;
import java.util.zip.CRC32;
-import org.apache.accumulo.trace.instrument.Span;
-import org.apache.accumulo.trace.instrument.Trace;
-import org.apache.accumulo.core.Constants;
import org.apache.accumulo.core.client.Connector;
import org.apache.accumulo.core.client.Scanner;
import org.apache.accumulo.core.data.Key;
import org.apache.accumulo.core.data.Range;
import org.apache.accumulo.core.data.Value;
import org.apache.accumulo.core.security.Authorizations;
+import org.apache.accumulo.trace.instrument.Span;
+import org.apache.accumulo.trace.instrument.Trace;
import org.apache.hadoop.conf.Configuration;
import org.apache.hadoop.fs.FileSystem;
import org.apache.hadoop.fs.Path;
@@ -43,7 +42,6 @@ import org.apache.hadoop.io.Text;
import com.beust.jcommander.IStringConverter;
import com.beust.jcommander.Parameter;
-
public class ContinuousWalk {
static public class Opts extends ContinuousQuery.Opts {
@@ -57,7 +55,8 @@ public class ContinuousWalk {
}
}
}
- @Parameter(names="--authsFile", description="read the authorities to use from a file")
+
+ @Parameter(names = "--authsFile", description = "read the authorities to use from a file")
RandomAuths randomAuths = new RandomAuths();
}
@@ -74,12 +73,12 @@ public class ContinuousWalk {
private List<Authorizations> auths;
RandomAuths() {
- auths = Collections.singletonList(Constants.NO_AUTHS);
+ auths = Collections.singletonList(Authorizations.EMPTY);
}
RandomAuths(String file) throws IOException {
if (file == null) {
- auths = Collections.singletonList(Constants.NO_AUTHS);
+ auths = Collections.singletonList(Authorizations.EMPTY);
return;
}
@@ -101,7 +100,7 @@ public class ContinuousWalk {
return auths.get(r.nextInt(auths.size()));
}
}
-
+
public static void main(String[] args) throws Exception {
Opts opts = new Opts();
opts.parseArgs(ContinuousWalk.class.getName(), args);
Modified: accumulo/branches/ACCUMULO-CURATOR/test/src/main/java/org/apache/accumulo/test/functional/AddSplitTest.java
URL: http://svn.apache.org/viewvc/accumulo/branches/ACCUMULO-CURATOR/test/src/main/java/org/apache/accumulo/test/functional/AddSplitTest.java?rev=1496226&r1=1496225&r2=1496226&view=diff
==============================================================================
--- accumulo/branches/ACCUMULO-CURATOR/test/src/main/java/org/apache/accumulo/test/functional/AddSplitTest.java (original)
+++ accumulo/branches/ACCUMULO-CURATOR/test/src/main/java/org/apache/accumulo/test/functional/AddSplitTest.java Mon Jun 24 21:34:20 2013
@@ -24,7 +24,6 @@ import java.util.Map;
import java.util.Map.Entry;
import java.util.TreeSet;
-import org.apache.accumulo.core.Constants;
import org.apache.accumulo.core.client.AccumuloException;
import org.apache.accumulo.core.client.AccumuloSecurityException;
import org.apache.accumulo.core.client.BatchWriter;
@@ -35,6 +34,7 @@ import org.apache.accumulo.core.client.T
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.security.Authorizations;
import org.apache.accumulo.core.util.UtilWaitThread;
import org.apache.hadoop.io.Text;
@@ -99,7 +99,7 @@ public class AddSplitTest extends Functi
}
private void verifyData(long ts) throws Exception {
- Scanner scanner = getConnector().createScanner("foo", Constants.NO_AUTHS);
+ Scanner scanner = getConnector().createScanner("foo", Authorizations.EMPTY);
Iterator<Entry<Key,Value>> iter = scanner.iterator();
Modified: accumulo/branches/ACCUMULO-CURATOR/test/src/main/java/org/apache/accumulo/test/functional/BadIteratorMincTest.java
URL: http://svn.apache.org/viewvc/accumulo/branches/ACCUMULO-CURATOR/test/src/main/java/org/apache/accumulo/test/functional/BadIteratorMincTest.java?rev=1496226&r1=1496225&r2=1496226&view=diff
==============================================================================
--- accumulo/branches/ACCUMULO-CURATOR/test/src/main/java/org/apache/accumulo/test/functional/BadIteratorMincTest.java (original)
+++ accumulo/branches/ACCUMULO-CURATOR/test/src/main/java/org/apache/accumulo/test/functional/BadIteratorMincTest.java Mon Jun 24 21:34:20 2013
@@ -21,7 +21,6 @@ import java.util.List;
import java.util.Map;
import java.util.Map.Entry;
-import org.apache.accumulo.core.Constants;
import org.apache.accumulo.core.client.BatchWriter;
import org.apache.accumulo.core.client.BatchWriterConfig;
import org.apache.accumulo.core.client.Scanner;
@@ -29,6 +28,7 @@ import org.apache.accumulo.core.conf.Pro
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.security.Authorizations;
import org.apache.accumulo.core.util.UtilWaitThread;
import org.apache.hadoop.io.Text;
@@ -69,7 +69,7 @@ public class BadIteratorMincTest extends
checkRFiles("foo", 1, 1, 0, 0);
// try to scan table
- Scanner scanner = getConnector().createScanner("foo", Constants.NO_AUTHS);
+ Scanner scanner = getConnector().createScanner("foo", Authorizations.EMPTY);
int count = 0;
for (@SuppressWarnings("unused")
@@ -115,7 +115,7 @@ public class BadIteratorMincTest extends
// this should not hang
getConnector().tableOperations().delete("foo");
-
+
}
}
Modified: accumulo/branches/ACCUMULO-CURATOR/test/src/main/java/org/apache/accumulo/test/functional/BatchScanSplitTest.java
URL: http://svn.apache.org/viewvc/accumulo/branches/ACCUMULO-CURATOR/test/src/main/java/org/apache/accumulo/test/functional/BatchScanSplitTest.java?rev=1496226&r1=1496225&r2=1496226&view=diff
==============================================================================
--- accumulo/branches/ACCUMULO-CURATOR/test/src/main/java/org/apache/accumulo/test/functional/BatchScanSplitTest.java (original)
+++ accumulo/branches/ACCUMULO-CURATOR/test/src/main/java/org/apache/accumulo/test/functional/BatchScanSplitTest.java Mon Jun 24 21:34:20 2013
@@ -25,7 +25,6 @@ import java.util.Map;
import java.util.Map.Entry;
import java.util.Random;
-import org.apache.accumulo.core.Constants;
import org.apache.accumulo.core.client.BatchScanner;
import org.apache.accumulo.core.client.BatchWriter;
import org.apache.accumulo.core.client.BatchWriterConfig;
@@ -34,6 +33,7 @@ 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.security.Authorizations;
import org.apache.accumulo.core.util.UtilWaitThread;
import org.apache.hadoop.io.Text;
@@ -95,7 +95,7 @@ public class BatchScanSplitTest extends
// logger.setLevel(Level.TRACE);
- BatchScanner bs = getConnector().createBatchScanner("bss", Constants.NO_AUTHS, 4);
+ BatchScanner bs = getConnector().createBatchScanner("bss", Authorizations.EMPTY, 4);
HashMap<Text,Value> found = new HashMap<Text,Value>();
Modified: accumulo/branches/ACCUMULO-CURATOR/test/src/main/java/org/apache/accumulo/test/functional/BatchWriterFlushTest.java
URL: http://svn.apache.org/viewvc/accumulo/branches/ACCUMULO-CURATOR/test/src/main/java/org/apache/accumulo/test/functional/BatchWriterFlushTest.java?rev=1496226&r1=1496225&r2=1496226&view=diff
==============================================================================
--- accumulo/branches/ACCUMULO-CURATOR/test/src/main/java/org/apache/accumulo/test/functional/BatchWriterFlushTest.java (original)
+++ accumulo/branches/ACCUMULO-CURATOR/test/src/main/java/org/apache/accumulo/test/functional/BatchWriterFlushTest.java Mon Jun 24 21:34:20 2013
@@ -25,7 +25,6 @@ import java.util.Map.Entry;
import java.util.concurrent.TimeUnit;
import java.util.Random;
-import org.apache.accumulo.core.Constants;
import org.apache.accumulo.core.client.AccumuloException;
import org.apache.accumulo.core.client.AccumuloSecurityException;
import org.apache.accumulo.core.client.BatchWriter;
@@ -37,6 +36,7 @@ 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.security.Authorizations;
import org.apache.accumulo.core.util.UtilWaitThread;
import org.apache.hadoop.io.Text;
@@ -73,7 +73,7 @@ public class BatchWriterFlushTest extend
private void runLatencyTest() throws Exception {
// should automatically flush after 3 seconds
BatchWriter bw = getConnector().createBatchWriter("bwlt", new BatchWriterConfig().setMaxLatency(2000, TimeUnit.MILLISECONDS));
- Scanner scanner = getConnector().createScanner("bwlt", Constants.NO_AUTHS);
+ Scanner scanner = getConnector().createScanner("bwlt", Authorizations.EMPTY);
Mutation m = new Mutation(new Text(String.format("r_%10d", 1)));
m.put(new Text("cf"), new Text("cq"), new Value(("" + 1).getBytes()));
@@ -107,7 +107,7 @@ public class BatchWriterFlushTest extend
private void runFlushTest() throws AccumuloException, AccumuloSecurityException, TableNotFoundException, MutationsRejectedException, Exception {
BatchWriter bw = getConnector().createBatchWriter("bwft", new BatchWriterConfig());
- Scanner scanner = getConnector().createScanner("bwft", Constants.NO_AUTHS);
+ Scanner scanner = getConnector().createScanner("bwft", Authorizations.EMPTY);
Random r = new Random();
for (int i = 0; i < 4; i++) {
Modified: accumulo/branches/ACCUMULO-CURATOR/test/src/main/java/org/apache/accumulo/test/functional/BloomFilterTest.java
URL: http://svn.apache.org/viewvc/accumulo/branches/ACCUMULO-CURATOR/test/src/main/java/org/apache/accumulo/test/functional/BloomFilterTest.java?rev=1496226&r1=1496225&r2=1496226&view=diff
==============================================================================
--- accumulo/branches/ACCUMULO-CURATOR/test/src/main/java/org/apache/accumulo/test/functional/BloomFilterTest.java (original)
+++ accumulo/branches/ACCUMULO-CURATOR/test/src/main/java/org/apache/accumulo/test/functional/BloomFilterTest.java Mon Jun 24 21:34:20 2013
@@ -24,7 +24,6 @@ import java.util.Map;
import java.util.Map.Entry;
import java.util.Random;
-import org.apache.accumulo.core.Constants;
import org.apache.accumulo.core.client.BatchScanner;
import org.apache.accumulo.core.client.BatchWriter;
import org.apache.accumulo.core.client.BatchWriterConfig;
@@ -35,6 +34,7 @@ import org.apache.accumulo.core.data.Mut
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.security.Authorizations;
import org.apache.hadoop.io.Text;
public class BloomFilterTest extends FunctionalTest {
@@ -75,7 +75,7 @@ public class BloomFilterTest extends Fun
bw.close();
getConnector().tableOperations().flush("bt4", null, null, true);
- for (String table : new String[]{"bt1", "bt2", "bt3"}) {
+ for (String table : new String[] {"bt1", "bt2", "bt3"}) {
getConnector().tableOperations().setProperty(table, Property.TABLE_INDEXCACHE_ENABLED.getKey(), "false");
getConnector().tableOperations().setProperty(table, Property.TABLE_BLOCKCACHE_ENABLED.getKey(), "false");
getConnector().tableOperations().flush(table, null, null, true);
@@ -122,7 +122,7 @@ public class BloomFilterTest extends Fun
timeCheck(t3, tb3);
// test querying for empty key
- Scanner scanner = getConnector().createScanner("bt4", Constants.NO_AUTHS);
+ Scanner scanner = getConnector().createScanner("bt4", Authorizations.EMPTY);
scanner.setRange(new Range(new Text("")));
if (!scanner.iterator().next().getValue().toString().equals("foo1")) {
@@ -172,7 +172,7 @@ public class BloomFilterTest extends Fun
ranges.add(range);
}
- BatchScanner bs = getConnector().createBatchScanner(table, Constants.NO_AUTHS, 3);
+ BatchScanner bs = getConnector().createBatchScanner(table, Authorizations.EMPTY, 3);
bs.setRanges(ranges);
long t1 = System.currentTimeMillis();
Modified: accumulo/branches/ACCUMULO-CURATOR/test/src/main/java/org/apache/accumulo/test/functional/BulkFileTest.java
URL: http://svn.apache.org/viewvc/accumulo/branches/ACCUMULO-CURATOR/test/src/main/java/org/apache/accumulo/test/functional/BulkFileTest.java?rev=1496226&r1=1496225&r2=1496226&view=diff
==============================================================================
--- accumulo/branches/ACCUMULO-CURATOR/test/src/main/java/org/apache/accumulo/test/functional/BulkFileTest.java (original)
+++ accumulo/branches/ACCUMULO-CURATOR/test/src/main/java/org/apache/accumulo/test/functional/BulkFileTest.java Mon Jun 24 21:34:20 2013
@@ -22,7 +22,6 @@ import java.util.List;
import java.util.Map;
import java.util.Map.Entry;
-import org.apache.accumulo.core.Constants;
import org.apache.accumulo.core.client.Scanner;
import org.apache.accumulo.core.conf.AccumuloConfiguration;
import org.apache.accumulo.core.data.Key;
@@ -31,6 +30,7 @@ import org.apache.accumulo.core.file.Fil
import org.apache.accumulo.core.file.FileSKVWriter;
import org.apache.accumulo.core.file.FileUtil;
import org.apache.accumulo.core.file.rfile.RFile;
+import org.apache.accumulo.core.security.Authorizations;
import org.apache.accumulo.server.conf.ServerConfiguration;
import org.apache.accumulo.server.trace.TraceFileSystem;
import org.apache.hadoop.conf.Configuration;
@@ -87,7 +87,7 @@ public class BulkFileTest extends Functi
}
private void verifyData(String table, int s, int e) throws Exception {
- Scanner scanner = getConnector().createScanner(table, Constants.NO_AUTHS);
+ Scanner scanner = getConnector().createScanner(table, Authorizations.EMPTY);
Iterator<Entry<Key,Value>> iter = scanner.iterator();
Modified: accumulo/branches/ACCUMULO-CURATOR/test/src/main/java/org/apache/accumulo/test/functional/ConcurrencyTest.java
URL: http://svn.apache.org/viewvc/accumulo/branches/ACCUMULO-CURATOR/test/src/main/java/org/apache/accumulo/test/functional/ConcurrencyTest.java?rev=1496226&r1=1496225&r2=1496226&view=diff
==============================================================================
--- accumulo/branches/ACCUMULO-CURATOR/test/src/main/java/org/apache/accumulo/test/functional/ConcurrencyTest.java (original)
+++ accumulo/branches/ACCUMULO-CURATOR/test/src/main/java/org/apache/accumulo/test/functional/ConcurrencyTest.java Mon Jun 24 21:34:20 2013
@@ -22,7 +22,6 @@ import java.util.List;
import java.util.Map;
import java.util.Map.Entry;
-import org.apache.accumulo.core.Constants;
import org.apache.accumulo.core.client.BatchWriter;
import org.apache.accumulo.core.client.BatchWriterConfig;
import org.apache.accumulo.core.client.Connector;
@@ -32,6 +31,7 @@ import org.apache.accumulo.core.conf.Pro
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.security.Authorizations;
import org.apache.accumulo.core.util.UtilWaitThread;
import org.apache.hadoop.io.Text;
@@ -43,7 +43,7 @@ public class ConcurrencyTest extends Fun
Scanner scanner;
ScanTask(Connector conn, long time) throws Exception {
- scanner = conn.createScanner("cct", Constants.NO_AUTHS);
+ scanner = conn.createScanner("cct", Authorizations.EMPTY);
IteratorSetting slow = new IteratorSetting(30, "slow", SlowIterator.class);
slow.addOption("sleepTime", "" + time);
scanner.addScanIterator(slow);
Modified: accumulo/branches/ACCUMULO-CURATOR/test/src/main/java/org/apache/accumulo/test/functional/ConstraintTest.java
URL: http://svn.apache.org/viewvc/accumulo/branches/ACCUMULO-CURATOR/test/src/main/java/org/apache/accumulo/test/functional/ConstraintTest.java?rev=1496226&r1=1496225&r2=1496226&view=diff
==============================================================================
--- accumulo/branches/ACCUMULO-CURATOR/test/src/main/java/org/apache/accumulo/test/functional/ConstraintTest.java (original)
+++ accumulo/branches/ACCUMULO-CURATOR/test/src/main/java/org/apache/accumulo/test/functional/ConstraintTest.java Mon Jun 24 21:34:20 2013
@@ -35,6 +35,7 @@ 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.security.Authorizations;
import org.apache.accumulo.core.util.UtilWaitThread;
import org.apache.hadoop.io.Text;
import org.apache.log4j.Level;
@@ -123,7 +124,7 @@ public class ConstraintTest extends Func
}
// verify mutation did not go through
- Scanner scanner = getConnector().createScanner("ct", Constants.NO_AUTHS);
+ Scanner scanner = getConnector().createScanner("ct", Authorizations.EMPTY);
scanner.setRange(new Range(new Text("r1")));
Iterator<Entry<Key,Value>> iter = scanner.iterator();
@@ -293,7 +294,7 @@ public class ConstraintTest extends Func
throw new Exception("Did not see MutationsRejectedException");
}
- Scanner scanner = getConnector().createScanner(table, Constants.NO_AUTHS);
+ Scanner scanner = getConnector().createScanner(table, Authorizations.EMPTY);
Iterator<Entry<Key,Value>> iter = scanner.iterator();
Modified: accumulo/branches/ACCUMULO-CURATOR/test/src/main/java/org/apache/accumulo/test/functional/CreateAndUseTest.java
URL: http://svn.apache.org/viewvc/accumulo/branches/ACCUMULO-CURATOR/test/src/main/java/org/apache/accumulo/test/functional/CreateAndUseTest.java?rev=1496226&r1=1496225&r2=1496226&view=diff
==============================================================================
--- accumulo/branches/ACCUMULO-CURATOR/test/src/main/java/org/apache/accumulo/test/functional/CreateAndUseTest.java (original)
+++ accumulo/branches/ACCUMULO-CURATOR/test/src/main/java/org/apache/accumulo/test/functional/CreateAndUseTest.java Mon Jun 24 21:34:20 2013
@@ -24,7 +24,6 @@ import java.util.Map.Entry;
import java.util.SortedSet;
import java.util.TreeSet;
-import org.apache.accumulo.core.Constants;
import org.apache.accumulo.core.client.BatchScanner;
import org.apache.accumulo.core.client.BatchWriter;
import org.apache.accumulo.core.client.BatchWriterConfig;
@@ -33,6 +32,7 @@ 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.security.Authorizations;
import org.apache.hadoop.io.Text;
public class CreateAndUseTest extends FunctionalTest {
@@ -79,7 +79,7 @@ public class CreateAndUseTest extends Fu
bw.close();
// verify data is there
- Scanner scanner1 = getConnector().createScanner("t1", Constants.NO_AUTHS);
+ Scanner scanner1 = getConnector().createScanner("t1", Authorizations.EMPTY);
int ei = 1;
@@ -102,7 +102,7 @@ public class CreateAndUseTest extends Fu
// TEST 2 create a table and immediately scan it
getConnector().tableOperations().create("t2");
getConnector().tableOperations().addSplits("t2", splits);
- Scanner scanner2 = getConnector().createScanner("t2", Constants.NO_AUTHS);
+ Scanner scanner2 = getConnector().createScanner("t2", Authorizations.EMPTY);
int count = 0;
for (Entry<Key,Value> entry : scanner2) {
if (entry != null)
@@ -122,7 +122,7 @@ public class CreateAndUseTest extends Fu
getConnector().tableOperations().create("t3");
getConnector().tableOperations().addSplits("t3", splits);
- BatchScanner bs = getConnector().createBatchScanner("t3", Constants.NO_AUTHS, 3);
+ BatchScanner bs = getConnector().createBatchScanner("t3", Authorizations.EMPTY, 3);
bs.setRanges(ranges);
count = 0;
for (Entry<Key,Value> entry : bs) {
Modified: accumulo/branches/ACCUMULO-CURATOR/test/src/main/java/org/apache/accumulo/test/functional/CreateManyScannersTest.java
URL: http://svn.apache.org/viewvc/accumulo/branches/ACCUMULO-CURATOR/test/src/main/java/org/apache/accumulo/test/functional/CreateManyScannersTest.java?rev=1496226&r1=1496225&r2=1496226&view=diff
==============================================================================
--- accumulo/branches/ACCUMULO-CURATOR/test/src/main/java/org/apache/accumulo/test/functional/CreateManyScannersTest.java (original)
+++ accumulo/branches/ACCUMULO-CURATOR/test/src/main/java/org/apache/accumulo/test/functional/CreateManyScannersTest.java Mon Jun 24 21:34:20 2013
@@ -20,8 +20,8 @@ import java.util.Collections;
import java.util.List;
import java.util.Map;
-import org.apache.accumulo.core.Constants;
import org.apache.accumulo.core.client.Connector;
+import org.apache.accumulo.core.security.Authorizations;
public class CreateManyScannersTest extends FunctionalTest {
@@ -44,7 +44,7 @@ public class CreateManyScannersTest exte
public void run() throws Exception {
Connector connector = getConnector();
for (int i = 0; i < 100000; i++) {
- connector.createScanner("mscant", Constants.NO_AUTHS);
+ connector.createScanner("mscant", Authorizations.EMPTY);
}
}
Modified: accumulo/branches/ACCUMULO-CURATOR/test/src/main/java/org/apache/accumulo/test/functional/DeleteEverythingTest.java
URL: http://svn.apache.org/viewvc/accumulo/branches/ACCUMULO-CURATOR/test/src/main/java/org/apache/accumulo/test/functional/DeleteEverythingTest.java?rev=1496226&r1=1496225&r2=1496226&view=diff
==============================================================================
--- accumulo/branches/ACCUMULO-CURATOR/test/src/main/java/org/apache/accumulo/test/functional/DeleteEverythingTest.java (original)
+++ accumulo/branches/ACCUMULO-CURATOR/test/src/main/java/org/apache/accumulo/test/functional/DeleteEverythingTest.java Mon Jun 24 21:34:20 2013
@@ -22,7 +22,6 @@ import java.util.List;
import java.util.Map;
import java.util.Map.Entry;
-import org.apache.accumulo.core.Constants;
import org.apache.accumulo.core.client.BatchWriter;
import org.apache.accumulo.core.client.BatchWriterConfig;
import org.apache.accumulo.core.client.Scanner;
@@ -31,6 +30,7 @@ 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.security.Authorizations;
import org.apache.accumulo.core.util.UtilWaitThread;
import org.apache.hadoop.io.Text;
@@ -68,7 +68,7 @@ public class DeleteEverythingTest extend
bw.addMutation(m);
bw.flush();
- Scanner scanner = getConnector().createScanner("de", Constants.NO_AUTHS);
+ Scanner scanner = getConnector().createScanner("de", Authorizations.EMPTY);
scanner.setRange(new Range());
int count = 0;
Modified: accumulo/branches/ACCUMULO-CURATOR/test/src/main/java/org/apache/accumulo/test/functional/DeleteRowsSplitTest.java
URL: http://svn.apache.org/viewvc/accumulo/branches/ACCUMULO-CURATOR/test/src/main/java/org/apache/accumulo/test/functional/DeleteRowsSplitTest.java?rev=1496226&r1=1496225&r2=1496226&view=diff
==============================================================================
--- accumulo/branches/ACCUMULO-CURATOR/test/src/main/java/org/apache/accumulo/test/functional/DeleteRowsSplitTest.java (original)
+++ accumulo/branches/ACCUMULO-CURATOR/test/src/main/java/org/apache/accumulo/test/functional/DeleteRowsSplitTest.java Mon Jun 24 21:34:20 2013
@@ -25,18 +25,17 @@ import java.util.Random;
import java.util.SortedSet;
import java.util.TreeSet;
-import org.apache.accumulo.core.Constants;
import org.apache.accumulo.core.client.BatchWriter;
import org.apache.accumulo.core.client.BatchWriterConfig;
import org.apache.accumulo.core.client.Scanner;
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.security.Authorizations;
import org.apache.accumulo.core.util.UtilWaitThread;
import org.apache.hadoop.io.Text;
import org.apache.log4j.Logger;
-
// attempt to reproduce ACCUMULO-315
public class DeleteRowsSplitTest extends FunctionalTest {
@@ -51,7 +50,7 @@ public class DeleteRowsSplitTest extends
ROWS.add(new String(new byte[] {b}));
}
}
-
+
@Override
public void cleanup() throws Exception {}
@@ -70,7 +69,7 @@ public class DeleteRowsSplitTest extends
Random random = new Random();
TABLE = "table" + Long.toHexString(random.nextLong());
}
-
+
@Override
public void run() throws Exception {
// Delete ranges of rows, and verify the are removed
@@ -81,18 +80,19 @@ public class DeleteRowsSplitTest extends
// create a table
log.info("Test " + test);
getConnector().tableOperations().create(TABLE);
-
+
// put some data in it
fillTable(TABLE);
-
+
// generate a random delete range
final Text start = new Text();
final Text end = new Text();
generateRandomRange(start, end);
-
+
// initiate the delete range
- final boolean fail[] = { false };
+ final boolean fail[] = {false};
Thread t = new Thread() {
+ @Override
public void run() {
try {
// split the table
@@ -109,16 +109,16 @@ public class DeleteRowsSplitTest extends
t.start();
UtilWaitThread.sleep(test * 2);
-
+
getConnector().tableOperations().deleteRows(TABLE, start, end);
t.join();
synchronized (fail) {
assertTrue(!fail[0]);
}
-
+
// scan the table
- Scanner scanner = getConnector().createScanner(TABLE, Constants.NO_AUTHS);
+ Scanner scanner = getConnector().createScanner(TABLE, Authorizations.EMPTY);
for (Entry<Key,Value> entry : scanner) {
Text row = entry.getKey().getRow();
assertTrue(row.compareTo(start) <= 0 || row.compareTo(end) > 0);
@@ -139,7 +139,7 @@ public class DeleteRowsSplitTest extends
start.set(bunch.get(1));
end.set(bunch.get(0));
}
-
+
}
private void fillTable(String table) throws Exception {
@@ -151,11 +151,10 @@ public class DeleteRowsSplitTest extends
}
bw.close();
}
-
+
private void assertTrue(boolean b) {
if (!b)
throw new RuntimeException("test failed, false value");
}
}
-
Modified: accumulo/branches/ACCUMULO-CURATOR/test/src/main/java/org/apache/accumulo/test/functional/DeleteRowsTest.java
URL: http://svn.apache.org/viewvc/accumulo/branches/ACCUMULO-CURATOR/test/src/main/java/org/apache/accumulo/test/functional/DeleteRowsTest.java?rev=1496226&r1=1496225&r2=1496226&view=diff
==============================================================================
--- accumulo/branches/ACCUMULO-CURATOR/test/src/main/java/org/apache/accumulo/test/functional/DeleteRowsTest.java (original)
+++ accumulo/branches/ACCUMULO-CURATOR/test/src/main/java/org/apache/accumulo/test/functional/DeleteRowsTest.java Mon Jun 24 21:34:20 2013
@@ -26,13 +26,13 @@ import java.util.Map.Entry;
import java.util.SortedSet;
import java.util.TreeSet;
-import org.apache.accumulo.core.Constants;
import org.apache.accumulo.core.client.BatchWriter;
import org.apache.accumulo.core.client.BatchWriterConfig;
import org.apache.accumulo.core.client.Scanner;
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.security.Authorizations;
import org.apache.hadoop.io.Text;
import org.apache.log4j.Logger;
@@ -126,7 +126,7 @@ public class DeleteRowsTest extends Func
sb.append(split.toString());
assertEquals(result, sb.toString());
// See that the rows are really deleted
- Scanner scanner = this.getConnector().createScanner(table, Constants.NO_AUTHS);
+ Scanner scanner = this.getConnector().createScanner(table, Authorizations.EMPTY);
int count = 0;
for (Entry<Key,Value> entry : scanner) {
Text row = entry.getKey().getRow();
Modified: accumulo/branches/ACCUMULO-CURATOR/test/src/main/java/org/apache/accumulo/test/functional/FunctionalTest.java
URL: http://svn.apache.org/viewvc/accumulo/branches/ACCUMULO-CURATOR/test/src/main/java/org/apache/accumulo/test/functional/FunctionalTest.java?rev=1496226&r1=1496225&r2=1496226&view=diff
==============================================================================
--- accumulo/branches/ACCUMULO-CURATOR/test/src/main/java/org/apache/accumulo/test/functional/FunctionalTest.java (original)
+++ accumulo/branches/ACCUMULO-CURATOR/test/src/main/java/org/apache/accumulo/test/functional/FunctionalTest.java Mon Jun 24 21:34:20 2013
@@ -26,7 +26,6 @@ import java.util.SortedSet;
import java.util.TreeMap;
import java.util.TreeSet;
-import org.apache.accumulo.core.Constants;
import org.apache.accumulo.core.client.AccumuloException;
import org.apache.accumulo.core.client.AccumuloSecurityException;
import org.apache.accumulo.core.client.Connector;
@@ -41,7 +40,9 @@ 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.security.Authorizations;
import org.apache.accumulo.core.security.CredentialHelper;
+import org.apache.accumulo.core.util.MetadataTable;
import org.apache.accumulo.server.cli.ClientOpts;
import org.apache.accumulo.server.conf.ServerConfiguration;
import org.apache.accumulo.start.classloader.vfs.AccumuloVFSClassLoader;
@@ -189,11 +190,11 @@ public abstract class FunctionalTest {
*/
protected void checkRFiles(String tableName, int minTablets, int maxTablets, int minRFiles, int maxRFiles) throws Exception {
- Scanner scanner = getConnector().createScanner(Constants.METADATA_TABLE_NAME, Constants.NO_AUTHS);
+ Scanner scanner = getConnector().createScanner(MetadataTable.NAME, Authorizations.EMPTY);
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);
- Constants.METADATA_PREV_ROW_COLUMN.fetch(scanner);
+ scanner.fetchColumnFamily(MetadataTable.DATAFILE_COLUMN_FAMILY);
+ MetadataTable.PREV_ROW_COLUMN.fetch(scanner);
HashMap<Text,Integer> tabletFileCounts = new HashMap<Text,Integer>();
@@ -204,7 +205,7 @@ public abstract class FunctionalTest {
Integer count = tabletFileCounts.get(row);
if (count == null)
count = 0;
- if (entry.getKey().getColumnFamily().equals(Constants.METADATA_DATAFILE_COLUMN_FAMILY)) {
+ if (entry.getKey().getColumnFamily().equals(MetadataTable.DATAFILE_COLUMN_FAMILY)) {
count = count + 1;
}
Modified: accumulo/branches/ACCUMULO-CURATOR/test/src/main/java/org/apache/accumulo/test/functional/LargeRowTest.java
URL: http://svn.apache.org/viewvc/accumulo/branches/ACCUMULO-CURATOR/test/src/main/java/org/apache/accumulo/test/functional/LargeRowTest.java?rev=1496226&r1=1496225&r2=1496226&view=diff
==============================================================================
--- accumulo/branches/ACCUMULO-CURATOR/test/src/main/java/org/apache/accumulo/test/functional/LargeRowTest.java (original)
+++ accumulo/branches/ACCUMULO-CURATOR/test/src/main/java/org/apache/accumulo/test/functional/LargeRowTest.java Mon Jun 24 21:34:20 2013
@@ -23,7 +23,6 @@ import java.util.Map.Entry;
import java.util.Random;
import java.util.TreeSet;
-import org.apache.accumulo.core.Constants;
import org.apache.accumulo.core.client.BatchWriter;
import org.apache.accumulo.core.client.BatchWriterConfig;
import org.apache.accumulo.core.client.Scanner;
@@ -32,6 +31,7 @@ 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.security.Authorizations;
import org.apache.accumulo.core.util.UtilWaitThread;
import org.apache.accumulo.test.TestIngest;
import org.apache.hadoop.io.Text;
@@ -97,7 +97,7 @@ public class LargeRowTest extends Functi
UtilWaitThread.sleep(12000);
Logger.getLogger(LargeRowTest.class).warn("checking splits");
- checkSplits(REG_TABLE_NAME, NUM_PRE_SPLITS/2, NUM_PRE_SPLITS * 2);
+ checkSplits(REG_TABLE_NAME, NUM_PRE_SPLITS / 2, NUM_PRE_SPLITS * 4);
verify(REG_TABLE_NAME);
}
@@ -153,7 +153,7 @@ public class LargeRowTest extends Functi
r.setSeed(SEED);
- Scanner scanner = getConnector().createScanner(table, Constants.NO_AUTHS);
+ Scanner scanner = getConnector().createScanner(table, Authorizations.EMPTY);
for (int i = 0; i < NUM_ROWS; i++) {
Modified: accumulo/branches/ACCUMULO-CURATOR/test/src/main/java/org/apache/accumulo/test/functional/LogicalTimeTest.java
URL: http://svn.apache.org/viewvc/accumulo/branches/ACCUMULO-CURATOR/test/src/main/java/org/apache/accumulo/test/functional/LogicalTimeTest.java?rev=1496226&r1=1496225&r2=1496226&view=diff
==============================================================================
--- accumulo/branches/ACCUMULO-CURATOR/test/src/main/java/org/apache/accumulo/test/functional/LogicalTimeTest.java (original)
+++ accumulo/branches/ACCUMULO-CURATOR/test/src/main/java/org/apache/accumulo/test/functional/LogicalTimeTest.java Mon Jun 24 21:34:20 2013
@@ -21,7 +21,6 @@ import java.util.List;
import java.util.Map;
import java.util.TreeSet;
-import org.apache.accumulo.core.Constants;
import org.apache.accumulo.core.client.BatchWriter;
import org.apache.accumulo.core.client.BatchWriterConfig;
import org.apache.accumulo.core.client.Connector;
@@ -29,6 +28,7 @@ import org.apache.accumulo.core.client.S
import org.apache.accumulo.core.client.admin.TimeType;
import org.apache.accumulo.core.data.Mutation;
import org.apache.accumulo.core.data.Range;
+import org.apache.accumulo.core.security.Authorizations;
import org.apache.hadoop.io.Text;
public class LogicalTimeTest extends FunctionalTest {
@@ -96,13 +96,14 @@ public class LogicalTimeTest extends Fun
bw.addMutation(m);
bw.flush();
- Scanner scanner = conn.createScanner(table, Constants.NO_AUTHS);
+ Scanner scanner = conn.createScanner(table, Authorizations.EMPTY);
scanner.setRange(new Range(last));
bw.close();
long time = scanner.iterator().next().getKey().getTimestamp();
- if (time != expected) throw new RuntimeException("unexpected time " + time + " " + expected);
+ if (time != expected)
+ throw new RuntimeException("unexpected time " + time + " " + expected);
}
@Override
Modified: accumulo/branches/ACCUMULO-CURATOR/test/src/main/java/org/apache/accumulo/test/functional/MergeTest.java
URL: http://svn.apache.org/viewvc/accumulo/branches/ACCUMULO-CURATOR/test/src/main/java/org/apache/accumulo/test/functional/MergeTest.java?rev=1496226&r1=1496225&r2=1496226&view=diff
==============================================================================
--- accumulo/branches/ACCUMULO-CURATOR/test/src/main/java/org/apache/accumulo/test/functional/MergeTest.java (original)
+++ accumulo/branches/ACCUMULO-CURATOR/test/src/main/java/org/apache/accumulo/test/functional/MergeTest.java Mon Jun 24 21:34:20 2013
@@ -24,7 +24,6 @@ import java.util.Map;
import java.util.Map.Entry;
import java.util.TreeSet;
-import org.apache.accumulo.core.Constants;
import org.apache.accumulo.core.client.BatchWriter;
import org.apache.accumulo.core.client.BatchWriterConfig;
import org.apache.accumulo.core.client.Connector;
@@ -33,6 +32,7 @@ import org.apache.accumulo.core.client.a
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.security.Authorizations;
import org.apache.hadoop.io.Text;
/**
@@ -50,8 +50,7 @@ public class MergeTest extends Functiona
return Collections.emptyList();
}
-
- private String[] ns(String...strings){
+ private String[] ns(String... strings) {
return strings;
}
@@ -60,7 +59,7 @@ public class MergeTest extends Functiona
int tc = 0;
runMergeTest("foo" + tc++, ns(), ns(), ns("l", "m", "n"), ns(null, "l"), ns(null, "n"));
-
+
runMergeTest("foo" + tc++, ns("m"), ns(), ns("l", "m", "n"), ns(null, "l"), ns(null, "n"));
runMergeTest("foo" + tc++, ns("m"), ns("m"), ns("l", "m", "n"), ns("m", "n"), ns(null, "z"));
runMergeTest("foo" + tc++, ns("m"), ns("m"), ns("l", "m", "n"), ns(null, "b"), ns("l", "m"));
@@ -90,7 +89,7 @@ public class MergeTest extends Functiona
private void runMergeTest(String table, String[] splits, String[] expectedSplits, String[] inserts, String start, String end) throws Exception {
System.out.println("Running merge test " + table + " " + Arrays.asList(splits) + " " + start + " " + end);
-
+
Connector conn = super.getConnector();
conn.tableOperations().create(table, true, TimeType.LOGICAL);
TreeSet<Text> splitSet = new TreeSet<Text>();
@@ -112,7 +111,7 @@ public class MergeTest extends Functiona
conn.tableOperations().merge(table, start == null ? null : new Text(start), end == null ? null : new Text(end));
- Scanner scanner = conn.createScanner(table, Constants.NO_AUTHS);
+ Scanner scanner = conn.createScanner(table, Authorizations.EMPTY);
HashSet<String> observed = new HashSet<String>();
for (Entry<Key,Value> entry : scanner) {
Modified: accumulo/branches/ACCUMULO-CURATOR/test/src/main/java/org/apache/accumulo/test/functional/PermissionsTest.java
URL: http://svn.apache.org/viewvc/accumulo/branches/ACCUMULO-CURATOR/test/src/main/java/org/apache/accumulo/test/functional/PermissionsTest.java?rev=1496226&r1=1496225&r2=1496226&view=diff
==============================================================================
--- accumulo/branches/ACCUMULO-CURATOR/test/src/main/java/org/apache/accumulo/test/functional/PermissionsTest.java (original)
+++ accumulo/branches/ACCUMULO-CURATOR/test/src/main/java/org/apache/accumulo/test/functional/PermissionsTest.java Mon Jun 24 21:34:20 2013
@@ -26,7 +26,6 @@ import java.util.Map;
import java.util.Map.Entry;
import java.util.Set;
-import org.apache.accumulo.core.Constants;
import org.apache.accumulo.core.client.AccumuloException;
import org.apache.accumulo.core.client.AccumuloSecurityException;
import org.apache.accumulo.core.client.BatchWriter;
@@ -47,6 +46,7 @@ import org.apache.accumulo.core.data.Val
import org.apache.accumulo.core.security.Authorizations;
import org.apache.accumulo.core.security.SystemPermission;
import org.apache.accumulo.core.security.TablePermission;
+import org.apache.accumulo.core.util.MetadataTable;
import org.apache.accumulo.server.conf.ServerConfiguration;
import org.apache.hadoop.io.Text;
import org.apache.log4j.Logger;
@@ -319,9 +319,9 @@ public class PermissionsTest {
Connector test_user_conn = getInstance().getConnector(TEST_USER, TEST_PASS);
// check for read-only access to metadata table
- verifyHasOnlyTheseTablePermissions(getConnector(), getConnector().whoami(), Constants.METADATA_TABLE_NAME, TablePermission.READ,
+ verifyHasOnlyTheseTablePermissions(getConnector(), getConnector().whoami(), MetadataTable.NAME, TablePermission.READ,
TablePermission.ALTER_TABLE);
- verifyHasOnlyTheseTablePermissions(getConnector(), TEST_USER, Constants.METADATA_TABLE_NAME, TablePermission.READ);
+ verifyHasOnlyTheseTablePermissions(getConnector(), TEST_USER, MetadataTable.NAME, TablePermission.READ);
// test each permission
for (TablePermission perm : TablePermission.values()) {
@@ -370,7 +370,7 @@ public class PermissionsTest {
switch (perm) {
case READ:
try {
- scanner = test_user_conn.createScanner(TEST_TABLE, Constants.NO_AUTHS);
+ scanner = test_user_conn.createScanner(TEST_TABLE, Authorizations.EMPTY);
int i = 0;
for (Entry<Key,Value> entry : scanner)
i += 1 + entry.getKey().getRowData().length();
@@ -448,7 +448,7 @@ public class PermissionsTest {
// test permission after granting it
switch (perm) {
case READ:
- scanner = test_user_conn.createScanner(TEST_TABLE, Constants.NO_AUTHS);
+ scanner = test_user_conn.createScanner(TEST_TABLE, Authorizations.EMPTY);
Iterator<Entry<Key,Value>> iter = scanner.iterator();
while (iter.hasNext())
iter.next();
Modified: accumulo/branches/ACCUMULO-CURATOR/test/src/main/java/org/apache/accumulo/test/functional/RowDeleteTest.java
URL: http://svn.apache.org/viewvc/accumulo/branches/ACCUMULO-CURATOR/test/src/main/java/org/apache/accumulo/test/functional/RowDeleteTest.java?rev=1496226&r1=1496225&r2=1496226&view=diff
==============================================================================
--- accumulo/branches/ACCUMULO-CURATOR/test/src/main/java/org/apache/accumulo/test/functional/RowDeleteTest.java (original)
+++ accumulo/branches/ACCUMULO-CURATOR/test/src/main/java/org/apache/accumulo/test/functional/RowDeleteTest.java Mon Jun 24 21:34:20 2013
@@ -22,7 +22,6 @@ import java.util.List;
import java.util.Map;
import java.util.Map.Entry;
-import org.apache.accumulo.core.Constants;
import org.apache.accumulo.core.client.BatchWriter;
import org.apache.accumulo.core.client.BatchWriterConfig;
import org.apache.accumulo.core.client.Scanner;
@@ -31,6 +30,7 @@ import org.apache.accumulo.core.data.Key
import org.apache.accumulo.core.data.Value;
import org.apache.accumulo.core.iterators.IteratorUtil.IteratorScope;
import org.apache.accumulo.core.iterators.user.RowDeletingIterator;
+import org.apache.accumulo.core.security.Authorizations;
import org.apache.accumulo.core.util.UtilWaitThread;
public class RowDeleteTest extends FunctionalTest {
@@ -66,7 +66,7 @@ public class RowDeleteTest extends Funct
checkRFiles("rdel1", 1, 1, 1, 1);
int count = 0;
- Scanner scanner = getConnector().createScanner("rdel1", Constants.NO_AUTHS);
+ Scanner scanner = getConnector().createScanner("rdel1", Authorizations.EMPTY);
for (@SuppressWarnings("unused")
Entry<Key,Value> entry : scanner) {
count++;
@@ -85,7 +85,7 @@ public class RowDeleteTest extends Funct
checkRFiles("rdel1", 1, 1, 2, 2);
count = 0;
- scanner = getConnector().createScanner("rdel1", Constants.NO_AUTHS);
+ scanner = getConnector().createScanner("rdel1", Authorizations.EMPTY);
for (@SuppressWarnings("unused")
Entry<Key,Value> entry : scanner) {
count++;
@@ -98,7 +98,7 @@ public class RowDeleteTest extends Funct
checkRFiles("rdel1", 1, 1, 0, 0);
count = 0;
- scanner = getConnector().createScanner("rdel1", Constants.NO_AUTHS);
+ scanner = getConnector().createScanner("rdel1", Authorizations.EMPTY);
for (@SuppressWarnings("unused")
Entry<Key,Value> entry : scanner) {
count++;
Modified: accumulo/branches/ACCUMULO-CURATOR/test/src/main/java/org/apache/accumulo/test/functional/ScanRangeTest.java
URL: http://svn.apache.org/viewvc/accumulo/branches/ACCUMULO-CURATOR/test/src/main/java/org/apache/accumulo/test/functional/ScanRangeTest.java?rev=1496226&r1=1496225&r2=1496226&view=diff
==============================================================================
--- accumulo/branches/ACCUMULO-CURATOR/test/src/main/java/org/apache/accumulo/test/functional/ScanRangeTest.java (original)
+++ accumulo/branches/ACCUMULO-CURATOR/test/src/main/java/org/apache/accumulo/test/functional/ScanRangeTest.java Mon Jun 24 21:34:20 2013
@@ -23,7 +23,6 @@ import java.util.Map;
import java.util.Map.Entry;
import java.util.TreeSet;
-import org.apache.accumulo.core.Constants;
import org.apache.accumulo.core.client.BatchWriter;
import org.apache.accumulo.core.client.BatchWriterConfig;
import org.apache.accumulo.core.client.Scanner;
@@ -31,6 +30,7 @@ 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.security.Authorizations;
import org.apache.hadoop.io.Text;
public class ScanRangeTest extends FunctionalTest {
@@ -163,7 +163,7 @@ public class ScanRangeTest extends Funct
}
private void scanRange(String table, IntKey ik1, boolean inclusive1, IntKey ik2, boolean inclusive2) throws Exception {
- Scanner scanner = getConnector().createScanner(table, Constants.NO_AUTHS);
+ Scanner scanner = getConnector().createScanner(table, Authorizations.EMPTY);
Key key1 = null;
Key key2 = null;
Modified: accumulo/branches/ACCUMULO-CURATOR/test/src/main/java/org/apache/accumulo/test/functional/ServerSideErrorTest.java
URL: http://svn.apache.org/viewvc/accumulo/branches/ACCUMULO-CURATOR/test/src/main/java/org/apache/accumulo/test/functional/ServerSideErrorTest.java?rev=1496226&r1=1496225&r2=1496226&view=diff
==============================================================================
--- accumulo/branches/ACCUMULO-CURATOR/test/src/main/java/org/apache/accumulo/test/functional/ServerSideErrorTest.java (original)
+++ accumulo/branches/ACCUMULO-CURATOR/test/src/main/java/org/apache/accumulo/test/functional/ServerSideErrorTest.java Mon Jun 24 21:34:20 2013
@@ -21,7 +21,6 @@ import java.util.List;
import java.util.Map;
import java.util.Map.Entry;
-import org.apache.accumulo.core.Constants;
import org.apache.accumulo.core.client.BatchScanner;
import org.apache.accumulo.core.client.BatchWriter;
import org.apache.accumulo.core.client.BatchWriterConfig;
@@ -33,6 +32,7 @@ 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.iterators.Combiner;
+import org.apache.accumulo.core.security.Authorizations;
import org.apache.accumulo.core.util.UtilWaitThread;
import org.apache.hadoop.io.Text;
@@ -72,7 +72,7 @@ public class ServerSideErrorTest extends
bw.close();
// try to scan table
- Scanner scanner = getConnector().createScanner("tt", Constants.NO_AUTHS);
+ Scanner scanner = getConnector().createScanner("tt", Authorizations.EMPTY);
boolean caught = false;
try {
@@ -87,7 +87,7 @@ public class ServerSideErrorTest extends
throw new Exception("Scan did not fail");
// try to batch scan the table
- BatchScanner bs = getConnector().createBatchScanner("tt", Constants.NO_AUTHS, 2);
+ BatchScanner bs = getConnector().createBatchScanner("tt", Authorizations.EMPTY, 2);
bs.setRanges(Collections.singleton(new Range()));
caught = false;
@@ -110,7 +110,7 @@ public class ServerSideErrorTest extends
UtilWaitThread.sleep(500);
// should be able to scan now
- scanner = getConnector().createScanner("tt", Constants.NO_AUTHS);
+ scanner = getConnector().createScanner("tt", Authorizations.EMPTY);
for (Entry<Key,Value> entry : scanner) {
entry.getKey();
}
Modified: accumulo/branches/ACCUMULO-CURATOR/test/src/main/java/org/apache/accumulo/test/functional/SparseColumnFamilyTest.java
URL: http://svn.apache.org/viewvc/accumulo/branches/ACCUMULO-CURATOR/test/src/main/java/org/apache/accumulo/test/functional/SparseColumnFamilyTest.java?rev=1496226&r1=1496225&r2=1496226&view=diff
==============================================================================
--- accumulo/branches/ACCUMULO-CURATOR/test/src/main/java/org/apache/accumulo/test/functional/SparseColumnFamilyTest.java (original)
+++ accumulo/branches/ACCUMULO-CURATOR/test/src/main/java/org/apache/accumulo/test/functional/SparseColumnFamilyTest.java Mon Jun 24 21:34:20 2013
@@ -22,7 +22,6 @@ import java.util.List;
import java.util.Map;
import java.util.Map.Entry;
-import org.apache.accumulo.core.Constants;
import org.apache.accumulo.core.client.BatchWriter;
import org.apache.accumulo.core.client.BatchWriterConfig;
import org.apache.accumulo.core.client.Scanner;
@@ -30,6 +29,7 @@ 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.security.Authorizations;
import org.apache.hadoop.io.Text;
/**
@@ -54,7 +54,7 @@ public class SparseColumnFamilyTest exte
BatchWriter bw = getConnector().createBatchWriter("scftt", new BatchWriterConfig());
// create file in the tablet that has mostly column family 0, with a few entries for column family 1
-
+
bw.addMutation(nm(0, 1, 0));
for (int i = 1; i < 99999; i++) {
bw.addMutation(nm(i * 2, 0, i));
@@ -72,7 +72,7 @@ public class SparseColumnFamilyTest exte
getConnector().tableOperations().flush("scftt", null, null, true);
- Scanner scanner = getConnector().createScanner("scftt", Constants.NO_AUTHS);
+ Scanner scanner = getConnector().createScanner("scftt", Authorizations.EMPTY);
for (int i = 0; i < 200; i++) {
@@ -109,7 +109,7 @@ public class SparseColumnFamilyTest exte
m.put(String.format("%03d", cf), "", "" + val);
return m;
}
-
+
@Override
public void cleanup() throws Exception {}
Modified: accumulo/branches/ACCUMULO-CURATOR/test/src/main/java/org/apache/accumulo/test/functional/SplitRecoveryTest.java
URL: http://svn.apache.org/viewvc/accumulo/branches/ACCUMULO-CURATOR/test/src/main/java/org/apache/accumulo/test/functional/SplitRecoveryTest.java?rev=1496226&r1=1496225&r2=1496226&view=diff
==============================================================================
--- accumulo/branches/ACCUMULO-CURATOR/test/src/main/java/org/apache/accumulo/test/functional/SplitRecoveryTest.java (original)
+++ accumulo/branches/ACCUMULO-CURATOR/test/src/main/java/org/apache/accumulo/test/functional/SplitRecoveryTest.java Mon Jun 24 21:34:20 2013
@@ -35,8 +35,8 @@ 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.file.FileUtil;
import org.apache.accumulo.core.file.rfile.RFile;
+import org.apache.accumulo.core.security.Authorizations;
import org.apache.accumulo.core.util.ColumnFQ;
import org.apache.accumulo.core.util.MetadataTable.DataFileValue;
import org.apache.accumulo.core.zookeeper.ZooUtil;
@@ -44,12 +44,15 @@ import org.apache.accumulo.fate.zookeepe
import org.apache.accumulo.fate.zookeeper.ZooLock.LockLossReason;
import org.apache.accumulo.fate.zookeeper.ZooLock.LockWatcher;
import org.apache.accumulo.fate.zookeeper.ZooUtil.NodeExistsPolicy;
+import org.apache.accumulo.server.ServerConstants;
import org.apache.accumulo.server.client.HdfsZooInstance;
+import org.apache.accumulo.server.fs.FileRef;
import org.apache.accumulo.server.master.state.Assignment;
import org.apache.accumulo.server.master.state.TServerInstance;
import org.apache.accumulo.server.security.SecurityConstants;
import org.apache.accumulo.server.tabletserver.TabletServer;
import org.apache.accumulo.server.tabletserver.TabletTime;
+import org.apache.accumulo.server.util.FileUtil;
import org.apache.accumulo.server.util.MetadataTable;
import org.apache.accumulo.server.zookeeper.TransactionWatcher;
import org.apache.accumulo.server.zookeeper.ZooLock;
@@ -128,15 +131,15 @@ public class SplitRecoveryTest extends F
Text midRow = new Text(mr);
- SortedMap<String,DataFileValue> splitMapFiles = null;
+ SortedMap<FileRef,DataFileValue> splitMapFiles = null;
for (int i = 0; i < extents.length; i++) {
KeyExtent extent = extents[i];
- String tdir = "/dir_" + i;
+ String tdir = ServerConstants.getTablesDirs()[0] + "/" + extent.getTableId().toString() + "/dir_" + i;
MetadataTable.addTablet(extent, tdir, SecurityConstants.getSystemCredentials(), TabletTime.LOGICAL_TIME_ID, zl);
- SortedMap<String,DataFileValue> mapFiles = new TreeMap<String,DataFileValue>();
- mapFiles.put(tdir + "/" + RFile.EXTENSION + "_000_000", new DataFileValue(1000017 + i, 10000 + i));
+ SortedMap<FileRef,DataFileValue> mapFiles = new TreeMap<FileRef,DataFileValue>();
+ mapFiles.put(new FileRef(tdir + "/" + RFile.EXTENSION + "_000_000"), new DataFileValue(1000017 + i, 10000 + i));
if (i == extentToSplit) {
splitMapFiles = mapFiles;
@@ -154,46 +157,45 @@ public class SplitRecoveryTest extends F
splitPartiallyAndRecover(extent, high, low, .4, splitMapFiles, midRow, "localhost:1234", failPoint, zl);
}
- private void splitPartiallyAndRecover(KeyExtent extent, KeyExtent high, KeyExtent low, double splitRatio, SortedMap<String,DataFileValue> mapFiles,
+ private void splitPartiallyAndRecover(KeyExtent extent, KeyExtent high, KeyExtent low, double splitRatio, SortedMap<FileRef,DataFileValue> mapFiles,
Text midRow, String location, int steps, ZooLock zl) throws Exception {
- SortedMap<String,DataFileValue> lowDatafileSizes = new TreeMap<String,DataFileValue>();
- SortedMap<String,DataFileValue> highDatafileSizes = new TreeMap<String,DataFileValue>();
- List<String> highDatafilesToRemove = new ArrayList<String>();
+ SortedMap<FileRef,DataFileValue> lowDatafileSizes = new TreeMap<FileRef,DataFileValue>();
+ SortedMap<FileRef,DataFileValue> highDatafileSizes = new TreeMap<FileRef,DataFileValue>();
+ List<FileRef> highDatafilesToRemove = new ArrayList<FileRef>();
- MetadataTable.splitDatafiles(extent.getTableId(), midRow, splitRatio, new HashMap<String,FileUtil.FileInfo>(), mapFiles, lowDatafileSizes,
+ MetadataTable.splitDatafiles(extent.getTableId(), midRow, splitRatio, new HashMap<FileRef,FileUtil.FileInfo>(), mapFiles, lowDatafileSizes,
highDatafileSizes, highDatafilesToRemove);
MetadataTable.splitTablet(high, extent.getPrevEndRow(), splitRatio, SecurityConstants.getSystemCredentials(), zl);
TServerInstance instance = new TServerInstance(location, zl.getSessionId());
- Writer writer = new Writer(HdfsZooInstance.getInstance(), SecurityConstants.getSystemCredentials(), Constants.METADATA_TABLE_ID);
+ Writer writer = new Writer(HdfsZooInstance.getInstance(), SecurityConstants.getSystemCredentials(), MetadataTable.ID);
Assignment assignment = new Assignment(high, instance);
Mutation m = new Mutation(assignment.tablet.getMetadataEntry());
- m.put(Constants.METADATA_FUTURE_LOCATION_COLUMN_FAMILY, assignment.server.asColumnQualifier(), assignment.server.asMutationValue());
+ m.put(MetadataTable.FUTURE_LOCATION_COLUMN_FAMILY, assignment.server.asColumnQualifier(), assignment.server.asMutationValue());
writer.update(m);
if (steps >= 1) {
- Map<String,Long> bulkFiles = MetadataTable.getBulkFilesLoaded(SecurityConstants.getSystemCredentials(), extent);
+ Map<FileRef,Long> bulkFiles = MetadataTable.getBulkFilesLoaded(SecurityConstants.getSystemCredentials(), extent);
MetadataTable.addNewTablet(low, "/lowDir", instance, lowDatafileSizes, bulkFiles, SecurityConstants.getSystemCredentials(), TabletTime.LOGICAL_TIME_ID
+ "0", -1l, -1l, zl);
}
if (steps >= 2)
MetadataTable.finishSplit(high, highDatafileSizes, highDatafilesToRemove, SecurityConstants.getSystemCredentials(), zl);
-
TabletServer.verifyTabletInformation(high, instance, null, "127.0.0.1:0", zl);
-
+
if (steps >= 1) {
ensureTabletHasNoUnexpectedMetadataEntries(low, lowDatafileSizes);
ensureTabletHasNoUnexpectedMetadataEntries(high, highDatafileSizes);
-
- Map<String,Long> lowBulkFiles = MetadataTable.getBulkFilesLoaded(SecurityConstants.getSystemCredentials(), low);
- Map<String,Long> highBulkFiles = MetadataTable.getBulkFilesLoaded(SecurityConstants.getSystemCredentials(), high);
-
+
+ Map<FileRef,Long> lowBulkFiles = MetadataTable.getBulkFilesLoaded(SecurityConstants.getSystemCredentials(), low);
+ Map<FileRef,Long> highBulkFiles = MetadataTable.getBulkFilesLoaded(SecurityConstants.getSystemCredentials(), high);
+
if (!lowBulkFiles.equals(highBulkFiles)) {
throw new Exception(" " + lowBulkFiles + " != " + highBulkFiles + " " + low + " " + high);
}
-
+
if (lowBulkFiles.size() == 0) {
throw new Exception(" no bulk files " + low);
}
@@ -202,30 +204,29 @@ public class SplitRecoveryTest extends F
}
}
- private void ensureTabletHasNoUnexpectedMetadataEntries(KeyExtent extent, SortedMap<String,DataFileValue> expectedMapFiles) throws Exception {
- Scanner scanner = new ScannerImpl(HdfsZooInstance.getInstance(), SecurityConstants.getSystemCredentials(), Constants.METADATA_TABLE_ID,
- Constants.NO_AUTHS);
+ private void ensureTabletHasNoUnexpectedMetadataEntries(KeyExtent extent, SortedMap<FileRef,DataFileValue> expectedMapFiles) throws Exception {
+ Scanner scanner = new ScannerImpl(HdfsZooInstance.getInstance(), SecurityConstants.getSystemCredentials(), MetadataTable.ID, Authorizations.EMPTY);
scanner.setRange(extent.toMetadataRange());
HashSet<ColumnFQ> expectedColumns = new HashSet<ColumnFQ>();
- expectedColumns.add(Constants.METADATA_DIRECTORY_COLUMN);
- expectedColumns.add(Constants.METADATA_PREV_ROW_COLUMN);
- expectedColumns.add(Constants.METADATA_TIME_COLUMN);
- expectedColumns.add(Constants.METADATA_LOCK_COLUMN);
+ expectedColumns.add(MetadataTable.DIRECTORY_COLUMN);
+ expectedColumns.add(MetadataTable.PREV_ROW_COLUMN);
+ expectedColumns.add(MetadataTable.TIME_COLUMN);
+ expectedColumns.add(MetadataTable.LOCK_COLUMN);
HashSet<Text> expectedColumnFamilies = new HashSet<Text>();
- expectedColumnFamilies.add(Constants.METADATA_DATAFILE_COLUMN_FAMILY);
- expectedColumnFamilies.add(Constants.METADATA_FUTURE_LOCATION_COLUMN_FAMILY);
- expectedColumnFamilies.add(Constants.METADATA_CURRENT_LOCATION_COLUMN_FAMILY);
- expectedColumnFamilies.add(Constants.METADATA_LAST_LOCATION_COLUMN_FAMILY);
- expectedColumnFamilies.add(Constants.METADATA_BULKFILE_COLUMN_FAMILY);
+ expectedColumnFamilies.add(MetadataTable.DATAFILE_COLUMN_FAMILY);
+ expectedColumnFamilies.add(MetadataTable.FUTURE_LOCATION_COLUMN_FAMILY);
+ expectedColumnFamilies.add(MetadataTable.CURRENT_LOCATION_COLUMN_FAMILY);
+ expectedColumnFamilies.add(MetadataTable.LAST_LOCATION_COLUMN_FAMILY);
+ expectedColumnFamilies.add(MetadataTable.BULKFILE_COLUMN_FAMILY);
Iterator<Entry<Key,Value>> iter = scanner.iterator();
while (iter.hasNext()) {
Key key = iter.next().getKey();
if (!key.getRow().equals(extent.getMetadataEntry())) {
- throw new Exception("Tablet " + extent + " contained unexpected " + Constants.METADATA_TABLE_NAME + " entry " + key);
+ throw new Exception("Tablet " + extent + " contained unexpected " + MetadataTable.NAME + " entry " + key);
}
if (expectedColumnFamilies.contains(key.getColumnFamily())) {
@@ -236,24 +237,24 @@ public class SplitRecoveryTest extends F
continue;
}
- throw new Exception("Tablet " + extent + " contained unexpected " + Constants.METADATA_TABLE_NAME + " entry " + key);
+ throw new Exception("Tablet " + extent + " contained unexpected " + MetadataTable.NAME + " entry " + key);
}
System.out.println("expectedColumns " + expectedColumns);
if (expectedColumns.size() > 1 || (expectedColumns.size() == 1)) {
throw new Exception("Not all expected columns seen " + extent + " " + expectedColumns);
}
- SortedMap<String,DataFileValue> fixedMapFiles = MetadataTable.getDataFileSizes(extent, SecurityConstants.getSystemCredentials());
+ SortedMap<FileRef,DataFileValue> fixedMapFiles = MetadataTable.getDataFileSizes(extent, SecurityConstants.getSystemCredentials());
verifySame(expectedMapFiles, fixedMapFiles);
}
- private void verifySame(SortedMap<String,DataFileValue> datafileSizes, SortedMap<String,DataFileValue> fixedDatafileSizes) throws Exception {
+ private void verifySame(SortedMap<FileRef,DataFileValue> datafileSizes, SortedMap<FileRef,DataFileValue> fixedDatafileSizes) throws Exception {
if (!datafileSizes.keySet().containsAll(fixedDatafileSizes.keySet()) || !fixedDatafileSizes.keySet().containsAll(datafileSizes.keySet())) {
throw new Exception("Key sets not the same " + datafileSizes.keySet() + " != " + fixedDatafileSizes.keySet());
}
- for (Entry<String,DataFileValue> entry : datafileSizes.entrySet()) {
+ for (Entry<FileRef,DataFileValue> entry : datafileSizes.entrySet()) {
DataFileValue dfv = entry.getValue();
DataFileValue otherDfv = fixedDatafileSizes.get(entry.getKey());
Modified: accumulo/branches/ACCUMULO-CURATOR/test/src/main/java/org/apache/accumulo/test/functional/TimeoutTest.java
URL: http://svn.apache.org/viewvc/accumulo/branches/ACCUMULO-CURATOR/test/src/main/java/org/apache/accumulo/test/functional/TimeoutTest.java?rev=1496226&r1=1496225&r2=1496226&view=diff
==============================================================================
--- accumulo/branches/ACCUMULO-CURATOR/test/src/main/java/org/apache/accumulo/test/functional/TimeoutTest.java (original)
+++ accumulo/branches/ACCUMULO-CURATOR/test/src/main/java/org/apache/accumulo/test/functional/TimeoutTest.java Mon Jun 24 21:34:20 2013
@@ -22,7 +22,6 @@ import java.util.Map;
import java.util.Map.Entry;
import java.util.concurrent.TimeUnit;
-import org.apache.accumulo.core.Constants;
import org.apache.accumulo.core.client.BatchScanner;
import org.apache.accumulo.core.client.BatchWriter;
import org.apache.accumulo.core.client.BatchWriterConfig;
@@ -34,6 +33,7 @@ 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.security.Authorizations;
import org.apache.accumulo.core.util.UtilWaitThread;
/**
@@ -56,7 +56,7 @@ public class TimeoutTest extends Functio
testBatchScannerTimeout();
testBatchWriterTimeout();
}
-
+
public void testBatchWriterTimeout() throws Exception {
Connector conn = getConnector();
@@ -98,7 +98,7 @@ public class TimeoutTest extends Functio
bw.close();
- BatchScanner bs = getConnector().createBatchScanner("timeout", Constants.NO_AUTHS, 2);
+ BatchScanner bs = getConnector().createBatchScanner("timeout", Authorizations.EMPTY, 2);
bs.setTimeout(1, TimeUnit.SECONDS);
bs.setRanges(Collections.singletonList(new Range()));
@@ -111,7 +111,7 @@ public class TimeoutTest extends Functio
iterSetting.addOption("sleepTime", 2000 + "");
getConnector().tableOperations().attachIterator("timeout", iterSetting);
UtilWaitThread.sleep(250);
-
+
try {
for (Entry<Key,Value> entry : bs) {
entry.getKey();
@@ -120,7 +120,7 @@ public class TimeoutTest extends Functio
} catch (TimedOutException toe) {
// toe.printStackTrace();
}
-
+
bs.close();
}
Modified: accumulo/branches/ACCUMULO-CURATOR/test/src/main/java/org/apache/accumulo/test/performance/metadata/MetadataBatchScanTest.java
URL: http://svn.apache.org/viewvc/accumulo/branches/ACCUMULO-CURATOR/test/src/main/java/org/apache/accumulo/test/performance/metadata/MetadataBatchScanTest.java?rev=1496226&r1=1496225&r2=1496226&view=diff
==============================================================================
--- accumulo/branches/ACCUMULO-CURATOR/test/src/main/java/org/apache/accumulo/test/performance/metadata/MetadataBatchScanTest.java (original)
+++ accumulo/branches/ACCUMULO-CURATOR/test/src/main/java/org/apache/accumulo/test/performance/metadata/MetadataBatchScanTest.java Mon Jun 24 21:34:20 2013
@@ -24,7 +24,6 @@ import java.util.Random;
import java.util.TreeSet;
import java.util.UUID;
-import org.apache.accumulo.core.Constants;
import org.apache.accumulo.core.client.BatchScanner;
import org.apache.accumulo.core.client.BatchWriter;
import org.apache.accumulo.core.client.BatchWriterConfig;
@@ -36,7 +35,9 @@ 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.security.Authorizations;
import org.apache.accumulo.core.util.AddressUtil;
+import org.apache.accumulo.core.util.MetadataTable;
import org.apache.accumulo.core.util.Stat;
import org.apache.accumulo.server.master.state.TServerInstance;
import org.apache.accumulo.server.security.SecurityConstants;
@@ -51,9 +52,6 @@ import org.apache.hadoop.io.Text;
public class MetadataBatchScanTest {
- /**
- * @param args
- */
public static void main(String[] args) throws Exception {
final Connector connector = new ZooKeeperInstance("acu14", "localhost")
@@ -83,7 +81,7 @@ public class MetadataBatchScanTest {
if (args[0].equals("write")) {
- BatchWriter bw = connector.createBatchWriter(Constants.METADATA_TABLE_NAME, new BatchWriterConfig());
+ BatchWriter bw = connector.createBatchWriter(MetadataTable.NAME, new BatchWriterConfig());
for (KeyExtent extent : extents) {
Mutation mut = extent.getPrevRowUpdateMutation();
@@ -93,7 +91,7 @@ public class MetadataBatchScanTest {
bw.close();
} else if (args[0].equals("writeFiles")) {
- BatchWriter bw = connector.createBatchWriter(Constants.METADATA_TABLE_NAME, new BatchWriterConfig());
+ BatchWriter bw = connector.createBatchWriter(MetadataTable.NAME, new BatchWriterConfig());
for (KeyExtent extent : extents) {
@@ -101,10 +99,10 @@ public class MetadataBatchScanTest {
String dir = "/t-" + UUID.randomUUID();
- Constants.METADATA_DIRECTORY_COLUMN.put(mut, new Value(dir.getBytes()));
+ MetadataTable.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()));
+ mut.put(MetadataTable.DATAFILE_COLUMN_FAMILY, new Text(dir + "/00000_0000" + i + ".map"), new Value("10000,1000000".getBytes()));
}
bw.addMutation(mut);
@@ -164,14 +162,11 @@ public class MetadataBatchScanTest {
}
private static ScanStats runScanTest(Connector connector, int numLoop, List<Range> ranges) throws Exception {
- Scanner scanner = null;/*
- * connector.createScanner(Constants.METADATA_TABLE_NAME, Constants.NO_AUTHS); ColumnFQ.fetch(scanner,
- * Constants.METADATA_LOCATION_COLUMN); ColumnFQ.fetch(scanner, Constants.METADATA_PREV_ROW_COLUMN);
- */
-
- BatchScanner bs = connector.createBatchScanner(Constants.METADATA_TABLE_NAME, Constants.NO_AUTHS, 1);
- bs.fetchColumnFamily(Constants.METADATA_CURRENT_LOCATION_COLUMN_FAMILY);
- Constants.METADATA_PREV_ROW_COLUMN.fetch(bs);
+ Scanner scanner = null;
+
+ BatchScanner bs = connector.createBatchScanner(MetadataTable.NAME, Authorizations.EMPTY, 1);
+ bs.fetchColumnFamily(MetadataTable.CURRENT_LOCATION_COLUMN_FAMILY);
+ MetadataTable.PREV_ROW_COLUMN.fetch(bs);
bs.setRanges(ranges);