[GLUTEN-4422][CORE] Fix core dump caused by spill on closed iterator (#…

…5874) Closes #4422
apache · May 29, 2024 · 79c681b · 79c681b
1 parent d7374bd
commit 79c681b
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 1 deletion.
diff --git a/cpp/core/jni/JniWrapper.cc b/cpp/core/jni/JniWrapper.cc
@@ -544,6 +544,10 @@ JNIEXPORT jlong JNICALL Java_org_apache_gluten_vectorized_ColumnarBatchOutIterat
   auto ctx = gluten::getRuntime(env, wrapper);
 
   auto it = ctx->objectStore()->retrieve<ResultIterator>(iterHandle);
+  if (it == nullptr) {
+    std::string errorMessage = "Invalid result iter handle " + std::to_string(iterHandle);
+    throw gluten::GlutenException(errorMessage);
+  }
   return it->spillFixedSize(size);
   JNI_METHOD_END(kInvalidResourceHandle)
 }

diff --git a/gluten-data/src/main/java/org/apache/gluten/vectorized/ColumnarBatchOutIterator.java b/gluten-data/src/main/java/org/apache/gluten/vectorized/ColumnarBatchOutIterator.java
@@ -80,7 +80,11 @@ public IMetrics getMetricsInternal() throws IOException, ClassNotFoundException
   }
 
   public long spill(long size) {
-    return nativeSpill(iterHandle, size);
+    if (!closed.get()) {
+      return nativeSpill(iterHandle, size);
+    } else {
+      return 0L;
+    }
   }
 
   @Override