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/11/01 03:06:12 UTC

[01/31] incubator-griffin git commit: add ci

Repository: incubator-griffin
Updated Branches:
  refs/heads/griffin-0.1.6-incubating-rc1 [created] a99602b5c


add ci


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

Branch: refs/heads/griffin-0.1.6-incubating-rc1
Commit: ad858d9f1947accf5e167a70b332a51e1f1d5246
Parents: fd84be8
Author: William Guo <gu...@icloud.com>
Authored: Thu Jul 20 11:14:18 2017 +0800
Committer: William Guo <gu...@icloud.com>
Committed: Thu Jul 20 11:14:18 2017 +0800

----------------------------------------------------------------------
 .travis.yml | 20 ++++++++++++++++++++
 1 file changed, 20 insertions(+)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-griffin/blob/ad858d9f/.travis.yml
----------------------------------------------------------------------
diff --git a/.travis.yml b/.travis.yml
new file mode 100644
index 0000000..8001116
--- /dev/null
+++ b/.travis.yml
@@ -0,0 +1,20 @@
+# Licensed to the Apache Software Foundation (ASF) under one or more contributor license
+# agreements. See the NOTICE file distributed with this work for additional information regarding
+# copyright ownership. The ASF licenses this file to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance with the License. You may obtain a
+# copy of the License at
+#
+#    http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software distributed under the License
+# is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express
+# or implied. See the License for the specific language governing permissions and limitations under
+# the License.
+
+language: java scala
+jdk:
+  - oraclejdk8
+scala:
+  - 2.10.6
+
+script: mvn clean verify


[10/31] incubator-griffin git commit: Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/incubator-griffin

Posted by gu...@apache.org.
Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/incubator-griffin


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

Branch: refs/heads/griffin-0.1.6-incubating-rc1
Commit: a94989dd2706919d7131721e53afdc8d06b2d125
Parents: cbeaaed f481c42
Author: William Guo <gu...@icloud.com>
Authored: Fri Jul 21 13:03:03 2017 +0800
Committer: William Guo <gu...@icloud.com>
Committed: Fri Jul 21 13:03:03 2017 +0800

----------------------------------------------------------------------

----------------------------------------------------------------------



[07/31] incubator-griffin git commit: fix logging level issue from Travis ci

Posted by gu...@apache.org.
fix logging level issue from Travis ci


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

Branch: refs/heads/griffin-0.1.6-incubating-rc1
Commit: 9a2fe6b17bd815289bf8385a042355bfc0827e56
Parents: 800ef44
Author: William Guo <gu...@icloud.com>
Authored: Thu Jul 20 14:39:14 2017 +0800
Committer: William Guo <gu...@icloud.com>
Committed: Thu Jul 20 14:39:14 2017 +0800

----------------------------------------------------------------------
 measure/src/test/resources/log4j.properties     | 25 --------------------
 .../test/resources/application-test.properties  |  6 ++++-
 .../src/test/resources/application.properties   |  8 ++++++-
 3 files changed, 12 insertions(+), 27 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-griffin/blob/9a2fe6b1/measure/src/test/resources/log4j.properties
----------------------------------------------------------------------
diff --git a/measure/src/test/resources/log4j.properties b/measure/src/test/resources/log4j.properties
deleted file mode 100644
index ff9399b..0000000
--- a/measure/src/test/resources/log4j.properties
+++ /dev/null
@@ -1,25 +0,0 @@
-#
-# Licensed to the Apache Software Foundation (ASF) under one
-# or more contributor license agreements.  See the NOTICE file
-# distributed with this work for additional information
-# regarding copyright ownership.  The ASF licenses this file
-# to you under the Apache License, Version 2.0 (the
-# "License"); you may not use this file except in compliance
-# with the License.  You may obtain a copy of the License at
-# 
-#   http://www.apache.org/licenses/LICENSE-2.0
-# 
-# Unless required by applicable law or agreed to in writing,
-# software distributed under the License is distributed on an
-# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied.  See the License for the
-# specific language governing permissions and limitations
-# under the License.
-#
-
-
-log4j.rootLogger=INFO, stdout
-log4j.appender.stdout=org.apache.log4j.ConsoleAppender
-log4j.appender.stdout.Target=System.out
-log4j.appender.stdout.layout=org.apache.log4j.PatternLayout
-log4j.appender.stdout.layout.ConversionPattern=%d{yyyy-MM-dd HH:mm:ss.SSS} %-5p [%c] - %m%n
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/incubator-griffin/blob/9a2fe6b1/service/src/test/resources/application-test.properties
----------------------------------------------------------------------
diff --git a/service/src/test/resources/application-test.properties b/service/src/test/resources/application-test.properties
index 7d93f37..ea9d83d 100644
--- a/service/src/test/resources/application-test.properties
+++ b/service/src/test/resources/application-test.properties
@@ -75,4 +75,8 @@ hive.metastore.uris = thrift://10.9.246.187:9083
 hive.metastore.dbname = default
 
 # kafka schema registry
-kafka.schema.registry.url = http://10.65.159.119:8081
\ No newline at end of file
+kafka.schema.registry.url = http://10.65.159.119:8081
+
+#logging level
+logging.level.org.springframework=DEBUG
+logging.level.org.hibernate=ERROR
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/incubator-griffin/blob/9a2fe6b1/service/src/test/resources/application.properties
----------------------------------------------------------------------
diff --git a/service/src/test/resources/application.properties b/service/src/test/resources/application.properties
index 1bdce71..755e449 100644
--- a/service/src/test/resources/application.properties
+++ b/service/src/test/resources/application.properties
@@ -36,4 +36,10 @@ hive.metastore.uris = thrift://10.9.246.187:9083
 hive.metastore.dbname = default
 
 # kafka schema registry
-kafka.schema.registry.url = http://10.65.159.119:8081
\ No newline at end of file
+kafka.schema.registry.url = http://10.65.159.119:8081
+
+#logging level
+logging.level.root=ERROR
+logging.level.org.hibernate=ERROR
+logging.level.org.springframework.test=ERROR
+logging.file=target/test.log
\ No newline at end of file


[03/31] incubator-griffin git commit: add node_js bower in ci

Posted by gu...@apache.org.
add node_js bower in ci


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

Branch: refs/heads/griffin-0.1.6-incubating-rc1
Commit: 775bd018cf4d0435fc91003d424a2fbf92802af4
Parents: 6b59bed 978c22e
Author: William Guo <gu...@icloud.com>
Authored: Thu Jul 20 12:55:57 2017 +0800
Committer: William Guo <gu...@icloud.com>
Committed: Thu Jul 20 12:55:57 2017 +0800

----------------------------------------------------------------------
 .travis.yml | 2 ++
 1 file changed, 2 insertions(+)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-griffin/blob/775bd018/.travis.yml
----------------------------------------------------------------------
diff --cc .travis.yml
index 73f9285,8001116..22b1b1d
--- a/.travis.yml
+++ b/.travis.yml
@@@ -11,15 -11,10 +11,17 @@@
  # or implied. See the License for the specific language governing permissions and limitations under
  # the License.
  
 -language: java scala
++
 +language: java scala node_js
 +
  jdk:
    - oraclejdk8
  scala:
    - 2.10.6
 +node_js:
 +  - "6"
 +
 +before_script:
 +  - 'npm install -g bower'
+ 
  script: mvn clean verify


[23/31] incubator-griffin git commit: Merge branch 'master' of https://github.com/apache/incubator-griffin

Posted by gu...@apache.org.
Merge branch 'master' of https://github.com/apache/incubator-griffin


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

Branch: refs/heads/griffin-0.1.6-incubating-rc1
Commit: b9d044633044af38bbc02ae22ee60b4ea4f0ed67
Parents: 215c8b4 0730988
Author: William Guo <gu...@icloud.com>
Authored: Mon Oct 30 16:18:44 2017 +0800
Committer: William Guo <gu...@icloud.com>
Committed: Mon Oct 30 16:18:44 2017 +0800

----------------------------------------------------------------------
 .../batch/KafkaCacheDirectDataConnector.scala   | 125 -----
 .../StreamingCacheDirectDataConnector.scala     |  60 ---
 .../connector/cache/CacheDataConnector.scala    |  33 --
 .../data/connector/cache/DataCacheable.scala    |  86 ---
 .../data/connector/cache/DataUpdatable.scala    |  30 --
 .../cache/HiveCacheDataConnector.scala          | 351 ------------
 .../cache/TextCacheDataConnector.scala          | 311 -----------
 .../measure/persist/OldHttpPersist.scala        |  87 ---
 .../apache/griffin/measure/process/Algo.scala   |  34 --
 measure/src/test/resources/test-data.jsonFile   |   3 -
 measure/src/test/resources/test-data1.jsonFile  |  31 --
 .../measure/cache/InfoCacheInstanceTest.scala   |  78 ---
 .../griffin/measure/cache/ZKCacheLockTest.scala |  84 ---
 .../griffin/measure/cache/ZKInfoCacheTest.scala |  90 ----
 .../measure/process/BatchProcessTest.scala      | 146 -----
 .../griffin/measure/process/JsonParseTest.scala | 531 -------------------
 .../griffin/measure/process/JsonToStructs.scala |  85 ---
 .../measure/process/StreamingProcessTest.scala  | 147 -----
 .../apache/griffin/measure/sql/SqlTest.scala    | 125 -----
 .../griffin/measure/utils/JsonUtilTest.scala    |  60 ---
 .../apache/griffin/core/job/JobController.java  |  10 +-
 .../griffin/core/measure/MeasureController.java |   2 +-
 .../griffin/core/job/JobInstanceRepoTest.java   |  19 +
 .../griffin/core/measure/MeasureTestHelper.java |  19 +
 24 files changed, 46 insertions(+), 2501 deletions(-)
----------------------------------------------------------------------



[13/31] incubator-griffin git commit: Merge branch 'master' of https://github.com/apache/incubator-griffin

Posted by gu...@apache.org.
Merge branch 'master' of https://github.com/apache/incubator-griffin


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

Branch: refs/heads/griffin-0.1.6-incubating-rc1
Commit: c16cbc26717d1f770b115b3f3a512c9d3dae9fdd
Parents: 56b6785 6fd22ae
Author: William Guo <gu...@icloud.com>
Authored: Fri Aug 11 15:12:51 2017 +0800
Committer: William Guo <gu...@icloud.com>
Committed: Fri Aug 11 15:12:51 2017 +0800

----------------------------------------------------------------------
 griffin-doc/measure-streaming-sample.md         | 204 +++++++++++
 measure/pom.xml                                 |   8 +
 measure/src/main/resources/config-old.json      |  45 ---
 .../src/main/resources/config-streaming.json    |  61 ++++
 measure/src/main/resources/config.json          |   2 +
 measure/src/main/resources/env.json             |  16 +
 .../apache/griffin/measure/Application.scala    | 133 +++++++
 .../griffin/measure/algo/AccuracyAlgo.scala     |  24 ++
 .../org/apache/griffin/measure/algo/Algo.scala  |  34 ++
 .../griffin/measure/algo/MeasureType.scala      |  26 ++
 .../griffin/measure/algo/ProcessType.scala      |  26 ++
 .../griffin/measure/algo/ProfileAlgo.scala      |  23 ++
 .../measure/algo/batch/BatchAccuracyAlgo.scala  | 190 ++++++++++
 .../measure/algo/batch/BatchProfileAlgo.scala   | 162 +++++++++
 .../measure/algo/core/AccuracyCore.scala        | 103 ++++++
 .../griffin/measure/algo/core/ProfileCore.scala |  73 ++++
 .../algo/streaming/StreamingAccuracyAlgo.scala  | 358 +++++++++++++++++++
 .../streaming/StreamingAccuracyProcess.scala    | 234 ++++++++++++
 .../measure/algo/streaming/TimingProcess.scala  |  46 +++
 .../griffin/measure/batch/Application.scala     | 113 ------
 .../measure/batch/algo/AccuracyAlgo.scala       |  24 --
 .../griffin/measure/batch/algo/Algo.scala       |  34 --
 .../measure/batch/algo/BatchAccuracyAlgo.scala  | 183 ----------
 .../measure/batch/algo/BatchProfileAlgo.scala   | 155 --------
 .../measure/batch/algo/MeasureType.scala        |  26 --
 .../measure/batch/algo/ProfileAlgo.scala        |  23 --
 .../measure/batch/algo/core/AccuracyCore.scala  | 101 ------
 .../measure/batch/algo/core/ProfileCore.scala   |  73 ----
 .../measure/batch/config/params/AllParam.scala  |  32 --
 .../measure/batch/config/params/Param.scala     |  25 --
 .../batch/config/params/env/CleanerParam.scala  |  28 --
 .../batch/config/params/env/EnvParam.scala      |  31 --
 .../batch/config/params/env/PersistParam.scala  |  30 --
 .../batch/config/params/env/SparkParam.scala    |  31 --
 .../config/params/user/DataConnectorParam.scala |  31 --
 .../config/params/user/EvaluateRuleParam.scala  |  30 --
 .../batch/config/params/user/UserParam.scala    |  33 --
 .../batch/config/reader/ParamFileReader.scala   |  38 --
 .../config/reader/ParamHdfsFileReader.scala     |  38 --
 .../config/reader/ParamRawStringReader.scala    |  35 --
 .../batch/config/reader/ParamReader.scala       |  30 --
 .../config/reader/ParamReaderFactory.scala      |  40 ---
 .../config/validator/AllParamValidator.scala    |  34 --
 .../batch/config/validator/ParamValidator.scala |  30 --
 .../batch/connector/AvroDataConnector.scala     | 109 ------
 .../measure/batch/connector/DataConnector.scala |  34 --
 .../batch/connector/DataConnectorFactory.scala  |  49 ---
 .../batch/connector/HiveDataConnector.scala     | 131 -------
 .../griffin/measure/batch/log/Loggable.scala    |  43 ---
 .../measure/batch/persist/HdfsPersist.scala     | 171 ---------
 .../measure/batch/persist/HttpPersist.scala     |  78 ----
 .../measure/batch/persist/LoggerPersist.scala   |  89 -----
 .../measure/batch/persist/MultiPersists.scala   |  49 ---
 .../griffin/measure/batch/persist/Persist.scala |  44 ---
 .../measure/batch/persist/PersistFactory.scala  |  51 ---
 .../measure/batch/result/AccuracyResult.scala   |  44 ---
 .../measure/batch/result/ProfileResult.scala    |  44 ---
 .../griffin/measure/batch/result/Result.scala   |  32 --
 .../measure/batch/result/ResultInfo.scala       |  57 ---
 .../measure/batch/rule/CalculationUtil.scala    | 315 ----------------
 .../measure/batch/rule/ExprValueUtil.scala      |  93 -----
 .../measure/batch/rule/RuleAnalyzer.scala       |  78 ----
 .../measure/batch/rule/RuleFactory.scala        |  52 ---
 .../griffin/measure/batch/rule/RuleParser.scala | 240 -------------
 .../batch/rule/expr/AnalyzableExpr.scala        |  25 --
 .../measure/batch/rule/expr/Cacheable.scala     |  33 --
 .../measure/batch/rule/expr/Calculatable.scala  |  25 --
 .../batch/rule/expr/DataSourceable.scala        |  28 --
 .../measure/batch/rule/expr/Describable.scala   |  33 --
 .../griffin/measure/batch/rule/expr/Expr.scala  |  51 ---
 .../measure/batch/rule/expr/ExprDescOnly.scala  |  40 ---
 .../measure/batch/rule/expr/ExprIdCounter.scala |  60 ----
 .../measure/batch/rule/expr/FieldDescOnly.scala |  58 ---
 .../measure/batch/rule/expr/LiteralExpr.scala   |  96 -----
 .../measure/batch/rule/expr/LogicalExpr.scala   | 177 ---------
 .../measure/batch/rule/expr/MathExpr.scala      |  97 -----
 .../measure/batch/rule/expr/SelectExpr.scala    |  71 ----
 .../measure/batch/rule/expr/StatementExpr.scala |  70 ----
 .../griffin/measure/batch/utils/HdfsUtil.scala  |  80 -----
 .../griffin/measure/batch/utils/HttpUtil.scala  |  48 ---
 .../griffin/measure/batch/utils/JsonUtil.scala  |  50 ---
 .../griffin/measure/cache/info/InfoCache.scala  |  39 ++
 .../measure/cache/info/InfoCacheFactory.scala   |  41 +++
 .../measure/cache/info/InfoCacheInstance.scala  |  53 +++
 .../measure/cache/info/TimeInfoCache.scala      | 116 ++++++
 .../measure/cache/info/ZKInfoCache.scala        | 210 +++++++++++
 .../griffin/measure/cache/lock/CacheLock.scala  |  31 ++
 .../measure/cache/lock/MultiCacheLock.scala     |  39 ++
 .../measure/cache/lock/ZKCacheLock.scala        |  53 +++
 .../measure/cache/result/CacheResult.scala      |  29 ++
 .../cache/result/CacheResultProcesser.scala     |  71 ++++
 .../measure/config/params/AllParam.scala        |  32 ++
 .../griffin/measure/config/params/Param.scala   |  25 ++
 .../config/params/env/CleanerParam.scala        |  29 ++
 .../measure/config/params/env/EnvParam.scala    |  32 ++
 .../config/params/env/InfoCacheParam.scala      |  30 ++
 .../config/params/env/PersistParam.scala        |  30 ++
 .../measure/config/params/env/SparkParam.scala  |  33 ++
 .../config/params/user/DataCacheParam.scala     |  31 ++
 .../config/params/user/DataConnectorParam.scala |  37 ++
 .../config/params/user/EvaluateRuleParam.scala  |  30 ++
 .../measure/config/params/user/UserParam.scala  |  34 ++
 .../measure/config/reader/ParamFileReader.scala |  38 ++
 .../config/reader/ParamHdfsFileReader.scala     |  38 ++
 .../config/reader/ParamRawStringReader.scala    |  35 ++
 .../measure/config/reader/ParamReader.scala     |  30 ++
 .../config/reader/ParamReaderFactory.scala      |  40 +++
 .../config/validator/AllParamValidator.scala    |  34 ++
 .../config/validator/ParamValidator.scala       |  30 ++
 .../measure/connector/DataConnector.scala       |  32 ++
 .../connector/DataConnectorFactory.scala        | 139 +++++++
 .../connector/cache/CacheDataConnector.scala    |  33 ++
 .../measure/connector/cache/DataCacheable.scala |  86 +++++
 .../measure/connector/cache/DataUpdatable.scala |  30 ++
 .../cache/HiveCacheDataConnector.scala          | 351 ++++++++++++++++++
 .../cache/TextCacheDataConnector.scala          | 311 ++++++++++++++++
 .../direct/AvroDirectDataConnector.scala        | 132 +++++++
 .../connector/direct/DirectDataConnector.scala  |  34 ++
 .../direct/HiveDirectDataConnector.scala        | 158 ++++++++
 .../direct/KafkaCacheDirectDataConnector.scala  | 125 +++++++
 .../StreamingCacheDirectDataConnector.scala     |  60 ++++
 .../streaming/KafkaStreamingDataConnector.scala |  58 +++
 .../streaming/StreamingDataConnector.scala      |  34 ++
 .../apache/griffin/measure/log/Loggable.scala   |  43 +++
 .../griffin/measure/persist/HdfsPersist.scala   | 206 +++++++++++
 .../griffin/measure/persist/HttpPersist.scala   |  88 +++++
 .../griffin/measure/persist/LoggerPersist.scala | 118 ++++++
 .../griffin/measure/persist/MultiPersists.scala |  52 +++
 .../measure/persist/OldHttpPersist.scala        |  87 +++++
 .../griffin/measure/persist/Persist.scala       |  52 +++
 .../measure/persist/PersistFactory.scala        |  53 +++
 .../measure/persist/PersistThreadPool.scala     |  62 ++++
 .../griffin/measure/result/AccuracyResult.scala |  44 +++
 .../griffin/measure/result/DataInfo.scala       |  50 +++
 .../griffin/measure/result/ProfileResult.scala  |  44 +++
 .../apache/griffin/measure/result/Result.scala  |  32 ++
 .../griffin/measure/rule/CalculationUtil.scala  | 315 ++++++++++++++++
 .../measure/rule/DataTypeCalculationUtil.scala  | 159 ++++++++
 .../griffin/measure/rule/ExprValueUtil.scala    | 263 ++++++++++++++
 .../griffin/measure/rule/RuleAnalyzer.scala     |  72 ++++
 .../griffin/measure/rule/RuleFactory.scala      |  52 +++
 .../griffin/measure/rule/RuleParser.scala       | 244 +++++++++++++
 .../measure/rule/SchemaValueCombineUtil.scala   | 187 ++++++++++
 .../measure/rule/expr/AnalyzableExpr.scala      |  24 ++
 .../griffin/measure/rule/expr/Cacheable.scala   |  33 ++
 .../measure/rule/expr/Calculatable.scala        |  25 ++
 .../griffin/measure/rule/expr/ClauseExpr.scala  | 109 ++++++
 .../measure/rule/expr/DataSourceable.scala      |  28 ++
 .../griffin/measure/rule/expr/Describable.scala |  33 ++
 .../apache/griffin/measure/rule/expr/Expr.scala |  53 +++
 .../measure/rule/expr/ExprDescOnly.scala        |  40 +++
 .../measure/rule/expr/ExprIdCounter.scala       |  60 ++++
 .../measure/rule/expr/FieldDescOnly.scala       |  58 +++
 .../griffin/measure/rule/expr/LiteralExpr.scala |  83 +++++
 .../griffin/measure/rule/expr/LogicalExpr.scala | 178 +++++++++
 .../griffin/measure/rule/expr/MathExpr.scala    |  99 +++++
 .../griffin/measure/rule/expr/SelectExpr.scala  |  88 +++++
 .../rule/func/DefaultFunctionDefine.scala       |  36 ++
 .../measure/rule/func/FunctionDefine.scala      |  25 ++
 .../measure/rule/func/FunctionUtil.scala        |  75 ++++
 .../measure/utils/HdfsFileDumpUtil.scala        |  83 +++++
 .../apache/griffin/measure/utils/HdfsUtil.scala | 120 +++++++
 .../apache/griffin/measure/utils/HttpUtil.scala |  54 +++
 .../apache/griffin/measure/utils/JsonUtil.scala |  54 +++
 .../apache/griffin/measure/utils/TimeUtil.scala |  79 ++++
 measure/src/test/resources/config-profile.json  |   2 +
 .../src/test/resources/config-streaming.json    |  69 ++++
 .../src/test/resources/config-streaming1.json   |  65 ++++
 .../src/test/resources/config-streaming2.json   |  65 ++++
 .../src/test/resources/config-streaming3.json   |  65 ++++
 measure/src/test/resources/config.json          |   4 +-
 measure/src/test/resources/config1.json         |   2 +
 measure/src/test/resources/env-streaming.json   |  45 +++
 measure/src/test/resources/env.json             |  24 +-
 .../algo/batch/BatchAccuracyAlgoTest.scala      | 198 ++++++++++
 .../algo/batch/BatchProfileAlgoTest.scala       | 173 +++++++++
 .../measure/algo/batch/DataFrameSaveTest.scala  | 172 +++++++++
 .../measure/algo/core/AccuracyCoreTest.scala    |  89 +++++
 .../measure/algo/core/ProfileCoreTest.scala     |  79 ++++
 .../streaming/StreamingAccuracyAlgoTest.scala   | 267 ++++++++++++++
 .../batch/algo/BatchAccuracyAlgoTest.scala      | 192 ----------
 .../batch/algo/BatchProfileAlgoTest.scala       | 167 ---------
 .../batch/algo/core/AccuracyCoreTest.scala      |  89 -----
 .../batch/algo/core/ProfileCoreTest.scala       |  79 ----
 .../reader/ParamRawStringReaderTest.scala       |  38 --
 .../validator/AllParamValidatorTest.scala       |  40 ---
 .../measure/batch/persist/HdfsPersistTest.scala |  48 ---
 .../measure/batch/persist/HttpPersistTest.scala |  42 ---
 .../batch/result/AccuracyResultTest.scala       |  57 ---
 .../batch/result/ProfileResultTest.scala        |  57 ---
 .../measure/batch/rule/RuleAnalyzerTest.scala   |  64 ----
 .../measure/batch/rule/RuleFactoryTest.scala    |  44 ---
 .../measure/batch/rule/RuleParserTest.scala     | 202 -----------
 .../measure/batch/utils/JsonUtilTest.scala      |  60 ----
 .../measure/cache/InfoCacheInstanceTest.scala   |  78 ++++
 .../griffin/measure/cache/ZKCacheLockTest.scala |  84 +++++
 .../griffin/measure/cache/ZKInfoCacheTest.scala |  90 +++++
 .../reader/ParamRawStringReaderTest.scala       |  38 ++
 .../validator/AllParamValidatorTest.scala       |  40 +++
 .../measure/connector/ConnectorTest.scala       |  70 ++++
 .../measure/persist/HdfsPersistTest.scala       |  48 +++
 .../measure/persist/HttpPersistTest.scala       |  42 +++
 .../measure/result/AccuracyResultTest.scala     |  57 +++
 .../measure/result/ProfileResultTest.scala      |  57 +++
 .../measure/rule/ExprValueUtilTest.scala        |  86 +++++
 .../griffin/measure/rule/RuleAnalyzerTest.scala |  60 ++++
 .../griffin/measure/rule/RuleFactoryTest.scala  |  44 +++
 .../griffin/measure/rule/RuleParserTest.scala   | 213 +++++++++++
 .../griffin/measure/utils/JsonUtilTest.scala    |  60 ++++
 service/src/main/resources/sparkJob.properties  |   2 +-
 210 files changed, 10619 insertions(+), 5322 deletions(-)
----------------------------------------------------------------------



[06/31] incubator-griffin git commit: Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/incubator-griffin

Posted by gu...@apache.org.
Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/incubator-griffin


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

Branch: refs/heads/griffin-0.1.6-incubating-rc1
Commit: 800ef44ea498dde9e924e8cc886633507a6c12bb
Parents: a6ec7a2 770dc01
Author: William Guo <gu...@icloud.com>
Authored: Thu Jul 20 13:24:09 2017 +0800
Committer: William Guo <gu...@icloud.com>
Committed: Thu Jul 20 13:24:09 2017 +0800

----------------------------------------------------------------------

----------------------------------------------------------------------



[05/31] incubator-griffin git commit: bower

Posted by gu...@apache.org.
bower


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

Branch: refs/heads/griffin-0.1.6-incubating-rc1
Commit: a6ec7a21273ea3af7ac7075939e6b3f317f03580
Parents: b056224
Author: William Guo <gu...@icloud.com>
Authored: Thu Jul 20 13:15:02 2017 +0800
Committer: William Guo <gu...@icloud.com>
Committed: Thu Jul 20 13:15:02 2017 +0800

----------------------------------------------------------------------
 .travis.yml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-griffin/blob/a6ec7a21/.travis.yml
----------------------------------------------------------------------
diff --git a/.travis.yml b/.travis.yml
index 22b1b1d..5466129 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -21,7 +21,7 @@ scala:
 node_js:
   - "6"
 
-before_script:
-  - 'npm install -g bower'
+install:
+  - npm install -g bower
 
 script: mvn clean verify


[08/31] incubator-griffin git commit: remove unused properties

Posted by gu...@apache.org.
remove unused properties


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

Branch: refs/heads/griffin-0.1.6-incubating-rc1
Commit: 2a69f4fde680c38e700de8d105386159c3e89703
Parents: 9a2fe6b
Author: William Guo <gu...@icloud.com>
Authored: Thu Jul 20 15:17:57 2017 +0800
Committer: William Guo <gu...@icloud.com>
Committed: Thu Jul 20 15:17:57 2017 +0800

----------------------------------------------------------------------
 .travis.yml                                     |  2 +-
 .../test/resources/application-test.properties  | 82 --------------------
 .../src/test/resources/application.properties   |  1 +
 3 files changed, 2 insertions(+), 83 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-griffin/blob/2a69f4fd/.travis.yml
----------------------------------------------------------------------
diff --git a/.travis.yml b/.travis.yml
index 5466129..143b665 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -24,4 +24,4 @@ node_js:
 install:
   - npm install -g bower
 
-script: mvn clean verify
+script: mvn clean verify -q

http://git-wip-us.apache.org/repos/asf/incubator-griffin/blob/2a69f4fd/service/src/test/resources/application-test.properties
----------------------------------------------------------------------
diff --git a/service/src/test/resources/application-test.properties b/service/src/test/resources/application-test.properties
deleted file mode 100644
index ea9d83d..0000000
--- a/service/src/test/resources/application-test.properties
+++ /dev/null
@@ -1,82 +0,0 @@
-#
-# Licensed to the Apache Software Foundation (ASF) under one
-# or more contributor license agreements.  See the NOTICE file
-# distributed with this work for additional information
-# regarding copyright ownership.  The ASF licenses this file
-# to you under the Apache License, Version 2.0 (the
-# "License"); you may not use this file except in compliance
-# with the License.  You may obtain a copy of the License at
-# 
-#   http://www.apache.org/licenses/LICENSE-2.0
-# 
-# Unless required by applicable law or agreed to in writing,
-# software distributed under the License is distributed on an
-# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied.  See the License for the
-# specific language governing permissions and limitations
-# under the License.
-#
-
-
-#spring.datasource.url= jdbc:mysql://localhost:3306/griffintest?autoReconnect=true&useSSL=false
-#spring.datasource.username =root
-#spring.datasource.password =cxr123
-#
-#spring.datasource.driver-class-name=com.mysql.jdbc.Driver
-#
-### Hibernate ddl auto (validate,create, create-drop, update)
-#
-#spring.jpa.hibernate.ddl-auto = update
-#spring.jpa.show-sql=true
-#spring.jpa.properties.hibernate.dialect=org.hibernate.dialect.MySQL5Dialect
-#
-##spring.jpa.hibernate.ddl-auto = create-drop
-##spring.jpa.database = HSQL
-##spring.jpa.properties.hibernate.dialect = org.hibernate.dialect.HSQLDialect
-##spring.datasource.driverClassName = org.hsqldb.jdbcDriver
-##spring.datasource.url: jdbc:hsqldb:mem:scratchdb
-##spring.datasource.username = sa
-##spring.datasource.password =
-
-#spring.jpa.database: HSQL
-#
-##
-##
-### Naming strategy
-#spring.jpa.hibernate.naming-strategy = org.hibernate.cfg.ImprovedNamingStrategy
-#
-# hive metastore
-#hive.metastore.uris = thrift://10.9.246.187:9083
-#hive.metastore.dbname = default
-#
-## kafka schema registry
-#kafka.schema.registry.url = http://10.65.159.119:8081
-
-key=test
-
-spring.datasource.url= jdbc:mysql://localhost:3306/quartz?autoReconnect=true&useSSL=false
-spring.datasource.username =griffin
-spring.datasource.password =123456
-
-spring.datasource.driver-class-name=com.mysql.jdbc.Driver
-
-## Hibernate ddl auto (validate,create, create-drop, update)
-
-spring.jpa.hibernate.ddl-auto = update
-spring.jpa.show-sql=true
-spring.jpa.properties.hibernate.dialect=org.hibernate.dialect.MySQL5Dialect
-#
-#
-## Naming strategy
-spring.jpa.hibernate.naming-strategy = org.hibernate.cfg.ImprovedNamingStrategy
-
-# hive metastore
-hive.metastore.uris = thrift://10.9.246.187:9083
-hive.metastore.dbname = default
-
-# kafka schema registry
-kafka.schema.registry.url = http://10.65.159.119:8081
-
-#logging level
-logging.level.org.springframework=DEBUG
-logging.level.org.hibernate=ERROR
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/incubator-griffin/blob/2a69f4fd/service/src/test/resources/application.properties
----------------------------------------------------------------------
diff --git a/service/src/test/resources/application.properties b/service/src/test/resources/application.properties
index 755e449..d6c7851 100644
--- a/service/src/test/resources/application.properties
+++ b/service/src/test/resources/application.properties
@@ -42,4 +42,5 @@ kafka.schema.registry.url = http://10.65.159.119:8081
 logging.level.root=ERROR
 logging.level.org.hibernate=ERROR
 logging.level.org.springframework.test=ERROR
+logging.level.org.apache.griffin=ERROR
 logging.file=target/test.log
\ No newline at end of file


[28/31] incubator-griffin git commit: Merge branch 'master' of https://github.com/apache/incubator-griffin

Posted by gu...@apache.org.
Merge branch 'master' of https://github.com/apache/incubator-griffin


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

Branch: refs/heads/griffin-0.1.6-incubating-rc1
Commit: fb2a4661e5150257e48019ab0b89621047dda665
Parents: 9917834 4a998d4
Author: William Guo <gu...@icloud.com>
Authored: Tue Oct 31 16:35:30 2017 +0800
Committer: William Guo <gu...@icloud.com>
Committed: Tue Oct 31 16:35:30 2017 +0800

----------------------------------------------------------------------
 griffin-doc/postman/griffin.json                |  4 +-
 service/pom.xml                                 | 24 ------
 .../griffin/core/config/SwaggerConfig.java      | 62 ----------------
 .../core/info/GriffinInfoController.java        |  4 -
 .../apache/griffin/core/job/JobController.java  | 25 ++-----
 .../apache/griffin/core/job/JobServiceImpl.java | 20 ++---
 .../apache/griffin/core/job/SparkSubmitJob.java |  2 +-
 .../griffin/core/job/entity/SparkJobDO.java     | 29 --------
 .../griffin/core/job/repo/JobInstanceRepo.java  |  2 +-
 .../griffin/core/login/LoginController.java     |  7 --
 .../griffin/core/measure/MeasureController.java | 22 ++----
 .../core/measure/MeasureOrgController.java      | 29 ++------
 .../griffin/core/measure/MeasureOrgService.java | 32 ++++++++
 .../core/measure/MeasureOrgServiceImpl.java     | 57 +++++++++++++++
 .../griffin/core/measure/entity/DataSource.java |  2 -
 .../metastore/hive/HiveMetaStoreController.java | 22 ++----
 .../hive/HiveMetaStoreServiceImpl.java          | 15 ++--
 .../metastore/kafka/KafkaSchemaController.java  |  4 -
 .../griffin/core/metric/MetricController.java   |  9 +--
 .../core/measure/MeasureOrgControllerTest.java  | 16 ++--
 .../core/measure/MeasureOrgServiceImplTest.java | 77 ++++++++++++++++++++
 21 files changed, 224 insertions(+), 240 deletions(-)
----------------------------------------------------------------------



[24/31] incubator-griffin git commit: ignore some dev config files for license check

Posted by gu...@apache.org.
ignore some dev config files for license check


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

Branch: refs/heads/griffin-0.1.6-incubating-rc1
Commit: c1c2f275421bde033d5becd48e752de15157e31a
Parents: b9d0446
Author: William Guo <gu...@icloud.com>
Authored: Mon Oct 30 16:19:58 2017 +0800
Committer: William Guo <gu...@icloud.com>
Committed: Mon Oct 30 16:19:58 2017 +0800

----------------------------------------------------------------------
 pom.xml | 5 +++++
 1 file changed, 5 insertions(+)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-griffin/blob/c1c2f275/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index 5189299..e0dcc83 100644
--- a/pom.xml
+++ b/pom.xml
@@ -155,6 +155,11 @@ under the License.
                                 <exclude>**/velocity.log*</exclude>
                                 <exclude>**/*.json</exclude>
                                 <exclude>**/bower_components/**</exclude>
+                                <exclude>**/node_modules/**</exclude>
+                                <exclude>**/.tmp/**</exclude>
+                                <exclude>**/angular/src/assets/.gitkeep</exclude>
+                                <exclude>**/angular/.editorconfig</exclude>
+                                <exclude>**/dist/**</exclude>
                                 <exclude>**/.bowerrc</exclude>
                                 <exclude>**/src/main/resources/public/**</exclude>
                                 <exclude>**/pom.xml.releaseBackup</exclude>


[02/31] incubator-griffin git commit: add bower in ci

Posted by gu...@apache.org.
add bower in ci


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

Branch: refs/heads/griffin-0.1.6-incubating-rc1
Commit: 6b59bed8f095e80a48f588f0f04f23049bbda0c6
Parents: ad858d9
Author: William Guo <gu...@icloud.com>
Authored: Thu Jul 20 12:52:45 2017 +0800
Committer: William Guo <gu...@icloud.com>
Committed: Thu Jul 20 12:52:45 2017 +0800

----------------------------------------------------------------------
 .travis.yml | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-griffin/blob/6b59bed8/.travis.yml
----------------------------------------------------------------------
diff --git a/.travis.yml b/.travis.yml
index 8001116..73f9285 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -11,10 +11,15 @@
 # or implied. See the License for the specific language governing permissions and limitations under
 # the License.
 
-language: java scala
+language: java scala node_js
+
 jdk:
   - oraclejdk8
 scala:
   - 2.10.6
+node_js:
+  - "6"
 
+before_script:
+  - 'npm install -g bower'
 script: mvn clean verify


[20/31] incubator-griffin git commit: fix conflict

Posted by gu...@apache.org.
fix conflict


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

Branch: refs/heads/griffin-0.1.6-incubating-rc1
Commit: d3fcc258b7e27a15fb4a4c313d2256d19fe1972c
Parents: 20f358e ed063d9
Author: William Guo <gu...@icloud.com>
Authored: Mon Oct 30 14:31:15 2017 +0800
Committer: William Guo <gu...@icloud.com>
Committed: Mon Oct 30 14:31:15 2017 +0800

----------------------------------------------------------------------
 .gitignore                                      |    1 +
 README.md                                       |   22 +-
 griffin-doc/docker/svc_msr/docker-compose.yml   |   25 +
 griffin-doc/dsl-guide.md                        |  110 +-
 griffin-doc/measure-batch-sample.md             |  140 +
 griffin-doc/measure-configuration-guide.md      |  211 ++
 griffin-doc/measure-demo-docker.md              |   63 +
 griffin-doc/measure-streaming-sample-old.md     |  204 ++
 griffin-doc/measure-streaming-sample.md         |  204 --
 griffin-doc/postman/griffin.json                | 2534 ++++++++++++++++++
 griffin-doc/postman/griffin_environment.json    |   16 +
 measure/pom.xml                                 |    6 +
 measure/src/main/resources/config.json          |    1 -
 measure/src/main/resources/env.json             |   17 +-
 .../measure/config/params/env/EmailParam.scala  |   36 +
 .../measure/config/params/env/EnvParam.scala    |   10 +-
 .../measure/config/params/env/SMSParam.scala    |   36 +
 .../batch/HiveBatchDataConnector.scala          |   32 +-
 .../batch/TextDirBatchDataConnector.scala       |    2 +-
 .../measure/rule/dsl/parser/BasicParser.scala   |   63 +-
 .../apache/griffin/measure/util/MailUtil.java   |   72 +
 .../apache/griffin/measure/util/Md5Util.java    |   56 +
 .../griffin/measure/util/MessageUtil.java       |  178 ++
 .../config-test-accuracy-streaming-multids.json |    2 -
 .../config-test-accuracy-streaming.json         |    2 -
 .../measure/data/connector/ConnectorTest.scala  |   26 +
 .../rule/dsl/parser/BasicParserTest.scala       |    7 +-
 .../griffin/core/common/CacheEvictor.java       |    7 +
 .../griffin/core/config/SwaggerConfig.java      |   34 +
 .../core/config/jobConfig/SchedulerConfig.java  |    5 +-
 .../core/config/jobConfig/SparkJobConfig.java   |    5 +-
 .../core/info/GriffinInfoController.java        |   38 +
 .../apache/griffin/core/job/JobController.java  |   31 +-
 .../apache/griffin/core/job/JobServiceImpl.java |  183 +-
 .../apache/griffin/core/job/SparkSubmitJob.java |   56 +-
 .../griffin/core/job/entity/JobInstance.java    |    6 +-
 .../griffin/core/job/entity/JobRequestBody.java |   21 +-
 .../griffin/core/job/repo/JobInstanceRepo.java  |    7 +-
 .../griffin/core/login/LoginController.java     |   10 +-
 .../griffin/core/measure/MeasureController.java |   26 +-
 .../core/measure/MeasureOrgController.java      |   72 +
 .../griffin/core/measure/MeasureService.java    |    2 +-
 .../core/measure/MeasureServiceImpl.java        |   15 +-
 .../measure/entity/AbstractAuditableEntity.java |  100 +
 .../core/measure/entity/AuditableEntity.java    |   96 -
 .../core/measure/entity/DataConnector.java      |   10 +-
 .../griffin/core/measure/entity/DataSource.java |    6 +-
 .../core/measure/entity/EvaluateRule.java       |    4 +-
 .../griffin/core/measure/entity/Measure.java    |    6 +-
 .../griffin/core/measure/entity/Rule.java       |    4 +-
 .../core/measure/repo/DataSourceRepo.java       |   26 -
 .../griffin/core/measure/repo/RuleRepo.java     |   26 -
 .../metastore/hive/HiveMetaStoreController.java |   39 +-
 .../metastore/hive/HiveMetaStoreService.java    |    1 -
 .../hive/HiveMetaStoreServiceImpl.java          |   26 +-
 .../metastore/kafka/KafkaSchemaController.java  |    6 +-
 .../metastore/kafka/KafkaSchemaServiceImpl.java |    4 +-
 .../griffin/core/metric/MetricController.java   |    9 +-
 .../griffin/core/service/GriffinController.java |   77 -
 .../core/util/GriffinOperationMessage.java      |    6 +-
 .../apache/griffin/core/util/GriffinUtil.java   |   77 -
 .../org/apache/griffin/core/util/JsonUtil.java  |   77 +
 .../griffin/core/util/PropertiesUtil.java       |   45 +
 .../src/main/resources/application.properties   |    2 +-
 service/src/main/resources/sparkJob.properties  |    3 +-
 .../core/info/GriffinInfoControllerTest.java    |   48 +
 .../griffin/core/job/JobControllerTest.java     |   18 +-
 .../griffin/core/job/JobServiceImplTest.java    |   34 +-
 .../griffin/core/job/SparkSubmitJobTest.java    |    8 +-
 .../core/measure/MeasureControllerTest.java     |   43 +-
 .../core/measure/MeasureOrgControllerTest.java  |   84 +
 .../core/measure/MeasureServiceImplTest.java    |    4 +-
 .../hive/HiveMetaStoreControllerTest.java       |   30 +-
 .../core/metric/MetricControllerTest.java       |    3 +-
 .../core/service/GriffinControllerTest.java     |   81 -
 .../griffin/core/util/GriffinUtilTest.java      |   17 +-
 .../org/apache/griffin/core/util/URLHelper.java |   24 +
 ui/angular/src/app/app.component.html           |    7 +-
 ui/angular/src/app/app.component.ts             |  121 +-
 ui/angular/src/app/app.module.ts                |    8 +-
 ui/angular/src/app/job/job.component.css        |    3 +
 ui/angular/src/app/job/job.component.html       |    6 +-
 ui/angular/src/app/job/job.component.ts         |    4 +-
 ui/angular/src/app/login/login.component.ts     |   87 +-
 .../src/app/measure/measure.component.css       |    3 +
 .../src/app/measure/measure.component.html      |    2 +-
 ui/angular/src/app/measure/measure.component.ts |    8 +-
 ui/angular/src/app/service/service.service.ts   |   43 +-
 ui/angular/src/app/service/user.service.spec.ts |   15 +
 ui/angular/src/app/service/user.service.ts      |   44 +
 90 files changed, 4912 insertions(+), 1077 deletions(-)
----------------------------------------------------------------------



[30/31] incubator-griffin git commit: Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/incubator-griffin

Posted by gu...@apache.org.
Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/incubator-griffin


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

Branch: refs/heads/griffin-0.1.6-incubating-rc1
Commit: 23ff65fcd1577cfeb18b52892793c71cd88f47d0
Parents: 458d56d 509640f
Author: William Guo <gu...@icloud.com>
Authored: Wed Nov 1 10:43:42 2017 +0800
Committer: William Guo <gu...@icloud.com>
Committed: Wed Nov 1 10:43:42 2017 +0800

----------------------------------------------------------------------

----------------------------------------------------------------------



[09/31] incubator-griffin git commit: merge

Posted by gu...@apache.org.
merge


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

Branch: refs/heads/griffin-0.1.6-incubating-rc1
Commit: cbeaaedc5c9be381420498ad8e17758a81cb33fe
Parents: 2a69f4f f7cf615
Author: William Guo <gu...@icloud.com>
Authored: Thu Jul 20 15:21:47 2017 +0800
Committer: William Guo <gu...@icloud.com>
Committed: Thu Jul 20 15:21:47 2017 +0800

----------------------------------------------------------------------

----------------------------------------------------------------------



[14/31] incubator-griffin git commit: Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/incubator-griffin

Posted by gu...@apache.org.
Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/incubator-griffin


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

Branch: refs/heads/griffin-0.1.6-incubating-rc1
Commit: f8d68aef6b10d046bc099b506528f97f0b850836
Parents: c16cbc2 5464ba5
Author: William Guo <gu...@icloud.com>
Authored: Mon Aug 28 17:44:15 2017 +0800
Committer: William Guo <gu...@icloud.com>
Committed: Mon Aug 28 17:44:15 2017 +0800

----------------------------------------------------------------------
 ui/index.html                           |  2 +-
 ui/js/controllers/createrule-ac-ctrl.js |  9 ++++---
 ui/js/controllers/mydashboard-ctrl.js   | 38 ++++++++++++++--------------
 ui/js/controllers/sidebar-ctrl.js       |  2 +-
 ui/js/routes.js                         |  6 +++--
 ui/js/services/bark-chart.js            |  5 +++-
 6 files changed, 34 insertions(+), 28 deletions(-)
----------------------------------------------------------------------



[21/31] incubator-griffin git commit: Merge branch 'master' of https://github.com/apache/incubator-griffin

Posted by gu...@apache.org.
Merge branch 'master' of https://github.com/apache/incubator-griffin


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

Branch: refs/heads/griffin-0.1.6-incubating-rc1
Commit: e8315a2261a6bfaea3a7aa996d20dcea4ef5866a
Parents: d3fcc25 edac09a
Author: William Guo <gu...@icloud.com>
Authored: Mon Oct 30 14:35:56 2017 +0800
Committer: William Guo <gu...@icloud.com>
Committed: Mon Oct 30 14:35:56 2017 +0800

----------------------------------------------------------------------

----------------------------------------------------------------------



[04/31] incubator-griffin git commit: Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/incubator-griffin

Posted by gu...@apache.org.
Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/incubator-griffin


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

Branch: refs/heads/griffin-0.1.6-incubating-rc1
Commit: b05622460daa9810ab2233f2ffc189cb8ccd9190
Parents: 775bd01 0d98e0e
Author: William Guo <gu...@icloud.com>
Authored: Thu Jul 20 13:09:16 2017 +0800
Committer: William Guo <gu...@icloud.com>
Committed: Thu Jul 20 13:09:16 2017 +0800

----------------------------------------------------------------------

----------------------------------------------------------------------



[11/31] incubator-griffin git commit: Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/incubator-griffin

Posted by gu...@apache.org.
Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/incubator-griffin


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

Branch: refs/heads/griffin-0.1.6-incubating-rc1
Commit: 290a020f51339a4f7698be8ec9a2074921dc8f0a
Parents: a94989d e486f75
Author: William Guo <gu...@icloud.com>
Authored: Fri Jul 21 13:14:50 2017 +0800
Committer: William Guo <gu...@icloud.com>
Committed: Fri Jul 21 13:14:50 2017 +0800

----------------------------------------------------------------------
 .../griffin/core/GriffinWebApplication.java     |   2 +
 .../apache/griffin/core/common/JsonConvert.java |  59 +++++++
 .../griffin/core/common/PropertiesOperate.java  |  37 +++++
 .../core/metastore/HiveMetastoreProxy.java      |   4 +-
 .../AutowiringSpringBeanJobFactory.java         |  45 ------
 .../org/apache/griffin/core/schedule/Conf.java  |  35 -----
 .../apache/griffin/core/schedule/JobHealth.java |  56 -------
 .../core/schedule/Repo/ScheduleStateRepo.java   |  37 -----
 .../griffin/core/schedule/ScheduleResult.java   |  88 -----------
 .../griffin/core/schedule/ScheduleState.java    | 100 ------------
 .../griffin/core/schedule/SchedulerConfig.java  |  63 --------
 .../core/schedule/SchedulerController.java      |   7 +-
 .../griffin/core/schedule/SchedulerService.java |   8 +-
 .../core/schedule/SchedulerServiceImpl.java     |  95 ++++++++++--
 .../griffin/core/schedule/SparkJobDO.java       | 150 ------------------
 .../griffin/core/schedule/SparkSubmitJob.java   |  85 +++++------
 .../griffin/core/schedule/entity/JobHealth.java |  56 +++++++
 .../core/schedule/entity/JobInstance.java       | 100 ++++++++++++
 .../core/schedule/entity/SparkJobDO.java        | 152 +++++++++++++++++++
 .../AutowiringSpringBeanJobFactory.java         |  45 ++++++
 .../core/schedule/quartzConfig/Conf.java        |  35 +++++
 .../schedule/quartzConfig/SchedulerConfig.java  |  63 ++++++++
 .../core/schedule/repo/JobInstanceRepo.java     |  59 +++++++
 .../main/resources/application-dev.properties   |   2 +
 .../src/main/resources/application.properties   |   4 +-
 .../core/schedule/SchedulerControllerTest.java  |   6 +-
 .../core/schedule/SchedulerServiceImplTest.java |  34 +++--
 .../core/schedule/SparkSubmitJobTest.java       |  19 +--
 28 files changed, 784 insertions(+), 662 deletions(-)
----------------------------------------------------------------------



[17/31] incubator-griffin git commit: Merge branch 'master' of https://github.com/apache/incubator-griffin

Posted by gu...@apache.org.
Merge branch 'master' of https://github.com/apache/incubator-griffin


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

Branch: refs/heads/griffin-0.1.6-incubating-rc1
Commit: 3133ec0a4c8db207f0fc256a938ea489a3f03b40
Parents: 38f37b6 ac8351f
Author: William Guo <gu...@icloud.com>
Authored: Tue Sep 5 15:56:59 2017 +0800
Committer: William Guo <gu...@icloud.com>
Committed: Tue Sep 5 15:56:59 2017 +0800

----------------------------------------------------------------------
 .../griffin/core/common/CacheEvictor.java       |  2 +-
 .../core/measure/MeasureServiceImpl.java        |  8 +--
 .../metastore/hive/HiveMetastoreController.java | 17 +------
 .../metastore/hive/HiveMetastoreService.java    |  2 +-
 .../hive/HiveMetastoreServiceImpl.java          |  3 +-
 .../metastore/kafka/KafkaSchemaController.java  |  2 +-
 .../griffin/core/metric/MetricController.java   |  6 +--
 .../main/resources/application-dev.properties   |  2 +-
 .../src/main/resources/application.properties   |  2 +-
 service/src/main/resources/sparkJob.properties  | 12 ++---
 .../griffin/core/job/SparkSubmitJobTest.java    | 12 ++---
 .../core/measure/MeasureServiceImplTest.java    | 52 ++++++++++----------
 .../hive/HiveMetastoreControllerTest.java       | 27 ++--------
 .../hive/HiveMetastoreServiceImplTest.java      |  4 +-
 .../kafka/KafkaSchemaServiceImplTest.java       | 29 ++++-------
 .../core/metric/MetricControllerTest.java       |  2 +-
 .../src/test/resources/application.properties   |  4 +-
 ui/js/services/services.js                      |  2 +-
 18 files changed, 69 insertions(+), 119 deletions(-)
----------------------------------------------------------------------



[22/31] incubator-griffin git commit: Merge branch 'master' of https://github.com/apache/incubator-griffin

Posted by gu...@apache.org.
Merge branch 'master' of https://github.com/apache/incubator-griffin


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

Branch: refs/heads/griffin-0.1.6-incubating-rc1
Commit: 215c8b437b5fe60a4a0a1fd43fb93ecfb0ed03e3
Parents: e8315a2 0dd1d35
Author: William Guo <gu...@icloud.com>
Authored: Mon Oct 30 14:56:29 2017 +0800
Committer: William Guo <gu...@icloud.com>
Committed: Mon Oct 30 14:56:29 2017 +0800

----------------------------------------------------------------------
 griffin-doc/docker/svc_msr/docker-compose.yml | 17 +++++++++++++++++
 1 file changed, 17 insertions(+)
----------------------------------------------------------------------



[25/31] incubator-griffin git commit: Merge branch 'master' of https://github.com/apache/incubator-griffin

Posted by gu...@apache.org.
Merge branch 'master' of https://github.com/apache/incubator-griffin


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

Branch: refs/heads/griffin-0.1.6-incubating-rc1
Commit: c4021738845b5248cecd8d2ad2b787f0dfa86007
Parents: c1c2f27 779783a
Author: William Guo <gu...@icloud.com>
Authored: Mon Oct 30 16:22:20 2017 +0800
Committer: William Guo <gu...@icloud.com>
Committed: Mon Oct 30 16:22:20 2017 +0800

----------------------------------------------------------------------

----------------------------------------------------------------------



[15/31] incubator-griffin git commit: Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/incubator-griffin

Posted by gu...@apache.org.
Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/incubator-griffin


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

Branch: refs/heads/griffin-0.1.6-incubating-rc1
Commit: 06cd305866472ebc7e196472345fc074717f326d
Parents: f8d68ae 1cf0a99
Author: William Guo <gu...@icloud.com>
Authored: Mon Aug 28 18:29:09 2017 +0800
Committer: William Guo <gu...@icloud.com>
Committed: Mon Aug 28 18:29:09 2017 +0800

----------------------------------------------------------------------
 .gitignore                                      |   5 +
 merge_pr.py                                     |   0
 service/pom.xml                                 |  44 ++-
 .../griffin/core/GriffinWebApplication.java     |   4 +-
 .../griffin/core/common/CacheEvictor.java       |  18 +
 .../apache/griffin/core/common/JsonConvert.java |  77 ----
 .../griffin/core/common/PropertiesOperate.java  |  54 ---
 .../griffin/core/common/SimpleCORSFilter.java   |   8 -
 .../apache/griffin/core/config/CacheConfig.java |   9 +
 .../griffin/core/config/SwaggerConfig.java      |   9 +
 .../AutowiringSpringBeanJobFactory.java         |  54 +++
 .../core/config/jobConfig/SchedulerConfig.java  |  58 +++
 .../core/config/jobConfig/SparkJobConfig.java   |  37 ++
 .../core/error/exception/GriffinException.java  |  41 ++
 .../exception/RuntimeExceptionHandler.java      |  65 ++++
 .../apache/griffin/core/job/JobController.java  |  73 ++++
 .../org/apache/griffin/core/job/JobService.java |  44 +++
 .../apache/griffin/core/job/JobServiceImpl.java | 378 +++++++++++++++++++
 .../apache/griffin/core/job/SparkSubmitJob.java | 254 +++++++++++++
 .../griffin/core/job/entity/JobHealth.java      |  49 +++
 .../griffin/core/job/entity/JobInstance.java    | 114 ++++++
 .../griffin/core/job/entity/JobRequestBody.java | 108 ++++++
 .../core/job/entity/LivySessionStates.java      |  93 +++++
 .../griffin/core/job/entity/SparkJobDO.java     | 181 +++++++++
 .../griffin/core/job/repo/JobInstanceRepo.java  |  67 ++++
 .../griffin/core/measure/AuditableEntity.java   |  86 -----
 .../griffin/core/measure/DataConnector.java     | 137 -------
 .../griffin/core/measure/EvaluateRule.java      |  56 ---
 .../apache/griffin/core/measure/Measure.java    | 136 -------
 .../griffin/core/measure/MeasureController.java |  51 +--
 .../griffin/core/measure/MeasureService.java    |  23 +-
 .../core/measure/MeasureServiceImpl.java        |  99 +++--
 .../core/measure/entity/AuditableEntity.java    |  86 +++++
 .../core/measure/entity/DataConnector.java      | 126 +++++++
 .../core/measure/entity/EvaluateRule.java       |  61 +++
 .../griffin/core/measure/entity/Measure.java    | 165 ++++++++
 .../core/measure/repo/DataConnectorRepo.java    |   2 +-
 .../core/measure/repo/EvaluateRuleRepo.java     |   2 +-
 .../griffin/core/measure/repo/MeasureRepo.java  |  16 +-
 .../core/metastore/HiveMetastoreController.java |  74 ----
 .../core/metastore/HiveMetastoreProxy.java      |  66 ----
 .../core/metastore/HiveMetastoreService.java    |  41 --
 .../metastore/HiveMetastoreServiceImpl.java     | 157 --------
 .../core/metastore/KafkaSchemaController.java   |  67 ----
 .../core/metastore/KafkaSchemaService.java      |  39 --
 .../core/metastore/KafkaSchemaServiceImpl.java  | 144 -------
 .../metastore/hive/HiveMetastoreController.java |  73 ++++
 .../core/metastore/hive/HiveMetastoreProxy.java |  78 ++++
 .../metastore/hive/HiveMetastoreService.java    |  39 ++
 .../hive/HiveMetastoreServiceImpl.java          | 155 ++++++++
 .../metastore/kafka/KafkaSchemaController.java  |  65 ++++
 .../metastore/kafka/KafkaSchemaService.java     |  39 ++
 .../metastore/kafka/KafkaSchemaServiceImpl.java | 107 ++++++
 .../griffin/core/metric/MetricController.java   |  16 +-
 .../griffin/core/metric/MetricService.java      |   2 +-
 .../core/schedule/SchedulerController.java      |  79 ----
 .../core/schedule/SchedulerRequestBody.java     | 106 ------
 .../griffin/core/schedule/SchedulerService.java |  46 ---
 .../core/schedule/SchedulerServiceImpl.java     | 302 ---------------
 .../griffin/core/schedule/SparkSubmitJob.java   | 256 -------------
 .../griffin/core/schedule/entity/JobHealth.java |  56 ---
 .../core/schedule/entity/JobInstance.java       | 100 -----
 .../core/schedule/entity/SparkJobDO.java        | 152 --------
 .../AutowiringSpringBeanJobFactory.java         |  45 ---
 .../core/schedule/quartzConfig/Conf.java        |  35 --
 .../schedule/quartzConfig/SchedulerConfig.java  |  63 ----
 .../core/schedule/repo/JobInstanceRepo.java     |  59 ---
 .../griffin/core/service/GriffinController.java |  34 +-
 .../core/util/GriffinOperationMessage.java      |  50 ++-
 .../apache/griffin/core/util/GriffinUtil.java   |  80 ++++
 .../main/resources/application-dev.properties   |  15 +-
 .../src/main/resources/application.properties   |  15 +-
 service/src/main/resources/sparkJob.properties  |  21 +-
 .../griffin/core/job/JobControllerTest.java     | 128 +++++++
 .../griffin/core/job/JobInstanceRepoTest.java   |  42 +++
 .../griffin/core/job/JobServiceImplTest.java    | 222 +++++++++++
 .../griffin/core/job/SparkSubmitJobTest.java    | 233 ++++++++++++
 .../core/measure/MeasureControllerTest.java     |  63 ++--
 .../griffin/core/measure/MeasureRepoTest.java   | 106 ++++++
 .../core/measure/MeasureServiceImplTest.java    |  71 ++--
 .../core/measure/repo/MeasureRepoTest.java      |   6 +-
 .../metastore/HiveMetastoreControllerTest.java  | 114 ------
 .../metastore/HiveMetastoreServiceImplTest.java | 162 --------
 .../metastore/KafkaSchemaControllerTest.java    | 108 ------
 .../metastore/KafkaSchemaServiceImplTest.java   | 115 ------
 .../hive/HiveMetastoreControllerTest.java       | 118 ++++++
 .../hive/HiveMetastoreServiceImplTest.java      | 167 ++++++++
 .../kafka/KafkaSchemaControllerTest.java        | 110 ++++++
 .../kafka/KafkaSchemaServiceImplTest.java       | 151 ++++++++
 .../core/metric/MetricControllerTest.java       |   2 +-
 .../core/schedule/SchedulerControllerTest.java  | 122 ------
 .../core/schedule/SchedulerServiceImplTest.java | 207 ----------
 .../core/schedule/SparkSubmitJobTest.java       | 187 ---------
 .../core/service/GriffinControllerTest.java     |  10 +-
 .../griffin/core/util/GriffinUtilTest.java      |  71 ++++
 service/src/test/resources/Init_quartz-h2.sql   | 190 ++++++++++
 .../src/test/resources/application.properties   |  21 +-
 service/src/test/resources/quartz-test.sql      |  26 ++
 service/src/test/resources/sparkJob.properties  |  52 +++
 service/src/test/resources/test.sql             |  25 ++
 ui/bower.json                                   |   1 +
 ui/css/main.css                                 |  75 +++-
 ui/img/logo.png                                 | Bin 0 -> 20582 bytes
 ui/img/spinner.gif                              | Bin 0 -> 5860 bytes
 ui/index.html                                   |  12 +-
 ui/js/bs.js                                     |   3 +-
 ui/js/controllers/createjob-ac-ctrl.js          | 168 +++++----
 ui/js/controllers/createrule-ac-ctrl.js         | 232 +++---------
 ui/js/controllers/dataassets-ctrl.js            |  27 +-
 ui/js/controllers/detail-ctrl.js                |   4 +-
 ui/js/controllers/health-ctrl.js                |  27 +-
 ui/js/controllers/job-ctrl.js                   | 261 ++++++-------
 ui/js/controllers/metrics-ctrl.js               |   2 +-
 ui/js/controllers/rule-ctrl.js                  |  19 +-
 ui/js/controllers/sidebar-ctrl.js               |  37 +-
 ui/js/controllers/viewrule-ctrl.js              |   9 +-
 ui/js/main.js                                   |   5 +
 ui/js/routes.js                                 |  12 +-
 ui/js/services/bark-chart.js                    |   2 +
 ui/js/services/services.js                      |  28 +-
 ui/login/login.html                             |   2 +-
 ui/login/login.js                               |   8 -
 ui/pages/dataassets/dataassets.html             |  15 +-
 ui/pages/health/health.html                     |   6 +
 ui/pages/jobs/confirmation-ac.html              |  12 +-
 ui/pages/jobs/createjob-ac.html                 |  46 ++-
 ui/pages/jobs/delete-confirm.html               |  10 +-
 ui/pages/jobs/jobs.html                         |  47 +--
 ui/pages/measures/measure.css                   |   2 +-
 ui/pages/measures/measures.html                 |  11 +-
 ui/sidebar.html                                 |  10 +-
 131 files changed, 5271 insertions(+), 4217 deletions(-)
----------------------------------------------------------------------



[12/31] incubator-griffin git commit: Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/incubator-griffin

Posted by gu...@apache.org.
Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/incubator-griffin


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

Branch: refs/heads/griffin-0.1.6-incubating-rc1
Commit: 56b6785d182ab7db0b7b4ce65def313283df675f
Parents: 290a020 df44514
Author: William Guo <gu...@icloud.com>
Authored: Fri Jul 21 15:02:05 2017 +0800
Committer: William Guo <gu...@icloud.com>
Committed: Fri Jul 21 15:02:05 2017 +0800

----------------------------------------------------------------------
 service/pom.xml                                  |  6 ------
 .../apache/griffin/core/common/JsonConvert.java  | 18 ++++++++++++++++++
 .../griffin/core/common/PropertiesOperate.java   | 19 ++++++++++++++++++-
 3 files changed, 36 insertions(+), 7 deletions(-)
----------------------------------------------------------------------



[18/31] incubator-griffin git commit: Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/incubator-griffin

Posted by gu...@apache.org.
Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/incubator-griffin


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

Branch: refs/heads/griffin-0.1.6-incubating-rc1
Commit: 1285468e98e8ae5f15d063cf78a2e440875d62e2
Parents: 3133ec0 42ee886
Author: William Guo <gu...@icloud.com>
Authored: Wed Oct 11 13:12:51 2017 +0800
Committer: William Guo <gu...@icloud.com>
Committed: Wed Oct 11 13:12:51 2017 +0800

----------------------------------------------------------------------
 .gitignore                                      |    3 +
 griffin-doc/dsl-guide.md                        |  103 ++
 measure/src/main/resources/config-old.json      |   31 +
 measure/src/main/resources/config-sql.json      |   54 +
 measure/src/main/resources/config.json          |   71 +-
 .../apache/griffin/measure/Application.scala    |  102 +-
 .../griffin/measure/algo/AccuracyAlgo.scala     |   24 -
 .../org/apache/griffin/measure/algo/Algo.scala  |   34 -
 .../griffin/measure/algo/MeasureType.scala      |   26 -
 .../griffin/measure/algo/ProcessType.scala      |   26 -
 .../griffin/measure/algo/ProfileAlgo.scala      |   23 -
 .../measure/algo/batch/BatchAccuracyAlgo.scala  |  190 ---
 .../measure/algo/batch/BatchProfileAlgo.scala   |  162 ---
 .../measure/algo/core/AccuracyCore.scala        |  103 --
 .../griffin/measure/algo/core/ProfileCore.scala |   73 --
 .../algo/streaming/StreamingAccuracyAlgo.scala  |  358 ------
 .../streaming/StreamingAccuracyProcess.scala    |  234 ----
 .../measure/algo/streaming/TimingProcess.scala  |   46 -
 .../measure/cache/info/TimeInfoCache.scala      |    2 +-
 .../cache/result/CacheResultProcesser.scala     |    2 +-
 .../config/params/user/DataCacheParam.scala     |   31 -
 .../config/params/user/DataConnectorParam.scala |    6 +-
 .../config/params/user/DataSourceParam.scala    |   31 +
 .../config/params/user/EvaluateRuleParam.scala  |    4 +-
 .../measure/config/params/user/UserParam.scala  |   10 +-
 .../measure/connector/DataConnector.scala       |   32 -
 .../connector/DataConnectorFactory.scala        |  139 ---
 .../connector/cache/CacheDataConnector.scala    |   33 -
 .../measure/connector/cache/DataCacheable.scala |   86 --
 .../measure/connector/cache/DataUpdatable.scala |   30 -
 .../cache/HiveCacheDataConnector.scala          |  351 ------
 .../cache/TextCacheDataConnector.scala          |  311 -----
 .../direct/AvroDirectDataConnector.scala        |  132 --
 .../connector/direct/DirectDataConnector.scala  |   34 -
 .../direct/HiveDirectDataConnector.scala        |  158 ---
 .../direct/KafkaCacheDirectDataConnector.scala  |  125 --
 .../StreamingCacheDirectDataConnector.scala     |   60 -
 .../streaming/KafkaStreamingDataConnector.scala |   58 -
 .../streaming/StreamingDataConnector.scala      |   34 -
 .../measure/data/connector/DataConnector.scala  |  114 ++
 .../data/connector/DataConnectorFactory.scala   |  150 +++
 .../batch/AvroBatchDataConnector.scala          |  112 ++
 .../connector/batch/BatchDataConnector.scala    |   35 +
 .../batch/HiveBatchDataConnector.scala          |  149 +++
 .../batch/KafkaCacheDirectDataConnector.scala   |  125 ++
 .../StreamingCacheDirectDataConnector.scala     |   60 +
 .../batch/TextDirBatchDataConnector.scala       |  136 +++
 .../connector/cache/CacheDataConnector.scala    |   33 +
 .../data/connector/cache/DataCacheable.scala    |   86 ++
 .../data/connector/cache/DataUpdatable.scala    |   30 +
 .../cache/HiveCacheDataConnector.scala          |  351 ++++++
 .../cache/TextCacheDataConnector.scala          |  311 +++++
 .../streaming/KafkaStreamingDataConnector.scala |   70 ++
 .../KafkaStreamingStringDataConnector.scala     |   65 +
 .../streaming/StreamingDataConnector.scala      |   43 +
 .../measure/data/source/DataCacheable.scala     |   76 ++
 .../measure/data/source/DataSource.scala        |  109 ++
 .../measure/data/source/DataSourceCache.scala   |  347 ++++++
 .../measure/data/source/DataSourceFactory.scala |   80 ++
 .../griffin/measure/persist/HdfsPersist.scala   |  240 ++--
 .../griffin/measure/persist/HttpPersist.scala   |   64 +-
 .../griffin/measure/persist/LoggerPersist.scala |  173 ++-
 .../griffin/measure/persist/MultiPersists.scala |   14 +-
 .../measure/persist/OldHttpPersist.scala        |  174 +--
 .../griffin/measure/persist/Persist.scala       |   24 +-
 .../measure/persist/PersistFactory.scala        |    4 +-
 .../apache/griffin/measure/process/Algo.scala   |   34 +
 .../measure/process/BatchDqProcess.scala        |  117 ++
 .../griffin/measure/process/DqProcess.scala     |   40 +
 .../griffin/measure/process/ProcessType.scala   |   47 +
 .../measure/process/StreamingDqProcess.scala    |  157 +++
 .../measure/process/StreamingDqThread.scala     |  185 +++
 .../griffin/measure/process/TimingProcess.scala |   46 +
 .../measure/process/check/DataChecker.scala     |   29 +
 .../process/engine/DataFrameOprEngine.scala     |  165 +++
 .../measure/process/engine/DqEngine.scala       |   41 +
 .../process/engine/DqEngineFactory.scala        |   47 +
 .../measure/process/engine/DqEngines.scala      |  208 ++++
 .../measure/process/engine/SparkDqEngine.scala  |  167 +++
 .../process/engine/SparkRowFormatter.scala      |   62 +
 .../measure/process/engine/SparkSqlEngine.scala |   58 +
 .../griffin/measure/rule/CalculationUtil.scala  |  315 -----
 .../measure/rule/DataTypeCalculationUtil.scala  |  159 ---
 .../griffin/measure/rule/ExprValueUtil.scala    |  263 ----
 .../griffin/measure/rule/RuleAnalyzer.scala     |   72 --
 .../griffin/measure/rule/RuleFactory.scala      |   52 -
 .../griffin/measure/rule/RuleParser.scala       |  244 ----
 .../measure/rule/SchemaValueCombineUtil.scala   |  187 ---
 .../measure/rule/adaptor/AdaptPhase.scala       |   25 +
 .../rule/adaptor/DataFrameOprAdaptor.scala      |   44 +
 .../rule/adaptor/GriffinDslAdaptor.scala        |  357 ++++++
 .../measure/rule/adaptor/RuleAdaptor.scala      |   72 ++
 .../measure/rule/adaptor/RuleAdaptorGroup.scala |  105 ++
 .../measure/rule/adaptor/SparkSqlAdaptor.scala  |   54 +
 .../griffin/measure/rule/dsl/DqType.scala       |   58 +
 .../griffin/measure/rule/dsl/DslType.scala      |   58 +
 .../griffin/measure/rule/dsl/PersistType.scala  |   58 +
 .../rule/dsl/analyzer/AccuracyAnalyzer.scala    |   41 +
 .../rule/dsl/analyzer/BasicAnalyzer.scala       |   53 +
 .../rule/dsl/analyzer/ProfilingAnalyzer.scala   |   52 +
 .../measure/rule/dsl/expr/AliasableExpr.scala   |   25 +
 .../rule/dsl/expr/ClauseExpression.scala        |  174 +++
 .../griffin/measure/rule/dsl/expr/Expr.scala    |   29 +
 .../measure/rule/dsl/expr/FunctionExpr.scala    |   29 +
 .../measure/rule/dsl/expr/LiteralExpr.scala     |   72 ++
 .../measure/rule/dsl/expr/LogicalExpr.scala     |  170 +++
 .../measure/rule/dsl/expr/MathExpr.scala        |   80 ++
 .../measure/rule/dsl/expr/SelectExpr.scala      |  115 ++
 .../measure/rule/dsl/expr/TreeNode.scala        |   45 +
 .../measure/rule/dsl/parser/BasicParser.scala   |  348 ++++++
 .../rule/dsl/parser/GriffinDslParser.scala      |   50 +
 .../measure/rule/expr/AnalyzableExpr.scala      |   24 -
 .../griffin/measure/rule/expr/Cacheable.scala   |   33 -
 .../measure/rule/expr/Calculatable.scala        |   25 -
 .../griffin/measure/rule/expr/ClauseExpr.scala  |  109 --
 .../measure/rule/expr/DataSourceable.scala      |   28 -
 .../griffin/measure/rule/expr/Describable.scala |   33 -
 .../apache/griffin/measure/rule/expr/Expr.scala |   53 -
 .../measure/rule/expr/ExprDescOnly.scala        |   40 -
 .../measure/rule/expr/ExprIdCounter.scala       |   60 -
 .../measure/rule/expr/FieldDescOnly.scala       |   58 -
 .../griffin/measure/rule/expr/LiteralExpr.scala |   83 --
 .../griffin/measure/rule/expr/LogicalExpr.scala |  178 ---
 .../griffin/measure/rule/expr/MathExpr.scala    |   99 --
 .../griffin/measure/rule/expr/SelectExpr.scala  |   88 --
 .../rule/func/DefaultFunctionDefine.scala       |   36 -
 .../measure/rule/func/FunctionDefine.scala      |   25 -
 .../measure/rule/func/FunctionUtil.scala        |   75 --
 .../rule/preproc/PreProcRuleGenerator.scala     |   72 ++
 .../measure/rule/step/ConcreteRuleStep.scala    |   37 +
 .../griffin/measure/rule/step/DfOprStep.scala   |   29 +
 .../measure/rule/step/GriffinDslStep.scala      |   28 +
 .../griffin/measure/rule/step/RuleStep.scala    |   31 +
 .../measure/rule/step/SparkSqlStep.scala        |   30 +
 .../griffin/measure/rule/udf/GriffinUdfs.scala  |   33 +
 .../measure/utils/HdfsFileDumpUtil.scala        |    2 +-
 .../apache/griffin/measure/utils/HdfsUtil.scala |   71 +-
 .../griffin/measure/utils/ParamUtil.scala       |  164 +++
 .../apache/griffin/measure/utils/TimeUtil.scala |    4 +-
 .../config-test-accuracy-streaming-multids.json |  144 +++
 .../config-test-accuracy-streaming.json         |  119 ++
 .../test/resources/config-test-accuracy.json    |   56 +
 .../config-test-profiling-streaming.json        |   68 ++
 .../test/resources/config-test-profiling.json   |   36 +
 measure/src/test/resources/config-test.json     |   55 +
 measure/src/test/resources/config-test1.json    |   96 ++
 measure/src/test/resources/config.json          |    2 +-
 measure/src/test/resources/env-streaming.json   |    1 +
 measure/src/test/resources/env-test.json        |   38 +
 measure/src/test/resources/test-data.jsonFile   |    3 +
 measure/src/test/resources/test-data0.json      |   56 +
 measure/src/test/resources/test-data1.jsonFile  |   31 +
 .../algo/batch/BatchAccuracyAlgoTest.scala      |  198 ---
 .../algo/batch/BatchProfileAlgoTest.scala       |  173 ---
 .../measure/algo/batch/DataFrameSaveTest.scala  |  172 ---
 .../measure/algo/core/AccuracyCoreTest.scala    |   89 --
 .../measure/algo/core/ProfileCoreTest.scala     |   79 --
 .../streaming/StreamingAccuracyAlgoTest.scala   |  267 -----
 .../reader/ParamRawStringReaderTest.scala       |    3 +-
 .../measure/connector/ConnectorTest.scala       |   70 --
 .../measure/data/connector/ConnectorTest.scala  |   71 ++
 .../measure/process/BatchProcessTest.scala      |  146 +++
 .../griffin/measure/process/JsonParseTest.scala |  531 ++++++++
 .../griffin/measure/process/JsonToStructs.scala |   85 ++
 .../measure/process/StreamingProcessTest.scala  |  147 +++
 .../measure/rule/ExprValueUtilTest.scala        |   86 --
 .../griffin/measure/rule/RuleAnalyzerTest.scala |   60 -
 .../griffin/measure/rule/RuleFactoryTest.scala  |   44 -
 .../griffin/measure/rule/RuleParserTest.scala   |  213 ----
 .../rule/adaptor/GriffinDslAdaptorTest.scala    |   65 +
 .../rule/dsl/parser/BasicParserTest.scala       |  219 ++++
 .../apache/griffin/measure/sql/SqlTest.scala    |  125 ++
 .../griffin/measure/utils/HdfsUtilTest.scala    |  132 ++
 .../griffin/measure/utils/JsonUtilTest.scala    |  120 +-
 .../griffin/measure/utils/ParamUtilTest.scala   |   50 +
 .../griffin/core/GriffinWebApplication.java     |   44 +-
 .../griffin/core/common/SimpleCORSFilter.java   |    7 +-
 .../griffin/core/config/SwaggerConfig.java      |    1 +
 .../AutowiringSpringBeanJobFactory.java         |   34 +-
 .../core/config/jobConfig/SparkJobConfig.java   |    3 -
 .../core/error/exception/GriffinException.java  |   32 +-
 .../exception/RuntimeExceptionHandler.java      |   50 +-
 .../apache/griffin/core/job/JobController.java  |   20 +-
 .../org/apache/griffin/core/job/JobService.java |    2 +-
 .../apache/griffin/core/job/JobServiceImpl.java |  223 ++--
 .../apache/griffin/core/job/SparkSubmitJob.java |  157 ++-
 .../griffin/core/job/entity/JobInstance.java    |   11 +-
 .../griffin/core/job/entity/JobRequestBody.java |    3 -
 .../core/job/entity/LivySessionStates.java      |   21 +-
 .../griffin/core/job/entity/SparkJobDO.java     |   60 +-
 .../griffin/core/job/repo/JobInstanceRepo.java  |   16 +-
 .../griffin/core/login/LoginController.java     |   49 +
 .../apache/griffin/core/login/LoginService.java |   35 +
 .../griffin/core/login/LoginServiceImpl.java    |  157 +++
 .../griffin/core/measure/MeasureController.java |   14 +-
 .../core/measure/MeasureServiceImpl.java        |   53 +-
 .../core/measure/entity/AuditableEntity.java    |   20 +-
 .../core/measure/entity/DataConnector.java      |   70 +-
 .../griffin/core/measure/entity/DataSource.java |   59 +
 .../core/measure/entity/EvaluateRule.java       |   41 +-
 .../griffin/core/measure/entity/Measure.java    |   76 +-
 .../griffin/core/measure/entity/Rule.java       |   75 ++
 .../core/measure/repo/DataConnectorRepo.java    |    2 -
 .../core/measure/repo/DataSourceRepo.java       |   26 +
 .../core/measure/repo/EvaluateRuleRepo.java     |    2 -
 .../griffin/core/measure/repo/MeasureRepo.java  |   19 +-
 .../griffin/core/measure/repo/RuleRepo.java     |   26 +
 .../metastore/hive/HiveMetaStoreController.java |   73 ++
 .../core/metastore/hive/HiveMetaStoreProxy.java |   78 ++
 .../metastore/hive/HiveMetaStoreService.java    |   39 +
 .../hive/HiveMetaStoreServiceImpl.java          |  162 +++
 .../metastore/hive/HiveMetastoreController.java |   60 -
 .../core/metastore/hive/HiveMetastoreProxy.java |   78 --
 .../metastore/hive/HiveMetastoreService.java    |   39 -
 .../hive/HiveMetastoreServiceImpl.java          |  154 ---
 .../metastore/kafka/KafkaSchemaController.java  |   14 +-
 .../metastore/kafka/KafkaSchemaServiceImpl.java |    2 +-
 .../griffin/core/metric/MetricController.java   |    6 +-
 .../griffin/core/metric/MetricServiceImpl.java  |    5 +-
 .../griffin/core/service/GriffinController.java |   57 +-
 .../core/util/GriffinOperationMessage.java      |   27 +-
 .../apache/griffin/core/util/GriffinUtil.java   |   39 +-
 .../src/main/resources/application.properties   |   12 +-
 .../griffin/core/job/JobControllerTest.java     |  109 +-
 .../griffin/core/job/JobInstanceRepoTest.java   |   97 +-
 .../griffin/core/job/JobServiceImplTest.java    |  298 +++--
 .../griffin/core/job/SparkSubmitJobTest.java    |  213 +---
 .../core/measure/MeasureControllerTest.java     |  163 +--
 .../griffin/core/measure/MeasureRepoTest.java   |  125 --
 .../core/measure/MeasureServiceImplTest.java    |  232 ++--
 .../griffin/core/measure/MeasureTestHelper.java |   55 +
 .../core/measure/repo/MeasureRepoTest.java      |   41 +-
 .../hive/HiveMetaStoreControllerTest.java       |  128 ++
 .../hive/HiveMetaStoreServiceImplTest.java      |  158 +++
 .../hive/HiveMetastoreControllerTest.java       |  101 --
 .../hive/HiveMetastoreServiceImplTest.java      |  167 ---
 .../kafka/KafkaSchemaControllerTest.java        |  220 ++--
 .../kafka/KafkaSchemaServiceImplTest.java       |  257 ++--
 .../core/metric/MetricControllerTest.java       |   22 +-
 .../core/metric/MetricServiceImplTest.java      |   23 +-
 .../core/service/GriffinControllerTest.java     |  104 +-
 .../griffin/core/util/GriffinUtilTest.java      |   47 +-
 service/src/test/resources/Init_quartz-h2.sql   |    1 -
 service/src/test/resources/sparkJob.properties  |   52 -
 service/src/test/resources/test.sql             |   88 +-
 ui/.bowerrc                                     |    4 -
 ui/angular/.angular-cli.json                    |   60 +
 ui/angular/.editorconfig                        |   13 +
 ui/angular/.gitignore                           |   43 +
 ui/angular/README.md                            |   28 +
 ui/angular/b3vHigh.jpg                          |  Bin 0 -> 555201 bytes
 ui/angular/karma.conf.js                        |   52 +
 ui/angular/package.json                         |   66 +
 ui/angular/protractor.conf.js                   |   46 +
 ui/angular/src/app/app.component.css            |  142 +++
 ui/angular/src/app/app.component.html           |  163 +++
 ui/angular/src/app/app.component.js             |   43 +
 ui/angular/src/app/app.component.spec.ts        |   50 +
 ui/angular/src/app/app.component.ts             |  151 +++
 ui/angular/src/app/app.module.js                |   65 +
 ui/angular/src/app/app.module.ts                |  158 +++
 .../src/app/dataasset/dataasset.component.css   |   32 +
 .../src/app/dataasset/dataasset.component.html  |  107 ++
 .../app/dataasset/dataasset.component.spec.ts   |   43 +
 .../src/app/dataasset/dataasset.component.ts    |   85 ++
 ui/angular/src/app/health/health.component.css  |   21 +
 ui/angular/src/app/health/health.component.html |   24 +
 .../src/app/health/health.component.spec.ts     |   43 +
 ui/angular/src/app/health/health.component.ts   |  345 ++++++
 .../app/job/create-job/create-job.component.css |   66 +
 .../job/create-job/create-job.component.html    |  252 ++++
 .../job/create-job/create-job.component.spec.ts |   43 +
 .../app/job/create-job/create-job.component.ts  |  229 ++++
 ui/angular/src/app/job/job.component.css        |   29 +
 ui/angular/src/app/job/job.component.html       |  192 +++
 ui/angular/src/app/job/job.component.spec.ts    |   43 +
 ui/angular/src/app/job/job.component.ts         |  165 +++
 ui/angular/src/app/login/login.component.css    |   83 ++
 ui/angular/src/app/login/login.component.html   |   88 ++
 .../src/app/login/login.component.spec.ts       |   43 +
 ui/angular/src/app/login/login.component.ts     |   31 +
 .../measure/create-measure/ac/ac.component.css  |  119 ++
 .../measure/create-measure/ac/ac.component.html |  467 ++++++++
 .../create-measure/ac/ac.component.spec.ts      |   43 +
 .../measure/create-measure/ac/ac.component.ts   |  594 +++++++++
 .../create-measure/create-measure.component.css |  123 ++
 .../create-measure.component.html               |  134 +++
 .../create-measure.component.spec.ts            |   43 +
 .../create-measure/create-measure.component.ts  |   52 +
 .../measure/create-measure/pr/pr.component.css  |  156 +++
 .../measure/create-measure/pr/pr.component.html |  392 ++++++
 .../create-measure/pr/pr.component.spec.ts      |   43 +
 .../measure/create-measure/pr/pr.component.ts   |  580 +++++++++
 .../measure-detail/measure-detail.component.css |   18 +
 .../measure-detail.component.html               |  105 ++
 .../measure-detail.component.spec.ts            |   43 +
 .../measure-detail/measure-detail.component.ts  |   70 ++
 .../src/app/measure/measure.component.css       |  367 ++++++
 .../src/app/measure/measure.component.html      |  149 +++
 .../src/app/measure/measure.component.spec.ts   |   44 +
 ui/angular/src/app/measure/measure.component.ts |  108 ++
 .../detail-metric/detail-metric.component.css   |   18 +
 .../detail-metric/detail-metric.component.html  |   28 +
 .../detail-metric.component.spec.ts             |   43 +
 .../detail-metric/detail-metric.component.ts    |  264 ++++
 ui/angular/src/app/metric/metric.component.css  |   36 +
 ui/angular/src/app/metric/metric.component.html |   60 +
 .../src/app/metric/metric.component.spec.ts     |   43 +
 ui/angular/src/app/metric/metric.component.ts   |  367 ++++++
 .../app/mydashboard/mydashboard.component.css   |   18 +
 .../app/mydashboard/mydashboard.component.html  |   18 +
 .../mydashboard/mydashboard.component.spec.ts   |   43 +
 .../app/mydashboard/mydashboard.component.ts    |   34 +
 .../src/app/service/chart.service.spec.ts       |   33 +
 ui/angular/src/app/service/chart.service.ts     |  333 +++++
 .../src/app/service/service.service.spec.ts     |   33 +
 ui/angular/src/app/service/service.service.ts   |  103 ++
 .../src/app/sidebar/sidebar.component.css       |  219 ++++
 .../src/app/sidebar/sidebar.component.html      |   84 ++
 .../src/app/sidebar/sidebar.component.spec.ts   |   43 +
 ui/angular/src/app/sidebar/sidebar.component.ts |  178 +++
 ui/angular/src/assets/.gitkeep                  |    0
 ui/angular/src/assets/img/1.PNG                 |  Bin 0 -> 13855 bytes
 ui/angular/src/assets/img/2.PNG                 |  Bin 0 -> 8562 bytes
 ui/angular/src/assets/img/b3vHigh.jpg           |  Bin 0 -> 555201 bytes
 ui/angular/src/assets/img/bollinger.png         |  Bin 0 -> 145323 bytes
 ui/angular/src/assets/img/construction.gif      |  Bin 0 -> 4853 bytes
 ui/angular/src/assets/img/favicon.ico           |  Bin 0 -> 9920 bytes
 ui/angular/src/assets/img/logo.gif              |  Bin 0 -> 5764 bytes
 ui/angular/src/assets/img/logo.png              |  Bin 0 -> 20582 bytes
 ui/angular/src/assets/img/mad.png               |  Bin 0 -> 47922 bytes
 ui/angular/src/assets/img/sidebar1.png          |  Bin 0 -> 1536 bytes
 ui/angular/src/assets/img/sidebar2.png          |  Bin 0 -> 1617 bytes
 ui/angular/src/assets/img/yoy.png               |  Bin 0 -> 28400 bytes
 ui/angular/src/environments/environment.js      |   27 +
 ui/angular/src/environments/environment.prod.ts |   21 +
 ui/angular/src/environments/environment.ts      |   26 +
 ui/angular/src/favicon.ico                      |  Bin 0 -> 9920 bytes
 ui/angular/src/index.html                       |   41 +
 ui/angular/src/main.js                          |   32 +
 ui/angular/src/main.ts                          |   35 +
 ui/angular/src/polyfills.ts                     |   90 ++
 ui/angular/src/styles.css                       | 1134 ++++++++++++++++++
 ui/angular/src/test.html                        |   41 +
 ui/angular/src/test.ts                          |   50 +
 ui/angular/src/tsconfig.app.json                |   13 +
 ui/angular/src/tsconfig.spec.json               |   20 +
 ui/angular/src/typings.d.ts                     |   23 +
 ui/angular/src/vendor.ts                        |   33 +
 ui/angular/tsconfig.json                        |   19 +
 ui/angular/tslint.json                          |  142 +++
 ui/angular/webpack.config.js                    |   82 ++
 ui/bower.json                                   |   24 -
 ui/build.xml                                    |   48 -
 ui/css/main.css                                 | 1124 -----------------
 ui/css/sidebar.css                              |  183 ---
 ui/css/treeview-check.css                       |   85 --
 ui/css/treeview.css                             |   85 --
 ui/img/1.PNG                                    |  Bin 13855 -> 0 bytes
 ui/img/2.PNG                                    |  Bin 8562 -> 0 bytes
 ui/img/bollinger.png                            |  Bin 145323 -> 0 bytes
 ui/img/construction.gif                         |  Bin 4853 -> 0 bytes
 ui/img/favicon.ico                              |  Bin 9920 -> 0 bytes
 ui/img/logo.gif                                 |  Bin 5764 -> 0 bytes
 ui/img/logo.png                                 |  Bin 20582 -> 0 bytes
 ui/img/mad.png                                  |  Bin 47922 -> 0 bytes
 ui/img/sidebar1.png                             |  Bin 1536 -> 0 bytes
 ui/img/sidebar2.png                             |  Bin 1617 -> 0 bytes
 ui/img/spinner.gif                              |  Bin 5860 -> 0 bytes
 ui/img/yoy.png                                  |  Bin 28400 -> 0 bytes
 ui/index.html                                   |  194 ---
 ui/js/app.js                                    |   47 -
 ui/js/bs.js                                     |   37 -
 ui/js/controllers/bigChart-ctrl.js              |   74 --
 ui/js/controllers/createdataasset-ctrl.js       |  185 ---
 ui/js/controllers/createjob-ac-ctrl.js          |  210 ----
 ui/js/controllers/createjob0.js                 |   47 -
 ui/js/controllers/createrule-ac-ctrl.js         |  459 -------
 ui/js/controllers/createrule-an-ctrl.js         |  303 -----
 ui/js/controllers/createrule-pu-ctrl.js         |  166 ---
 ui/js/controllers/createrule-va-ctrl.js         |  336 ------
 ui/js/controllers/createrule0-ctrl.js           |   46 -
 ui/js/controllers/dataassets-ctrl.js            |  144 ---
 ui/js/controllers/detail-ctrl.js                |   81 --
 ui/js/controllers/downloadSample-ctrl.js        |   41 -
 ui/js/controllers/editdataasset-ctrl.js         |  219 ----
 ui/js/controllers/footer-ctrl.js                |   61 -
 ui/js/controllers/health-ctrl.js                |  266 ----
 ui/js/controllers/index.js                      |   48 -
 ui/js/controllers/job-ctrl.js                   |  151 ---
 ui/js/controllers/main-ctrl.js                  |   41 -
 ui/js/controllers/metrics-ctrl.js               |  208 ----
 ui/js/controllers/module.js                     |   23 -
 ui/js/controllers/mydashboard-ctrl.js           |   89 --
 ui/js/controllers/nav-ctrl.js                   |   70 --
 ui/js/controllers/rule-ctrl.js                  |  176 ---
 ui/js/controllers/sidebar-ctrl.js               |  191 ---
 ui/js/controllers/subscribemodel-ctrl.js        |  411 -------
 ui/js/controllers/viewrule-ctrl.js              |  114 --
 ui/js/directives/bigchart.js                    |   97 --
 ui/js/directives/index.js                       |   20 -
 ui/js/directives/module.js                      |   23 -
 ui/js/directives/treeview.js                    |  252 ----
 ui/js/filters/index.js                          |   20 -
 ui/js/filters/module.js                         |   25 -
 ui/js/filters/strmap.js                         |   71 --
 ui/js/filters/strshorten.js                     |   50 -
 ui/js/main.js                                   |   97 --
 ui/js/routes.js                                 |  245 ----
 ui/js/services/bark-chart.js                    |  302 -----
 ui/js/services/index.js                         |   19 -
 ui/js/services/module.js                        |   23 -
 ui/js/services/services.js                      |  110 --
 ui/login/b3vHigh.jpg                            |  Bin 555201 -> 0 bytes
 ui/login/login.css                              |   90 --
 ui/login/login.html                             |  120 --
 ui/login/login.js                               |  111 --
 ui/login/logo.gif                               |  Bin 59985 -> 0 bytes
 ui/login/pad.png                                |  Bin 140342 -> 0 bytes
 ui/package.json                                 |   27 -
 ui/pages/dataassets/confirmation-dataasset.html |  125 --
 .../confirmation-delete-dataasset.html          |  104 --
 ui/pages/dataassets/createdataasset.html        |  241 ----
 ui/pages/dataassets/dataassets.html             |  108 --
 ui/pages/dataassets/editdataasset.html          |  223 ----
 ui/pages/health/health.html                     |   49 -
 ui/pages/jobs/confirmation-ac.html              |   86 --
 ui/pages/jobs/createjob-ac.html                 |  182 ---
 ui/pages/jobs/createjob0.html                   |   29 -
 ui/pages/jobs/delete-confirm.html               |   95 --
 ui/pages/jobs/jobs.html                         |  135 ---
 ui/pages/measures/confirmation-ac.html          |  122 --
 ui/pages/measures/confirmation-an.html          |  147 ---
 ui/pages/measures/confirmation-pu.html          |  161 ---
 ui/pages/measures/confirmation-va.html          |  161 ---
 ui/pages/measures/createrule-ac.html            |  436 -------
 ui/pages/measures/createrule-an.html            |  410 -------
 ui/pages/measures/createrule-pu.html            |  238 ----
 ui/pages/measures/createrule-va.html            |  407 -------
 ui/pages/measures/createrule0.html              |  259 ----
 ui/pages/measures/delete-confirm.html           |   95 --
 ui/pages/measures/detail.html                   |   80 --
 ui/pages/measures/measure.css                   |  347 ------
 ui/pages/measures/measures.html                 |  106 --
 ui/pages/measures/va-explaination.html          |  771 ------------
 ui/pages/measures/viewrule.html                 |  214 ----
 ui/pages/metrics/dashboard.html                 |   63 -
 ui/pages/metrics/download-sample.html           |   52 -
 ui/pages/metrics/metrics.css                    |   28 -
 .../mydashboard/confirmation-subscribe.html     |   42 -
 ui/pages/mydashboard/mydashboard.html           |   48 -
 ui/pages/mydashboard/subscribemodel.html        |  118 --
 ui/pages/template/bigchart.css                  |   95 --
 ui/pages/template/bigchart.html                 |   35 -
 ui/pages/template/undercons.html                |   22 -
 ui/pom.xml                                      |   48 +-
 ui/sidebar.html                                 |   92 --
 ui/src/main/java/jar/App.java                   |   33 -
 ui/src/test/java/jar/AppTest.java               |   58 -
 ui/tests/ut/karma.conf.js                       |  107 --
 .../specs/controllers/createjob-ac-ctrl.spec.js |   63 -
 .../controllers/createrule-ac-ctrl.spec.js      |  134 ---
 .../controllers/createrule-pu-ctrl.spec.js      |  110 --
 .../controllers/createrule-va-ctrl.spec.js      |  115 --
 .../specs/controllers/createrule0-ctrl.spec.js  |   67 --
 .../ut/specs/controllers/health-ctrl.spec.js    |   78 --
 ui/tests/ut/specs/controllers/job-ctrl.spec.js  |   62 -
 .../ut/specs/controllers/metrics-ctrl.spec.js   |   81 --
 ui/tests/ut/specs/controllers/nav-ctrl_spec.js  |   52 -
 ui/tests/ut/specs/controllers/rule-ctrl.spec.js |   62 -
 .../ut/specs/controllers/sidebar-ctrl_spec.js   |   94 --
 .../ut/specs/controllers/viewrule-ctrl.spec.js  |   77 --
 ui/tests/ut/specs/filters/strmap_spec.js        |   38 -
 ui/tests/ut/specs/filters/strshorten_spec.js    |   43 -
 ui/tests/ut/specs/services/services_spec.js     |   42 -
 ui/tests/ut/test-main.js                        |  102 --
 476 files changed, 22685 insertions(+), 24589 deletions(-)
----------------------------------------------------------------------



[19/31] incubator-griffin git commit: rename tmp as .tmp

Posted by gu...@apache.org.
rename tmp as .tmp


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

Branch: refs/heads/griffin-0.1.6-incubating-rc1
Commit: 20f358e11e8a8f39e387bf49aa1bbb4fe717d783
Parents: 1285468
Author: William Guo <gu...@icloud.com>
Authored: Wed Oct 11 15:39:16 2017 +0800
Committer: William Guo <gu...@icloud.com>
Committed: Wed Oct 11 15:39:16 2017 +0800

----------------------------------------------------------------------
 .gitignore  | 1 +
 merge_pr.py | 0
 ui/pom.xml  | 4 ++--
 3 files changed, 3 insertions(+), 2 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-griffin/blob/20f358e1/.gitignore
----------------------------------------------------------------------
diff --git a/.gitignore b/.gitignore
index ad52fe5..c9f7b00 100644
--- a/.gitignore
+++ b/.gitignore
@@ -13,6 +13,7 @@ target/**
 *.ear
 target
 service/src/main/resources/public/
+ui/.tmp/
 
 
 .project

http://git-wip-us.apache.org/repos/asf/incubator-griffin/blob/20f358e1/merge_pr.py
----------------------------------------------------------------------
diff --git a/merge_pr.py b/merge_pr.py
old mode 100644
new mode 100755

http://git-wip-us.apache.org/repos/asf/incubator-griffin/blob/20f358e1/ui/pom.xml
----------------------------------------------------------------------
diff --git a/ui/pom.xml b/ui/pom.xml
index 6541986..f9523e6 100644
--- a/ui/pom.xml
+++ b/ui/pom.xml
@@ -60,7 +60,7 @@ under the License.
         <version>1.0</version>
         <configuration>
           <workingDirectory>angular</workingDirectory>
-          <installDirectory>tmp</installDirectory>
+          <installDirectory>.tmp</installDirectory>
         </configuration>
         <executions>
           <!-- It will install nodejs and npm -->
@@ -86,7 +86,7 @@ under the License.
             </configuration>
           </execution>
 
-          <!-- It will execute command "npm build" inside "/angular" directory to clean and create "/dist" directory-->
+          <!-- It will execute command "npm build" inside "/angular" directory to clean and create "/.tmp" directory-->
           <execution>
             <id>npm build</id>
             <goals>


[27/31] incubator-griffin git commit: Merge branch 'master' of https://github.com/apache/incubator-griffin

Posted by gu...@apache.org.
Merge branch 'master' of https://github.com/apache/incubator-griffin


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

Branch: refs/heads/griffin-0.1.6-incubating-rc1
Commit: 9917834395c194d42d19e030dd49e4f579673f38
Parents: 110414d 09cc350
Author: William Guo <gu...@icloud.com>
Authored: Mon Oct 30 16:45:39 2017 +0800
Committer: William Guo <gu...@icloud.com>
Committed: Mon Oct 30 16:45:39 2017 +0800

----------------------------------------------------------------------
 .../src/main/java/org/apache/griffin/core/job/JobController.java | 4 ----
 1 file changed, 4 deletions(-)
----------------------------------------------------------------------



[16/31] incubator-griffin git commit: Merge branch 'master' of https://github.com/apache/incubator-griffin

Posted by gu...@apache.org.
Merge branch 'master' of https://github.com/apache/incubator-griffin


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

Branch: refs/heads/griffin-0.1.6-incubating-rc1
Commit: 38f37b6b54c46b86aa691480d7a345dfbbf83e0d
Parents: 06cd305 9ae8c4d
Author: William Guo <gu...@icloud.com>
Authored: Tue Sep 5 15:55:19 2017 +0800
Committer: William Guo <gu...@icloud.com>
Committed: Tue Sep 5 15:55:19 2017 +0800

----------------------------------------------------------------------
 .../griffin/core/common/CacheEvictor.java       | 18 +++++++++++
 .../apache/griffin/core/config/CacheConfig.java | 18 +++++++++++
 .../griffin/core/config/SwaggerConfig.java      | 18 +++++++++++
 .../exception/RuntimeExceptionHandler.java      |  3 +-
 .../griffin/core/job/JobInstanceRepoTest.java   | 19 +++++++++++
 .../griffin/core/measure/MeasureRepoTest.java   | 19 +++++++++++
 service/src/test/resources/Init_quartz-h2.sql   | 34 +++++++++++---------
 service/src/test/resources/quartz-test.sql      | 19 +++++++++++
 service/src/test/resources/test.sql             | 19 +++++++++++
 9 files changed, 149 insertions(+), 18 deletions(-)
----------------------------------------------------------------------



[29/31] incubator-griffin git commit: update parent artifact id as griffin.griffin instead of griffin.griffin-parent

Posted by gu...@apache.org.
update parent artifact id as griffin.griffin instead of griffin.griffin-parent


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

Branch: refs/heads/griffin-0.1.6-incubating-rc1
Commit: 458d56db6bb640d083d27d650efbb222b72d19d3
Parents: fb2a466
Author: William Guo <gu...@icloud.com>
Authored: Wed Nov 1 10:27:19 2017 +0800
Committer: William Guo <gu...@icloud.com>
Committed: Wed Nov 1 10:27:19 2017 +0800

----------------------------------------------------------------------
 measure/pom.xml | 2 +-
 pom.xml         | 2 +-
 service/pom.xml | 2 +-
 ui/pom.xml      | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-griffin/blob/458d56db/measure/pom.xml
----------------------------------------------------------------------
diff --git a/measure/pom.xml b/measure/pom.xml
index 9b16595..9d48cab 100644
--- a/measure/pom.xml
+++ b/measure/pom.xml
@@ -22,7 +22,7 @@ under the License.
 
   <parent>
     <groupId>org.apache.griffin</groupId>
-    <artifactId>griffin-parent</artifactId>
+    <artifactId>griffin</artifactId>
     <version>0.1.6-incubating-SNAPSHOT</version>
   </parent>
 

http://git-wip-us.apache.org/repos/asf/incubator-griffin/blob/458d56db/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index e0dcc83..af5f646 100644
--- a/pom.xml
+++ b/pom.xml
@@ -29,7 +29,7 @@ under the License.
     </parent>
 
     <groupId>org.apache.griffin</groupId>
-    <artifactId>griffin-parent</artifactId>
+    <artifactId>griffin</artifactId>
     <version>0.1.6-incubating-SNAPSHOT</version>
     <packaging>pom</packaging>
     <name>Apache Griffin ${project.version}</name>

http://git-wip-us.apache.org/repos/asf/incubator-griffin/blob/458d56db/service/pom.xml
----------------------------------------------------------------------
diff --git a/service/pom.xml b/service/pom.xml
index b3a42cf..2dd1f75 100644
--- a/service/pom.xml
+++ b/service/pom.xml
@@ -22,7 +22,7 @@ under the License.
 
     <parent>
         <groupId>org.apache.griffin</groupId>
-        <artifactId>griffin-parent</artifactId>
+        <artifactId>griffin</artifactId>
         <version>0.1.6-incubating-SNAPSHOT</version>
     </parent>
 

http://git-wip-us.apache.org/repos/asf/incubator-griffin/blob/458d56db/ui/pom.xml
----------------------------------------------------------------------
diff --git a/ui/pom.xml b/ui/pom.xml
index f9523e6..1a39f3b 100644
--- a/ui/pom.xml
+++ b/ui/pom.xml
@@ -23,7 +23,7 @@ under the License.
 
     <parent>
         <groupId>org.apache.griffin</groupId>
-        <artifactId>griffin-parent</artifactId>
+        <artifactId>griffin</artifactId>
         <version>0.1.6-incubating-SNAPSHOT</version>
     </parent>
   <artifactId>ui</artifactId>


[31/31] incubator-griffin git commit: [maven-release-plugin] prepare release griffin-0.1.6-incubating

Posted by gu...@apache.org.
[maven-release-plugin] prepare release griffin-0.1.6-incubating


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

Branch: refs/heads/griffin-0.1.6-incubating-rc1
Commit: a99602b5c66e4c946bee70f216ab4593cf706fad
Parents: 23ff65f
Author: William Guo <gu...@icloud.com>
Authored: Wed Nov 1 11:04:48 2017 +0800
Committer: William Guo <gu...@icloud.com>
Committed: Wed Nov 1 11:04:48 2017 +0800

----------------------------------------------------------------------
 measure/pom.xml | 2 +-
 pom.xml         | 4 ++--
 service/pom.xml | 2 +-
 ui/pom.xml      | 2 +-
 4 files changed, 5 insertions(+), 5 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-griffin/blob/a99602b5/measure/pom.xml
----------------------------------------------------------------------
diff --git a/measure/pom.xml b/measure/pom.xml
index 9d48cab..31e0f66 100644
--- a/measure/pom.xml
+++ b/measure/pom.xml
@@ -23,7 +23,7 @@ under the License.
   <parent>
     <groupId>org.apache.griffin</groupId>
     <artifactId>griffin</artifactId>
-    <version>0.1.6-incubating-SNAPSHOT</version>
+    <version>0.1.6-incubating</version>
   </parent>
 
   <artifactId>measure</artifactId>

http://git-wip-us.apache.org/repos/asf/incubator-griffin/blob/a99602b5/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index af5f646..5f92a3f 100644
--- a/pom.xml
+++ b/pom.xml
@@ -30,7 +30,7 @@ under the License.
 
     <groupId>org.apache.griffin</groupId>
     <artifactId>griffin</artifactId>
-    <version>0.1.6-incubating-SNAPSHOT</version>
+    <version>0.1.6-incubating</version>
     <packaging>pom</packaging>
     <name>Apache Griffin ${project.version}</name>
     <url>http://griffin.incubator.apache.org</url>
@@ -82,7 +82,7 @@ under the License.
         <connection>scm:git:https://git-wip-us.apache.org/repos/asf/incubator-griffin.git</connection>
         <developerConnection>scm:git:https://git-wip-us.apache.org/repos/asf/incubator-griffin.git</developerConnection>
         <url>https://git-wip-us.apache.org/repos/asf?p=incubator-griffin.git;a=summary</url>
-        <tag>HEAD</tag>
+        <tag>griffin-0.1.6-incubating</tag>
     </scm>
 
     <distributionManagement>

http://git-wip-us.apache.org/repos/asf/incubator-griffin/blob/a99602b5/service/pom.xml
----------------------------------------------------------------------
diff --git a/service/pom.xml b/service/pom.xml
index 2dd1f75..b981c22 100644
--- a/service/pom.xml
+++ b/service/pom.xml
@@ -23,7 +23,7 @@ under the License.
     <parent>
         <groupId>org.apache.griffin</groupId>
         <artifactId>griffin</artifactId>
-        <version>0.1.6-incubating-SNAPSHOT</version>
+        <version>0.1.6-incubating</version>
     </parent>
 
     <artifactId>service</artifactId>

http://git-wip-us.apache.org/repos/asf/incubator-griffin/blob/a99602b5/ui/pom.xml
----------------------------------------------------------------------
diff --git a/ui/pom.xml b/ui/pom.xml
index 1a39f3b..32a9eb7 100644
--- a/ui/pom.xml
+++ b/ui/pom.xml
@@ -24,7 +24,7 @@ under the License.
     <parent>
         <groupId>org.apache.griffin</groupId>
         <artifactId>griffin</artifactId>
-        <version>0.1.6-incubating-SNAPSHOT</version>
+        <version>0.1.6-incubating</version>
     </parent>
   <artifactId>ui</artifactId>
   <packaging>pom</packaging>


[26/31] incubator-griffin git commit: remove generated readme

Posted by gu...@apache.org.
remove generated readme


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

Branch: refs/heads/griffin-0.1.6-incubating-rc1
Commit: 110414d0a3a37d4689556b42daa1add8bdeae352
Parents: c402173
Author: William Guo <gu...@icloud.com>
Authored: Mon Oct 30 16:26:13 2017 +0800
Committer: William Guo <gu...@icloud.com>
Committed: Mon Oct 30 16:26:13 2017 +0800

----------------------------------------------------------------------
 ui/angular/README.md | 28 ----------------------------
 1 file changed, 28 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-griffin/blob/110414d0/ui/angular/README.md
----------------------------------------------------------------------
diff --git a/ui/angular/README.md b/ui/angular/README.md
deleted file mode 100644
index 301832c..0000000
--- a/ui/angular/README.md
+++ /dev/null
@@ -1,28 +0,0 @@
-# Griffin
-
-This project was generated with [Angular CLI](https://github.com/angular/angular-cli) version 1.3.0.
-
-## Development server
-
-Run `ng serve` for a dev server. Navigate to `http://localhost:4200/`. The app will automatically reload if you change any of the source files.
-
-## Code scaffolding
-
-Run `ng generate component component-name` to generate a new component. You can also use `ng generate directive|pipe|service|class|guard|interface|enum|module`.
-
-## Build
-
-Run `ng build` to build the project. The build artifacts will be stored in the `dist/` directory. Use the `-prod` flag for a production build.
-
-## Running unit tests
-
-Run `ng test` to execute the unit tests via [Karma](https://karma-runner.github.io).
-
-## Running end-to-end tests
-
-Run `ng e2e` to execute the end-to-end tests via [Protractor](http://www.protractortest.org/).
-Before running the tests make sure you are serving the app via `ng serve`.
-
-## Further help
-
-To get more help on the Angular CLI use `ng help` or go check out the [Angular CLI README](https://github.com/angular/angular-cli/blob/master/README.md).