diff --git a/api/src/main/java/com/seibel/distanthorizons/api/enums/config/EDhApiDataCompressionMode.java b/api/src/main/java/com/seibel/distanthorizons/api/enums/config/EDhApiDataCompressionMode.java
index 312b9cdc2..a6bccc9d9 100644
--- a/api/src/main/java/com/seibel/distanthorizons/api/enums/config/EDhApiDataCompressionMode.java
+++ b/api/src/main/java/com/seibel/distanthorizons/api/enums/config/EDhApiDataCompressionMode.java
@@ -55,15 +55,15 @@ public enum EDhApiDataCompressionMode
*/
LZ4(1),
- /**
- * Decent speed and good compression.
- *
- * Read Speed: 9.31 MS / DTO
- * Write Speed: 15.13 MS / DTO
- * Compression ratio: 0.2606
- */
- //@DisallowSelectingViaConfigGui
- Z_STD(2),
+ ///**
+ // * Decent speed and good compression.
+ // *
+ // * Read Speed: 9.31 MS / DTO
+ // * Write Speed: 15.13 MS / DTO
+ // * Compression ratio: 0.2606
+ // */
+ ////@DisallowSelectingViaConfigGui
+ //Z_STD(2),
/**
diff --git a/core/src/main/java/com/seibel/distanthorizons/core/util/objects/dataStreams/DhDataInputStream.java b/core/src/main/java/com/seibel/distanthorizons/core/util/objects/dataStreams/DhDataInputStream.java
index 4fcec523e..f734df8f8 100644
--- a/core/src/main/java/com/seibel/distanthorizons/core/util/objects/dataStreams/DhDataInputStream.java
+++ b/core/src/main/java/com/seibel/distanthorizons/core/util/objects/dataStreams/DhDataInputStream.java
@@ -20,11 +20,8 @@
package com.seibel.distanthorizons.core.util.objects.dataStreams;
import com.seibel.distanthorizons.api.enums.config.EDhApiDataCompressionMode;
-import com.seibel.distanthorizons.core.Initializer;
-import com.seibel.distanthorizons.core.util.objects.DataCorruptedException;
-import com.seibel.distanthorizons.coreapi.ModInfo;
import net.jpountz.lz4.LZ4FrameInputStream;
-import org.apache.commons.compress.compressors.zstandard.ZstdCompressorInputStream;
+//import org.apache.commons.compress.compressors.zstandard.ZstdCompressorInputStream;
import org.apache.logging.log4j.LogManager;
import org.apache.logging.log4j.Logger;
import org.tukaani.xz.ResettableArrayCache;
@@ -45,7 +42,7 @@ import java.io.*;
public class DhDataInputStream extends DataInputStream
{
private static final ThreadLocal LZMA_RESETTABLE_ARRAY_CACHE_GETTER = ThreadLocal.withInitial(() -> new ResettableArrayCache(new LzmaArrayCache()));
- private static final ThreadLocal ZSTD_RESETTABLE_ARRAY_CACHE_GETTER = ThreadLocal.withInitial(() -> new ZstdArrayCache());
+ //private static final ThreadLocal ZSTD_RESETTABLE_ARRAY_CACHE_GETTER = ThreadLocal.withInitial(() -> new ZstdArrayCache());
private static final Logger LOGGER = LogManager.getLogger();
@@ -64,8 +61,8 @@ public class DhDataInputStream extends DataInputStream
return stream;
case LZ4:
return new LZ4FrameInputStream(stream);
- case Z_STD:
- return new ZstdCompressorInputStream(stream, ZSTD_RESETTABLE_ARRAY_CACHE_GETTER.get());
+ //case Z_STD:
+ // return new ZstdCompressorInputStream(stream, ZSTD_RESETTABLE_ARRAY_CACHE_GETTER.get());
case LZMA2:
// using an array cache significantly reduces GC pressure
ResettableArrayCache arrayCache = LZMA_RESETTABLE_ARRAY_CACHE_GETTER.get();
diff --git a/core/src/main/java/com/seibel/distanthorizons/core/util/objects/dataStreams/DhDataOutputStream.java b/core/src/main/java/com/seibel/distanthorizons/core/util/objects/dataStreams/DhDataOutputStream.java
index a074b70a5..d350a168d 100644
--- a/core/src/main/java/com/seibel/distanthorizons/core/util/objects/dataStreams/DhDataOutputStream.java
+++ b/core/src/main/java/com/seibel/distanthorizons/core/util/objects/dataStreams/DhDataOutputStream.java
@@ -23,7 +23,7 @@ import com.seibel.distanthorizons.api.enums.config.EDhApiDataCompressionMode;
import net.jpountz.lz4.LZ4Factory;
import net.jpountz.lz4.LZ4FrameOutputStream;
import net.jpountz.xxhash.XXHashFactory;
-import org.apache.commons.compress.compressors.zstandard.ZstdCompressorOutputStream;
+//import org.apache.commons.compress.compressors.zstandard.ZstdCompressorOutputStream;
import org.apache.logging.log4j.LogManager;
import org.apache.logging.log4j.Logger;
import org.tukaani.xz.*;
@@ -55,8 +55,8 @@ public class DhDataOutputStream extends DataOutputStream
case UNCOMPRESSED:
return stream;
- case Z_STD:
- return new ZstdCompressorOutputStream(stream, 3, true, true);
+ //case Z_STD:
+ // return new ZstdCompressorOutputStream(stream, 3, true, true);
case LZ4:
return new LZ4FrameOutputStream(stream,
LZ4FrameOutputStream.BLOCKSIZE.SIZE_64KB, -1L,
diff --git a/core/src/main/java/com/seibel/distanthorizons/core/util/objects/dataStreams/ZstdArrayCache.java b/core/src/main/java/com/seibel/distanthorizons/core/util/objects/dataStreams/ZstdArrayCache.java
index dc6916bf0..1d387e05f 100644
--- a/core/src/main/java/com/seibel/distanthorizons/core/util/objects/dataStreams/ZstdArrayCache.java
+++ b/core/src/main/java/com/seibel/distanthorizons/core/util/objects/dataStreams/ZstdArrayCache.java
@@ -1,6 +1,6 @@
package com.seibel.distanthorizons.core.util.objects.dataStreams;
-import com.github.luben.zstd.BufferPool;
+//import com.github.luben.zstd.BufferPool;
import com.seibel.distanthorizons.core.logging.DhLoggerBuilder;
import it.unimi.dsi.fastutil.ints.Int2ReferenceArrayMap;
import org.apache.logging.log4j.Logger;
@@ -14,7 +14,7 @@ import java.util.function.IntUnaryOperator;
/**
* LZMA requires a custom object to cache it's backend arrays.
*/
-public class ZstdArrayCache implements BufferPool
+public class ZstdArrayCache //implements BufferPool
{
private static final Logger LOGGER = DhLoggerBuilder.getLogger();
@@ -43,7 +43,7 @@ public class ZstdArrayCache implements BufferPool
// byte arrays //
//=============//
- @Override
+ //@Override
public ByteBuffer get(int size)
{
ArrayList cacheList = this.bufferCache.computeIfAbsent(size, (newSize) -> new ArrayList<>(4));
@@ -61,7 +61,7 @@ public class ZstdArrayCache implements BufferPool
return array;
}
- @Override
+ //@Override
public void release(ByteBuffer buffer)
{
int size = buffer.array().length;
diff --git a/core/src/test/java/tests/CompressionTest.java b/core/src/test/java/tests/CompressionTest.java
index dc7f5ed51..893fce050 100644
--- a/core/src/test/java/tests/CompressionTest.java
+++ b/core/src/test/java/tests/CompressionTest.java
@@ -25,7 +25,7 @@ import com.seibel.distanthorizons.core.sql.dto.FullDataSourceV2DTO;
import com.seibel.distanthorizons.core.sql.repo.FullDataSourceV2Repo;
import com.seibel.distanthorizons.coreapi.util.StringUtil;
import it.unimi.dsi.fastutil.longs.LongArrayList;
-import org.apache.commons.compress.compressors.zstandard.ZstdCompressorOutputStream;
+//import org.apache.commons.compress.compressors.zstandard.ZstdCompressorOutputStream;
import org.junit.Assert;
import org.junit.Test;
@@ -203,8 +203,8 @@ public class CompressionTest
//@Test
public void Zstd() // middle of the road
{
- String compressorName = "Zstd";
- this.testCompressor(compressorName, EDhApiDataCompressionMode.Z_STD);
+ //String compressorName = "Zstd";
+ //this.testCompressor(compressorName, EDhApiDataCompressionMode.Z_STD);
}
//@Test