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

iwasakims pushed a commit to branch branch-3.2
in repository https://gitbox.apache.org/repos/asf/bigtop.git


The following commit(s) were added to refs/heads/branch-3.2 by this push:
     new 5b88580ff BIGTOP-4000. Fix build failure of Tez against Hadoop 3.3.6. 
(#1173)
5b88580ff is described below

commit 5b88580ff9bc180b9ea7e1749230a11ba7c9d3cf
Author: Masatake Iwasaki <[email protected]>
AuthorDate: Tue Sep 12 02:12:46 2023 +0900

    BIGTOP-4000. Fix build failure of Tez against Hadoop 3.3.6. (#1173)
    
    (cherry picked from commit e01adb6139eb72dff9d334065d6501c421503805)
---
 .../src/common/tez/patch7-TEZ-4493.diff            | 40 ++++++++++++++++++++++
 1 file changed, 40 insertions(+)

diff --git a/bigtop-packages/src/common/tez/patch7-TEZ-4493.diff 
b/bigtop-packages/src/common/tez/patch7-TEZ-4493.diff
new file mode 100644
index 000000000..a7583ce17
--- /dev/null
+++ b/bigtop-packages/src/common/tez/patch7-TEZ-4493.diff
@@ -0,0 +1,40 @@
+commit 0fc920ec3739a766dfac82120c3c17a091d13213
+Author: Ayush Saxena <[email protected]>
+Date:   Fri Jun 30 01:24:00 2023 +0530
+
+    TEZ-4493: Upgrade Hadoop to 3.3.6. (#285) (Ayush Saxena reviewed by Laszlo 
Bodor)
+    
+    (cherry picked from commit 50380751b7e7e628aeb40a985b94aba98d2a88db)
+    
+     Conflicts:
+            pom.xml
+
+diff --git a/pom.xml b/pom.xml
+index f5a526ae2..25efcea21 100644
+--- a/pom.xml
++++ b/pom.xml
+@@ -58,7 +58,7 @@
+ 
+     <clover.license>${user.home}/clover.license</clover.license>
+     <guava.version>27.0-jre</guava.version>
+-    <hadoop.version>3.1.3</hadoop.version>
++    <hadoop.version>3.3.6</hadoop.version>
+     <netty.version>4.0.52.Final</netty.version>
+     <pig.version>0.13.0</pig.version>
+     <jersey.version>1.19</jersey.version>
+diff --git a/tez-dag/src/main/java/org/apache/tez/state/StateMachineTez.java 
b/tez-dag/src/main/java/org/apache/tez/state/StateMachineTez.java
+index 3be771892..cbb838d7f 100644
+--- a/tez-dag/src/main/java/org/apache/tez/state/StateMachineTez.java
++++ b/tez-dag/src/main/java/org/apache/tez/state/StateMachineTez.java
+@@ -51,6 +51,11 @@ public class StateMachineTez<STATE extends Enum<STATE>, 
EVENTTYPE extends Enum<E
+     return realStatemachine.getCurrentState();
+   }
+ 
++  @Override
++  public STATE getPreviousState() {
++    return realStatemachine.getPreviousState();
++  }
++
+   @SuppressWarnings("unchecked")
+   @Override
+   public STATE doTransition(EVENTTYPE eventType, EVENT event) throws

Reply via email to