[kylin] branch master updated: KYLIN-4521 make the default-time-filter enable

[shaofengshi]

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

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


The following commit(s) were added to refs/heads/master by this push:
     new 52edac1  KYLIN-4521 make the default-time-filter enable
52edac1 is described below

commit 52edac1521b3b51d34e972b28df3d9dd462b394f
Author: zhangrusong <zhangrus...@ke.com>
AuthorDate: Wed May 20 17:30:37 2020 +0800

    KYLIN-4521 make the default-time-filter enable
    
    Signed-off-by: shaofengshi <shaofeng...@apache.org>
---
 .../src/main/java/org/apache/kylin/common/KylinConfigBase.java       | 4 ++++
 .../main/java/org/apache/kylin/rest/controller/JobController.java    | 5 ++++-
 2 files changed, 8 insertions(+), 1 deletion(-)

diff --git 
a/core-common/src/main/java/org/apache/kylin/common/KylinConfigBase.java 
b/core-common/src/main/java/org/apache/kylin/common/KylinConfigBase.java
index b85f90a..01fd461 100644
--- a/core-common/src/main/java/org/apache/kylin/common/KylinConfigBase.java
+++ b/core-common/src/main/java/org/apache/kylin/common/KylinConfigBase.java
@@ -2501,4 +2501,8 @@ public abstract class KylinConfigBase implements 
Serializable {
     public String getIntersectFilterOrSeparator() {
         return getOptional("kylin.query.intersect.separator", "|");
     }
+
+    public int getDefaultTimeFilter() {
+        return Integer.parseInt(getOptional("kylin.web.default-time-filter", 
"2"));
+    }
 }
diff --git 
a/server-base/src/main/java/org/apache/kylin/rest/controller/JobController.java 
b/server-base/src/main/java/org/apache/kylin/rest/controller/JobController.java
index 8fa9e5c..89ff34f 100644
--- 
a/server-base/src/main/java/org/apache/kylin/rest/controller/JobController.java
+++ 
b/server-base/src/main/java/org/apache/kylin/rest/controller/JobController.java
@@ -24,6 +24,7 @@ import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 
+import org.apache.kylin.common.KylinConfig;
 import org.apache.kylin.job.JobInstance;
 import org.apache.kylin.job.constant.JobStatusEnum;
 import org.apache.kylin.job.constant.JobTimeFilterEnum;
@@ -69,9 +70,11 @@ public class JobController extends BasicController {
             }
         }
 
-        JobTimeFilterEnum timeFilter = JobTimeFilterEnum.LAST_ONE_WEEK;
+        JobTimeFilterEnum timeFilter = null;
         if (null != jobRequest.getTimeFilter()) {
             timeFilter = 
JobTimeFilterEnum.getByCode(jobRequest.getTimeFilter());
+        } else {
+            timeFilter = 
JobTimeFilterEnum.getByCode(KylinConfig.getInstanceFromEnv().getDefaultTimeFilter());
         }
 
         JobService.JobSearchMode jobSearchMode = 
JobService.JobSearchMode.CUBING_ONLY;