From 3c21a78e1a59ebc84e34f26f4e4efa43dc23bac0 Mon Sep 17 00:00:00 2001
From: Walter Oggioni <walter.oggioni@r3.com>
Date: Fri, 1 May 2020 00:45:04 +0100
Subject: [PATCH] fixed performance bug

---
 cli/src/main/kotlin/net/woggioni/jzstd/Cli.kt    |  6 ++----
 .../net/woggioni/jzstd/ZstdOutputStream.java     | 16 ++++++++--------
 .../woggioni/jzstd/internal/ZSTD_inBuffer.java   |  2 +-
 .../woggioni/jzstd/internal/ZSTD_outBuffer.java  |  2 +-
 4 files changed, 12 insertions(+), 14 deletions(-)

diff --git a/cli/src/main/kotlin/net/woggioni/jzstd/Cli.kt b/cli/src/main/kotlin/net/woggioni/jzstd/Cli.kt
index 3778971..32fdfc7 100644
--- a/cli/src/main/kotlin/net/woggioni/jzstd/Cli.kt
+++ b/cli/src/main/kotlin/net/woggioni/jzstd/Cli.kt
@@ -3,8 +3,6 @@ package net.woggioni.jzstd
 import com.beust.jcommander.JCommander
 import com.beust.jcommander.Parameter
 import org.slf4j.LoggerFactory
-import java.io.BufferedInputStream
-import java.io.BufferedOutputStream
 import java.io.InputStream
 import java.io.OutputStream
 import java.nio.file.Files
@@ -32,7 +30,7 @@ object Cli {
             var overwrite: Boolean = false,
 
             @Parameter(names = arrayOf("-l", "--level"), description = "Set compression level")
-            var level: Int = 3,
+            var level: Int = 0,
 
             @Parameter(names = arrayOf("-i", "--input"), description = "Set input file, defaults to stdin otherwise")
             var input: String? = null,
@@ -110,7 +108,7 @@ object Cli {
                             else it
                         }
                 output.use { outputStream ->
-                    val buffer = ByteArray(0x10000)
+                    val buffer = ByteArray(0x1000)
                     while (true) {
                         val read = inputStream.read(buffer, 0, buffer.size)
                         if (read < 0) break
diff --git a/src/main/java/net/woggioni/jzstd/ZstdOutputStream.java b/src/main/java/net/woggioni/jzstd/ZstdOutputStream.java
index 3a0ed49..14bb810 100644
--- a/src/main/java/net/woggioni/jzstd/ZstdOutputStream.java
+++ b/src/main/java/net/woggioni/jzstd/ZstdOutputStream.java
@@ -16,7 +16,7 @@ public class ZstdOutputStream extends OutputStream {
 
     private static final int inputBufferSize = ZstdLibrary.CStreamInSize();
     private static final int outputBufferSize = ZstdLibrary.CStreamOutSize();
-
+    private final byte[] buffer = new byte[outputBufferSize];
 
     private ZstdOutputStream(OutputStream sink,
                              ZstdCompressionCtx ctx,
@@ -37,7 +37,7 @@ public class ZstdOutputStream extends OutputStream {
     }
 
     public static ZstdOutputStream from(OutputStream sink) {
-        return from(sink, 3);
+        return from(sink, 0);
     }
 
     public static ZstdOutputStream from(OutputStream sink,
@@ -49,6 +49,7 @@ public class ZstdOutputStream extends OutputStream {
         }
         ZstdCompressionCtx ctx = new ZstdCompressionCtx();
         ctx.setParameter(CompressionParameter.compressionLevel, compressionLevel);
+        ctx.setParameter(CompressionParameter.checksumFlag, 1);
         return new ZstdOutputStream(sink, ctx, true);
     }
 
@@ -62,12 +63,11 @@ public class ZstdOutputStream extends OutputStream {
         input.pos = zero;
         while (true) {
             size_t rc = ZstdLibrary.compressStream2(ctx.ctx, output, input, flag);
-            if (output.pos.longValue() > 0) {
-                int limit = output.pos.intValue();
-                while(output.dst.position() < limit) {
-                    byte b = output.dst.get();
-                    sink.write(b);
-                }
+            if (flag == ZSTD_EndDirective.ZSTD_e_end || output.pos.longValue() > output.dst.capacity() / 2) {
+                int toWrite = output.pos.intValue() - output.dst.position();
+
+                output.dst.get(buffer, output.dst.position(), toWrite);
+                sink.write(buffer, 0, toWrite);
                 output.pos = zero;
                 output.dst.position(0);
             }
diff --git a/src/main/java/net/woggioni/jzstd/internal/ZSTD_inBuffer.java b/src/main/java/net/woggioni/jzstd/internal/ZSTD_inBuffer.java
index bb2c501..96563a9 100644
--- a/src/main/java/net/woggioni/jzstd/internal/ZSTD_inBuffer.java
+++ b/src/main/java/net/woggioni/jzstd/internal/ZSTD_inBuffer.java
@@ -12,7 +12,7 @@ public class ZSTD_inBuffer extends Structure {
     public size_t pos;
 
     public ZSTD_inBuffer(int size) {
-        this.src = ByteBuffer.allocateDirect(size).order(ByteOrder.nativeOrder());
+        this.src = ByteBuffer.allocateDirect(size);
         this.size = new size_t(this.src.capacity());
         this.pos = new size_t(this.src.capacity());
     }
diff --git a/src/main/java/net/woggioni/jzstd/internal/ZSTD_outBuffer.java b/src/main/java/net/woggioni/jzstd/internal/ZSTD_outBuffer.java
index 1d432d9..02def98 100644
--- a/src/main/java/net/woggioni/jzstd/internal/ZSTD_outBuffer.java
+++ b/src/main/java/net/woggioni/jzstd/internal/ZSTD_outBuffer.java
@@ -12,7 +12,7 @@ public class ZSTD_outBuffer extends Structure {
     public size_t pos;
 
     public ZSTD_outBuffer(int size) {
-        this.dst = ByteBuffer.allocateDirect(size).order(ByteOrder.nativeOrder());
+        this.dst = ByteBuffer.allocateDirect(size);
         this.size = new size_t(dst.capacity());
         this.pos = new size_t(0);
     }