accumulo-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From mmil...@apache.org
Subject [accumulo] branch master updated: Move AbstractLexicoder to API (#1400)
Date Fri, 01 Nov 2019 20:36:03 GMT
This is an automated email from the ASF dual-hosted git repository.

mmiller pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/accumulo.git


The following commit(s) were added to refs/heads/master by this push:
     new 2e8144e  Move AbstractLexicoder to API (#1400)
2e8144e is described below

commit 2e8144ec89e74d37c7ff97d301051fea747e05c7
Author: Mike Miller <mmiller@apache.org>
AuthorDate: Fri Nov 1 16:35:52 2019 -0400

    Move AbstractLexicoder to API (#1400)
---
 .../core/{clientImpl => client}/lexicoder/AbstractLexicoder.java     | 5 +----
 .../apache/accumulo/core/client/lexicoder/BigIntegerLexicoder.java   | 1 -
 .../org/apache/accumulo/core/client/lexicoder/BytesLexicoder.java    | 2 --
 .../org/apache/accumulo/core/client/lexicoder/DateLexicoder.java     | 2 --
 .../org/apache/accumulo/core/client/lexicoder/DoubleLexicoder.java   | 2 --
 .../org/apache/accumulo/core/client/lexicoder/FloatLexicoder.java    | 2 --
 .../org/apache/accumulo/core/client/lexicoder/IntegerLexicoder.java  | 2 --
 .../org/apache/accumulo/core/client/lexicoder/ListLexicoder.java     | 2 --
 .../org/apache/accumulo/core/client/lexicoder/PairLexicoder.java     | 1 -
 .../org/apache/accumulo/core/client/lexicoder/ReverseLexicoder.java  | 2 --
 .../org/apache/accumulo/core/client/lexicoder/SequenceLexicoder.java | 2 --
 .../org/apache/accumulo/core/client/lexicoder/StringLexicoder.java   | 2 --
 .../org/apache/accumulo/core/client/lexicoder/TextLexicoder.java     | 1 -
 .../org/apache/accumulo/core/client/lexicoder/UIntegerLexicoder.java | 2 --
 .../org/apache/accumulo/core/client/lexicoder/ULongLexicoder.java    | 2 --
 .../org/apache/accumulo/core/client/lexicoder/UUIDLexicoder.java     | 1 -
 .../main/java/org/apache/accumulo/core/iterators/LongCombiner.java   | 2 +-
 .../org/apache/accumulo/core/iterators/user/BigDecimalCombiner.java  | 2 +-
 .../apache/accumulo/core/iterators/user/SummingArrayCombiner.java    | 2 +-
 .../accumulo/core/clientImpl/lexicoder/AbstractLexicoderTest.java    | 1 +
 20 files changed, 5 insertions(+), 33 deletions(-)

diff --git a/core/src/main/java/org/apache/accumulo/core/clientImpl/lexicoder/AbstractLexicoder.java
b/core/src/main/java/org/apache/accumulo/core/client/lexicoder/AbstractLexicoder.java
similarity index 83%
rename from core/src/main/java/org/apache/accumulo/core/clientImpl/lexicoder/AbstractLexicoder.java
rename to core/src/main/java/org/apache/accumulo/core/client/lexicoder/AbstractLexicoder.java
index 0fbaa21..959b13f 100644
--- a/core/src/main/java/org/apache/accumulo/core/clientImpl/lexicoder/AbstractLexicoder.java
+++ b/core/src/main/java/org/apache/accumulo/core/client/lexicoder/AbstractLexicoder.java
@@ -14,9 +14,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.accumulo.core.clientImpl.lexicoder;
-
-import org.apache.accumulo.core.client.lexicoder.AbstractEncoder;
-import org.apache.accumulo.core.client.lexicoder.Lexicoder;
+package org.apache.accumulo.core.client.lexicoder;
 
 public abstract class AbstractLexicoder<T> extends AbstractEncoder<T> implements
Lexicoder<T> {}
diff --git a/core/src/main/java/org/apache/accumulo/core/client/lexicoder/BigIntegerLexicoder.java
b/core/src/main/java/org/apache/accumulo/core/client/lexicoder/BigIntegerLexicoder.java
index 245cda1..dea8310 100644
--- a/core/src/main/java/org/apache/accumulo/core/client/lexicoder/BigIntegerLexicoder.java
+++ b/core/src/main/java/org/apache/accumulo/core/client/lexicoder/BigIntegerLexicoder.java
@@ -22,7 +22,6 @@ import java.io.DataOutputStream;
 import java.io.IOException;
 import java.math.BigInteger;
 
-import org.apache.accumulo.core.clientImpl.lexicoder.AbstractLexicoder;
 import org.apache.accumulo.core.clientImpl.lexicoder.FixedByteArrayOutputStream;
 
 /**
diff --git a/core/src/main/java/org/apache/accumulo/core/client/lexicoder/BytesLexicoder.java
b/core/src/main/java/org/apache/accumulo/core/client/lexicoder/BytesLexicoder.java
index 65cfbf8..d9dd9a4 100644
--- a/core/src/main/java/org/apache/accumulo/core/client/lexicoder/BytesLexicoder.java
+++ b/core/src/main/java/org/apache/accumulo/core/client/lexicoder/BytesLexicoder.java
@@ -16,8 +16,6 @@
  */
 package org.apache.accumulo.core.client.lexicoder;
 
-import org.apache.accumulo.core.clientImpl.lexicoder.AbstractLexicoder;
-
 /**
  * For each of the methods, this lexicoder just passes the input through untouched. It is
meant to
  * be combined with other lexicoders like the {@link ReverseLexicoder}.
diff --git a/core/src/main/java/org/apache/accumulo/core/client/lexicoder/DateLexicoder.java
b/core/src/main/java/org/apache/accumulo/core/client/lexicoder/DateLexicoder.java
index 452c4ae..2dc1969 100644
--- a/core/src/main/java/org/apache/accumulo/core/client/lexicoder/DateLexicoder.java
+++ b/core/src/main/java/org/apache/accumulo/core/client/lexicoder/DateLexicoder.java
@@ -18,8 +18,6 @@ package org.apache.accumulo.core.client.lexicoder;
 
 import java.util.Date;
 
-import org.apache.accumulo.core.clientImpl.lexicoder.AbstractLexicoder;
-
 /**
  * A lexicoder for date objects. It preserves the native Java sort order for Date.
  *
diff --git a/core/src/main/java/org/apache/accumulo/core/client/lexicoder/DoubleLexicoder.java
b/core/src/main/java/org/apache/accumulo/core/client/lexicoder/DoubleLexicoder.java
index dbbba7c..3ab7f94 100644
--- a/core/src/main/java/org/apache/accumulo/core/client/lexicoder/DoubleLexicoder.java
+++ b/core/src/main/java/org/apache/accumulo/core/client/lexicoder/DoubleLexicoder.java
@@ -16,8 +16,6 @@
  */
 package org.apache.accumulo.core.client.lexicoder;
 
-import org.apache.accumulo.core.clientImpl.lexicoder.AbstractLexicoder;
-
 /**
  * A lexicoder for preserving the native Java sort order of Double values.
  *
diff --git a/core/src/main/java/org/apache/accumulo/core/client/lexicoder/FloatLexicoder.java
b/core/src/main/java/org/apache/accumulo/core/client/lexicoder/FloatLexicoder.java
index ad03533..460f239 100644
--- a/core/src/main/java/org/apache/accumulo/core/client/lexicoder/FloatLexicoder.java
+++ b/core/src/main/java/org/apache/accumulo/core/client/lexicoder/FloatLexicoder.java
@@ -16,8 +16,6 @@
  */
 package org.apache.accumulo.core.client.lexicoder;
 
-import org.apache.accumulo.core.clientImpl.lexicoder.AbstractLexicoder;
-
 /**
  * A lexicoder for preserving the native Java sort order of Float values.
  *
diff --git a/core/src/main/java/org/apache/accumulo/core/client/lexicoder/IntegerLexicoder.java
b/core/src/main/java/org/apache/accumulo/core/client/lexicoder/IntegerLexicoder.java
index 0b2fa33..21a2cd3 100644
--- a/core/src/main/java/org/apache/accumulo/core/client/lexicoder/IntegerLexicoder.java
+++ b/core/src/main/java/org/apache/accumulo/core/client/lexicoder/IntegerLexicoder.java
@@ -16,8 +16,6 @@
  */
 package org.apache.accumulo.core.client.lexicoder;
 
-import org.apache.accumulo.core.clientImpl.lexicoder.AbstractLexicoder;
-
 /**
  * A lexicoder for signed integers. The encoding sorts Integer.MIN_VALUE first and Integer.MAX_VALUE
  * last. The encoding sorts -2 before -1. It corresponds to the sort order of Integer.
diff --git a/core/src/main/java/org/apache/accumulo/core/client/lexicoder/ListLexicoder.java
b/core/src/main/java/org/apache/accumulo/core/client/lexicoder/ListLexicoder.java
index 5835290..6c430af 100644
--- a/core/src/main/java/org/apache/accumulo/core/client/lexicoder/ListLexicoder.java
+++ b/core/src/main/java/org/apache/accumulo/core/client/lexicoder/ListLexicoder.java
@@ -24,8 +24,6 @@ import static org.apache.accumulo.core.clientImpl.lexicoder.ByteUtils.unescape;
 import java.util.ArrayList;
 import java.util.List;
 
-import org.apache.accumulo.core.clientImpl.lexicoder.AbstractLexicoder;
-
 /**
  * A lexicoder to encode/decode a Java List to/from a byte array where the concatenation
of each
  * encoded element sorts lexicographically.
diff --git a/core/src/main/java/org/apache/accumulo/core/client/lexicoder/PairLexicoder.java
b/core/src/main/java/org/apache/accumulo/core/client/lexicoder/PairLexicoder.java
index c887171..2ce3350 100644
--- a/core/src/main/java/org/apache/accumulo/core/client/lexicoder/PairLexicoder.java
+++ b/core/src/main/java/org/apache/accumulo/core/client/lexicoder/PairLexicoder.java
@@ -21,7 +21,6 @@ import static org.apache.accumulo.core.clientImpl.lexicoder.ByteUtils.escape;
 import static org.apache.accumulo.core.clientImpl.lexicoder.ByteUtils.split;
 import static org.apache.accumulo.core.clientImpl.lexicoder.ByteUtils.unescape;
 
-import org.apache.accumulo.core.clientImpl.lexicoder.AbstractLexicoder;
 import org.apache.accumulo.core.util.ComparablePair;
 
 /**
diff --git a/core/src/main/java/org/apache/accumulo/core/client/lexicoder/ReverseLexicoder.java
b/core/src/main/java/org/apache/accumulo/core/client/lexicoder/ReverseLexicoder.java
index ebe578c..c1736b6 100644
--- a/core/src/main/java/org/apache/accumulo/core/client/lexicoder/ReverseLexicoder.java
+++ b/core/src/main/java/org/apache/accumulo/core/client/lexicoder/ReverseLexicoder.java
@@ -19,8 +19,6 @@ package org.apache.accumulo.core.client.lexicoder;
 import static org.apache.accumulo.core.clientImpl.lexicoder.ByteUtils.escape;
 import static org.apache.accumulo.core.clientImpl.lexicoder.ByteUtils.unescape;
 
-import org.apache.accumulo.core.clientImpl.lexicoder.AbstractLexicoder;
-
 /**
  * A lexicoder that flips the sort order from another lexicoder. If this is applied to
  * {@link DateLexicoder}, the most recent date will be sorted first and the oldest date will
be
diff --git a/core/src/main/java/org/apache/accumulo/core/client/lexicoder/SequenceLexicoder.java
b/core/src/main/java/org/apache/accumulo/core/client/lexicoder/SequenceLexicoder.java
index 8baa59b..e1ceb27 100644
--- a/core/src/main/java/org/apache/accumulo/core/client/lexicoder/SequenceLexicoder.java
+++ b/core/src/main/java/org/apache/accumulo/core/client/lexicoder/SequenceLexicoder.java
@@ -25,8 +25,6 @@ import static org.apache.accumulo.core.clientImpl.lexicoder.ByteUtils.unescape;
 import java.util.ArrayList;
 import java.util.List;
 
-import org.apache.accumulo.core.clientImpl.lexicoder.AbstractLexicoder;
-
 /**
  * A Lexicoder to encode/decode a Java List to/from a byte array where the concatenation
of each
  * encoded element sorts lexicographically.
diff --git a/core/src/main/java/org/apache/accumulo/core/client/lexicoder/StringLexicoder.java
b/core/src/main/java/org/apache/accumulo/core/client/lexicoder/StringLexicoder.java
index 31b6117..7b8c5f4 100644
--- a/core/src/main/java/org/apache/accumulo/core/client/lexicoder/StringLexicoder.java
+++ b/core/src/main/java/org/apache/accumulo/core/client/lexicoder/StringLexicoder.java
@@ -18,8 +18,6 @@ package org.apache.accumulo.core.client.lexicoder;
 
 import static java.nio.charset.StandardCharsets.UTF_8;
 
-import org.apache.accumulo.core.clientImpl.lexicoder.AbstractLexicoder;
-
 /**
  * This lexicoder encodes/decodes a given String to/from bytes without further processing.
It can be
  * combined with other encoders like the {@link ReverseLexicoder} to flip the default sort
order.
diff --git a/core/src/main/java/org/apache/accumulo/core/client/lexicoder/TextLexicoder.java
b/core/src/main/java/org/apache/accumulo/core/client/lexicoder/TextLexicoder.java
index 560cc46..b0ae4c1 100644
--- a/core/src/main/java/org/apache/accumulo/core/client/lexicoder/TextLexicoder.java
+++ b/core/src/main/java/org/apache/accumulo/core/client/lexicoder/TextLexicoder.java
@@ -16,7 +16,6 @@
  */
 package org.apache.accumulo.core.client.lexicoder;
 
-import org.apache.accumulo.core.clientImpl.lexicoder.AbstractLexicoder;
 import org.apache.accumulo.core.util.TextUtil;
 import org.apache.hadoop.io.Text;
 
diff --git a/core/src/main/java/org/apache/accumulo/core/client/lexicoder/UIntegerLexicoder.java
b/core/src/main/java/org/apache/accumulo/core/client/lexicoder/UIntegerLexicoder.java
index 8589602..a1cc362 100644
--- a/core/src/main/java/org/apache/accumulo/core/client/lexicoder/UIntegerLexicoder.java
+++ b/core/src/main/java/org/apache/accumulo/core/client/lexicoder/UIntegerLexicoder.java
@@ -16,8 +16,6 @@
  */
 package org.apache.accumulo.core.client.lexicoder;
 
-import org.apache.accumulo.core.clientImpl.lexicoder.AbstractLexicoder;
-
 /**
  * A lexicoder for an unsigned integer. It sorts 0 before -1 and does not preserve the native
sort
  * order of a Java integer because Java does not contain an unsigned integer. If Java had
an
diff --git a/core/src/main/java/org/apache/accumulo/core/client/lexicoder/ULongLexicoder.java
b/core/src/main/java/org/apache/accumulo/core/client/lexicoder/ULongLexicoder.java
index d5a0ee9..1f2540c 100644
--- a/core/src/main/java/org/apache/accumulo/core/client/lexicoder/ULongLexicoder.java
+++ b/core/src/main/java/org/apache/accumulo/core/client/lexicoder/ULongLexicoder.java
@@ -16,8 +16,6 @@
  */
 package org.apache.accumulo.core.client.lexicoder;
 
-import org.apache.accumulo.core.clientImpl.lexicoder.AbstractLexicoder;
-
 /**
  * Unsigned long lexicoder. 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
diff --git a/core/src/main/java/org/apache/accumulo/core/client/lexicoder/UUIDLexicoder.java
b/core/src/main/java/org/apache/accumulo/core/client/lexicoder/UUIDLexicoder.java
index aa1ba61..9dbbf41 100644
--- a/core/src/main/java/org/apache/accumulo/core/client/lexicoder/UUIDLexicoder.java
+++ b/core/src/main/java/org/apache/accumulo/core/client/lexicoder/UUIDLexicoder.java
@@ -22,7 +22,6 @@ import java.io.DataOutputStream;
 import java.io.IOException;
 import java.util.UUID;
 
-import org.apache.accumulo.core.clientImpl.lexicoder.AbstractLexicoder;
 import org.apache.accumulo.core.clientImpl.lexicoder.FixedByteArrayOutputStream;
 
 /**
diff --git a/core/src/main/java/org/apache/accumulo/core/iterators/LongCombiner.java b/core/src/main/java/org/apache/accumulo/core/iterators/LongCombiner.java
index 888eb1f..1d5a611 100644
--- a/core/src/main/java/org/apache/accumulo/core/iterators/LongCombiner.java
+++ b/core/src/main/java/org/apache/accumulo/core/iterators/LongCombiner.java
@@ -26,8 +26,8 @@ import java.io.IOException;
 import java.util.Map;
 
 import org.apache.accumulo.core.client.IteratorSetting;
+import org.apache.accumulo.core.client.lexicoder.AbstractLexicoder;
 import org.apache.accumulo.core.client.lexicoder.Encoder;
-import org.apache.accumulo.core.clientImpl.lexicoder.AbstractLexicoder;
 import org.apache.accumulo.core.data.Key;
 import org.apache.accumulo.core.data.Value;
 import org.apache.hadoop.io.WritableUtils;
diff --git a/core/src/main/java/org/apache/accumulo/core/iterators/user/BigDecimalCombiner.java
b/core/src/main/java/org/apache/accumulo/core/iterators/user/BigDecimalCombiner.java
index 2f85675..c98fb57 100644
--- a/core/src/main/java/org/apache/accumulo/core/iterators/user/BigDecimalCombiner.java
+++ b/core/src/main/java/org/apache/accumulo/core/iterators/user/BigDecimalCombiner.java
@@ -23,7 +23,7 @@ import java.math.BigDecimal;
 import java.util.Iterator;
 import java.util.Map;
 
-import org.apache.accumulo.core.clientImpl.lexicoder.AbstractLexicoder;
+import org.apache.accumulo.core.client.lexicoder.AbstractLexicoder;
 import org.apache.accumulo.core.data.Key;
 import org.apache.accumulo.core.data.Value;
 import org.apache.accumulo.core.iterators.IteratorEnvironment;
diff --git a/core/src/main/java/org/apache/accumulo/core/iterators/user/SummingArrayCombiner.java
b/core/src/main/java/org/apache/accumulo/core/iterators/user/SummingArrayCombiner.java
index 015a12f..0fc886b 100644
--- a/core/src/main/java/org/apache/accumulo/core/iterators/user/SummingArrayCombiner.java
+++ b/core/src/main/java/org/apache/accumulo/core/iterators/user/SummingArrayCombiner.java
@@ -31,8 +31,8 @@ import java.util.Map;
 
 import org.apache.accumulo.core.client.IteratorSetting;
 import org.apache.accumulo.core.client.lexicoder.AbstractEncoder;
+import org.apache.accumulo.core.client.lexicoder.AbstractLexicoder;
 import org.apache.accumulo.core.client.lexicoder.Encoder;
-import org.apache.accumulo.core.clientImpl.lexicoder.AbstractLexicoder;
 import org.apache.accumulo.core.data.Key;
 import org.apache.accumulo.core.data.Value;
 import org.apache.accumulo.core.iterators.IteratorEnvironment;
diff --git a/core/src/test/java/org/apache/accumulo/core/clientImpl/lexicoder/AbstractLexicoderTest.java
b/core/src/test/java/org/apache/accumulo/core/clientImpl/lexicoder/AbstractLexicoderTest.java
index 8f1ffb1..3369786 100644
--- a/core/src/test/java/org/apache/accumulo/core/clientImpl/lexicoder/AbstractLexicoderTest.java
+++ b/core/src/test/java/org/apache/accumulo/core/clientImpl/lexicoder/AbstractLexicoderTest.java
@@ -19,6 +19,7 @@ package org.apache.accumulo.core.clientImpl.lexicoder;
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.fail;
 
+import org.apache.accumulo.core.client.lexicoder.AbstractLexicoder;
 import org.apache.accumulo.core.client.lexicoder.LexicoderTest;
 import org.apache.commons.lang3.ArrayUtils;
 


Mime
View raw message