This is an automated email from the ASF dual-hosted git repository. gabor pushed a commit to branch encryption in repository https://gitbox.apache.org/repos/asf/parquet-mr.git
commit add2497a1e738caddc5bc57d3897305fe99c69c8 Author: ggershinsky <[email protected]> AuthorDate: Wed Mar 18 10:53:48 2020 +0200 PARQUET-1818: Fix bloom/encryption collision in format-structures (#771) --- .../src/main/java/org/apache/parquet/format/Util.java | 14 ++++++++++++-- 1 file changed, 12 insertions(+), 2 deletions(-) diff --git a/parquet-format-structures/src/main/java/org/apache/parquet/format/Util.java b/parquet-format-structures/src/main/java/org/apache/parquet/format/Util.java index 557eaa7..36aaf74 100644 --- a/parquet-format-structures/src/main/java/org/apache/parquet/format/Util.java +++ b/parquet-format-structures/src/main/java/org/apache/parquet/format/Util.java @@ -97,11 +97,21 @@ public class Util { } public static BloomFilterHeader readBloomFilterHeader(InputStream from) throws IOException { - return read(from, new BloomFilterHeader()); + return readBloomFilterHeader(from, null, null); } public static void writeBloomFilterHeader(BloomFilterHeader header, OutputStream out) throws IOException { - write(header, out); + writeBloomFilterHeader(header, out, null, null); + } + + public static BloomFilterHeader readBloomFilterHeader(InputStream from, + BlockCipher.Decryptor decryptor, byte[] AAD) throws IOException { + return read(from, new BloomFilterHeader(), decryptor, AAD); + } + + public static void writeBloomFilterHeader(BloomFilterHeader header, OutputStream out, + BlockCipher.Encryptor encryptor, byte[] AAD) throws IOException { + write(header, out, encryptor, AAD); } public static void writePageHeader(PageHeader pageHeader, OutputStream to) throws IOException {
