[hive] branch master updated: HIVE-25355 : Exclude EXPLAIN from Read Txns. Need to be reverted once HIVE-25011 i… (#2694)(Aasha Medhi, reviewed by Pravin Kumar Sinha)

[aasha]

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

aasha 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 4949f23  HIVE-25355 : Exclude EXPLAIN from Read Txns. Need to be 
reverted once HIVE-25011 i… (#2694)(Aasha Medhi, reviewed by Pravin Kumar Sinha)
4949f23 is described below

commit 4949f23b7e616bf933e3f35069ef79b7d8ad750f
Author: aasha <aasha.medhi2...@gmail.com>
AuthorDate: Mon Oct 4 09:49:53 2021 +0530

    HIVE-25355 : Exclude EXPLAIN from Read Txns. Need to be reverted once 
HIVE-25011 i… (#2694)(Aasha Medhi, reviewed by Pravin Kumar Sinha)
    
    * Exclude EXPLAIN from Read Txns. Need to be reverted once HIVE-25011 is 
committed
    
    * Fix tests
---
 .../hadoop/hive/ql/parse/TestReplicationScenariosAcidTables.java     | 5 +----
 ql/src/java/org/apache/hadoop/hive/ql/io/AcidUtils.java              | 3 +--
 2 files changed, 2 insertions(+), 6 deletions(-)

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 ed7a4f9..dea7460 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
@@ -976,10 +976,7 @@ public class TestReplicationScenariosAcidTables extends 
BaseReplicationScenarios
       primary.run("SHOW TABLES " + dbName);
       primary.run("SHOW TABLE EXTENDED LIKE 't1'");
       primary.run("SHOW TBLPROPERTIES t1");
-      primary.run("EXPLAIN SELECT * from " + dbName + ".t1");
       primary.run("SHOW LOCKS");
-      primary.run("EXPLAIN SHOW LOCKS");
-      primary.run("EXPLAIN LOCKS UPDATE target SET b = 1 WHERE p IN (SELECT 
t.q1 FROM source t WHERE t.a1=5)");
       long currentEventId = 
primary.getCurrentNotificationEventId().getEventId();
       Assert.assertEquals(lastEventId, currentEventId);
     } finally {
@@ -1659,7 +1656,7 @@ public class TestReplicationScenariosAcidTables extends 
BaseReplicationScenarios
             primary.dump(primaryDbName);
 
     long lastReplId = Long.parseLong(bootStrapDump.lastReplicationId);
-    primary.testEventCounts(primaryDbName, lastReplId, null, null, 12);
+    primary.testEventCounts(primaryDbName, lastReplId, null, null, 14);
 
     // Test load
     replica.load(replicatedDbName, primaryDbName)
diff --git a/ql/src/java/org/apache/hadoop/hive/ql/io/AcidUtils.java 
b/ql/src/java/org/apache/hadoop/hive/ql/io/AcidUtils.java
index 6034d78..ec2058a 100644
--- a/ql/src/java/org/apache/hadoop/hive/ql/io/AcidUtils.java
+++ b/ql/src/java/org/apache/hadoop/hive/ql/io/AcidUtils.java
@@ -195,8 +195,7 @@ public class AcidUtils {
             HiveParser.TOK_DESCTABLE,
             HiveParser.TOK_SHOWTABLES,
             HiveParser.TOK_SHOW_TABLESTATUS,
-            HiveParser.TOK_SHOW_TBLPROPERTIES,
-            HiveParser.TOK_EXPLAIN
+            HiveParser.TOK_SHOW_TBLPROPERTIES
     ));
   }