You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ignite.apache.org by sb...@apache.org on 2017/09/15 08:08:43 UTC

[14/25] ignite git commit: IGNITE-6330: Implemented closing of ODBC and JDBC cursors on disconnect

IGNITE-6330: Implemented closing of ODBC and JDBC cursors on disconnect


Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/28b5c116
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/28b5c116
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/28b5c116

Branch: refs/heads/ignite-6149
Commit: 28b5c1162cac13dad8d190b66bdd87380e632c86
Parents: 60d7588
Author: Igor Sapego <is...@gridgain.com>
Authored: Wed Sep 13 16:21:56 2017 +0300
Committer: Igor Sapego <is...@gridgain.com>
Committed: Wed Sep 13 16:21:56 2017 +0300

----------------------------------------------------------------------
 .../odbc/SqlListenerConnectionContext.java      |  6 ++++++
 .../processors/odbc/SqlListenerNioListener.java |  5 +++++
 .../odbc/jdbc/JdbcConnectionContext.java        |  5 +++++
 .../odbc/jdbc/JdbcRequestHandler.java           | 20 +++++++++++++++++++-
 .../odbc/odbc/OdbcConnectionContext.java        |  5 +++++
 .../odbc/odbc/OdbcRequestHandler.java           | 18 ++++++++++++++++++
 6 files changed, 58 insertions(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/ignite/blob/28b5c116/modules/core/src/main/java/org/apache/ignite/internal/processors/odbc/SqlListenerConnectionContext.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/odbc/SqlListenerConnectionContext.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/odbc/SqlListenerConnectionContext.java
index a459a1f..3438d5a 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/odbc/SqlListenerConnectionContext.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/odbc/SqlListenerConnectionContext.java
@@ -53,4 +53,10 @@ public interface SqlListenerConnectionContext {
      * @return Message parser for the connection.
      */
     SqlListenerMessageParser parser();
+
+    /**
+     * Called whenever client is disconnected due to correct connection close
+     * or due to {@code IOException} during network operations.
+     */
+    void onDisconnected();
 }

http://git-wip-us.apache.org/repos/asf/ignite/blob/28b5c116/modules/core/src/main/java/org/apache/ignite/internal/processors/odbc/SqlListenerNioListener.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/odbc/SqlListenerNioListener.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/odbc/SqlListenerNioListener.java
index 339c8c1..81539dc 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/odbc/SqlListenerNioListener.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/odbc/SqlListenerNioListener.java
@@ -88,6 +88,11 @@ public class SqlListenerNioListener extends GridNioServerListenerAdapter<byte[]>
 
     /** {@inheritDoc} */
     @Override public void onDisconnected(GridNioSession ses, @Nullable Exception e) {
+        SqlListenerConnectionContext connCtx = ses.meta(CONN_CTX_META_KEY);
+
+        if (connCtx != null)
+            connCtx.onDisconnected();
+
         if (log.isDebugEnabled()) {
             if (e == null)
                 log.debug("SQL client disconnected: " + ses.remoteAddress());

http://git-wip-us.apache.org/repos/asf/ignite/blob/28b5c116/modules/core/src/main/java/org/apache/ignite/internal/processors/odbc/jdbc/JdbcConnectionContext.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/odbc/jdbc/JdbcConnectionContext.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/odbc/jdbc/JdbcConnectionContext.java
index 035cb77..1f13fcf 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/odbc/jdbc/JdbcConnectionContext.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/odbc/jdbc/JdbcConnectionContext.java
@@ -115,4 +115,9 @@ public class JdbcConnectionContext implements SqlListenerConnectionContext {
     @Override public SqlListenerMessageParser parser() {
         return parser;
     }
+
+    /** {@inheritDoc} */
+    @Override public void onDisconnected() {
+        handler.onDisconnect();
+    }
 }

http://git-wip-us.apache.org/repos/asf/ignite/blob/28b5c116/modules/core/src/main/java/org/apache/ignite/internal/processors/odbc/jdbc/JdbcRequestHandler.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/odbc/jdbc/JdbcRequestHandler.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/odbc/jdbc/JdbcRequestHandler.java
index 3ccc195..378c6cb 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/odbc/jdbc/JdbcRequestHandler.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/odbc/jdbc/JdbcRequestHandler.java
@@ -138,7 +138,7 @@ public class JdbcRequestHandler implements SqlListenerRequestHandler {
         JdbcRequest req = (JdbcRequest)req0;
 
         if (!busyLock.enterBusy())
-            return new JdbcResponse(SqlListenerResponse.STATUS_FAILED, 
+            return new JdbcResponse(SqlListenerResponse.STATUS_FAILED,
                 "Failed to handle JDBC request because node is stopping.");
 
         try {
@@ -204,6 +204,24 @@ public class JdbcRequestHandler implements SqlListenerRequestHandler {
     }
 
     /**
+     * Called whenever client is disconnected due to correct connection close
+     * or due to {@code IOException} during network operations.
+     */
+    public void onDisconnect() {
+        if (busyLock.enterBusy())
+        {
+            try
+            {
+                for (JdbcQueryCursor cursor : qryCursors.values())
+                    cursor.close();
+            }
+            finally {
+                busyLock.leaveBusy();
+            }
+        }
+    }
+
+    /**
      * {@link JdbcQueryExecuteRequest} command handler.
      *
      * @param req Execute query request.

http://git-wip-us.apache.org/repos/asf/ignite/blob/28b5c116/modules/core/src/main/java/org/apache/ignite/internal/processors/odbc/odbc/OdbcConnectionContext.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/odbc/odbc/OdbcConnectionContext.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/odbc/odbc/OdbcConnectionContext.java
index 5e8a514..9b7bcbd 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/odbc/odbc/OdbcConnectionContext.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/odbc/odbc/OdbcConnectionContext.java
@@ -113,4 +113,9 @@ public class OdbcConnectionContext implements SqlListenerConnectionContext {
     @Override public SqlListenerMessageParser parser() {
         return parser;
     }
+
+    /** {@inheritDoc} */
+    @Override public void onDisconnected() {
+        handler.onDisconnect();
+    }
 }

http://git-wip-us.apache.org/repos/asf/ignite/blob/28b5c116/modules/core/src/main/java/org/apache/ignite/internal/processors/odbc/odbc/OdbcRequestHandler.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/odbc/odbc/OdbcRequestHandler.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/odbc/odbc/OdbcRequestHandler.java
index 19fe796..31053c7 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/odbc/odbc/OdbcRequestHandler.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/odbc/odbc/OdbcRequestHandler.java
@@ -170,6 +170,24 @@ public class OdbcRequestHandler implements SqlListenerRequestHandler {
     }
 
     /**
+     * Called whenever client is disconnected due to correct connection close
+     * or due to {@code IOException} during network operations.
+     */
+    public void onDisconnect() {
+        if (busyLock.enterBusy())
+        {
+            try
+            {
+                for (IgniteBiTuple<QueryCursor, Iterator> tuple : qryCursors.values())
+                    tuple.get1().close();
+            }
+            finally {
+                busyLock.leaveBusy();
+            }
+        }
+    }
+
+    /**
      * Make query considering handler configuration.
      * @param schema Schema.
      * @param sql SQL request.