Delete snappy compression as it doesn't work symmetrically for stream…

… and bytes
EdShangGG · Feb 11, 2019 · e146024 · e146024
1 parent e965701
commit e146024
Show file tree

Hide file tree

Showing 6 changed files with 1 addition and 144 deletions.
diff --git a/pom.xml b/pom.xml
@@ -75,12 +75,6 @@
 
         <!-- test dependencies -->
 
-        <dependency>
-            <groupId>org.xerial.snappy</groupId>
-            <artifactId>snappy-java</artifactId>
-            <optional>true</optional>
-        </dependency>
-
         <dependency>
             <groupId>junit</groupId>
             <artifactId>junit</artifactId>

diff --git a/src/main/java/net/openhft/chronicle/wire/BinaryWire.java b/src/main/java/net/openhft/chronicle/wire/BinaryWire.java
@@ -745,7 +745,7 @@ private void copySpecial(@NotNull WireOut wire, int peekCode) {
                 long readPosition = bytes.readPosition();
                 bytes.uncheckedReadSkipOne();
                 @Nullable StringBuilder sb = readUtf8();
-                if (StringUtils.isEqual("snappy", sb) || StringUtils.isEqual("gzip", sb) || StringUtils.isEqual("lzw", sb)) {
+                if (StringUtils.isEqual("gzip", sb) || StringUtils.isEqual("lzw", sb)) {
                     bytes.readPosition(readPosition);
                     wire.writeComment(sb);
                     wire.getValueOut().text(valueIn.text());

diff --git a/src/main/java/net/openhft/chronicle/wire/TextWire.java b/src/main/java/net/openhft/chronicle/wire/TextWire.java
@@ -30,7 +30,6 @@
 import net.openhft.chronicle.core.values.*;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
-import org.xerial.snappy.Snappy;
 
 import java.io.Externalizable;
 import java.io.IOException;
@@ -2165,16 +2164,6 @@ <ACS extends Appendable & CharSequence> CharSequence textTo0(@NotNull ACS a) {
                     if (StringUtils.isEqual(sb, "!null")) {
                         textTo(sb);
                         ret = null;
-                    } else if (StringUtils.isEqual(sb, "snappy")) {
-                        textTo(sb);
-                        try {
-                            //todo needs to be made efficient
-                            byte[] decodedBytes = Base64.getDecoder().decode(sb.toString().getBytes(ISO_8859_1));
-                            String csq = Snappy.uncompressString(decodedBytes);
-                            ret = acquireStringBuilder().append(csq);
-                        } catch (IOException e) {
-                            throw new AssertionError(e);
-                        }
                     } else {
                         // ignore the type.
                         if (a instanceof StringBuilder) {

diff --git a/src/test/java/net/openhft/chronicle/wire/BinaryWire2Test.java b/src/test/java/net/openhft/chronicle/wire/BinaryWire2Test.java
@@ -24,16 +24,13 @@
 import org.jetbrains.annotations.Nullable;
 import org.junit.After;
 import org.junit.Assert;
-import org.junit.Ignore;
 import org.junit.Test;
 
-import java.io.IOException;
 import java.lang.reflect.Field;
 import java.time.*;
 import java.util.*;
 import java.util.function.Consumer;
 
-import static net.openhft.chronicle.bytes.Bytes.elasticByteBuffer;
 import static net.openhft.chronicle.bytes.NativeBytes.nativeBytes;
 import static org.junit.Assert.*;
 
@@ -478,35 +475,6 @@ public void readDemarshallable() {
         }
     }
 
-    @Test
-    @Ignore("Snappy decompression doesn't work for some reason")
-    public void testSnappyCompressWithSnappy() {
-        if (!Compressions.Snappy.available())
-            return;
-
-        @NotNull Wire wire = createWire();
-        @NotNull String str = "xxxxxxxxxxxxxxxx" +
-                "xxxxxxxxxxxxxxxx" +
-                "xxxxxxxxxxxxxxxx" +
-                "xxxxxxxxxxxxxxxx" +
-                "xxxxxxxxxxxxxxxx";
-
-        wire.write().compress("snappy", Bytes.from(str));
-
-        wire.bytes().readPosition(0);
-        Bytes b = elasticByteBuffer();
-        wire.read().bytes(b);
-        assertEquals(str, b.toString());
-
-        wire.bytes().readPosition(0);
-        Bytes asText = Bytes.elasticByteBuffer();
-        wire.copyTo(new TextWire(asText));
-        assertEquals("message: " + str + "\n", asText.toString());
-
-        wire.bytes().release();
-        asText.release();
-    }
-
     @Test
     public void testSnappyCompressWithGzip() {
         if (!Compressions.Snappy.available())

diff --git a/src/test/java/net/openhft/chronicle/wire/SnappyComparisonMain.java b/src/test/java/net/openhft/chronicle/wire/SnappyComparisonMain.java
diff --git a/src/test/java/net/openhft/chronicle/wire/TextWireTest.java b/src/test/java/net/openhft/chronicle/wire/TextWireTest.java
@@ -1206,42 +1206,6 @@ public void testArrays2() {
         assertArrayEquals(a3, (Object[]) o3);
     }
 
-    @Test
-    @Ignore
-    public void testSnappyCompression() {
-        if (!Compressions.Snappy.available())
-            return;
-        @NotNull Wire wire = createWire();
-        @NotNull final String s = "xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx";
-        @NotNull String str = s + s + s + s;
-
-        wire.write().compress("snappy", Bytes.wrapForRead(str.getBytes(ISO_8859_1)));
-
-        @NotNull Bytes ret = Bytes.allocateElasticDirect();
-        wire.read().bytes(ret);
-        @NotNull byte[] returnBytes = new byte[(int) ret.readRemaining()];
-        ret.read(returnBytes);
-        assertArrayEquals(str.getBytes(ISO_8859_1), returnBytes);
-    }
-
-    @Test
-    @Ignore
-    public void testSnappyCompressionAsText() {
-        if (!Compressions.Snappy.available())
-            return;
-
-        @NotNull Wire wire = createWire();
-        @NotNull final String s = "xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx";
-        @NotNull String str = s + s + s + s;
-
-        @NotNull byte[] bytes0 = str.getBytes(ISO_8859_1);
-        wire.write().compress("snappy", Bytes.wrapForRead(bytes0));
-
-        @NotNull Bytes bytes = allocateElasticDirect();
-        wire.read().bytes(bytes);
-        assertEquals(str, bytes.toString());
-    }
-
     @Test
     public void testGZIPCompressionAsText() {
         @NotNull Wire wire = createWire();