ignite-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From voze...@apache.org
Subject [30/31] ignite git commit: Merge branch 'gridgain-7.6.2'
Date Tue, 19 Jul 2016 14:10:16 GMT
Merge branch 'gridgain-7.6.2'

# Conflicts:
#	modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheAbstractFullApiSelfTest.java
#	modules/core/src/test/java/org/apache/ignite/testframework/junits/multijvm/IgniteCacheProcessProxy.java


Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/84fddee1
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/84fddee1
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/84fddee1

Branch: refs/heads/master
Commit: 84fddee18240776fce2466c3d58ac36cefce7e9f
Parents: 96f25ae ecc77b0
Author: vozerov-gridgain <vozerov@gridgain.com>
Authored: Tue Jul 19 17:04:50 2016 +0300
Committer: vozerov-gridgain <vozerov@gridgain.com>
Committed: Tue Jul 19 17:04:50 2016 +0300

----------------------------------------------------------------------
 .../org/apache/ignite/IgniteDataStreamer.java   |   52 +-
 .../IgniteDataStreamerTimeoutException.java     |   45 +
 .../ignite/internal/binary/BinaryContext.java   |    6 +-
 .../internal/binary/BinaryObjectImpl.java       |    8 +
 .../cache/CacheEvictableEntryImpl.java          |   11 +-
 .../processors/cache/GridCacheAdapter.java      |   46 +
 .../processors/cache/GridCacheProcessor.java    |    2 +
 .../dht/GridDhtPartitionTopologyImpl.java       |    9 +-
 .../continuous/CacheContinuousQueryManager.java |    4 +-
 .../datastreamer/DataStreamerImpl.java          |   71 +-
 .../service/GridServiceProcessor.java           |   70 +-
 .../ignite/internal/util/IgniteUtils.java       |   21 +
 .../binary/BinaryMarshallerSelfTest.java        |   41 +
 .../CacheKeepBinaryIterationTest.java           |   36 +-
 ...eContinuousQueryMultiNodesFilteringTest.java |  278 +++
 ...dCacheContinuousQueryNodesFilteringTest.java |  168 ++
 .../datastreamer/DataStreamerTimeoutTest.java   |  163 ++
 .../processors/igfs/IgfsIgniteMock.java         |  501 +++++
 .../internal/processors/igfs/IgfsMock.java      |  397 ++++
 ...rviceDeploymentExceptionPropagationTest.java |   80 +
 .../multijvm/IgniteCacheProcessProxy.java       |    1 -
 .../ignite/testsuites/IgniteCacheTestSuite.java |    2 +
 .../mapreduce/IgniteHadoopMapReducePlanner.java |   48 +-
 .../IgniteHadoopWeightedMapReducePlanner.java   |  846 +++++++++
 .../internal/processors/hadoop/HadoopUtils.java |   81 +
 .../planner/HadoopAbstractMapReducePlanner.java |  116 ++
 .../planner/HadoopMapReducePlanGroup.java       |  150 ++
 .../planner/HadoopMapReducePlanTopology.java    |   89 +
 .../hadoop/HadoopAbstractMapReduceTest.java     |   15 +
 .../HadoopDefaultMapReducePlannerSelfTest.java  |  451 +----
 .../processors/hadoop/HadoopPlannerMockJob.java |  168 ++
 .../HadoopWeightedMapReducePlannerTest.java     |  599 ++++++
 .../HadoopWeightedPlannerMapReduceTest.java     |   38 +
 .../testsuites/IgniteHadoopTestSuite.java       |    8 +-
 .../IgniteCacheQuerySelfTestSuite3.java         |    4 +
 .../ignite/impl/binary/binary_id_resolver.h     |   10 +-
 .../ignite/impl/binary/binary_reader_impl.h     |   21 +-
 .../src/impl/binary/binary_reader_impl.cpp      |   14 +-
 .../src/impl/interop/interop_input_stream.cpp   |   14 +-
 modules/schema-import-db/pom.xml                |   12 +
 modules/schema-import/pom.xml                   |    8 +
 .../ignite/visor/commands/VisorConsole.scala    |    5 +-
 .../commands/alert/VisorAlertCommand.scala      |    2 +-
 .../commands/cache/VisorCacheCommand.scala      |   40 +-
 .../commands/cache/VisorCacheStopCommand.scala  |    2 +-
 .../config/VisorConfigurationCommand.scala      |   23 +-
 .../commands/events/VisorEventsCommand.scala    |   29 +-
 .../visor/commands/gc/VisorGcCommand.scala      |   11 +-
 .../visor/commands/kill/VisorKillCommand.scala  |  184 +-
 .../visor/commands/node/VisorNodeCommand.scala  |   13 +-
 .../visor/commands/vvm/VisorVvmCommand.scala    |   11 +-
 .../scala/org/apache/ignite/visor/visor.scala   |   76 +-
 modules/web-console/DEVNOTES.txt                |   29 +-
 modules/web-console/src/main/js/.gitignore      |    2 -
 .../web-console/src/main/js/app/app.config.js   |   86 +
 modules/web-console/src/main/js/app/app.js      |  274 +++
 .../main/js/app/controllers/auth.controller.js  |   30 +
 .../js/app/controllers/notebooks.controller.js  |   69 +
 .../controllers/reset-password.controller.js    |   51 +
 .../js/app/directives/auto-focus.directive.js   |   26 +
 .../directives/centered/centered.directive.js   |    2 +-
 .../directives/copy-to-clipboard.directive.js   |   29 +
 .../information/information.directive.js        |    4 +-
 .../main/js/app/directives/match.directive.js   |   27 +
 .../app/directives/on-click-focus.directive.js  |   26 +
 .../directives/on-enter-focus-move.directive.js |   29 +
 .../js/app/directives/on-enter.directive.js     |   32 +
 .../js/app/directives/on-escape.directive.js    |   32 +
 .../ui-ace-docker/ui-ace-docker.directive.js    |    4 +-
 .../ui-ace-java/ui-ace-java.directive.js        |    4 +-
 .../ui-ace-pojos/ui-ace-pojos.directive.js      |    4 +-
 .../ui-ace-pom/ui-ace-pom.directive.js          |    4 +-
 .../ui-ace-xml/ui-ace-xml.directive.js          |    4 +-
 .../js/app/filters/domainsValidation.filter.js  |   33 +
 .../src/main/js/app/helpers/jade/mixins.jade    |   26 +-
 modules/web-console/src/main/js/app/index.js    |  241 ---
 .../src/main/js/app/modules/Demo/Demo.module.js |   15 +-
 .../src/main/js/app/modules/ace.module.js       |    4 +-
 .../main/js/app/modules/agent/agent.module.js   |   10 +-
 .../js/app/modules/branding/branding.module.js  |    1 -
 .../modules/branding/header-logo.directive.js   |    4 +-
 .../branding/powered-by-apache.directive.js     |    4 +-
 .../configuration/EventGroups.provider.js       |    2 +-
 .../configuration/generator/Pom.service.js      |    2 +-
 .../js/app/modules/dialog/dialog.factory.js     |    4 +-
 .../field/bs-select-placeholder.directive.js    |    7 +-
 .../modules/form/field/dropdown.directive.js    |    9 +-
 .../js/app/modules/form/field/dropdown.jade     |    4 +-
 .../main/js/app/modules/form/field/field.css    |    2 +-
 .../app/modules/form/field/field.directive.js   |    6 +-
 .../form/field/input/checkbox.directive.js      |    9 +-
 .../form/field/input/datalist.directive.js      |    9 +-
 .../app/modules/form/field/input/datalist.jade  |    2 +-
 .../form/field/input/number.directive.js        |    9 +-
 .../modules/form/field/input/text.directive.js  |   11 +-
 .../app/modules/form/group/group.directive.js   |    4 +-
 .../app/modules/form/group/table.directive.js   |    4 +-
 .../app/modules/form/panel/revert.directive.js  |    4 +-
 .../getting-started/GettingStarted.provider.js  |    2 +-
 .../js/app/modules/loading/loading.directive.js |   10 +-
 .../js/app/modules/loading/loading.service.js   |    2 +-
 .../caches/concurrency.directive.js             |    4 +-
 .../configuration/caches/general.directive.js   |    4 +-
 .../states/configuration/caches/general.jade    |    2 +-
 .../configuration/caches/memory.directive.js    |    4 +-
 .../configuration/caches/query.directive.js     |    4 +-
 .../configuration/caches/rebalance.directive.js |    4 +-
 .../caches/server-near-cache.directive.js       |    4 +-
 .../caches/statistics.directive.js              |    4 +-
 .../configuration/caches/store.directive.js     |    4 +-
 .../states/configuration/caches/store.jade      |    4 +-
 .../configuration/clusters/atomic.directive.js  |    4 +-
 .../clusters/attributes.directive.js            |    4 +-
 .../configuration/clusters/binary.directive.js  |    4 +-
 .../clusters/collision.directive.js             |    4 +-
 .../clusters/collision/custom.directive.js      |    4 +-
 .../clusters/collision/fifo-queue.directive.js  |    4 +-
 .../collision/job-stealing.directive.js         |    4 +-
 .../collision/priority-queue.directive.js       |    4 +-
 .../clusters/communication.directive.js         |    4 +-
 .../clusters/connector.directive.js             |    4 +-
 .../clusters/deployment.directive.js            |    4 +-
 .../clusters/discovery.directive.js             |    4 +-
 .../configuration/clusters/events.directive.js  |    4 +-
 .../clusters/failover.directive.js              |    4 +-
 .../configuration/clusters/general.directive.js |    4 +-
 .../general/discovery/cloud.directive.js        |    4 +-
 .../general/discovery/google.directive.js       |    4 +-
 .../general/discovery/jdbc.directive.js         |    4 +-
 .../general/discovery/multicast.directive.js    |    4 +-
 .../clusters/general/discovery/s3.directive.js  |    4 +-
 .../general/discovery/shared.directive.js       |    4 +-
 .../clusters/general/discovery/vm.directive.js  |    4 +-
 .../clusters/general/discovery/vm.jade          |    2 +-
 .../general/discovery/zookeeper.directive.js    |    4 +-
 .../bounded-exponential-backoff.directive.js    |    4 +-
 .../zookeeper/retrypolicy/custom.directive.js   |    4 +-
 .../exponential-backoff.directive.js            |    4 +-
 .../zookeeper/retrypolicy/forever.directive.js  |    4 +-
 .../zookeeper/retrypolicy/n-times.directive.js  |    4 +-
 .../zookeeper/retrypolicy/one-time.directive.js |    4 +-
 .../retrypolicy/until-elapsed.directive.js      |    4 +-
 .../configuration/clusters/igfs.directive.js    |    4 +-
 .../configuration/clusters/logger.directive.js  |    4 +-
 .../clusters/logger/custom.directive.js         |    4 +-
 .../clusters/logger/log4j.directive.js          |    4 +-
 .../clusters/logger/log4j2.directive.js         |    4 +-
 .../clusters/marshaller.directive.js            |    4 +-
 .../configuration/clusters/metrics.directive.js |    4 +-
 .../configuration/clusters/ssl.directive.js     |    4 +-
 .../configuration/clusters/swap.directive.js    |    4 +-
 .../configuration/clusters/thread.directive.js  |    4 +-
 .../configuration/clusters/time.directive.js    |    4 +-
 .../clusters/transactions.directive.js          |    4 +-
 .../configuration/domains/general.directive.js  |    4 +-
 .../configuration/domains/query.directive.js    |    4 +-
 .../states/configuration/domains/query.jade     |   14 +-
 .../configuration/domains/store.directive.js    |    4 +-
 .../states/configuration/domains/store.jade     |    8 +-
 .../states/configuration/igfs/dual.directive.js |    4 +-
 .../modules/states/configuration/igfs/dual.jade |    4 +-
 .../igfs/fragmentizer.directive.js              |    4 +-
 .../configuration/igfs/general.directive.js     |    4 +-
 .../states/configuration/igfs/ipc.directive.js  |    4 +-
 .../states/configuration/igfs/misc.directive.js |    4 +-
 .../modules/states/configuration/igfs/misc.jade |   12 +-
 .../configuration/igfs/secondary.directive.js   |    4 +-
 .../configuration/preview-panel.directive.js    |    4 +-
 .../configuration/summary/summary.controller.js |   17 +-
 .../main/js/app/modules/states/signin.state.js  |    3 +-
 .../main/js/app/modules/user/Auth.service.js    |   10 +-
 .../main/js/app/services/ChartColors.service.js |    2 +-
 .../src/main/js/app/services/Clone.service.js   |   64 +
 .../src/main/js/app/services/Confirm.service.js |   70 +
 .../js/app/services/ConfirmBatch.service.js     |   92 +
 .../js/app/services/CopyToClipboard.service.js  |   50 +
 .../main/js/app/services/Countries.service.js   |    2 +-
 .../src/main/js/app/services/Focus.service.js   |   33 +
 .../main/js/app/services/JavaTypes.service.js   |    6 +-
 .../main/js/app/services/LegacyTable.service.js |  205 +++
 .../main/js/app/services/LegacyUtils.service.js |  948 ++++++++++
 .../main/js/app/services/Messages.service.js    |   63 +
 .../js/app/services/ModelNormalizer.service.js  |   59 +
 .../app/services/UnsavedChangesGuard.service.js |   38 +
 .../src/main/js/app/services/cleanup.service.js |   46 -
 .../src/main/js/app/services/confirm.service.js |   70 -
 modules/web-console/src/main/js/app/vendor.js   |   54 +
 .../src/main/js/build/system.config.js          |  424 -----
 .../src/main/js/controllers/admin-controller.js |   33 +-
 .../main/js/controllers/caches-controller.js    |   97 +-
 .../main/js/controllers/clusters-controller.js  |  142 +-
 .../src/main/js/controllers/common-module.js    | 1741 ------------------
 .../main/js/controllers/domains-controller.js   |  295 ++-
 .../src/main/js/controllers/igfs-controller.js  |  126 +-
 .../main/js/controllers/profile-controller.js   |   27 +-
 .../src/main/js/controllers/sql-controller.js   |   75 +-
 .../src/main/js/generator/generator-java.js     |    7 +-
 .../src/main/js/generator/generator-xml.js      |    5 +-
 .../src/main/js/gulpfile.babel.js/paths.js      |   65 +-
 .../main/js/gulpfile.babel.js/tasks/build.js    |    2 +-
 .../main/js/gulpfile.babel.js/tasks/bundle.js   |   68 +-
 .../main/js/gulpfile.babel.js/tasks/clean.js    |    5 +-
 .../main/js/gulpfile.babel.js/tasks/connect.js  |   47 -
 .../src/main/js/gulpfile.babel.js/tasks/copy.js |   32 +-
 .../main/js/gulpfile.babel.js/tasks/eslint.js   |   46 -
 .../gulpfile.babel.js/tasks/ignite-modules.js   |    9 +-
 .../src/main/js/gulpfile.babel.js/tasks/sass.js |   25 -
 .../main/js/gulpfile.babel.js/tasks/watch.js    |   20 +-
 .../main/js/gulpfile.babel.js/webpack/common.js |  192 ++
 .../webpack/environments/development.js         |   64 +
 .../webpack/environments/production.js          |   45 +
 .../main/js/gulpfile.babel.js/webpack/index.js  |   32 +
 .../webpack/plugins/progress.js                 |   82 +
 modules/web-console/src/main/js/package.json    |  301 +--
 .../stylesheets/_font-awesome-custom.scss       |   27 +-
 .../src/main/js/public/stylesheets/style.scss   |   10 +-
 modules/web-console/src/main/js/serve/agent.js  |   89 +-
 .../web-console/src/main/js/serve/keys/test.crt |   13 -
 .../web-console/src/main/js/serve/keys/test.key |   18 -
 .../src/main/js/serve/routes/agent.js           |   30 +-
 .../js/views/configuration/domains-import.jade  |    2 +-
 .../main/js/views/configuration/domains.jade    |    8 +-
 .../main/js/views/configuration/summary.jade    |    2 +-
 .../src/main/js/views/includes/header.jade      |   19 +-
 .../web-console/src/main/js/views/index.jade    |   18 -
 .../web-console/src/main/js/views/reset.jade    |    4 +-
 .../src/main/js/views/settings/profile.jade     |   16 +-
 .../web-console/src/main/js/views/signin.jade   |   52 +-
 .../src/main/js/views/sql/notebook-new.jade     |    2 +-
 .../src/main/js/views/sql/paragraph-rate.jade   |    2 +-
 .../web-console/src/main/js/views/sql/sql.jade  |    6 +-
 .../main/js/views/templates/agent-download.jade |    2 +-
 .../src/main/js/views/templates/clone.jade      |    2 +-
 parent/pom.xml                                  |    8 +-
 234 files changed, 8188 insertions(+), 4575 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/ignite/blob/84fddee1/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheAdapter.java
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/ignite/blob/84fddee1/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtPartitionTopologyImpl.java
----------------------------------------------------------------------


Mime
View raw message