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 2018/08/10 10:34:31 UTC

incubator-griffin git commit: merge pr382 and pr389

Repository: incubator-griffin
Updated Branches:
  refs/heads/master 7b749ad72 -> 10f8103ec


merge pr382 and pr389

add out.dataframe.name in accuracy and profiling measure

Author: Li, Juan <su...@gmail.com>

Closes #391 from icesmartjuan/mergepr389382.


Project: http://git-wip-us.apache.org/repos/asf/incubator-griffin/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-griffin/commit/10f8103e
Tree: http://git-wip-us.apache.org/repos/asf/incubator-griffin/tree/10f8103e
Diff: http://git-wip-us.apache.org/repos/asf/incubator-griffin/diff/10f8103e

Branch: refs/heads/master
Commit: 10f8103ec9660b0c96e33060f44f3fdab49f7c0a
Parents: 7b749ad
Author: Li, Juan <su...@gmail.com>
Authored: Fri Aug 10 18:34:24 2018 +0800
Committer: William Guo <gu...@apache.org>
Committed: Fri Aug 10 18:34:24 2018 +0800

----------------------------------------------------------------------
 ui/angular/src/app/measure/create-measure/ac/ac.component.ts | 8 ++++----
 ui/angular/src/app/measure/create-measure/pr/pr.component.ts | 1 +
 2 files changed, 5 insertions(+), 4 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-griffin/blob/10f8103e/ui/angular/src/app/measure/create-measure/ac/ac.component.ts
----------------------------------------------------------------------
diff --git a/ui/angular/src/app/measure/create-measure/ac/ac.component.ts b/ui/angular/src/app/measure/create-measure/ac/ac.component.ts
index 4bb7ddc..fd51c22 100644
--- a/ui/angular/src/app/measure/create-measure/ac/ac.component.ts
+++ b/ui/angular/src/app/measure/create-measure/ac/ac.component.ts
@@ -200,7 +200,7 @@ export class AcComponent implements OnInit, AfterViewChecked {
         {
           "dsl.type": "griffin-dsl",
           "dq.type": "ACCURACY",
-          name: "accuracy",
+          "out.dataframe.name": "accuracy",
           rule: ""
           // "details": {
           //   "source": "source",
@@ -436,7 +436,7 @@ export class AcComponent implements OnInit, AfterViewChecked {
           {
             "dsl.type": "griffin-dsl",
             "dq.type": "ACCURACY",
-            name: "accuracy",
+            "out.dataframe.name": "accuracy",
             rule: ""
             // "details": {
             //   "source": "source",
@@ -484,7 +484,7 @@ export class AcComponent implements OnInit, AfterViewChecked {
     this.visible = true;
     setTimeout(() => (this.visibleAnimate = true), 100);
   }
-  
+
   deleteUnit(index){
     delete this.newMeasure["data.sources"][index]["connectors"][0]["data.unit"];
   }
@@ -689,4 +689,4 @@ export class AcComponent implements OnInit, AfterViewChecked {
   ngAfterViewChecked() {
     this.resizeWindow();
   }
-}
\ No newline at end of file
+}

http://git-wip-us.apache.org/repos/asf/incubator-griffin/blob/10f8103e/ui/angular/src/app/measure/create-measure/pr/pr.component.ts
----------------------------------------------------------------------
diff --git a/ui/angular/src/app/measure/create-measure/pr/pr.component.ts b/ui/angular/src/app/measure/create-measure/pr/pr.component.ts
index 4b4b747..fec1a2e 100644
--- a/ui/angular/src/app/measure/create-measure/pr/pr.component.ts
+++ b/ui/angular/src/app/measure/create-measure/pr/pr.component.ts
@@ -382,6 +382,7 @@ export class PrComponent implements AfterViewChecked, OnInit {
         }
       ],
       "evaluate.rule": {
+        "out.dataframe.name":"profiling",
         rules: []
       }
     };