Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

PARQUET-2227: Refactor several file rewriters to use a new unified ParquetRewriter implementation #1014

Merged
merged 7 commits into from
Jan 29, 2023
Original file line number Diff line number Diff line change
@@ -0,0 +1,38 @@
/*
* 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.parquet.hadoop.rewrite;

import org.apache.parquet.Preconditions;

public enum MaskMode {
NULLIFY("nullify"),
HASH("hash"),
REDACT("redact");

private String mode;

MaskMode(String text) {
Preconditions.checkArgument(text != null, "Text of mask mode is required");
this.mode = text;
wgtmac marked this conversation as resolved.
Show resolved Hide resolved
}

public String getMode() {
return this.mode;
}
}

Large diffs are not rendered by default.

Original file line number Diff line number Diff line change
@@ -0,0 +1,178 @@
/*
* 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.parquet.hadoop.rewrite;

import org.apache.hadoop.conf.Configuration;
import org.apache.hadoop.fs.Path;
import org.apache.parquet.Preconditions;
import org.apache.parquet.crypto.FileEncryptionProperties;
import org.apache.parquet.hadoop.metadata.CompressionCodecName;

import java.util.List;
import java.util.Map;

// A set of options to create a ParquetRewriter.
public class RewriteOptions {

final Configuration conf;
final Path inputFile;
final Path outputFile;
final List<String> pruneColumns;
final CompressionCodecName newCodecName;
final Map<String, MaskMode> maskColumns;
final List<String> encryptColumns;
final FileEncryptionProperties fileEncryptionProperties;

private RewriteOptions(Configuration conf,
Path inputFile,
Path outputFile,
List<String> pruneColumns,
CompressionCodecName newCodecName,
Map<String, MaskMode> maskColumns,
List<String> encryptColumns,
FileEncryptionProperties fileEncryptionProperties) {
this.conf = conf;
this.inputFile = inputFile;
this.outputFile = outputFile;
this.pruneColumns = pruneColumns;
this.newCodecName = newCodecName;
this.maskColumns = maskColumns;
this.encryptColumns = encryptColumns;
this.fileEncryptionProperties = fileEncryptionProperties;
}

public Configuration getConf() {
return conf;
}

public Path getInputFile() {
return inputFile;
}

public Path getOutputFile() {
return outputFile;
}

public List<String> getPruneColumns() {
return pruneColumns;
}

public CompressionCodecName getNewCodecName() {
return newCodecName;
}

public Map<String, MaskMode> getMaskColumns() {
return maskColumns;
}

public List<String> getEncryptColumns() {
return encryptColumns;
}

public FileEncryptionProperties getFileEncryptionProperties() {
return fileEncryptionProperties;
}

// Builder to create a RewriterOptions.
public static class Builder {
private Configuration conf;
private Path inputFile;
private Path outputFile;
private List<String> pruneColumns;
private CompressionCodecName newCodecName;
private Map<String, MaskMode> maskColumns;
private List<String> encryptColumns;
private FileEncryptionProperties fileEncryptionProperties;

public Builder(Configuration conf, Path inputFile, Path outputFile) {
this.conf = conf;
this.inputFile = inputFile;
this.outputFile = outputFile;
}

public Builder prune(List<String> columns) {
this.pruneColumns = columns;
return this;
}

public Builder transform(CompressionCodecName newCodecName) {
this.newCodecName = newCodecName;
return this;
}

public Builder mask(Map<String, MaskMode> maskColumns) {
this.maskColumns = maskColumns;
return this;
}

public Builder encrypt(List<String> encryptColumns) {
this.encryptColumns = encryptColumns;
return this;
}

public Builder encryptionProperties(FileEncryptionProperties fileEncryptionProperties) {
this.fileEncryptionProperties = fileEncryptionProperties;
return this;
}

public RewriteOptions build() {
Preconditions.checkArgument(inputFile != null, "Input file is required");
Preconditions.checkArgument(outputFile != null, "Output file is required");

if (pruneColumns != null) {
if (maskColumns != null) {
for (String pruneColumn : pruneColumns) {
Preconditions.checkArgument(!maskColumns.containsKey(pruneColumn),
"Cannot prune and mask same column");
}
}

if (encryptColumns != null) {
for (String pruneColumn : pruneColumns) {
Preconditions.checkArgument(!encryptColumns.contains(pruneColumn),
"Cannot prune and mask same column");
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Cannot prune and encrypt same column?

Copy link
Member Author

@wgtmac wgtmac Jan 10, 2023

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Pruned column does not exist in the rewritten file. Then it does not make sense to encrypt the missing column any more.

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Yep. I meant the exception text in the line 149, it is identical to the masking check (line 142); I guess the encryption check would print "Cannot prune and encrypt same column"

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Sorry, I misunderstood your meaning. Fixed the error message. Please take a look again. Thanks!

}
}
}

// TODO: support masking and encrypting same columns
if (maskColumns != null && encryptColumns != null) {
for (String encryptColumn : encryptColumns) {
Preconditions.checkArgument(!maskColumns.containsKey(encryptColumn),
"Cannot encrypt and mask same column");
}
}

if (encryptColumns != null && !encryptColumns.isEmpty()) {
Preconditions.checkArgument(fileEncryptionProperties != null,
wgtmac marked this conversation as resolved.
Show resolved Hide resolved
"FileEncryptionProperties is required when encrypting columns");
}

return new RewriteOptions(conf,
inputFile,
outputFile,
pruneColumns,
newCodecName,
maskColumns,
encryptColumns,
fileEncryptionProperties);
}
}

}