(amoro) branch 0.7.x updated: Merge #3225 & fix conflicts

[jinsongzhou]

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

jinsongzhou pushed a commit to branch 0.7.x
in repository https://gitbox.apache.org/repos/asf/amoro.git


The following commit(s) were added to refs/heads/0.7.x by this push:
     new a05f56c2e Merge #3225 & fix conflicts
a05f56c2e is described below

commit a05f56c2efa434d2fda73a47cdb11c5a56973110
Author: ZhouJinsong <zhoujinsong0...@163.com>
AuthorDate: Thu Sep 26 17:43:26 2024 +0800

    Merge #3225 & fix conflicts
---
 .../src/main/java/org/apache/amoro/api/config/OptimizingConfig.java | 6 ++++--
 amoro-ams/pom.xml                                                   | 1 -
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git 
a/amoro-ams/amoro-ams-api/src/main/java/org/apache/amoro/api/config/OptimizingConfig.java
 
b/amoro-ams/amoro-ams-api/src/main/java/org/apache/amoro/api/config/OptimizingConfig.java
index fac4143b9..78b3d33d9 100644
--- 
a/amoro-ams/amoro-ams-api/src/main/java/org/apache/amoro/api/config/OptimizingConfig.java
+++ 
b/amoro-ams/amoro-ams-api/src/main/java/org/apache/amoro/api/config/OptimizingConfig.java
@@ -300,7 +300,8 @@ public class OptimizingConfig {
         && baseHashBucket == that.baseHashBucket
         && baseRefreshInterval == that.baseRefreshInterval
         && hiveRefreshInterval == that.hiveRefreshInterval
-        && Objects.equal(optimizerGroup, that.optimizerGroup);
+        && Objects.equal(optimizerGroup, that.optimizerGroup)
+        && Objects.equal(minPlanInterval, that.minPlanInterval);
   }
 
   @Override
@@ -324,7 +325,8 @@ public class OptimizingConfig {
         fullRewriteAllFiles,
         baseHashBucket,
         baseRefreshInterval,
-        hiveRefreshInterval);
+        hiveRefreshInterval,
+        minPlanInterval);
   }
 
   @Override
diff --git a/amoro-ams/pom.xml b/amoro-ams/pom.xml
index 64e840287..a279f1af3 100644
--- a/amoro-ams/pom.xml
+++ b/amoro-ams/pom.xml
@@ -40,5 +40,4 @@
         <module>amoro-ams-metrics</module>
         <module>dist</module>
     </modules>
-
 </project>