diff --git common/src/java/org/apache/hadoop/hive/conf/HiveConf.java common/src/java/org/apache/hadoop/hive/conf/HiveConf.java index ed20069..bba9be8 100644 --- common/src/java/org/apache/hadoop/hive/conf/HiveConf.java +++ common/src/java/org/apache/hadoop/hive/conf/HiveConf.java @@ -2928,7 +2928,11 @@ private static void populateLlapDaemonVarsSet(Set llapDaemonVarsSetLocal "Comma separated list of configuration options which should not be read by normal user like passwords"), HIVE_CONF_INTERNAL_VARIABLE_LIST("hive.conf.internal.variable.list", "hive.added.files.path,hive.added.jars.path,hive.added.archives.path", - "Comma separated list of variables which are used internally and should not be configurable."); + "Comma separated list of variables which are used internally and should not be configurable."), + + HIVE_QUERY_TIMEOUT_SECONDS("hive.query.timeout.seconds", "0s", + new TimeValidator(TimeUnit.SECONDS), + "Timeout for Running Query in seconds. A nonpositive value means infinite."); public final String varname; diff --git service/src/java/org/apache/hive/service/cli/operation/SQLOperation.java service/src/java/org/apache/hive/service/cli/operation/SQLOperation.java index 33f95fb..3bf40eb 100644 --- service/src/java/org/apache/hive/service/cli/operation/SQLOperation.java +++ service/src/java/org/apache/hive/service/cli/operation/SQLOperation.java @@ -112,6 +112,12 @@ public SQLOperation(HiveSession parentSession, String statement, Map 0 && (queryTimeout <= 0 || timeout < queryTimeout)) { + this.queryTimeout = timeout; + } + setupSessionIO(parentSession.getSessionState()); try { sqlOpDisplay = new SQLOperationDisplay(this);