You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ignite.apache.org by nt...@apache.org on 2015/11/17 09:20:47 UTC
[31/31] ignite git commit: Merge branch 'ignite-1.5' into ignite-426-2
Merge branch 'ignite-1.5' into ignite-426-2
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/d196c06b
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/d196c06b
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/d196c06b
Branch: refs/heads/ignite-426-2
Commit: d196c06beb8aebf3643a96c6b734ebf3a6b788cf
Parents: 43a60d4 8014712
Author: nikolay_tikhonov <nt...@gridgain.com>
Authored: Tue Nov 17 11:18:37 2015 +0300
Committer: nikolay_tikhonov <nt...@gridgain.com>
Committed: Tue Nov 17 11:18:37 2015 +0300
----------------------------------------------------------------------
.../java/org/apache/ignite/IgniteCache.java | 1 +
.../eviction/random/RandomEvictionPolicy.java | 4 +
.../cache/store/CacheStoreSessionListener.java | 9 +-
.../store/jdbc/CacheAbstractJdbcStore.java | 34 +-
.../jdbc/CacheJdbcStoreSessionListener.java | 8 +-
.../configuration/CacheConfiguration.java | 37 ++
.../cache/CacheStoreBalancingWrapper.java | 5 +-
.../processors/cache/GridCacheAdapter.java | 22 +-
.../GridCachePartitionExchangeManager.java | 34 +-
.../processors/cache/IgniteCacheProxy.java | 6 +
.../dht/preloader/GridDhtPartitionDemander.java | 25 +-
.../dht/preloader/GridDhtPartitionSupplier.java | 3 +
.../store/GridCacheStoreManagerAdapter.java | 29 +-
.../GridCacheAtomicReferenceImpl.java | 2 +-
.../processors/igfs/IgfsMetaManager.java | 2 +-
.../ignite/spi/discovery/tcp/ServerImpl.java | 360 +++++++++++----
.../spi/discovery/tcp/TcpDiscoveryImpl.java | 4 +-
.../tcp/internal/TcpDiscoveryNodesRing.java | 95 ++--
.../messages/TcpDiscoveryAbstractMessage.java | 37 ++
.../TcpDiscoveryStatusCheckMessage.java | 11 +
.../org/apache/ignite/stream/StreamAdapter.java | 2 +-
.../store/GridCacheBalancingStoreSelfTest.java | 220 ++++++++-
...CacheAtomicReferenceApiSelfAbstractTest.java | 20 +-
...gniteCachePutRetryTransactionalSelfTest.java | 10 +
.../tcp/TcpDiscoveryMultiThreadedTest.java | 158 ++++---
.../discovery/tcp/TcpDiscoveryRestartTest.java | 10 +-
.../spi/discovery/tcp/TcpDiscoverySelfTest.java | 459 ++++++++++++++++++-
.../TcpDiscoveryMulticastIpFinderSelfTest.java | 28 +-
.../testframework/junits/GridAbstractTest.java | 29 +-
modules/rest-http/pom.xml | 11 +
.../scala/org/apache/ignite/visor/visor.scala | 3 +-
modules/yardstick/README.txt | 16 +-
.../config/benchmark-multicast.properties | 9 +-
.../yardstick/config/benchmark-store.properties | 86 ++--
.../yardstick/config/ignite-store-config.xml | 31 +-
.../yardstick/IgniteBenchmarkArguments.java | 2 +-
.../ignite/yardstick/IgniteBenchmarkUtils.java | 75 +++
.../org/apache/ignite/yardstick/IgniteNode.java | 23 +-
.../IgniteAccountSerializableTxBenchmark.java | 11 +-
.../cache/IgniteAccountTxBenchmark.java | 11 +-
.../cache/IgniteGetAllPutAllTxBenchmark.java | 73 +++
.../cache/IgnitePutGetTxBenchmark.java | 41 +-
...IgniteTransactionalWriteInvokeBenchmark.java | 41 +-
.../IgniteTransactionalWriteReadBenchmark.java | 41 +-
modules/zookeeper/pom.xml | 2 +-
45 files changed, 1654 insertions(+), 486 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ignite/blob/d196c06b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCachePartitionExchangeManager.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ignite/blob/d196c06b/modules/core/src/test/java/org/apache/ignite/testframework/junits/GridAbstractTest.java
----------------------------------------------------------------------