hive-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From khorg...@apache.org
Subject svn commit: r1587713 - /hive/trunk/hcatalog/core/src/main/java/org/apache/hive/hcatalog/cli/HCatCli.java
Date Tue, 15 Apr 2014 20:22:31 GMT
Author: khorgath
Date: Tue Apr 15 20:22:31 2014
New Revision: 1587713

URL: http://svn.apache.org/r1587713
Log:
HIVE-6726 : Hcat cli does not close SessionState (Sushanth Sowmyan, reviewed by Thejas M Nair)

Modified:
    hive/trunk/hcatalog/core/src/main/java/org/apache/hive/hcatalog/cli/HCatCli.java

Modified: hive/trunk/hcatalog/core/src/main/java/org/apache/hive/hcatalog/cli/HCatCli.java
URL: http://svn.apache.org/viewvc/hive/trunk/hcatalog/core/src/main/java/org/apache/hive/hcatalog/cli/HCatCli.java?rev=1587713&r1=1587712&r2=1587713&view=diff
==============================================================================
--- hive/trunk/hcatalog/core/src/main/java/org/apache/hive/hcatalog/cli/HCatCli.java (original)
+++ hive/trunk/hcatalog/core/src/main/java/org/apache/hive/hcatalog/cli/HCatCli.java Tue Apr
15 20:22:31 2014
@@ -151,7 +151,7 @@ public class HCatCli {
     // -h
     if (cmdLine.hasOption('h')) {
       printUsage(options, ss.out);
-      System.exit(0);
+      sysExit(ss, 0);
     }
 
     // -e
@@ -162,7 +162,7 @@ public class HCatCli {
     if (execString != null && fileName != null) {
       ss.err.println("The '-e' and '-f' options cannot be specified simultaneously");
       printUsage(options, ss.err);
-      System.exit(1);
+      sysExit(ss, 1);
     }
 
     // -p
@@ -180,24 +180,45 @@ public class HCatCli {
     // all done parsing, let's run stuff!
 
     if (execString != null) {
-      System.exit(processLine(execString));
+      sysExit(ss, processLine(execString));
     }
 
     try {
       if (fileName != null) {
-        System.exit(processFile(fileName));
+        sysExit(ss, processFile(fileName));
       }
     } catch (FileNotFoundException e) {
       ss.err.println("Input file not found. (" + e.getMessage() + ")");
-      System.exit(1);
+      sysExit(ss, 1);
     } catch (IOException e) {
       ss.err.println("Could not open input file for reading. (" + e.getMessage() + ")");
-      System.exit(1);
+      sysExit(ss, 1);
     }
 
     // -h
     printUsage(options, ss.err);
-    System.exit(1);
+    sysExit(ss, 1);
+  }
+
+  /**
+   * Wrapper for System.exit that makes sure we close our SessionState
+   * before we exit. This ignores any error generated by attempting to
+   * close the session state, merely printing out the error. The return
+   * code is not changed in such an occurrence because we want to retain
+   * the success code of whatever command we already ran.
+   */
+  private static void sysExit(SessionState ss, int retCode) {
+    try {
+      ss.close();
+    } catch (IOException e) {
+      // If we got an error attempting to ss.close, then it's not likely that
+      // ss.err is valid. So we're back to System.err. Also, we don't change
+      // the return code, we simply log a warning, and return whatever return
+      // code we expected to do already.
+      System.err.println(e.getMessage());
+      e.printStackTrace(System.err);
+    }
+    System.exit(retCode);
   }
 
   private static void setConfProperties(HiveConf conf, Properties props) {
@@ -271,7 +292,7 @@ public class HCatCli {
 
     if (ret != 0) {
       driver.close();
-      System.exit(ret);
+      sysExit(ss, ret);
     }
 
     ArrayList<String> res = new ArrayList<String>();
@@ -324,22 +345,22 @@ public class HCatCli {
       fp = new FsPermission(Short.decode("0" + perms));
     } else {
       ss.err.println("Invalid permission specification: " + perms);
-      System.exit(1);
+      sysExit(ss,1);
     }
 
     if (!HCatUtil.validateMorePermissive(fp.getUserAction(), fp.getGroupAction())) {
       ss.err.println("Invalid permission specification: " + perms + " : user permissions
must be more permissive than group permission ");
-      System.exit(1);
+      sysExit(ss,1);
     }
     if (!HCatUtil.validateMorePermissive(fp.getGroupAction(), fp.getOtherAction())) {
       ss.err.println("Invalid permission specification: " + perms + " : group permissions
must be more permissive than other permission ");
-      System.exit(1);
+      sysExit(ss,1);
     }
     if ((!HCatUtil.validateExecuteBitPresentIfReadOrWrite(fp.getUserAction())) ||
       (!HCatUtil.validateExecuteBitPresentIfReadOrWrite(fp.getGroupAction())) ||
       (!HCatUtil.validateExecuteBitPresentIfReadOrWrite(fp.getOtherAction()))) {
       ss.err.println("Invalid permission specification: " + perms + " : permissions must
have execute permissions if read or write permissions are specified ");
-      System.exit(1);
+      sysExit(ss,1);
     }
 
     conf.set(HCatConstants.HCAT_PERMS, "d" + fp.toString());



Mime
View raw message