(drill) branch master updated: DRILL-8485: HashJoinPOP memory leak is caused by an oom exception when read data from InputStream (#2891)

[cgivre]

This is an automated email from the ASF dual-hosted git repository.

cgivre pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/drill.git


The following commit(s) were added to refs/heads/master by this push:
     new 749772cb0b DRILL-8485: HashJoinPOP memory leak is caused by an oom 
exception when read data from InputStream (#2891)
749772cb0b is described below

commit 749772cb0bd83c1a8fe455410ec80b1e5a9bf239
Author: shfshihuafeng <shfshihuaf...@163.com>
AuthorDate: Mon Mar 25 08:29:51 2024 +0800

    DRILL-8485: HashJoinPOP memory leak is caused by an oom exception when read 
data from InputStream (#2891)
---
 .../exec/cache/VectorAccessibleSerializable.java      | 19 ++++++++++++++-----
 1 file changed, 14 insertions(+), 5 deletions(-)

diff --git 
a/exec/java-exec/src/main/java/org/apache/drill/exec/cache/VectorAccessibleSerializable.java
 
b/exec/java-exec/src/main/java/org/apache/drill/exec/cache/VectorAccessibleSerializable.java
index d0f4c0345f..2b85d7912b 100644
--- 
a/exec/java-exec/src/main/java/org/apache/drill/exec/cache/VectorAccessibleSerializable.java
+++ 
b/exec/java-exec/src/main/java/org/apache/drill/exec/cache/VectorAccessibleSerializable.java
@@ -24,6 +24,7 @@ import java.io.InputStream;
 import java.io.OutputStream;
 import java.util.List;
 
+import org.apache.drill.common.exceptions.UserException;
 import org.apache.drill.exec.expr.TypeHelper;
 import org.apache.drill.exec.memory.BufferAllocator;
 import org.apache.drill.exec.metrics.DrillMetrics;
@@ -124,11 +125,19 @@ public class VectorAccessibleSerializable extends 
AbstractStreamSerializable {
     for (SerializedField metaData : fieldList) {
       final int dataLength = metaData.getBufferLength();
       final MaterializedField field = MaterializedField.create(metaData);
-      final DrillBuf buf = allocator.read(dataLength, input);
-      final ValueVector vector = TypeHelper.getNewVector(field, allocator);
-      vector.load(metaData, buf);
-      buf.release(); // Vector now owns the buffer
-      vectorList.add(vector);
+      DrillBuf buf = null;
+      try {
+        buf = allocator.read(dataLength, input);
+        final ValueVector vector = TypeHelper.getNewVector(field, allocator);
+        vector.load(metaData, buf);
+        buf.release(); // Vector now owns the buffer
+        vectorList.add(vector);
+      } catch (OutOfMemoryError oom) {
+        for (ValueVector valueVector : vectorList) {
+          valueVector.clear();
+        }
+        throw UserException.memoryError(oom).message("Allocator memory 
failed").build(logger);
+      }
     }
     container.addCollection(vectorList);
     container.buildSchema(svMode);