Skip to content

Revert "Move AbstractLexicoder to API (#1400)" #2325

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
milleruntime wants to merge 1 commit into from
Closed

Revert "Move AbstractLexicoder to API (#1400)" #2325

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions core/src/main/java/org/apache/accumulo/core/client/lexicoder/BigIntegerLexicoder.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,7 @@
import java.io.IOException;
import java.math.BigInteger;

import org.apache.accumulo.core.clientImpl.lexicoder.AbstractLexicoder;
import org.apache.accumulo.core.clientImpl.lexicoder.FixedByteArrayOutputStream;

/**
Expand Down
2 changes: 2 additions & 0 deletions core/src/main/java/org/apache/accumulo/core/client/lexicoder/BytesLexicoder.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,8 @@
*/
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}.
Expand Down
2 changes: 2 additions & 0 deletions core/src/main/java/org/apache/accumulo/core/client/lexicoder/DateLexicoder.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,8 @@

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.
*
Expand Down
2 changes: 2 additions & 0 deletions core/src/main/java/org/apache/accumulo/core/client/lexicoder/DoubleLexicoder.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,8 @@
*/
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.
*
Expand Down
2 changes: 2 additions & 0 deletions core/src/main/java/org/apache/accumulo/core/client/lexicoder/FloatLexicoder.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,8 @@
*/
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.
*
Expand Down
2 changes: 2 additions & 0 deletions core/src/main/java/org/apache/accumulo/core/client/lexicoder/IntegerLexicoder.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,8 @@
*/
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.
Expand Down
2 changes: 2 additions & 0 deletions core/src/main/java/org/apache/accumulo/core/client/lexicoder/ListLexicoder.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,8 @@
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.
Expand Down
1 change: 1 addition & 0 deletions core/src/main/java/org/apache/accumulo/core/client/lexicoder/PairLexicoder.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,7 @@
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;

/**
Expand Down
2 changes: 2 additions & 0 deletions core/src/main/java/org/apache/accumulo/core/client/lexicoder/ReverseLexicoder.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,8 @@
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
Expand Down
2 changes: 2 additions & 0 deletions core/src/main/java/org/apache/accumulo/core/client/lexicoder/SequenceLexicoder.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,8 @@
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.
Expand Down
2 changes: 2 additions & 0 deletions core/src/main/java/org/apache/accumulo/core/client/lexicoder/StringLexicoder.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,8 @@

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.
Expand Down
1 change: 1 addition & 0 deletions core/src/main/java/org/apache/accumulo/core/client/lexicoder/TextLexicoder.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,7 @@
*/
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;

Expand Down
2 changes: 2 additions & 0 deletions core/src/main/java/org/apache/accumulo/core/client/lexicoder/UIntegerLexicoder.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,8 @@
*/
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
Expand Down
2 changes: 2 additions & 0 deletions core/src/main/java/org/apache/accumulo/core/client/lexicoder/ULongLexicoder.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,8 @@
*/
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
Expand Down
1 change: 1 addition & 0 deletions core/src/main/java/org/apache/accumulo/core/client/lexicoder/UUIDLexicoder.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,7 @@
import java.io.IOException;
import java.util.UUID;

import org.apache.accumulo.core.clientImpl.lexicoder.AbstractLexicoder;
import org.apache.accumulo.core.clientImpl.lexicoder.FixedByteArrayOutputStream;

/**
Expand Down
5 changes: 4 additions & 1 deletion ...e/client/lexicoder/AbstractLexicoder.java → ...ientImpl/lexicoder/AbstractLexicoder.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,9 @@
* specific language governing permissions and limitations
* under the License.
*/
package org.apache.accumulo.core.client.lexicoder;
package org.apache.accumulo.core.clientImpl.lexicoder;

import org.apache.accumulo.core.client.lexicoder.AbstractEncoder;
import org.apache.accumulo.core.client.lexicoder.Lexicoder;

public abstract class AbstractLexicoder<T> extends AbstractEncoder<T> implements Lexicoder<T> {}
2 changes: 1 addition & 1 deletion core/src/main/java/org/apache/accumulo/core/iterators/LongCombiner.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,8 +28,8 @@
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;
Expand Down
2 changes: 1 addition & 1 deletion core/src/main/java/org/apache/accumulo/core/iterators/user/BigDecimalCombiner.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@
import java.util.Iterator;
import java.util.Map;

import org.apache.accumulo.core.client.lexicoder.AbstractLexicoder;
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;
Expand Down
2 changes: 1 addition & 1 deletion core/src/main/java/org/apache/accumulo/core/iterators/user/SummingArrayCombiner.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,8 +33,8 @@

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;
Expand Down
1 change: 0 additions & 1 deletion core/src/test/java/org/apache/accumulo/core/clientImpl/lexicoder/AbstractLexicoderTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,6 @@
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;

Expand Down