This is an automated email from the ASF dual-hosted git repository. xuekaifeng pushed a commit to branch fix-session-put-back-0.11 in repository https://gitbox.apache.org/repos/asf/iotdb.git
commit 5817d971ccb04cbd629028c7ef9bb781ad7a380c Author: 151250176 <[email protected]> AuthorDate: Fri Jan 22 15:21:18 2021 +0800 fix bug --- .../org/apache/iotdb/session/pool/SessionPool.java | 30 +++++++++++----------- 1 file changed, 15 insertions(+), 15 deletions(-) diff --git a/session/src/main/java/org/apache/iotdb/session/pool/SessionPool.java b/session/src/main/java/org/apache/iotdb/session/pool/SessionPool.java index 7a21f40..932369c 100644 --- a/session/src/main/java/org/apache/iotdb/session/pool/SessionPool.java +++ b/session/src/main/java/org/apache/iotdb/session/pool/SessionPool.java @@ -545,7 +545,7 @@ public class SessionPool { // TException means the connection is broken, remove it and get a new one. logger.warn("insertRecord failed", e); cleanSessionAndMayThrowConnectionException(session, i, e); - } catch (StatementExecutionException e) { + } catch (StatementExecutionException | RuntimeException e) { putBack(session); throw e; } @@ -711,7 +711,7 @@ public class SessionPool { // TException means the connection is broken, remove it and get a new one. logger.warn("deleteTimeseries failed", e); cleanSessionAndMayThrowConnectionException(session, i, e); - } catch (StatementExecutionException e) { + } catch (StatementExecutionException | RuntimeException e) { putBack(session); throw e; } @@ -735,7 +735,7 @@ public class SessionPool { // TException means the connection is broken, remove it and get a new one. logger.warn("deleteTimeseries failed", e); cleanSessionAndMayThrowConnectionException(session, i, e); - } catch (StatementExecutionException e) { + } catch (StatementExecutionException | RuntimeException e) { putBack(session); throw e; } @@ -760,7 +760,7 @@ public class SessionPool { // TException means the connection is broken, remove it and get a new one. logger.warn("deleteData failed", e); cleanSessionAndMayThrowConnectionException(session, i, e); - } catch (StatementExecutionException e) { + } catch (StatementExecutionException | RuntimeException e) { putBack(session); throw e; } @@ -785,7 +785,7 @@ public class SessionPool { // TException means the connection is broken, remove it and get a new one. logger.warn("deleteData failed", e); cleanSessionAndMayThrowConnectionException(session, i, e); - } catch (StatementExecutionException e) { + } catch (StatementExecutionException | RuntimeException e) { putBack(session); throw e; } @@ -811,7 +811,7 @@ public class SessionPool { // TException means the connection is broken, remove it and get a new one. logger.warn("deleteData failed", e); cleanSessionAndMayThrowConnectionException(session, i, e); - } catch (StatementExecutionException e) { + } catch (StatementExecutionException | RuntimeException e) { putBack(session); throw e; } @@ -830,7 +830,7 @@ public class SessionPool { // TException means the connection is broken, remove it and get a new one. logger.warn("setStorageGroup failed", e); cleanSessionAndMayThrowConnectionException(session, i, e); - } catch (StatementExecutionException e) { + } catch (StatementExecutionException | RuntimeException e) { putBack(session); throw e; } @@ -849,7 +849,7 @@ public class SessionPool { // TException means the connection is broken, remove it and get a new one. logger.warn("deleteStorageGroup failed", e); cleanSessionAndMayThrowConnectionException(session, i, e); - } catch (StatementExecutionException e) { + } catch (StatementExecutionException | RuntimeException e) { putBack(session); throw e; } @@ -868,7 +868,7 @@ public class SessionPool { // TException means the connection is broken, remove it and get a new one. logger.warn("deleteStorageGroups failed", e); cleanSessionAndMayThrowConnectionException(session, i, e); - } catch (StatementExecutionException e) { + } catch (StatementExecutionException | RuntimeException e) { putBack(session); throw e; } @@ -887,7 +887,7 @@ public class SessionPool { // TException means the connection is broken, remove it and get a new one. logger.warn("createTimeseries failed", e); cleanSessionAndMayThrowConnectionException(session, i, e); - } catch (StatementExecutionException e) { + } catch (StatementExecutionException | RuntimeException e) { putBack(session); throw e; } @@ -909,7 +909,7 @@ public class SessionPool { // TException means the connection is broken, remove it and get a new one. logger.warn("createTimeseries failed", e); cleanSessionAndMayThrowConnectionException(session, i, e); - } catch (StatementExecutionException e) { + } catch (StatementExecutionException | RuntimeException e) { putBack(session); throw e; } @@ -932,7 +932,7 @@ public class SessionPool { // TException means the connection is broken, remove it and get a new one. logger.warn("createMultiTimeseries failed", e); cleanSessionAndMayThrowConnectionException(session, i, e); - } catch (StatementExecutionException e) { + } catch (StatementExecutionException | RuntimeException e) { putBack(session); throw e; } @@ -951,7 +951,7 @@ public class SessionPool { // TException means the connection is broken, remove it and get a new one. logger.warn("checkTimeseriesExists failed", e); cleanSessionAndMayThrowConnectionException(session, i, e); - } catch (StatementExecutionException e) { + } catch (StatementExecutionException | RuntimeException e) { putBack(session); throw e; } @@ -982,7 +982,7 @@ public class SessionPool { // TException means the connection is broken, remove it and get a new one. logger.warn("executeQueryStatement failed", e); cleanSessionAndMayThrowConnectionException(session, i, e); - } catch (StatementExecutionException e) { + } catch (StatementExecutionException | RuntimeException e) { putBack(session); throw e; } @@ -1008,7 +1008,7 @@ public class SessionPool { // TException means the connection is broken, remove it and get a new one. logger.warn("executeNonQueryStatement failed", e); cleanSessionAndMayThrowConnectionException(session, i, e); - } catch (StatementExecutionException e) { + } catch (StatementExecutionException | RuntimeException e) { putBack(session); throw e; }
