Skip to content

Commit f17ad82

Browse files
committed
remove snappy support
relates to elastic#2459
1 parent 677e6ce commit f17ad82

19 files changed

+1
-930
lines changed

pom.xml

Lines changed: 1 addition & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -219,14 +219,6 @@
219219
<optional>true</optional>
220220
</dependency>
221221

222-
<dependency>
223-
<groupId>org.xerial.snappy</groupId>
224-
<artifactId>snappy-java</artifactId>
225-
<version>1.0.4.1</version>
226-
<scope>compile</scope>
227-
<optional>true</optional>
228-
</dependency>
229-
230222
<!-- We don't use this since the publish pom is then messed up -->
231223
<!--
232224
<dependency>
@@ -544,7 +536,7 @@
544536
</data>
545537
<data>
546538
<src>${project.build.directory}/lib</src>
547-
<includes>lucene*, log4j*, jna*, snappy-java-*, spatial4j*, jts*</includes>
539+
<includes>lucene*, log4j*, jna*, spatial4j*, jts*</includes>
548540
<type>directory</type>
549541
<mapper>
550542
<type>perm</type>

src/main/assemblies/common-bin.xml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,6 @@
77
<include>org.apache.lucene:lucene*</include>
88
<include>log4j:log4j</include>
99
<include>net.java.dev.jna:jna</include>
10-
<include>org.xerial.snappy:snappy-java</include>
1110
<include>com.spatial4j:spatial4j</include>
1211
<include>com.vividsolutions:jts</include>
1312
</includes>

src/main/java/org/elasticsearch/common/compress/CompressorFactory.java

Lines changed: 0 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -27,9 +27,6 @@
2727
import org.elasticsearch.common.bytes.BytesReference;
2828
import org.elasticsearch.common.collect.MapBuilder;
2929
import org.elasticsearch.common.compress.lzf.LZFCompressor;
30-
import org.elasticsearch.common.compress.snappy.UnavailableSnappyCompressor;
31-
import org.elasticsearch.common.compress.snappy.xerial.XerialSnappy;
32-
import org.elasticsearch.common.compress.snappy.xerial.XerialSnappyCompressor;
3330
import org.elasticsearch.common.io.Streams;
3431
import org.elasticsearch.common.io.stream.CachedStreamOutput;
3532
import org.elasticsearch.common.io.stream.StreamInput;
@@ -54,19 +51,8 @@ public class CompressorFactory {
5451
static {
5552
List<Compressor> compressorsX = Lists.newArrayList();
5653
compressorsX.add(LZF);
57-
boolean addedSnappy = false;
58-
if (XerialSnappy.available) {
59-
compressorsX.add(new XerialSnappyCompressor());
60-
addedSnappy = true;
61-
} else {
62-
Loggers.getLogger(CompressorFactory.class).debug("failed to load xerial snappy-java", XerialSnappy.failure);
63-
}
64-
if (!addedSnappy) {
65-
compressorsX.add(new UnavailableSnappyCompressor());
66-
}
6754

6855
compressors = compressorsX.toArray(new Compressor[compressorsX.size()]);
69-
7056
MapBuilder<String, Compressor> compressorsByTypeX = MapBuilder.newMapBuilder();
7157
for (Compressor compressor : compressors) {
7258
compressorsByTypeX.put(compressor.type(), compressor);

src/main/java/org/elasticsearch/common/compress/snappy/SnappyCompressedIndexInput.java

Lines changed: 0 additions & 67 deletions
This file was deleted.

src/main/java/org/elasticsearch/common/compress/snappy/SnappyCompressedIndexOutput.java

Lines changed: 0 additions & 64 deletions
This file was deleted.

src/main/java/org/elasticsearch/common/compress/snappy/SnappyCompressedStreamInput.java

Lines changed: 0 additions & 72 deletions
This file was deleted.

src/main/java/org/elasticsearch/common/compress/snappy/SnappyCompressedStreamOutput.java

Lines changed: 0 additions & 64 deletions
This file was deleted.

0 commit comments

Comments
 (0)