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/master Commit: d3fcc258b7e27a15fb4a4c313d2256d19fe1972c Parents: 20f358e ed063d9 Author: William Guo <guo...@icloud.com> Authored: Mon Oct 30 14:31:15 2017 +0800 Committer: William Guo <guo...@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(-) ----------------------------------------------------------------------
