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 2017/01/12 08:01:48 UTC
[22/24] ignite git commit: Merge branch 'ignite-3477' of
https://git-wip-us.apache.org/repos/asf/ignite into ignite-gg-8.0.2.ea2
Merge branch 'ignite-3477' of https://git-wip-us.apache.org/repos/asf/ignite into ignite-gg-8.0.2.ea2
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/79a546a9
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/79a546a9
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/79a546a9
Branch: refs/heads/ignite-gg-11810
Commit: 79a546a97448aba01c67ef52177e6c293dd3cf74
Parents: 43eefb0 3443c4e
Author: Alexey Goncharuk <al...@gmail.com>
Authored: Wed Jan 11 20:26:53 2017 +0300
Committer: Alexey Goncharuk <al...@gmail.com>
Committed: Wed Jan 11 20:26:53 2017 +0300
----------------------------------------------------------------------
.../JettyRestProcessorAbstractSelfTest.java | 2 +-
.../internal/managers/GridManagerAdapter.java | 3 +-
.../processors/cache/GridCacheAdapter.java | 7 +-
.../cache/GridCacheConcurrentMapImpl.java | 7 +-
.../processors/cache/GridCacheMapEntry.java | 8 ++
.../GridCachePartitionExchangeManager.java | 115 +++++++++----------
.../cache/GridCacheSharedContext.java | 23 +++-
.../distributed/dht/GridDhtCacheEntry.java | 2 +-
.../distributed/dht/GridDhtLocalPartition.java | 9 +-
.../dht/GridDhtPartitionTopologyImpl.java | 8 +-
.../dht/GridPartitionedGetFuture.java | 4 +-
.../dht/GridPartitionedSingleGetFuture.java | 4 +-
.../dht/atomic/GridDhtAtomicCache.java | 60 +++++-----
.../dht/preloader/GridDhtForceKeysFuture.java | 10 +-
.../GridDhtPartitionsExchangeFuture.java | 30 ++---
.../dht/preloader/GridDhtPreloader.java | 2 +-
.../extras/GridCacheAttributesEntryExtras.java | 4 +-
.../GridCacheAttributesMvccEntryExtras.java | 2 +-
...dCacheAttributesMvccObsoleteEntryExtras.java | 2 +-
...cheAttributesMvccObsoleteTtlEntryExtras.java | 4 +-
.../GridCacheAttributesMvccTtlEntryExtras.java | 4 +-
.../GridCacheAttributesObsoleteEntryExtras.java | 2 +-
...idCacheAttributesObsoleteTtlEntryExtras.java | 4 +-
.../GridCacheAttributesTtlEntryExtras.java | 4 +-
.../GridCacheMvccObsoleteEntryExtras.java | 2 +-
.../GridCacheMvccObsoleteTtlEntryExtras.java | 4 +-
.../extras/GridCacheMvccTtlEntryExtras.java | 3 +-
.../extras/GridCacheObsoleteTtlEntryExtras.java | 3 +-
.../cache/extras/GridCacheTtlEntryExtras.java | 2 +-
.../cache/CacheConfigurationLeakTest.java | 4 +-
.../cache/GridCacheAbstractMetricsSelfTest.java | 28 ++---
.../GridCacheValueBytesPreloadingSelfTest.java | 17 +--
...CacheLoadingConcurrentGridStartSelfTest.java | 2 +
...tractPartitionedByteArrayValuesSelfTest.java | 1 +
...GridCachePreloadRestartAbstractSelfTest.java | 12 +-
.../GridCacheDhtEvictionsDisabledSelfTest.java | 3 +-
.../GridCacheReplicatedPreloadSelfTest.java | 25 ++--
.../testsuites/IgniteCacheTestSuite2.java | 15 +--
.../testsuites/IgniteCacheTestSuite3.java | 13 ++-
.../testsuites/IgniteCacheTestSuite5.java | 4 +-
.../IgniteCacheQuerySelfTestSuite2.java | 5 +-
modules/yardstick/config/ignite-base-config.xml | 2 +-
.../yardstick/cache/IgniteGetAllBenchmark.java | 42 +++++++
.../yardstick/cache/IgniteGetBenchmark.java | 38 +++++-
.../cache/jdbc/JdbcAbstractBenchmark.java | 17 +++
.../yardstick/cache/jdbc/JdbcPutBenchmark.java | 17 +++
.../cache/jdbc/JdbcPutGetBenchmark.java | 17 +++
.../jdbc/JdbcPutIndexedValue8Benchmark.java | 17 +++
.../cache/jdbc/JdbcSqlQueryBenchmark.java | 17 +++
.../cache/jdbc/JdbcSqlQueryJoinBenchmark.java | 17 +++
50 files changed, 442 insertions(+), 205 deletions(-)
----------------------------------------------------------------------