wgtmac commented on code in PR #3562:
URL: https://github.com/apache/parquet-java/pull/3562#discussion_r4402405749
##########
parquet-variant/src/main/java/org/apache/parquet/variant/Variant.java:
##########
@@ -422,7 +473,20 @@ private VariantUtil.ArrayInfo arrayInfo() {
if (info == null) {
info = VariantUtil.getArrayInfo(value);
cachedArrayInfo = info;
+ cachedArrayEndOffset = VariantUtil.readUnsignedLittleEndian(
+ value,
+ value.position() + info.offsetStartOffset + info.offsetSize *
info.numElements,
Review Comment:
These values are published as two independent fields. A concurrent reader
can observe `cachedArrayInfo` while `cachedArrayEndOffset` is still 0, and
incorrectly reject a valid array element.
Codex has suggested a minimal fix like below:
```diff
diff --git
a/parquet-variant/src/main/java/org/apache/parquet/variant/VariantUtil.java
b/parquet-variant/src/main/java/org/apache/parquet/variant/VariantUtil.java
---
a/parquet-variant/src/main/java/org/apache/parquet/variant/VariantUtil.java
+++
b/parquet-variant/src/main/java/org/apache/parquet/variant/VariantUtil.java
@@ -827,14 +827,18 @@
/** The byte offset (from the beginning of the Variant array) of the
field data. */
public final int dataStartOffset;
+ /** The declared end offset of the array data region. */
+ public final int endOffset;
- public ArrayInfo(int numElements, int offsetSize, int
offsetStartOffset, int dataStartOffset) {
+ public ArrayInfo(
+ int numElements, int offsetSize, int offsetStartOffset, int
dataStartOffset, int endOffset) {
this.numElements = numElements;
this.offsetSize = offsetSize;
this.offsetStartOffset = offsetStartOffset;
this.dataStartOffset = dataStartOffset;
+ this.endOffset = endOffset;
}
}
@@ -860,7 +864,11 @@
Preconditions.checkArgument(
dataStart <= (long) value.limit() - value.position(),
"variant array offset table extends past buffer: numElements=%s",
numElements);
- return new ArrayInfo((int) numElements, offsetSize, offsetStartOffset,
(int) dataStart);
+ int elements = Math.toIntExact(numElements);
+ int endOffset = readUnsignedLittleEndian(
+ value, value.position() + offsetStartOffset + elements *
offsetSize, offsetSize);
+ return new ArrayInfo(
+ elements, offsetSize, offsetStartOffset, (int) dataStart,
endOffset);
}
```
```diff
diff --git
a/parquet-variant/src/main/java/org/apache/parquet/variant/Variant.java
b/parquet-variant/src/main/java/org/apache/parquet/variant/Variant.java
--- a/parquet-variant/src/main/java/org/apache/parquet/variant/Variant.java
+++ b/parquet-variant/src/main/java/org/apache/parquet/variant/Variant.java
@@ -60,12 +60,6 @@
private VariantUtil.ArrayInfo cachedArrayInfo;
- /**
- * Lazy cache for the parsed array offset; saved when {@link
#cachedArrayInfo} is saved.
- */
- private int cachedArrayEndOffset;
-
/**
* Child depth of this Variant relative to the top-level value (0 =
top-level).
@@ -415,7 +409,7 @@
int offset =
VariantUtil.readUnsignedLittleEndian(value, offsetStart +
info.offsetSize * index, info.offsetSize);
- int endOffset = arrayEndOffset();
+ int endOffset = info.endOffset;
Preconditions.checkArgument(
offset <= endOffset, "variant array child offset out of range: %s
(end offset %s)", offset, endOffset);
return childVariant(VariantUtil.slice(value, dataStart + offset));
@@ -471,14 +465,8 @@
VariantUtil.ArrayInfo info = cachedArrayInfo;
if (info == null) {
info = VariantUtil.getArrayInfo(value);
cachedArrayInfo = info;
- cachedArrayEndOffset = VariantUtil.readUnsignedLittleEndian(
- value,
- value.position() + info.offsetStartOffset + info.offsetSize *
info.numElements,
- info.offsetSize);
}
return info;
}
-
- private int arrayEndOffset() {
- arrayInfo();
- return cachedArrayEndOffset;
- }
}
```
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: [email protected]
For queries about this service, please contact Infrastructure at:
[email protected]
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]