You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ignite.apache.org by yz...@apache.org on 2015/11/11 17:17:42 UTC
[23/23] ignite git commit: Merge branches 'ignite-1.5' and
'ignite-1.5-atomic-opt' of https://git-wip-us.apache.org/repos/asf/ignite
into ignite-1.5-atomic-opt
Merge branches 'ignite-1.5' and 'ignite-1.5-atomic-opt' of https://git-wip-us.apache.org/repos/asf/ignite into ignite-1.5-atomic-opt
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/dd764830
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/dd764830
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/dd764830
Branch: refs/heads/ignite-1.5-atomic-opt
Commit: dd764830f8de22e5d4707b75fefdc91b20f06143
Parents: 81b600d 8cc9fa4
Author: Yakov Zhdanov <yz...@gridgain.com>
Authored: Wed Nov 11 19:15:31 2015 +0300
Committer: Yakov Zhdanov <yz...@gridgain.com>
Committed: Wed Nov 11 19:15:31 2015 +0300
----------------------------------------------------------------------
.../java/org/apache/ignite/IgniteCache.java | 1 +
.../eviction/random/RandomEvictionPolicy.java | 4 +
.../cache/store/CacheStoreSessionListener.java | 9 +-
.../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 | 29 ++-
.../dht/preloader/GridDhtPreloader.java | 2 +-
.../store/GridCacheStoreManagerAdapter.java | 29 ++-
.../GridCacheAtomicReferenceImpl.java | 2 +-
.../processors/igfs/IgfsMetaManager.java | 2 +-
.../handlers/query/QueryCommandHandler.java | 4 -
.../org/apache/ignite/stream/StreamAdapter.java | 2 +-
.../store/GridCacheBalancingStoreSelfTest.java | 220 ++++++++++++++++++-
...CacheAtomicReferenceApiSelfAbstractTest.java | 20 +-
...gniteCachePutRetryTransactionalSelfTest.java | 10 +
modules/rest-http/pom.xml | 11 +
.../config/benchmark-multicast.properties | 5 +-
.../yardstick/config/ignite-store-config.xml | 31 +--
.../ignite/yardstick/IgniteBenchmarkUtils.java | 75 +++++++
.../org/apache/ignite/yardstick/IgniteNode.java | 23 +-
.../IgniteAccountSerializableTxBenchmark.java | 11 +-
.../cache/IgniteAccountTxBenchmark.java | 11 +-
.../cache/IgniteGetAllPutAllTxBenchmark.java | 73 ++++++
...IgniteTransactionalWriteInvokeBenchmark.java | 41 +---
.../IgniteTransactionalWriteReadBenchmark.java | 41 +---
modules/zookeeper/pom.xml | 2 +-
30 files changed, 598 insertions(+), 172 deletions(-)
----------------------------------------------------------------------