Merge remote-tracking branch 'remotes/origin/ignite-sprint-5' into ignite-709_2
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/98743efe Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/98743efe Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/98743efe Branch: refs/heads/ignite-836_2 Commit: 98743efe6a0a3f99a42c1a0e576152546d87f67d Parents: 4d5b899 56e67e8 Author: sevdokimov <sevdoki...@gridgain.com> Authored: Thu May 14 17:38:05 2015 +0300 Committer: sevdokimov <sevdoki...@gridgain.com> Committed: Thu May 14 17:38:05 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 +++++------ .../processors/cache/GridCacheContext.java | 7 + .../processors/cache/GridCacheMapEntry.java | 70 ++++--- .../GridDistributedCacheAdapter.java | 210 ++++++++++++------- .../distributed/dht/GridDhtCacheAdapter.java | 16 +- .../dht/GridDhtOffHeapCacheEntry.java | 63 ++++++ .../dht/GridDhtTransactionalCacheAdapter.java | 9 +- .../distributed/dht/GridNoStorageCacheMap.java | 4 +- .../dht/atomic/GridDhtAtomicCache.java | 3 + .../atomic/GridDhtAtomicOffHeapCacheEntry.java | 63 ++++++ .../dht/colocated/GridDhtColocatedCache.java | 5 +- .../GridDhtColocatedOffHeapCacheEntry.java | 63 ++++++ .../distributed/near/GridNearCacheAdapter.java | 3 + .../near/GridNearOffHeapCacheEntry.java | 60 ++++++ .../cache/local/GridLocalCacheEntry.java | 18 ++ .../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 --------- .../resources/META-INF/classnames.properties | 1 - .../cache/CacheOffheapMapEntrySelfTest.java | 168 +++++++++++++++ .../cache/CacheRemoveAllSelfTest.java | 81 +++++++ .../distributed/GridCacheLockAbstractTest.java | 2 - ...achePartitionedNearDisabledLockSelfTest.java | 47 +++++ .../near/NoneRebalanceModeSelfTest.java | 67 ++++++ .../GridCacheReplicatedLockSelfTest.java | 5 + .../GridCacheLocalIsolatedNodesSelfTest.java | 18 +- .../discovery/tcp/TcpDiscoveryRestartTest.java | 199 ++++++++++++++++++ .../testsuites/IgniteCacheTestSuite2.java | 2 + .../testsuites/IgniteCacheTestSuite4.java | 4 + .../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 +-- 67 files changed, 1872 insertions(+), 998 deletions(-) ----------------------------------------------------------------------
