Skip to content
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

PHOENIX-7482 Replace uses of org.iq80.snappy:snappy with org.xerial.snappy:snappy-java #2039

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
+31 −20
Open

PHOENIX-7482 Replace uses of org.iq80.snappy:snappy with org.xerial.snappy:snappy-java #2039

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
c009aab
PHOENIX-7482 Replace uses of org.iq80.snappy:snappy with org.xerial.s…
apurtell Dec 9, 2024
24963c3
Xerial Snappy has a JNI component so cannot be shaded or else native …
apurtell Dec 19, 2024
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
4 changes: 2 additions & 2 deletions phoenix-core-client/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -359,8 +359,8 @@
<artifactId>jsr305</artifactId>
</dependency>
<dependency>
<groupId>org.iq80.snappy</groupId>
<artifactId>snappy</artifactId>
<groupId>org.xerial.snappy</groupId>
<artifactId>snappy-java</artifactId>
</dependency>
<dependency>
<groupId>com.fasterxml.jackson.core</groupId>
Expand Down
4 changes: 2 additions & 2 deletions ...java/org/apache/phoenix/expression/aggregator/DistinctValueWithCountClientAggregator.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,10 +33,10 @@
import org.apache.phoenix.hbase.index.util.ImmutableBytesPtr;
import org.apache.phoenix.schema.types.PDataType;
import org.apache.phoenix.schema.types.PVarbinary;
import org.xerial.snappy.Snappy;
import org.apache.phoenix.schema.SortOrder;
import org.apache.phoenix.schema.tuple.SingleKeyValueTuple;
import org.apache.phoenix.schema.tuple.Tuple;
import org.iq80.snappy.Snappy;

/**
* Client side Aggregator which will aggregate data and find distinct values with number of occurrences for each.
Expand Down Expand Up @@ -66,7 +66,7 @@ public void aggregate(Tuple tuple, ImmutableBytesWritable ptr) {
if (Bytes.equals(ptr.get(), ptr.getOffset(), 1, DistinctValueWithCountServerAggregator.COMPRESS_MARKER,
0, 1)) {
// This reads the uncompressed length from the front of the compressed input
int uncompressedLength = Snappy.getUncompressedLength(ptr.get(), ptr.getOffset() + 1);
int uncompressedLength = Snappy.uncompressedLength(ptr.get(), ptr.getOffset() + 1, ptr.getLength() - 1);
byte[] uncompressed = new byte[uncompressedLength];
// This will throw CorruptionException, a RuntimeException if the snappy data is invalid.
// We're making a RuntimeException out of a checked IOException below so assume it's ok
Expand Down
11 changes: 8 additions & 3 deletions ...java/org/apache/phoenix/expression/aggregator/DistinctValueWithCountServerAggregator.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@
*/
package org.apache.phoenix.expression.aggregator;

import java.io.IOException;
import java.util.HashMap;
import java.util.Map;
import java.util.Map.Entry;
Expand All @@ -33,7 +34,7 @@
import org.apache.phoenix.schema.types.PVarbinary;
import org.apache.phoenix.util.ByteUtil;
import org.apache.phoenix.util.SizedUtil;
import org.iq80.snappy.Snappy;
import org.xerial.snappy.Snappy;

/**
* Server side Aggregator which will aggregate data and find distinct values with number of occurrences for each.
Expand Down Expand Up @@ -108,8 +109,12 @@ public boolean evaluate(Tuple tuple, ImmutableBytesWritable ptr) {
// The size for the map serialization is above the threshold. We will do the Snappy compression here.
byte[] compressed = new byte[COMPRESS_MARKER.length + Snappy.maxCompressedLength(buffer.length)];
System.arraycopy(COMPRESS_MARKER, 0, compressed, 0, COMPRESS_MARKER.length);
int compressedLen = Snappy.compress(buffer, 1, buffer.length - 1, compressed, COMPRESS_MARKER.length);
ptr.set(compressed, 0, compressedLen + 1);
try {
int compressedLen = Snappy.compress(buffer, 1, buffer.length - 1, compressed, COMPRESS_MARKER.length);
ptr.set(compressed, 0, compressedLen + 1);
} catch (IOException e) {
throw new RuntimeException(e);
}
return true;
}
ptr.set(buffer, 0, offset);
Expand Down
3 changes: 1 addition & 2 deletions phoenix-core-client/src/main/java/org/apache/phoenix/join/HashCacheClient.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,8 +44,7 @@
import org.apache.phoenix.util.ClientUtil;
import org.apache.phoenix.util.TrustedByteArrayOutputStream;
import org.apache.phoenix.util.TupleUtil;
import org.iq80.snappy.Snappy;

import org.xerial.snappy.Snappy;
import org.apache.phoenix.thirdparty.com.google.common.collect.Lists;

/**
Expand Down
10 changes: 4 additions & 6 deletions phoenix-core-client/src/main/java/org/apache/phoenix/join/HashCacheFactory.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,8 +51,7 @@
import org.apache.phoenix.util.ResultUtil;
import org.apache.phoenix.util.SizedUtil;
import org.apache.phoenix.util.TupleUtil;
import org.iq80.snappy.CorruptionException;
import org.iq80.snappy.Snappy;
import org.xerial.snappy.Snappy;

public class HashCacheFactory implements ServerCacheFactory {

Expand All @@ -71,12 +70,11 @@ public void write(DataOutput output) throws IOException {
public Closeable newCache(ImmutableBytesWritable cachePtr, byte[] txState, MemoryChunk chunk, boolean useProtoForIndexMaintainer, int clientVersion) throws SQLException {
try {
// This reads the uncompressed length from the front of the compressed input
int uncompressedLen = Snappy.getUncompressedLength(cachePtr.get(), cachePtr.getOffset());
int uncompressedLen = Snappy.uncompressedLength(cachePtr.get(), cachePtr.getOffset(), cachePtr.getLength());
byte[] uncompressed = new byte[uncompressedLen];
Snappy.uncompress(cachePtr.get(), cachePtr.getOffset(), cachePtr.getLength(),
uncompressed, 0);
Snappy.uncompress(cachePtr.get(), cachePtr.getOffset(), cachePtr.getLength(), uncompressed, 0);
return new HashCacheImpl(uncompressed, chunk, clientVersion);
} catch (CorruptionException e) {
} catch (IOException e) {
throw ClientUtil.parseServerException(e);
}
}
Expand Down
6 changes: 3 additions & 3 deletions pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -120,7 +120,7 @@
<sqlline.version>1.9.0</sqlline.version>
<jcip-annotations.version>1.0-1</jcip-annotations.version>
<jsr305.version>2.0.1</jsr305.version>
<snappy.version>0.5</snappy.version>
<snappy.version>1.1.10.5</snappy.version>
<commons-codec.version>1.16.0</commons-codec.version>
<htrace.version>3.1.0-incubating</htrace.version>
<jodatime.version>2.10.5</jodatime.version>
Expand Down Expand Up @@ -1651,8 +1651,8 @@
<version>${jsr305.version}</version>
</dependency>
<dependency>
<groupId>org.iq80.snappy</groupId>
<artifactId>snappy</artifactId>
<groupId>org.xerial.snappy</groupId>
<artifactId>snappy-java</artifactId>
<version>${snappy.version}</version>
</dependency>
<dependency>
Expand Down