(nifi) branch main updated: NIFI-14313 JoinEnrichment processor; failure to close result sets contributes to excess memory usage

[mattyb149]

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

mattyb149 pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/nifi.git


The following commit(s) were added to refs/heads/main by this push:
     new fc533d05c0 NIFI-14313 JoinEnrichment processor; failure to close 
result sets contributes to excess memory usage
fc533d05c0 is described below

commit fc533d05c05fedb927a4b5f0d997f65ad20bf3d5
Author: Jim Steinebrey <jrsteineb...@gmail.com>
AuthorDate: Tue Mar 25 10:09:16 2025 -0400

    NIFI-14313 JoinEnrichment processor; failure to close result sets 
contributes to excess memory usage
    
    Signed-off-by: Matt Burgess <mattyb...@apache.org>
    
    This closes #9821
---
 .../apache/nifi/processors/standard/enrichment/SqlJoinStrategy.java   | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git 
a/nifi-extension-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/enrichment/SqlJoinStrategy.java
 
b/nifi-extension-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/enrichment/SqlJoinStrategy.java
index f34008cae9..44056446fa 100644
--- 
a/nifi-extension-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/enrichment/SqlJoinStrategy.java
+++ 
b/nifi-extension-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/enrichment/SqlJoinStrategy.java
@@ -74,13 +74,13 @@ public class SqlJoinStrategy implements RecordJoinStrategy {
             throw t;
         }
 
-        final RecordSet recordSet = new ResultSetRecordSet(rs, outputSchema, 
defaultPrecision, defaultScale, true);
+        final ResultSetRecordSet recordSet = new ResultSetRecordSet(rs, 
outputSchema, defaultPrecision, defaultScale, true);
 
         // Create a RecordJoinResult that allows us to return our RecordSet 
and also close all resources when they are no longer needed
         return new RecordJoinResult() {
             @Override
             public void close() {
-                closeQuietly(originalTable, enrichmentTable);
+                closeQuietly(originalTable, enrichmentTable, recordSet);
                 cache.returnCalciteParameters(sql, outputSchema, 
calciteParameters);
             }