[hudi] branch master updated: [HUDI-6074] Check inlineClusteringEnabled in isAsyncClusteringEnabled (#8453)

[codope]

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

codope pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/hudi.git


The following commit(s) were added to refs/heads/master by this push:
     new d0a13e64c8c [HUDI-6074] Check inlineClusteringEnabled in 
isAsyncClusteringEnabled (#8453)
d0a13e64c8c is described below

commit d0a13e64c8c755e28c2c0920d246f711b0663bc1
Author: Zouxxyy <zouxinyu....@alibaba-inc.com>
AuthorDate: Fri Apr 14 09:50:36 2023 +0800

    [HUDI-6074] Check inlineClusteringEnabled in isAsyncClusteringEnabled 
(#8453)
---
 .../main/scala/org/apache/hudi/HoodieSparkSqlWriter.scala    | 12 +++++-------
 1 file changed, 5 insertions(+), 7 deletions(-)

diff --git 
a/hudi-spark-datasource/hudi-spark-common/src/main/scala/org/apache/hudi/HoodieSparkSqlWriter.scala
 
b/hudi-spark-datasource/hudi-spark-common/src/main/scala/org/apache/hudi/HoodieSparkSqlWriter.scala
index 1f9e218572e..d338f74bc5a 100644
--- 
a/hudi-spark-datasource/hudi-spark-common/src/main/scala/org/apache/hudi/HoodieSparkSqlWriter.scala
+++ 
b/hudi-spark-datasource/hudi-spark-common/src/main/scala/org/apache/hudi/HoodieSparkSqlWriter.scala
@@ -1015,18 +1015,16 @@ object HoodieSparkSqlWriter {
                                        tableConfig: HoodieTableConfig,
                                        parameters: Map[String, String], 
configuration: Configuration): Boolean = {
     log.info(s"Config.inlineCompactionEnabled ? 
${client.getConfig.inlineCompactionEnabled}")
-    if (asyncCompactionTriggerFnDefined && 
!client.getConfig.inlineCompactionEnabled
-      && parameters.get(ASYNC_COMPACT_ENABLE.key).exists(r => r.toBoolean)) {
-      tableConfig.getTableType == HoodieTableType.MERGE_ON_READ
-    } else {
-      false
-    }
+    (asyncCompactionTriggerFnDefined && 
!client.getConfig.inlineCompactionEnabled
+      && parameters.get(ASYNC_COMPACT_ENABLE.key).exists(r => r.toBoolean)
+      && tableConfig.getTableType == HoodieTableType.MERGE_ON_READ)
   }
 
   private def isAsyncClusteringEnabled(client: SparkRDDWriteClient[_],
                                        parameters: Map[String, String]): 
Boolean = {
     log.info(s"Config.asyncClusteringEnabled ? 
${client.getConfig.isAsyncClusteringEnabled}")
-    asyncClusteringTriggerFnDefined && 
client.getConfig.isAsyncClusteringEnabled
+    (asyncClusteringTriggerFnDefined && 
!client.getConfig.inlineClusteringEnabled
+      && client.getConfig.isAsyncClusteringEnabled)
   }
 
   /**