Repository: hive Updated Branches: refs/heads/branch-1.0 9bf229d8c -> f03eacb2e
Revert "HIVE-12660 : HS2 memory leak with .hiverc file use (Thejas Nair, reviewed by Vaibhav Gumashta, Dong Chen)" This reverts commit a7a96afb9651a5e0fa01fcef05ab61ff8c1917c2. Project: http://git-wip-us.apache.org/repos/asf/hive/repo Commit: http://git-wip-us.apache.org/repos/asf/hive/commit/6adfa545 Tree: http://git-wip-us.apache.org/repos/asf/hive/tree/6adfa545 Diff: http://git-wip-us.apache.org/repos/asf/hive/diff/6adfa545 Branch: refs/heads/branch-1.0 Commit: 6adfa5451b5fe00b41eaabf67b128fe79e5c0b06 Parents: 9bf229d Author: Thejas Nair <[email protected]> Authored: Tue Jan 12 10:13:07 2016 -0800 Committer: Thejas Nair <[email protected]> Committed: Tue Jan 12 10:13:07 2016 -0800 ---------------------------------------------------------------------- .../hive/service/cli/session/HiveSessionImpl.java | 15 +++------------ .../cli/session/TestSessionGlobalInitFile.java | 17 +++-------------- 2 files changed, 6 insertions(+), 26 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/hive/blob/6adfa545/service/src/java/org/apache/hive/service/cli/session/HiveSessionImpl.java ---------------------------------------------------------------------- diff --git a/service/src/java/org/apache/hive/service/cli/session/HiveSessionImpl.java b/service/src/java/org/apache/hive/service/cli/session/HiveSessionImpl.java index e8dab75..7206a1d 100644 --- a/service/src/java/org/apache/hive/service/cli/session/HiveSessionImpl.java +++ b/service/src/java/org/apache/hive/service/cli/session/HiveSessionImpl.java @@ -152,20 +152,11 @@ public class HiveSessionImpl implements HiveSession { protected int processCmd(String cmd) { int rc = 0; String cmd_trimed = cmd.trim(); - OperationHandle opHandle = null; try { - //execute in sync mode - opHandle = executeStatementInternal(cmd_trimed, null, false); + executeStatementInternal(cmd_trimed, null, false); } catch (HiveSQLException e) { - LOG.warn("Failed to execute command in global .hiverc file.", e); - return -1; - } - if (opHandle != null) { - try { - closeOperation(opHandle); - } catch (HiveSQLException e) { - LOG.warn("Failed to close operation for command in .hiverc file.", e); - } + rc = -1; + LOG.warn("Failed to execute HQL command in global .hiverc file.", e); } return rc; } http://git-wip-us.apache.org/repos/asf/hive/blob/6adfa545/service/src/test/org/apache/hive/service/cli/session/TestSessionGlobalInitFile.java ---------------------------------------------------------------------- diff --git a/service/src/test/org/apache/hive/service/cli/session/TestSessionGlobalInitFile.java b/service/src/test/org/apache/hive/service/cli/session/TestSessionGlobalInitFile.java index aa38a66..37b698b 100644 --- a/service/src/test/org/apache/hive/service/cli/session/TestSessionGlobalInitFile.java +++ b/service/src/test/org/apache/hive/service/cli/session/TestSessionGlobalInitFile.java @@ -22,19 +22,19 @@ import java.util.Arrays; import java.util.HashMap; import java.util.Map; +import junit.framework.Assert; import junit.framework.TestCase; import org.apache.commons.io.FileUtils; import org.apache.hadoop.hive.conf.HiveConf; import org.apache.hive.service.cli.CLIService; +import org.apache.hive.service.cli.ICLIService; import org.apache.hive.service.cli.OperationHandle; import org.apache.hive.service.cli.RowSet; import org.apache.hive.service.cli.SessionHandle; -import org.apache.hive.service.cli.operation.OperationManager; import org.apache.hive.service.cli.thrift.ThriftBinaryCLIService; import org.apache.hive.service.cli.thrift.ThriftCLIServiceClient; import org.junit.After; -import org.junit.Assert; import org.junit.Before; import org.junit.Test; @@ -58,7 +58,7 @@ public class TestSessionGlobalInitFile extends TestCase { cliService.start(); } - public CLIService getService() { + public ICLIService getService() { return cliService; } } @@ -123,15 +123,8 @@ public class TestSessionGlobalInitFile extends TestCase { * setting property. */ private void doTestSessionGlobalInitFile() throws Exception { - - OperationManager operationManager = service.getService().getSessionManager() - .getOperationManager(); SessionHandle sessionHandle = client.openSession(null, null, null); - // ensure there is no operation related object leak - Assert.assertEquals("Verifying all operations used for init file are closed", - 0, operationManager.getOperations().size()); - verifyInitProperty("a", "1", sessionHandle); verifyInitProperty("b", "1", sessionHandle); verifyInitProperty("c", "1", sessionHandle); @@ -144,10 +137,7 @@ public class TestSessionGlobalInitFile extends TestCase { */ // Assert.assertEquals("expected uri", api.getAddedResource("jar")); - Assert.assertEquals("Verifying all operations used for checks are closed", - 0, operationManager.getOperations().size()); client.closeSession(sessionHandle); - } @Test @@ -185,6 +175,5 @@ public class TestSessionGlobalInitFile extends TestCase { Assert.assertEquals(1, rowSet.numRows()); // we know rowSet has only one element Assert.assertEquals(key + "=" + value, rowSet.iterator().next()[0]); - client.closeOperation(operationHandle); } }
