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/11/03 13:24:57 UTC
[18/18] ignite git commit: Merge remote-tracking branch
'remotes/origin/master' into ignite-1093-3
Merge remote-tracking branch 'remotes/origin/master' into ignite-1093-3
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/cd9753ca
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/cd9753ca
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/cd9753ca
Branch: refs/heads/ignite-1093-3
Commit: cd9753ca21e75c4e7bff4b557c825224aaa83cfc
Parents: 5ae676a 953f76b
Author: Anton Vinogradov <av...@apache.org>
Authored: Tue Nov 3 15:24:00 2015 +0300
Committer: Anton Vinogradov <av...@apache.org>
Committed: Tue Nov 3 15:24:00 2015 +0300
----------------------------------------------------------------------
.../cache/GridCacheAffinityManager.java | 18 +-
.../distributed/dht/GridDhtLocalPartition.java | 8 +
.../ignite/internal/visor/cache/VisorCache.java | 5 +-
.../cache/GridCacheAbstractFullApiSelfTest.java | 2 +
.../GridCacheAbstractRemoveFailureTest.java | 4 +-
.../cache/IgniteCacheTxNearPeekModesTest.java | 7 +-
.../CacheGetFutureHangsSelfTest.java | 3 +-
...niteCacheClientNodeChangingTopologyTest.java | 2 +
.../IgniteCacheCrossCacheTxFailoverTest.java | 4 +-
.../IgniteCachePutRetryAbstractSelfTest.java | 4 +-
...ledFairAffinityMultiNodeFullApiSelfTest.java | 5 -
...omicNearEnabledMultiNodeFullApiSelfTest.java | 5 -
...icOffHeapTieredMultiNodeFullApiSelfTest.java | 5 -
.../near/GridCacheNearTxExceptionSelfTest.java | 4 +
.../ignite/testframework/GridTestUtils.java | 4 +-
.../processors/query/h2/IgniteH2Indexing.java | 2 +-
.../cache/SqlFieldsQuerySelfTest.java | 2 -
.../ignite/logger/log4j2/Log4J2Logger.java~ | 542 -------------------
.../ignite/logger/log4j2/Log4j2FileAware.java~ | 33 --
.../ignite/logger/log4j2/Log4jFileAware.java~ | 13 -
.../config/benchmark-client-mode.properties | 4 +-
.../config/benchmark-failover.properties | 107 ++++
.../config/benchmark-multicast.properties | 71 ++-
.../yardstick/config/benchmark-store.properties | 4 +-
modules/yardstick/config/benchmark.properties | 4 +-
.../config/ignite-failover-base-config.xml | 126 +++++
.../config/ignite-failover-localhost-config.xml | 56 ++
modules/yardstick/pom.xml | 3 +-
.../yardstick/IgniteAbstractBenchmark.java | 2 +-
.../yardstick/IgniteBenchmarkArguments.java | 66 ++-
.../cache/IgniteCacheAbstractBenchmark.java | 8 +-
.../yardstick/cache/IgniteGetBenchmark.java | 4 +-
.../cache/IgniteJdbcSqlQueryBenchmark.java | 4 +-
.../yardstick/cache/IgnitePutAllBenchmark.java | 4 +-
.../cache/IgnitePutAllTxBenchmark.java | 4 +-
.../yardstick/cache/IgnitePutBenchmark.java | 4 +-
.../yardstick/cache/IgnitePutGetBenchmark.java | 4 +-
.../cache/IgnitePutGetTxBenchmark.java | 4 +-
.../cache/IgnitePutIndexedValue1Benchmark.java | 4 +-
.../cache/IgnitePutIndexedValue2Benchmark.java | 4 +-
.../cache/IgnitePutIndexedValue8Benchmark.java | 4 +-
.../yardstick/cache/IgnitePutTxBenchmark.java | 4 +-
.../cache/IgniteSqlQueryBenchmark.java | 4 +-
.../cache/IgniteSqlQueryJoinBenchmark.java | 4 +-
.../cache/IgniteSqlQueryPutBenchmark.java | 4 +-
.../IgniteAtomicInvokeRetryBenchmark.java | 214 ++++++++
...IgniteAtomicOffHeapInvokeRetryBenchmark.java | 31 ++
.../IgniteAtomicOffHeapRetriesBenchmark.java | 31 ++
.../failover/IgniteAtomicRetriesBenchmark.java | 89 +++
.../IgniteFailoverAbstractBenchmark.java | 320 +++++++++++
.../cache/failover/IgniteFailoverNode.java | 60 ++
...IgniteTransactionalInvokeRetryBenchmark.java | 212 ++++++++
...ransactionalOffHeapInvokeRetryBenchmark.java | 33 ++
...ransactionalOffHeapWriteInvokeBenchmark.java | 37 ++
...eTransactionalOffHeapWriteReadBenchmark.java | 32 ++
...IgniteTransactionalWriteInvokeBenchmark.java | 182 +++++++
.../IgniteTransactionalWriteReadBenchmark.java | 141 +++++
57 files changed, 1873 insertions(+), 688 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ignite/blob/cd9753ca/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtLocalPartition.java
----------------------------------------------------------------------