vvysotskyi commented on a change in pull request #2321: URL: https://github.com/apache/drill/pull/2321#discussion_r717727768
########## File path: exec/java-exec/src/main/java/org/apache/drill/exec/store/parquet/compression/AirliftBytesInputCompressor.java ########## @@ -0,0 +1,171 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +package org.apache.drill.exec.store.parquet.compression; + +import java.io.IOException; +import java.nio.ByteBuffer; +import java.util.Stack; + +import org.apache.parquet.bytes.ByteBufferAllocator; +import org.apache.parquet.bytes.BytesInput; +import org.apache.parquet.compression.CompressionCodecFactory; +import org.apache.parquet.hadoop.metadata.CompressionCodecName; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; + +import io.airlift.compress.Compressor; +import io.airlift.compress.Decompressor; +import io.airlift.compress.lz4.Lz4Compressor; +import io.airlift.compress.lz4.Lz4Decompressor; +import io.airlift.compress.lzo.LzoCompressor; +import io.airlift.compress.lzo.LzoDecompressor; +import io.airlift.compress.snappy.SnappyCompressor; +import io.airlift.compress.snappy.SnappyDecompressor; +import io.airlift.compress.zstd.ZstdCompressor; +import io.airlift.compress.zstd.ZstdDecompressor; + +/** + * A shim making an aircompressor (de)compressor available through the BytesInputCompressor + * and BytesInputDecompressor interfaces. + */ +public class AirliftBytesInputCompressor implements CompressionCodecFactory.BytesInputCompressor, CompressionCodecFactory.BytesInputDecompressor { + private static final Logger logger = LoggerFactory.getLogger(AirliftBytesInputCompressor.class); + + // name of the codec provided by this compressor + private CompressionCodecName codecName; + + // backing aircompressor compressor + private Compressor airComp = null; + + // backing aircompressor decompressor + private Decompressor airDecomp = null; + + // the direct memory allocator to be used for (de)compression outputs + private ByteBufferAllocator allocator; + + // all the direct memory buffers we've allocated, and must release + private Stack<ByteBuffer> allocatedBuffers; + + public AirliftBytesInputCompressor(CompressionCodecName codecName, ByteBufferAllocator allocator) { + this.codecName = codecName; + + switch (codecName) { + case LZ4: + airComp = new Lz4Compressor(); + airDecomp = new Lz4Decompressor(); + break; + case LZO: + airComp = new LzoCompressor(); + airDecomp = new LzoDecompressor(); + break; + case SNAPPY: + airComp = new SnappyCompressor(); + airDecomp = new SnappyDecompressor(); + break; + case ZSTD: + airComp = new ZstdCompressor(); + airDecomp = new ZstdDecompressor(); + break; + default: + throw new UnsupportedOperationException("Parquet compression codec is not supported: " + codecName); + } + + this.allocator = allocator; + this.allocatedBuffers = new Stack<>(); + + logger.debug(String.format( + "constructed a %s using a backing compressor of %s", + getClass().getName(), + airComp.getClass().getName() + )); Review comment: Please use logger formatting instead of `String.format()`, so for the case when log level is above provided, the message wouldn't be constructed. ```suggestion logger.debug( "constructed a {} using a backing compressor of {}", getClass().getName(), airComp.getClass().getName() ); ``` ########## File path: exec/java-exec/src/main/java/org/apache/drill/exec/store/parquet/compression/AirliftBytesInputCompressor.java ########## @@ -0,0 +1,171 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +package org.apache.drill.exec.store.parquet.compression; + +import java.io.IOException; +import java.nio.ByteBuffer; +import java.util.Stack; + +import org.apache.parquet.bytes.ByteBufferAllocator; +import org.apache.parquet.bytes.BytesInput; +import org.apache.parquet.compression.CompressionCodecFactory; +import org.apache.parquet.hadoop.metadata.CompressionCodecName; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; + +import io.airlift.compress.Compressor; +import io.airlift.compress.Decompressor; +import io.airlift.compress.lz4.Lz4Compressor; +import io.airlift.compress.lz4.Lz4Decompressor; +import io.airlift.compress.lzo.LzoCompressor; +import io.airlift.compress.lzo.LzoDecompressor; +import io.airlift.compress.snappy.SnappyCompressor; +import io.airlift.compress.snappy.SnappyDecompressor; +import io.airlift.compress.zstd.ZstdCompressor; +import io.airlift.compress.zstd.ZstdDecompressor; + +/** + * A shim making an aircompressor (de)compressor available through the BytesInputCompressor + * and BytesInputDecompressor interfaces. + */ +public class AirliftBytesInputCompressor implements CompressionCodecFactory.BytesInputCompressor, CompressionCodecFactory.BytesInputDecompressor { + private static final Logger logger = LoggerFactory.getLogger(AirliftBytesInputCompressor.class); + + // name of the codec provided by this compressor + private CompressionCodecName codecName; + + // backing aircompressor compressor + private Compressor airComp = null; Review comment: No need to initialize fields with null values. ########## File path: exec/java-exec/src/main/java/org/apache/drill/exec/store/parquet/compression/DrillCompressionCodecFactory.java ########## @@ -0,0 +1,117 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +package org.apache.drill.exec.store.parquet.compression; + +import java.util.Arrays; +import java.util.HashMap; +import java.util.HashSet; +import java.util.Map; +import java.util.Set; + +import org.apache.hadoop.conf.Configuration; +import org.apache.parquet.bytes.ByteBufferAllocator; +import org.apache.parquet.compression.CompressionCodecFactory; +import org.apache.parquet.hadoop.CodecFactory; +import org.apache.parquet.hadoop.metadata.CompressionCodecName; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; + +/** + * A delegating compression codec factory that returns (de)compressors based on + * https://github.com/airlift/aircompressor when possible and falls back to + * parquet-mr otherwise. The aircompressor lib was introduced into Drill + * because of difficulties encountered with the JNI-based implementations of + * lzo, lz4 and zstd in parquet-mr. + * + * By modifying the constant AIRCOMPRESSOR_CODECS it is possible to choose + * which codecs should be routed to which lib. In addition, this class + * implements parquet-mr's CompressionCodecFactory interface meaning that + * swapping this factory for e.g. one in parquet-mr will have minimal impact + * on code in Drill relying on a CompressCodecFactory. + * + */ +public class DrillCompressionCodecFactory implements CompressionCodecFactory { + private static final Logger logger = LoggerFactory.getLogger(DrillCompressionCodecFactory.class); + + // The set of codecs to be handled by aircompressor + private static final Set<CompressionCodecName> AIRCOMPRESSOR_CODECS = new HashSet<>( + Arrays.asList(CompressionCodecName.LZ4, CompressionCodecName.LZO, + CompressionCodecName.SNAPPY, CompressionCodecName.ZSTD)); + + // pool of reused aircompressor compressors (parquet-mr's factory has its own) + private final Map airCompressors = new HashMap(); Review comment: Please use generics and remove unnecessary casts below: ```suggestion private final Map<CompressionCodecName, AirliftBytesInputCompressor> airCompressors = new HashMap<>(); ``` ########## File path: exec/java-exec/src/main/java/org/apache/drill/exec/store/parquet/compression/DrillCompressionCodecFactory.java ########## @@ -0,0 +1,117 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +package org.apache.drill.exec.store.parquet.compression; + +import java.util.Arrays; +import java.util.HashMap; +import java.util.HashSet; +import java.util.Map; +import java.util.Set; + +import org.apache.hadoop.conf.Configuration; +import org.apache.parquet.bytes.ByteBufferAllocator; +import org.apache.parquet.compression.CompressionCodecFactory; +import org.apache.parquet.hadoop.CodecFactory; +import org.apache.parquet.hadoop.metadata.CompressionCodecName; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; + +/** + * A delegating compression codec factory that returns (de)compressors based on + * https://github.com/airlift/aircompressor when possible and falls back to + * parquet-mr otherwise. The aircompressor lib was introduced into Drill + * because of difficulties encountered with the JNI-based implementations of + * lzo, lz4 and zstd in parquet-mr. + * + * By modifying the constant AIRCOMPRESSOR_CODECS it is possible to choose + * which codecs should be routed to which lib. In addition, this class + * implements parquet-mr's CompressionCodecFactory interface meaning that + * swapping this factory for e.g. one in parquet-mr will have minimal impact + * on code in Drill relying on a CompressCodecFactory. + * + */ +public class DrillCompressionCodecFactory implements CompressionCodecFactory { + private static final Logger logger = LoggerFactory.getLogger(DrillCompressionCodecFactory.class); + + // The set of codecs to be handled by aircompressor + private static final Set<CompressionCodecName> AIRCOMPRESSOR_CODECS = new HashSet<>( + Arrays.asList(CompressionCodecName.LZ4, CompressionCodecName.LZO, + CompressionCodecName.SNAPPY, CompressionCodecName.ZSTD)); + + // pool of reused aircompressor compressors (parquet-mr's factory has its own) + private final Map airCompressors = new HashMap(); Review comment: If `AirliftBytesInputCompressor` is specified, no cast is required. -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. To unsubscribe, e-mail: [email protected] For queries about this service, please contact Infrastructure at: [email protected]
