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/11 13:22:59 UTC
[25/25] ignite git commit: Merge remote-tracking branch
'remotes/origin/ignite-3477' into ignite-gg-11810
Merge remote-tracking branch 'remotes/origin/ignite-3477' into ignite-gg-11810
# Conflicts:
# modules/core/src/main/java/org/apache/ignite/internal/processors/cache/IgniteCacheOffheapManagerImpl.java
# modules/yardstick/config/ignite-base-config.xml
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/b81c30ac
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/b81c30ac
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/b81c30ac
Branch: refs/heads/ignite-gg-11810
Commit: b81c30acb3f9be9ec78c287cae4be548fefbdb4f
Parents: 75a9a07 3443c4e
Author: sboikov <sb...@gridgain.com>
Authored: Wed Jan 11 16:20:50 2017 +0300
Committer: sboikov <sb...@gridgain.com>
Committed: Wed Jan 11 16:20:50 2017 +0300
----------------------------------------------------------------------
.../JettyRestProcessorAbstractSelfTest.java | 2 +-
.../internal/managers/GridManagerAdapter.java | 3 +-
.../ignite/internal/pagemem/FullPageId.java | 29 +++-
.../cache/DynamicCacheDescriptor.java | 17 +++
.../processors/cache/GridCacheAdapter.java | 7 +-
.../cache/GridCacheConcurrentMapImpl.java | 7 +-
.../processors/cache/GridCacheMapEntry.java | 60 ++++++---
.../GridCachePartitionExchangeManager.java | 131 +++++++++---------
.../processors/cache/GridCacheProcessor.java | 45 +++++--
.../cache/GridCacheSharedContext.java | 23 +++-
.../cache/GridCacheSharedTtlCleanupManager.java | 5 +-
.../processors/cache/GridCacheTtlManager.java | 13 +-
.../GridChangeGlobalStateMessageResponse.java | 2 +-
.../cache/IgniteCacheOffheapManager.java | 8 +-
.../cache/IgniteCacheOffheapManagerImpl.java | 44 ++++--
.../IgniteCacheDatabaseSharedManager.java | 16 ++-
.../cache/database/tree/BPlusTree.java | 4 +-
.../GridDistributedTxRemoteAdapter.java | 14 +-
.../distributed/dht/GridDhtCacheEntry.java | 2 +-
.../distributed/dht/GridDhtLocalPartition.java | 57 ++++++--
.../dht/GridDhtPartitionTopologyImpl.java | 135 ++++++++++---------
.../distributed/dht/GridDhtTxFinishFuture.java | 7 +-
.../dht/GridPartitionedGetFuture.java | 4 +-
.../dht/GridPartitionedSingleGetFuture.java | 4 +-
.../dht/atomic/GridDhtAtomicCache.java | 60 ++++-----
.../dht/preloader/GridDhtForceKeysFuture.java | 10 +-
.../GridDhtPartitionsExchangeFuture.java | 81 ++++++-----
.../dht/preloader/GridDhtPreloader.java | 29 ++--
.../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 +-
.../processors/cache/local/GridLocalCache.java | 7 +-
.../continuous/CacheContinuousQueryHandler.java | 20 +--
.../cluster/GridClusterStateProcessor.java | 9 +-
.../util/future/IgniteRemoteMapTask.java | 17 +++
.../ignite/spi/discovery/tcp/ServerImpl.java | 16 ++-
.../GridCommunicationSendMessageSelfTest.java | 7 +-
.../cache/CacheClientStoreSelfTest.java | 6 +-
.../cache/CacheConfigurationLeakTest.java | 19 ++-
.../cache/CacheEntryProcessorCopySelfTest.java | 8 --
...idAbstractCacheInterceptorRebalanceTest.java | 2 +
.../cache/GridCacheAbstractMetricsSelfTest.java | 28 ++--
.../cache/GridCacheAbstractTxReadTest.java | 2 -
.../cache/GridCacheBasicStoreAbstractTest.java | 7 +-
.../GridCacheOffHeapTieredAbstractSelfTest.java | 4 +
.../cache/GridCacheP2PUndeploySelfTest.java | 5 -
.../GridCacheValueBytesPreloadingSelfTest.java | 17 +--
...idCacheValueConsistencyAbstractSelfTest.java | 30 -----
.../IgniteCacheConfigVariationsFullApiTest.java | 35 +++--
.../IgniteCacheInterceptorSelfTestSuite.java | 10 +-
.../cache/IgniteCachePeekModesAbstractTest.java | 6 +
.../IgniteCacheReadThroughEvictionSelfTest.java | 5 +-
.../GridDataStreamerImplSelfTest.java | 8 +-
.../database/tree/io/TrackingPageIOTest.java | 17 +++
...CacheLoadingConcurrentGridStartSelfTest.java | 22 ++-
...tractDistributedByteArrayValuesSelfTest.java | 3 +
...tractPartitionedByteArrayValuesSelfTest.java | 1 +
...GridCachePreloadRestartAbstractSelfTest.java | 12 +-
.../IgniteTxCachePrimarySyncTest.java | 7 +
...teSynchronizationModesMultithreadedTest.java | 5 +-
.../GridCacheDhtEvictionsDisabledSelfTest.java | 3 +-
.../dht/GridCacheTxNodeFailureSelfTest.java | 13 +-
...eAtomicInvalidPartitionHandlingSelfTest.java | 16 +--
.../near/GridCacheNearReadersSelfTest.java | 3 +-
.../near/NoneRebalanceModeSelfTest.java | 4 +-
.../GridCacheReplicatedPreloadSelfTest.java | 25 ++--
...maryWriteOrderWithStoreExpiryPolicyTest.java | 2 +-
...eCacheExpiryPolicyWithStoreAbstractTest.java | 21 ++-
...cheLocalBasicStoreMultithreadedSelfTest.java | 1 +
...ContinuousQueryFailoverAbstractSelfTest.java | 4 +-
.../CacheKeepBinaryIterationTest.java | 3 +
.../GridCacheContinuousQueryConcurrentTest.java | 47 ++++---
...teCacheContinuousQueryNoUnsubscribeTest.java | 2 +
.../ignite/testsuites/IgniteCacheTestSuite.java | 12 +-
.../testsuites/IgniteCacheTestSuite2.java | 16 ++-
.../testsuites/IgniteCacheTestSuite3.java | 13 +-
.../testsuites/IgniteCacheTestSuite5.java | 4 +-
...niteCacheLockPartitionOnAffinityRunTest.java | 36 +++--
.../IgniteCacheQueryMultiThreadedSelfTest.java | 10 +-
.../IgniteCacheQueryNodeRestartSelfTest.java | 3 +-
.../IgniteCacheQuerySelfTestSuite2.java | 5 +-
modules/yardstick/config/ignite-base-config.xml | 13 ++
.../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 +++
100 files changed, 1074 insertions(+), 558 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ignite/blob/b81c30ac/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheProcessor.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ignite/blob/b81c30ac/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/IgniteCacheOffheapManagerImpl.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ignite/blob/b81c30ac/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/database/IgniteCacheDatabaseSharedManager.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ignite/blob/b81c30ac/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/database/tree/BPlusTree.java
----------------------------------------------------------------------
diff --cc modules/core/src/main/java/org/apache/ignite/internal/processors/cache/database/tree/BPlusTree.java
index 56bebbc,28fcfd8..c136799
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/database/tree/BPlusTree.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/database/tree/BPlusTree.java
@@@ -3569,10 -3558,10 +3569,10 @@@ public abstract class BPlusTree<L, T ex
* @throws IgniteCheckedException If failed.
*/
@SuppressWarnings("unchecked")
- private boolean fillFromBuffer(ByteBuffer buf, BPlusIO<L> io, int startIdx, int cnt)
+ private boolean fillFromBuffer(long buf, BPlusIO<L> io, int startIdx, int cnt)
throws IgniteCheckedException {
- assert io.isLeaf();
- assert cnt != 0: cnt; // We can not see empty pages (empty tree handled in init).
+ assert io.isLeaf() : io;
+ assert cnt != 0 : cnt; // We can not see empty pages (empty tree handled in init).
assert startIdx >= 0 : startIdx;
assert cnt >= startIdx;
http://git-wip-us.apache.org/repos/asf/ignite/blob/b81c30ac/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtLocalPartition.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ignite/blob/b81c30ac/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridDhtAtomicCache.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ignite/blob/b81c30ac/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/database/tree/io/TrackingPageIOTest.java
----------------------------------------------------------------------