Fokko commented on code in PR #3917:
URL: https://github.com/apache/parquet-java/pull/3917#discussion_r4459945394
##########
parquet-hadoop/src/main/java/org/apache/parquet/hadoop/DirectCodecFactory.java:
##########
@@ -301,14 +275,14 @@ public FullDirectDecompressor(CompressionCodecName
codecName) {
}
private FullDirectDecompressor(Object decompressor) {
- this.decompressor = decompressor;
+ this.decompressor = (DirectDecompressor) decompressor;
}
@Override
public BytesInput decompress(BytesInput compressedBytes, int
decompressedSize) throws IOException {
// Similarly to non-direct decompressors, we reset before use, if
possible (see HeapBytesDecompressor)
- if (decompressor instanceof Decompressor) {
- ((Decompressor) decompressor).reset();
+ if (decompressor instanceof Decompressor decompressor) {
+ decompressor.reset();
Review Comment:
Nit: the pattern variable has the same name as the field it shadows, which
is a bit of a trap when reading. A different name makes it clearer:
```suggestion
if (decompressor instanceof Decompressor resettable) {
resettable.reset();
```
##########
parquet-hadoop/src/main/java/org/apache/parquet/hadoop/DirectCodecFactory.java:
##########
@@ -317,20 +291,16 @@ public BytesInput decompress(BytesInput compressedBytes,
int decompressedSize) t
public void decompress(ByteBuffer input, int compressedSize, ByteBuffer
output, int decompressedSize)
throws IOException {
// Similarly to non-direct decompressors, we reset before use, if
possible (see HeapBytesDecompressor)
- if (decompressor instanceof Decompressor) {
- ((Decompressor) decompressor).reset();
+ if (decompressor instanceof Decompressor decompressor) {
+ decompressor.reset();
Review Comment:
Same here:
```suggestion
if (decompressor instanceof Decompressor resettable) {
resettable.reset();
```
##########
parquet-hadoop/src/main/java/org/apache/parquet/hadoop/DirectCodecFactory.java:
##########
@@ -554,21 +523,21 @@ public Object makeObject() throws Exception {
}
}
- if (supportDirectDecompressor) {
+ if (codec instanceof DirectDecompressionCodec directCodec) {
directDecompressorPool = new GenericObjectPool(
new BasePoolableObjectFactory() {
- public Object makeObject() throws Exception {
- return CREATE_DIRECT_DECOMPRESSOR_METHOD.invoke(codec);
+ public DirectDecompressor makeObject() {
+ return directCodec.createDirectDecompressor();
}
},
Integer.MAX_VALUE);
- Object ddecom = directDecompressorPool.borrowObject();
+ DirectDecompressor ddecom = (DirectDecompressor)
directDecompressorPool.borrowObject();
if (ddecom != null) {
directDePools.put(ddecom.getClass(), directDecompressorPool);
directDecompressorPool.returnObject(ddecom);
+ supportDirectDecompressor = true;
} else {
- supportDirectDecompressor = false;
if (LOG.isDebugEnabled()) {
LOG.debug(String.format(
BYTE_BUF_IMPL_NOT_FOUND_MSG,
Review Comment:
Pre-existing, but since you are here anyway: the argument on the next line
should be `"direct decompressor"` instead of `"compressor"`, this is the direct
decompressor branch.
##########
parquet-hadoop/src/main/java/org/apache/parquet/hadoop/DirectCodecFactory.java:
##########
@@ -589,11 +558,7 @@ public Object makeObject() throws Exception {
public Object borrowDirectDecompressor() {
Review Comment:
Optional: since `DirectCodecFactory` is package-private, another way to deal
with the japicmp complaint is to add excludes for
`org.apache.parquet.hadoop.DirectCodecFactory$DirectCodecPool$CodecPool#borrowDirectDecompressor()`
and
`org.apache.parquet.hadoop.DirectCodecFactory$DirectCodecPool#returnDirectDecompressor(java.lang.Object)`
to the japicmp config in the root pom. Then this can return
`DirectDecompressor` and the cast in the `FullDirectDecompressor` constructor
goes away. Keeping `Object` is fine with me too.
--
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]
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]