Skip to content

[SPARK-37896][SQL][FOLLOWUP] Fix NPE in ConstantColumnVector.close() #35324

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

Closed
c21 wants to merge 2 commits into from
Closed

[SPARK-37896][SQL][FOLLOWUP] Fix NPE in ConstantColumnVector.close() #35324

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
94c643b
Fix NPE in ConstantColumnVector.close()
c21 Jan 25, 2022
fb5e214
Set childData to null in if condition
c21 Jan 25, 2022
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
13 changes: 9 additions & 4 deletions sql/core/src/main/java/org/apache/spark/sql/execution/vectorized/ConstantColumnVector.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -70,12 +70,17 @@ public ConstantColumnVector(int numRows, DataType type) {

@Override
public void close() {
stringData = null;
Copy link
Contributor Author

@c21 c21 Jan 25, 2022

Choose a reason for hiding this comment

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

This change is not related to the NPE fix, but it's good to have. We should release the memory for UTF8String as well.

byteArrayData = null;
for (int i = 0; i < childData.length; i++) {
childData[i].close();
childData[i] = null;
if (childData != null) {
for (int i = 0; i < childData.length; i++) {
if (childData[i] != null) {
childData[i].close();
childData[i] = null;
}
}
childData = null;
}
childData = null;
arrayData = null;
mapData = null;
}
Expand Down
4 changes: 3 additions & 1 deletion .../src/test/scala/org/apache/spark/sql/execution/vectorized/ConstantColumnVectorSuite.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,9 @@ class ConstantColumnVectorSuite extends SparkFunSuite {
private def testVector(name: String, size: Int, dt: DataType)
(f: ConstantColumnVector => Unit): Unit = {
test(name) {
f(new ConstantColumnVector(size, dt))
val vector = new ConstantColumnVector(size, dt)
f(vector)
vector.close()
}
}

Expand Down