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

vamossagar12 · Sagar Rao · web-flow · commit 833ce2f0b77d · 2022-11-14T23:06:42.000+08:00
Co-authored-by: Sagar Rao &lt;sagarrao@Sagars-MacBook-Pro.local&gt;
diff --git a/hugegraph-cassandra/src/main/java/com/baidu/hugegraph/backend/store/cassandra/CassandraTable.java b/hugegraph-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);
         }
 

Original file line number	Diff line number	Diff line change
`@@ -477,6 +477,12 @@ protected <R> Iterator<R> query(Session session, Query query,`
`477`	`477`	`rs.extend(parser.apply(query, results));`
`478`	`478`	`}`
`479`	`479`	`} catch (SQLException e) {`
	`480`	`+ // Closing the iterator`
	`481`	`+ try {`
	`482`	`+ rs.close();`
	`483`	`+ } catch (Exception e2) {`
	`484`	`+ LOG.error("Got error {} when closing iterator for query {}", e2, query);`
	`485`	`+ }`
`480`	`486`	`throw new BackendException("Failed to query [%s]", e, query);`
`481`	`487`	`}`
`482`	`488`