Fix bug: Closing iterators on errors for CassandraTable and MysqlTable (

#2014) Co-authored-by: Sagar Rao <[email protected]>
apache · Nov 14, 2022 · 833ce2f · 833ce2f
1 parent 020b7dc
commit 833ce2f
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 0 deletions.
diff --git a/...h-cassandra/src/main/java/com/baidu/hugegraph/backend/store/cassandra/CassandraTable.java b/...h-cassandra/src/main/java/com/baidu/hugegraph/backend/store/cassandra/CassandraTable.java
@@ -156,6 +156,12 @@ protected <R> Iterator<R> query(Query query,
         } catch (DriverException e) {
             LOG.debug("Failed to query [{}], detail statement: {}",
                       query, selects, e);
+            // Closing the iterator
+            try {
+                rs.close();
+            } catch (Exception e2) {
+                LOG.error("Got error {} when closing iterator for query {}", e2, query);
+            }
             throw new BackendException("Failed to query [%s]", e, query);
         }
 

diff --git a/hugegraph-mysql/src/main/java/com/baidu/hugegraph/backend/store/mysql/MysqlTable.java b/hugegraph-mysql/src/main/java/com/baidu/hugegraph/backend/store/mysql/MysqlTable.java
@@ -477,6 +477,12 @@ protected <R> Iterator<R> query(Session session, Query query,
                 rs.extend(parser.apply(query, results));
             }
         } catch (SQLException e) {
+            // Closing the iterator
+            try {
+                rs.close();
+            } catch (Exception e2) {
+                LOG.error("Got error {} when closing iterator for query {}", e2, query);
+            }
             throw new BackendException("Failed to query [%s]", e, query);
         }