Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

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

Merged
merged 4 commits into from
Nov 14, 2022
Merged

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

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
5b6ee0b
Fix bug: Closing iterators on errors
Nov 10, 2022
e457710
Merge branch 'master' into cassandra-close-extendableiterator
imbajin Nov 13, 2022
ae12cd1
Review comments addresed
Nov 14, 2022
6f9acd3
Review comments addressed
Nov 14, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 6 additions & 0 deletions ...h-cassandra/src/main/java/com/baidu/hugegraph/backend/store/cassandra/CassandraTable.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 closeException) {
vamossagar12 marked this conversation as resolved.
Show resolved Hide resolved
throw new BackendException("Error closing Iterator during query [%s]", e, query);
vamossagar12 marked this conversation as resolved.
Show resolved Hide resolved
}
throw new BackendException("Failed to query [%s]", e, query);
}

Expand Down
6 changes: 6 additions & 0 deletions hugegraph-mysql/src/main/java/com/baidu/hugegraph/backend/store/mysql/MysqlTable.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -477,6 +477,12 @@ protected <R> Iterator<R> query(Session session, Query query,
rs.extend(parser.apply(query, results));
}
} catch (SQLException e) {
// closing iterator
try {
rs.close();
} catch (Exception closeException) {
throw new BackendException("Error closing Iterator during query [%s]", e, query);
vamossagar12 marked this conversation as resolved.
Show resolved Hide resolved
}
throw new BackendException("Failed to query [%s]", e, query);
}

Expand Down