You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@accumulo.apache.org by kt...@apache.org on 2013/05/06 16:42:39 UTC
svn commit: r1479587 - in
/accumulo/trunk/core/src/main/java/org/apache/accumulo/core/client/lexicoder:
./ impl/ util/
Author: kturner
Date: Mon May 6 14:42:37 2013
New Revision: 1479587
URL: http://svn.apache.org/r1479587
Log:
ACCUMULO-1336 added since tags to lexicoders, moved util package to impl package to indicate its not part of public API
Added:
accumulo/trunk/core/src/main/java/org/apache/accumulo/core/client/lexicoder/impl/
- copied from r1479579, accumulo/trunk/core/src/main/java/org/apache/accumulo/core/client/lexicoder/util/
Removed:
accumulo/trunk/core/src/main/java/org/apache/accumulo/core/client/lexicoder/util/
Modified:
accumulo/trunk/core/src/main/java/org/apache/accumulo/core/client/lexicoder/BigIntegerLexicoder.java
accumulo/trunk/core/src/main/java/org/apache/accumulo/core/client/lexicoder/BytesLexicoder.java
accumulo/trunk/core/src/main/java/org/apache/accumulo/core/client/lexicoder/DateLexicoder.java
accumulo/trunk/core/src/main/java/org/apache/accumulo/core/client/lexicoder/DoubleLexicoder.java
accumulo/trunk/core/src/main/java/org/apache/accumulo/core/client/lexicoder/Encoder.java
accumulo/trunk/core/src/main/java/org/apache/accumulo/core/client/lexicoder/IntegerLexicoder.java
accumulo/trunk/core/src/main/java/org/apache/accumulo/core/client/lexicoder/Lexicoder.java
accumulo/trunk/core/src/main/java/org/apache/accumulo/core/client/lexicoder/ListLexicoder.java
accumulo/trunk/core/src/main/java/org/apache/accumulo/core/client/lexicoder/LongLexicoder.java
accumulo/trunk/core/src/main/java/org/apache/accumulo/core/client/lexicoder/PairLexicoder.java
accumulo/trunk/core/src/main/java/org/apache/accumulo/core/client/lexicoder/ReverseLexicoder.java
accumulo/trunk/core/src/main/java/org/apache/accumulo/core/client/lexicoder/StringLexicoder.java
accumulo/trunk/core/src/main/java/org/apache/accumulo/core/client/lexicoder/TextLexicoder.java
accumulo/trunk/core/src/main/java/org/apache/accumulo/core/client/lexicoder/UIntegerLexicoder.java
accumulo/trunk/core/src/main/java/org/apache/accumulo/core/client/lexicoder/ULongLexicoder.java
accumulo/trunk/core/src/main/java/org/apache/accumulo/core/client/lexicoder/UUIDLexicoder.java
accumulo/trunk/core/src/main/java/org/apache/accumulo/core/client/lexicoder/impl/ByteUtils.java
accumulo/trunk/core/src/main/java/org/apache/accumulo/core/client/lexicoder/impl/FixedByteArrayOutputStream.java
Modified: accumulo/trunk/core/src/main/java/org/apache/accumulo/core/client/lexicoder/BigIntegerLexicoder.java
URL: http://svn.apache.org/viewvc/accumulo/trunk/core/src/main/java/org/apache/accumulo/core/client/lexicoder/BigIntegerLexicoder.java?rev=1479587&r1=1479586&r2=1479587&view=diff
==============================================================================
--- accumulo/trunk/core/src/main/java/org/apache/accumulo/core/client/lexicoder/BigIntegerLexicoder.java (original)
+++ accumulo/trunk/core/src/main/java/org/apache/accumulo/core/client/lexicoder/BigIntegerLexicoder.java Mon May 6 14:42:37 2013
@@ -22,11 +22,12 @@ import java.io.DataOutputStream;
import java.io.IOException;
import java.math.BigInteger;
-import org.apache.accumulo.core.client.lexicoder.util.FixedByteArrayOutputStream;
+import org.apache.accumulo.core.client.lexicoder.impl.FixedByteArrayOutputStream;
import org.apache.accumulo.core.iterators.ValueFormatException;
/**
*
+ * @since 1.6.0
*/
public class BigIntegerLexicoder implements Lexicoder<BigInteger> {
Modified: accumulo/trunk/core/src/main/java/org/apache/accumulo/core/client/lexicoder/BytesLexicoder.java
URL: http://svn.apache.org/viewvc/accumulo/trunk/core/src/main/java/org/apache/accumulo/core/client/lexicoder/BytesLexicoder.java?rev=1479587&r1=1479586&r2=1479587&view=diff
==============================================================================
--- accumulo/trunk/core/src/main/java/org/apache/accumulo/core/client/lexicoder/BytesLexicoder.java (original)
+++ accumulo/trunk/core/src/main/java/org/apache/accumulo/core/client/lexicoder/BytesLexicoder.java Mon May 6 14:42:37 2013
@@ -18,6 +18,7 @@ package org.apache.accumulo.core.client.
/**
*
+ * @since 1.6.0
*/
public class BytesLexicoder implements Lexicoder<byte[]> {
Modified: accumulo/trunk/core/src/main/java/org/apache/accumulo/core/client/lexicoder/DateLexicoder.java
URL: http://svn.apache.org/viewvc/accumulo/trunk/core/src/main/java/org/apache/accumulo/core/client/lexicoder/DateLexicoder.java?rev=1479587&r1=1479586&r2=1479587&view=diff
==============================================================================
--- accumulo/trunk/core/src/main/java/org/apache/accumulo/core/client/lexicoder/DateLexicoder.java (original)
+++ accumulo/trunk/core/src/main/java/org/apache/accumulo/core/client/lexicoder/DateLexicoder.java Mon May 6 14:42:37 2013
@@ -20,6 +20,7 @@ import java.util.Date;
/**
*
+ * @since 1.6.0
*/
public class DateLexicoder implements Lexicoder<Date> {
Modified: accumulo/trunk/core/src/main/java/org/apache/accumulo/core/client/lexicoder/DoubleLexicoder.java
URL: http://svn.apache.org/viewvc/accumulo/trunk/core/src/main/java/org/apache/accumulo/core/client/lexicoder/DoubleLexicoder.java?rev=1479587&r1=1479586&r2=1479587&view=diff
==============================================================================
--- accumulo/trunk/core/src/main/java/org/apache/accumulo/core/client/lexicoder/DoubleLexicoder.java (original)
+++ accumulo/trunk/core/src/main/java/org/apache/accumulo/core/client/lexicoder/DoubleLexicoder.java Mon May 6 14:42:37 2013
@@ -18,6 +18,7 @@ package org.apache.accumulo.core.client.
/**
*
+ * @since 1.6.0
*/
public class DoubleLexicoder implements Lexicoder<Double> {
Modified: accumulo/trunk/core/src/main/java/org/apache/accumulo/core/client/lexicoder/Encoder.java
URL: http://svn.apache.org/viewvc/accumulo/trunk/core/src/main/java/org/apache/accumulo/core/client/lexicoder/Encoder.java?rev=1479587&r1=1479586&r2=1479587&view=diff
==============================================================================
--- accumulo/trunk/core/src/main/java/org/apache/accumulo/core/client/lexicoder/Encoder.java (original)
+++ accumulo/trunk/core/src/main/java/org/apache/accumulo/core/client/lexicoder/Encoder.java Mon May 6 14:42:37 2013
@@ -18,6 +18,7 @@ package org.apache.accumulo.core.client.
/**
*
+ * @since 1.6.0
*/
public interface Encoder<T> extends org.apache.accumulo.core.iterators.TypedValueCombiner.Encoder<T> {
Modified: accumulo/trunk/core/src/main/java/org/apache/accumulo/core/client/lexicoder/IntegerLexicoder.java
URL: http://svn.apache.org/viewvc/accumulo/trunk/core/src/main/java/org/apache/accumulo/core/client/lexicoder/IntegerLexicoder.java?rev=1479587&r1=1479586&r2=1479587&view=diff
==============================================================================
--- accumulo/trunk/core/src/main/java/org/apache/accumulo/core/client/lexicoder/IntegerLexicoder.java (original)
+++ accumulo/trunk/core/src/main/java/org/apache/accumulo/core/client/lexicoder/IntegerLexicoder.java Mon May 6 14:42:37 2013
@@ -18,6 +18,7 @@ package org.apache.accumulo.core.client.
/**
*
+ * @since 1.6.0
*/
public class IntegerLexicoder implements Lexicoder<Integer> {
Modified: accumulo/trunk/core/src/main/java/org/apache/accumulo/core/client/lexicoder/Lexicoder.java
URL: http://svn.apache.org/viewvc/accumulo/trunk/core/src/main/java/org/apache/accumulo/core/client/lexicoder/Lexicoder.java?rev=1479587&r1=1479586&r2=1479587&view=diff
==============================================================================
--- accumulo/trunk/core/src/main/java/org/apache/accumulo/core/client/lexicoder/Lexicoder.java (original)
+++ accumulo/trunk/core/src/main/java/org/apache/accumulo/core/client/lexicoder/Lexicoder.java Mon May 6 14:42:37 2013
@@ -18,6 +18,8 @@ package org.apache.accumulo.core.client.
/**
* An encoder that produces byte arrays in which the lexicographic sort order corresponds to the types sort order.
+ *
+ * @since 1.6.0
*/
public interface Lexicoder<T> extends Encoder<T> {
Modified: accumulo/trunk/core/src/main/java/org/apache/accumulo/core/client/lexicoder/ListLexicoder.java
URL: http://svn.apache.org/viewvc/accumulo/trunk/core/src/main/java/org/apache/accumulo/core/client/lexicoder/ListLexicoder.java?rev=1479587&r1=1479586&r2=1479587&view=diff
==============================================================================
--- accumulo/trunk/core/src/main/java/org/apache/accumulo/core/client/lexicoder/ListLexicoder.java (original)
+++ accumulo/trunk/core/src/main/java/org/apache/accumulo/core/client/lexicoder/ListLexicoder.java Mon May 6 14:42:37 2013
@@ -16,14 +16,19 @@
*/
package org.apache.accumulo.core.client.lexicoder;
-import static org.apache.accumulo.core.client.lexicoder.util.ByteUtils.concat;
-import static org.apache.accumulo.core.client.lexicoder.util.ByteUtils.escape;
-import static org.apache.accumulo.core.client.lexicoder.util.ByteUtils.split;
-import static org.apache.accumulo.core.client.lexicoder.util.ByteUtils.unescape;
+import static org.apache.accumulo.core.client.lexicoder.impl.ByteUtils.concat;
+import static org.apache.accumulo.core.client.lexicoder.impl.ByteUtils.escape;
+import static org.apache.accumulo.core.client.lexicoder.impl.ByteUtils.split;
+import static org.apache.accumulo.core.client.lexicoder.impl.ByteUtils.unescape;
import java.util.ArrayList;
import java.util.List;
+/**
+ *
+ * @since 1.6.0
+ */
+
public class ListLexicoder<LT> implements Lexicoder<List<LT>> {
private Lexicoder<LT> lexicoder;
Modified: accumulo/trunk/core/src/main/java/org/apache/accumulo/core/client/lexicoder/LongLexicoder.java
URL: http://svn.apache.org/viewvc/accumulo/trunk/core/src/main/java/org/apache/accumulo/core/client/lexicoder/LongLexicoder.java?rev=1479587&r1=1479586&r2=1479587&view=diff
==============================================================================
--- accumulo/trunk/core/src/main/java/org/apache/accumulo/core/client/lexicoder/LongLexicoder.java (original)
+++ accumulo/trunk/core/src/main/java/org/apache/accumulo/core/client/lexicoder/LongLexicoder.java Mon May 6 14:42:37 2013
@@ -19,6 +19,8 @@ package org.apache.accumulo.core.client.
/**
* Signed long encoder. The lexicographic encoding sorts Long.MIN_VALUE first and Long.MAX_VALUE last. The lexicographic encoding sorts -2l before -1l. It
* corresponds to the sort order of Long.
+ *
+ * @since 1.6.0
*/
public class LongLexicoder extends ULongLexicoder {
@Override
Modified: accumulo/trunk/core/src/main/java/org/apache/accumulo/core/client/lexicoder/PairLexicoder.java
URL: http://svn.apache.org/viewvc/accumulo/trunk/core/src/main/java/org/apache/accumulo/core/client/lexicoder/PairLexicoder.java?rev=1479587&r1=1479586&r2=1479587&view=diff
==============================================================================
--- accumulo/trunk/core/src/main/java/org/apache/accumulo/core/client/lexicoder/PairLexicoder.java (original)
+++ accumulo/trunk/core/src/main/java/org/apache/accumulo/core/client/lexicoder/PairLexicoder.java Mon May 6 14:42:37 2013
@@ -16,13 +16,18 @@
*/
package org.apache.accumulo.core.client.lexicoder;
-import static org.apache.accumulo.core.client.lexicoder.util.ByteUtils.concat;
-import static org.apache.accumulo.core.client.lexicoder.util.ByteUtils.escape;
-import static org.apache.accumulo.core.client.lexicoder.util.ByteUtils.split;
-import static org.apache.accumulo.core.client.lexicoder.util.ByteUtils.unescape;
+import static org.apache.accumulo.core.client.lexicoder.impl.ByteUtils.concat;
+import static org.apache.accumulo.core.client.lexicoder.impl.ByteUtils.escape;
+import static org.apache.accumulo.core.client.lexicoder.impl.ByteUtils.split;
+import static org.apache.accumulo.core.client.lexicoder.impl.ByteUtils.unescape;
import org.apache.accumulo.core.util.ComparablePair;
+/**
+ *
+ * @since 1.6.0
+ */
+
public class PairLexicoder<A extends Comparable<A>,B extends Comparable<B>> implements Lexicoder<ComparablePair<A,B>> {
private Lexicoder<A> firstLexicoder;
Modified: accumulo/trunk/core/src/main/java/org/apache/accumulo/core/client/lexicoder/ReverseLexicoder.java
URL: http://svn.apache.org/viewvc/accumulo/trunk/core/src/main/java/org/apache/accumulo/core/client/lexicoder/ReverseLexicoder.java?rev=1479587&r1=1479586&r2=1479587&view=diff
==============================================================================
--- accumulo/trunk/core/src/main/java/org/apache/accumulo/core/client/lexicoder/ReverseLexicoder.java (original)
+++ accumulo/trunk/core/src/main/java/org/apache/accumulo/core/client/lexicoder/ReverseLexicoder.java Mon May 6 14:42:37 2013
@@ -16,8 +16,13 @@
*/
package org.apache.accumulo.core.client.lexicoder;
-import static org.apache.accumulo.core.client.lexicoder.util.ByteUtils.escape;
-import static org.apache.accumulo.core.client.lexicoder.util.ByteUtils.unescape;
+import static org.apache.accumulo.core.client.lexicoder.impl.ByteUtils.escape;
+import static org.apache.accumulo.core.client.lexicoder.impl.ByteUtils.unescape;
+
+/**
+ *
+ * @since 1.6.0
+ */
public class ReverseLexicoder<T> implements Lexicoder<T> {
Modified: accumulo/trunk/core/src/main/java/org/apache/accumulo/core/client/lexicoder/StringLexicoder.java
URL: http://svn.apache.org/viewvc/accumulo/trunk/core/src/main/java/org/apache/accumulo/core/client/lexicoder/StringLexicoder.java?rev=1479587&r1=1479586&r2=1479587&view=diff
==============================================================================
--- accumulo/trunk/core/src/main/java/org/apache/accumulo/core/client/lexicoder/StringLexicoder.java (original)
+++ accumulo/trunk/core/src/main/java/org/apache/accumulo/core/client/lexicoder/StringLexicoder.java Mon May 6 14:42:37 2013
@@ -18,6 +18,11 @@ package org.apache.accumulo.core.client.
import java.io.UnsupportedEncodingException;
+/**
+ *
+ * @since 1.6.0
+ */
+
public class StringLexicoder implements Lexicoder<String> {
@Override
Modified: accumulo/trunk/core/src/main/java/org/apache/accumulo/core/client/lexicoder/TextLexicoder.java
URL: http://svn.apache.org/viewvc/accumulo/trunk/core/src/main/java/org/apache/accumulo/core/client/lexicoder/TextLexicoder.java?rev=1479587&r1=1479586&r2=1479587&view=diff
==============================================================================
--- accumulo/trunk/core/src/main/java/org/apache/accumulo/core/client/lexicoder/TextLexicoder.java (original)
+++ accumulo/trunk/core/src/main/java/org/apache/accumulo/core/client/lexicoder/TextLexicoder.java Mon May 6 14:42:37 2013
@@ -19,6 +19,11 @@ package org.apache.accumulo.core.client.
import org.apache.accumulo.core.util.TextUtil;
import org.apache.hadoop.io.Text;
+/**
+ *
+ * @since 1.6.0
+ */
+
public class TextLexicoder implements Lexicoder<Text> {
@Override
Modified: accumulo/trunk/core/src/main/java/org/apache/accumulo/core/client/lexicoder/UIntegerLexicoder.java
URL: http://svn.apache.org/viewvc/accumulo/trunk/core/src/main/java/org/apache/accumulo/core/client/lexicoder/UIntegerLexicoder.java?rev=1479587&r1=1479586&r2=1479587&view=diff
==============================================================================
--- accumulo/trunk/core/src/main/java/org/apache/accumulo/core/client/lexicoder/UIntegerLexicoder.java (original)
+++ accumulo/trunk/core/src/main/java/org/apache/accumulo/core/client/lexicoder/UIntegerLexicoder.java Mon May 6 14:42:37 2013
@@ -18,6 +18,7 @@ package org.apache.accumulo.core.client.
/**
*
+ * @since 1.6.0
*/
public class UIntegerLexicoder implements Lexicoder<Integer> {
Modified: accumulo/trunk/core/src/main/java/org/apache/accumulo/core/client/lexicoder/ULongLexicoder.java
URL: http://svn.apache.org/viewvc/accumulo/trunk/core/src/main/java/org/apache/accumulo/core/client/lexicoder/ULongLexicoder.java?rev=1479587&r1=1479586&r2=1479587&view=diff
==============================================================================
--- accumulo/trunk/core/src/main/java/org/apache/accumulo/core/client/lexicoder/ULongLexicoder.java (original)
+++ accumulo/trunk/core/src/main/java/org/apache/accumulo/core/client/lexicoder/ULongLexicoder.java Mon May 6 14:42:37 2013
@@ -19,6 +19,8 @@ package org.apache.accumulo.core.client.
/**
* Unsigned long encoder. The lexicographic encoding sorts first 0l and -1l last. This encoding does not correspond to the sort of Long because it does not
* consider the sign bit. If Java had an unsigned long type, this encoder would correspond to its sort order.
+ *
+ * @since 1.6.0
*/
public class ULongLexicoder implements Lexicoder<Long> {
Modified: accumulo/trunk/core/src/main/java/org/apache/accumulo/core/client/lexicoder/UUIDLexicoder.java
URL: http://svn.apache.org/viewvc/accumulo/trunk/core/src/main/java/org/apache/accumulo/core/client/lexicoder/UUIDLexicoder.java?rev=1479587&r1=1479586&r2=1479587&view=diff
==============================================================================
--- accumulo/trunk/core/src/main/java/org/apache/accumulo/core/client/lexicoder/UUIDLexicoder.java (original)
+++ accumulo/trunk/core/src/main/java/org/apache/accumulo/core/client/lexicoder/UUIDLexicoder.java Mon May 6 14:42:37 2013
@@ -22,9 +22,14 @@ import java.io.DataOutputStream;
import java.io.IOException;
import java.util.UUID;
-import org.apache.accumulo.core.client.lexicoder.util.FixedByteArrayOutputStream;
+import org.apache.accumulo.core.client.lexicoder.impl.FixedByteArrayOutputStream;
import org.apache.accumulo.core.iterators.ValueFormatException;
+/**
+ *
+ * @since 1.6.0
+ */
+
public class UUIDLexicoder implements Lexicoder<UUID> {
@Override
Modified: accumulo/trunk/core/src/main/java/org/apache/accumulo/core/client/lexicoder/impl/ByteUtils.java
URL: http://svn.apache.org/viewvc/accumulo/trunk/core/src/main/java/org/apache/accumulo/core/client/lexicoder/impl/ByteUtils.java?rev=1479587&r1=1479579&r2=1479587&view=diff
==============================================================================
--- accumulo/trunk/core/src/main/java/org/apache/accumulo/core/client/lexicoder/impl/ByteUtils.java (original)
+++ accumulo/trunk/core/src/main/java/org/apache/accumulo/core/client/lexicoder/impl/ByteUtils.java Mon May 6 14:42:37 2013
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.accumulo.core.client.lexicoder.util;
+package org.apache.accumulo.core.client.lexicoder.impl;
import java.util.ArrayList;
Modified: accumulo/trunk/core/src/main/java/org/apache/accumulo/core/client/lexicoder/impl/FixedByteArrayOutputStream.java
URL: http://svn.apache.org/viewvc/accumulo/trunk/core/src/main/java/org/apache/accumulo/core/client/lexicoder/impl/FixedByteArrayOutputStream.java?rev=1479587&r1=1479579&r2=1479587&view=diff
==============================================================================
--- accumulo/trunk/core/src/main/java/org/apache/accumulo/core/client/lexicoder/impl/FixedByteArrayOutputStream.java (original)
+++ accumulo/trunk/core/src/main/java/org/apache/accumulo/core/client/lexicoder/impl/FixedByteArrayOutputStream.java Mon May 6 14:42:37 2013
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.accumulo.core.client.lexicoder.util;
+package org.apache.accumulo.core.client.lexicoder.impl;
import java.io.IOException;
import java.io.OutputStream;