You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ignite.apache.org by sb...@apache.org on 2015/07/07 15:25:34 UTC

[03/47] incubator-ignite git commit: Merge branches 'sprint-1' and 'sprint-1-release' of https://git-wip-us.apache.org/repos/asf/incubator-ignite into sprint-1-release

Merge branches 'sprint-1' and 'sprint-1-release' of https://git-wip-us.apache.org/repos/asf/incubator-ignite into sprint-1-release


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

Branch: refs/heads/ignite-648
Commit: 9b3bae79d5a51406a9b993a5f4ea4480bf795cb7
Parents: 34d0e44 3ba4f3c
Author: Yakov Zhdanov <yz...@gridgain.com>
Authored: Mon Feb 16 15:14:20 2015 +0300
Committer: Yakov Zhdanov <yz...@gridgain.com>
Committed: Mon Feb 16 15:14:20 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 +-
 .../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 +++
 .../node/VisorNodeEventsCollectorTask.java      |   9 +-
 .../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                                         |  38 +++-
 59 files changed, 696 insertions(+), 355 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/9b3bae79/pom.xml
----------------------------------------------------------------------