Since resolving instances are error phrone we need to do it once.

3 files changed, 25 insertions, 8 deletions

diff --git a/searchlib/src/main/java/com/yahoo/searchlib/aggregation/hll/NormalSketch.java b/searchlib/src/main/java/com/yahoo/searchlib/aggregation/hll/NormalSketch.java
index 37d5dd345ad..d32349906ee 100644
--- a/searchlib/src/main/java/com/yahoo/searchlib/aggregation/hll/NormalSketch.java
+++ b/searchlib/src/main/java/com/yahoo/searchlib/aggregation/hll/NormalSketch.java
@@ -22,6 +22,7 @@ public class NormalSketch extends Sketch<NormalSketch>  {
 
     private final byte[] data;
     private final int bucketMask;
+    private static final LZ4Factory lz4Factory = LZ4Factory.safeInstance();
 
     /**
      * Create a sketch with the default precision given by {@link HyperLogLog#DEFAULT_PRECISION}.
@@ -100,7 +101,7 @@ public class NormalSketch extends Sketch<NormalSketch>  {
         super.onSerialize(buf);
         buf.putInt(null, data.length);
         try {
-            LZ4Compressor c = LZ4Factory.safeInstance().highCompressor();
+            LZ4Compressor c = lz4Factory.highCompressor();
             byte[] compressedData = new byte[data.length];
             int compressedSize = c.compress(data, compressedData);
             serializeDataArray(compressedData, compressedSize, buf);
@@ -129,7 +130,7 @@ public class NormalSketch extends Sketch<NormalSketch>  {
         if (length == compressedLength) {
             deserializeDataArray(data, length, buf);
         } else {
-            LZ4FastDecompressor c = LZ4Factory.safeInstance().fastDecompressor();
+            LZ4FastDecompressor c = lz4Factory.fastDecompressor();
             byte[] compressedData = buf.getBytes(null, compressedLength);
             c.decompress(compressedData, data);
         }
diff --git a/vespaclient-java/src/main/java/com/yahoo/vespasummarybenchmark/VespaSummaryBenchmark.java b/vespaclient-java/src/main/java/com/yahoo/vespasummarybenchmark/VespaSummaryBenchmark.java
index 16f8198a8ac..c47ffb241d2 100644
--- a/vespaclient-java/src/main/java/com/yahoo/vespasummarybenchmark/VespaSummaryBenchmark.java
+++ b/vespaclient-java/src/main/java/com/yahoo/vespasummarybenchmark/VespaSummaryBenchmark.java
@@ -5,13 +5,29 @@ import com.yahoo.compress.CompressionType;
 import com.yahoo.document.GlobalId;
 import com.yahoo.document.idstring.IdString;
 import com.yahoo.document.serialization.DeserializationException;
-import com.yahoo.jrt.*;
+import com.yahoo.jrt.DataValue;
+import com.yahoo.jrt.Int32Value;
+import com.yahoo.jrt.Int8Value;
+import com.yahoo.jrt.Request;
+import com.yahoo.jrt.RequestWaiter;
+import com.yahoo.jrt.Spec;
+import com.yahoo.jrt.Supervisor;
+import com.yahoo.jrt.Target;
+import com.yahoo.jrt.Transport;
+import com.yahoo.jrt.Values;
 import com.yahoo.log.LogSetup;
-import com.yahoo.slime.*;
+import com.yahoo.slime.BinaryFormat;
+import com.yahoo.slime.Cursor;
+import com.yahoo.slime.JsonFormat;
+import com.yahoo.slime.Slime;
 import net.jpountz.lz4.LZ4Factory;
 import net.jpountz.lz4.LZ4FastDecompressor;
 
-import java.io.*;
+import java.io.BufferedReader;
+import java.io.DataInputStream;
+import java.io.FileInputStream;
+import java.io.IOException;
+import java.io.InputStreamReader;
 import java.util.ArrayList;
 import java.util.List;
 
@@ -26,6 +42,7 @@ import java.util.List;
 public class VespaSummaryBenchmark {
 
     private final Supervisor supervisor = new Supervisor(new Transport());
+    private static final LZ4Factory lz4Factory = LZ4Factory.fastestInstance();
 
     private VespaSummaryBenchmark() { }
 
@@ -82,8 +99,7 @@ public class VespaSummaryBenchmark {
             int uncompressedSize = ret.get(1).asInt32();
             byte [] blob = ret.get(2).asData();
             if (type == CompressionType.LZ4) {
-                LZ4Factory factory = LZ4Factory.fastestInstance();
-                LZ4FastDecompressor decompressor = factory.fastDecompressor();
+                LZ4FastDecompressor decompressor = lz4Factory.fastDecompressor();
                 byte [] uncompressed = new byte [uncompressedSize];
                 int compressedLength = decompressor.decompress(blob, 0, uncompressed, 0, uncompressedSize);
                 if (compressedLength != blob.length) {
diff --git a/vespajlib/src/main/java/com/yahoo/compress/Compressor.java b/vespajlib/src/main/java/com/yahoo/compress/Compressor.java
index bb1ca99c4ab..fb5da192f36 100644
--- a/vespajlib/src/main/java/com/yahoo/compress/Compressor.java
+++ b/vespajlib/src/main/java/com/yahoo/compress/Compressor.java
@@ -23,7 +23,7 @@ public class Compressor {
     private final double compressionThresholdFactor;
     private final int compressMinSizeBytes;
 
-    private final LZ4Factory factory = LZ4Factory.fastestInstance();
+    private static final LZ4Factory factory = LZ4Factory.fastestInstance();
 
     /** Creates a compressor with default settings. */
     public Compressor() {