You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@griffin.apache.org by gu...@apache.org on 2017/06/02 09:39:43 UTC
incubator-griffin git commit: 20170602 1732modify
Repository: incubator-griffin
Updated Branches:
refs/heads/master 8d43a4c0e -> d3f21b105
20170602 1732modify
Author: Chen <xi...@lm-shc-16501061.corp.ebay.com>
Closes #52 from justACT/20170602-1732modify.
Project: http://git-wip-us.apache.org/repos/asf/incubator-griffin/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-griffin/commit/d3f21b10
Tree: http://git-wip-us.apache.org/repos/asf/incubator-griffin/tree/d3f21b10
Diff: http://git-wip-us.apache.org/repos/asf/incubator-griffin/diff/d3f21b10
Branch: refs/heads/master
Commit: d3f21b105663d760217b73a20ee0e60f3bbcbc97
Parents: 8d43a4c
Author: Chen <xi...@lm-shc-16501061.corp.ebay.com>
Authored: Fri Jun 2 17:39:35 2017 +0800
Committer: Lionel Liu <bh...@163.com>
Committed: Fri Jun 2 17:39:35 2017 +0800
----------------------------------------------------------------------
.gitignore | 4 ++++
.../apache/griffin/core/measure/DataConnector.java | 14 ++++++++++++++
.../apache/griffin/core/measure/EvaluateRule.java | 17 +++++++++++++++++
.../griffin/core/schedule/SchedulerController.java | 5 ++++-
4 files changed, 39 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-griffin/blob/d3f21b10/.gitignore
----------------------------------------------------------------------
diff --git a/.gitignore b/.gitignore
index 146c012..98c857c 100644
--- a/.gitignore
+++ b/.gitignore
@@ -13,6 +13,8 @@ target/**
*.ear
target
service/src/main/resources/public/
+service/src/main/resources/application-dev.properties
+
.project
.settings/
@@ -21,3 +23,5 @@ bin
# virtual machine crash logs, see http://www.java.com/en/download/help/error_hotspot.xml
hs_err_pid*
+
+
http://git-wip-us.apache.org/repos/asf/incubator-griffin/blob/d3f21b10/service/src/main/java/org/apache/griffin/core/measure/DataConnector.java
----------------------------------------------------------------------
diff --git a/service/src/main/java/org/apache/griffin/core/measure/DataConnector.java b/service/src/main/java/org/apache/griffin/core/measure/DataConnector.java
index 58e8219..7143c36 100644
--- a/service/src/main/java/org/apache/griffin/core/measure/DataConnector.java
+++ b/service/src/main/java/org/apache/griffin/core/measure/DataConnector.java
@@ -87,6 +87,20 @@ public class DataConnector extends AuditableEntity {
this.config = configJson;
}
+ public ConnectorType getType() {
+ return type;
+ }
+
+ public void setType(ConnectorType type) {
+ this.type = type;
+ }
+
+ public String getConfig() {
+ return config;
+ }
+
+
+
public DataConnector() {
System.out.println();
}
http://git-wip-us.apache.org/repos/asf/incubator-griffin/blob/d3f21b10/service/src/main/java/org/apache/griffin/core/measure/EvaluateRule.java
----------------------------------------------------------------------
diff --git a/service/src/main/java/org/apache/griffin/core/measure/EvaluateRule.java b/service/src/main/java/org/apache/griffin/core/measure/EvaluateRule.java
index 8428e38..5475e5d 100644
--- a/service/src/main/java/org/apache/griffin/core/measure/EvaluateRule.java
+++ b/service/src/main/java/org/apache/griffin/core/measure/EvaluateRule.java
@@ -22,6 +22,23 @@ import javax.persistence.Entity;
public class EvaluateRule extends AuditableEntity {
private static final long serialVersionUID = -3589222812544556642L;
+
+ public int getSampleRatio() {
+ return sampleRatio;
+ }
+
+ public void setSampleRatio(int sampleRatio) {
+ this.sampleRatio = sampleRatio;
+ }
+
+ public String getRules() {
+ return rules;
+ }
+
+ public void setRules(String rules) {
+ this.rules = rules;
+ }
+
private int sampleRatio;
private String rules;
http://git-wip-us.apache.org/repos/asf/incubator-griffin/blob/d3f21b10/service/src/main/java/org/apache/griffin/core/schedule/SchedulerController.java
----------------------------------------------------------------------
diff --git a/service/src/main/java/org/apache/griffin/core/schedule/SchedulerController.java b/service/src/main/java/org/apache/griffin/core/schedule/SchedulerController.java
index 233c920..5f01c2b 100644
--- a/service/src/main/java/org/apache/griffin/core/schedule/SchedulerController.java
+++ b/service/src/main/java/org/apache/griffin/core/schedule/SchedulerController.java
@@ -80,7 +80,10 @@ public class SchedulerController {
map.put("jobName", jobName);
map.put("groupName", jobGroup);
map.put("nextFireTime", nextFireTime.getTime());
- map.put("previousFireTime",previousFireTime.getTime());
+ if (previousFireTime!=null)
+ map.put("previousFireTime",previousFireTime.getTime());
+ else
+ map.put("previousFireTime",-1);
map.put("triggerState",triggerState);
map.put("measure", (String) jd.getJobDataMap().get("measure"));