This is an automated email from the ASF dual-hosted git repository.
soumyakantidas pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/hive.git
The following commit(s) were added to refs/heads/master by this push:
new 931d4bb62b2 HIVE-29495: [HPLSQL]Setting hive configs in hplsql causing
console logs to be lost (#6361)
931d4bb62b2 is described below
commit 931d4bb62b26de699240c816df439e00644e3dcb
Author: Dayakar M <[email protected]>
AuthorDate: Tue Mar 24 04:15:52 2026 +0530
HIVE-29495: [HPLSQL]Setting hive configs in hplsql causing console logs to
be lost (#6361)
---
.../org/apache/hive/beeline/TestHplSqlViaBeeLine.java | 8 ++++++++
.../cli/operation/ExecuteStatementOperation.java | 18 +++++++-----------
.../service/cli/operation/HiveCommandOperation.java | 4 ++--
.../hive/service/cli/operation/SQLOperation.java | 2 +-
.../cli/operation/ShowProcessListOperation.java | 4 ++--
.../service/cli/operation/hplsql/HplSqlOperation.java | 3 +--
.../service/cli/operation/TestCommandWithSpace.java | 11 ++++++-----
.../cli/operation/TestHiveCommandOpForProcessList.java | 3 ++-
8 files changed, 29 insertions(+), 24 deletions(-)
diff --git
a/itests/hive-unit/src/test/java/org/apache/hive/beeline/TestHplSqlViaBeeLine.java
b/itests/hive-unit/src/test/java/org/apache/hive/beeline/TestHplSqlViaBeeLine.java
index f16b9d08e4a..2aa433990e8 100644
---
a/itests/hive-unit/src/test/java/org/apache/hive/beeline/TestHplSqlViaBeeLine.java
+++
b/itests/hive-unit/src/test/java/org/apache/hive/beeline/TestHplSqlViaBeeLine.java
@@ -1393,6 +1393,14 @@ public void testExecuteImmediateLoadData() throws
Throwable {
testScriptFile(scriptText, args(), "100.*Bob");
}
+ @Test
+ public void testPrintMessageAfterExecuteSetHiveConfig() throws Throwable {
+ String scriptText =
+ "EXECUTE 'SET hive.query.results.cache.enabled=false';\n" +
+ "PRINT 'Should print this message!...';";
+ testScriptFile(scriptText, args(), "Should print this message!...",
OutStream.ERR);
+ }
+
private static List<String> args() {
return Arrays.asList("-d", BeeLine.BEELINE_DEFAULT_JDBC_DRIVER,
"-u", miniHS2.getBaseJdbcURL() + ";mode=hplsql", "-n", USER_NAME);
diff --git
a/service/src/java/org/apache/hive/service/cli/operation/ExecuteStatementOperation.java
b/service/src/java/org/apache/hive/service/cli/operation/ExecuteStatementOperation.java
index 2607f98ea8e..264ec3987dd 100644
---
a/service/src/java/org/apache/hive/service/cli/operation/ExecuteStatementOperation.java
+++
b/service/src/java/org/apache/hive/service/cli/operation/ExecuteStatementOperation.java
@@ -45,14 +45,9 @@
public abstract class ExecuteStatementOperation extends Operation {
protected String statement = null;
- public ExecuteStatementOperation(HiveSession parentSession, String statement,
- Map<String, String> confOverlay) {
- super(parentSession, confOverlay, OperationType.EXECUTE_STATEMENT);
- this.statement = statement;
- }
-
- public ExecuteStatementOperation(HiveSession parentSession, String
statement, Map<String, String> confOverlay, boolean runInBackground, boolean
generateNewQueryId) {
- super(parentSession, confOverlay, OperationType.EXECUTE_STATEMENT,
generateNewQueryId);
+ public ExecuteStatementOperation(HiveSession parentSession, String
statement, Map<String, String> confOverlay,
+ boolean embedded) {
+ super(parentSession, confOverlay, OperationType.EXECUTE_STATEMENT,
embedded);
this.statement = statement;
}
@@ -79,7 +74,8 @@ public static ExecuteStatementOperation
newExecuteStatementOperation(HiveSession
registerUdf();
SessionState.get().addDynamicVar(interpreter);
}
- return new HplSqlOperation(parentSession, statement, confOverlay,
runAsync, SessionState.get().getDynamicVar(Exec.class));
+ return new HplSqlOperation(parentSession, statement, confOverlay,
runAsync,
+ SessionState.get().getDynamicVar(Exec.class));
}
String[] tokens = cleanStatement.trim().split("\\s+");
@@ -94,9 +90,9 @@ public static ExecuteStatementOperation
newExecuteStatementOperation(HiveSession
// Pass the original statement to SQLOperation as sql parser can remove
comments by itself
return new SQLOperation(parentSession, statement, confOverlay, runAsync,
queryTimeout, hplSqlMode());
} else if (processor instanceof ShowProcessListProcessor) {
- return new ShowProcessListOperation(parentSession, cleanStatement,
processor, confOverlay);
+ return new ShowProcessListOperation(parentSession, cleanStatement,
processor, confOverlay, hplSqlMode());
}
- return new HiveCommandOperation(parentSession, cleanStatement, processor,
confOverlay);
+ return new HiveCommandOperation(parentSession, cleanStatement, processor,
confOverlay, hplSqlMode());
}
private static void setHiveVariables(HiveSession parentSession, Exec
interpreter) {
diff --git
a/service/src/java/org/apache/hive/service/cli/operation/HiveCommandOperation.java
b/service/src/java/org/apache/hive/service/cli/operation/HiveCommandOperation.java
index 9d91e7db649..c216851dc80 100644
---
a/service/src/java/org/apache/hive/service/cli/operation/HiveCommandOperation.java
+++
b/service/src/java/org/apache/hive/service/cli/operation/HiveCommandOperation.java
@@ -59,8 +59,8 @@ public class HiveCommandOperation extends
ExecuteStatementOperation {
private BufferedReader resultReader;
protected HiveCommandOperation(HiveSession parentSession, String statement,
- CommandProcessor commandProcessor, Map<String, String> confOverlay) {
- super(parentSession, statement, confOverlay);
+ CommandProcessor commandProcessor, Map<String, String> confOverlay,
boolean embedded) {
+ super(parentSession, statement, confOverlay, embedded);
this.commandProcessor = commandProcessor;
setupSessionIO(parentSession.getSessionState());
}
diff --git
a/service/src/java/org/apache/hive/service/cli/operation/SQLOperation.java
b/service/src/java/org/apache/hive/service/cli/operation/SQLOperation.java
index 4d3865e98ef..de3e68b30c7 100644
--- a/service/src/java/org/apache/hive/service/cli/operation/SQLOperation.java
+++ b/service/src/java/org/apache/hive/service/cli/operation/SQLOperation.java
@@ -113,7 +113,7 @@ public SQLOperation(HiveSession parentSession, String
statement, Map<String, Str
public SQLOperation(HiveSession parentSession, String statement, Map<String,
String> confOverlay,
boolean runInBackground, long queryTimeout, boolean embedded) {
// TODO: call setRemoteUser in ExecuteStatementOperation or higher.
- super(parentSession, statement, confOverlay, runInBackground, embedded);
+ super(parentSession, statement, confOverlay, embedded);
this.runAsync = runInBackground;
this.resultSchema = Optional.empty();
diff --git
a/service/src/java/org/apache/hive/service/cli/operation/ShowProcessListOperation.java
b/service/src/java/org/apache/hive/service/cli/operation/ShowProcessListOperation.java
index e667f3f6b91..262cbfff328 100644
---
a/service/src/java/org/apache/hive/service/cli/operation/ShowProcessListOperation.java
+++
b/service/src/java/org/apache/hive/service/cli/operation/ShowProcessListOperation.java
@@ -39,8 +39,8 @@ public class ShowProcessListOperation extends
HiveCommandOperation {
private static final DateTimeFormatter FORMATTER =
DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss.SSS");
protected ShowProcessListOperation(HiveSession parentSession, String
statement,
- CommandProcessor commandProcessor, Map<String, String> confOverlay) {
- super(parentSession, statement, commandProcessor, confOverlay);
+ CommandProcessor commandProcessor, Map<String, String> confOverlay,
boolean embedded) {
+ super(parentSession, statement, commandProcessor, confOverlay, embedded);
}
@Override
diff --git
a/service/src/java/org/apache/hive/service/cli/operation/hplsql/HplSqlOperation.java
b/service/src/java/org/apache/hive/service/cli/operation/hplsql/HplSqlOperation.java
index 16d16792aed..3f3dc44f2aa 100644
---
a/service/src/java/org/apache/hive/service/cli/operation/hplsql/HplSqlOperation.java
+++
b/service/src/java/org/apache/hive/service/cli/operation/hplsql/HplSqlOperation.java
@@ -27,7 +27,6 @@
import java.util.concurrent.RejectedExecutionException;
import org.apache.hadoop.hive.common.LogUtils;
-import org.apache.hadoop.hive.ql.log.PerfLogger;
import org.apache.hadoop.hive.ql.metadata.Hive;
import org.apache.hadoop.hive.ql.session.SessionState;
import org.apache.hadoop.hive.serde2.thrift.Type;
@@ -58,7 +57,7 @@ public class HplSqlOperation extends
ExecuteStatementOperation implements Result
private TableSchema schema;
public HplSqlOperation(HiveSession parentSession, String statement,
Map<String, String> confOverlay, boolean runInBackground, Exec exec) {
- super(parentSession, statement, confOverlay, runInBackground, false);
+ super(parentSession, statement, confOverlay, false);
this.exec = exec;
this.runInBackground = runInBackground;
this.exec.setResultListener(this);
diff --git
a/service/src/test/org/apache/hive/service/cli/operation/TestCommandWithSpace.java
b/service/src/test/org/apache/hive/service/cli/operation/TestCommandWithSpace.java
index 568a05bf631..2af46df6e3c 100644
---
a/service/src/test/org/apache/hive/service/cli/operation/TestCommandWithSpace.java
+++
b/service/src/test/org/apache/hive/service/cli/operation/TestCommandWithSpace.java
@@ -32,22 +32,23 @@
import static org.mockito.Mockito.when;
public class TestCommandWithSpace {
-
+
@Test
- public void testCommandWithPrefixSpace() throws IllegalAccessException,
ClassNotFoundException, InstantiationException, HiveSQLException {
+ public void testCommandWithPrefixSpace()
+ throws IllegalAccessException, ClassNotFoundException,
InstantiationException, HiveSQLException {
String query = " dfs -ls /";
HiveConf conf = new HiveConfForTest(getClass());
conf.setBoolVar(HiveConf.ConfVars.HIVE_SUPPORT_CONCURRENCY, false);
conf.setVar(HiveConf.ConfVars.HIVE_AUTHORIZATION_MANAGER,
-
"org.apache.hadoop.hive.ql.security.authorization.plugin.sqlstd.SQLStdHiveAuthorizerFactory");
+
"org.apache.hadoop.hive.ql.security.authorization.plugin.sqlstd.SQLStdHiveAuthorizerFactory");
SessionState.start(conf);
HiveSession mockHiveSession = mock(HiveSession.class);
when(mockHiveSession.getHiveConf()).thenReturn(conf);
when(mockHiveSession.getSessionState()).thenReturn(SessionState.get());
DfsProcessor dfsProcessor = new DfsProcessor(new Configuration());
- HiveCommandOperation sqlOperation = new
HiveCommandOperation(mockHiveSession, query, dfsProcessor, ImmutableMap.of());
+ HiveCommandOperation sqlOperation =
+ new HiveCommandOperation(mockHiveSession, query, dfsProcessor,
ImmutableMap.of(), false);
sqlOperation.run();
}
-
}
diff --git
a/service/src/test/org/apache/hive/service/cli/operation/TestHiveCommandOpForProcessList.java
b/service/src/test/org/apache/hive/service/cli/operation/TestHiveCommandOpForProcessList.java
index 43398881bfd..5fbb920d0b7 100644
---
a/service/src/test/org/apache/hive/service/cli/operation/TestHiveCommandOpForProcessList.java
+++
b/service/src/test/org/apache/hive/service/cli/operation/TestHiveCommandOpForProcessList.java
@@ -93,7 +93,8 @@ public void testRunningQueryDisplay() throws HiveSQLException
{
String query = "show processlist";
setCurrentSession();
- ShowProcessListOperation sqlOperation = new
ShowProcessListOperation(session2, query, processor, ImmutableMap.of());
+ ShowProcessListOperation sqlOperation =
+ new ShowProcessListOperation(session2, query, processor,
ImmutableMap.of(), false);
sqlOperation.run();
state.out.flush();
String output = baos.toString();
