diff --git beeline/src/java/org/apache/hive/beeline/Commands.java beeline/src/java/org/apache/hive/beeline/Commands.java index 99ee82c..ab613a5 100644 --- beeline/src/java/org/apache/hive/beeline/Commands.java +++ beeline/src/java/org/apache/hive/beeline/Commands.java @@ -1364,6 +1364,9 @@ private void showRemainingLogsIfAny(Statement statement) { HiveStatement hiveStatement = (HiveStatement) statement; List logs = null; do { + if (!hiveStatement.hasMoreLogs()) { + return; + } try { logs = hiveStatement.getQueryLog(); } catch (SQLException e) { diff --git jdbc/src/java/org/apache/hive/jdbc/HiveStatement.java jdbc/src/java/org/apache/hive/jdbc/HiveStatement.java index a0aea72..1b64479 100644 --- jdbc/src/java/org/apache/hive/jdbc/HiveStatement.java +++ jdbc/src/java/org/apache/hive/jdbc/HiveStatement.java @@ -315,9 +315,11 @@ private void runAsyncOnServer(String sql) throws SQLException { isExecuteStatementFailed = false; } catch (SQLException eS) { isExecuteStatementFailed = true; + isLogBeingGenerated = false; throw eS; } catch (Exception ex) { isExecuteStatementFailed = true; + isLogBeingGenerated = false; throw new SQLException(ex.toString(), "08S01", ex); } }