use closeExpectNoException

ChrisHegarty · Sep 13, 2023 · ded62c6 · ded62c6
1 parent 06064d3
commit ded62c6
Show file tree

Hide file tree

Showing 23 changed files with 48 additions and 25 deletions.
diff --git a/...sql/compute/src/main/generated-src/org/elasticsearch/compute/data/BooleanVectorBlock.java b/...sql/compute/src/main/generated-src/org/elasticsearch/compute/data/BooleanVectorBlock.java
@@ -8,6 +8,7 @@
 package org.elasticsearch.compute.data;
 
 import org.apache.lucene.util.RamUsageEstimator;
+import org.elasticsearch.core.Releasables;
 
 /**
  * Block view of a BooleanVector.
@@ -74,6 +75,6 @@ public String toString() {
 
     @Override
     public void close() {
-        vector.close();
+        Releasables.closeExpectNoException(vector);
     }
 }
diff --git a/...ql/compute/src/main/generated-src/org/elasticsearch/compute/data/BytesRefArrayVector.java b/...ql/compute/src/main/generated-src/org/elasticsearch/compute/data/BytesRefArrayVector.java
@@ -81,6 +81,6 @@ public String toString() {
 
     @Override
     public void close() {
-        Releasables.close(values);
+        Releasables.closeExpectNoException(values);
     }
 }
diff --git a/...in/esql/compute/src/main/generated-src/org/elasticsearch/compute/data/BytesRefVector.java b/...in/esql/compute/src/main/generated-src/org/elasticsearch/compute/data/BytesRefVector.java
@@ -10,6 +10,7 @@
 import org.apache.lucene.util.BytesRef;
 import org.elasticsearch.common.io.stream.StreamInput;
 import org.elasticsearch.common.io.stream.StreamOutput;
+import org.elasticsearch.common.util.BigArrays;
 
 import java.io.IOException;
 
@@ -78,7 +79,7 @@ static BytesRefVector of(StreamInput in) throws IOException {
         if (constant && positions > 0) {
             return new ConstantBytesRefVector(in.readBytesRef(), positions);
         } else {
-            var builder = BytesRefVector.newVectorBuilder(positions);
+            var builder = BytesRefVector.newVectorBuilder(positions, BigArrays.NON_RECYCLING_INSTANCE);
             for (int i = 0; i < positions; i++) {
                 builder.appendBytesRef(in.readBytesRef());
             }
@@ -100,8 +101,12 @@ default void writeTo(StreamOutput out) throws IOException {
         }
     }
 
-    static Builder newVectorBuilder(int estimatedSize) {
-        return new BytesRefVectorBuilder(estimatedSize);
+    static Builder newVectorBuilder(int estimatedSize) { // For now
+        return new BytesRefVectorBuilder(estimatedSize, BigArrays.NON_RECYCLING_INSTANCE);
+    }
+
+    static Builder newVectorBuilder(int estimatedSize, BigArrays bigArrays) {
+        return new BytesRefVectorBuilder(estimatedSize, bigArrays);
     }
 
     sealed interface Builder extends Vector.Builder permits BytesRefVectorBuilder {

diff --git a/...ql/compute/src/main/generated-src/org/elasticsearch/compute/data/BytesRefVectorBlock.java b/...ql/compute/src/main/generated-src/org/elasticsearch/compute/data/BytesRefVectorBlock.java
@@ -9,6 +9,7 @@
 
 import org.apache.lucene.util.BytesRef;
 import org.apache.lucene.util.RamUsageEstimator;
+import org.elasticsearch.core.Releasables;
 
 /**
  * Block view of a BytesRefVector.
@@ -75,6 +76,6 @@ public String toString() {
 
     @Override
     public void close() {
-        vector.close();
+        Releasables.closeExpectNoException(vector);
     }
 }
diff --git a/...esql/compute/src/main/generated-src/org/elasticsearch/compute/data/DoubleVectorBlock.java b/...esql/compute/src/main/generated-src/org/elasticsearch/compute/data/DoubleVectorBlock.java
@@ -8,6 +8,7 @@
 package org.elasticsearch.compute.data;
 
 import org.apache.lucene.util.RamUsageEstimator;
+import org.elasticsearch.core.Releasables;
 
 /**
  * Block view of a DoubleVector.
@@ -74,6 +75,6 @@ public String toString() {
 
     @Override
     public void close() {
-        vector.close();
+        Releasables.closeExpectNoException(vector);
     }
 }
diff --git a/...sql/compute/src/main/generated-src/org/elasticsearch/compute/data/FilterBooleanBlock.java b/...sql/compute/src/main/generated-src/org/elasticsearch/compute/data/FilterBooleanBlock.java
@@ -8,6 +8,7 @@
 package org.elasticsearch.compute.data;
 
 import org.apache.lucene.util.RamUsageEstimator;
+import org.elasticsearch.core.Releasables;
 
 /**
  * Filter block for BooleanBlocks.
@@ -125,6 +126,6 @@ private void appendValues(StringBuilder sb) {
 
     @Override
     public void close() {
-        block.close();
+        Releasables.closeExpectNoException(block);
     }
 }
diff --git a/...ql/compute/src/main/generated-src/org/elasticsearch/compute/data/FilterBooleanVector.java b/...ql/compute/src/main/generated-src/org/elasticsearch/compute/data/FilterBooleanVector.java
@@ -8,6 +8,7 @@
 package org.elasticsearch.compute.data;
 
 import org.apache.lucene.util.RamUsageEstimator;
+import org.elasticsearch.core.Releasables;
 
 /**
  * Filter vector for BooleanVectors.
@@ -91,6 +92,6 @@ private void appendValues(StringBuilder sb) {
 
     @Override
     public void close() {
-        vector.close();
+        Releasables.closeExpectNoException(vector);
     }
 }
diff --git a/...ql/compute/src/main/generated-src/org/elasticsearch/compute/data/FilterBytesRefBlock.java b/...ql/compute/src/main/generated-src/org/elasticsearch/compute/data/FilterBytesRefBlock.java
@@ -9,6 +9,7 @@
 
 import org.apache.lucene.util.BytesRef;
 import org.apache.lucene.util.RamUsageEstimator;
+import org.elasticsearch.core.Releasables;
 
 /**
  * Filter block for BytesRefBlocks.
@@ -128,6 +129,6 @@ private void appendValues(StringBuilder sb) {
 
     @Override
     public void close() {
-        block.close();
+        Releasables.closeExpectNoException(block);
     }
 }
diff --git a/...l/compute/src/main/generated-src/org/elasticsearch/compute/data/FilterBytesRefVector.java b/...l/compute/src/main/generated-src/org/elasticsearch/compute/data/FilterBytesRefVector.java
@@ -9,6 +9,7 @@
 
 import org.apache.lucene.util.BytesRef;
 import org.apache.lucene.util.RamUsageEstimator;
+import org.elasticsearch.core.Releasables;
 
 /**
  * Filter vector for BytesRefVectors.
@@ -92,6 +93,6 @@ private void appendValues(StringBuilder sb) {
 
     @Override
     public void close() {
-        vector.close();
+        Releasables.closeExpectNoException(vector);
     }
 }
diff --git a/...esql/compute/src/main/generated-src/org/elasticsearch/compute/data/FilterDoubleBlock.java b/...esql/compute/src/main/generated-src/org/elasticsearch/compute/data/FilterDoubleBlock.java
@@ -8,6 +8,7 @@
 package org.elasticsearch.compute.data;
 
 import org.apache.lucene.util.RamUsageEstimator;
+import org.elasticsearch.core.Releasables;
 
 /**
  * Filter block for DoubleBlocks.
@@ -125,6 +126,6 @@ private void appendValues(StringBuilder sb) {
 
     @Override
     public void close() {
-        block.close();
+        Releasables.closeExpectNoException(block);
     }
 }
diff --git a/...sql/compute/src/main/generated-src/org/elasticsearch/compute/data/FilterDoubleVector.java b/...sql/compute/src/main/generated-src/org/elasticsearch/compute/data/FilterDoubleVector.java
@@ -8,6 +8,7 @@
 package org.elasticsearch.compute.data;
 
 import org.apache.lucene.util.RamUsageEstimator;
+import org.elasticsearch.core.Releasables;
 
 /**
  * Filter vector for DoubleVectors.
@@ -91,6 +92,6 @@ private void appendValues(StringBuilder sb) {
 
     @Override
     public void close() {
-        vector.close();
+        Releasables.closeExpectNoException(vector);
     }
 }
diff --git a/...in/esql/compute/src/main/generated-src/org/elasticsearch/compute/data/FilterIntBlock.java b/...in/esql/compute/src/main/generated-src/org/elasticsearch/compute/data/FilterIntBlock.java
@@ -8,6 +8,7 @@
 package org.elasticsearch.compute.data;
 
 import org.apache.lucene.util.RamUsageEstimator;
+import org.elasticsearch.core.Releasables;
 
 /**
  * Filter block for IntBlocks.
@@ -125,6 +126,6 @@ private void appendValues(StringBuilder sb) {
 
     @Override
     public void close() {
-        block.close();
+        Releasables.closeExpectNoException(block);
     }
 }
diff --git a/...n/esql/compute/src/main/generated-src/org/elasticsearch/compute/data/FilterIntVector.java b/...n/esql/compute/src/main/generated-src/org/elasticsearch/compute/data/FilterIntVector.java
@@ -8,6 +8,7 @@
 package org.elasticsearch.compute.data;
 
 import org.apache.lucene.util.RamUsageEstimator;
+import org.elasticsearch.core.Releasables;
 
 /**
  * Filter vector for IntVectors.
@@ -91,6 +92,6 @@ private void appendValues(StringBuilder sb) {
 
     @Override
     public void close() {
-        vector.close();
+        Releasables.closeExpectNoException(vector);
     }
 }
diff --git a/...n/esql/compute/src/main/generated-src/org/elasticsearch/compute/data/FilterLongBlock.java b/...n/esql/compute/src/main/generated-src/org/elasticsearch/compute/data/FilterLongBlock.java
@@ -8,6 +8,7 @@
 package org.elasticsearch.compute.data;
 
 import org.apache.lucene.util.RamUsageEstimator;
+import org.elasticsearch.core.Releasables;
 
 /**
  * Filter block for LongBlocks.
@@ -125,6 +126,6 @@ private void appendValues(StringBuilder sb) {
 
     @Override
     public void close() {
-        block.close();
+        Releasables.closeExpectNoException(block);
     }
 }
diff --git a/.../esql/compute/src/main/generated-src/org/elasticsearch/compute/data/FilterLongVector.java b/.../esql/compute/src/main/generated-src/org/elasticsearch/compute/data/FilterLongVector.java
@@ -8,6 +8,7 @@
 package org.elasticsearch.compute.data;
 
 import org.apache.lucene.util.RamUsageEstimator;
+import org.elasticsearch.core.Releasables;
 
 /**
  * Filter vector for LongVectors.
@@ -91,6 +92,6 @@ private void appendValues(StringBuilder sb) {
 
     @Override
     public void close() {
-        vector.close();
+        Releasables.closeExpectNoException(vector);
     }
 }
diff --git a/...in/esql/compute/src/main/generated-src/org/elasticsearch/compute/data/IntVectorBlock.java b/...in/esql/compute/src/main/generated-src/org/elasticsearch/compute/data/IntVectorBlock.java
@@ -8,6 +8,7 @@
 package org.elasticsearch.compute.data;
 
 import org.apache.lucene.util.RamUsageEstimator;
+import org.elasticsearch.core.Releasables;
 
 /**
  * Block view of a IntVector.
@@ -74,6 +75,6 @@ public String toString() {
 
     @Override
     public void close() {
-        vector.close();
+        Releasables.closeExpectNoException(vector);
     }
 }
diff --git a/...n/esql/compute/src/main/generated-src/org/elasticsearch/compute/data/LongVectorBlock.java b/...n/esql/compute/src/main/generated-src/org/elasticsearch/compute/data/LongVectorBlock.java
@@ -8,6 +8,7 @@
 package org.elasticsearch.compute.data;
 
 import org.apache.lucene.util.RamUsageEstimator;
+import org.elasticsearch.core.Releasables;
 
 /**
  * Block view of a LongVector.
@@ -74,6 +75,6 @@ public String toString() {
 
     @Override
     public void close() {
-        vector.close();
+        Releasables.closeExpectNoException(vector);
     }
 }
diff --git a/x-pack/plugin/esql/compute/src/main/java/org/elasticsearch/compute/data/DocBlock.java b/x-pack/plugin/esql/compute/src/main/java/org/elasticsearch/compute/data/DocBlock.java
@@ -59,7 +59,7 @@ public long ramBytesUsed() {
 
     @Override
     public void close() {
-        Releasables.close(vector);
+        Releasables.closeExpectNoException(vector);
     }
 
     /**

diff --git a/x-pack/plugin/esql/compute/src/main/java/org/elasticsearch/compute/data/DocVector.java b/x-pack/plugin/esql/compute/src/main/java/org/elasticsearch/compute/data/DocVector.java
@@ -202,6 +202,6 @@ public long ramBytesUsed() {
 
     @Override
     public void close() {
-        Releasables.close(shards, segments, docs);
+        Releasables.closeExpectNoException(shards, segments, docs);
     }
 }
diff --git a/...ck/plugin/esql/compute/src/main/java/org/elasticsearch/compute/data/X-ArrayVector.java.st b/...ck/plugin/esql/compute/src/main/java/org/elasticsearch/compute/data/X-ArrayVector.java.st
@@ -110,7 +110,7 @@ $endif$
     @Override
     public void close() {
 $if(BytesRef)$
-        Releasables.close(values);
+        Releasables.closeExpectNoException(values);
 $else$
         // no-op
 $endif$

diff --git a/...ck/plugin/esql/compute/src/main/java/org/elasticsearch/compute/data/X-FilterBlock.java.st b/...ck/plugin/esql/compute/src/main/java/org/elasticsearch/compute/data/X-FilterBlock.java.st
@@ -11,6 +11,7 @@ $if(BytesRef)$
 import org.apache.lucene.util.BytesRef;
 $endif$
 import org.apache.lucene.util.RamUsageEstimator;
+import org.elasticsearch.core.Releasables;
 
 /**
  * Filter block for $Type$Blocks.
@@ -149,6 +150,6 @@ $endif$
 
     @Override
     public void close() {
-        block.close();
+        Releasables.closeExpectNoException(block);
     }
 }
diff --git a/...k/plugin/esql/compute/src/main/java/org/elasticsearch/compute/data/X-FilterVector.java.st b/...k/plugin/esql/compute/src/main/java/org/elasticsearch/compute/data/X-FilterVector.java.st
@@ -11,6 +11,7 @@ $if(BytesRef)$
 import org.apache.lucene.util.BytesRef;
 $endif$
 import org.apache.lucene.util.RamUsageEstimator;
+import org.elasticsearch.core.Releasables;
 
 /**
  * Filter vector for $Type$Vectors.
@@ -103,6 +104,6 @@ $endif$
 
     @Override
     public void close() {
-        vector.close();
+        Releasables.closeExpectNoException(vector);
     }
 }
diff --git a/...ck/plugin/esql/compute/src/main/java/org/elasticsearch/compute/data/X-VectorBlock.java.st b/...ck/plugin/esql/compute/src/main/java/org/elasticsearch/compute/data/X-VectorBlock.java.st
@@ -11,6 +11,7 @@ $if(BytesRef)$
 import org.apache.lucene.util.BytesRef;
 $endif$
 import org.apache.lucene.util.RamUsageEstimator;
+import org.elasticsearch.core.Releasables;
 
 /**
  * Block view of a $Type$Vector.
@@ -82,6 +83,6 @@ $endif$
 
     @Override
     public void close() {
-        vector.close();
+        Releasables.closeExpectNoException(vector);
     }
 }