Author: hashutosh Date: Fri Dec 20 16:45:46 2013 New Revision: 1552730 URL: http://svn.apache.org/r1552730 Log: HIVE-6065 : orc/FileDump and testRCFile should close on appropriate resources (Jason Dere via Ashutosh Chauhan)
Modified: hive/trunk/itests/hive-unit/src/test/java/org/apache/hadoop/hive/metastore/TestHiveMetaStore.java hive/trunk/itests/hive-unit/src/test/java/org/apache/hadoop/hive/metastore/TestMetastoreVersion.java hive/trunk/itests/hive-unit/src/test/java/org/apache/hive/beeline/TestSchemaTool.java hive/trunk/ql/src/java/org/apache/hadoop/hive/ql/io/orc/FileDump.java hive/trunk/ql/src/test/org/apache/hadoop/hive/ql/io/TestRCFile.java Modified: hive/trunk/itests/hive-unit/src/test/java/org/apache/hadoop/hive/metastore/TestHiveMetaStore.java URL: http://svn.apache.org/viewvc/hive/trunk/itests/hive-unit/src/test/java/org/apache/hadoop/hive/metastore/TestHiveMetaStore.java?rev=1552730&r1=1552729&r2=1552730&view=diff ============================================================================== --- hive/trunk/itests/hive-unit/src/test/java/org/apache/hadoop/hive/metastore/TestHiveMetaStore.java (original) +++ hive/trunk/itests/hive-unit/src/test/java/org/apache/hadoop/hive/metastore/TestHiveMetaStore.java Fri Dec 20 16:45:46 2013 @@ -37,6 +37,7 @@ import org.apache.commons.logging.LogFac import org.apache.hadoop.fs.FileSystem; import org.apache.hadoop.fs.Path; import org.apache.hadoop.fs.permission.FsPermission; +import org.apache.hadoop.hive.common.FileUtils; import org.apache.hadoop.hive.conf.HiveConf; import org.apache.hadoop.hive.metastore.api.AlreadyExistsException; import org.apache.hadoop.hive.metastore.api.ColumnStatistics; @@ -258,10 +259,10 @@ public abstract class TestHiveMetaStore } assertTrue("Partitions are not same", part.equals(part_get)); - String partName = "ds=2008-07-01 14%3A13%3A12/hr=14"; - String part2Name = "ds=2008-07-01 14%3A13%3A12/hr=15"; - String part3Name ="ds=2008-07-02 14%3A13%3A12/hr=15"; - String part4Name ="ds=2008-07-03 14%3A13%3A12/hr=151"; + String partName = "ds=" + FileUtils.escapePathName("2008-07-01 14:13:12") + "/hr=14"; + String part2Name = "ds=" + FileUtils.escapePathName("2008-07-01 14:13:12") + "/hr=15"; + String part3Name = "ds=" + FileUtils.escapePathName("2008-07-02 14:13:12") + "/hr=15"; + String part4Name = "ds=" + FileUtils.escapePathName("2008-07-03 14:13:12") + "/hr=151"; part_get = client.getPartition(dbName, tblName, partName); assertTrue("Partitions are not the same", part.equals(part_get)); Modified: hive/trunk/itests/hive-unit/src/test/java/org/apache/hadoop/hive/metastore/TestMetastoreVersion.java URL: http://svn.apache.org/viewvc/hive/trunk/itests/hive-unit/src/test/java/org/apache/hadoop/hive/metastore/TestMetastoreVersion.java?rev=1552730&r1=1552729&r2=1552730&view=diff ============================================================================== --- hive/trunk/itests/hive-unit/src/test/java/org/apache/hadoop/hive/metastore/TestMetastoreVersion.java (original) +++ hive/trunk/itests/hive-unit/src/test/java/org/apache/hadoop/hive/metastore/TestMetastoreVersion.java Fri Dec 20 16:45:46 2013 @@ -61,7 +61,7 @@ public class TestMetastoreVersion extend protected void tearDown() throws Exception { File metaStoreDir = new File(testMetastoreDB); if (metaStoreDir.exists()) { - FileUtils.deleteDirectory(metaStoreDir); + FileUtils.forceDeleteOnExit(metaStoreDir); } } Modified: hive/trunk/itests/hive-unit/src/test/java/org/apache/hive/beeline/TestSchemaTool.java URL: http://svn.apache.org/viewvc/hive/trunk/itests/hive-unit/src/test/java/org/apache/hive/beeline/TestSchemaTool.java?rev=1552730&r1=1552729&r2=1552730&view=diff ============================================================================== --- hive/trunk/itests/hive-unit/src/test/java/org/apache/hive/beeline/TestSchemaTool.java (original) +++ hive/trunk/itests/hive-unit/src/test/java/org/apache/hive/beeline/TestSchemaTool.java Fri Dec 20 16:45:46 2013 @@ -56,7 +56,7 @@ public class TestSchemaTool extends Test protected void tearDown() throws Exception { File metaStoreDir = new File(testMetastoreDB); if (metaStoreDir.exists()) { - FileUtils.deleteDirectory(metaStoreDir); + FileUtils.forceDeleteOnExit(metaStoreDir); } } Modified: hive/trunk/ql/src/java/org/apache/hadoop/hive/ql/io/orc/FileDump.java URL: http://svn.apache.org/viewvc/hive/trunk/ql/src/java/org/apache/hadoop/hive/ql/io/orc/FileDump.java?rev=1552730&r1=1552729&r2=1552730&view=diff ============================================================================== --- hive/trunk/ql/src/java/org/apache/hadoop/hive/ql/io/orc/FileDump.java (original) +++ hive/trunk/ql/src/java/org/apache/hadoop/hive/ql/io/orc/FileDump.java Fri Dec 20 16:45:46 2013 @@ -82,6 +82,7 @@ public final class FileDump { System.out.println(buf); } } + rows.close(); } } } Modified: hive/trunk/ql/src/test/org/apache/hadoop/hive/ql/io/TestRCFile.java URL: http://svn.apache.org/viewvc/hive/trunk/ql/src/test/org/apache/hadoop/hive/ql/io/TestRCFile.java?rev=1552730&r1=1552729&r2=1552730&view=diff ============================================================================== --- hive/trunk/ql/src/test/org/apache/hadoop/hive/ql/io/TestRCFile.java (original) +++ hive/trunk/ql/src/test/org/apache/hadoop/hive/ql/io/TestRCFile.java Fri Dec 20 16:45:46 2013 @@ -719,6 +719,7 @@ public class TestRCFile { while (rr.next(key, value)) { readCount++; } + rr.close(); System.out.println("The " + i + "th split read " + (readCount - previousReadCount)); }