(hive) branch master updated: HIVE-28029: Make unit tests based on TxnCommandsBaseForTests/DbTxnManagerEndToEndTestBase run on Tez - ADDENDUM - restore filename check (#6133)

[dkuzmenko]

This is an automated email from the ASF dual-hosted git repository.

dkuzmenko 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 46ed6cd6ebd HIVE-28029: Make unit tests based on 
TxnCommandsBaseForTests/DbTxnManagerEndToEndTestBase run on Tez - ADDENDUM - 
restore filename check (#6133)
46ed6cd6ebd is described below

commit 46ed6cd6ebd21200fc2829a7e57692b5e8618470
Author: Krisztian Kasa <kasakri...@gmail.com>
AuthorDate: Thu Oct 16 12:01:15 2025 +0200

    HIVE-28029: Make unit tests based on 
TxnCommandsBaseForTests/DbTxnManagerEndToEndTestBase run on Tez - ADDENDUM - 
restore filename check (#6133)
---
 ql/src/test/org/apache/hadoop/hive/ql/TestTxnConcatenate.java      | 4 ++--
 ql/src/test/org/apache/hadoop/hive/ql/TxnCommandsBaseForTests.java | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/ql/src/test/org/apache/hadoop/hive/ql/TestTxnConcatenate.java 
b/ql/src/test/org/apache/hadoop/hive/ql/TestTxnConcatenate.java
index 1fabfcb2e52..d3f5b3a0a76 100644
--- a/ql/src/test/org/apache/hadoop/hive/ql/TestTxnConcatenate.java
+++ b/ql/src/test/org/apache/hadoop/hive/ql/TestTxnConcatenate.java
@@ -166,8 +166,8 @@ public void testConcatenateMM() throws Exception {
     String[][] expected2 = new String[][] {
         {"1\t2", "t/base_0000003_v0000011/000000_0"},
         {"4\t5", "t/base_0000003_v0000011/000000_0"},
-        {"5\t6", "t/base_0000003_v0000011/000000_0"},
-        {"8\t8", "t/base_0000003_v0000011/000000_0"}};
+        {"5\t6", "t/base_0000003_v0000011/000001_0"},
+        {"8\t8", "t/base_0000003_v0000011/000001_0"}};
     checkResultAndVectorization(expected2, testQuery, "check data after 
concatenate", LOG);
   }
 }
diff --git a/ql/src/test/org/apache/hadoop/hive/ql/TxnCommandsBaseForTests.java 
b/ql/src/test/org/apache/hadoop/hive/ql/TxnCommandsBaseForTests.java
index fe10a762bf9..d82e1cad9a0 100644
--- a/ql/src/test/org/apache/hadoop/hive/ql/TxnCommandsBaseForTests.java
+++ b/ql/src/test/org/apache/hadoop/hive/ql/TxnCommandsBaseForTests.java
@@ -387,7 +387,7 @@ void checkExpected(List<String> rs, String[][] expected, 
String msg, Logger LOG)
     //verify data and layout
     for(int i = 0; i < expected.length; i++) {
       Assert.assertTrue("Actual line (data) " + i + " data: " + rs.get(i) + "; 
expected " + expected[i][0], rs.get(i).startsWith(expected[i][0]));
-      if (expected.length == 2) {
+      if (expected[i].length == 2) {
         Assert.assertTrue("Actual line(file) " + i + " file: " + rs.get(i),
                 rs.get(i).endsWith(expected[i][1]) || 
rs.get(i).matches(expected[i][1]));
       }