diff --git a/java/tsfile/src/main/java/org/apache/tsfile/common/conf/TSFileConfig.java b/java/tsfile/src/main/java/org/apache/tsfile/common/conf/TSFileConfig.java index 163187450..456377c8e 100644 --- a/java/tsfile/src/main/java/org/apache/tsfile/common/conf/TSFileConfig.java +++ b/java/tsfile/src/main/java/org/apache/tsfile/common/conf/TSFileConfig.java @@ -236,6 +236,8 @@ public class TSFileConfig implements Serializable { private String objectStorageTsFileOutput = "org.apache.iotdb.os.fileSystem.OSTsFileOutput"; + private boolean lz4UseJni = true; + /** customizedProperties, this should be empty by default. */ private Properties customizedProperties = new Properties(); @@ -690,4 +692,12 @@ public String getObjectStorageTsFileOutput() { public void setObjectStorageTsFileOutput(String objectStorageTsFileOutput) { this.objectStorageTsFileOutput = objectStorageTsFileOutput; } + + public boolean isLz4UseJni() { + return lz4UseJni; + } + + public void setLz4UseJni(boolean lz4UseJni) { + this.lz4UseJni = lz4UseJni; + } } diff --git a/java/tsfile/src/main/java/org/apache/tsfile/common/conf/TSFileDescriptor.java b/java/tsfile/src/main/java/org/apache/tsfile/common/conf/TSFileDescriptor.java index 76a95db45..1db389b6a 100644 --- a/java/tsfile/src/main/java/org/apache/tsfile/common/conf/TSFileDescriptor.java +++ b/java/tsfile/src/main/java/org/apache/tsfile/common/conf/TSFileDescriptor.java @@ -85,6 +85,7 @@ public void overwriteConfigByCustomSettings(Properties properties) { writer.setString(conf::setEncryptFlag, "encrypt_flag"); writer.setString(conf::setEncryptType, "encrypt_type"); writer.setString(conf::setEncryptKeyFromPath, "encrypt_key_path"); + writer.setBoolean(conf::setLz4UseJni, "lz4_use_jni"); } private static class PropertiesOverWriter { @@ -110,6 +111,10 @@ public void setString(Consumer setter, String propertyKey) { set(setter, propertyKey, Function.identity()); } + public void setBoolean(Consumer setter, String propertyKey) { + set(setter, propertyKey, Boolean::parseBoolean); + } + private void set( Consumer setter, String propertyKey, Function propertyValueConverter) { String value = this.properties.getProperty(propertyKey); diff --git a/java/tsfile/src/main/java/org/apache/tsfile/compress/ICompressor.java b/java/tsfile/src/main/java/org/apache/tsfile/compress/ICompressor.java index e4579d2ba..c86c84b66 100644 --- a/java/tsfile/src/main/java/org/apache/tsfile/compress/ICompressor.java +++ b/java/tsfile/src/main/java/org/apache/tsfile/compress/ICompressor.java @@ -19,6 +19,7 @@ package org.apache.tsfile.compress; +import org.apache.tsfile.common.conf.TSFileDescriptor; import org.apache.tsfile.exception.compress.CompressionTypeNotSupportedException; import org.apache.tsfile.exception.compress.GZIPCompressOverflowException; import org.apache.tsfile.file.metadata.enums.CompressionType; @@ -201,7 +202,10 @@ class LZ4Compressor implements ICompressor { * This instance should be cached to avoid performance problem. See: * https://github.com/lz4/lz4-java/issues/152 and https://github.com/apache/spark/pull/24905 */ - private static final LZ4Factory factory = LZ4Factory.fastestInstance(); + private static final LZ4Factory factory = + TSFileDescriptor.getInstance().getConfig().isLz4UseJni() + ? LZ4Factory.fastestInstance() + : LZ4Factory.safeInstance(); private static final net.jpountz.lz4.LZ4Compressor compressor = factory.fastCompressor();