On Sun, Feb 24, 2013 at 7:59 PM, <[email protected]> wrote: > Author: elserj > Date: Mon Feb 25 00:59:00 2013 > New Revision: 1449573 > > URL: http://svn.apache.org/r1449573 > Log: > ACCUMULO-498 Applying patch to retrieve ColumnVisibility from a Key as a > ColumnVisibility instead of only a Text.
When applying a patch for someone else, I think we should include their name in the svn commit msg. You can edit commit messages if you agree :) > > Modified: > > accumulo/branches/1.5/core/src/main/java/org/apache/accumulo/core/data/Key.java > > accumulo/branches/1.5/core/src/test/java/org/apache/accumulo/core/data/KeyTest.java > > Modified: > accumulo/branches/1.5/core/src/main/java/org/apache/accumulo/core/data/Key.java > URL: > http://svn.apache.org/viewvc/accumulo/branches/1.5/core/src/main/java/org/apache/accumulo/core/data/Key.java?rev=1449573&r1=1449572&r2=1449573&view=diff > ============================================================================== > --- > accumulo/branches/1.5/core/src/main/java/org/apache/accumulo/core/data/Key.java > (original) > +++ > accumulo/branches/1.5/core/src/main/java/org/apache/accumulo/core/data/Key.java > Mon Feb 25 00:59:00 2013 > @@ -478,6 +478,17 @@ public class Key implements WritableComp > } > > /** > + * This method creates a new ColumnVisibility representing the column > visibility for this key > + * > + * WARNING: using this method may inhibit performance since a new > ColumnVisibility object is created on every call. > + * > + * @return A new object representing the column visibility field > + */ > + public final ColumnVisibility getColumnVisibilityParsed() { > + return new ColumnVisibility(colVisibility); > + } > + > + /** > * Sets this key's row, column family, column qualifier, column > visibility, timestamp, and delete marker to be the same as another key's. > */ > public void set(Key k) { > > Modified: > accumulo/branches/1.5/core/src/test/java/org/apache/accumulo/core/data/KeyTest.java > URL: > http://svn.apache.org/viewvc/accumulo/branches/1.5/core/src/test/java/org/apache/accumulo/core/data/KeyTest.java?rev=1449573&r1=1449572&r2=1449573&view=diff > ============================================================================== > --- > accumulo/branches/1.5/core/src/test/java/org/apache/accumulo/core/data/KeyTest.java > (original) > +++ > accumulo/branches/1.5/core/src/test/java/org/apache/accumulo/core/data/KeyTest.java > Mon Feb 25 00:59:00 2013 > @@ -18,6 +18,7 @@ package org.apache.accumulo.core.data; > > import junit.framework.TestCase; > > +import org.apache.accumulo.core.security.ColumnVisibility; > import org.apache.hadoop.io.Text; > > public class KeyTest extends TestCase { > @@ -97,4 +98,13 @@ public class KeyTest extends TestCase { > Key k = new Key("r", "f", "q", "v"); > > assertEquals(k.followingKey(PartialKey.ROW_COLFAM_COLQUAL_COLVIS).toString(), > "r f:q [v%00;] " + Long.MAX_VALUE + " false"); > } > + > + public void testVisibilityGetters() { > + Key k = new Key("r", "f", "q", "v1|(v2&v3)"); > + > + Text expression = k.getColumnVisibility(); > + ColumnVisibility parsed = k.getColumnVisibilityParsed(); > + > + assertEquals(expression, new Text(parsed.getExpression())); > + } > } > >
