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-rc0 Commit: b9d044633044af38bbc02ae22ee60b4ea4f0ed67 Parents: 215c8b4 0730988 Author: William Guo <guo...@icloud.com> Authored: Mon Oct 30 16:18:44 2017 +0800 Committer: William Guo <guo...@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(-) ----------------------------------------------------------------------
