(kylin) 16/35: KYLIN-5810 Add the spark.session.isDefined check in queryExec

[liyang]

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

liyang pushed a commit to branch kylin5
in repository https://gitbox.apache.org/repos/asf/kylin.git

commit dcfa26067ff19352e064801d191f27c98fe1e6d2
Author: Yinghao Lin <39019287+yhca...@users.noreply.github.com>
AuthorDate: Wed Sep 6 14:04:06 2023 +0800

    KYLIN-5810 Add the spark.session.isDefined check in queryExec
---
 .../src/main/java/org/apache/kylin/query/engine/QueryExec.java   | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git 
a/src/query/src/main/java/org/apache/kylin/query/engine/QueryExec.java 
b/src/query/src/main/java/org/apache/kylin/query/engine/QueryExec.java
index d9015fb340..442eea7faf 100644
--- a/src/query/src/main/java/org/apache/kylin/query/engine/QueryExec.java
+++ b/src/query/src/main/java/org/apache/kylin/query/engine/QueryExec.java
@@ -78,6 +78,7 @@ import org.apache.kylin.query.util.QueryContextCutter;
 import org.apache.kylin.query.util.QueryInterruptChecker;
 import org.apache.kylin.query.util.QueryUtil;
 import org.apache.kylin.query.util.RelAggPushDownUtil;
+import org.apache.spark.sql.SparkSession;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -273,7 +274,7 @@ public class QueryExec {
             postOptRules.addAll(HepUtils.AggPushDownRules);
         }
 
-        if(kylinConfig.isScalarSubqueryJoinEnabled()) {
+        if (kylinConfig.isScalarSubqueryJoinEnabled()) {
             postOptRules.addAll(HepUtils.ScalarSubqueryJoinRules);
         }
 
@@ -598,14 +599,16 @@ public class QueryExec {
     }
 
     private String processAcceptCacheTimeInSql(String sql) {
-        if (kylinConfig.isKylinLocalCacheEnabled() && 
kylinConfig.isKylinFileStatusCacheEnabled()) {
+        if (kylinConfig.isKylinLocalCacheEnabled() && 
kylinConfig.isKylinFileStatusCacheEnabled()
+                && SparkSession.getDefaultSession().isDefined()) {
             return KylinCacheFileSystem.processAcceptCacheTimeInSql(sql);
         }
         return sql;
     }
 
     private void clearAcceptCacheTimeLocally() {
-        if (kylinConfig.isKylinLocalCacheEnabled() && 
kylinConfig.isKylinFileStatusCacheEnabled()) {
+        if (kylinConfig.isKylinLocalCacheEnabled() && 
kylinConfig.isKylinFileStatusCacheEnabled()
+                && SparkSession.getDefaultSession().isDefined()) {
             KylinCacheFileSystem.clearAcceptCacheTimeLocally();
         }
     }