soumyakanti3578 commented on code in PR #6500: URL: https://github.com/apache/hive/pull/6500#discussion_r3268823587
########## service/src/test/org/apache/hive/service/cli/operation/TestSQLOperationDriverCleanup.java: ########## @@ -0,0 +1,96 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package org.apache.hive.service.cli.operation; + +import com.google.common.collect.ImmutableMap; +import org.apache.hadoop.hive.conf.HiveConf; +import org.apache.hadoop.hive.ql.IDriver; +import org.apache.hadoop.hive.ql.session.SessionState; +import org.apache.hive.service.cli.HandleIdentifier; +import org.apache.hive.service.cli.OperationState; +import org.apache.hive.service.cli.SessionHandle; +import org.apache.hive.service.cli.session.HiveSession; +import org.junit.Before; +import org.junit.Test; + +import java.lang.reflect.Field; + +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertNull; +import static org.mockito.Mockito.inOrder; +import static org.mockito.Mockito.mock; +import static org.mockito.Mockito.when; + +public class TestSQLOperationDriverCleanup { + + private HiveSession session; + private IDriver driver; + + @Before + public void setUp() { + HiveConf conf = new HiveConf(); + session = mock(HiveSession.class); + when(session.getHiveConf()).thenReturn(conf); + when(session.getSessionState()).thenReturn(mock(SessionState.class)); + when(session.getUserName()).thenReturn("user"); + SessionHandle sessionHandle = mock(SessionHandle.class); + when(sessionHandle.getHandleIdentifier()).thenReturn(new HandleIdentifier()); + when(session.getSessionHandle()).thenReturn(sessionHandle); + driver = mock(IDriver.class); + } + + @Test + public void testSQLOperationCloseReleasesDriverInHPLSQLMode() throws Exception { + SQLOperation operation = new SQLOperation(session, "insert into test values (1)", + ImmutableMap.of(), false, 0L, true); + setDriver(operation, driver); + + operation.close(); + + inOrder(driver).verify(driver).close(); + inOrder(driver).verify(driver).destroy(); Review Comment: Do we need to verify on the same `InOrder` object? Calling `inOrder` creates a new `InOrder` object every time. Maybe we need something like this? ``` InOrder order = inOrder(driver); order.verify(driver).close(); order.verify(driver).destroy(); ``` ########## service/src/test/org/apache/hive/service/cli/operation/TestSQLOperationDriverCleanup.java: ########## @@ -0,0 +1,96 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package org.apache.hive.service.cli.operation; + +import com.google.common.collect.ImmutableMap; +import org.apache.hadoop.hive.conf.HiveConf; +import org.apache.hadoop.hive.ql.IDriver; +import org.apache.hadoop.hive.ql.session.SessionState; +import org.apache.hive.service.cli.HandleIdentifier; +import org.apache.hive.service.cli.OperationState; +import org.apache.hive.service.cli.SessionHandle; +import org.apache.hive.service.cli.session.HiveSession; +import org.junit.Before; +import org.junit.Test; + +import java.lang.reflect.Field; + +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertNull; +import static org.mockito.Mockito.inOrder; +import static org.mockito.Mockito.mock; +import static org.mockito.Mockito.when; + +public class TestSQLOperationDriverCleanup { + + private HiveSession session; + private IDriver driver; + + @Before + public void setUp() { + HiveConf conf = new HiveConf(); + session = mock(HiveSession.class); + when(session.getHiveConf()).thenReturn(conf); + when(session.getSessionState()).thenReturn(mock(SessionState.class)); + when(session.getUserName()).thenReturn("user"); + SessionHandle sessionHandle = mock(SessionHandle.class); + when(sessionHandle.getHandleIdentifier()).thenReturn(new HandleIdentifier()); + when(session.getSessionHandle()).thenReturn(sessionHandle); + driver = mock(IDriver.class); + } + + @Test + public void testSQLOperationCloseReleasesDriverInHPLSQLMode() throws Exception { + SQLOperation operation = new SQLOperation(session, "insert into test values (1)", + ImmutableMap.of(), false, 0L, true); + setDriver(operation, driver); + + operation.close(); + + inOrder(driver).verify(driver).close(); + inOrder(driver).verify(driver).destroy(); + assertNull(getDriver(operation)); + } + + @Test + public void testSQLOperationCloseReleasesDriverInNonHPLSQLMode() throws Exception { + SQLOperation operation = new SQLOperation(session, "insert into test values (1)", + ImmutableMap.of(), false, 0L, false); + setDriver(operation, driver); + + operation.close(); + + inOrder(driver).verify(driver).close(); + inOrder(driver).verify(driver).destroy(); Review Comment: Similar as above. ########## itests/hive-unit/src/test/java/org/apache/hive/beeline/TestHplSqlViaBeeLine.java: ########## @@ -1480,6 +1485,28 @@ public void testERRORCODEForExecuteStatements() throws Throwable { testScriptFile(scriptText, args(), "First ERRORCODE: -1.*Second ERRORCODE: 0", OutStream.ERR); } + @Test + public void testHplSqlInsertRemovesStagingDirsUnderTable() throws Throwable { + String scriptText = + "DROP TABLE IF EXISTS result;\n" + + "CREATE TABLE result (s string);\n" + + "INSERT INTO result VALUES('Hello');\n" + + "execute 'INSERT INTO result VALUES(''World'')';\n" + + "SELECT * FROM result;"; + testScriptFile(scriptText, args(), "Hello.*World"); + + HiveConf conf = miniHS2.getHiveConf(); + String stagingDirPrefix = HiveConf.getVar(conf, HiveConf.ConfVars.STAGING_DIR); + Path wh = new Path(MetastoreConf.getVar(conf, MetastoreConf.ConfVars.WAREHOUSE)); + FileSystem fs = wh.getFileSystem(conf); + Path tableDir = fs.makeQualified(new Path(wh, "result")); + FileStatus[] children = fs.listStatus(tableDir); + for (FileStatus child : children) { Review Comment: Is it possible for `children` to be null? It's fine if the array is empty but if it's null we may run into NPE here. -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. To unsubscribe, e-mail: [email protected] For queries about this service, please contact Infrastructure at: [email protected] --------------------------------------------------------------------- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
