You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@hive.apache.org by na...@apache.org on 2013/10/21 08:34:28 UTC
svn commit: r1534034 - in /hive/trunk:
common/src/java/org/apache/hadoop/hive/conf/HiveConf.java
service/src/java/org/apache/hive/service/cli/operation/HiveCommandOperation.java
Author: navis
Date: Mon Oct 21 06:34:28 2013
New Revision: 1534034
URL: http://svn.apache.org/r1534034
Log:
HIVE-5572 : Fails of non-sql command are not propagated to jdbc2 client (Navis reviewed by Brock Noland)
Modified:
hive/trunk/common/src/java/org/apache/hadoop/hive/conf/HiveConf.java
hive/trunk/service/src/java/org/apache/hive/service/cli/operation/HiveCommandOperation.java
Modified: hive/trunk/common/src/java/org/apache/hadoop/hive/conf/HiveConf.java
URL: http://svn.apache.org/viewvc/hive/trunk/common/src/java/org/apache/hadoop/hive/conf/HiveConf.java?rev=1534034&r1=1534033&r2=1534034&view=diff
==============================================================================
--- hive/trunk/common/src/java/org/apache/hadoop/hive/conf/HiveConf.java (original)
+++ hive/trunk/common/src/java/org/apache/hadoop/hive/conf/HiveConf.java Mon Oct 21 06:34:28 2013
@@ -968,7 +968,7 @@ public class HiveConf extends Configurat
public void verifyAndSet(String name, String value) throws IllegalArgumentException {
if (restrictList.contains(name)) {
- throw new IllegalArgumentException("Cann't modify " + name + " at runtime");
+ throw new IllegalArgumentException("Cannot modify " + name + " at runtime");
}
set(name, value);
}
@@ -1112,6 +1112,7 @@ public class HiveConf extends Configurat
hiveJar = other.hiveJar;
auxJars = other.auxJars;
origProp = (Properties)other.origProp.clone();
+ restrictList.addAll(other.restrictList);
}
public Properties getAllProperties() {
Modified: hive/trunk/service/src/java/org/apache/hive/service/cli/operation/HiveCommandOperation.java
URL: http://svn.apache.org/viewvc/hive/trunk/service/src/java/org/apache/hive/service/cli/operation/HiveCommandOperation.java?rev=1534034&r1=1534033&r2=1534034&view=diff
==============================================================================
--- hive/trunk/service/src/java/org/apache/hive/service/cli/operation/HiveCommandOperation.java (original)
+++ hive/trunk/service/src/java/org/apache/hive/service/cli/operation/HiveCommandOperation.java Mon Oct 21 06:34:28 2013
@@ -107,8 +107,10 @@ public class HiveCommandOperation extend
response = commandProcessor.run(commandArgs);
int returnCode = response.getResponseCode();
- String sqlState = response.getSQLState();
- String errorMessage = response.getErrorMessage();
+ if (returnCode != 0) {
+ throw new HiveSQLException("Error while processing statement: "
+ + response.getErrorMessage(), response.getSQLState(), response.getResponseCode());
+ }
Schema schema = response.getSchema();
if (schema != null) {
setHasResultSet(true);
@@ -117,6 +119,9 @@ public class HiveCommandOperation extend
setHasResultSet(false);
resultSchema = new TableSchema();
}
+ } catch (HiveSQLException e) {
+ setState(OperationState.ERROR);
+ throw e;
} catch (Exception e) {
setState(OperationState.ERROR);
throw new HiveSQLException("Error running query: " + e.toString(), e);