You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@accumulo.apache.org by ct...@apache.org on 2013/07/17 04:33:09 UTC
[07/50] [abbrv] git commit: ACCUMULO-1537 fixing tests and timings,
migrated visibility test
ACCUMULO-1537 fixing tests and timings, migrated visibility test
git-svn-id: https://svn.apache.org/repos/asf/accumulo/trunk@1499414 13f79535-47bb-0310-9956-ffa450edef68
Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo
Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/a5872e65
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/a5872e65
Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/a5872e65
Branch: refs/heads/ACCUMULO-1496
Commit: a5872e651cfea9043fd75819e69294ca49253488
Parents: e8cdd0b
Author: Eric C. Newton <ec...@apache.org>
Authored: Wed Jul 3 14:17:38 2013 +0000
Committer: Eric C. Newton <ec...@apache.org>
Committed: Wed Jul 3 14:17:38 2013 +0000
----------------------------------------------------------------------
.../accumulo/test/TestMultiTableIngest.java | 3 +
.../test/functional/VisibilityTest.java | 305 -------------------
.../accumulo/test/functional/ReadWriteIT.java | 4 +-
.../accumulo/test/functional/VisibilityIT.java | 294 ++++++++++++++++++
test/system/auto/simple/visibility.py | 30 --
5 files changed, 299 insertions(+), 337 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/accumulo/blob/a5872e65/test/src/main/java/org/apache/accumulo/test/TestMultiTableIngest.java
----------------------------------------------------------------------
diff --git a/test/src/main/java/org/apache/accumulo/test/TestMultiTableIngest.java b/test/src/main/java/org/apache/accumulo/test/TestMultiTableIngest.java
index 423acaa..8edcd92 100644
--- a/test/src/main/java/org/apache/accumulo/test/TestMultiTableIngest.java
+++ b/test/src/main/java/org/apache/accumulo/test/TestMultiTableIngest.java
@@ -20,6 +20,8 @@ import java.util.ArrayList;
import java.util.List;
import java.util.Map.Entry;
+import javax.crypto.Mac;
+
import org.apache.accumulo.core.cli.BatchWriterOpts;
import org.apache.accumulo.core.cli.ScannerOpts;
import org.apache.accumulo.core.client.AccumuloException;
@@ -32,6 +34,7 @@ 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.server.cli.ClientOpts;
+import org.apache.accumulo.test.functional.MacTest;
import org.apache.hadoop.io.Text;
import com.beust.jcommander.Parameter;
http://git-wip-us.apache.org/repos/asf/accumulo/blob/a5872e65/test/src/main/java/org/apache/accumulo/test/functional/VisibilityTest.java
----------------------------------------------------------------------
diff --git a/test/src/main/java/org/apache/accumulo/test/functional/VisibilityTest.java b/test/src/main/java/org/apache/accumulo/test/functional/VisibilityTest.java
deleted file mode 100644
index ffe383b..0000000
--- a/test/src/main/java/org/apache/accumulo/test/functional/VisibilityTest.java
+++ /dev/null
@@ -1,305 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.apache.accumulo.test.functional;
-
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.Collections;
-import java.util.HashMap;
-import java.util.HashSet;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Map;
-import java.util.Map.Entry;
-import java.util.Set;
-import java.util.SortedSet;
-import java.util.TreeSet;
-
-import org.apache.accumulo.core.client.BatchScanner;
-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.conf.Property;
-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.ColumnVisibility;
-import org.apache.accumulo.core.util.ByteArraySet;
-import org.apache.hadoop.io.Text;
-
-public class VisibilityTest extends FunctionalTest {
-
- @Override
- public void cleanup() throws Exception {
-
- }
-
- @Override
- public Map<String,String> getInitialConfig() {
- return Collections.emptyMap();
- }
-
- @Override
- public List<TableSetup> getTablesToCreate() {
- return Arrays.asList(new TableSetup[] {new TableSetup("vt"),
- new TableSetup("vt2", Collections.singletonMap(Property.TABLE_DEFAULT_SCANTIME_VISIBILITY.getKey(), "DEFLABEL"))});
- }
-
- @Override
- public void run() throws Exception {
-
- insertData();
- queryData();
- deleteData();
-
- insertDefaultData();
- queryDefaultData();
-
- }
-
- private static SortedSet<String> nss(String... labels) {
- TreeSet<String> ts = new TreeSet<String>();
-
- for (String s : labels) {
- ts.add(s);
- }
-
- return ts;
- }
-
- private void mput(Mutation m, String cf, String cq, String cv, String val) {
- ColumnVisibility le = new ColumnVisibility(cv.getBytes());
- m.put(new Text(cf), new Text(cq), le, new Value(val.getBytes()));
- }
-
- private void mputDelete(Mutation m, String cf, String cq, String cv) {
- ColumnVisibility le = new ColumnVisibility(cv.getBytes());
- m.putDelete(new Text(cf), new Text(cq), le);
- }
-
- private void insertData() throws Exception {
-
- BatchWriter bw = getConnector().createBatchWriter("vt", new BatchWriterConfig());
- Mutation m1 = new Mutation(new Text("row1"));
-
- mput(m1, "cf1", "cq1", "", "v1");
- mput(m1, "cf1", "cq1", "A", "v2");
- mput(m1, "cf1", "cq1", "B", "v3");
- mput(m1, "cf1", "cq1", "A&B", "v4");
- mput(m1, "cf1", "cq1", "A&(L|M)", "v5");
- mput(m1, "cf1", "cq1", "B&(L|M)", "v6");
- mput(m1, "cf1", "cq1", "A&B&(L|M)", "v7");
- mput(m1, "cf1", "cq1", "A&B&(L)", "v8");
- mput(m1, "cf1", "cq1", "A&FOO", "v9");
- mput(m1, "cf1", "cq1", "A&FOO&(L|M)", "v10");
- mput(m1, "cf1", "cq1", "FOO", "v11");
- mput(m1, "cf1", "cq1", "(A|B)&FOO&(L|M)", "v12");
- mput(m1, "cf1", "cq1", "A&B&(L|M|FOO)", "v13");
-
- bw.addMutation(m1);
- bw.close();
- }
-
- private void deleteData() throws Exception {
-
- BatchWriter bw = getConnector().createBatchWriter("vt", new BatchWriterConfig());
- Mutation m1 = new Mutation(new Text("row1"));
-
- mputDelete(m1, "cf1", "cq1", "");
- mputDelete(m1, "cf1", "cq1", "A");
- mputDelete(m1, "cf1", "cq1", "A&B");
- mputDelete(m1, "cf1", "cq1", "B&(L|M)");
- mputDelete(m1, "cf1", "cq1", "A&B&(L)");
- mputDelete(m1, "cf1", "cq1", "A&FOO&(L|M)");
- mputDelete(m1, "cf1", "cq1", "(A|B)&FOO&(L|M)");
- mputDelete(m1, "cf1", "cq1", "FOO&A"); // should not delete anything
-
- bw.addMutation(m1);
- bw.close();
-
- Map<Set<String>,Set<String>> expected = new HashMap<Set<String>,Set<String>>();
-
- expected.put(nss("A", "L"), nss("v5"));
- expected.put(nss("A", "M"), nss("v5"));
- expected.put(nss("B"), nss("v3"));
- expected.put(nss("Z"), nss());
- expected.put(nss("A", "B", "L"), nss("v7", "v13"));
- expected.put(nss("A", "B", "M"), nss("v7", "v13"));
- expected.put(nss("A", "B", "FOO"), nss("v13"));
- expected.put(nss("FOO"), nss("v11"));
- expected.put(nss("A", "FOO"), nss("v9"));
-
- queryData(nss("A", "B", "FOO", "L", "M", "Z"), nss("A", "B", "FOO", "L", "M", "Z"), expected);
- }
-
- private void insertDefaultData() throws Exception {
- BatchWriter bw = getConnector().createBatchWriter("vt2", new BatchWriterConfig());
- Mutation m1 = new Mutation(new Text("row1"));
-
- mput(m1, "cf1", "cq1", "BASE", "v1");
- mput(m1, "cf1", "cq2", "DEFLABEL", "v2");
- mput(m1, "cf1", "cq3", "", "v3");
-
- bw.addMutation(m1);
- bw.close();
- }
-
- private static void uniqueCombos(List<Set<String>> all, Set<String> prefix, Set<String> suffix) {
-
- all.add(prefix);
-
- TreeSet<String> ss = new TreeSet<String>(suffix);
-
- for (String s : suffix) {
- TreeSet<String> ps = new TreeSet<String>(prefix);
- ps.add(s);
- ss.remove(s);
-
- uniqueCombos(all, ps, ss);
- }
- }
-
- private void queryData() throws Exception {
- Map<Set<String>,Set<String>> expected = new HashMap<Set<String>,Set<String>>();
- expected.put(nss(), nss("v1"));
- expected.put(nss("A"), nss("v2"));
- expected.put(nss("A", "L"), nss("v5"));
- expected.put(nss("A", "M"), nss("v5"));
- expected.put(nss("B"), nss("v3"));
- expected.put(nss("B", "L"), nss("v6"));
- expected.put(nss("B", "M"), nss("v6"));
- expected.put(nss("Z"), nss());
- expected.put(nss("A", "B"), nss("v4"));
- expected.put(nss("A", "B", "L"), nss("v7", "v8", "v13"));
- expected.put(nss("A", "B", "M"), nss("v7", "v13"));
- expected.put(nss("A", "B", "FOO"), nss("v13"));
- expected.put(nss("FOO"), nss("v11"));
- expected.put(nss("A", "FOO"), nss("v9"));
- expected.put(nss("A", "FOO", "L"), nss("v10", "v12"));
- expected.put(nss("A", "FOO", "M"), nss("v10", "v12"));
- expected.put(nss("B", "FOO", "L"), nss("v12"));
- expected.put(nss("B", "FOO", "M"), nss("v12"));
-
- queryData(nss("A", "B", "FOO", "L", "M", "Z"), nss("A", "B", "FOO", "L", "M", "Z"), expected);
- queryData(nss("A", "B", "FOO", "L", "M", "Z"), nss("A", "B", "L", "M", "Z"), expected);
- queryData(nss("A", "B", "FOO", "L", "M", "Z"), nss("A", "Z"), expected);
- queryData(nss("A", "B", "FOO", "L", "M", "Z"), nss("Z"), expected);
- queryData(nss("A", "B", "FOO", "L", "M", "Z"), nss(), expected);
- }
-
- private void queryData(Set<String> allAuths, Set<String> userAuths, Map<Set<String>,Set<String>> expected) throws Exception {
-
- getConnector().securityOperations().changeUserAuthorizations(getPrincipal(), new Authorizations(nbas(userAuths)));
-
- ArrayList<Set<String>> combos = new ArrayList<Set<String>>();
- uniqueCombos(combos, nss(), allAuths);
-
- for (Set<String> set1 : combos) {
- Set<String> e = new TreeSet<String>();
- for (Set<String> set2 : combos) {
-
- set2 = new HashSet<String>(set2);
- set2.retainAll(userAuths);
-
- if (set1.containsAll(set2) && expected.containsKey(set2)) {
- e.addAll(expected.get(set2));
- }
- }
-
- set1.retainAll(userAuths);
- verify(set1, e);
- }
-
- }
-
- private void queryDefaultData() throws Exception {
- Scanner scanner;
-
- // should return no records
- getConnector().securityOperations().changeUserAuthorizations(getPrincipal(), new Authorizations("BASE", "DEFLABEL"));
- scanner = getConnector().createScanner("vt2", new Authorizations());
- verifyDefault(scanner, 0);
-
- // should return one record
- scanner = getConnector().createScanner("vt2", new Authorizations("BASE"));
- verifyDefault(scanner, 1);
-
- // should return all three records
- scanner = getConnector().createScanner("vt2", new Authorizations("BASE", "DEFLABEL"));
- verifyDefault(scanner, 3);
- }
-
- private void verifyDefault(Scanner scanner, int expectedCount) throws Exception {
- for (@SuppressWarnings("unused")
- Entry<Key,Value> entry : scanner)
- --expectedCount;
- if (expectedCount != 0)
- throw new Exception(" expected count !=0 " + expectedCount);
- }
-
- private void verify(Set<String> auths, Set<String> expectedValues) throws Exception {
- ByteArraySet bas = nbas(auths);
-
- try {
- verify(bas, expectedValues.toArray(new String[0]));
- } catch (Exception e) {
- throw new Exception("Verification failed auths=" + auths + " exp=" + expectedValues, e);
- }
- }
-
- private ByteArraySet nbas(Set<String> auths) {
- ByteArraySet bas = new ByteArraySet();
- for (String auth : auths) {
- bas.add(auth.getBytes());
- }
- return bas;
- }
-
- private void verify(ByteArraySet nss, String... expected) throws Exception {
- Scanner scanner = getConnector().createScanner("vt", new Authorizations(nss));
- verify(scanner.iterator(), expected);
-
- BatchScanner bs = getConnector().createBatchScanner("vt", new Authorizations(nss), 3);
- bs.setRanges(Collections.singleton(new Range()));
- verify(bs.iterator(), expected);
- bs.close();
- }
-
- private void verify(Iterator<Entry<Key,Value>> iter, String... expected) throws Exception {
- HashSet<String> valuesSeen = new HashSet<String>();
-
- while (iter.hasNext()) {
- Entry<Key,Value> entry = iter.next();
- if (valuesSeen.contains(entry.getValue().toString())) {
- throw new Exception("Value seen twice");
- }
- valuesSeen.add(entry.getValue().toString());
- }
-
- for (String ev : expected) {
- if (!valuesSeen.remove(ev)) {
- throw new Exception("Did not see expected value " + ev);
- }
- }
-
- if (valuesSeen.size() != 0) {
- throw new Exception("Saw more values than expected " + valuesSeen);
- }
- }
-}
http://git-wip-us.apache.org/repos/asf/accumulo/blob/a5872e65/test/src/test/java/org/apache/accumulo/test/functional/ReadWriteIT.java
----------------------------------------------------------------------
diff --git a/test/src/test/java/org/apache/accumulo/test/functional/ReadWriteIT.java b/test/src/test/java/org/apache/accumulo/test/functional/ReadWriteIT.java
index c4c5980..d058724 100644
--- a/test/src/test/java/org/apache/accumulo/test/functional/ReadWriteIT.java
+++ b/test/src/test/java/org/apache/accumulo/test/functional/ReadWriteIT.java
@@ -56,7 +56,7 @@ import org.junit.Test;
public class ReadWriteIT extends MacTest {
- static final int ROWS = 200000;
+ static final int ROWS = 20000;
static final int COLS = 1;
static final String COLF = "colf";
@@ -226,7 +226,7 @@ public class ReadWriteIT extends MacTest {
assertTrue(foundFile);
}
- @Test(timeout=60*1000)
+ @Test(timeout=90*1000)
public void localityGroupChange() throws Exception {
// Make changes to locality groups and ensure nothing is lostssh
final Connector connector = getConnector();
http://git-wip-us.apache.org/repos/asf/accumulo/blob/a5872e65/test/src/test/java/org/apache/accumulo/test/functional/VisibilityIT.java
----------------------------------------------------------------------
diff --git a/test/src/test/java/org/apache/accumulo/test/functional/VisibilityIT.java b/test/src/test/java/org/apache/accumulo/test/functional/VisibilityIT.java
new file mode 100644
index 0000000..7266430
--- /dev/null
+++ b/test/src/test/java/org/apache/accumulo/test/functional/VisibilityIT.java
@@ -0,0 +1,294 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.accumulo.test.functional;
+
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.HashMap;
+import java.util.HashSet;
+import java.util.Iterator;
+import java.util.List;
+import java.util.Map;
+import java.util.Map.Entry;
+import java.util.Set;
+import java.util.SortedSet;
+import java.util.TreeSet;
+
+import org.apache.accumulo.core.client.BatchScanner;
+import org.apache.accumulo.core.client.BatchWriter;
+import org.apache.accumulo.core.client.BatchWriterConfig;
+import org.apache.accumulo.core.client.Connector;
+import org.apache.accumulo.core.client.Scanner;
+import org.apache.accumulo.core.conf.Property;
+import org.apache.accumulo.core.data.Key;
+import org.apache.accumulo.core.data.Mutation;
+import org.apache.accumulo.core.data.Range;
+import org.apache.accumulo.core.data.Value;
+import org.apache.accumulo.core.security.Authorizations;
+import org.apache.accumulo.core.security.ColumnVisibility;
+import org.apache.accumulo.core.util.ByteArraySet;
+import org.apache.hadoop.io.Text;
+import org.junit.Test;
+
+public class VisibilityIT extends MacTest {
+
+ @Test
+ public void run() throws Exception {
+ Connector c = getConnector();
+ c.tableOperations().create("vt");
+ c.tableOperations().create("vt2");
+ c.tableOperations().setProperty("vt2", Property.TABLE_DEFAULT_SCANTIME_VISIBILITY.getKey(), "DEFLABEL");
+
+ insertData(c);
+ queryData(c);
+ deleteData(c);
+
+ insertDefaultData(c);
+ queryDefaultData(c);
+
+ }
+
+ private static SortedSet<String> nss(String... labels) {
+ TreeSet<String> ts = new TreeSet<String>();
+
+ for (String s : labels) {
+ ts.add(s);
+ }
+
+ return ts;
+ }
+
+ private void mput(Mutation m, String cf, String cq, String cv, String val) {
+ ColumnVisibility le = new ColumnVisibility(cv.getBytes());
+ m.put(new Text(cf), new Text(cq), le, new Value(val.getBytes()));
+ }
+
+ private void mputDelete(Mutation m, String cf, String cq, String cv) {
+ ColumnVisibility le = new ColumnVisibility(cv.getBytes());
+ m.putDelete(new Text(cf), new Text(cq), le);
+ }
+
+ private void insertData(Connector c) throws Exception {
+
+ BatchWriter bw = c.createBatchWriter("vt", new BatchWriterConfig());
+ Mutation m1 = new Mutation(new Text("row1"));
+
+ mput(m1, "cf1", "cq1", "", "v1");
+ mput(m1, "cf1", "cq1", "A", "v2");
+ mput(m1, "cf1", "cq1", "B", "v3");
+ mput(m1, "cf1", "cq1", "A&B", "v4");
+ mput(m1, "cf1", "cq1", "A&(L|M)", "v5");
+ mput(m1, "cf1", "cq1", "B&(L|M)", "v6");
+ mput(m1, "cf1", "cq1", "A&B&(L|M)", "v7");
+ mput(m1, "cf1", "cq1", "A&B&(L)", "v8");
+ mput(m1, "cf1", "cq1", "A&FOO", "v9");
+ mput(m1, "cf1", "cq1", "A&FOO&(L|M)", "v10");
+ mput(m1, "cf1", "cq1", "FOO", "v11");
+ mput(m1, "cf1", "cq1", "(A|B)&FOO&(L|M)", "v12");
+ mput(m1, "cf1", "cq1", "A&B&(L|M|FOO)", "v13");
+
+ bw.addMutation(m1);
+ bw.close();
+ }
+
+ private void deleteData(Connector c) throws Exception {
+
+ BatchWriter bw = c.createBatchWriter("vt", new BatchWriterConfig());
+ Mutation m1 = new Mutation(new Text("row1"));
+
+ mputDelete(m1, "cf1", "cq1", "");
+ mputDelete(m1, "cf1", "cq1", "A");
+ mputDelete(m1, "cf1", "cq1", "A&B");
+ mputDelete(m1, "cf1", "cq1", "B&(L|M)");
+ mputDelete(m1, "cf1", "cq1", "A&B&(L)");
+ mputDelete(m1, "cf1", "cq1", "A&FOO&(L|M)");
+ mputDelete(m1, "cf1", "cq1", "(A|B)&FOO&(L|M)");
+ mputDelete(m1, "cf1", "cq1", "FOO&A"); // should not delete anything
+
+ bw.addMutation(m1);
+ bw.close();
+
+ Map<Set<String>,Set<String>> expected = new HashMap<Set<String>,Set<String>>();
+
+ expected.put(nss("A", "L"), nss("v5"));
+ expected.put(nss("A", "M"), nss("v5"));
+ expected.put(nss("B"), nss("v3"));
+ expected.put(nss("Z"), nss());
+ expected.put(nss("A", "B", "L"), nss("v7", "v13"));
+ expected.put(nss("A", "B", "M"), nss("v7", "v13"));
+ expected.put(nss("A", "B", "FOO"), nss("v13"));
+ expected.put(nss("FOO"), nss("v11"));
+ expected.put(nss("A", "FOO"), nss("v9"));
+
+ queryData(c, nss("A", "B", "FOO", "L", "M", "Z"), nss("A", "B", "FOO", "L", "M", "Z"), expected);
+ }
+
+ private void insertDefaultData(Connector c) throws Exception {
+ BatchWriter bw = c.createBatchWriter("vt2", new BatchWriterConfig());
+ Mutation m1 = new Mutation(new Text("row1"));
+
+ mput(m1, "cf1", "cq1", "BASE", "v1");
+ mput(m1, "cf1", "cq2", "DEFLABEL", "v2");
+ mput(m1, "cf1", "cq3", "", "v3");
+
+ bw.addMutation(m1);
+ bw.close();
+ }
+
+ private static void uniqueCombos(List<Set<String>> all, Set<String> prefix, Set<String> suffix) {
+
+ all.add(prefix);
+
+ TreeSet<String> ss = new TreeSet<String>(suffix);
+
+ for (String s : suffix) {
+ TreeSet<String> ps = new TreeSet<String>(prefix);
+ ps.add(s);
+ ss.remove(s);
+
+ uniqueCombos(all, ps, ss);
+ }
+ }
+
+ private void queryData(Connector c) throws Exception {
+ Map<Set<String>,Set<String>> expected = new HashMap<Set<String>,Set<String>>();
+ expected.put(nss(), nss("v1"));
+ expected.put(nss("A"), nss("v2"));
+ expected.put(nss("A", "L"), nss("v5"));
+ expected.put(nss("A", "M"), nss("v5"));
+ expected.put(nss("B"), nss("v3"));
+ expected.put(nss("B", "L"), nss("v6"));
+ expected.put(nss("B", "M"), nss("v6"));
+ expected.put(nss("Z"), nss());
+ expected.put(nss("A", "B"), nss("v4"));
+ expected.put(nss("A", "B", "L"), nss("v7", "v8", "v13"));
+ expected.put(nss("A", "B", "M"), nss("v7", "v13"));
+ expected.put(nss("A", "B", "FOO"), nss("v13"));
+ expected.put(nss("FOO"), nss("v11"));
+ expected.put(nss("A", "FOO"), nss("v9"));
+ expected.put(nss("A", "FOO", "L"), nss("v10", "v12"));
+ expected.put(nss("A", "FOO", "M"), nss("v10", "v12"));
+ expected.put(nss("B", "FOO", "L"), nss("v12"));
+ expected.put(nss("B", "FOO", "M"), nss("v12"));
+
+ queryData(c, nss("A", "B", "FOO", "L", "M", "Z"), nss("A", "B", "FOO", "L", "M", "Z"), expected);
+ queryData(c, nss("A", "B", "FOO", "L", "M", "Z"), nss("A", "B", "L", "M", "Z"), expected);
+ queryData(c, nss("A", "B", "FOO", "L", "M", "Z"), nss("A", "Z"), expected);
+ queryData(c, nss("A", "B", "FOO", "L", "M", "Z"), nss("Z"), expected);
+ queryData(c, nss("A", "B", "FOO", "L", "M", "Z"), nss(), expected);
+ }
+
+ private void queryData(Connector c, Set<String> allAuths, Set<String> userAuths, Map<Set<String>,Set<String>> expected) throws Exception {
+
+ c.securityOperations().changeUserAuthorizations("root", new Authorizations(nbas(userAuths)));
+
+ ArrayList<Set<String>> combos = new ArrayList<Set<String>>();
+ uniqueCombos(combos, nss(), allAuths);
+
+ for (Set<String> set1 : combos) {
+ Set<String> e = new TreeSet<String>();
+ for (Set<String> set2 : combos) {
+
+ set2 = new HashSet<String>(set2);
+ set2.retainAll(userAuths);
+
+ if (set1.containsAll(set2) && expected.containsKey(set2)) {
+ e.addAll(expected.get(set2));
+ }
+ }
+
+ set1.retainAll(userAuths);
+ verify(c, set1, e);
+ }
+
+ }
+
+ private void queryDefaultData(Connector c) throws Exception {
+ Scanner scanner;
+
+ // should return no records
+ c.securityOperations().changeUserAuthorizations("root", new Authorizations("BASE", "DEFLABEL"));
+ scanner = getConnector().createScanner("vt2", new Authorizations());
+ verifyDefault(scanner, 0);
+
+ // should return one record
+ scanner = getConnector().createScanner("vt2", new Authorizations("BASE"));
+ verifyDefault(scanner, 1);
+
+ // should return all three records
+ scanner = getConnector().createScanner("vt2", new Authorizations("BASE", "DEFLABEL"));
+ verifyDefault(scanner, 3);
+ }
+
+ private void verifyDefault(Scanner scanner, int expectedCount) throws Exception {
+ for (@SuppressWarnings("unused")
+ Entry<Key,Value> entry : scanner)
+ --expectedCount;
+ if (expectedCount != 0)
+ throw new Exception(" expected count !=0 " + expectedCount);
+ }
+
+ private void verify(Connector c, Set<String> auths, Set<String> expectedValues) throws Exception {
+ ByteArraySet bas = nbas(auths);
+
+ try {
+ verify(c, bas, expectedValues.toArray(new String[0]));
+ } catch (Exception e) {
+ throw new Exception("Verification failed auths=" + auths + " exp=" + expectedValues, e);
+ }
+ }
+
+ private ByteArraySet nbas(Set<String> auths) {
+ ByteArraySet bas = new ByteArraySet();
+ for (String auth : auths) {
+ bas.add(auth.getBytes());
+ }
+ return bas;
+ }
+
+ private void verify(Connector c, ByteArraySet nss, String... expected) throws Exception {
+ Scanner scanner = c.createScanner("vt", new Authorizations(nss));
+ verify(scanner.iterator(), expected);
+
+ BatchScanner bs = getConnector().createBatchScanner("vt", new Authorizations(nss), 3);
+ bs.setRanges(Collections.singleton(new Range()));
+ verify(bs.iterator(), expected);
+ bs.close();
+ }
+
+ private void verify(Iterator<Entry<Key,Value>> iter, String... expected) throws Exception {
+ HashSet<String> valuesSeen = new HashSet<String>();
+
+ while (iter.hasNext()) {
+ Entry<Key,Value> entry = iter.next();
+ if (valuesSeen.contains(entry.getValue().toString())) {
+ throw new Exception("Value seen twice");
+ }
+ valuesSeen.add(entry.getValue().toString());
+ }
+
+ for (String ev : expected) {
+ if (!valuesSeen.remove(ev)) {
+ throw new Exception("Did not see expected value " + ev);
+ }
+ }
+
+ if (valuesSeen.size() != 0) {
+ throw new Exception("Saw more values than expected " + valuesSeen);
+ }
+ }
+}
http://git-wip-us.apache.org/repos/asf/accumulo/blob/a5872e65/test/system/auto/simple/visibility.py
----------------------------------------------------------------------
diff --git a/test/system/auto/simple/visibility.py b/test/system/auto/simple/visibility.py
deleted file mode 100755
index 60f7ae4..0000000
--- a/test/system/auto/simple/visibility.py
+++ /dev/null
@@ -1,30 +0,0 @@
-# Licensed to the Apache Software Foundation (ASF) under one or more
-# contributor license agreements. See the NOTICE file distributed with
-# this work for additional information regarding copyright ownership.
-# The ASF licenses this file to You under the Apache License, Version 2.0
-# (the "License"); you may not use this file except in compliance with
-# the License. You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
-from JavaTest import JavaTest
-
-import unittest
-
-class VisibilityTest(JavaTest):
- "Test Column Visibility"
-
- order = 21
- testClass="org.apache.accumulo.test.functional.VisibilityTest"
-
-
-def suite():
- result = unittest.TestSuite()
- result.addTest(VisibilityTest())
- return result