Skip to content

Flink: Avoid per-row field getter allocation in RowDataWrapper #16789

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wombatu-kun wants to merge 1 commit into
base: main
Choose a base branch
from
+27 −15
Open

Flink: Avoid per-row field getter allocation in RowDataWrapper #16789

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
14 changes: 9 additions & 5 deletions flink/v1.20/flink/src/main/java/org/apache/iceberg/flink/RowDataWrapper.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,14 @@ public RowDataWrapper(RowType rowType, Types.StructType struct) {

for (int i = 0; i < size; i++) {
types[i] = rowType.getTypeAt(i);
getters[i] = buildGetter(types[i], struct.fields().get(i).type());
PositionalGetter<?> getter = buildGetter(types[i], struct.fields().get(i).type());
if (getter == null) {
// Pre-build the Flink field getter once instead of recreating it on every access.
RowData.FieldGetter fieldGetter = FlinkRowData.createFieldGetter(types[i], i);
getter = (row, pos) -> fieldGetter.getFieldOrNull(row);
}

getters[i] = getter;
}
}

Expand All @@ -66,12 +73,9 @@ public int size() {
public <T> T get(int pos, Class<T> javaClass) {
if (rowData.isNullAt(pos)) {
return null;
} else if (getters[pos] != null) {
return javaClass.cast(getters[pos].get(rowData, pos));
}

Object value = FlinkRowData.createFieldGetter(types[pos], pos).getFieldOrNull(rowData);
return javaClass.cast(value);
return javaClass.cast(getters[pos].get(rowData, pos));
}

@Override
Expand Down
14 changes: 9 additions & 5 deletions flink/v2.0/flink/src/main/java/org/apache/iceberg/flink/RowDataWrapper.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,14 @@ public RowDataWrapper(RowType rowType, Types.StructType struct) {

for (int i = 0; i < size; i++) {
types[i] = rowType.getTypeAt(i);
getters[i] = buildGetter(types[i], struct.fields().get(i).type());
PositionalGetter<?> getter = buildGetter(types[i], struct.fields().get(i).type());
if (getter == null) {
// Pre-build the Flink field getter once instead of recreating it on every access.
RowData.FieldGetter fieldGetter = FlinkRowData.createFieldGetter(types[i], i);
getter = (row, pos) -> fieldGetter.getFieldOrNull(row);
}

getters[i] = getter;
}
}

Expand All @@ -66,12 +73,9 @@ public int size() {
public <T> T get(int pos, Class<T> javaClass) {
if (rowData.isNullAt(pos)) {
return null;
} else if (getters[pos] != null) {
return javaClass.cast(getters[pos].get(rowData, pos));
}

Object value = FlinkRowData.createFieldGetter(types[pos], pos).getFieldOrNull(rowData);
return javaClass.cast(value);
return javaClass.cast(getters[pos].get(rowData, pos));
}

@Override
Expand Down
14 changes: 9 additions & 5 deletions flink/v2.1/flink/src/main/java/org/apache/iceberg/flink/RowDataWrapper.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,14 @@ public RowDataWrapper(RowType rowType, Types.StructType struct) {

for (int i = 0; i < size; i++) {
types[i] = rowType.getTypeAt(i);
getters[i] = buildGetter(types[i], struct.fields().get(i).type());
PositionalGetter<?> getter = buildGetter(types[i], struct.fields().get(i).type());
if (getter == null) {
// Pre-build the Flink field getter once instead of recreating it on every access.
RowData.FieldGetter fieldGetter = FlinkRowData.createFieldGetter(types[i], i);
getter = (row, pos) -> fieldGetter.getFieldOrNull(row);
}

getters[i] = getter;
}
}

Expand All @@ -66,12 +73,9 @@ public int size() {
public <T> T get(int pos, Class<T> javaClass) {
if (rowData.isNullAt(pos)) {
return null;
} else if (getters[pos] != null) {
return javaClass.cast(getters[pos].get(rowData, pos));
}

Object value = FlinkRowData.createFieldGetter(types[pos], pos).getFieldOrNull(rowData);
return javaClass.cast(value);
return javaClass.cast(getters[pos].get(rowData, pos));
}

@Override
Expand Down