Merge remote-tracking branch 'remotes/origin/ignite-sprint-5' into ignite-630
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/db24c992 Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/db24c992 Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/db24c992 Branch: refs/heads/ignite-630 Commit: db24c9925639266d3380bb44d1cdfac337b85d2c Parents: e1b38fc 56e67e8 Author: avinogradov <avinogra...@gridgain.com> Authored: Thu May 14 17:56:01 2015 +0300 Committer: avinogradov <avinogra...@gridgain.com> Committed: Thu May 14 17:56:01 2015 +0300 ---------------------------------------------------------------------- bin/ignite-schema-import.bat | 2 +- bin/ignite-schema-import.sh | 2 +- bin/ignite.bat | 2 +- bin/ignite.sh | 2 +- bin/ignitevisorcmd.bat | 2 +- bin/ignitevisorcmd.sh | 2 +- .../processors/cache/GridCacheAdapter.java | 119 +++++------ .../GridDistributedCacheAdapter.java | 210 ++++++++++++------- .../GridDhtPartitionsExchangeFuture.java | 2 +- .../processors/resource/GridResourceField.java | 5 +- .../processors/resource/GridResourceIoc.java | 20 +- .../resource/GridResourceProcessor.java | 16 +- .../ignite/internal/util/IgniteUtils.java | 3 + .../util/lang/GridComputeJobWrapper.java | 96 --------- .../spi/discovery/tcp/TcpDiscoverySpi.java | 2 - .../resources/META-INF/classnames.properties | 1 - .../cache/CacheRemoveAllSelfTest.java | 81 +++++++ .../near/NoneRebalanceModeSelfTest.java | 67 ++++++ .../testsuites/IgniteCacheTestSuite2.java | 1 + .../testsuites/IgniteCacheTestSuite4.java | 2 + .../scalar/tests/ScalarCacheQueriesSpec.scala | 154 +++++++------- .../ignite/scalar/tests/ScalarCacheSpec.scala | 23 +- .../scalar/tests/ScalarConversionsSpec.scala | 43 ++-- .../scalar/tests/ScalarProjectionSpec.scala | 128 ++++++----- .../scalar/tests/ScalarReturnableSpec.scala | 41 ++-- modules/visor-console/pom.xml | 2 +- .../ignite/visor/VisorRuntimeBaseSpec.scala | 2 +- .../visor/commands/VisorArgListSpec.scala | 60 +++--- .../commands/VisorFileNameCompleterSpec.scala | 34 +-- .../commands/ack/VisorAckCommandSpec.scala | 20 +- .../commands/alert/VisorAlertCommandSpec.scala | 68 +++--- .../cache/VisorCacheClearCommandSpec.scala | 48 ++--- .../commands/cache/VisorCacheCommandSpec.scala | 66 +++--- .../config/VisorConfigurationCommandSpec.scala | 8 +- .../cswap/VisorCacheSwapCommandSpec.scala | 24 +-- .../deploy/VisorDeployCommandSpec.scala | 10 +- .../disco/VisorDiscoveryCommandSpec.scala | 46 ++-- .../events/VisorEventsCommandSpec.scala | 28 +-- .../visor/commands/gc/VisorGcCommandSpec.scala | 30 +-- .../commands/help/VisorHelpCommandSpec.scala | 57 ++--- .../commands/kill/VisorKillCommandSpec.scala | 58 ++--- .../commands/log/VisorLogCommandSpec.scala | 10 +- .../commands/mem/VisorMemoryCommandSpec.scala | 77 +++---- .../commands/node/VisorNodeCommandSpec.scala | 22 +- .../commands/open/VisorOpenCommandSpec.scala | 16 +- .../commands/ping/VisorPingCommandSpec.scala | 16 +- .../commands/start/VisorStartCommandSpec.scala | 126 +++++------ .../commands/tasks/VisorTasksCommandSpec.scala | 112 +++++----- .../commands/top/VisorTopologyCommandSpec.scala | 52 ++--- .../commands/vvm/VisorVvmCommandSpec.scala | 30 +-- 50 files changed, 1086 insertions(+), 962 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/db24c992/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheAdapter.java ----------------------------------------------------------------------
