# ignite-709_3 merge
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/c1913c45 Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/c1913c45 Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/c1913c45 Branch: refs/heads/ignite-709_3 Commit: c1913c45175485543d51e167f7b548e52bdbe13d Parents: 4717ea9 98743ef Author: sboikov <sboi...@gridgain.com> Authored: Fri May 15 09:18:07 2015 +0300 Committer: sboikov <sboi...@gridgain.com> Committed: Fri May 15 09:18:07 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 ++++++ .../GridDhtPartitionsExchangeFuture.java | 7 - .../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 --------- .../discovery/tcp/TcpClientDiscoverySpi.java | 151 +++++++------ .../tcp/internal/TcpDiscoveryNodesRing.java | 2 +- .../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 +- .../tcp/TcpClientDiscoverySpiSelfTest.java | 37 ++++ .../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 +-- 71 files changed, 1992 insertions(+), 1075 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/c1913c45/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/GridDhtPartitionsExchangeFuture.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/c1913c45/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteCacheTestSuite4.java ---------------------------------------------------------------------- diff --cc modules/core/src/test/java/org/apache/ignite/testsuites/IgniteCacheTestSuite4.java index 39f331c,aaf7e5b..b3eb899 --- a/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteCacheTestSuite4.java +++ b/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteCacheTestSuite4.java @@@ -125,8 -125,11 +125,12 @@@ public class IgniteCacheTestSuite4 exte suite.addTestSuite(IgniteExchangeFutureHistoryTest.class); suite.addTestSuite(CacheNoValueClassOnServerNodeTest.class); + suite.addTestSuite(IgniteSystemCacheOnClientTest.class); + suite.addTestSuite(CacheRemoveAllSelfTest.class); + + suite.addTestSuite(CacheOffheapMapEntrySelfTest.class); + return suite; } }
