Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,8 @@
import java.io.Serializable;
import java.util.Map;
import java.util.Objects;
import org.apache.parquet.VersionParser;
import org.apache.parquet.VersionParser.ParsedVersion;
import org.apache.parquet.crypto.InternalFileDecryptor;
import org.apache.parquet.schema.MessageType;

Expand All @@ -42,6 +44,7 @@ public enum EncryptionType {
private final MessageType schema;
private final Map<String, String> keyValueMetaData;

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

This cached field is transient final. After Java deserialization it will stay null even when createdBy is valid. Recompute lazily in getWriterVersion(), or add serialization handling and tests.

private final String createdBy;
private final transient ParsedVersion writerVersion;
private final InternalFileDecryptor fileDecryptor;
private final EncryptionType encryptionType;

Expand Down Expand Up @@ -80,6 +83,7 @@ public FileMetaData(
this.keyValueMetaData =
unmodifiableMap(Objects.requireNonNull(keyValueMetaData, "keyValueMetaData cannot be null"));
this.createdBy = createdBy;
this.writerVersion = parseVersion(createdBy);

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

Seems reasonable. Do we want to initialize this field lazily?

this.fileDecryptor = fileDecryptor;
this.encryptionType = encryptionType;
}
Expand Down Expand Up @@ -118,4 +122,23 @@ public InternalFileDecryptor getFileDecryptor() {
public EncryptionType getEncryptionType() {
return encryptionType;
}

/**
* @return the parsed writer version, or {@code null} if {@code createdBy} is null, empty, or unparseable
*/
@JsonIgnore
public ParsedVersion getWriterVersion() {

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

This adds the cached value, but no production call site uses it yet. Please migrate the callers listed in the issue, especially footer stats, page stats, reader init, rewrite, and lazy encrypted metadata paths.

return writerVersion;
}

private static ParsedVersion parseVersion(String createdBy) {
if (createdBy == null || createdBy.isEmpty()) {
return null;
}
try {
return VersionParser.parse(createdBy);
} catch (RuntimeException | VersionParser.VersionParseException e) {
return null;
}

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

Returning null loses the difference between missing createdBy and parse failure. CorruptStatistics currently logs different warnings for these cases. Preserve the parse failure state, or keep enough context for migrated callers to preserve existing behavior.

}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,76 @@
/*
* 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.metadata;

import static org.assertj.core.api.Assertions.assertThat;

import java.util.Collections;
import org.apache.parquet.schema.MessageType;
import org.apache.parquet.schema.PrimitiveType;
import org.apache.parquet.schema.Type;
import org.junit.jupiter.api.Test;

class FileMetaDataTest {

private static final MessageType SCHEMA = new MessageType(
"test", new PrimitiveType(Type.Repetition.REQUIRED, PrimitiveType.PrimitiveTypeName.INT32, "id"));

@Test
void validCreatedByIsParsed() {
FileMetaData meta =
new FileMetaData(SCHEMA, Collections.emptyMap(), "parquet-mr version 1.12.0 (build abc123)");

assertThat(meta.getWriterVersion()).isNotNull();

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

These tests only cover the getter. They do not prove the repeated parsing problem is fixed. Please add coverage for at least one migrated production path using the cached ParsedVersion instead of reparsing createdBy.

assertThat(meta.getWriterVersion().application).isEqualTo("parquet-mr");
assertThat(meta.getWriterVersion().version).isEqualTo("1.12.0");
assertThat(meta.getWriterVersion().appBuildHash).isEqualTo("abc123");
}

@Test
void nullCreatedByReturnsNullWriterVersion() {
FileMetaData meta = new FileMetaData(SCHEMA, Collections.emptyMap(), null);

assertThat(meta.getWriterVersion()).isNull();
assertThat(meta.getCreatedBy()).isNull();
}

@Test
void emptyCreatedByReturnsNullWriterVersion() {
FileMetaData meta = new FileMetaData(SCHEMA, Collections.emptyMap(), "");

assertThat(meta.getWriterVersion()).isNull();
}

@Test
void unparseableCreatedByReturnsNullWriterVersion() {
FileMetaData meta = new FileMetaData(SCHEMA, Collections.emptyMap(), "no-version-here");

assertThat(meta.getWriterVersion()).isNull();
}

@Test
void versionWithoutBuildHash() {
FileMetaData meta = new FileMetaData(SCHEMA, Collections.emptyMap(), "parquet-mr version 1.8.0");

assertThat(meta.getWriterVersion()).isNotNull();
assertThat(meta.getWriterVersion().application).isEqualTo("parquet-mr");
assertThat(meta.getWriterVersion().version).isEqualTo("1.8.0");
assertThat(meta.getWriterVersion().appBuildHash).isNull();
}
}
Loading