Skip to content

Commit d2ec684

Browse files
authored
GH-48557: [C++][Parquet][CI] Also encrypt nested columns in fuzz seed corpus (#48558)
### Rationale for this change In #48336 we skipped encrypted nested columns because it was too cumbersome to configure (each leaf column had to be configured independently). Now that #45462 has been merged we can configure nested columns the same way as non-nested ones. ### Are these changes tested? Manually and later by OSS-Fuzz. ### Are there any user-facing changes? No. * GitHub Issue: #48557 Authored-by: Antoine Pitrou <[email protected]> Signed-off-by: Antoine Pitrou <[email protected]>
1 parent b355fc0 commit d2ec684

File tree

1 file changed

+0
-9
lines changed

1 file changed

+0
-9
lines changed

cpp/src/parquet/arrow/generate_fuzz_corpus.cc

Lines changed: 0 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -168,11 +168,6 @@ std::vector<WriteConfig> GetEncryptedWriteConfigurations(const ::arrow::Schema&
168168
{
169169
ColumnPathToEncryptionPropertiesMap column_map;
170170
for (const auto& field : schema.fields()) {
171-
// Skip nested columns (they will not be encrypted) until GH-41246 makes
172-
// their configuration easier.
173-
if (field->type()->num_fields() > 0) {
174-
continue;
175-
}
176171
auto column_key = MakeEncryptionKey();
177172
column_map[field->name()] = ColumnEncryptionProperties::WithColumnKey(
178173
column_key.key, column_key.key_metadata);
@@ -184,11 +179,7 @@ std::vector<WriteConfig> GetEncryptedWriteConfigurations(const ::arrow::Schema&
184179
// Unencrypted columns
185180
{
186181
ColumnPathToEncryptionPropertiesMap column_map;
187-
// Only encrypt the first non-nested column, the rest will be written in plaintext
188182
for (const auto& field : schema.fields()) {
189-
if (field->type()->num_fields() > 0) {
190-
continue;
191-
}
192183
column_map[field->name()] = ColumnEncryptionProperties::Unencrypted();
193184
}
194185
ARROW_DCHECK_NE(column_map.size(), 0);

0 commit comments

Comments
 (0)