You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@accumulo.apache.org by ec...@apache.org on 2013/10/15 19:42:15 UTC
[3/3] git commit: ACCUMULO-1730 Expose ColumnVisibility
normalize/stringify methods.
ACCUMULO-1730 Expose ColumnVisibility normalize/stringify methods.
Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo
Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/876c5ce5
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/876c5ce5
Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/876c5ce5
Branch: refs/heads/master
Commit: 876c5ce5ee9a039d56c8e4c7ca04d0401a47cdac
Parents: 33118cb
Author: John Stoneham <js...@texeltek.com>
Authored: Tue Oct 15 13:15:19 2013 -0400
Committer: John Stoneham <js...@texeltek.com>
Committed: Tue Oct 15 13:15:19 2013 -0400
----------------------------------------------------------------------
.../org/apache/accumulo/core/security/ColumnVisibility.java | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/accumulo/blob/876c5ce5/core/src/main/java/org/apache/accumulo/core/security/ColumnVisibility.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/accumulo/core/security/ColumnVisibility.java b/core/src/main/java/org/apache/accumulo/core/security/ColumnVisibility.java
index 2b9b49d..55763bc 100644
--- a/core/src/main/java/org/apache/accumulo/core/security/ColumnVisibility.java
+++ b/core/src/main/java/org/apache/accumulo/core/security/ColumnVisibility.java
@@ -144,7 +144,7 @@ public class ColumnVisibility {
/*
* Convience method that delegates to normalize with a new NodeComparator constructed using the supplied expression.
*/
- private static Node normalize(Node root, byte[] expression) {
+ public static Node normalize(Node root, byte[] expression) {
return normalize(root, expression, new NodeComparator(expression));
}
@@ -156,7 +156,7 @@ public class ColumnVisibility {
* 3) dedupes labels (`a&b&a` becomes `a&b`)
*/
// @formatter:on
- private static Node normalize(Node root, byte[] expression, NodeComparator comparator) {
+ public static Node normalize(Node root, byte[] expression, NodeComparator comparator) {
if (root.type != NodeType.TERM) {
TreeSet<Node> rolledUp = new TreeSet<Node>(comparator);
java.util.Iterator<Node> itr = root.children.iterator();
@@ -183,7 +183,7 @@ public class ColumnVisibility {
/*
* Walks an expression's AST and appends a string representation to a supplied StringBuilder. This method adds parens where necessary.
*/
- private static void stringify(Node root, byte[] expression, StringBuilder out) {
+ public static void stringify(Node root, byte[] expression, StringBuilder out) {
if (root.type == NodeType.TERM) {
out.append(new String(expression, root.start, root.end - root.start));
} else {