You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ignite.apache.org by vo...@apache.org on 2016/11/17 10:51:41 UTC
[18/50] [abbrv] ignite git commit: Merge branch 'ignite-1.7.3' into
ignite-1.7.4
Merge branch 'ignite-1.7.3' into ignite-1.7.4
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/34859398
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/34859398
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/34859398
Branch: refs/heads/ignite-2693
Commit: 348593986b56ddfcec4a4455e49d9b279eae4dc8
Parents: 74f8308 a62a013
Author: devozerov <vo...@gridgain.com>
Authored: Sat Nov 5 13:28:03 2016 +0300
Committer: thatcoach <pp...@list.ru>
Committed: Sat Nov 5 13:29:08 2016 +0300
----------------------------------------------------------------------
.../java/org/apache/ignite/IgniteScheduler.java | 13 +
.../cache/query/QueryCancelledException.java | 35 +
.../apache/ignite/cache/query/QueryCursor.java | 8 +-
.../ignite/cache/query/SqlFieldsQuery.java | 26 +
.../org/apache/ignite/cache/query/SqlQuery.java | 25 +
.../ignite/internal/IgniteSchedulerImpl.java | 18 +
.../processors/cache/QueryCursorImpl.java | 92 +-
.../internal/processors/job/GridJobWorker.java | 10 +-
.../processors/query/GridQueryCancel.java | 83 +
.../processors/query/GridQueryFieldsResult.java | 3 +-
.../query/GridQueryFieldsResultAdapter.java | 3 +-
.../processors/query/GridQueryIndexing.java | 11 +-
.../processors/query/GridQueryProcessor.java | 105 +-
.../twostep/messages/GridQueryFailResponse.java | 36 +-
.../h2/twostep/messages/GridQueryRequest.java | 31 +-
.../service/GridServiceProcessor.java | 61 +-
.../internal/util/SerializableTransient.java | 58 +
.../util/nio/ssl/BlockingSslHandler.java | 50 +-
.../ignite/marshaller/MarshallerUtils.java | 22 +
.../optimized/OptimizedClassDescriptor.java | 90 +-
...CommunicationSpiSslSmallBuffersSelfTest.java | 43 +
.../IgniteSpiCommunicationSelfTestSuite.java | 7 +-
.../processors/query/h2/IgniteH2Indexing.java | 160 +-
.../query/h2/twostep/GridMapQueryExecutor.java | 66 +-
.../query/h2/twostep/GridMergeIndex.java | 12 +-
.../h2/twostep/GridReduceQueryExecutor.java | 117 +-
.../h2/twostep/msg/GridH2QueryRequest.java | 42 +-
...niteCacheDistributedQueryCancelSelfTest.java | 176 +
...butedQueryStopOnCancelOrTimeoutSelfTest.java | 253 ++
...cheQueryAbstractDistributedJoinSelfTest.java | 290 ++
...QueryNodeRestartDistributedJoinSelfTest.java | 262 +-
.../IgniteCacheQueryNodeRestartSelfTest2.java | 125 +-
...nCancelOrTimeoutDistributedJoinSelfTest.java | 138 +
...eCacheLocalQueryCancelOrTimeoutSelfTest.java | 158 +
.../h2/GridIndexingSpiAbstractSelfTest.java | 4 +-
.../IgniteCacheQuerySelfTestSuite.java | 4 +-
.../IgniteCacheQuerySelfTestSuite2.java | 10 +
modules/web-console/DEVNOTES.txt | 2 +-
modules/web-console/backend/app/agent.js | 26 +-
modules/web-console/backend/app/browser.js | 14 +-
modules/web-console/backend/app/mongo.js | 207 +-
.../backend/routes/demo/domains.json | 15 +-
modules/web-console/backend/services/agents.js | 1 +
modules/web-console/backend/services/auth.js | 8 +-
modules/web-console/backend/services/caches.js | 14 +-
.../web-console/backend/services/clusters.js | 19 +-
modules/web-console/backend/services/domains.js | 12 +-
modules/web-console/backend/services/igfss.js | 12 +-
.../backend/test/unit/AuthService.test.js | 4 +-
.../backend/test/unit/CacheService.test.js | 135 +-
.../backend/test/unit/ClusterService.test.js | 132 +-
.../backend/test/unit/DomainService.test.js | 144 +-
.../backend/test/unit/IgfsService.test.js | 122 +-
modules/web-console/frontend/.eslintrc | 6 +-
modules/web-console/frontend/app/app.config.js | 10 +
modules/web-console/frontend/app/app.js | 37 +-
.../web-console/frontend/app/data/dialects.json | 9 +
.../frontend/app/data/java-classes.json | 4 +-
.../frontend/app/decorator/tooltip.js | 13 +-
.../app/directives/on-focus-out.directive.js | 37 +
.../directives/restore-input-focus.directive.js | 24 +
.../ui-ace-java/ui-ace-java.controller.js | 78 +-
.../ui-ace-java/ui-ace-java.directive.js | 100 +-
.../ui-ace-pojos/ui-ace-pojos.controller.js | 2 +-
.../ui-ace-pom/ui-ace-pom.controller.js | 2 +-
.../ui-ace-sharp/ui-ace-sharp.controller.js | 32 +
.../ui-ace-sharp/ui-ace-sharp.directive.js | 133 +
.../directives/ui-ace-sharp/ui-ace-sharp.jade | 22 +
.../ui-ace-spring/ui-ace-spring.controller.js | 88 +
.../ui-ace-spring/ui-ace-spring.directive.js | 66 +
.../directives/ui-ace-spring/ui-ace-spring.jade | 17 +
.../ui-ace-xml/ui-ace-xml.controller.js | 27 -
.../ui-ace-xml/ui-ace-xml.directive.js | 147 -
.../app/directives/ui-ace-xml/ui-ace-xml.jade | 17 -
.../ui-grid-settings/ui-grid-settings.jade | 33 +
.../ui-grid-settings/ui-grid-settings.scss | 38 +
.../frontend/app/filters/default-name.filter.js | 21 +
.../frontend/app/filters/hasPojo.filter.js | 5 +-
.../helpers/jade/form/form-field-feedback.jade | 5 +-
.../frontend/app/helpers/jade/mixins.jade | 219 +-
.../frontend/app/modules/agent/agent.module.js | 10 +-
.../modules/configuration/Version.service.js | 82 +-
.../configuration/configuration.module.js | 30 +-
.../generator/AbstractTransformer.js | 341 ++
.../modules/configuration/generator/Beans.js | 379 ++
.../generator/ConfigurationGenerator.js | 1785 +++++++++
.../configuration/generator/Java.service.js | 21 -
.../generator/JavaTransformer.service.js | 1721 +++++++++
.../generator/PlatformGenerator.js | 522 +++
.../configuration/generator/Pom.service.js | 173 +-
.../generator/Properties.service.js | 74 +
.../configuration/generator/Readme.service.js | 79 +
.../generator/SharpTransformer.service.js | 243 ++
.../generator/SpringTransformer.service.js | 325 ++
.../configuration/generator/StringBuilder.js | 76 +
.../configuration/generator/Xml.service.js | 21 -
.../defaults/cache.platform.provider.js | 60 +
.../generator/defaults/cache.provider.js | 129 +
.../defaults/cluster.platform.provider.js | 49 +
.../generator/defaults/cluster.provider.js | 293 ++
.../generator/defaults/igfs.provider.js | 68 +
.../configuration/generator/generator-common.js | 625 +++
.../configuration/generator/generator-java.js | 3617 ++++++++++++++++++
.../generator/generator-optional.js | 25 +
.../configuration/generator/generator-spring.js | 2111 ++++++++++
.../app/modules/form/field/input/select.scss | 21 -
.../app/modules/form/field/input/text.scss | 1 -
.../frontend/app/modules/form/form.module.js | 10 +-
.../app/modules/form/panel/revert.directive.js | 4 +-
.../modules/form/services/FormGUID.service.js | 22 +
.../validator/java-built-in-class.directive.js | 6 +-
.../form/validator/java-identifier.directive.js | 6 +-
.../form/validator/java-keywords.directive.js | 15 +-
.../java-package-specified.directive.js | 6 +-
.../frontend/app/modules/nodes/Nodes.service.js | 69 +
.../modules/nodes/nodes-dialog.controller.js | 68 +
.../app/modules/nodes/nodes-dialog.jade | 35 +
.../app/modules/nodes/nodes-dialog.scss | 37 +
.../frontend/app/modules/nodes/nodes.module.js | 27 +
.../frontend/app/modules/sql/sql.controller.js | 269 +-
.../app/modules/states/configuration.state.js | 2 +-
.../configuration/caches/client-near-cache.jade | 50 +
.../states/configuration/caches/general.jade | 3 +
.../states/configuration/caches/memory.jade | 14 +-
.../configuration/caches/near-cache-client.jade | 51 +
.../configuration/caches/near-cache-server.jade | 52 +
.../configuration/caches/node-filter.jade | 49 -
.../states/configuration/caches/query.jade | 30 +-
.../states/configuration/caches/rebalance.jade | 3 +-
.../configuration/caches/server-near-cache.jade | 51 -
.../states/configuration/caches/store.jade | 84 +-
.../states/configuration/clusters/atomic.jade | 3 +-
.../configuration/clusters/attributes.jade | 4 +-
.../states/configuration/clusters/binary.jade | 28 +-
.../configuration/clusters/cache-key-cfg.jade | 9 +-
.../configuration/clusters/checkpoint.jade | 85 +
.../configuration/clusters/checkpoint/fs.jade | 66 +
.../configuration/clusters/checkpoint/jdbc.jade | 45 +
.../configuration/clusters/checkpoint/s3.jade | 174 +
.../configuration/clusters/collision.jade | 13 +-
.../clusters/collision/job-stealing.jade | 2 +-
.../configuration/clusters/communication.jade | 3 +-
.../configuration/clusters/connector.jade | 3 +-
.../configuration/clusters/deployment.jade | 3 +-
.../configuration/clusters/discovery.jade | 3 +-
.../states/configuration/clusters/events.jade | 37 +-
.../states/configuration/clusters/failover.jade | 19 +-
.../states/configuration/clusters/general.jade | 3 +
.../clusters/general/discovery/zookeeper.jade | 2 +
.../states/configuration/clusters/igfs.jade | 3 +-
.../configuration/clusters/load-balancing.jade | 104 +
.../configuration/clusters/marshaller.jade | 3 +-
.../states/configuration/clusters/odbc.jade | 3 +-
.../states/configuration/clusters/ssl.jade | 7 +-
.../states/configuration/clusters/swap.jade | 3 +-
.../configuration/clusters/transactions.jade | 6 +-
.../states/configuration/domains/general.jade | 12 +-
.../states/configuration/domains/query.jade | 40 +-
.../states/configuration/domains/store.jade | 15 +-
.../states/configuration/igfs/general.jade | 3 +
.../modules/states/configuration/igfs/ipc.jade | 2 +-
.../modules/states/configuration/igfs/misc.jade | 4 +-
.../states/configuration/igfs/secondary.jade | 3 +-
.../configuration/summary/summary.controller.js | 106 +-
.../app/services/ErrorPopover.service.js | 2 +-
.../frontend/app/services/FormUtils.service.js | 6 +-
.../frontend/app/services/JavaTypes.service.js | 70 +-
.../app/services/LegacyTable.service.js | 24 +-
.../app/services/LegacyUtils.service.js | 128 +-
.../frontend/app/services/SqlTypes.service.js | 6 +-
modules/web-console/frontend/app/vendor.js | 3 +-
.../frontend/controllers/caches-controller.js | 121 +-
.../frontend/controllers/clusters-controller.js | 177 +-
.../frontend/controllers/domains-controller.js | 148 +-
.../frontend/controllers/igfs-controller.js | 6 +-
.../frontend/generator/generator-common.js | 625 ---
.../frontend/generator/generator-java.js | 3611 -----------------
.../frontend/generator/generator-optional.js | 25 -
.../frontend/generator/generator-properties.js | 175 -
.../frontend/generator/generator-readme.js | 85 -
.../frontend/generator/generator-xml.js | 2108 ----------
.../frontend/gulpfile.babel.js/paths.js | 31 +-
.../frontend/gulpfile.babel.js/tasks/jade.js | 21 +-
.../frontend/gulpfile.babel.js/tasks/watch.js | 6 +-
.../gulpfile.babel.js/webpack/common.js | 2 +-
.../webpack/environments/development.js | 17 +-
.../webpack/environments/test.js | 52 +
.../frontend/gulpfile.babel.js/webpack/index.js | 4 +-
modules/web-console/frontend/package.json | 16 +-
.../frontend/public/stylesheets/style.scss | 75 +-
.../frontend/test/karma.conf.babel.js | 91 +
modules/web-console/frontend/test/karma.conf.js | 98 +-
.../frontend/test/unit/JavaTransformer.test.js | 57 +
.../frontend/test/unit/JavaTypes.test.js | 23 +-
.../frontend/test/unit/SharpTransformer.test.js | 55 +
.../test/unit/SpringTransformer.test.js | 57 +
.../frontend/test/unit/SqlTypes.test.js | 17 -
.../frontend/test/unit/Version.test.js | 82 +
.../test/unit/defaultName.filter.test.js | 38 +
.../frontend/views/configuration/caches.jade | 3 +-
.../frontend/views/configuration/clusters.jade | 3 +-
.../views/configuration/domains-import.jade | 14 +-
.../summary-project-structure.jade | 2 +-
.../frontend/views/configuration/summary.jade | 57 +-
.../frontend/views/sql/cache-metadata.jade | 2 +-
.../frontend/views/sql/notebook-new.jade | 4 +-
modules/web-console/frontend/views/sql/sql.jade | 80 +-
.../views/templates/agent-download.jade | 6 +-
.../frontend/views/templates/batch-confirm.jade | 4 +-
.../frontend/views/templates/clone.jade | 4 +-
.../frontend/views/templates/confirm.jade | 4 +-
.../frontend/views/templates/demo-info.jade | 4 +-
.../views/templates/getting-started.jade | 4 +-
.../frontend/views/templates/message.jade | 4 +-
.../frontend/views/templates/select.jade | 2 +-
.../ignite/console/demo/AgentClusterDemo.java | 2 +-
216 files changed, 18733 insertions(+), 8894 deletions(-)
----------------------------------------------------------------------