Skip to content

Commit 6a16090

Browse files
committed
update
1 parent 58ea650 commit 6a16090

1 file changed

Lines changed: 11 additions & 10 deletions

File tree

parquet-cli/src/test/java/org/apache/parquet/cli/commands/TestEncryptionInfoCommand.java

Lines changed: 11 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -27,8 +27,10 @@
2727
import java.io.IOException;
2828
import java.io.PrintStream;
2929
import java.nio.charset.StandardCharsets;
30+
import java.util.Collections;
3031
import java.util.HashMap;
3132
import java.util.Map;
33+
import java.util.Set;
3234
import org.apache.hadoop.conf.Configuration;
3335
import org.apache.hadoop.fs.Path;
3436
import org.apache.parquet.ParquetReadOptions;
@@ -47,6 +49,8 @@
4749
import org.apache.parquet.hadoop.example.GroupWriteSupport;
4850
import org.apache.parquet.hadoop.metadata.ColumnPath;
4951
import org.apache.parquet.hadoop.metadata.CompressionCodecName;
52+
import org.apache.parquet.hadoop.metadata.ParquetMetadata;
53+
import org.apache.parquet.hadoop.metadata.ParquetMetadataConverter;
5054
import org.apache.parquet.hadoop.util.HadoopInputFile;
5155
import org.apache.parquet.io.InputFile;
5256
import org.apache.parquet.schema.MessageType;
@@ -246,22 +250,19 @@ public void testCommandExists() {
246250
public void testColumnEncryptedFileWithKeys() throws IOException {
247251
assertTrue(columnEncryptedFile.exists());
248252

249-
ByteArrayOutputStream out = new ByteArrayOutputStream();
250-
PrintStream ps = new PrintStream(out, true, StandardCharsets.UTF_8);
251-
Logger logger = createLogger(ps);
252-
253-
EncryptionInfoCommand cmd = new EncryptionInfoCommand(logger);
253+
EncryptionInfoCommand cmd = new EncryptionInfoCommand(createLogger());
254254
cmd.targets = java.util.Arrays.asList(columnEncryptedFile.getAbsolutePath());
255255
cmd.setConf(new Configuration());
256256

257257
int rc = cmd.run();
258258
assertEquals(0, rc);
259259

260-
String output = out.toString(StandardCharsets.UTF_8);
261-
262-
assertTrue(output.contains("Encryption type: PLAINTEXT_FOOTER"));
263-
assertTrue(output.contains("ssn ENCRYPTED"));
264-
assertTrue(output.contains("id -"));
260+
ParquetMetadata footer = ParquetFileReader.readFooter(
261+
new Configuration(),
262+
new Path(columnEncryptedFile.getAbsolutePath()),
263+
ParquetMetadataConverter.NO_FILTER);
264+
Set<String> encrypted = EncryptionInfoCommand.findEncryptedColumns(footer);
265+
assertEquals(Collections.singleton("ssn"), encrypted);
265266
}
266267

267268
@Test

0 commit comments

Comments
 (0)