Merge remote-tracking branch 'remotes/origin/sprint-1' into ignite-239
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/be8f2562 Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/be8f2562 Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/be8f2562 Branch: refs/heads/sprint-2 Commit: be8f2562de9b33fb231a82d834399553ccf52359 Parents: 60d6780 d7f173c Author: ivasilinets <ivasilin...@gridgain.com> Authored: Mon Feb 16 16:06:00 2015 +0300 Committer: ivasilinets <ivasilin...@gridgain.com> Committed: Mon Feb 16 16:06:00 2015 +0300 ---------------------------------------------------------------------- .../store/dummy/CacheDummyPersonStore.java | 11 ++ .../hibernate/CacheHibernatePersonStore.java | 12 ++ .../store/jdbc/CacheJdbcPersonStore.java | 11 +- .../cache/store/CacheLoadOnlyStoreAdapter.java | 2 +- .../apache/ignite/cache/store/CacheStore.java | 31 +--- .../ignite/cache/store/CacheStoreAdapter.java | 2 +- .../ignite/cache/store/CacheStoreSession.java | 3 + .../store/jdbc/CacheAbstractJdbcStore.java | 24 ++- .../cache/store/jdbc/CacheJdbcBlobStore.java | 11 ++ .../apache/ignite/cluster/ClusterMetrics.java | 41 +++++ .../org/apache/ignite/compute/ComputeTask.java | 3 +- .../configuration/CacheConfiguration.java | 26 +-- .../ClusterLocalNodeMetricsMXBeanImpl.java | 10 ++ .../ignite/internal/ClusterMetricsSnapshot.java | 52 ++++++ .../discovery/GridDiscoveryManager.java | 2 + .../cache/CacheStoreBalancingWrapper.java | 2 +- .../processors/cache/GridCacheAdapter.java | 2 +- .../cache/GridCacheDeploymentManager.java | 33 ++-- .../cache/GridCacheLoaderWriterStore.java | 2 +- .../processors/cache/GridCacheMapEntry.java | 4 +- .../processors/cache/GridCacheProcessor.java | 2 +- .../processors/cache/GridCacheStoreManager.java | 84 +++++---- .../cache/GridCacheWriteBehindStore.java | 2 +- .../dht/atomic/GridDhtAtomicCache.java | 2 +- .../transactions/IgniteTxLocalAdapter.java | 2 +- .../GridTransactionalCacheQueueImpl.java | 4 +- .../processors/query/GridQueryProcessor.java | 6 +- .../processors/resource/GridResourceIoc.java | 48 +++-- .../resource/GridResourceProcessor.java | 21 +++ .../mxbean/ClusterLocalNodeMetricsMXBean.java | 9 + .../resources/CacheStoreSessionResource.java | 41 +++++ .../apache/ignite/resources/package-info.java | 22 +++ .../org/apache/ignite/resources/package.html | 25 --- .../store/GridCacheBalancingStoreSelfTest.java | 2 +- .../cache/store/GridGeneratingTestStore.java | 2 +- .../store/jdbc/CacheJdbcPojoStoreTest.java | 2 +- ...idCacheConfigurationConsistencySelfTest.java | 2 +- .../cache/GridCacheGenericTestStore.java | 2 +- .../cache/GridCacheLifecycleAwareSelfTest.java | 2 +- .../cache/GridCacheStorePutxSelfTest.java | 2 +- .../processors/cache/GridCacheTestStore.java | 15 +- .../IgniteTxStoreExceptionAbstractSelfTest.java | 2 +- .../IgniteCrossCacheTxStoreSelfTest.java | 14 +- .../near/GridCacheNearMetricsSelfTest.java | 4 +- ...idCachePartitionedHitsAndMissesSelfTest.java | 177 +++++++++++++++++++ .../IgniteCacheStoreSessionAbstractTest.java | 20 ++- ...ClusterMetricsSnapshotSerializeSelfTest.java | 6 +- .../cache/GridAbstractCacheStoreSelfTest.java | 2 +- .../IgniteCacheMetricsSelfTestSuite.java | 21 +-- .../hibernate/CacheHibernateBlobStore.java | 11 ++ ...idCachePartitionedHitsAndMissesSelfTest.java | 176 ------------------ .../IgniteH2IndexingSpiTestSuite.java | 2 - .../commands/cache/VisorCacheCommand.scala | 2 +- .../commands/top/VisorTopologyCommand.scala | 3 +- .../scala/org/apache/ignite/visor/visor.scala | 2 +- .../cache/VisorCacheClearCommandSpec.scala | 4 +- .../commands/cache/VisorCacheCommandSpec.scala | 4 +- .../cache/VisorCacheCompactCommandSpec.scala | 4 +- .../cswap/VisorCacheSwapCommandSpec.scala | 4 +- pom.xml | 40 ++++- 60 files changed, 707 insertions(+), 372 deletions(-) ----------------------------------------------------------------------
