Return-Path: X-Original-To: apmail-accumulo-commits-archive@www.apache.org Delivered-To: apmail-accumulo-commits-archive@www.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id D842410C38 for ; Fri, 14 Jun 2013 21:20:01 +0000 (UTC) Received: (qmail 40436 invoked by uid 500); 14 Jun 2013 21:20:01 -0000 Delivered-To: apmail-accumulo-commits-archive@accumulo.apache.org Received: (qmail 40410 invoked by uid 500); 14 Jun 2013 21:20:01 -0000 Mailing-List: contact commits-help@accumulo.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@accumulo.apache.org Delivered-To: mailing list commits@accumulo.apache.org Received: (qmail 40403 invoked by uid 99); 14 Jun 2013 21:20:01 -0000 Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230) by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 14 Jun 2013 21:20:01 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=5.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4) by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 14 Jun 2013 21:19:51 +0000 Received: from eris.apache.org (localhost [127.0.0.1]) by eris.apache.org (Postfix) with ESMTP id 520C42388A29; Fri, 14 Jun 2013 21:19:30 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1493250 [3/3] - in /accumulo/trunk: core/src/main/java/org/apache/accumulo/core/ core/src/main/java/org/apache/accumulo/core/cli/ core/src/main/java/org/apache/accumulo/core/client/admin/ core/src/main/java/org/apache/accumulo/core/client/... Date: Fri, 14 Jun 2013 21:19:25 -0000 To: commits@accumulo.apache.org From: ctubbsii@apache.org X-Mailer: svnmailer-1.0.8-patched Message-Id: <20130614211930.520C42388A29@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Modified: accumulo/trunk/test/src/main/java/org/apache/accumulo/test/functional/ConstraintTest.java URL: http://svn.apache.org/viewvc/accumulo/trunk/test/src/main/java/org/apache/accumulo/test/functional/ConstraintTest.java?rev=1493250&r1=1493249&r2=1493250&view=diff ============================================================================== --- accumulo/trunk/test/src/main/java/org/apache/accumulo/test/functional/ConstraintTest.java (original) +++ accumulo/trunk/test/src/main/java/org/apache/accumulo/test/functional/ConstraintTest.java Fri Jun 14 21:19:23 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> 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> iter = scanner.iterator(); Modified: accumulo/trunk/test/src/main/java/org/apache/accumulo/test/functional/CreateAndUseTest.java URL: http://svn.apache.org/viewvc/accumulo/trunk/test/src/main/java/org/apache/accumulo/test/functional/CreateAndUseTest.java?rev=1493250&r1=1493249&r2=1493250&view=diff ============================================================================== --- accumulo/trunk/test/src/main/java/org/apache/accumulo/test/functional/CreateAndUseTest.java (original) +++ accumulo/trunk/test/src/main/java/org/apache/accumulo/test/functional/CreateAndUseTest.java Fri Jun 14 21:19:23 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 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 entry : bs) { Modified: accumulo/trunk/test/src/main/java/org/apache/accumulo/test/functional/CreateManyScannersTest.java URL: http://svn.apache.org/viewvc/accumulo/trunk/test/src/main/java/org/apache/accumulo/test/functional/CreateManyScannersTest.java?rev=1493250&r1=1493249&r2=1493250&view=diff ============================================================================== --- accumulo/trunk/test/src/main/java/org/apache/accumulo/test/functional/CreateManyScannersTest.java (original) +++ accumulo/trunk/test/src/main/java/org/apache/accumulo/test/functional/CreateManyScannersTest.java Fri Jun 14 21:19:23 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/trunk/test/src/main/java/org/apache/accumulo/test/functional/DeleteEverythingTest.java URL: http://svn.apache.org/viewvc/accumulo/trunk/test/src/main/java/org/apache/accumulo/test/functional/DeleteEverythingTest.java?rev=1493250&r1=1493249&r2=1493250&view=diff ============================================================================== --- accumulo/trunk/test/src/main/java/org/apache/accumulo/test/functional/DeleteEverythingTest.java (original) +++ accumulo/trunk/test/src/main/java/org/apache/accumulo/test/functional/DeleteEverythingTest.java Fri Jun 14 21:19:23 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/trunk/test/src/main/java/org/apache/accumulo/test/functional/DeleteRowsSplitTest.java URL: http://svn.apache.org/viewvc/accumulo/trunk/test/src/main/java/org/apache/accumulo/test/functional/DeleteRowsSplitTest.java?rev=1493250&r1=1493249&r2=1493250&view=diff ============================================================================== --- accumulo/trunk/test/src/main/java/org/apache/accumulo/test/functional/DeleteRowsSplitTest.java (original) +++ accumulo/trunk/test/src/main/java/org/apache/accumulo/test/functional/DeleteRowsSplitTest.java Fri Jun 14 21:19:23 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 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/trunk/test/src/main/java/org/apache/accumulo/test/functional/DeleteRowsTest.java URL: http://svn.apache.org/viewvc/accumulo/trunk/test/src/main/java/org/apache/accumulo/test/functional/DeleteRowsTest.java?rev=1493250&r1=1493249&r2=1493250&view=diff ============================================================================== --- accumulo/trunk/test/src/main/java/org/apache/accumulo/test/functional/DeleteRowsTest.java (original) +++ accumulo/trunk/test/src/main/java/org/apache/accumulo/test/functional/DeleteRowsTest.java Fri Jun 14 21:19:23 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 entry : scanner) { Text row = entry.getKey().getRow(); Modified: accumulo/trunk/test/src/main/java/org/apache/accumulo/test/functional/FunctionalTest.java URL: http://svn.apache.org/viewvc/accumulo/trunk/test/src/main/java/org/apache/accumulo/test/functional/FunctionalTest.java?rev=1493250&r1=1493249&r2=1493250&view=diff ============================================================================== --- accumulo/trunk/test/src/main/java/org/apache/accumulo/test/functional/FunctionalTest.java (original) +++ accumulo/trunk/test/src/main/java/org/apache/accumulo/test/functional/FunctionalTest.java Fri Jun 14 21:19:23 2013 @@ -41,6 +41,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.security.CredentialHelper; import org.apache.accumulo.server.cli.ClientOpts; import org.apache.accumulo.server.conf.ServerConfiguration; @@ -189,7 +190,7 @@ 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(Constants.METADATA_TABLE_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); Modified: accumulo/trunk/test/src/main/java/org/apache/accumulo/test/functional/LargeRowTest.java URL: http://svn.apache.org/viewvc/accumulo/trunk/test/src/main/java/org/apache/accumulo/test/functional/LargeRowTest.java?rev=1493250&r1=1493249&r2=1493250&view=diff ============================================================================== --- accumulo/trunk/test/src/main/java/org/apache/accumulo/test/functional/LargeRowTest.java (original) +++ accumulo/trunk/test/src/main/java/org/apache/accumulo/test/functional/LargeRowTest.java Fri Jun 14 21:19:23 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 * 2); 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/trunk/test/src/main/java/org/apache/accumulo/test/functional/LogicalTimeTest.java URL: http://svn.apache.org/viewvc/accumulo/trunk/test/src/main/java/org/apache/accumulo/test/functional/LogicalTimeTest.java?rev=1493250&r1=1493249&r2=1493250&view=diff ============================================================================== --- accumulo/trunk/test/src/main/java/org/apache/accumulo/test/functional/LogicalTimeTest.java (original) +++ accumulo/trunk/test/src/main/java/org/apache/accumulo/test/functional/LogicalTimeTest.java Fri Jun 14 21:19:23 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/trunk/test/src/main/java/org/apache/accumulo/test/functional/MergeTest.java URL: http://svn.apache.org/viewvc/accumulo/trunk/test/src/main/java/org/apache/accumulo/test/functional/MergeTest.java?rev=1493250&r1=1493249&r2=1493250&view=diff ============================================================================== --- accumulo/trunk/test/src/main/java/org/apache/accumulo/test/functional/MergeTest.java (original) +++ accumulo/trunk/test/src/main/java/org/apache/accumulo/test/functional/MergeTest.java Fri Jun 14 21:19:23 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 splitSet = new TreeSet(); @@ -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 observed = new HashSet(); for (Entry entry : scanner) { Modified: accumulo/trunk/test/src/main/java/org/apache/accumulo/test/functional/PermissionsTest.java URL: http://svn.apache.org/viewvc/accumulo/trunk/test/src/main/java/org/apache/accumulo/test/functional/PermissionsTest.java?rev=1493250&r1=1493249&r2=1493250&view=diff ============================================================================== --- accumulo/trunk/test/src/main/java/org/apache/accumulo/test/functional/PermissionsTest.java (original) +++ accumulo/trunk/test/src/main/java/org/apache/accumulo/test/functional/PermissionsTest.java Fri Jun 14 21:19:23 2013 @@ -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 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> iter = scanner.iterator(); while (iter.hasNext()) iter.next(); Modified: accumulo/trunk/test/src/main/java/org/apache/accumulo/test/functional/RowDeleteTest.java URL: http://svn.apache.org/viewvc/accumulo/trunk/test/src/main/java/org/apache/accumulo/test/functional/RowDeleteTest.java?rev=1493250&r1=1493249&r2=1493250&view=diff ============================================================================== --- accumulo/trunk/test/src/main/java/org/apache/accumulo/test/functional/RowDeleteTest.java (original) +++ accumulo/trunk/test/src/main/java/org/apache/accumulo/test/functional/RowDeleteTest.java Fri Jun 14 21:19:23 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 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 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 entry : scanner) { count++; Modified: accumulo/trunk/test/src/main/java/org/apache/accumulo/test/functional/ScanRangeTest.java URL: http://svn.apache.org/viewvc/accumulo/trunk/test/src/main/java/org/apache/accumulo/test/functional/ScanRangeTest.java?rev=1493250&r1=1493249&r2=1493250&view=diff ============================================================================== --- accumulo/trunk/test/src/main/java/org/apache/accumulo/test/functional/ScanRangeTest.java (original) +++ accumulo/trunk/test/src/main/java/org/apache/accumulo/test/functional/ScanRangeTest.java Fri Jun 14 21:19:23 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/trunk/test/src/main/java/org/apache/accumulo/test/functional/ServerSideErrorTest.java URL: http://svn.apache.org/viewvc/accumulo/trunk/test/src/main/java/org/apache/accumulo/test/functional/ServerSideErrorTest.java?rev=1493250&r1=1493249&r2=1493250&view=diff ============================================================================== --- accumulo/trunk/test/src/main/java/org/apache/accumulo/test/functional/ServerSideErrorTest.java (original) +++ accumulo/trunk/test/src/main/java/org/apache/accumulo/test/functional/ServerSideErrorTest.java Fri Jun 14 21:19:23 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 entry : scanner) { entry.getKey(); } Modified: accumulo/trunk/test/src/main/java/org/apache/accumulo/test/functional/SparseColumnFamilyTest.java URL: http://svn.apache.org/viewvc/accumulo/trunk/test/src/main/java/org/apache/accumulo/test/functional/SparseColumnFamilyTest.java?rev=1493250&r1=1493249&r2=1493250&view=diff ============================================================================== --- accumulo/trunk/test/src/main/java/org/apache/accumulo/test/functional/SparseColumnFamilyTest.java (original) +++ accumulo/trunk/test/src/main/java/org/apache/accumulo/test/functional/SparseColumnFamilyTest.java Fri Jun 14 21:19:23 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/trunk/test/src/main/java/org/apache/accumulo/test/functional/SplitRecoveryTest.java URL: http://svn.apache.org/viewvc/accumulo/trunk/test/src/main/java/org/apache/accumulo/test/functional/SplitRecoveryTest.java?rev=1493250&r1=1493249&r2=1493250&view=diff ============================================================================== --- accumulo/trunk/test/src/main/java/org/apache/accumulo/test/functional/SplitRecoveryTest.java (original) +++ accumulo/trunk/test/src/main/java/org/apache/accumulo/test/functional/SplitRecoveryTest.java Fri Jun 14 21:19:23 2013 @@ -37,6 +37,7 @@ import org.apache.accumulo.core.data.Mut 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; @@ -180,20 +181,19 @@ public class SplitRecoveryTest extends F 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 lowBulkFiles = MetadataTable.getBulkFilesLoaded(SecurityConstants.getSystemCredentials(), low); Map 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); } @@ -204,7 +204,7 @@ public class SplitRecoveryTest extends F private void ensureTabletHasNoUnexpectedMetadataEntries(KeyExtent extent, SortedMap expectedMapFiles) throws Exception { Scanner scanner = new ScannerImpl(HdfsZooInstance.getInstance(), SecurityConstants.getSystemCredentials(), Constants.METADATA_TABLE_ID, - Constants.NO_AUTHS); + Authorizations.EMPTY); scanner.setRange(extent.toMetadataRange()); HashSet expectedColumns = new HashSet(); Modified: accumulo/trunk/test/src/main/java/org/apache/accumulo/test/functional/TimeoutTest.java URL: http://svn.apache.org/viewvc/accumulo/trunk/test/src/main/java/org/apache/accumulo/test/functional/TimeoutTest.java?rev=1493250&r1=1493249&r2=1493250&view=diff ============================================================================== --- accumulo/trunk/test/src/main/java/org/apache/accumulo/test/functional/TimeoutTest.java (original) +++ accumulo/trunk/test/src/main/java/org/apache/accumulo/test/functional/TimeoutTest.java Fri Jun 14 21:19:23 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 entry : bs) { entry.getKey(); @@ -120,7 +120,7 @@ public class TimeoutTest extends Functio } catch (TimedOutException toe) { // toe.printStackTrace(); } - + bs.close(); } Modified: accumulo/trunk/test/src/main/java/org/apache/accumulo/test/performance/metadata/MetadataBatchScanTest.java URL: http://svn.apache.org/viewvc/accumulo/trunk/test/src/main/java/org/apache/accumulo/test/performance/metadata/MetadataBatchScanTest.java?rev=1493250&r1=1493249&r2=1493250&view=diff ============================================================================== --- accumulo/trunk/test/src/main/java/org/apache/accumulo/test/performance/metadata/MetadataBatchScanTest.java (original) +++ accumulo/trunk/test/src/main/java/org/apache/accumulo/test/performance/metadata/MetadataBatchScanTest.java Fri Jun 14 21:19:23 2013 @@ -36,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.AddressUtil; import org.apache.accumulo.core.util.Stat; import org.apache.accumulo.server.master.state.TServerInstance; @@ -169,7 +170,7 @@ public class MetadataBatchScanTest { * Constants.METADATA_LOCATION_COLUMN); ColumnFQ.fetch(scanner, Constants.METADATA_PREV_ROW_COLUMN); */ - BatchScanner bs = connector.createBatchScanner(Constants.METADATA_TABLE_NAME, Constants.NO_AUTHS, 1); + BatchScanner bs = connector.createBatchScanner(Constants.METADATA_TABLE_NAME, Authorizations.EMPTY, 1); bs.fetchColumnFamily(Constants.METADATA_CURRENT_LOCATION_COLUMN_FAMILY); Constants.METADATA_PREV_ROW_COLUMN.fetch(bs); Modified: accumulo/trunk/test/src/main/java/org/apache/accumulo/test/performance/thrift/NullTserver.java URL: http://svn.apache.org/viewvc/accumulo/trunk/test/src/main/java/org/apache/accumulo/test/performance/thrift/NullTserver.java?rev=1493250&r1=1493249&r2=1493250&view=diff ============================================================================== --- accumulo/trunk/test/src/main/java/org/apache/accumulo/test/performance/thrift/NullTserver.java (original) +++ accumulo/trunk/test/src/main/java/org/apache/accumulo/test/performance/thrift/NullTserver.java Fri Jun 14 21:19:23 2013 @@ -71,7 +71,6 @@ import org.apache.thrift.TException; import com.beust.jcommander.Parameter; - /** * The purpose of this class is to server as fake tserver that is a data sink like /dev/null. NullTserver modifies the !METADATA location entries for a table to * point to it. This allows thrift performance to be measured by running any client code that writes to a table. @@ -98,7 +97,7 @@ public class NullTserver { @Override public UpdateErrors closeUpdate(TInfo tinfo, long updateID) { - return new UpdateErrors(new HashMap(), new ArrayList(), new HashMap()); + return new UpdateErrors(new HashMap(), new ArrayList(), new HashMap()); } @Override @@ -194,15 +193,8 @@ public class NullTserver { } - /* - * (non-Javadoc) - * - * @see org.apache.accumulo.core.tabletserver.thrift.TabletClientService.Iface#removeLogs(org.apache.accumulo.trace.thrift.TInfo, - * org.apache.accumulo.core.security.thrift.Credentials, java.util.List) - */ @Override - public void removeLogs(TInfo tinfo, TCredentials credentials, List filenames) throws TException { - } + public void removeLogs(TInfo tinfo, TCredentials credentials, List filenames) throws TException {} @Override public List getActiveCompactions(TInfo tinfo, TCredentials credentials) throws ThriftSecurityException, TException { @@ -211,13 +203,13 @@ public class NullTserver { } static class Opts extends Help { - @Parameter(names={"-i", "--instance"}, description="instance name", required=true) + @Parameter(names = {"-i", "--instance"}, description = "instance name", required = true) String iname = null; - @Parameter(names={"-z", "--keepers"}, description="comma-separated list of zookeeper host:ports", required=true) + @Parameter(names = {"-z", "--keepers"}, description = "comma-separated list of zookeeper host:ports", required = true) String keepers = null; - @Parameter(names="--table", description="table to adopt", required=true) + @Parameter(names = "--table", description = "table to adopt", required = true) String tableName = null; - @Parameter(names="--port", description="port number to use") + @Parameter(names = "--port", description = "port number to use") int port = DefaultConfiguration.getInstance().getPort(Property.TSERV_CLIENTPORT); } @@ -228,7 +220,7 @@ public class NullTserver { TransactionWatcher watcher = new TransactionWatcher(); ThriftClientHandler tch = new ThriftClientHandler(HdfsZooInstance.getInstance(), watcher); Processor processor = new Processor(tch); - TServerUtils.startTServer(opts.port, processor, "NullTServer", "null tserver", 2, 1000, 10*1024*1024); + TServerUtils.startTServer(opts.port, processor, "NullTServer", "null tserver", 2, 1000, 10 * 1024 * 1024); InetSocketAddress addr = new InetSocketAddress(InetAddress.getLocalHost(), opts.port); Modified: accumulo/trunk/test/src/main/java/org/apache/accumulo/test/randomwalk/concurrent/BatchScan.java URL: http://svn.apache.org/viewvc/accumulo/trunk/test/src/main/java/org/apache/accumulo/test/randomwalk/concurrent/BatchScan.java?rev=1493250&r1=1493249&r2=1493250&view=diff ============================================================================== --- accumulo/trunk/test/src/main/java/org/apache/accumulo/test/randomwalk/concurrent/BatchScan.java (original) +++ accumulo/trunk/test/src/main/java/org/apache/accumulo/test/randomwalk/concurrent/BatchScan.java Fri Jun 14 21:19:23 2013 @@ -23,7 +23,6 @@ import java.util.Map.Entry; import java.util.Properties; import java.util.Random; -import org.apache.accumulo.core.Constants; import org.apache.accumulo.core.client.AccumuloSecurityException; import org.apache.accumulo.core.client.BatchScanner; import org.apache.accumulo.core.client.Connector; @@ -33,6 +32,7 @@ import org.apache.accumulo.core.client.T 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.test.randomwalk.State; import org.apache.accumulo.test.randomwalk.Test; @@ -50,7 +50,7 @@ public class BatchScan extends Test { String tableName = tableNames.get(rand.nextInt(tableNames.size())); try { - BatchScanner bs = conn.createBatchScanner(tableName, Constants.NO_AUTHS, 3); + BatchScanner bs = conn.createBatchScanner(tableName, Authorizations.EMPTY, 3); List ranges = new ArrayList(); for (int i = 0; i < rand.nextInt(2000) + 1; i++) ranges.add(new Range(String.format("%016x", (rand.nextLong() & 0x7fffffffffffffffl)))); Modified: accumulo/trunk/test/src/main/java/org/apache/accumulo/test/randomwalk/concurrent/CheckBalance.java URL: http://svn.apache.org/viewvc/accumulo/trunk/test/src/main/java/org/apache/accumulo/test/randomwalk/concurrent/CheckBalance.java?rev=1493250&r1=1493249&r2=1493250&view=diff ============================================================================== --- accumulo/trunk/test/src/main/java/org/apache/accumulo/test/randomwalk/concurrent/CheckBalance.java (original) +++ accumulo/trunk/test/src/main/java/org/apache/accumulo/test/randomwalk/concurrent/CheckBalance.java Fri Jun 14 21:19:23 2013 @@ -25,6 +25,7 @@ import org.apache.accumulo.core.Constant import org.apache.accumulo.core.client.Scanner; import org.apache.accumulo.core.data.Key; import org.apache.accumulo.core.data.Value; +import org.apache.accumulo.core.security.Authorizations; import org.apache.accumulo.test.randomwalk.State; import org.apache.accumulo.test.randomwalk.Test; @@ -35,15 +36,12 @@ public class CheckBalance extends Test { private static final String LAST_UNBALANCED_TIME = "lastUnbalancedTime"; private static final String UNBALANCED_COUNT = "unbalancedCount"; - - /* (non-Javadoc) - * @see org.apache.accumulo.test.randomwalk.Node#visit(org.apache.accumulo.test.randomwalk.State, java.util.Properties) - */ + @Override public void visit(State state, Properties props) throws Exception { log.debug("checking balance"); Map counts = new HashMap(); - Scanner scanner = state.getConnector().createScanner(Constants.METADATA_TABLE_NAME, Constants.NO_AUTHS); + Scanner scanner = state.getConnector().createScanner(Constants.METADATA_TABLE_NAME, Authorizations.EMPTY); scanner.fetchColumnFamily(Constants.METADATA_CURRENT_LOCATION_COLUMN_FAMILY); for (Entry entry : scanner) { String location = entry.getKey().getColumnQualifier().toString(); Modified: accumulo/trunk/test/src/main/java/org/apache/accumulo/test/randomwalk/concurrent/IsolatedScan.java URL: http://svn.apache.org/viewvc/accumulo/trunk/test/src/main/java/org/apache/accumulo/test/randomwalk/concurrent/IsolatedScan.java?rev=1493250&r1=1493249&r2=1493250&view=diff ============================================================================== --- accumulo/trunk/test/src/main/java/org/apache/accumulo/test/randomwalk/concurrent/IsolatedScan.java (original) +++ accumulo/trunk/test/src/main/java/org/apache/accumulo/test/randomwalk/concurrent/IsolatedScan.java Fri Jun 14 21:19:23 2013 @@ -21,7 +21,6 @@ import java.util.Map.Entry; import java.util.Properties; import java.util.Random; -import org.apache.accumulo.core.Constants; import org.apache.accumulo.core.client.Connector; import org.apache.accumulo.core.client.IsolatedScanner; import org.apache.accumulo.core.client.RowIterator; @@ -30,6 +29,7 @@ import org.apache.accumulo.core.client.T import org.apache.accumulo.core.client.TableOfflineException; import org.apache.accumulo.core.data.Key; import org.apache.accumulo.core.data.Value; +import org.apache.accumulo.core.security.Authorizations; import org.apache.accumulo.core.util.PeekingIterator; import org.apache.accumulo.test.randomwalk.State; import org.apache.accumulo.test.randomwalk.Test; @@ -48,7 +48,7 @@ public class IsolatedScan extends Test { String tableName = tableNames.get(rand.nextInt(tableNames.size())); try { - RowIterator iter = new RowIterator(new IsolatedScanner(conn.createScanner(tableName, Constants.NO_AUTHS))); + RowIterator iter = new RowIterator(new IsolatedScanner(conn.createScanner(tableName, Authorizations.EMPTY))); while (iter.hasNext()) { PeekingIterator> row = new PeekingIterator>(iter.next()); Modified: accumulo/trunk/test/src/main/java/org/apache/accumulo/test/randomwalk/concurrent/ScanTable.java URL: http://svn.apache.org/viewvc/accumulo/trunk/test/src/main/java/org/apache/accumulo/test/randomwalk/concurrent/ScanTable.java?rev=1493250&r1=1493249&r2=1493250&view=diff ============================================================================== --- accumulo/trunk/test/src/main/java/org/apache/accumulo/test/randomwalk/concurrent/ScanTable.java (original) +++ accumulo/trunk/test/src/main/java/org/apache/accumulo/test/randomwalk/concurrent/ScanTable.java Fri Jun 14 21:19:23 2013 @@ -22,7 +22,6 @@ import java.util.Map.Entry; import java.util.Properties; import java.util.Random; -import org.apache.accumulo.core.Constants; import org.apache.accumulo.core.client.AccumuloSecurityException; import org.apache.accumulo.core.client.Connector; import org.apache.accumulo.core.client.Scanner; @@ -31,6 +30,7 @@ import org.apache.accumulo.core.client.T import org.apache.accumulo.core.client.TableOfflineException; import org.apache.accumulo.core.data.Key; import org.apache.accumulo.core.data.Value; +import org.apache.accumulo.core.security.Authorizations; import org.apache.accumulo.test.randomwalk.State; import org.apache.accumulo.test.randomwalk.Test; @@ -48,7 +48,7 @@ public class ScanTable extends Test { String tableName = tableNames.get(rand.nextInt(tableNames.size())); try { - Scanner scanner = conn.createScanner(tableName, Constants.NO_AUTHS); + Scanner scanner = conn.createScanner(tableName, Authorizations.EMPTY); Iterator> iter = scanner.iterator(); while (iter.hasNext()) { iter.next(); Modified: accumulo/trunk/test/src/main/java/org/apache/accumulo/test/randomwalk/image/ScanMeta.java URL: http://svn.apache.org/viewvc/accumulo/trunk/test/src/main/java/org/apache/accumulo/test/randomwalk/image/ScanMeta.java?rev=1493250&r1=1493249&r2=1493250&view=diff ============================================================================== --- accumulo/trunk/test/src/main/java/org/apache/accumulo/test/randomwalk/image/ScanMeta.java (original) +++ accumulo/trunk/test/src/main/java/org/apache/accumulo/test/randomwalk/image/ScanMeta.java Fri Jun 14 21:19:23 2013 @@ -25,7 +25,6 @@ import java.util.ArrayList; import java.util.Properties; import java.util.UUID; -import org.apache.accumulo.core.Constants; import org.apache.accumulo.core.client.BatchScanner; import org.apache.accumulo.core.client.Connector; import org.apache.accumulo.core.client.Scanner; @@ -79,7 +78,7 @@ public class ScanMeta extends Test { log.debug("Found " + hashes.size() + " hashes starting at " + uuid); // use batch scanner to verify all of these exist in index - BatchScanner indexScanner = conn.createBatchScanner(indexTableName, Constants.NO_AUTHS, 3); + BatchScanner indexScanner = conn.createBatchScanner(indexTableName, Authorizations.EMPTY, 3); ArrayList ranges = new ArrayList(); for (Text row : hashes.keySet()) { ranges.add(new Range(row)); Modified: accumulo/trunk/test/src/main/java/org/apache/accumulo/test/randomwalk/multitable/CopyTool.java URL: http://svn.apache.org/viewvc/accumulo/trunk/test/src/main/java/org/apache/accumulo/test/randomwalk/multitable/CopyTool.java?rev=1493250&r1=1493249&r2=1493250&view=diff ============================================================================== --- accumulo/trunk/test/src/main/java/org/apache/accumulo/test/randomwalk/multitable/CopyTool.java (original) +++ accumulo/trunk/test/src/main/java/org/apache/accumulo/test/randomwalk/multitable/CopyTool.java Fri Jun 14 21:19:23 2013 @@ -18,13 +18,13 @@ package org.apache.accumulo.test.randomw import java.io.IOException; -import org.apache.accumulo.core.Constants; import org.apache.accumulo.core.client.mapreduce.AccumuloInputFormat; import org.apache.accumulo.core.client.mapreduce.AccumuloOutputFormat; import org.apache.accumulo.core.client.security.tokens.PasswordToken; 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.conf.Configured; import org.apache.hadoop.io.Text; import org.apache.hadoop.mapreduce.Job; @@ -57,7 +57,7 @@ public class CopyTool extends Configured job.setInputFormatClass(AccumuloInputFormat.class); AccumuloInputFormat.setConnectorInfo(job, args[0], new PasswordToken(args[1])); AccumuloInputFormat.setInputTableName(job, args[2]); - AccumuloInputFormat.setScanAuthorizations(job, Constants.NO_AUTHS); + AccumuloInputFormat.setScanAuthorizations(job, Authorizations.EMPTY); AccumuloInputFormat.setZooKeeperInstance(job, args[3], args[4]); job.setMapperClass(SeqMapClass.class); Modified: accumulo/trunk/test/src/main/java/org/apache/accumulo/test/randomwalk/sequential/MapRedVerify.java URL: http://svn.apache.org/viewvc/accumulo/trunk/test/src/main/java/org/apache/accumulo/test/randomwalk/sequential/MapRedVerify.java?rev=1493250&r1=1493249&r2=1493250&view=diff ============================================================================== --- accumulo/trunk/test/src/main/java/org/apache/accumulo/test/randomwalk/sequential/MapRedVerify.java (original) +++ accumulo/trunk/test/src/main/java/org/apache/accumulo/test/randomwalk/sequential/MapRedVerify.java Fri Jun 14 21:19:23 2013 @@ -19,12 +19,12 @@ package org.apache.accumulo.test.randomw import java.util.Properties; import java.util.Map.Entry; -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.core.util.CachedConfiguration; import org.apache.accumulo.test.randomwalk.State; import org.apache.accumulo.test.randomwalk.Test; @@ -50,7 +50,7 @@ public class MapRedVerify extends Test { return; } - Scanner outputScanner = state.getConnector().createScanner(args[7], Constants.NO_AUTHS); + Scanner outputScanner = state.getConnector().createScanner(args[7], Authorizations.EMPTY); outputScanner.setRange(new Range()); int count = 0; Modified: accumulo/trunk/test/src/main/java/org/apache/accumulo/test/randomwalk/shard/DeleteSomeDocs.java URL: http://svn.apache.org/viewvc/accumulo/trunk/test/src/main/java/org/apache/accumulo/test/randomwalk/shard/DeleteSomeDocs.java?rev=1493250&r1=1493249&r2=1493250&view=diff ============================================================================== --- accumulo/trunk/test/src/main/java/org/apache/accumulo/test/randomwalk/shard/DeleteSomeDocs.java (original) +++ accumulo/trunk/test/src/main/java/org/apache/accumulo/test/randomwalk/shard/DeleteSomeDocs.java Fri Jun 14 21:19:23 2013 @@ -21,12 +21,12 @@ import java.util.Collections; import java.util.Properties; import java.util.Random; -import org.apache.accumulo.core.Constants; import org.apache.accumulo.core.client.BatchDeleter; import org.apache.accumulo.core.client.BatchWriterConfig; import org.apache.accumulo.core.client.IteratorSetting; import org.apache.accumulo.core.data.Range; import org.apache.accumulo.core.iterators.user.RegExFilter; +import org.apache.accumulo.core.security.Authorizations; import org.apache.accumulo.test.randomwalk.State; import org.apache.accumulo.test.randomwalk.Test; @@ -50,7 +50,7 @@ public class DeleteSomeDocs extends Test String pattern = patterns.get(rand.nextInt(patterns.size())); BatchWriterConfig bwc = new BatchWriterConfig(); - BatchDeleter ibd = state.getConnector().createBatchDeleter(indexTableName, Constants.NO_AUTHS, 8, bwc); + BatchDeleter ibd = state.getConnector().createBatchDeleter(indexTableName, Authorizations.EMPTY, 8, bwc); ibd.setRanges(Collections.singletonList(new Range())); IteratorSetting iterSettings = new IteratorSetting(100, RegExFilter.class); @@ -62,7 +62,7 @@ public class DeleteSomeDocs extends Test ibd.close(); - BatchDeleter dbd = state.getConnector().createBatchDeleter(dataTableName, Constants.NO_AUTHS, 8, bwc); + BatchDeleter dbd = state.getConnector().createBatchDeleter(dataTableName, Authorizations.EMPTY, 8, bwc); dbd.setRanges(Collections.singletonList(new Range())); iterSettings = new IteratorSetting(100, RegExFilter.class); Modified: accumulo/trunk/test/src/main/java/org/apache/accumulo/test/randomwalk/shard/DeleteWord.java URL: http://svn.apache.org/viewvc/accumulo/trunk/test/src/main/java/org/apache/accumulo/test/randomwalk/shard/DeleteWord.java?rev=1493250&r1=1493249&r2=1493250&view=diff ============================================================================== --- accumulo/trunk/test/src/main/java/org/apache/accumulo/test/randomwalk/shard/DeleteWord.java (original) +++ accumulo/trunk/test/src/main/java/org/apache/accumulo/test/randomwalk/shard/DeleteWord.java Fri Jun 14 21:19:23 2013 @@ -21,7 +21,6 @@ import java.util.Properties; 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.Scanner; @@ -29,6 +28,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.test.randomwalk.State; import org.apache.accumulo.test.randomwalk.Test; import org.apache.hadoop.io.Text; @@ -50,7 +50,7 @@ public class DeleteWord extends Test { String wordToDelete = Insert.generateRandomWord(rand); // use index to find all documents containing word - Scanner scanner = state.getConnector().createScanner(indexTableName, Constants.NO_AUTHS); + Scanner scanner = state.getConnector().createScanner(indexTableName, Authorizations.EMPTY); scanner.fetchColumnFamily(new Text(wordToDelete)); ArrayList documentsToDelete = new ArrayList(); @@ -60,7 +60,7 @@ public class DeleteWord extends Test { if (documentsToDelete.size() > 0) { // use a batch scanner to fetch all documents - BatchScanner bscanner = state.getConnector().createBatchScanner(docTableName, Constants.NO_AUTHS, 8); + BatchScanner bscanner = state.getConnector().createBatchScanner(docTableName, Authorizations.EMPTY, 8); bscanner.setRanges(documentsToDelete); BatchWriter ibw = state.getMultiTableBatchWriter().getBatchWriter(indexTableName); Modified: accumulo/trunk/test/src/main/java/org/apache/accumulo/test/randomwalk/shard/Grep.java URL: http://svn.apache.org/viewvc/accumulo/trunk/test/src/main/java/org/apache/accumulo/test/randomwalk/shard/Grep.java?rev=1493250&r1=1493249&r2=1493250&view=diff ============================================================================== --- accumulo/trunk/test/src/main/java/org/apache/accumulo/test/randomwalk/shard/Grep.java (original) +++ accumulo/trunk/test/src/main/java/org/apache/accumulo/test/randomwalk/shard/Grep.java Fri Jun 14 21:19:23 2013 @@ -23,7 +23,6 @@ import java.util.Map.Entry; import java.util.Properties; import java.util.Random; -import org.apache.accumulo.core.Constants; import org.apache.accumulo.core.client.BatchScanner; import org.apache.accumulo.core.client.IteratorSetting; import org.apache.accumulo.core.data.Key; @@ -31,6 +30,7 @@ import org.apache.accumulo.core.data.Ran import org.apache.accumulo.core.data.Value; import org.apache.accumulo.core.iterators.user.IntersectingIterator; import org.apache.accumulo.core.iterators.user.RegExFilter; +import org.apache.accumulo.core.security.Authorizations; import org.apache.accumulo.test.randomwalk.State; import org.apache.accumulo.test.randomwalk.Test; import org.apache.hadoop.io.Text; @@ -52,7 +52,7 @@ public class Grep extends Test { words[i] = new Text(Insert.generateRandomWord(rand)); } - BatchScanner bs = state.getConnector().createBatchScanner(indexTableName, Constants.NO_AUTHS, 16); + BatchScanner bs = state.getConnector().createBatchScanner(indexTableName, Authorizations.EMPTY, 16); IteratorSetting ii = new IteratorSetting(20, "ii", IntersectingIterator.class.getName()); IntersectingIterator.setColumnFamilies(ii, words); bs.addScanIterator(ii); @@ -66,7 +66,7 @@ public class Grep extends Test { bs.close(); - bs = state.getConnector().createBatchScanner(dataTableName, Constants.NO_AUTHS, 16); + bs = state.getConnector().createBatchScanner(dataTableName, Authorizations.EMPTY, 16); for (int i = 0; i < words.length; i++) { IteratorSetting more = new IteratorSetting(20 + i, "ii" + i, RegExFilter.class); Modified: accumulo/trunk/test/src/main/java/org/apache/accumulo/test/randomwalk/shard/Reindex.java URL: http://svn.apache.org/viewvc/accumulo/trunk/test/src/main/java/org/apache/accumulo/test/randomwalk/shard/Reindex.java?rev=1493250&r1=1493249&r2=1493250&view=diff ============================================================================== --- accumulo/trunk/test/src/main/java/org/apache/accumulo/test/randomwalk/shard/Reindex.java (original) +++ accumulo/trunk/test/src/main/java/org/apache/accumulo/test/randomwalk/shard/Reindex.java Fri Jun 14 21:19:23 2013 @@ -20,12 +20,12 @@ import java.util.Map.Entry; import java.util.Properties; import java.util.Random; -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.Value; +import org.apache.accumulo.core.security.Authorizations; import org.apache.accumulo.test.randomwalk.State; import org.apache.accumulo.test.randomwalk.Test; @@ -42,7 +42,7 @@ public class Reindex extends Test { ShardFixture.createIndexTable(this.log, state, "_tmp", rand); - Scanner scanner = state.getConnector().createScanner(docTableName, Constants.NO_AUTHS); + Scanner scanner = state.getConnector().createScanner(docTableName, Authorizations.EMPTY); BatchWriter tbw = state.getConnector().createBatchWriter(tmpIndexTableName, new BatchWriterConfig()); int count = 0; Modified: accumulo/trunk/test/src/main/java/org/apache/accumulo/test/randomwalk/shard/Search.java URL: http://svn.apache.org/viewvc/accumulo/trunk/test/src/main/java/org/apache/accumulo/test/randomwalk/shard/Search.java?rev=1493250&r1=1493249&r2=1493250&view=diff ============================================================================== --- accumulo/trunk/test/src/main/java/org/apache/accumulo/test/randomwalk/shard/Search.java (original) +++ accumulo/trunk/test/src/main/java/org/apache/accumulo/test/randomwalk/shard/Search.java Fri Jun 14 21:19:23 2013 @@ -23,7 +23,6 @@ import java.util.Properties; 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.IteratorSetting; import org.apache.accumulo.core.client.Scanner; @@ -31,6 +30,7 @@ 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.iterators.user.IntersectingIterator; +import org.apache.accumulo.core.security.Authorizations; import org.apache.accumulo.test.randomwalk.State; import org.apache.accumulo.test.randomwalk.Test; import org.apache.hadoop.io.Text; @@ -68,7 +68,7 @@ public class Search extends Test { log.debug("Looking up terms " + searchTerms + " expect to find " + docID); - BatchScanner bs = state.getConnector().createBatchScanner(indexTableName, Constants.NO_AUTHS, 10); + BatchScanner bs = state.getConnector().createBatchScanner(indexTableName, Authorizations.EMPTY, 10); IteratorSetting ii = new IteratorSetting(20, "ii", IntersectingIterator.class); IntersectingIterator.setColumnFamilies(ii, columns); bs.addScanIterator(ii); @@ -90,7 +90,7 @@ public class Search extends Test { } static Entry findRandomDocument(State state, String dataTableName, Random rand) throws Exception { - Scanner scanner = state.getConnector().createScanner(dataTableName, Constants.NO_AUTHS); + Scanner scanner = state.getConnector().createScanner(dataTableName, Authorizations.EMPTY); scanner.setBatchSize(1); scanner.setRange(new Range(Integer.toString(rand.nextInt(0xfffffff), 16), null)); Modified: accumulo/trunk/test/src/main/java/org/apache/accumulo/test/randomwalk/shard/VerifyIndex.java URL: http://svn.apache.org/viewvc/accumulo/trunk/test/src/main/java/org/apache/accumulo/test/randomwalk/shard/VerifyIndex.java?rev=1493250&r1=1493249&r2=1493250&view=diff ============================================================================== --- accumulo/trunk/test/src/main/java/org/apache/accumulo/test/randomwalk/shard/VerifyIndex.java (original) +++ accumulo/trunk/test/src/main/java/org/apache/accumulo/test/randomwalk/shard/VerifyIndex.java Fri Jun 14 21:19:23 2013 @@ -20,11 +20,11 @@ import java.util.Iterator; import java.util.Map.Entry; import java.util.Properties; -import org.apache.accumulo.core.Constants; import org.apache.accumulo.core.client.Scanner; import org.apache.accumulo.core.data.Key; import org.apache.accumulo.core.data.PartialKey; import org.apache.accumulo.core.data.Value; +import org.apache.accumulo.core.security.Authorizations; import org.apache.accumulo.test.randomwalk.State; import org.apache.accumulo.test.randomwalk.Test; @@ -37,8 +37,8 @@ public class VerifyIndex extends Test { String tmpIndexTableName = indexTableName + "_tmp"; // scan new and old index and verify identical - Scanner indexScanner1 = state.getConnector().createScanner(tmpIndexTableName, Constants.NO_AUTHS); - Scanner indexScanner2 = state.getConnector().createScanner(indexTableName, Constants.NO_AUTHS); + Scanner indexScanner1 = state.getConnector().createScanner(tmpIndexTableName, Authorizations.EMPTY); + Scanner indexScanner2 = state.getConnector().createScanner(indexTableName, Authorizations.EMPTY); Iterator> iter = indexScanner2.iterator(); Modified: accumulo/trunk/test/src/test/java/org/apache/accumulo/test/ShellServerTest.java URL: http://svn.apache.org/viewvc/accumulo/trunk/test/src/test/java/org/apache/accumulo/test/ShellServerTest.java?rev=1493250&r1=1493249&r2=1493250&view=diff ============================================================================== --- accumulo/trunk/test/src/test/java/org/apache/accumulo/test/ShellServerTest.java (original) +++ accumulo/trunk/test/src/test/java/org/apache/accumulo/test/ShellServerTest.java Fri Jun 14 21:19:23 2013 @@ -42,6 +42,7 @@ import org.apache.accumulo.core.data.Key import org.apache.accumulo.core.data.Value; import org.apache.accumulo.core.file.FileOperations; import org.apache.accumulo.core.file.FileSKVWriter; +import org.apache.accumulo.core.security.Authorizations; import org.apache.accumulo.core.util.UtilWaitThread; import org.apache.accumulo.core.util.shell.Shell; import org.apache.accumulo.minicluster.MiniAccumuloCluster; @@ -75,7 +76,7 @@ public class ShellServerTest { sb.setLength(0); } } - + public static class StringInputStream extends InputStream { private String source = ""; private int offset = 0; @@ -152,9 +153,9 @@ public class ShellServerTest { MiniAccumuloConfig cfg = new MiniAccumuloConfig(folder.newFolder("miniAccumulo"), secret); cluster = new MiniAccumuloCluster(cfg); cluster.start(); - + System.setProperty("HOME", folder.getRoot().getAbsolutePath()); - + // start the shell output = new TestOutputStream(); input = new StringInputStream(); @@ -173,14 +174,14 @@ public class ShellServerTest { // give the tracer some time to start UtilWaitThread.sleep(1000); } - + @AfterClass public static void tearDownAfterClass() throws Exception { cluster.stop(); traceProcess.destroy(); folder.delete(); } - + @Test(timeout = 30000) public void exporttableImporttable() throws Exception { // exporttable / importtable @@ -249,7 +250,7 @@ public class ShellServerTest { exec("execfile " + file.getAbsolutePath(), true, Constants.VERSION, true); } - + @Test(timeout = 30000) public void egrep() throws Exception { // egrep @@ -307,7 +308,7 @@ public class ShellServerTest { exec("scan", true, "row1", true); exec("droptable -f t", true); exec("deleteuser xyzzy", false, "delete yourself", true); - input.set(secret+"\n"+secret+"\n"); + input.set(secret + "\n" + secret + "\n"); exec("user root", true); exec("revoke -u xyzzy -s System.CREATE_TABLE", true); exec("revoke -u xyzzy -s System.GOOFY", false); @@ -537,7 +538,8 @@ public class ShellServerTest { exec("deletetable -f t", true); } - @Test//(timeout = 30000) + @Test + // (timeout = 30000) public void help() throws Exception { exec("help -np", true, "Help Commands", true); exec("?", true, "Help Commands", true); @@ -698,11 +700,12 @@ public class ShellServerTest { exec("insert c cf cq value", true); exec("insert d cf cq value", true); Thread thread = new Thread() { + @Override public void run() { try { ZooKeeperInstance instance = new ZooKeeperInstance(cluster.getConfig().getInstanceName(), cluster.getConfig().getZooKeepers()); Connector connector = instance.getConnector("root", new PasswordToken(secret)); - Scanner s = connector.createScanner("t", Constants.NO_AUTHS); + Scanner s = connector.createScanner("t", Authorizations.EMPTY); for (@SuppressWarnings("unused") Entry kv : s) ; Modified: accumulo/trunk/test/src/test/java/org/apache/accumulo/test/TestAccumuloSplitRecovery.java URL: http://svn.apache.org/viewvc/accumulo/trunk/test/src/test/java/org/apache/accumulo/test/TestAccumuloSplitRecovery.java?rev=1493250&r1=1493249&r2=1493250&view=diff ============================================================================== --- accumulo/trunk/test/src/test/java/org/apache/accumulo/test/TestAccumuloSplitRecovery.java (original) +++ accumulo/trunk/test/src/test/java/org/apache/accumulo/test/TestAccumuloSplitRecovery.java Fri Jun 14 21:19:23 2013 @@ -33,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.security.TablePermission; import org.apache.accumulo.core.util.UtilWaitThread; import org.apache.accumulo.minicluster.MiniAccumuloCluster; @@ -70,7 +71,7 @@ public class TestAccumuloSplitRecovery { boolean isOffline(String tablename, Connector connector) throws TableNotFoundException { String tableId = connector.tableOperations().tableIdMap().get(tablename); - Scanner scanner = connector.createScanner(Constants.METADATA_TABLE_NAME, Constants.NO_AUTHS); + Scanner scanner = connector.createScanner(Constants.METADATA_TABLE_NAME, Authorizations.EMPTY); scanner.setRange(new Range(new Text(tableId + ";"), new Text(tableId + "<"))); scanner.fetchColumnFamily(Constants.METADATA_CURRENT_LOCATION_COLUMN_FAMILY); for (@SuppressWarnings("unused") @@ -115,7 +116,7 @@ public class TestAccumuloSplitRecovery { bw.flush(); - Scanner scanner = connector.createScanner(Constants.METADATA_TABLE_NAME, Constants.NO_AUTHS); + Scanner scanner = connector.createScanner(Constants.METADATA_TABLE_NAME, Authorizations.EMPTY); scanner.setRange(extent.toMetadataRange()); scanner.fetchColumnFamily(Constants.METADATA_DATAFILE_COLUMN_FAMILY); @@ -136,7 +137,7 @@ public class TestAccumuloSplitRecovery { connector.tableOperations().online(TABLE); // verify the tablets went online - Scanner scanner = connector.createScanner(TABLE, Constants.NO_AUTHS); + Scanner scanner = connector.createScanner(TABLE, Authorizations.EMPTY); int i = 0; String expected[] = {"a", "b", "c"}; for (Entry entry : scanner) { Modified: accumulo/trunk/test/src/test/java/org/apache/accumulo/test/iterator/RegExTest.java URL: http://svn.apache.org/viewvc/accumulo/trunk/test/src/test/java/org/apache/accumulo/test/iterator/RegExTest.java?rev=1493250&r1=1493249&r2=1493250&view=diff ============================================================================== --- accumulo/trunk/test/src/test/java/org/apache/accumulo/test/iterator/RegExTest.java (original) +++ accumulo/trunk/test/src/test/java/org/apache/accumulo/test/iterator/RegExTest.java Fri Jun 14 21:19:23 2013 @@ -20,7 +20,6 @@ import java.util.ArrayList; import java.util.Collections; 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; @@ -36,6 +35,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.user.RegExFilter; +import org.apache.accumulo.core.security.Authorizations; import org.apache.hadoop.io.Text; import org.junit.Test; @@ -124,12 +124,12 @@ public class RegExTest { private void runTest(Range range, String rowRegEx, String cfRegEx, String cqRegEx, String valRegEx, int expected) throws Exception { - Scanner s = conn.createScanner("ret", Constants.NO_AUTHS); + Scanner s = conn.createScanner("ret", Authorizations.EMPTY); s.setRange(range); setRegexs(s, rowRegEx, cfRegEx, cqRegEx, valRegEx); runTest(s, rowRegEx, cfRegEx, cqRegEx, valRegEx, expected); - BatchScanner bs = conn.createBatchScanner("ret", Constants.NO_AUTHS, 1); + BatchScanner bs = conn.createBatchScanner("ret", Authorizations.EMPTY, 1); bs.setRanges(Collections.singletonList(range)); setRegexs(bs, rowRegEx, cfRegEx, cqRegEx, valRegEx); runTest(bs, rowRegEx, cfRegEx, cqRegEx, valRegEx, expected); Modified: accumulo/trunk/trace/src/main/java/org/apache/accumulo/trace/instrument/receivers/ZooSpanClient.java URL: http://svn.apache.org/viewvc/accumulo/trunk/trace/src/main/java/org/apache/accumulo/trace/instrument/receivers/ZooSpanClient.java?rev=1493250&r1=1493249&r2=1493250&view=diff ============================================================================== --- accumulo/trunk/trace/src/main/java/org/apache/accumulo/trace/instrument/receivers/ZooSpanClient.java (original) +++ accumulo/trunk/trace/src/main/java/org/apache/accumulo/trace/instrument/receivers/ZooSpanClient.java Fri Jun 14 21:19:23 2013 @@ -71,22 +71,12 @@ public class ZooSpanClient extends SendS zoo.getChildren(path, true); } - /* - * (non-Javadoc) - * - * @see trace.instrument.receivers.AsyncSpanReceiver#flush() - */ @Override public void flush() { if (!hosts.isEmpty()) super.flush(); } - /* - * (non-Javadoc) - * - * @see trace.instrument.receivers.AsyncSpanReceiver#sendSpans() - */ @Override void sendSpans() { if (hosts.isEmpty()) { @@ -101,7 +91,7 @@ public class ZooSpanClient extends SendS super.sendSpans(); } } - + synchronized private void updateHosts(String path, List children) { log.debug("Scanning trace hosts in zookeeper: " + path); try {