You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@iotdb.apache.org by ja...@apache.org on 2021/01/22 07:44:24 UTC
[iotdb] branch rel/0.11 updated: Fix session put back bug (#2556)
This is an automated email from the ASF dual-hosted git repository.
jackietien pushed a commit to branch rel/0.11
in repository https://gitbox.apache.org/repos/asf/iotdb.git
The following commit(s) were added to refs/heads/rel/0.11 by this push:
new 7b2f9f9 Fix session put back bug (#2556)
7b2f9f9 is described below
commit 7b2f9f96f3d507e1fa5847469cf069403aee512f
Author: SilverNarcissus <15...@smail.nju.edu.cn>
AuthorDate: Fri Jan 22 15:44:10 2021 +0800
Fix session put back bug (#2556)
Fix session put back bug
---
.../org/apache/iotdb/session/pool/SessionPool.java | 32 +++++++++++-----------
1 file changed, 16 insertions(+), 16 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..effbdde 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;
}
@@ -663,7 +663,7 @@ public class SessionPool {
// TException means the connection is broken, remove it and get a new one.
logger.warn("testInsertRecord 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;
}