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

tchoi 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 78e6bfcebea HIVE-28988: Handle materialized view commit txn during 
hive acid repl (#5842)
78e6bfcebea is described below

commit 78e6bfcebea5d389515a6868425787b1c5041098
Author: Shivam Kumar <[email protected]>
AuthorDate: Wed Jun 18 11:28:23 2025 +0530

    HIVE-28988: Handle materialized view commit txn during hive acid repl 
(#5842)
    
    * Details:
      * Commit txn of alter mv command was getting populated by write event 
infos.
      * This was causing a repl failure on load.
      * This is now fixed.
    
    * Testing:
      * Added itest.
    
    Co-authored-by: shivam02 <[email protected]>
---
 .../ql/parse/TestReplicationScenariosAcidTables.java | 11 ++++++++++-
 .../ql/parse/repl/dump/events/CommitTxnHandler.java  | 20 ++++++++++++++++++++
 2 files changed, 30 insertions(+), 1 deletion(-)

diff --git 
a/itests/hive-unit/src/test/java/org/apache/hadoop/hive/ql/parse/TestReplicationScenariosAcidTables.java
 
b/itests/hive-unit/src/test/java/org/apache/hadoop/hive/ql/parse/TestReplicationScenariosAcidTables.java
index 28ea5ca9a22..bbbec078992 100644
--- 
a/itests/hive-unit/src/test/java/org/apache/hadoop/hive/ql/parse/TestReplicationScenariosAcidTables.java
+++ 
b/itests/hive-unit/src/test/java/org/apache/hadoop/hive/ql/parse/TestReplicationScenariosAcidTables.java
@@ -3197,10 +3197,13 @@ public void 
testMaterializedViewOnAcidTableReplication() throws Throwable {
             .run("insert into t1 values (1)")
             .run("insert into t1 values (2)")
             .run("create materialized view mat_view as select * from t1")
+            .run("create materialized view mat_view_txn TBLPROPERTIES 
('transactional'='true') as select * from t1")
             .run("show tables")
-            .verifyResults(new String[]{"t1", "mat_view"})
+            .verifyResults(new String[]{"t1", "mat_view", "mat_view_txn"})
             .run("select * from mat_view")
             .verifyResults(new String[]{"1", "2"})
+            .run("select * from mat_view_txn")
+            .verifyResults(new String[]{"1", "2"})
             .dump(primaryDbName);
 
     //confirm materialized-view not replicated
@@ -3217,6 +3220,9 @@ public void testMaterializedViewOnAcidTableReplication() 
throws Throwable {
             .run("alter materialized view mat_view rebuild")
             .run("select * from mat_view")
             .verifyResults(new String[]{"1", "2", "3"})
+            .run("alter materialized view mat_view_txn rebuild")
+            .run("select * from mat_view_txn")
+            .verifyResults(new String[]{"1", "2", "3"})
             .dump(primaryDbName);
 
     //confirm materialized-view not replicated
@@ -3232,6 +3238,9 @@ public void testMaterializedViewOnAcidTableReplication() 
throws Throwable {
             .run("alter materialized view mat_view disable rewrite")
             .run("select * from mat_view")
             .verifyResults(new String[]{"1", "2", "3"})
+            .run("alter materialized view mat_view_txn disable rewrite")
+            .run("select * from mat_view_txn")
+            .verifyResults(new String[]{"1", "2", "3"})
             .dump(primaryDbName);
 
     //confirm materialized-view not replicated
diff --git 
a/ql/src/java/org/apache/hadoop/hive/ql/parse/repl/dump/events/CommitTxnHandler.java
 
b/ql/src/java/org/apache/hadoop/hive/ql/parse/repl/dump/events/CommitTxnHandler.java
index b65849cf605..ddef7807a40 100644
--- 
a/ql/src/java/org/apache/hadoop/hive/ql/parse/repl/dump/events/CommitTxnHandler.java
+++ 
b/ql/src/java/org/apache/hadoop/hive/ql/parse/repl/dump/events/CommitTxnHandler.java
@@ -27,6 +27,7 @@
 import org.apache.hadoop.hive.metastore.api.NotificationEvent;
 import org.apache.hadoop.hive.metastore.api.WriteEventInfo;
 import org.apache.hadoop.hive.metastore.messaging.CommitTxnMessage;
+import org.apache.hadoop.hive.metastore.messaging.MessageBuilder;
 import org.apache.hadoop.hive.metastore.utils.StringUtils;
 import org.apache.hadoop.hive.ql.exec.repl.util.ReplUtils;
 import org.apache.hadoop.hive.ql.metadata.HiveFatalException;
@@ -43,6 +44,7 @@
 import java.io.IOException;
 import java.util.ArrayList;
 import java.util.List;
+import java.util.stream.Collectors;
 
 class CommitTxnHandler extends AbstractEventHandler<CommitTxnMessage> {
 
@@ -128,6 +130,20 @@ private List<WriteEventInfo> getAllWriteEventInfo(Context 
withinContext) throws
               })));
   }
 
+  private List<WriteEventInfo> 
getAllWriteEventInfoExceptMV(List<WriteEventInfo> writeEventInfoList) {
+    return writeEventInfoList.stream().filter(writeEventInfo -> {
+      try {
+        if (writeEventInfo.getTableObj() != null) {
+          Table table = new Table((org.apache.hadoop.hive.metastore.api.Table) 
MessageBuilder.getTObj(writeEventInfo.getTableObj(), 
org.apache.hadoop.hive.metastore.api.Table.class));
+          return !table.isMaterializedView();
+        }
+        return true;
+      } catch (Exception e) {
+        throw new RuntimeException(e);
+      }
+    }).collect(Collectors.toList());
+  }
+
   @Override
   public void handle(Context withinContext) throws Exception {
     if (!ReplUtils.includeAcidTableInDump(withinContext.hiveConf)) {
@@ -168,6 +184,10 @@ public void handle(Context withinContext) throws Exception 
{
         }
       }
 
+      // Filtering out all write event i related to materialized view
+      if (writeEventInfoList != null) {
+        writeEventInfoList = getAllWriteEventInfoExceptMV(writeEventInfoList);
+      }
       int numEntry = (writeEventInfoList != null ? writeEventInfoList.size() : 
0);
       if (numEntry != 0) {
         eventMessage.addWriteEventInfo(writeEventInfoList);

Reply via email to