wisplite/distant-horizons-core-sharded
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

comment out Z_STD compression

Browse Source
This commit is contained in:
James Seibel
2025-06-30 06:54:27 -05:00
parent 3a525f53f0
commit 32c3118afa
5 changed files with 23 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files
api/src/main/java/com/seibel/distanthorizons/api/enums/config/EDhApiDataCompressionMode.java
+9 -9
View File
@@ -55,15 +55,15 @@ public enum EDhApiDataCompressionMode
*/
LZ4(1),
/**
* Decent speed and good compression. <br><br>
*
* Read Speed: 9.31 MS / DTO <br>
* Write Speed: 15.13 MS / DTO <br>
* Compression ratio: 0.2606 <br>
*/
//@DisallowSelectingViaConfigGui
Z_STD(2),
///**
// * Decent speed and good compression. <br><br>
// *
// * Read Speed: 9.31 MS / DTO <br>
// * Write Speed: 15.13 MS / DTO <br>
// * Compression ratio: 0.2606 <br>
// */
////@DisallowSelectingViaConfigGui
//Z_STD(2),
/**
core/src/main/java/com/seibel/distanthorizons/core/util/objects/dataStreams/DhDataInputStream.java
+4 -7
View File
@@ -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<ResettableArrayCache> LZMA_RESETTABLE_ARRAY_CACHE_GETTER = ThreadLocal.withInitial(() -> new ResettableArrayCache(new LzmaArrayCache()));
private static final ThreadLocal<ZstdArrayCache> ZSTD_RESETTABLE_ARRAY_CACHE_GETTER = ThreadLocal.withInitial(() -> new ZstdArrayCache());
//private static final ThreadLocal<ZstdArrayCache> 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();
core/src/main/java/com/seibel/distanthorizons/core/util/objects/dataStreams/DhDataOutputStream.java
+3 -3
View File
@@ -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,
core/src/main/java/com/seibel/distanthorizons/core/util/objects/dataStreams/ZstdArrayCache.java
+4 -4
View File
@@ -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<ByteBuffer> 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;
core/src/test/java/tests/CompressionTest.java
+3 -3
View File
@@ -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