From 88f8b22dc37bccd70a8446e1876630efb6cf764b Mon Sep 17 00:00:00 2001
From: liveandevil <1361605435@qq.com>
Date: Sun, 12 Nov 2017 14:32:07 +0800
Subject: [PATCH] KYLIN-2975 Close statement and connection in query acl test

---
 ...{QuerACLTestUtil.java => QueryACLTestUtil.java} | 24 ++++++++++++++++------
 .../kylin/rest/security/QueryWithTableACLTest.java | 22 ++++++++++----------
 2 files changed, 29 insertions(+), 17 deletions(-)
 rename query/src/main/java/org/apache/kylin/query/security/{QuerACLTestUtil.java => QueryACLTestUtil.java} (68%)

diff --git a/query/src/main/java/org/apache/kylin/query/security/QuerACLTestUtil.java b/query/src/main/java/org/apache/kylin/query/security/QueryACLTestUtil.java
similarity index 68%
rename from query/src/main/java/org/apache/kylin/query/security/QuerACLTestUtil.java
rename to query/src/main/java/org/apache/kylin/query/security/QueryACLTestUtil.java
index 123ae5bed..071e7c7de 100644
--- a/query/src/main/java/org/apache/kylin/query/security/QuerACLTestUtil.java
+++ b/query/src/main/java/org/apache/kylin/query/security/QueryACLTestUtil.java
@@ -22,22 +22,34 @@ import org.apache.kylin.query.QueryConnection;
 import org.apache.kylin.query.relnode.OLAPContext;
 
 import java.sql.Connection;
-import java.sql.ResultSet;
 import java.sql.SQLException;
 import java.sql.Statement;
 import java.util.HashMap;
 import java.util.Map;
 
-public class QuerACLTestUtil {
+public class QueryACLTestUtil {
     public static void setUser(String username) {
         Map<String, String> auth = new HashMap<>();
         auth.put(OLAPContext.PRM_USER_AUTHEN_INFO, username);
         OLAPContext.setParameters(auth);
     }
 
-    public static ResultSet mockQuery(String project, String sql) throws SQLException {
-        Connection conn = QueryConnection.getConnection(project);
-        Statement statement = conn.createStatement();
-        return statement.executeQuery(sql);
+    public static void mockQuery(String project, String sql) throws SQLException {
+        Connection conn = null;
+        Statement statement = null;
+        try {
+            conn = QueryConnection.getConnection(project);
+            statement = conn.createStatement();
+            statement.executeQuery(sql);
+        } catch (SQLException ex) {
+            throw ex;
+        } finally {
+            if (statement != null) {
+                statement.close();
+            }
+            if (conn != null) {
+                conn.close();
+            }
+        }
     }
 }
diff --git a/server/src/test/java/org/apache/kylin/rest/security/QueryWithTableACLTest.java b/server/src/test/java/org/apache/kylin/rest/security/QueryWithTableACLTest.java
index 950f586ca..414a24148 100644
--- a/server/src/test/java/org/apache/kylin/rest/security/QueryWithTableACLTest.java
+++ b/server/src/test/java/org/apache/kylin/rest/security/QueryWithTableACLTest.java
@@ -25,7 +25,7 @@ import org.apache.kylin.common.KylinConfig;
 import org.apache.kylin.common.util.LocalFileMetadataTestCase;
 import org.apache.kylin.metadata.acl.TableACLManager;
 import org.apache.kylin.query.security.AccessDeniedException;
-import org.apache.kylin.query.security.QuerACLTestUtil;
+import org.apache.kylin.query.security.QueryACLTestUtil;
 import org.hamcrest.CoreMatchers;
 import org.junit.After;
 import org.junit.Before;
@@ -49,32 +49,32 @@ public class QueryWithTableACLTest extends LocalFileMetadataTestCase {
 
     @Test
     public void testNormalQuery() throws SQLException {
-        QuerACLTestUtil.setUser(ADMIN);
-        QuerACLTestUtil.mockQuery(PROJECT, "select * from STREAMING_TABLE");
+        QueryACLTestUtil.setUser(ADMIN);
+        QueryACLTestUtil.mockQuery(PROJECT, "select * from STREAMING_TABLE");
     }
 
     @Test
     public void testFailQuery() throws SQLException, IOException {
-        QuerACLTestUtil.setUser(MODELER);
-        QuerACLTestUtil.mockQuery(PROJECT, "select * from STREAMING_TABLE");
+        QueryACLTestUtil.setUser(MODELER);
+        QueryACLTestUtil.mockQuery(PROJECT, "select * from STREAMING_TABLE");
 
-        QuerACLTestUtil.setUser(ADMIN);
+        QueryACLTestUtil.setUser(ADMIN);
         TableACLManager.getInstance(KylinConfig.getInstanceFromEnv()).addTableACL(PROJECT, "ADMIN", STREAMING_TABLE);
         thrown.expectCause(CoreMatchers.isA(AccessDeniedException.class));
         thrown.expectMessage(CoreMatchers.containsString("Query failed.Access table:DEFAULT.STREAMING_TABLE denied"));
-        QuerACLTestUtil.mockQuery(PROJECT, "select * from STREAMING_TABLE");
+        QueryACLTestUtil.mockQuery(PROJECT, "select * from STREAMING_TABLE");
     }
 
     @Test
     public void testFailQueryWithCountStar() throws SQLException, IOException {
-        QuerACLTestUtil.setUser(MODELER);
-        QuerACLTestUtil.mockQuery(PROJECT, "select count(*) from STREAMING_TABLE");
+        QueryACLTestUtil.setUser(MODELER);
+        QueryACLTestUtil.mockQuery(PROJECT, "select count(*) from STREAMING_TABLE");
 
-        QuerACLTestUtil.setUser(ADMIN);
+        QueryACLTestUtil.setUser(ADMIN);
         TableACLManager.getInstance(KylinConfig.getInstanceFromEnv()).addTableACL(PROJECT, "ADMIN", STREAMING_TABLE);
         thrown.expectCause(CoreMatchers.isA(AccessDeniedException.class));
         thrown.expectMessage(CoreMatchers.containsString("Query failed.Access table:DEFAULT.STREAMING_TABLE denied"));
-        QuerACLTestUtil.mockQuery(PROJECT, "select count(*) from STREAMING_TABLE");
+        QueryACLTestUtil.mockQuery(PROJECT, "select count(*) from STREAMING_TABLE");
     }
 
     @After
-- 
2.11.0 (Apple Git-81)