beeline/src/java/org/apache/hive/beeline/BeeLine.java

@@ -113,11 +113,13 @@
 import com.google.common.annotations.VisibleForTesting;
 
 import org.jline.reader.Completer;
+import org.jline.reader.EndOfFileException;
 import org.jline.reader.History;
 import org.jline.reader.LineReader;
 import org.jline.reader.LineReaderBuilder;
 import org.jline.reader.impl.LineReaderImpl;
 import org.jline.reader.impl.history.DefaultHistory;
+import org.jline.terminal.Terminal;
 import org.jline.terminal.TerminalBuilder;
 
 import static org.jline.builtins.Completers.FileNameCompleter;
@@ -158,7 +160,7 @@ public class BeeLine implements Closeable {
   private OutputFile recordOutputFile = null;
   private PrintStream outputStream = new PrintStream(System.out, true);
   private PrintStream errorStream = new PrintStream(System.err, true);
-  private InputStream inputStream = System.in;
+  private Terminal terminal;
   private LineReader lineReader;
   private List<String> batch = null;
   private final Reflector reflector = new Reflector(this);
@@ -440,7 +442,6 @@ public class BeeLine implements Closeable {
         .create());
   }
 
-
   static Manifest getManifest() throws IOException {
     URL base = BeeLine.class.getResource("/META-INF/MANIFEST.MF");
     URLConnection c = base.openConnection();
@@ -1367,11 +1368,12 @@ private int execute(LineReader reader, boolean exitOnError) {
     Character mask = (System.getProperty("jline.terminal", "").equals("jline.UnsupportedTerminal")) ? null
                        : LineReaderImpl.NULL_MASK;
 
+    String line;
     while (!exit) {
       try {
         // Execute one instruction; terminate on executing a script if there is an error
         // in silent mode, prevent the query and prompt being echoed back to terminal
-        String line = (getOpts().isSilent() && getOpts().getScriptFile() != null) ? reader
+        line = (getOpts().isSilent() && getOpts().getScriptFile() != null) ? reader
             .readLine(null, mask) : reader.readLine(getPrompt());
 
         // trim line
@@ -1387,7 +1389,17 @@ private int execute(LineReader reader, boolean exitOnError) {
         } else if (line != null) {
           lastExecutionResult = ERRNO_OK;
         }
-
+      } catch (EndOfFileException t) {
+        /*
+         * If you're reading from a normal file (not from standard input or a terminal), JLine might raise an
+         * EndOfFileException when it reaches the end of the file. JLine uses readLine() for reading input, and it
+         * expects the input source to provide data interactively. When reading from a file, it might misinterpret
+         * the EOF condition.
+         * It's unlikely that this catch-and-return-OK block masks a real issue.
+         * In interactive usage, EndOfFileException is not triggered, and in script file mode (-f),
+         * any potential corruption would typically surface as a failing command.
+         */
+        return lastExecutionResult;
       } catch (Throwable t) {
         handleException(t);
         return ERRNO_OTHER;
@@ -1416,25 +1428,14 @@ private void addBeelineShutdownHook() throws IOException {
 
   public LineReader initializeLineReader(InputStream inputStream) throws IOException {
     final LineReaderBuilder builder = LineReaderBuilder.builder();
-    if (inputStream != null) {
-      // ### NOTE: fix for sf.net bug 879425.
-      // Working around an issue in jline-2.1.2, see https://github.com/jline/jline/issues/10
-      // by appending a newline to the end of inputstream
-      InputStream inputStreamAppendedNewline = new SequenceInputStream(inputStream,
-          new ByteArrayInputStream((new String("\n")).getBytes()));
-      builder.terminal(TerminalBuilder.builder()
-                      .streams(inputStreamAppendedNewline, getErrorStream()).build());
-    } else {
-      builder.terminal(TerminalBuilder.builder()
-              .streams(getInputStream(), getErrorStream()).build());
-    }
+    terminal = buildTerminal(prepareInputStream(inputStream));
+    builder.terminal(terminal);
 
     if (inputStream instanceof FileInputStream || inputStream instanceof FSDataInputStream) {
       // from script.. no need to load history and no need of completer, either
       lineReader = builder.build();
       return lineReader;
     }
-
     try {
       // now set the output for the history
       if (this.history != null) {
@@ -1449,7 +1450,7 @@ public LineReader initializeLineReader(InputStream inputStream) throws IOExcepti
     }
 
     builder.completer(new BeeLineCompleter(this));
-    lineReader =  builder.build();
+    lineReader = builder.build();
     lineReader.unsetOpt(LineReader.Option.HISTORY_TIMESTAMPED);
 
     if (this.history != null) {
@@ -1460,6 +1461,23 @@ public LineReader initializeLineReader(InputStream inputStream) throws IOExcepti
 
   }
 
+  private InputStream prepareInputStream(InputStream inputStream) {
+    if (inputStream != null) {
+      inputStream = new SequenceInputStream(inputStream,
+          new ByteArrayInputStream((new String("\n")).getBytes()));
+    }
+    return inputStream;
+  }
+
+  protected Terminal buildTerminal(InputStream inputStream) throws IOException {
+    if (inputStream != null) { // typically when there is a file script to read from
+      return TerminalBuilder.builder().streams(inputStream, getErrorStream()).build();
+    } else { // no input stream, normal operation: proper behavior needs a system terminal
+      // system terminal can only be created with system streams
+      return TerminalBuilder.builder().system(true).dumb(false).streams(System.in, System.err).build();
+    }
+  }
+
   void usage() {
     output(loc("cmd-usage"));
   }
@@ -2505,18 +2523,10 @@ PrintStream getErrorStream() {
     return errorStream;
   }
 
-  InputStream getInputStream() {
-    return inputStream;
-  }
-
   LineReader getLineReader() {
     return lineReader;
   }
 
-  void setLineReader(LineReader reader) {
-    this.lineReader = reader;
-  }
-
   List<String> getBatch() {
     return batch;
   }

beeline/src/java/org/apache/hive/beeline/BeeLineOpts.java

@@ -88,7 +88,6 @@ public class BeeLineOpts implements Completer {
   private boolean showElapsedTime = true;
   private boolean entireLineAsCommand = false;
   private String numberFormat = "default";
-  private Terminal terminal;
   private int maxWidth = DEFAULT_MAX_WIDTH;
   private int maxHeight = DEFAULT_MAX_HEIGHT;
   private int maxColumnWidth = DEFAULT_MAX_COLUMN_WIDTH;
@@ -155,16 +154,17 @@ public String get(String envVar) {
   public BeeLineOpts(BeeLine beeLine, Properties props) {
     this.beeLine = beeLine;
     try {
-      terminal = TerminalBuilder.terminal();
+      Terminal terminal = TerminalBuilder.terminal();
+      if (terminal.getWidth() > 0) {
+        maxWidth = terminal.getWidth();
+      }
+      if (terminal.getHeight() > 0) {
+        maxHeight = terminal.getHeight();
+      }
+      terminal.close();
     } catch(IOException e) {
       // nothing to do
     }
-    if (terminal.getWidth() > 0) {
-      maxWidth = terminal.getWidth();
-    }
-    if (terminal.getHeight() > 0) {
-      maxHeight = terminal.getHeight();
-    }
     loadProperties(props);
   }
 

beeline/src/java/org/apache/hive/beeline/cli/HiveCli.java

@@ -31,11 +31,15 @@ public static void main(String[] args) throws IOException {
   }
 
   public int runWithArgs(String[] cmd, InputStream inputStream) throws IOException {
-    beeLine = new BeeLine(false);
+    beeLine = createBeeline();
     try {
       return beeLine.begin(cmd, inputStream);
     } finally {
       beeLine.close();
     }
   }
+
+  protected BeeLine createBeeline() {
+    return new BeeLine(false);
+  }
 }

beeline/src/test/org/apache/hive/beeline/BeeLineForTest.java

@@ -0,0 +1,40 @@
+/*
+ * 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;
+
+import java.io.IOException;
+import java.io.InputStream;
+
+import org.jline.terminal.Terminal;
+import org.jline.terminal.impl.DumbTerminal;
+
+public class BeeLineForTest extends BeeLine {
+
+  public BeeLineForTest() {
+    this(true);
+  }
+
+  public BeeLineForTest(boolean isBeeLine) {
+    super(isBeeLine);
+  }
+
+  protected Terminal buildTerminal(InputStream inputStream) throws IOException {
+    return new DumbTerminal(inputStream, getOutputStream());
+  }
+}

beeline/src/test/org/apache/hive/beeline/cli/HiveCliForTest.java

@@ -0,0 +1,28 @@
+/*
+ * 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.cli;
+
+import org.apache.hive.beeline.BeeLine;
+import org.apache.hive.beeline.BeeLineForTest;
+
+public class HiveCliForTest extends HiveCli {
+
+  protected BeeLine createBeeline() {
+    return new BeeLineForTest(false);
+  }
+}

beeline/src/test/org/apache/hive/beeline/cli/TestHiveCli.java

@@ -294,7 +294,7 @@ public static void init(){
   @Before
   public void setup() throws IOException, URISyntaxException {
     System.setProperty("datanucleus.schema.autoCreateAll", "true");
-    cli = new HiveCli();
+    cli = new HiveCliForTest();
     redirectOutputStream();
     initFromFile();
   }

common/src/java/org/apache/hive/common/util/MatchingStringsCompleter.java

@@ -30,7 +30,7 @@
 import java.util.TreeSet;
 
 /**
- * A matching string Completer based on JLine2's StringCompleter
+ * A matching string Completer based on JLine's StringCompleter
  */
 public class MatchingStringsCompleter implements Completer {
   protected SortedSet<String> candidateStrings = new TreeSet<>();

hcatalog/hcatalog-pig-adapter/pom.xml

@@ -30,7 +30,7 @@
   <name>Hive HCatalog Pig Adapter</name>
   <properties>
     <hive.path.to.root>../..</hive.path.to.root>
-    <jline.version>3.21.0</jline.version>
+    <jline.version>3.25.0</jline.version> <!-- HIVE-28992: only upgrade to newer than 3.25.0 if you tested the prompt -->
   </properties>
   <dependencies>
     <!-- dependencies are always listed in sorted order by groupId, artifactId -->

iceberg/iceberg-handler/src/main/java/org/apache/iceberg/mr/hive/IcebergTransformSortFunctionUtil.java

@@ -50,7 +50,7 @@ private IcebergTransformSortFunctionUtil() {
    * Takes the source column index and the bucket count to create a function where Iceberg transform UDF is used to
    * build the sort expression, e.g. iceberg_bucket(_col2, 5)
    */
-  private static final transient BiFunction<Integer, Integer, Function<List<ExprNodeDesc>, ExprNodeDesc>>
+  private static final BiFunction<Integer, Integer, Function<List<ExprNodeDesc>, ExprNodeDesc>>
       BUCKET_SORT_EXPR =
           (idx, bucket) -> cols -> {
             try {
@@ -65,7 +65,7 @@ private IcebergTransformSortFunctionUtil() {
             }
           };
 
-  private static final transient BiFunction<Integer, Integer, Function<List<ExprNodeDesc>, ExprNodeDesc>>
+  private static final BiFunction<Integer, Integer, Function<List<ExprNodeDesc>, ExprNodeDesc>>
       TRUNCATE_SORT_EXPR =
           (idx, truncateLength) -> cols -> {
             try {
@@ -80,7 +80,7 @@ private IcebergTransformSortFunctionUtil() {
             }
           };
 
-  private static final transient Function<Integer, Function<List<ExprNodeDesc>, ExprNodeDesc>>
+  private static final Function<Integer, Function<List<ExprNodeDesc>, ExprNodeDesc>>
       YEAR_SORT_EXPR =
           idx -> cols -> {
             try {
@@ -94,7 +94,7 @@ private IcebergTransformSortFunctionUtil() {
             }
           };
 
-  private static final transient Function<Integer, Function<List<ExprNodeDesc>, ExprNodeDesc>>
+  private static final Function<Integer, Function<List<ExprNodeDesc>, ExprNodeDesc>>
       MONTH_SORT_EXPR =
           idx -> cols -> {
             try {
@@ -108,7 +108,7 @@ private IcebergTransformSortFunctionUtil() {
             }
           };
 
-  private static final transient Function<Integer, Function<List<ExprNodeDesc>, ExprNodeDesc>>
+  private static final Function<Integer, Function<List<ExprNodeDesc>, ExprNodeDesc>>
       DAY_SORT_EXPR =
           idx -> cols -> {
             try {
@@ -122,7 +122,7 @@ private IcebergTransformSortFunctionUtil() {
             }
           };
 
-  private static final transient Function<Integer, Function<List<ExprNodeDesc>, ExprNodeDesc>>
+  private static final Function<Integer, Function<List<ExprNodeDesc>, ExprNodeDesc>>
       HOUR_SORT_EXPR =
           idx -> cols -> {
             try {

iceberg/pom.xml

@@ -29,7 +29,7 @@
     <iceberg.version>1.6.1</iceberg.version>
     <kryo-shaded.version>4.0.3</kryo-shaded.version>
     <iceberg.mockito-core.version>5.2.0</iceberg.mockito-core.version>
-    <iceberg.avro.version>1.11.4</iceberg.avro.version>
+    <iceberg.avro.version>1.12.0</iceberg.avro.version>
     <iceberg.checkstyle.plugin.version>3.5.0</iceberg.checkstyle.plugin.version>
     <spotless.maven.plugin.version>2.44.4</spotless.maven.plugin.version>
     <google.errorprone.version>2.29.2</google.errorprone.version>

itests/hive-unit/src/test/java/org/apache/hive/beeline/TestBeeLineWithArgs.java

@@ -161,7 +161,7 @@ public static void postTests() {
   static String testCommandLineScript(List<String> argList, InputStream inputStream,
       OutStream streamType)
       throws Throwable {
-    BeeLine beeLine = new BeeLine();
+    BeeLine beeLine = new BeeLineForTest();
     ByteArrayOutputStream os = new ByteArrayOutputStream();
     PrintStream beelineOutputStream = new PrintStream(os);
     switch (streamType) {
@@ -266,8 +266,8 @@ public Tuple<Pattern> apply(Tuple<String> tuple) {
         boolean matches = m.matches();
         if (patternToMatch.shouldMatch != matches) {
           //failed
-          fail("Output" + output + " should" + (patternToMatch.shouldMatch ? "" : " not") +
-              " contain " + patternToMatch.pattern.pattern());
+          fail(String.format("Output '%s' should %s contain '%s' (mode: %s)", output, (patternToMatch.shouldMatch ? "" :
+                  " not"), patternToMatch.pattern.pattern(), mode));
         }
       }
     }

itests/src/test/resources/testconfiguration.properties

@@ -306,6 +306,7 @@ mr.query.files=\
   udaf_percentile_approx_23.q,\
   udf_context_aware.q,\
   udf_count.q,\
+  udf_dayofweek_with_tz.q,\
   udf_using.q,\
   uniquejoin.q,\
   windowing_windowspec.q

pom.xml

@@ -110,7 +110,7 @@
     <antlr4.version>4.9.3</antlr4.version>
     <apache-directory-server.version>2.0.0-M24</apache-directory-server.version>
     <avatica.version>1.23.0</avatica.version>
-    <avro.version>1.11.4</avro.version>
+    <avro.version>1.12.0</avro.version>
     <bcprov-jdk18on.version>1.78</bcprov-jdk18on.version>
     <calcite.version>1.33.0</calcite.version>
     <datanucleus-api-jdo.version>6.0.3</datanucleus-api-jdo.version>
@@ -160,7 +160,7 @@
     <jettison.version>1.5.4</jettison.version>
     <jetty.version>9.4.57.v20241219</jetty.version>
     <jersey.version>1.19.4</jersey.version>
-    <jline.version>3.30.4</jline.version>
+    <jline.version>3.25.0</jline.version> <!-- HIVE-28992: only upgrade to newer than 3.25.0 if you tested the prompt -->
     <jms.version>2.0.2</jms.version>
     <joda.version>2.13.0</joda.version>
     <jodd.version>6.0.0</jodd.version>