[incubator-iotdb] branch cluster updated: modify close clusterService

[lt...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

lta pushed a commit to branch cluster
in repository https://gitbox.apache.org/repos/asf/incubator-iotdb.git


The following commit(s) were added to refs/heads/cluster by this push:
     new 29f8eea  modify close clusterService
29f8eea is described below

commit 29f8eea82cf7176b30dda3dc7906fa229dbec3d3
Author: lta <li...@163.com>
AuthorDate: Mon May 13 10:56:30 2019 +0800

    modify close clusterService
---
 .../apache/iotdb/cluster/service/TSServiceClusterImpl.java    | 11 +++++++++--
 .../main/java/org/apache/iotdb/db/service/TSServiceImpl.java  | 10 +---------
 2 files changed, 10 insertions(+), 11 deletions(-)

diff --git a/cluster/src/main/java/org/apache/iotdb/cluster/service/TSServiceClusterImpl.java b/cluster/src/main/java/org/apache/iotdb/cluster/service/TSServiceClusterImpl.java
index 4f3b442..ea98ac4 100644
--- a/cluster/src/main/java/org/apache/iotdb/cluster/service/TSServiceClusterImpl.java
+++ b/cluster/src/main/java/org/apache/iotdb/cluster/service/TSServiceClusterImpl.java
@@ -311,11 +311,18 @@ public class TSServiceClusterImpl extends TSServiceImpl {
     queryRet.get().put(statement, queryDataSet);
     return queryDataSet;
   }
+
+  @Override
+  public void handleClientExit() throws TException {
+    closeClusterService();
+    closeOperation(null);
+    closeSession(null);
+  }
+
   /**
    * Close cluster service
    */
-  @Override
-  public void closeClusterService() {
+  private void closeClusterService() {
     nonQueryExecutor.shutdown();
     queryMetadataExecutor.shutdown();
   }
diff --git a/iotdb/src/main/java/org/apache/iotdb/db/service/TSServiceImpl.java b/iotdb/src/main/java/org/apache/iotdb/db/service/TSServiceImpl.java
index 8c9415d..8bb5001 100644
--- a/iotdb/src/main/java/org/apache/iotdb/db/service/TSServiceImpl.java
+++ b/iotdb/src/main/java/org/apache/iotdb/db/service/TSServiceImpl.java
@@ -852,19 +852,11 @@ public class TSServiceImpl implements TSIService.Iface, ServerContext {
     return resp;
   }
 
-  public void handleClientExit() throws TException {
-    closeClusterService();
+  protected void handleClientExit() throws TException {
     closeOperation(null);
     closeSession(null);
   }
 
-  /**
-   * Close cluster service
-   */
-  public void closeClusterService() {
-
-  }
-
   @Override
   public TSGetTimeZoneResp getTimeZone() throws TException {
     TS_Status tsStatus;