stevenzwu commented on code in PR #6222:
URL: https://github.com/apache/iceberg/pull/6222#discussion_r1042761243
##########
core/src/main/java/org/apache/iceberg/BaseFilesTable.java:
##########
@@ -223,34 +225,28 @@ ManifestFile manifest() {
static class ContentFileStructWithMetrics implements StructLike {
private final StructLike fileAsStruct;
private final MetricsUtil.ReadableMetricsStruct readableMetrics;
- private final int expectedSize;
+ private final int position;
ContentFileStructWithMetrics(
- int expectedSize,
- StructLike fileAsStruct,
- MetricsUtil.ReadableMetricsStruct readableMetrics) {
+ int position, StructLike fileAsStruct,
MetricsUtil.ReadableMetricsStruct readableMetrics) {
this.fileAsStruct = fileAsStruct;
this.readableMetrics = readableMetrics;
- this.expectedSize = expectedSize;
+ this.position = position;
}
@Override
public int size() {
- return expectedSize;
+ return position;
}
@Override
public <T> T get(int pos, Class<T> javaClass) {
- int lastExpectedIndex = expectedSize - 1;
- if (pos < lastExpectedIndex) {
+ if (pos < position) {
return fileAsStruct.get(pos, javaClass);
- } else if (pos == lastExpectedIndex) {
+ } else if (pos == position) {
return javaClass.cast(readableMetrics);
} else {
- throw new IllegalArgumentException(
Review Comment:
I think we should just add a Preconditions check
```
Preconditions.check(pos < expectedSize, ...)
if (pos == metricsPosition) {
return javaClass.cast...
} else {
return fileAsStruct.get(pos, javaClass);
}
```
Then just check if the (pos == metricsPos
##########
core/src/main/java/org/apache/iceberg/BaseFilesTable.java:
##########
@@ -223,34 +225,28 @@ ManifestFile manifest() {
static class ContentFileStructWithMetrics implements StructLike {
private final StructLike fileAsStruct;
private final MetricsUtil.ReadableMetricsStruct readableMetrics;
- private final int expectedSize;
+ private final int position;
ContentFileStructWithMetrics(
- int expectedSize,
- StructLike fileAsStruct,
- MetricsUtil.ReadableMetricsStruct readableMetrics) {
+ int position, StructLike fileAsStruct,
MetricsUtil.ReadableMetricsStruct readableMetrics) {
this.fileAsStruct = fileAsStruct;
this.readableMetrics = readableMetrics;
- this.expectedSize = expectedSize;
+ this.position = position;
}
@Override
public int size() {
- return expectedSize;
+ return position;
}
@Override
public <T> T get(int pos, Class<T> javaClass) {
- int lastExpectedIndex = expectedSize - 1;
- if (pos < lastExpectedIndex) {
+ if (pos < position) {
return fileAsStruct.get(pos, javaClass);
- } else if (pos == lastExpectedIndex) {
+ } else if (pos == position) {
return javaClass.cast(readableMetrics);
} else {
- throw new IllegalArgumentException(
Review Comment:
I think we should just add a Preconditions check
```
Preconditions.check(pos < expectedSize, ...)
if (pos == metricsPosition) {
return javaClass.cast...
} else {
return fileAsStruct.get(pos, javaClass);
}
```
--
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]
