hive-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From c..@apache.org
Subject svn commit: r1467920 - in /hive/trunk: ./ beeline/src/java/org/apache/hive/beeline/ beeline/src/test/org/ beeline/src/test/org/apache/ beeline/src/test/org/apache/hive/ beeline/src/test/org/apache/hive/beeline/ beeline/src/test/org/apache/hive/beeline/...
Date Mon, 15 Apr 2013 09:54:54 GMT
Author: cws
Date: Mon Apr 15 09:54:54 2013
New Revision: 1467920

URL: http://svn.apache.org/r1467920
Log:
HIVE-4268. Beeline should support the -f option (Rob Weltman via cws)

Added:
    hive/trunk/beeline/src/test/org/
    hive/trunk/beeline/src/test/org/apache/
    hive/trunk/beeline/src/test/org/apache/hive/
    hive/trunk/beeline/src/test/org/apache/hive/beeline/
    hive/trunk/beeline/src/test/org/apache/hive/beeline/src/
    hive/trunk/beeline/src/test/org/apache/hive/beeline/src/test/
    hive/trunk/beeline/src/test/org/apache/hive/beeline/src/test/TestBeeLineWithArgs.java
Modified:
    hive/trunk/beeline/src/java/org/apache/hive/beeline/BeeLine.java
    hive/trunk/beeline/src/java/org/apache/hive/beeline/BeeLineOpts.java
    hive/trunk/build.xml

Modified: hive/trunk/beeline/src/java/org/apache/hive/beeline/BeeLine.java
URL: http://svn.apache.org/viewvc/hive/trunk/beeline/src/java/org/apache/hive/beeline/BeeLine.java?rev=1467920&r1=1467919&r2=1467920&view=diff
==============================================================================
--- hive/trunk/beeline/src/java/org/apache/hive/beeline/BeeLine.java (original)
+++ hive/trunk/beeline/src/java/org/apache/hive/beeline/BeeLine.java Mon Apr 15 09:54:54 2013
@@ -554,6 +554,8 @@ public class BeeLine {
         url = args[i++ + 1];
       } else if (args[i].equals("-e")) {
         commands.add(args[i++ + 1]);
+      } else if (args[i].equals("-f")) {
+        getOpts().setScriptFile(args[i++ + 1]);
       } else {
         files.add(args[i]);
       }
@@ -606,7 +608,7 @@ public class BeeLine {
    * to the appropriate {@link CommandHandler} until the
    * global variable <code>exit</code> is true.
    */
-  void begin(String[] args, InputStream inputStream) throws IOException {
+  public void begin(String[] args, InputStream inputStream) throws IOException {
     try {
       // load the options first, so we can override on the command line
       getOpts().load();
@@ -614,12 +616,25 @@ public class BeeLine {
       // nothing
     }
 
-    ConsoleReader reader = getConsoleReader(inputStream);
     if (!(initArgs(args))) {
       usage();
       return;
     }
 
+    ConsoleReader reader = null;
+    boolean runningScript = (getOpts().getScriptFile() != null);
+    if (runningScript) {
+      try {
+        FileInputStream scriptStream = new FileInputStream(getOpts().getScriptFile());
+        reader = getConsoleReader(scriptStream);
+      } catch (Throwable t) {
+        handleException(t);
+        commands.quit(null);
+      }
+    } else {
+      reader = getConsoleReader(inputStream);
+    }
+
     try {
       info(getApplicationTitle());
     } catch (Exception e) {
@@ -628,7 +643,10 @@ public class BeeLine {
 
     while (!exit) {
       try {
-        dispatch(reader.readLine(getPrompt()));
+        // Execute one instruction; terminate on executing a script if there is an error
+        if (!dispatch(reader.readLine(getPrompt())) && runningScript) {
+          commands.quit(null);
+        }
       } catch (EOFException eof) {
         // CTRL-D
         commands.quit(null);

Modified: hive/trunk/beeline/src/java/org/apache/hive/beeline/BeeLineOpts.java
URL: http://svn.apache.org/viewvc/hive/trunk/beeline/src/java/org/apache/hive/beeline/BeeLineOpts.java?rev=1467920&r1=1467919&r2=1467920&view=diff
==============================================================================
--- hive/trunk/beeline/src/java/org/apache/hive/beeline/BeeLineOpts.java (original)
+++ hive/trunk/beeline/src/java/org/apache/hive/beeline/BeeLineOpts.java Mon Apr 15 09:54:54
2013
@@ -100,6 +100,7 @@ class BeeLineOpts implements Completor {
   private final File rcFile = new File(saveDir(), "beeline.properties");
   private String historyFile = new File(saveDir(), "history").getAbsolutePath();
 
+  private String scriptFile = null;
 
   public BeeLineOpts(BeeLine beeLine, Properties props) {
     this.beeLine = beeLine;
@@ -351,6 +352,14 @@ class BeeLineOpts implements Completor {
     return historyFile;
   }
 
+  public void setScriptFile(String scriptFile) {
+    this.scriptFile = scriptFile;
+  }
+
+  public String getScriptFile() {
+    return scriptFile;
+  }
+
   public void setColor(boolean color) {
     this.color = color;
   }

Added: hive/trunk/beeline/src/test/org/apache/hive/beeline/src/test/TestBeeLineWithArgs.java
URL: http://svn.apache.org/viewvc/hive/trunk/beeline/src/test/org/apache/hive/beeline/src/test/TestBeeLineWithArgs.java?rev=1467920&view=auto
==============================================================================
--- hive/trunk/beeline/src/test/org/apache/hive/beeline/src/test/TestBeeLineWithArgs.java
(added)
+++ hive/trunk/beeline/src/test/org/apache/hive/beeline/src/test/TestBeeLineWithArgs.java
Mon Apr 15 09:54:54 2013
@@ -0,0 +1,219 @@
+/**
+ * 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.beeline.src.test;
+
+import java.io.File;
+import java.io.IOException;
+import java.io.PrintStream;
+import java.io.ByteArrayOutputStream;
+import java.io.FileOutputStream;
+
+import junit.framework.TestCase;
+import org.junit.AfterClass;
+import org.junit.BeforeClass;
+import org.junit.Test;
+import org.junit.Assert;
+
+import org.apache.hadoop.hive.conf.HiveConf;
+import org.apache.hadoop.hive.ql.parse.SemanticException;
+import org.apache.hive.beeline.BeeLine;
+import org.apache.hive.service.server.HiveServer2;
+import org.apache.hive.service.cli.HiveSQLException;
+
+/**
+ * TestBeeLineWithArgs - executes tests of the command-line arguments to BeeLine
+ *
+ */
+//public class TestBeeLineWithArgs extends TestCase {
+public class TestBeeLineWithArgs {
+
+  // Default location of HiveServer2
+  final static String JDBC_URL = BeeLine.BEELINE_DEFAULT_JDBC_URL + "localhost:10000";
+
+  private static HiveServer2 hiveServer2;
+
+  /**
+   * Start up a local Hive Server 2 for these tests
+   */
+  @BeforeClass
+  public static void preTests() throws Exception {
+    HiveConf hiveConf = new HiveConf();
+    //  hiveConf.logVars(System.err);
+    // System.err.flush();
+
+    hiveServer2 = new HiveServer2();
+    hiveServer2.init(hiveConf);
+    System.err.println("Starting HiveServer2...");
+    hiveServer2.start();
+    Thread.sleep(1000);
+  }
+
+  /**
+   * Shut down a local Hive Server 2 for these tests
+   */
+  @AfterClass
+  public static void postTests() {
+    try {
+      if (hiveServer2 != null) {
+        System.err.println("Stopping HiveServer2...");
+        hiveServer2.stop();
+      }
+    } catch (Throwable t) {
+      t.printStackTrace();
+    }
+  }
+
+  /**
+   * Execute a script with "beeline -f"
+   * @param scriptFileName The name of the script to execute
+   * @throws Any exception while executing
+   * @return The stderr and stdout from running the script
+   */
+  private String testCommandLineScript(String scriptFileName) throws Throwable {
+    String[] args = {"-d", BeeLine.BEELINE_DEFAULT_JDBC_DRIVER, "-u", JDBC_URL, "-f", scriptFileName};
+    BeeLine beeLine = new BeeLine();
+    ByteArrayOutputStream os = new ByteArrayOutputStream();
+    PrintStream beelineOutputStream = new PrintStream(os);
+    beeLine.setOutputStream(beelineOutputStream);
+    beeLine.setErrorStream(beelineOutputStream);
+    beeLine.begin(args, null);
+    String output = os.toString("UTF8");
+
+    return output;
+  }
+
+  /**
+   * Attempt to execute a simple script file with the -f option to BeeLine
+   * Test for presence of an expected pattern
+   * in the output (stdout or stderr), fail if not found
+   * Print PASSED or FAILED
+   * @paramm testName Name of test to print
+   * @param expecttedPattern Text to look for in command output
+   * @param shouldMatch true if the pattern should be found, false if it should not
+   * @throws Exception on command execution error
+   */
+  private void testScriptFile(String testName, String scriptText, String expectedPattern,
boolean shouldMatch) throws Throwable {
+
+    long startTime = System.currentTimeMillis();
+    System.out.println(">>> STARTED " + testName);
+
+    // Put the script content in a temp file
+    File scriptFile = File.createTempFile(testName, "temp");
+    scriptFile.deleteOnExit();
+    PrintStream os = new PrintStream(new FileOutputStream(scriptFile));
+    os.print(scriptText);
+    os.close();
+
+    if(shouldMatch) {
+      try {
+        String output = testCommandLineScript(scriptFile.getAbsolutePath());
+        long elapsedTime = (System.currentTimeMillis() - startTime)/1000;
+        String time = "(" + elapsedTime + "s)";
+        if (output.contains(expectedPattern)) {
+          System.out.println(">>> PASSED " + testName + " " + time);
+        } else {
+          System.err.println("Output: " + output);
+          System.err.println(">>> FAILED " + testName + " (ERROR) " + time);
+          Assert.fail(testName);
+        }
+      } catch (Throwable e) {
+        e.printStackTrace();
+        throw e;
+      }
+    } else {
+      try {
+        String output = testCommandLineScript(scriptFile.getAbsolutePath());
+        long elapsedTime = (System.currentTimeMillis() - startTime)/1000;
+        String time = "(" + elapsedTime + "s)";
+        if (output.contains(expectedPattern)) {
+          System.err.println("Output: " + output);
+          System.err.println(">>> FAILED " + testName + " (ERROR) " + time);
+          Assert.fail(testName);
+        } else {
+          System.out.println(">>> PASSED " + testName + " " + time);
+        }
+      } catch (Throwable e) {
+        System.err.println("Exception: " + e.toString());
+        e.printStackTrace();
+        throw e;
+      }
+    }
+    scriptFile.delete();
+  }
+
+  /**
+   * Attempt to execute a simple script file with the -f option to BeeLine
+   * Test for presence of an expected pattern
+   * in the output (stdout or stderr), fail if not found
+   * Print PASSED or FAILED
+   */
+  @Test
+  public void testPositiveScriptFile() throws Throwable {
+    final String TEST_NAME = "testPositiveScriptFile";
+    final String SCRIPT_TEXT = "show databases;\n";
+    final String EXPECTED_PATTERN = " default ";
+    testScriptFile(TEST_NAME, SCRIPT_TEXT, EXPECTED_PATTERN, true);
+  }
+
+  /**
+   * Attempt to execute a simple script file with the -f option to BeeLine
+   * The first command should fail and the second command should not execute
+   * Print PASSED or FAILED
+   */
+  @Test
+  public void testBreakOnErrorScriptFile() throws Throwable {
+    final String TEST_NAME = "testBreakOnErrorScriptFile";
+    final String SCRIPT_TEXT = "select * from abcdefg01;\nshow databases;\n";
+    final String EXPECTED_PATTERN = " default ";
+    testScriptFile(TEST_NAME, SCRIPT_TEXT, EXPECTED_PATTERN, false);
+  }
+
+  /**
+   * Attempt to execute a missing script file with the -f option to BeeLine
+   * Print PASSED or FAILED
+   */
+  @Test
+  public void testNegativeScriptFile() throws Throwable {
+    final String TEST_NAME = "testNegativeScriptFile";
+    final String EXPECTED_PATTERN = " default ";
+
+    long startTime = System.currentTimeMillis();
+    System.out.println(">>> STARTED " + TEST_NAME);
+
+    // Create and delete a temp file
+    File scriptFile = File.createTempFile("beelinenegative", "temp");
+    scriptFile.delete();
+
+    try {
+        String output = testCommandLineScript(scriptFile.getAbsolutePath());
+      long elapsedTime = (System.currentTimeMillis() - startTime)/1000;
+      String time = "(" + elapsedTime + "s)";
+      if (output.contains(EXPECTED_PATTERN)) {
+        System.err.println("Output: " + output);
+        System.err.println(">>> FAILED " + TEST_NAME + " (ERROR) " + time);
+        Assert.fail(TEST_NAME);
+      } else {
+        System.out.println(">>> PASSED " + TEST_NAME + " " + time);
+      }
+    } catch (Throwable e) {
+      e.printStackTrace();
+      throw e;
+    }
+  }
+}

Modified: hive/trunk/build.xml
URL: http://svn.apache.org/viewvc/hive/trunk/build.xml?rev=1467920&r1=1467919&r2=1467920&view=diff
==============================================================================
--- hive/trunk/build.xml (original)
+++ hive/trunk/build.xml Mon Apr 15 09:54:54 2013
@@ -678,6 +678,7 @@
       <packageset dir="hcatalog/src/java"/>
       <packageset dir="cli/src/java"/>
       <packageset dir="beeline/src/java"/>
+      <packageset dir="beeline/src/test"/>
       <packageset dir="ql/src/java"/>
       <packageset dir="ql/src/test"/>
       <packageset dir="ql/src/gen/thrift/gen-javabean"/>



Mime
View raw message