For create docker Author: Liu <[email protected]> Author: Liu <[email protected]> Author: bhlx3lyx7 <[email protected]>
Closes #31 from bhlx3lyx7/master. Project: http://git-wip-us.apache.org/repos/asf/incubator-griffin/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-griffin/commit/bc1ffbcd Tree: http://git-wip-us.apache.org/repos/asf/incubator-griffin/tree/bc1ffbcd Diff: http://git-wip-us.apache.org/repos/asf/incubator-griffin/diff/bc1ffbcd Branch: refs/heads/master Commit: bc1ffbcd0dd3c105e4b20b57bba525ce84920739 Parents: 8fe05d2 Author: [Liu <[email protected]> Authored: Thu May 18 10:06:31 2017 +0800 Committer: Liu <[email protected]> Committed: Thu May 18 10:06:31 2017 +0800 ---------------------------------------------------------------------- .../measure/batch/persist/HdfsPersist.scala | 84 +- .../measure/batch/persist/HttpPersist.scala | 34 +- .../measure/batch/persist/MultiPersists.scala | 4 +- .../griffin/measure/batch/persist/Persist.scala | 2 + .../measure/batch/persist/HttpPersistTest.scala | 15 + .../griffin/core/GriffinWebApplication.java | 6 +- .../src/main/resources/application.properties | 6 +- service/src/main/resources/sparkJob.properties | 21 +- ui/bower.json | 6 +- .../AngularJS-Toaster/.bower.json | 27 + ui/bower_components/AngularJS-Toaster/LICENSE | 20 + ui/bower_components/AngularJS-Toaster/README.md | 305 + .../AngularJS-Toaster/bower.json | 17 + ui/bower_components/AngularJS-Toaster/index.js | 2 + .../AngularJS-Toaster/karma.conf.js | 73 + .../AngularJS-Toaster/karma.coverage.js | 38 + .../AngularJS-Toaster/package.json | 36 + .../test/directiveTemplateSpec.js | 213 + .../test/toasterContainerControllerSpec.js | 358 + .../test/toasterContainerSpec.js | 742 + .../test/toasterEventRegistrySpec.js | 76 + .../test/toasterServiceSpec.js | 136 + .../AngularJS-Toaster/toaster.scss | 292 + ui/bower_components/angular-animate/.bower.json | 20 + ui/bower_components/angular-animate/LICENSE.md | 21 + ui/bower_components/angular-animate/README.md | 68 + .../angular-animate/angular-animate.js | 312 +- .../angular-animate/angular-animate.min.js | 106 +- .../angular-animate/angular-animate.min.js.map | 8 + ui/bower_components/angular-animate/bower.json | 10 + ui/bower_components/angular-animate/index.js | 2 + .../angular-animate/package.json | 33 + ui/bower_components/angular-cookies/.bower.json | 20 + ui/bower_components/angular-cookies/LICENSE.md | 21 + ui/bower_components/angular-cookies/README.md | 68 + .../angular-cookies/angular-cookies.min.js.map | 8 + ui/bower_components/angular-cookies/bower.json | 10 + ui/bower_components/angular-cookies/index.js | 2 + .../angular-cookies/package.json | 33 + ui/bower_components/angular-route/.bower.json | 20 + ui/bower_components/angular-route/LICENSE.md | 21 + ui/bower_components/angular-route/README.md | 68 + .../angular-route/angular-route.min.js.map | 8 + ui/bower_components/angular-route/bower.json | 10 + ui/bower_components/angular-route/index.js | 2 + ui/bower_components/angular-route/package.json | 33 + .../angular-smart-table/.bower.json | 38 + .../angular-smart-table/.gitignore | 7 + .../angular-smart-table/.travis.yml | 12 + .../angular-smart-table/bower.json | 29 + .../angular-smart-table/changeLog.md | 175 + .../dist/smart-table.min.js.map | 1 + .../angular-smart-table/gulpFile.js | 60 + .../angular-smart-table/index.js | 2 + .../angular-smart-table/package.json | 29 + .../angular-smart-table/readme.md | 72 + .../angular-smart-table/src/bottom.txt | 1 + .../src/smart-table.module.js | 7 + .../angular-smart-table/src/stConfig.js | 25 + .../angular-smart-table/src/stPagination.js | 80 + .../angular-smart-table/src/stPipe.js | 36 + .../angular-smart-table/src/stSearch.js | 43 + .../angular-smart-table/src/stSelectRow.js | 26 + .../angular-smart-table/src/stSort.js | 82 + .../angular-smart-table/src/stTable.js | 219 + .../angular-smart-table/src/top.txt | 2 + ui/bower_components/angular-spinner/.bower.json | 30 + .../angular-spinner/.editorconfig | 20 + ui/bower_components/angular-spinner/.gitignore | 4 + ui/bower_components/angular-spinner/.jshintrc | 36 + ui/bower_components/angular-spinner/.npmignore | 4 + ui/bower_components/angular-spinner/.travis.yml | 9 + .../angular-spinner/CHANGELOG.md | 49 + .../angular-spinner/Gruntfile.js | 51 + ui/bower_components/angular-spinner/README.md | 134 + .../angular-spinner/angular-spinner.min.js.map | 1 + ui/bower_components/angular-spinner/bower.json | 21 + .../angular-spinner/karma.conf.js | 31 + .../angular-spinner/package.json | 31 + ui/bower_components/angular-spinner/tests.js | 198 + ui/bower_components/angular/.bower.json | 18 + ui/bower_components/angular/LICENSE.md | 21 + ui/bower_components/angular/README.md | 64 + ui/bower_components/angular/angular.min.js.gzip | Bin 0 -> 56905 bytes ui/bower_components/angular/angular.min.js.map | 8 + ui/bower_components/angular/bower.json | 9 + ui/bower_components/angular/index.js | 2 + ui/bower_components/angular/package.json | 25 + ui/bower_components/bootstrap/.bower.json | 44 + ui/bower_components/bootstrap/CHANGELOG.md | 5 + ui/bower_components/bootstrap/Gemfile | 6 + ui/bower_components/bootstrap/Gemfile.lock | 43 + ui/bower_components/bootstrap/Gruntfile.js | 511 + ui/bower_components/bootstrap/ISSUE_TEMPLATE.md | 22 + ui/bower_components/bootstrap/LICENSE | 21 + ui/bower_components/bootstrap/README.md | 142 + ui/bower_components/bootstrap/bower.json | 34 + .../bootstrap/dist/css/bootstrap-theme.css | 587 + .../bootstrap/dist/css/bootstrap-theme.css.map | 1 + .../bootstrap/dist/css/bootstrap-theme.min.css | 6 + .../dist/css/bootstrap-theme.min.css.map | 1 + .../bootstrap/dist/css/bootstrap.css | 6757 +++ .../bootstrap/dist/css/bootstrap.css.map | 1 + .../bootstrap/dist/css/bootstrap.min.css | 6 + .../bootstrap/dist/css/bootstrap.min.css.map | 1 + .../dist/fonts/glyphicons-halflings-regular.eot | Bin 0 -> 20127 bytes .../dist/fonts/glyphicons-halflings-regular.svg | 288 + .../dist/fonts/glyphicons-halflings-regular.ttf | Bin 0 -> 45404 bytes .../fonts/glyphicons-halflings-regular.woff | Bin 0 -> 23424 bytes .../fonts/glyphicons-halflings-regular.woff2 | Bin 0 -> 18028 bytes ui/bower_components/bootstrap/dist/js/npm.js | 13 + .../fonts/glyphicons-halflings-regular.eot | Bin 0 -> 20127 bytes .../fonts/glyphicons-halflings-regular.svg | 288 + .../fonts/glyphicons-halflings-regular.ttf | Bin 0 -> 45404 bytes .../fonts/glyphicons-halflings-regular.woff | Bin 0 -> 23424 bytes .../fonts/glyphicons-halflings-regular.woff2 | Bin 0 -> 18028 bytes ui/bower_components/bootstrap/grunt/.jshintrc | 7 + .../bootstrap/grunt/bs-commonjs-generator.js | 30 + .../grunt/bs-glyphicons-data-generator.js | 42 + .../bootstrap/grunt/bs-lessdoc-parser.js | 237 + .../bootstrap/grunt/bs-raw-files-generator.js | 44 + .../bootstrap/grunt/change-version.js | 109 + .../bootstrap/grunt/configBridge.json | 46 + .../bootstrap/grunt/npm-shrinkwrap.json | 2679 ++ .../bootstrap/grunt/sauce_browsers.yml | 82 + ui/bower_components/bootstrap/js/.jscsrc | 42 + ui/bower_components/bootstrap/js/.jshintrc | 15 + ui/bower_components/bootstrap/js/affix.js | 162 + ui/bower_components/bootstrap/js/alert.js | 94 + ui/bower_components/bootstrap/js/button.js | 125 + ui/bower_components/bootstrap/js/carousel.js | 237 + ui/bower_components/bootstrap/js/collapse.js | 212 + ui/bower_components/bootstrap/js/dropdown.js | 165 + ui/bower_components/bootstrap/js/modal.js | 339 + ui/bower_components/bootstrap/js/popover.js | 108 + ui/bower_components/bootstrap/js/scrollspy.js | 172 + ui/bower_components/bootstrap/js/tab.js | 155 + ui/bower_components/bootstrap/js/tooltip.js | 520 + ui/bower_components/bootstrap/js/transition.js | 59 + .../bootstrap/less/.csscomb.json | 304 + ui/bower_components/bootstrap/less/.csslintrc | 19 + ui/bower_components/bootstrap/less/alerts.less | 73 + ui/bower_components/bootstrap/less/badges.less | 66 + .../bootstrap/less/bootstrap.less | 56 + .../bootstrap/less/breadcrumbs.less | 26 + .../bootstrap/less/button-groups.less | 244 + ui/bower_components/bootstrap/less/buttons.less | 166 + .../bootstrap/less/carousel.less | 270 + ui/bower_components/bootstrap/less/close.less | 34 + ui/bower_components/bootstrap/less/code.less | 69 + .../bootstrap/less/component-animations.less | 33 + .../bootstrap/less/dropdowns.less | 216 + ui/bower_components/bootstrap/less/forms.less | 613 + .../bootstrap/less/glyphicons.less | 305 + ui/bower_components/bootstrap/less/grid.less | 84 + .../bootstrap/less/input-groups.less | 171 + .../bootstrap/less/jumbotron.less | 54 + ui/bower_components/bootstrap/less/labels.less | 64 + .../bootstrap/less/list-group.less | 130 + ui/bower_components/bootstrap/less/media.less | 66 + ui/bower_components/bootstrap/less/mixins.less | 40 + .../bootstrap/less/mixins/alerts.less | 14 + .../less/mixins/background-variant.less | 9 + .../bootstrap/less/mixins/border-radius.less | 18 + .../bootstrap/less/mixins/buttons.less | 65 + .../bootstrap/less/mixins/center-block.less | 7 + .../bootstrap/less/mixins/clearfix.less | 22 + .../bootstrap/less/mixins/forms.less | 85 + .../bootstrap/less/mixins/gradients.less | 59 + .../bootstrap/less/mixins/grid-framework.less | 91 + .../bootstrap/less/mixins/grid.less | 122 + .../bootstrap/less/mixins/hide-text.less | 21 + .../bootstrap/less/mixins/image.less | 33 + .../bootstrap/less/mixins/labels.less | 12 + .../bootstrap/less/mixins/list-group.less | 30 + .../bootstrap/less/mixins/nav-divider.less | 10 + .../less/mixins/nav-vertical-align.less | 9 + .../bootstrap/less/mixins/opacity.less | 8 + .../bootstrap/less/mixins/pagination.less | 24 + .../bootstrap/less/mixins/panels.less | 24 + .../bootstrap/less/mixins/progress-bar.less | 10 + .../bootstrap/less/mixins/reset-filter.less | 8 + .../bootstrap/less/mixins/reset-text.less | 18 + .../bootstrap/less/mixins/resize.less | 6 + .../less/mixins/responsive-visibility.less | 15 + .../bootstrap/less/mixins/size.less | 10 + .../bootstrap/less/mixins/tab-focus.less | 9 + .../bootstrap/less/mixins/table-row.less | 28 + .../bootstrap/less/mixins/text-emphasis.less | 9 + .../bootstrap/less/mixins/text-overflow.less | 8 + .../bootstrap/less/mixins/vendor-prefixes.less | 227 + ui/bower_components/bootstrap/less/modals.less | 150 + ui/bower_components/bootstrap/less/navbar.less | 660 + ui/bower_components/bootstrap/less/navs.less | 242 + .../bootstrap/less/normalize.less | 424 + ui/bower_components/bootstrap/less/pager.less | 54 + .../bootstrap/less/pagination.less | 89 + ui/bower_components/bootstrap/less/panels.less | 271 + .../bootstrap/less/popovers.less | 131 + ui/bower_components/bootstrap/less/print.less | 101 + .../bootstrap/less/progress-bars.less | 87 + .../bootstrap/less/responsive-embed.less | 35 + .../bootstrap/less/responsive-utilities.less | 194 + .../bootstrap/less/scaffolding.less | 161 + ui/bower_components/bootstrap/less/tables.less | 234 + ui/bower_components/bootstrap/less/theme.less | 291 + .../bootstrap/less/thumbnails.less | 36 + ui/bower_components/bootstrap/less/tooltip.less | 101 + ui/bower_components/bootstrap/less/type.less | 302 + .../bootstrap/less/utilities.less | 55 + .../bootstrap/less/variables.less | 869 + ui/bower_components/bootstrap/less/wells.less | 29 + ui/bower_components/bootstrap/nuget/MyGet.ps1 | 8 + .../bootstrap/nuget/bootstrap.less.nuspec | 28 + .../bootstrap/nuget/bootstrap.nuspec | 28 + ui/bower_components/bootstrap/package.js | 32 + ui/bower_components/bootstrap/package.json | 89 + ui/bower_components/bootswatch/.bower.json | 52 + ui/bower_components/bootswatch/.bowerrc | 5 + ui/bower_components/bootswatch/.npmignore | 21 + ui/bower_components/bootswatch/LICENSE | 21 + ui/bower_components/bootswatch/README.md | 69 + ui/bower_components/bootswatch/bower.json | 42 + .../bootswatch/cerulean/_bootswatch.scss | 131 + .../bootswatch/cerulean/_variables.scss | 870 + .../bootswatch/cerulean/bootstrap.css | 6904 +++ .../bootswatch/cerulean/bootstrap.min.css | 11 + .../bootswatch/cerulean/bootswatch.less | 131 + .../bootswatch/cerulean/thumbnail.png | Bin 0 -> 38843 bytes .../bootswatch/cerulean/variables.less | 869 + .../bootswatch/cosmo/_bootswatch.scss | 262 + .../bootswatch/cosmo/_variables.scss | 870 + .../bootswatch/cosmo/bootstrap.css | 6939 +++ .../bootswatch/cosmo/bootstrap.min.css | 11 + .../bootswatch/cosmo/bootswatch.less | 266 + .../bootswatch/cosmo/thumbnail.png | Bin 0 -> 22825 bytes .../bootswatch/cosmo/variables.less | 869 + .../bootswatch/cyborg/_bootswatch.scss | 242 + .../bootswatch/cyborg/_variables.scss | 870 + .../bootswatch/cyborg/bootstrap.css | 4 +- .../bootswatch/cyborg/bootswatch.less | 246 + .../bootswatch/cyborg/thumbnail.png | Bin 0 -> 25410 bytes .../bootswatch/cyborg/variables.less | 869 + .../bootswatch/darkly/_bootswatch.scss | 347 + .../bootswatch/darkly/_variables.scss | 870 + .../bootswatch/darkly/bootstrap.css | 7046 +++ .../bootswatch/darkly/bootstrap.min.css | 11 + .../bootswatch/darkly/bootswatch.less | 351 + .../bootswatch/darkly/thumbnail.png | Bin 0 -> 25944 bytes .../bootswatch/darkly/variables.less | 869 + .../bootswatch/flatly/_bootswatch.scss | 330 + .../bootswatch/flatly/_variables.scss | 870 + .../bootswatch/flatly/bootstrap.css | 7025 +++ .../bootswatch/flatly/bootstrap.min.css | 11 + .../bootswatch/flatly/bootswatch.less | 334 + .../bootswatch/flatly/thumbnail.png | Bin 0 -> 24089 bytes .../bootswatch/flatly/variables.less | 869 + .../bootswatch/journal/_bootswatch.scss | 145 + .../bootswatch/journal/_variables.scss | 870 + .../bootswatch/journal/bootstrap.css | 6851 +++ .../bootswatch/journal/bootstrap.min.css | 11 + .../bootswatch/journal/bootswatch.less | 149 + .../bootswatch/journal/thumbnail.png | Bin 0 -> 27152 bytes .../bootswatch/journal/variables.less | 869 + .../bootswatch/lumen/_bootswatch.scss | 523 + .../bootswatch/lumen/_variables.scss | 870 + .../bootswatch/lumen/bootstrap.css | 7176 +++ .../bootswatch/lumen/bootstrap.min.css | 11 + .../bootswatch/lumen/bootswatch.less | 527 + .../bootswatch/lumen/thumbnail.png | Bin 0 -> 19347 bytes .../bootswatch/lumen/variables.less | 869 + .../bootswatch/paper/_bootswatch.scss | 612 + .../bootswatch/paper/_variables.scss | 870 + .../bootswatch/paper/bootstrap.css | 7519 +++ .../bootswatch/paper/bootstrap.min.css | 11 + .../bootswatch/paper/bootswatch.less | 616 + .../bootswatch/paper/thumbnail.png | Bin 0 -> 25645 bytes .../bootswatch/paper/variables.less | 869 + .../bootswatch/readable/_bootswatch.scss | 183 + .../bootswatch/readable/_variables.scss | 870 + .../bootswatch/readable/bootstrap.css | 6875 +++ .../bootswatch/readable/bootstrap.min.css | 11 + .../bootswatch/readable/bootswatch.less | 187 + .../bootswatch/readable/thumbnail.png | Bin 0 -> 28365 bytes .../bootswatch/readable/variables.less | 869 + .../bootswatch/sandstone/_bootswatch.scss | 195 + .../bootswatch/sandstone/_variables.scss | 870 + .../bootswatch/sandstone/bootstrap.css | 6913 +++ .../bootswatch/sandstone/bootstrap.min.css | 11 + .../bootswatch/sandstone/bootswatch.less | 199 + .../bootswatch/sandstone/thumbnail.png | Bin 0 -> 21569 bytes .../bootswatch/sandstone/variables.less | 869 + .../bootswatch/simplex/_bootswatch.scss | 170 + .../bootswatch/simplex/_variables.scss | 870 + .../bootswatch/simplex/bootstrap.css | 6913 +++ .../bootswatch/simplex/bootstrap.min.css | 11 + .../bootswatch/simplex/bootswatch.less | 174 + .../bootswatch/simplex/thumbnail.png | Bin 0 -> 26736 bytes .../bootswatch/simplex/variables.less | 869 + .../bootswatch/slate/_bootswatch.scss | 441 + .../bootswatch/slate/_variables.scss | 870 + .../bootswatch/slate/bootstrap.css | 7261 +++ .../bootswatch/slate/bootstrap.min.css | 11 + .../bootswatch/slate/bootswatch.less | 441 + .../bootswatch/slate/thumbnail.png | Bin 0 -> 56970 bytes .../bootswatch/slate/variables.less | 869 + .../bootswatch/spacelab/_bootswatch.scss | 142 + .../bootswatch/spacelab/_variables.scss | 870 + .../bootswatch/spacelab/bootstrap.css | 6961 +++ .../bootswatch/spacelab/bootstrap.min.css | 11 + .../bootswatch/spacelab/bootswatch.less | 146 + .../bootswatch/spacelab/thumbnail.png | Bin 0 -> 37531 bytes .../bootswatch/spacelab/variables.less | 869 + .../bootswatch/superhero/_bootswatch.scss | 345 + .../bootswatch/superhero/_variables.scss | 870 + .../bootswatch/superhero/bootstrap.css | 6997 +++ .../bootswatch/superhero/bootstrap.min.css | 11 + .../bootswatch/superhero/bootswatch.less | 349 + .../bootswatch/superhero/thumbnail.png | Bin 0 -> 25185 bytes .../bootswatch/superhero/variables.less | 869 + .../bootswatch/united/_bootswatch.scss | 56 + .../bootswatch/united/_variables.scss | 870 + .../bootswatch/united/bootstrap.css | 6773 +++ .../bootswatch/united/bootstrap.min.css | 11 + .../bootswatch/united/bootswatch.less | 60 + .../bootswatch/united/thumbnail.png | Bin 0 -> 23115 bytes .../bootswatch/united/variables.less | 869 + .../bootswatch/yeti/_bootswatch.scss | 440 + .../bootswatch/yeti/_variables.scss | 870 + .../bootswatch/yeti/bootstrap.css | 7069 +++ .../bootswatch/yeti/bootstrap.min.css | 11 + .../bootswatch/yeti/bootswatch.less | 444 + .../bootswatch/yeti/thumbnail.png | Bin 0 -> 20421 bytes .../bootswatch/yeti/variables.less | 869 + ui/bower_components/domReady/.bower.json | 15 + ui/bower_components/domReady/LICENSE | 58 + ui/bower_components/domReady/README.md | 32 + ui/bower_components/domReady/bower.json | 5 + ui/bower_components/domReady/package.json | 32 + ui/bower_components/echarts/.bower.json | 14 + ui/bower_components/echarts/.editorconfig | 38 + .../echarts/.github/CONTRIBUTING.md | 27 + .../echarts/.github/ISSUE_TEMPLATE.md | 41 + ui/bower_components/echarts/.gitignore | 171 + ui/bower_components/echarts/.jshintrc | 73 + ui/bower_components/echarts/.npmignore | 9 + ui/bower_components/echarts/LICENSE | 26 + ui/bower_components/echarts/README.md | 114 + ui/bower_components/echarts/asset/logo.png | Bin 0 -> 7323 bytes ui/bower_components/echarts/build/amd2common.js | 160 + ui/bower_components/echarts/build/build.sh | 15 + .../echarts/build/mangleString.js | 165 + ui/bower_components/echarts/build/optimize.js | 40 + .../echarts/dist/echarts.common.js | 41078 +++++++++++++++++ .../echarts/dist/echarts.common.min.js | 28 + ui/bower_components/echarts/dist/echarts.js | 11 +- .../echarts/dist/echarts.simple.js | 29183 ++++++++++++ .../echarts/dist/echarts.simple.min.js | 25 + .../echarts/dist/extension/bmap.js | 369 + .../echarts/dist/extension/bmap.min.js | 1 + .../echarts/dist/extension/dataTool.js | 405 + .../echarts/dist/extension/dataTool.min.js | 1 + .../echarts/extension/bmap/BMapCoordSys.js | 136 + .../echarts/extension/bmap/BMapModel.js | 36 + .../echarts/extension/bmap/BMapView.js | 87 + .../echarts/extension/bmap/README.md | 72 + .../echarts/extension/bmap/bmap.js | 28 + .../echarts/extension/dataTool/gexf.js | 204 + .../echarts/extension/dataTool/index.js | 9 + .../extension/dataTool/prepareBoxplotData.js | 63 + .../echarts/extension/dataTool/quantile.js | 44 + .../echarts/extension/echarts.js | 1 + .../echarts/extension/webpack.config.js | 17 + ui/bower_components/echarts/index.common.js | 22 + ui/bower_components/echarts/index.js | 47 + ui/bower_components/echarts/index.simple.js | 9 + .../echarts/map/js/china-contour.js | 27 + ui/bower_components/echarts/map/js/china.js | 27 + .../echarts/map/js/province/anhui.js | 27 + .../echarts/map/js/province/aomen.js | 27 + .../echarts/map/js/province/beijing.js | 27 + .../echarts/map/js/province/chongqing.js | 27 + .../echarts/map/js/province/fujian.js | 27 + .../echarts/map/js/province/gansu.js | 27 + .../echarts/map/js/province/guangdong.js | 27 + .../echarts/map/js/province/guangxi.js | 27 + .../echarts/map/js/province/guizhou.js | 27 + .../echarts/map/js/province/hainan.js | 27 + .../echarts/map/js/province/hebei.js | 27 + .../echarts/map/js/province/heilongjiang.js | 27 + .../echarts/map/js/province/henan.js | 27 + .../echarts/map/js/province/hubei.js | 27 + .../echarts/map/js/province/hunan.js | 27 + .../echarts/map/js/province/jiangsu.js | 27 + .../echarts/map/js/province/jiangxi.js | 27 + .../echarts/map/js/province/jilin.js | 27 + .../echarts/map/js/province/liaoning.js | 27 + .../echarts/map/js/province/neimenggu.js | 27 + .../echarts/map/js/province/ningxia.js | 27 + .../echarts/map/js/province/qinghai.js | 27 + .../echarts/map/js/province/shandong.js | 27 + .../echarts/map/js/province/shanghai.js | 27 + .../echarts/map/js/province/shanxi.js | 27 + .../echarts/map/js/province/shanxi1.js | 27 + .../echarts/map/js/province/sichuan.js | 27 + .../echarts/map/js/province/tianjin.js | 27 + .../echarts/map/js/province/xianggang.js | 27 + .../echarts/map/js/province/xinjiang.js | 27 + .../echarts/map/js/province/xizang.js | 27 + .../echarts/map/js/province/yunnan.js | 27 + .../echarts/map/js/province/zhejiang.js | 27 + ui/bower_components/echarts/map/js/world.js | 27 + .../echarts/map/json/china-contour.json | 1 + ui/bower_components/echarts/map/json/china.json | 1 + .../echarts/map/json/province/anhui.json | 1 + .../echarts/map/json/province/aomen.json | 1 + .../echarts/map/json/province/beijing.json | 1 + .../echarts/map/json/province/chongqing.json | 1 + .../echarts/map/json/province/fujian.json | 1 + .../echarts/map/json/province/gansu.json | 1 + .../echarts/map/json/province/guangdong.json | 1 + .../echarts/map/json/province/guangxi.json | 1 + .../echarts/map/json/province/guizhou.json | 1 + .../echarts/map/json/province/hainan.json | 1 + .../echarts/map/json/province/hebei.json | 1 + .../echarts/map/json/province/heilongjiang.json | 1 + .../echarts/map/json/province/henan.json | 1 + .../echarts/map/json/province/hubei.json | 1 + .../echarts/map/json/province/hunan.json | 1 + .../echarts/map/json/province/jiangsu.json | 1 + .../echarts/map/json/province/jiangxi.json | 1 + .../echarts/map/json/province/jilin.json | 1 + .../echarts/map/json/province/liaoning.json | 1 + .../echarts/map/json/province/neimenggu.json | 1 + .../echarts/map/json/province/ningxia.json | 1 + .../echarts/map/json/province/qinghai.json | 1 + .../echarts/map/json/province/shandong.json | 1 + .../echarts/map/json/province/shanghai.json | 1 + .../echarts/map/json/province/shanxi.json | 1 + .../echarts/map/json/province/shanxi1.json | 1 + .../echarts/map/json/province/sichuan.json | 1 + .../echarts/map/json/province/tianjin.json | 1 + .../echarts/map/json/province/xianggang.json | 1 + .../echarts/map/json/province/xinjiang.json | 1 + .../echarts/map/json/province/xizang.json | 1 + .../echarts/map/json/province/yunnan.json | 1 + .../echarts/map/json/province/zhejiang.json | 1 + ui/bower_components/echarts/map/json/world.json | 1 + ui/bower_components/echarts/package.json | 50 + .../echarts/src/CoordinateSystem.js | 44 + ui/bower_components/echarts/src/ExtensionAPI.js | 19 + .../src/action/createDataSelectAction.js | 35 + .../echarts/src/action/geoRoam.js | 53 + .../echarts/src/action/roamHelper.js | 60 + ui/bower_components/echarts/src/chart/bar.js | 24 + .../echarts/src/chart/bar/BarSeries.js | 75 + .../echarts/src/chart/bar/BarView.js | 215 + .../echarts/src/chart/bar/barItemStyle.js | 29 + .../echarts/src/chart/boxplot.js | 11 + .../echarts/src/chart/boxplot/BoxplotSeries.js | 72 + .../echarts/src/chart/boxplot/BoxplotView.js | 49 + .../echarts/src/chart/boxplot/boxplotLayout.js | 181 + .../echarts/src/chart/boxplot/boxplotVisual.js | 34 + .../echarts/src/chart/candlestick.js | 15 + .../src/chart/candlestick/CandlestickSeries.js | 96 + .../src/chart/candlestick/CandlestickView.js | 54 + .../src/chart/candlestick/candlestickLayout.js | 119 + .../src/chart/candlestick/candlestickVisual.js | 40 + .../src/chart/candlestick/preprocessor.js | 18 + ui/bower_components/echarts/src/chart/chord.js | 13 + .../echarts/src/chart/chord/ChordSeries.js | 64 + .../echarts/src/chart/chord/ChordView.js | 75 + .../echarts/src/chart/chord/Ribbon.js | 67 + .../src/chart/chord/chordCircularLayout.js | 123 + .../echarts/src/chart/effectScatter.js | 15 + .../chart/effectScatter/EffectScatterSeries.js | 67 + .../chart/effectScatter/EffectScatterView.js | 29 + ui/bower_components/echarts/src/chart/funnel.js | 13 + .../echarts/src/chart/funnel/FunnelSeries.js | 101 + .../echarts/src/chart/funnel/FunnelView.js | 214 + .../echarts/src/chart/funnel/funnelLayout.js | 170 + ui/bower_components/echarts/src/chart/gauge.js | 4 + .../echarts/src/chart/gauge/GaugeSeries.js | 123 + .../echarts/src/chart/gauge/GaugeView.js | 411 + .../echarts/src/chart/gauge/PointerPath.js | 47 + ui/bower_components/echarts/src/chart/graph.js | 27 + .../echarts/src/chart/graph/GraphSeries.js | 248 + .../echarts/src/chart/graph/GraphView.js | 290 + .../echarts/src/chart/graph/adjustEdge.js | 153 + .../echarts/src/chart/graph/backwardCompat.js | 3 + .../echarts/src/chart/graph/categoryFilter.js | 35 + .../echarts/src/chart/graph/categoryVisual.js | 40 + .../echarts/src/chart/graph/circularLayout.js | 10 + .../src/chart/graph/circularLayoutHelper.js | 53 + .../echarts/src/chart/graph/createView.js | 76 + .../echarts/src/chart/graph/edgeVisual.js | 47 + .../echarts/src/chart/graph/forceHelper.js | 137 + .../echarts/src/chart/graph/forceLayout.js | 117 + .../echarts/src/chart/graph/roamAction.js | 35 + .../echarts/src/chart/graph/simpleLayout.js | 28 + .../echarts/src/chart/graph/simpleLayoutEdge.js | 18 + .../src/chart/graph/simpleLayoutHelper.js | 19 + .../echarts/src/chart/heatmap.js | 5 + .../echarts/src/chart/heatmap/HeatmapLayer.js | 148 + .../echarts/src/chart/heatmap/HeatmapSeries.js | 38 + .../echarts/src/chart/heatmap/HeatmapView.js | 231 + .../echarts/src/chart/helper/EffectLine.js | 188 + .../echarts/src/chart/helper/EffectPolyline.js | 107 + .../echarts/src/chart/helper/EffectSymbol.js | 223 + .../echarts/src/chart/helper/LargeLineDraw.js | 143 + .../echarts/src/chart/helper/LargeSymbolDraw.js | 146 + .../echarts/src/chart/helper/Line.js | 340 + .../echarts/src/chart/helper/LineDraw.js | 94 + .../echarts/src/chart/helper/LinePath.js | 52 + .../echarts/src/chart/helper/Polyline.js | 85 + .../echarts/src/chart/helper/Symbol.js | 283 + .../echarts/src/chart/helper/SymbolDraw.js | 123 + .../echarts/src/chart/helper/WhiskerBoxDraw.js | 215 + .../src/chart/helper/createGraphFromNodeEdge.js | 68 + .../chart/helper/createGraphFromNodeMatrix.js | 92 + .../src/chart/helper/createListFromArray.js | 269 + .../src/chart/helper/whiskerBoxCommon.js | 140 + ui/bower_components/echarts/src/chart/line.js | 24 + .../echarts/src/chart/line/LineSeries.js | 87 + .../echarts/src/chart/line/LineView.js | 708 + .../echarts/src/chart/line/lineAnimationDiff.js | 209 + .../echarts/src/chart/line/poly.js | 250 + ui/bower_components/echarts/src/chart/lines.js | 10 + .../echarts/src/chart/lines/LinesSeries.js | 152 + .../echarts/src/chart/lines/LinesView.js | 93 + .../echarts/src/chart/lines/linesLayout.js | 43 + ui/bower_components/echarts/src/chart/map.js | 35 + .../echarts/src/chart/map/MapSeries.js | 207 + .../echarts/src/chart/map/MapView.js | 140 + .../echarts/src/chart/map/backwardCompat.js | 20 + .../echarts/src/chart/map/mapDataStatistic.js | 83 + .../echarts/src/chart/map/mapSymbolLayout.js | 59 + .../echarts/src/chart/map/mapVisual.js | 17 + .../echarts/src/chart/parallel.js | 12 + .../src/chart/parallel/ParallelSeries.js | 158 + .../echarts/src/chart/parallel/ParallelView.js | 236 + .../src/chart/parallel/parallelVisual.js | 34 + ui/bower_components/echarts/src/chart/pie.js | 30 + .../echarts/src/chart/pie/PieSeries.js | 140 + .../echarts/src/chart/pie/PieView.js | 363 + .../echarts/src/chart/pie/labelLayout.js | 227 + .../echarts/src/chart/pie/pieLayout.js | 123 + ui/bower_components/echarts/src/chart/radar.js | 23 + .../echarts/src/chart/radar/RadarSeries.js | 75 + .../echarts/src/chart/radar/RadarView.js | 219 + .../echarts/src/chart/radar/backwardCompat.js | 36 + .../echarts/src/chart/radar/radarLayout.js | 28 + ui/bower_components/echarts/src/chart/sankey.js | 9 + .../echarts/src/chart/sankey/SankeySeries.js | 119 + .../echarts/src/chart/sankey/SankeyView.js | 193 + .../echarts/src/chart/sankey/sankeyLayout.js | 357 + .../echarts/src/chart/sankey/sankeyVisual.js | 37 + .../echarts/src/chart/scatter.js | 18 + .../echarts/src/chart/scatter/ScatterSeries.js | 65 + .../echarts/src/chart/scatter/ScatterView.js | 42 + .../echarts/src/chart/themeRiver.js | 19 + .../src/chart/themeRiver/ThemeRiverSeries.js | 313 + .../src/chart/themeRiver/ThemeRiverView.js | 174 + .../src/chart/themeRiver/themeRiverLayout.js | 141 + .../src/chart/themeRiver/themeRiverVisual.js | 21 + .../echarts/src/chart/treemap.js | 12 + .../echarts/src/chart/treemap/Breadcrumb.js | 159 + .../echarts/src/chart/treemap/TreemapSeries.js | 361 + .../echarts/src/chart/treemap/TreemapView.js | 875 + .../echarts/src/chart/treemap/helper.js | 44 + .../echarts/src/chart/treemap/treemapAction.js | 45 + .../echarts/src/chart/treemap/treemapLayout.js | 550 + .../echarts/src/chart/treemap/treemapVisual.js | 220 + .../echarts/src/component/angleAxis.js | 7 + .../echarts/src/component/axis.js | 8 + .../echarts/src/component/axis/AngleAxisView.js | 229 + .../echarts/src/component/axis/AxisBuilder.js | 596 + .../echarts/src/component/axis/AxisView.js | 280 + .../src/component/axis/ParallelAxisView.js | 170 + .../src/component/axis/RadiusAxisView.js | 144 + .../src/component/axis/SingleAxisView.js | 161 + .../src/component/axis/parallelAxisAction.js | 36 + .../echarts/src/component/brush.js | 17 + .../echarts/src/component/brush/BrushModel.js | 149 + .../echarts/src/component/brush/BrushView.js | 101 + .../echarts/src/component/brush/brushAction.js | 50 + .../echarts/src/component/brush/preprocessor.js | 65 + .../echarts/src/component/brush/selector.js | 142 + .../src/component/brush/visualEncoding.js | 323 + .../echarts/src/component/dataZoom.js | 20 + .../echarts/src/component/dataZoom/AxisProxy.js | 358 + .../src/component/dataZoom/DataZoomModel.js | 457 + .../src/component/dataZoom/DataZoomView.js | 84 + .../src/component/dataZoom/InsideZoomModel.js | 17 + .../src/component/dataZoom/InsideZoomView.js | 186 + .../src/component/dataZoom/SelectZoomModel.js | 14 + .../src/component/dataZoom/SelectZoomView.js | 9 + .../src/component/dataZoom/SliderZoomModel.js | 74 + .../src/component/dataZoom/SliderZoomView.js | 734 + .../src/component/dataZoom/dataZoomAction.js | 43 + .../src/component/dataZoom/dataZoomProcessor.js | 57 + .../echarts/src/component/dataZoom/history.js | 109 + .../echarts/src/component/dataZoom/roams.js | 192 + .../src/component/dataZoom/typeDefaulter.js | 8 + .../echarts/src/component/dataZoomInside.js | 17 + .../echarts/src/component/dataZoomSelect.js | 17 + .../echarts/src/component/geo.js | 49 + .../echarts/src/component/geo/GeoView.js | 37 + .../echarts/src/component/grid.js | 29 + .../src/component/helper/BrushController.js | 994 + .../echarts/src/component/helper/MapDraw.js | 295 + .../src/component/helper/RoamController.js | 220 + .../echarts/src/component/helper/brushHelper.js | 229 + .../src/component/helper/interactionMutex.js | 43 + .../src/component/helper/listComponent.js | 65 + .../src/component/helper/selectableMixin.js | 65 + .../echarts/src/component/helper/sliderMove.js | 54 + .../echarts/src/component/legend.js | 13 + .../echarts/src/component/legend/LegendModel.js | 193 + .../echarts/src/component/legend/LegendView.js | 264 + .../src/component/legend/legendAction.js | 82 + .../src/component/legend/legendFilter.js | 19 + .../echarts/src/component/markArea.js | 10 + .../echarts/src/component/markLine.js | 10 + .../echarts/src/component/markPoint.js | 11 + .../src/component/marker/MarkAreaModel.js | 36 + .../src/component/marker/MarkAreaView.js | 306 + .../src/component/marker/MarkLineModel.js | 40 + .../src/component/marker/MarkLineView.js | 355 + .../src/component/marker/MarkPointModel.js | 33 + .../src/component/marker/MarkPointView.js | 156 + .../echarts/src/component/marker/MarkerModel.js | 130 + .../echarts/src/component/marker/MarkerView.js | 37 + .../src/component/marker/markerHelper.js | 199 + .../echarts/src/component/parallel.js | 58 + .../echarts/src/component/parallelAxis.js | 7 + .../echarts/src/component/polar.js | 12 + .../echarts/src/component/radar.js | 7 + .../echarts/src/component/radar/RadarView.js | 167 + .../echarts/src/component/radiusAxis.js | 6 + .../echarts/src/component/singleAxis.js | 13 + .../echarts/src/component/timeline.js | 15 + .../component/timeline/SliderTimelineModel.js | 111 + .../component/timeline/SliderTimelineView.js | 688 + .../src/component/timeline/TimelineAxis.js | 96 + .../src/component/timeline/TimelineModel.js | 197 + .../src/component/timeline/TimelineView.js | 15 + .../src/component/timeline/preprocessor.js | 86 + .../src/component/timeline/timelineAction.js | 39 + .../src/component/timeline/typeDefaulter.js | 8 + .../echarts/src/component/title.js | 210 + .../echarts/src/component/toolbox.js | 11 + .../src/component/toolbox/ToolboxModel.js | 71 + .../src/component/toolbox/ToolboxView.js | 247 + .../src/component/toolbox/feature/Brush.js | 120 + .../src/component/toolbox/feature/DataView.js | 478 + .../src/component/toolbox/feature/DataZoom.js | 303 + .../src/component/toolbox/feature/MagicType.js | 169 + .../src/component/toolbox/feature/Restore.js | 39 + .../component/toolbox/feature/SaveAsImage.js | 67 + .../src/component/toolbox/featureManager.js | 15 + .../echarts/src/component/tooltip.js | 36 + .../src/component/tooltip/TooltipContent.js | 268 + .../src/component/tooltip/TooltipModel.js | 104 + .../src/component/tooltip/TooltipView.js | 1170 + .../echarts/src/component/visualMap.js | 9 + .../src/component/visualMap/ContinuousModel.js | 228 + .../src/component/visualMap/ContinuousView.js | 827 + .../src/component/visualMap/PiecewiseModel.js | 449 + .../src/component/visualMap/PiecewiseView.js | 217 + .../src/component/visualMap/VisualMapModel.js | 505 + .../src/component/visualMap/VisualMapView.js | 155 + .../echarts/src/component/visualMap/helper.js | 51 + .../src/component/visualMap/preprocessor.js | 47 + .../src/component/visualMap/typeDefaulter.js | 19 + .../src/component/visualMap/visualEncoding.js | 79 + .../src/component/visualMap/visualMapAction.js | 23 + .../src/component/visualMapContinuous.js | 16 + .../echarts/src/component/visualMapPiecewise.js | 16 + ui/bower_components/echarts/src/coord/Axis.js | 220 + ui/bower_components/echarts/src/coord/View.js | 272 + .../echarts/src/coord/axisDefault.js | 151 + .../echarts/src/coord/axisHelper.js | 224 + .../echarts/src/coord/axisModelCommonMixin.js | 39 + .../echarts/src/coord/axisModelCreator.js | 58 + .../echarts/src/coord/cartesian/Axis2D.js | 117 + .../echarts/src/coord/cartesian/AxisModel.js | 108 + .../echarts/src/coord/cartesian/Cartesian.js | 114 + .../echarts/src/coord/cartesian/Cartesian2D.js | 112 + .../echarts/src/coord/cartesian/Grid.js | 439 + .../echarts/src/coord/cartesian/GridModel.js | 40 + .../src/coord/cartesian/axisLabelInterval.js | 26 + .../echarts/src/coord/geo/Geo.js | 230 + .../echarts/src/coord/geo/GeoModel.js | 163 + .../echarts/src/coord/geo/Region.js | 127 + .../echarts/src/coord/geo/fix/geoCoord.js | 20 + .../echarts/src/coord/geo/fix/nanhai.js | 40 + .../echarts/src/coord/geo/fix/textCoord.js | 25 + .../echarts/src/coord/geo/geoCreator.js | 278 + .../echarts/src/coord/geo/parseGeoJson.js | 114 + .../echarts/src/coord/parallel/AxisModel.js | 122 + .../echarts/src/coord/parallel/Parallel.js | 392 + .../echarts/src/coord/parallel/ParallelAxis.js | 50 + .../echarts/src/coord/parallel/ParallelModel.js | 121 + .../src/coord/parallel/parallelCreator.js | 36 + .../src/coord/parallel/parallelPreprocessor.js | 54 + .../echarts/src/coord/polar/AngleAxis.js | 36 + .../echarts/src/coord/polar/AxisModel.js | 48 + .../echarts/src/coord/polar/Polar.js | 229 + .../echarts/src/coord/polar/PolarModel.js | 46 + .../echarts/src/coord/polar/RadiusAxis.js | 34 + .../echarts/src/coord/polar/polarCreator.js | 131 + .../echarts/src/coord/radar/IndicatorAxis.js | 35 + .../echarts/src/coord/radar/Radar.js | 234 + .../echarts/src/coord/radar/RadarModel.js | 124 + .../echarts/src/coord/single/AxisModel.js | 77 + .../echarts/src/coord/single/Single.js | 262 + .../echarts/src/coord/single/SingleAxis.js | 121 + .../echarts/src/coord/single/singleCreator.js | 43 + .../echarts/src/data/DataDiffer.js | 124 + ui/bower_components/echarts/src/data/Graph.js | 515 + ui/bower_components/echarts/src/data/List.js | 1125 + ui/bower_components/echarts/src/data/Tree.js | 472 + .../src/data/helper/completeDimensions.js | 65 + .../echarts/src/data/helper/linkList.js | 133 + ui/bower_components/echarts/src/echarts.js | 1551 + .../echarts/src/layout/barGrid.js | 229 + .../echarts/src/layout/points.js | 28 + .../echarts/src/loading/default.js | 98 + .../echarts/src/model/Component.js | 189 + ui/bower_components/echarts/src/model/Global.js | 760 + ui/bower_components/echarts/src/model/Model.js | 156 + .../echarts/src/model/OptionManager.js | 435 + ui/bower_components/echarts/src/model/Series.js | 269 + .../echarts/src/model/globalDefault.js | 52 + .../echarts/src/model/mixin/areaStyle.js | 14 + .../echarts/src/model/mixin/boxLayout.js | 15 + .../echarts/src/model/mixin/colorPalette.js | 29 + .../echarts/src/model/mixin/itemStyle.js | 28 + .../echarts/src/model/mixin/lineStyle.js | 27 + .../echarts/src/model/mixin/makeStyleMapper.js | 28 + .../echarts/src/model/mixin/textStyle.js | 52 + .../echarts/src/preprocessor/backwardCompat.js | 105 + .../src/preprocessor/helper/compatStyle.js | 76 + .../echarts/src/processor/dataFilter.js | 23 + .../echarts/src/processor/dataSample.js | 78 + .../echarts/src/scale/Interval.js | 211 + ui/bower_components/echarts/src/scale/Log.js | 130 + .../echarts/src/scale/Ordinal.js | 95 + ui/bower_components/echarts/src/scale/Scale.js | 123 + ui/bower_components/echarts/src/scale/Time.js | 161 + ui/bower_components/echarts/src/util/KDTree.js | 247 + .../echarts/src/util/animation.js | 101 + .../echarts/src/util/array/nest.js | 106 + ui/bower_components/echarts/src/util/clazz.js | 212 + .../echarts/src/util/component.js | 176 + ui/bower_components/echarts/src/util/format.js | 165 + ui/bower_components/echarts/src/util/graphic.js | 554 + ui/bower_components/echarts/src/util/layout.js | 400 + ui/bower_components/echarts/src/util/model.js | 484 + ui/bower_components/echarts/src/util/number.js | 234 + .../echarts/src/util/quickSelect.js | 83 + ui/bower_components/echarts/src/util/symbol.js | 354 + .../echarts/src/util/throttle.js | 142 + ui/bower_components/echarts/src/view/Chart.js | 141 + .../echarts/src/view/Component.js | 46 + .../echarts/src/visual/VisualMapping.js | 583 + .../echarts/src/visual/dataColor.js | 38 + .../echarts/src/visual/seriesColor.js | 35 + .../echarts/src/visual/symbol.js | 44 + .../echarts/src/visual/visualDefault.js | 70 + .../echarts/src/visual/visualSolution.js | 143 + ui/bower_components/echarts/test/README.md | 55 + ui/bower_components/echarts/test/area.html | 149 + ui/bower_components/echarts/test/area2.html | 193 + ui/bower_components/echarts/test/axes.html | 616 + ui/bower_components/echarts/test/axis.html | 146 + ui/bower_components/echarts/test/bar-large.html | 121 + ui/bower_components/echarts/test/bar.html | 197 + ui/bower_components/echarts/test/bar2.html | 147 + ui/bower_components/echarts/test/bmap.html | 645 + .../echarts/test/boxplot-multi.html | 171 + ui/bower_components/echarts/test/boxplot.html | 252 + ui/bower_components/echarts/test/brush.html | 1039 + ui/bower_components/echarts/test/brush2.html | 542 + .../echarts/test/candlestick.html | 252 + .../echarts/test/candlestickConnect.html | 450 + ui/bower_components/echarts/test/chord.html | 58 + .../echarts/test/color-mix-aqi.html | 219 + ui/bower_components/echarts/test/config.js | 22 + ui/bower_components/echarts/test/connect.html | 179 + ui/bower_components/echarts/test/connect2.html | 231 + .../echarts/test/data/Michelson-Morley.json.js | 10 + .../echarts/test/data/aqi/BJdata.js | 33 + .../echarts/test/data/aqi/GZdata.js | 34 + .../echarts/test/data/aqi/SHdata.js | 34 + .../echarts/test/data/aqi/processAQI.js | 27 + .../echarts/test/data/disk.tree.js | 21040 +++++++++ .../echarts/test/data/energy.json | 120 + .../echarts/test/data/hangzhou-tracks.json | 1 + .../echarts/test/data/les-miserables.gexf | 1394 + .../echarts/test/data/lines-bus.json | 1 + .../test/data/masterPainterColorChoice.json | 1 + .../echarts/test/data/nutrients.json | 7639 +++ .../data/obama_budget_proposal_2012.tree.js | 4546 ++ .../echarts/test/data/option-view.json | 10625 +++++ .../echarts/test/data/option-view2.json | 11714 +++++ .../echarts/test/data/product.json | 134 + .../echarts/test/data/rainfall.json.js | 67 + .../echarts/test/data/security-sh-2013.json.js | 91 + .../echarts/test/data/stock-DJI.json.js | 4 + .../echarts/test/data/timelineGDP.js | 124 + ui/bower_components/echarts/test/dataView.html | 130 + .../echarts/test/dataZoom-axes.html | 337 + .../echarts/test/dataZoom-axis-type.html | 334 + .../echarts/test/dataZoom-cartesian-h.html | 125 + .../echarts/test/dataZoom-cartesian-v.html | 82 + .../echarts/test/dataZoom-dataShadow.html | 107 + .../echarts/test/dataZoom-dataShadow0.html | 107 + .../echarts/test/dataZoom-dataShadow1.html | 92 + .../echarts/test/dataZoom-dataShadow2.html | 107 + .../echarts/test/dataZoom-dynamic.html | 141 + .../echarts/test/dataZoom-rainfall-connect.html | 311 + .../echarts/test/dataZoom-rainfall-inside.html | 179 + .../echarts/test/dataZoom-rainfall.html | 161 + .../echarts/test/dataZoom-scatter-category.html | 192 + .../echarts/test/dataZoom-scatter-hv-polar.html | 96 + .../echarts/test/dataZoom-scatter-hv.html | 151 + .../echarts/test/dataZoom-scatter-toolbox.html | 171 + .../echarts/test/dataZoomHighPrecision.html | 351 + ui/bower_components/echarts/test/diff.html | 98 + .../echarts/test/dynamicData.html | 121 + .../echarts/test/effectScatter.html | 550 + ui/bower_components/echarts/test/esl.js | 1 + ui/bower_components/echarts/test/force.html | 96 + ui/bower_components/echarts/test/force2.html | 95 + ui/bower_components/echarts/test/force3.html | 82 + ui/bower_components/echarts/test/funnel.html | 118 + ui/bower_components/echarts/test/gauge.html | 265 + ui/bower_components/echarts/test/geoLine.html | 334 + .../echarts/test/geoScatter.html | 323 + ui/bower_components/echarts/test/getOption.html | 145 + .../echarts/test/graph-grid.html | 90 + .../echarts/test/graph-simple.html | 126 + ui/bower_components/echarts/test/graph.html | 138 + .../echarts/test/heatmap-large.html | 102 + .../echarts/test/heatmap-map.html | 471 + ui/bower_components/echarts/test/heatmap.html | 86 + ui/bower_components/echarts/test/ie8.html | 952 + ui/bower_components/echarts/test/largeLine.html | 124 + .../echarts/test/lib/dat.gui.min.js | 94 + .../echarts/test/lib/draggable.js | 226 + .../echarts/test/lib/facePrint.js | 79 + .../echarts/test/lib/jquery.min.js | 5 + ui/bower_components/echarts/test/lib/perlin.js | 294 + .../echarts/test/line-visual.html | 99 + ui/bower_components/echarts/test/line.html | 140 + ui/bower_components/echarts/test/lines-bus.html | 231 + .../echarts/test/lines-track.html | 195 + ui/bower_components/echarts/test/loading.html | 34 + ui/bower_components/echarts/test/logScale.html | 73 + .../echarts/test/map-contour.html | 98 + .../echarts/test/map-parallel.html | 468 + ui/bower_components/echarts/test/map.html | 206 + ui/bower_components/echarts/test/mapWorld.html | 269 + ui/bower_components/echarts/test/markArea.html | 103 + ui/bower_components/echarts/test/markLine.html | 125 + ui/bower_components/echarts/test/markPoint.html | 202 + .../echarts/test/masterPainterColorChoice.html | 89 + .../echarts/test/media-dataZoom.html | 196 + .../echarts/test/media-finance.html | 548 + ui/bower_components/echarts/test/media-pie.html | 237 + ui/bower_components/echarts/test/mix.html | 85 + .../echarts/test/mobileBench.html | 131 + .../echarts/test/multipleGrid.html | 173 + .../echarts/test/parallel-aqi.html | 193 + .../echarts/test/parallel-nutrients.html | 248 + ui/bower_components/echarts/test/pie.html | 135 + ui/bower_components/echarts/test/pie2.html | 220 + ui/bower_components/echarts/test/pie3.html | 87 + .../echarts/test/pieDynamic.html | 79 + ui/bower_components/echarts/test/polarLine.html | 114 + .../echarts/test/polarLine2.html | 67 + .../echarts/test/polarScatter.html | 75 + ui/bower_components/echarts/test/punchCard.html | 93 + ui/bower_components/echarts/test/radar.html | 71 + ui/bower_components/echarts/test/radar2.html | 97 + ui/bower_components/echarts/test/radar3.html | 119 + ui/bower_components/echarts/test/radar4.html | 185 + ui/bower_components/echarts/test/reset.css | 10 + ui/bower_components/echarts/test/roseType.html | 68 + ui/bower_components/echarts/test/sankey.html | 72 + .../echarts/test/scale-integer.html | 46 + .../echarts/test/scatter-single-axis.html | 65 + ui/bower_components/echarts/test/scatter.html | 146 + .../echarts/test/scatterMatrix.html | 311 + .../echarts/test/selectedMode.html | 129 + ui/bower_components/echarts/test/showTip.html | 119 + ui/bower_components/echarts/test/symbol.html | 97 + ui/bower_components/echarts/test/theme.html | 132 + .../echarts/test/themeRiver.html | 149 + ui/bower_components/echarts/test/timeScale.html | 180 + .../echarts/test/timeline-finance.html | 332 + .../echarts/test/timeline-layout.html | 352 + ui/bower_components/echarts/test/tooltip.html | 183 + .../echarts/test/touch-test.html | 189 + .../echarts/test/treemap-disk.html | 209 + .../echarts/test/treemap-obama.html | 320 + .../echarts/test/treemap-option.html | 174 + .../echarts/test/treemap-option2.html | 120 + .../echarts/test/treemap-simple.html | 119 + ui/bower_components/echarts/test/ut/.jshintrc | 61 + ui/bower_components/echarts/test/ut/MIT.LICENSE | 20 + ui/bower_components/echarts/test/ut/config.js | 23 + ui/bower_components/echarts/test/ut/configure | 10 + .../echarts/test/ut/core/uiHelper.js | 309 + .../echarts/test/ut/core/utHelper.js | 310 + .../echarts/test/ut/lib/canteen.js | 566 + .../echarts/test/ut/lib/imagediff.js | 392 + .../echarts/test/ut/lib/jasmine-2.3.4/boot.js | 121 + .../test/ut/lib/jasmine-2.3.4/console.js | 190 + .../test/ut/lib/jasmine-2.3.4/jasmine-html.js | 446 + .../test/ut/lib/jasmine-2.3.4/jasmine.css | 58 + .../test/ut/lib/jasmine-2.3.4/jasmine.js | 3298 ++ .../ut/lib/jasmine-2.3.4/jasmine_favicon.png | Bin 0 -> 1486 bytes .../ut/spec/component/visualMap/setOption.js | 250 + .../echarts/test/ut/spec/data/List.js | 151 + .../echarts/test/ut/spec/model/Component.js | 136 + .../echarts/test/ut/spec/model/Global.js | 808 + .../test/ut/spec/model/timelineOptions.js | 161 + .../echarts/test/ut/spec/ui/config.js | 6 + .../echarts/test/ut/spec/ui/legend.js | 1340 + .../echarts/test/ut/spec/ui/title.js | 433 + .../test/ut/spec/ui/title.subtextStyle.js | 361 + .../echarts/test/ut/spec/ui/title.textStyle.js | 330 + .../echarts/test/ut/spec/util/graphic.js | 76 + .../echarts/test/ut/spec/util/model.js | 173 + .../echarts/test/ut/spec/util/number.js | 200 + ui/bower_components/echarts/test/ut/ui.html | 43 + ui/bower_components/echarts/test/ut/ut.html | 19 + ui/bower_components/echarts/test/ut/ut.js | 13 + .../echarts/test/visualMap-categories.html | 201 + .../echarts/test/visualMap-continuous.html | 671 + .../echarts/test/visualMap-layout.html | 432 + .../echarts/test/visualMap-opacity.html | 738 + .../echarts/test/visualMap-pieces.html | 139 + .../test/visualMap-scatter-colorAndSymbol.html | 164 + .../test/visualMap-scatter-symbolSize.html | 146 + .../echarts/test/webkit-dep.html | 69 + .../echarts/test/worldPopulationBubble.html | 540 + .../echarts/theme/infographic.js | 204 + ui/bower_components/echarts/theme/macarons.js | 198 + ui/bower_components/echarts/theme/roma.js | 67 + ui/bower_components/echarts/theme/shine.js | 157 + .../echarts/theme/tool/option/area.js | 71 + .../echarts/theme/tool/option/bar.js | 98 + .../echarts/theme/tool/option/graph.js | 2963 ++ .../echarts/theme/tool/option/map.js | 122 + .../echarts/theme/tool/option/pie.js | 72 + .../echarts/theme/tool/option/scatter.js | 182 + ui/bower_components/echarts/theme/tool/thumb.js | 63 + ui/bower_components/echarts/theme/vintage.js | 30 + ui/bower_components/echarts/webpack.config.js | 22 + ui/bower_components/font-awesome/.bower.json | 36 + ui/bower_components/font-awesome/.gitignore | 33 + ui/bower_components/font-awesome/.npmignore | 42 + .../font-awesome/HELP-US-OUT.txt | 7 + ui/bower_components/font-awesome/bower.json | 22 + .../font-awesome/css/font-awesome.css | 269 +- .../font-awesome/css/font-awesome.css.map | 7 + .../font-awesome/css/font-awesome.min.css | 4 +- .../font-awesome/fonts/FontAwesome.otf | Bin 31963 -> 134808 bytes .../font-awesome/fonts/fontawesome-webfont.eot | Bin 32068 -> 165742 bytes .../font-awesome/fonts/fontawesome-webfont.svg | 3208 +- .../font-awesome/fonts/fontawesome-webfont.ttf | Bin 32068 -> 165548 bytes .../font-awesome/fonts/fontawesome-webfont.woff | Bin 32082 -> 98024 bytes .../fonts/fontawesome-webfont.woff.bak | 510 - .../fonts/fontawesome-webfont.woff2 | Bin 32095 -> 77160 bytes .../font-awesome/less/animated.less | 34 + .../font-awesome/less/bordered-pulled.less | 25 + ui/bower_components/font-awesome/less/core.less | 12 + .../font-awesome/less/fixed-width.less | 6 + .../font-awesome/less/font-awesome.less | 18 + .../font-awesome/less/icons.less | 789 + .../font-awesome/less/larger.less | 13 + ui/bower_components/font-awesome/less/list.less | 19 + .../font-awesome/less/mixins.less | 60 + ui/bower_components/font-awesome/less/path.less | 15 + .../font-awesome/less/rotated-flipped.less | 20 + .../font-awesome/less/screen-reader.less | 5 + .../font-awesome/less/stacked.less | 20 + .../font-awesome/less/variables.less | 800 + .../font-awesome/scss/_animated.scss | 34 + .../font-awesome/scss/_bordered-pulled.scss | 25 + .../font-awesome/scss/_core.scss | 12 + .../font-awesome/scss/_fixed-width.scss | 6 + .../font-awesome/scss/_icons.scss | 789 + .../font-awesome/scss/_larger.scss | 13 + .../font-awesome/scss/_list.scss | 19 + .../font-awesome/scss/_mixins.scss | 60 + .../font-awesome/scss/_path.scss | 15 + .../font-awesome/scss/_rotated-flipped.scss | 20 + .../font-awesome/scss/_screen-reader.scss | 5 + .../font-awesome/scss/_stacked.scss | 20 + .../font-awesome/scss/_variables.scss | 800 + .../font-awesome/scss/font-awesome.scss | 18 + ui/bower_components/jquery/.bower.json | 38 + ui/bower_components/jquery/MIT-LICENSE.txt | 21 + ui/bower_components/jquery/bower.json | 28 + ui/bower_components/jquery/dist/jquery.min.map | 1 + ui/bower_components/jquery/src/ajax.js | 786 + ui/bower_components/jquery/src/ajax/jsonp.js | 89 + ui/bower_components/jquery/src/ajax/load.js | 75 + .../jquery/src/ajax/parseJSON.js | 13 + ui/bower_components/jquery/src/ajax/parseXML.js | 28 + ui/bower_components/jquery/src/ajax/script.js | 64 + .../jquery/src/ajax/var/nonce.js | 5 + .../jquery/src/ajax/var/rquery.js | 3 + ui/bower_components/jquery/src/ajax/xhr.js | 136 + ui/bower_components/jquery/src/attributes.js | 11 + .../jquery/src/attributes/attr.js | 141 + .../jquery/src/attributes/classes.js | 158 + .../jquery/src/attributes/prop.js | 94 + .../jquery/src/attributes/support.js | 35 + .../jquery/src/attributes/val.js | 161 + ui/bower_components/jquery/src/callbacks.js | 205 + ui/bower_components/jquery/src/core.js | 502 + ui/bower_components/jquery/src/core/access.js | 60 + ui/bower_components/jquery/src/core/init.js | 123 + .../jquery/src/core/parseHTML.js | 39 + ui/bower_components/jquery/src/core/ready.js | 97 + .../jquery/src/core/var/rsingleTag.js | 4 + ui/bower_components/jquery/src/css.js | 450 + .../jquery/src/css/addGetHookIf.js | 22 + ui/bower_components/jquery/src/css/curCSS.js | 57 + .../jquery/src/css/defaultDisplay.js | 70 + .../jquery/src/css/hiddenVisibleSelectors.js | 15 + ui/bower_components/jquery/src/css/support.js | 96 + ui/bower_components/jquery/src/css/swap.js | 28 + .../jquery/src/css/var/cssExpand.js | 3 + .../jquery/src/css/var/getStyles.js | 12 + .../jquery/src/css/var/isHidden.js | 13 + .../jquery/src/css/var/rmargin.js | 3 + .../jquery/src/css/var/rnumnonpx.js | 5 + ui/bower_components/jquery/src/data.js | 178 + ui/bower_components/jquery/src/data/Data.js | 181 + ui/bower_components/jquery/src/data/accepts.js | 20 + .../jquery/src/data/var/data_priv.js | 5 + .../jquery/src/data/var/data_user.js | 5 + ui/bower_components/jquery/src/deferred.js | 149 + ui/bower_components/jquery/src/deprecated.js | 13 + ui/bower_components/jquery/src/dimensions.js | 50 + ui/bower_components/jquery/src/effects.js | 648 + ui/bower_components/jquery/src/effects/Tween.js | 114 + .../jquery/src/effects/animatedSelector.js | 13 + ui/bower_components/jquery/src/event.js | 868 + ui/bower_components/jquery/src/event/ajax.js | 13 + ui/bower_components/jquery/src/event/alias.js | 39 + ui/bower_components/jquery/src/event/support.js | 9 + ui/bower_components/jquery/src/exports/amd.js | 24 + .../jquery/src/exports/global.js | 32 + ui/bower_components/jquery/src/intro.js | 44 + ui/bower_components/jquery/src/jquery.js | 37 + ui/bower_components/jquery/src/manipulation.js | 580 + .../jquery/src/manipulation/_evalUrl.js | 18 + .../jquery/src/manipulation/support.js | 32 + .../src/manipulation/var/rcheckableType.js | 3 + ui/bower_components/jquery/src/offset.js | 207 + ui/bower_components/jquery/src/outro.js | 1 + ui/bower_components/jquery/src/queue.js | 142 + ui/bower_components/jquery/src/queue/delay.js | 22 + .../jquery/src/selector-native.js | 172 + .../jquery/src/selector-sizzle.js | 14 + ui/bower_components/jquery/src/selector.js | 1 + ui/bower_components/jquery/src/serialize.js | 111 + .../jquery/src/sizzle/dist/sizzle.js | 2067 + .../jquery/src/sizzle/dist/sizzle.min.js | 3 + .../jquery/src/sizzle/dist/sizzle.min.map | 1 + ui/bower_components/jquery/src/traversing.js | 199 + .../jquery/src/traversing/findFilter.js | 100 + .../jquery/src/traversing/var/rneedsContext.js | 6 + ui/bower_components/jquery/src/var/arr.js | 3 + .../jquery/src/var/class2type.js | 4 + ui/bower_components/jquery/src/var/concat.js | 5 + ui/bower_components/jquery/src/var/hasOwn.js | 5 + ui/bower_components/jquery/src/var/indexOf.js | 5 + ui/bower_components/jquery/src/var/pnum.js | 3 + ui/bower_components/jquery/src/var/push.js | 5 + ui/bower_components/jquery/src/var/rnotwhite.js | 3 + ui/bower_components/jquery/src/var/slice.js | 5 + .../jquery/src/var/strundefined.js | 3 + ui/bower_components/jquery/src/var/support.js | 4 + ui/bower_components/jquery/src/var/toString.js | 5 + ui/bower_components/jquery/src/wrap.js | 79 + ui/bower_components/requirejs/.bower.json | 27 + ui/bower_components/requirejs/README.md | 4 + ui/bower_components/requirejs/bower.json | 18 + ui/bower_components/spin.js/.bower.json | 28 + ui/bower_components/spin.js/.gitignore | 6 + ui/bower_components/spin.js/.jshintrc | 28 + ui/bower_components/spin.js/.npmignore | 4 + ui/bower_components/spin.js/.spmignore | 1 + ui/bower_components/spin.js/LICENSE.md | 22 + ui/bower_components/spin.js/README.md | 21 + ui/bower_components/spin.js/bower.json | 17 + ui/bower_components/spin.js/jquery.spin.js | 79 + ui/js/controllers/metrics-ctrl.js | 6 +- ui/js/services/services.js | 23 +- 1108 files changed, 407739 insertions(+), 1356 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-griffin/blob/bc1ffbcd/measure/measure-batch/src/main/scala/org/apache/griffin/measure/batch/persist/HdfsPersist.scala ---------------------------------------------------------------------- diff --git a/measure/measure-batch/src/main/scala/org/apache/griffin/measure/batch/persist/HdfsPersist.scala b/measure/measure-batch/src/main/scala/org/apache/griffin/measure/batch/persist/HdfsPersist.scala index 7bff3b6..49ebcea 100644 --- a/measure/measure-batch/src/main/scala/org/apache/griffin/measure/batch/persist/HdfsPersist.scala +++ b/measure/measure-batch/src/main/scala/org/apache/griffin/measure/batch/persist/HdfsPersist.scala @@ -6,6 +6,8 @@ import org.apache.griffin.measure.batch.result._ import org.apache.griffin.measure.batch.utils.HdfsUtil import org.apache.spark.rdd.RDD +import scala.util.Try + case class HdfsPersist(config: Map[String, Any], metricName: String, timeStamp: Long) extends Persist { @@ -61,48 +63,64 @@ case class HdfsPersist(config: Map[String, Any], metricName: String, timeStamp: } def start(msg: String): Unit = { - HdfsUtil.writeContent(StartFile, msg) + try { + HdfsUtil.writeContent(StartFile, msg) + } catch { + case e: Throwable => error(e.getMessage) + } } def finish(): Unit = { - HdfsUtil.createEmptyFile(FinishFile) + try { + HdfsUtil.createEmptyFile(FinishFile) + } catch { + case e: Throwable => error(e.getMessage) + } } def result(rt: Long, result: Result): Unit = { - val resStr = result match { - case ar: AccuracyResult => { - s"match percentage: ${ar.matchPercentage}\ntotal count: ${ar.getTotal}\nmiss count: ${ar.getMiss}, match count: ${ar.getMatch}" - } - case _ => { - s"result: ${result}" + try { + val resStr = result match { + case ar: AccuracyResult => { + s"match percentage: ${ar.matchPercentage}\ntotal count: ${ar.getTotal}\nmiss count: ${ar.getMiss}, match count: ${ar.getMatch}" + } + case _ => { + s"result: ${result}" + } } - } - HdfsUtil.writeContent(ResultFile, timeHead(rt) + resStr) - log(rt, resStr) + HdfsUtil.writeContent(ResultFile, timeHead(rt) + resStr) + log(rt, resStr) - info(resStr) + info(resStr) + } catch { + case e: Throwable => error(e.getMessage) + } } // need to avoid string too long def missRecords(records: RDD[String]): Unit = { - val recordCount = records.count - val count = if (maxPersistLines < 0) recordCount else scala.math.min(maxPersistLines, recordCount) - if (count > 0) { - val groupCount = ((count - 1) / maxLinesPerFile + 1).toInt - if (groupCount <= 1) { - val recs = records.take(count.toInt) - persistRecords(MissRecFile, recs) - } else { - val groupedRecords: RDD[(Long, Iterable[String])] = - records.zipWithIndex.flatMap { r => - val gid = r._2 / maxLinesPerFile - if (gid < groupCount) Some((gid, r._1)) else None - }.groupByKey() - groupedRecords.foreach { group => - val (gid, recs) = group - val hdfsPath = if (gid == 0) MissRecFile else withSuffix(MissRecFile, gid.toString) - persistRecords(hdfsPath, recs) + try { + val recordCount = records.count + val count = if (maxPersistLines < 0) recordCount else scala.math.min(maxPersistLines, recordCount) + if (count > 0) { + val groupCount = ((count - 1) / maxLinesPerFile + 1).toInt + if (groupCount <= 1) { + val recs = records.take(count.toInt) + persistRecords(MissRecFile, recs) + } else { + val groupedRecords: RDD[(Long, Iterable[String])] = + records.zipWithIndex.flatMap { r => + val gid = r._2 / maxLinesPerFile + if (gid < groupCount) Some((gid, r._1)) else None + }.groupByKey() + groupedRecords.foreach { group => + val (gid, recs) = group + val hdfsPath = if (gid == 0) MissRecFile else withSuffix(MissRecFile, gid.toString) + persistRecords(hdfsPath, recs) + } } } + } catch { + case e: Throwable => error(e.getMessage) } } @@ -112,8 +130,12 @@ case class HdfsPersist(config: Map[String, Any], metricName: String, timeStamp: } def log(rt: Long, msg: String): Unit = { - val logStr = (if (isInit) persistHead else "") + timeHead(rt) + s"${msg}\n\n" - HdfsUtil.appendContent(LogFile, logStr) + try { + val logStr = (if (isInit) persistHead else "") + timeHead(rt) + s"${msg}\n\n" + HdfsUtil.appendContent(LogFile, logStr) + } catch { + case e: Throwable => error(e.getMessage) + } } } http://git-wip-us.apache.org/repos/asf/incubator-griffin/blob/bc1ffbcd/measure/measure-batch/src/main/scala/org/apache/griffin/measure/batch/persist/HttpPersist.scala ---------------------------------------------------------------------- diff --git a/measure/measure-batch/src/main/scala/org/apache/griffin/measure/batch/persist/HttpPersist.scala b/measure/measure-batch/src/main/scala/org/apache/griffin/measure/batch/persist/HttpPersist.scala index 76bfd8a..fa2078b 100644 --- a/measure/measure-batch/src/main/scala/org/apache/griffin/measure/batch/persist/HttpPersist.scala +++ b/measure/measure-batch/src/main/scala/org/apache/griffin/measure/batch/persist/HttpPersist.scala @@ -4,6 +4,8 @@ import org.apache.griffin.measure.batch.result._ import org.apache.griffin.measure.batch.utils.{HttpUtil, JsonUtil} import org.apache.spark.rdd.RDD +import scala.util.Try + case class HttpPersist(config: Map[String, Any], metricName: String, timeStamp: Long) extends Persist { val Api = "api" @@ -20,21 +22,25 @@ case class HttpPersist(config: Map[String, Any], metricName: String, timeStamp: def finish(): Unit = {} def result(rt: Long, result: Result): Unit = { - result match { - case ar: AccuracyResult => { - val dataMap = Map[String, Any](("name" -> metricName), ("tmst" -> timeStamp), ("total" -> ar.getTotal), ("matched" -> ar.getMatch)) - val data = JsonUtil.toJson(dataMap) - - // post - val params = Map[String, Object]() -// val header = Map[String, Object](("content-type" -> "application/json")) - val header = Map[String, Object]() - val status = HttpUtil.httpRequest(api, method, params, header, data) - info(s"${method} to ${api} response status: ${status}") - } - case _ => { - info(s"result: ${result}") + try { + result match { + case ar: AccuracyResult => { + val dataMap = Map[String, Any](("name" -> metricName), ("tmst" -> timeStamp), ("total" -> ar.getTotal), ("matched" -> ar.getMatch)) + val data = JsonUtil.toJson(dataMap) + + // post + val params = Map[String, Object]() +// val header = Map[String, Object](("content-type" -> "application/json")) + val header = Map[String, Object]() + val status = HttpUtil.httpRequest(api, method, params, header, data) + info(s"${method} to ${api} response status: ${status}") + } + case _ => { + info(s"result: ${result}") + } } + } catch { + case e: Throwable => error(e.getMessage) } } http://git-wip-us.apache.org/repos/asf/incubator-griffin/blob/bc1ffbcd/measure/measure-batch/src/main/scala/org/apache/griffin/measure/batch/persist/MultiPersists.scala ---------------------------------------------------------------------- diff --git a/measure/measure-batch/src/main/scala/org/apache/griffin/measure/batch/persist/MultiPersists.scala b/measure/measure-batch/src/main/scala/org/apache/griffin/measure/batch/persist/MultiPersists.scala index 2fa6942..33f4a08 100644 --- a/measure/measure-batch/src/main/scala/org/apache/griffin/measure/batch/persist/MultiPersists.scala +++ b/measure/measure-batch/src/main/scala/org/apache/griffin/measure/batch/persist/MultiPersists.scala @@ -4,6 +4,8 @@ import org.apache.griffin.measure.batch.result._ import org.apache.griffin.measure.batch.utils.{HttpUtil, JsonUtil} import org.apache.spark.rdd.RDD +import scala.util.Try + case class MultiPersists(persists: Iterable[Persist]) extends Persist { val timeStamp: Long = persists match { @@ -16,7 +18,7 @@ case class MultiPersists(persists: Iterable[Persist]) extends Persist { def available(): Boolean = { persists.exists(_.available()) } def start(msg: String): Unit = { persists.foreach(_.start(msg)) } - def finish(): Unit = {persists.foreach(_.finish())} + def finish(): Unit = { persists.foreach(_.finish()) } def result(rt: Long, result: Result): Unit = { persists.foreach(_.result(rt, result)) } http://git-wip-us.apache.org/repos/asf/incubator-griffin/blob/bc1ffbcd/measure/measure-batch/src/main/scala/org/apache/griffin/measure/batch/persist/Persist.scala ---------------------------------------------------------------------- diff --git a/measure/measure-batch/src/main/scala/org/apache/griffin/measure/batch/persist/Persist.scala b/measure/measure-batch/src/main/scala/org/apache/griffin/measure/batch/persist/Persist.scala index 7398c24..16a8edd 100644 --- a/measure/measure-batch/src/main/scala/org/apache/griffin/measure/batch/persist/Persist.scala +++ b/measure/measure-batch/src/main/scala/org/apache/griffin/measure/batch/persist/Persist.scala @@ -4,6 +4,8 @@ import org.apache.griffin.measure.batch.log.Loggable import org.apache.griffin.measure.batch.result._ import org.apache.spark.rdd.RDD +import scala.util.Try + trait Persist extends Loggable with Serializable { val timeStamp: Long http://git-wip-us.apache.org/repos/asf/incubator-griffin/blob/bc1ffbcd/measure/measure-batch/src/test/scala/org/apache/griffin/measure/batch/persist/HttpPersistTest.scala ---------------------------------------------------------------------- diff --git a/measure/measure-batch/src/test/scala/org/apache/griffin/measure/batch/persist/HttpPersistTest.scala b/measure/measure-batch/src/test/scala/org/apache/griffin/measure/batch/persist/HttpPersistTest.scala index 20ebb7c..ab37ded 100644 --- a/measure/measure-batch/src/test/scala/org/apache/griffin/measure/batch/persist/HttpPersistTest.scala +++ b/measure/measure-batch/src/test/scala/org/apache/griffin/measure/batch/persist/HttpPersistTest.scala @@ -7,6 +7,7 @@ import org.junit.runner.RunWith import org.scalatest.junit.JUnitRunner import org.scalatest.{BeforeAndAfter, FunSuite, Matchers} +import scala.util.{Try, Failure} @RunWith(classOf[JUnitRunner]) class HttpPersistTest extends FunSuite with Matchers with BeforeAndAfter with Loggable { @@ -18,4 +19,18 @@ class HttpPersistTest extends FunSuite with Matchers with BeforeAndAfter with Lo println(data) } + test("test try") { + Try { + Try { + throw new Exception("test") + } match { + case Failure(ex) => throw new Exception(ex.getMessage) + case _ => println("success inner") + } + } match { + case Failure(ex) => println(ex.getMessage) + case _ => println("success") + } + + } } http://git-wip-us.apache.org/repos/asf/incubator-griffin/blob/bc1ffbcd/service/src/main/java/org/apache/griffin/core/GriffinWebApplication.java ---------------------------------------------------------------------- diff --git a/service/src/main/java/org/apache/griffin/core/GriffinWebApplication.java b/service/src/main/java/org/apache/griffin/core/GriffinWebApplication.java index 035e4a2..004961e 100644 --- a/service/src/main/java/org/apache/griffin/core/GriffinWebApplication.java +++ b/service/src/main/java/org/apache/griffin/core/GriffinWebApplication.java @@ -54,19 +54,19 @@ public class GriffinWebApplication implements CommandLineRunner{ EvaluateRule eRule = new EvaluateRule(1,rules); - Measure measure = new Measure("viewitem_hourly","bevssoj description", Measure.MearuseType.accuracy, "bullyeye", source, target, eRule,"test1"); + Measure measure = new Measure("viewitem_hourly","bevssoj description", Measure.MearuseType.accuracy, "bullseye", source, target, eRule,"test1"); measureRepo.save(measure); DataConnector source2 = new DataConnector(ConnectorType.HIVE, "1.2", configJson1); DataConnector target2 = new DataConnector(ConnectorType.HIVE, "1.2", configJson2); EvaluateRule eRule2 = new EvaluateRule(1,rules); - Measure measure2 = new Measure("search_hourly","test description", Measure.MearuseType.accuracy, "bullyeye", source2, target2, eRule2,"test1"); + Measure measure2 = new Measure("search_hourly","test description", Measure.MearuseType.accuracy, "bullseye", source2, target2, eRule2,"test1"); measureRepo.save(measure2); DataConnector source3 = new DataConnector(ConnectorType.HIVE, "1.2", configJson1); DataConnector target3 = new DataConnector(ConnectorType.HIVE, "1.2", configJson2); EvaluateRule eRule3 = new EvaluateRule(1,rules); - Measure measure3 = new Measure("buy_hourly","test_just_inthere description", Measure.MearuseType.accuracy, "hadoop", source3, target3, eRule3,"test1"); + Measure measure3 = new Measure("buy_hourly","test_just_inthere description", Measure.MearuseType.accuracy, "bullseye", source3, target3, eRule3,"test1"); measureRepo.save(measure3); } http://git-wip-us.apache.org/repos/asf/incubator-griffin/blob/bc1ffbcd/service/src/main/resources/application.properties ---------------------------------------------------------------------- diff --git a/service/src/main/resources/application.properties b/service/src/main/resources/application.properties index bd7fab1..39b6439 100644 --- a/service/src/main/resources/application.properties +++ b/service/src/main/resources/application.properties @@ -1,4 +1,4 @@ -spring.datasource.url= jdbc:mysql://localhost:3306/metastore?autoReconnect=true&useSSL=false +spring.datasource.url= jdbc:mysql://localhost:3306/quartz?autoReconnect=true&useSSL=false spring.datasource.username =griffin spring.datasource.password =123456 @@ -15,8 +15,8 @@ spring.jpa.properties.hibernate.dialect=org.hibernate.dialect.MySQL5Dialect spring.jpa.hibernate.naming-strategy = org.hibernate.cfg.ImprovedNamingStrategy # hive metastore -hive.metastore.uris = thrift://10.9.246.187:9083 +hive.metastore.uris = thrift://localhost: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://localhost:8081 \ No newline at end of file http://git-wip-us.apache.org/repos/asf/incubator-griffin/blob/bc1ffbcd/service/src/main/resources/sparkJob.properties ---------------------------------------------------------------------- diff --git a/service/src/main/resources/sparkJob.properties b/service/src/main/resources/sparkJob.properties index e3eddcc..b6f9932 100644 --- a/service/src/main/resources/sparkJob.properties +++ b/service/src/main/resources/sparkJob.properties @@ -1,17 +1,16 @@ -sparkJob.file=/exe/griffin-measure-batch-0.0.1-SNAPSHOT.jar +sparkJob.file=hdfs:///griffin/griffin-measure-batch.jar sparkJob.className=org.apache.griffin.measure.batch.Application -sparkJob.args_1=/benchmark/test/env.json +sparkJob.args_1=hdfs:///griffin/json/env.json sparkJob.args_3=hdfs,raw -sparkJob.name=griffin-livy-rrr +sparkJob.name=griffin sparkJob.queue=default sparkJob.numExecutors=2 -sparkJob.executorCores=4 -sparkJob.driverMemory=2g -sparkJob.executorMemory=2g +sparkJob.executorCores=1 +sparkJob.driverMemory=1g +sparkJob.executorMemory=1g sparkJob.spark.jars.packages=com.databricks:spark-avro_2.10:2.0.1 -sparkJob.jars_1=/livy/datanucleus-api-jdo-3.2.6.jar -sparkJob.jars_2=/livy/datanucleus-core-3.2.10.jar -sparkJob.jars_3=/livy/datanucleus-rdbms-3.2.9.jar -sparkJob.files_1=/livy/hive-site.xml +sparkJob.jars_1=hdfs:///livy/datanucleus-api-jdo-3.2.6.jar +sparkJob.jars_2=hdfs:///livy/datanucleus-core-3.2.10.jar +sparkJob.jars_3=hdfs:///livy/datanucleus-rdbms-3.2.9.jar sparkJob.dateAndHour=dt,hour -sparkJob.uri=http://10.9.246.187:8998/batches \ No newline at end of file +sparkJob.uri=http://localhost:8998/batches \ No newline at end of file http://git-wip-us.apache.org/repos/asf/incubator-griffin/blob/bc1ffbcd/ui/bower.json ---------------------------------------------------------------------- diff --git a/ui/bower.json b/ui/bower.json index 1932e60..4e49c5d 100644 --- a/ui/bower.json +++ b/ui/bower.json @@ -6,10 +6,10 @@ "jquery": "2.1.4", "bootswatch": "3.3.6", "font-awesome": "4.7.0", - "angular": "1.6.4", - "angular-route": "1.6.4", + "angular": "1.5.8", + "angular-route": "1.5.8", "angular-smart-table": "2.1.7", - "angular-cookies": "1.6.4", + "angular-cookies": "1.5.8", "AngularJS-Toaster": "1.2.0", "requirejs": "2.1.22", "domReady": "2.0.1", http://git-wip-us.apache.org/repos/asf/incubator-griffin/blob/bc1ffbcd/ui/bower_components/AngularJS-Toaster/.bower.json ---------------------------------------------------------------------- diff --git a/ui/bower_components/AngularJS-Toaster/.bower.json b/ui/bower_components/AngularJS-Toaster/.bower.json new file mode 100644 index 0000000..d355a05 --- /dev/null +++ b/ui/bower_components/AngularJS-Toaster/.bower.json @@ -0,0 +1,27 @@ +{ + "name": "AngularJS-Toaster", + "version": "1.2.0", + "main": [ + "toaster.js", + "toaster.css" + ], + "ignore": [ + "**/.*", + "node_modules", + "components" + ], + "dependencies": { + "angular": ">1.2.6", + "angular-animate": ">1.2.8" + }, + "homepage": "https://github.com/jirikavi/AngularJS-Toaster";, + "_release": "1.2.0", + "_resolution": { + "type": "version", + "tag": "1.2.0", + "commit": "e3fe3c2314930d9e7c756f4c1e1cdda04975130d" + }, + "_source": "https://github.com/jirikavi/AngularJS-Toaster.git";, + "_target": "1.2.0", + "_originalSource": "AngularJS-Toaster" +} \ No newline at end of file http://git-wip-us.apache.org/repos/asf/incubator-griffin/blob/bc1ffbcd/ui/bower_components/AngularJS-Toaster/LICENSE ---------------------------------------------------------------------- diff --git a/ui/bower_components/AngularJS-Toaster/LICENSE b/ui/bower_components/AngularJS-Toaster/LICENSE new file mode 100644 index 0000000..51cc495 --- /dev/null +++ b/ui/bower_components/AngularJS-Toaster/LICENSE @@ -0,0 +1,20 @@ +The MIT License (MIT) + +Copyright (c) 2013 jirikavi + +Permission is hereby granted, free of charge, to any person obtaining a copy of +this software and associated documentation files (the "Software"), to deal in +the Software without restriction, including without limitation the rights to +use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of +the Software, and to permit persons to whom the Software is furnished to do so, +subject to the following conditions: + +The above copyright notice and this permission notice shall be included in all +copies or substantial portions of the Software. + +THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS +FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR +COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER +IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN +CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
