Skip to content

Commit bbd0249

Browse files
committed
Avoid checks when readBloomFilter
1 parent 3d402c2 commit bbd0249

2 files changed

Lines changed: 4 additions & 4 deletions

File tree

parquet-hadoop/src/main/java/org/apache/parquet/hadoop/ParquetFileReader.java

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1356,7 +1356,7 @@ public BloomFilter readBloomFilter(ColumnChunkMetaData meta) throws IOException
13561356

13571357
// If it is set, read Bloom filter header and bitset together.
13581358
// Otherwise, read Bloom filter header first and then bitset.
1359-
InputStream in = null;
1359+
InputStream in = f;
13601360
if (bloomFilterLength > 0) {
13611361
byte[] headerAndBitSet = new byte[bloomFilterLength];
13621362
f.readFully(headerAndBitSet);
@@ -1365,7 +1365,7 @@ public BloomFilter readBloomFilter(ColumnChunkMetaData meta) throws IOException
13651365

13661366
BloomFilterHeader bloomFilterHeader;
13671367
try {
1368-
bloomFilterHeader = Util.readBloomFilterHeader(in != null ? in : f, bloomFilterDecryptor, bloomFilterHeaderAAD);
1368+
bloomFilterHeader = Util.readBloomFilterHeader(in, bloomFilterDecryptor, bloomFilterHeaderAAD);
13691369
} catch (IOException e) {
13701370
LOG.warn("read no bloom filter");
13711371
return null;
@@ -1393,7 +1393,7 @@ public BloomFilter readBloomFilter(ColumnChunkMetaData meta) throws IOException
13931393
f.readFully(bitset);
13941394
}
13951395
} else {
1396-
bitset = bloomFilterDecryptor.decrypt(in != null ? in : f, bloomFilterBitsetAAD);
1396+
bitset = bloomFilterDecryptor.decrypt(in, bloomFilterBitsetAAD);
13971397
if (bitset.length != numBytes) {
13981398
throw new ParquetCryptoRuntimeException("Wrong length of decrypted bloom filter bitset");
13991399
}

parquet-hadoop/src/main/java/org/apache/parquet/hadoop/metadata/ColumnChunkMetaData.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -352,7 +352,7 @@ public long getBloomFilterOffset() {
352352
}
353353

354354
/**
355-
* @return the length to the Bloom filter or {@code -1} if there is no bloom filter for this column chunk
355+
* @return the length to the Bloom filter or {@code -1} if there is no bloom filter length for this column chunk
356356
*/
357357
@Private
358358
public int getBloomFilterLength() {

0 commit comments

Comments
 (0)