You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@hugegraph.apache.org by je...@apache.org on 2022/11/14 15:06:49 UTC
[incubator-hugegraph] branch master updated: Fix bug: Closing iterators on errors for CassandraTable and MysqlTable (#2014)
This is an automated email from the ASF dual-hosted git repository.
jermy pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-hugegraph.git
The following commit(s) were added to refs/heads/master by this push:
new 833ce2f0b Fix bug: Closing iterators on errors for CassandraTable and MysqlTable (#2014)
833ce2f0b is described below
commit 833ce2f0b77dea6c10d9d3a34bc3b0547ba43dad
Author: vamossagar12 <sa...@gmail.com>
AuthorDate: Mon Nov 14 20:36:42 2022 +0530
Fix bug: Closing iterators on errors for CassandraTable and MysqlTable (#2014)
Co-authored-by: Sagar Rao <sa...@Sagars-MacBook-Pro.local>
---
.../com/baidu/hugegraph/backend/store/cassandra/CassandraTable.java | 6 ++++++
.../java/com/baidu/hugegraph/backend/store/mysql/MysqlTable.java | 6 ++++++
2 files changed, 12 insertions(+)
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
index a96fef04d..8f3d38284 100644
--- 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 @@ public abstract class CassandraTable
} 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
index 2a06beab9..3417ee21a 100644
--- 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 @@ public abstract class MysqlTable
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);
}