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/03/10 07:24:02 UTC
[41/43] ignite git commit: Merge remote-tracking branch
'community/ignite-4712' into ignite-4712
Merge remote-tracking branch 'community/ignite-4712' into ignite-4712
# Conflicts:
# modules/core/src/main/java/org/apache/ignite/internal/processors/cache/IgniteCacheOffheapManagerImpl.java
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/d275d5d5
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/d275d5d5
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/d275d5d5
Branch: refs/heads/ignite-4712
Commit: d275d5d558effd1371ec2371cef74b1e493934ec
Parents: c826a97 869089d
Author: sboikov <sb...@gridgain.com>
Authored: Fri Mar 10 10:03:24 2017 +0300
Committer: sboikov <sb...@gridgain.com>
Committed: Fri Mar 10 10:03:24 2017 +0300
----------------------------------------------------------------------
.../benchmarks/jmh/tree/BPlusTreeBenchmark.java | 3 +-
.../discovery/GridDiscoveryManager.java | 11 +
.../internal/pagemem/wal/record/DataRecord.java | 10 +-
.../processors/cache/GridCacheMapEntry.java | 1729 +++++++++++-------
.../cache/GridCacheUpdateAtomicResult.java | 96 +-
.../cache/IgniteCacheOffheapManager.java | 48 +
.../cache/IgniteCacheOffheapManagerImpl.java | 236 ++-
.../processors/cache/database/CacheDataRow.java | 6 +
.../cache/database/CacheDataRowAdapter.java | 13 +
.../cache/database/MetadataStorage.java | 2 +-
.../cache/database/tree/BPlusTree.java | 936 ++++++++--
.../distributed/dht/GridDhtCacheEntry.java | 5 +
.../query/GridCacheDistributedQueryFuture.java | 7 +-
.../utils/PlatformConfigurationUtils.java | 18 -
.../apache/ignite/internal/util/IgniteTree.java | 47 +
.../tcp/internal/TcpDiscoveryNodesRing.java | 3 +-
...eDynamicCacheStartNoExchangeTimeoutTest.java | 8 +-
.../processors/database/BPlusTreeSelfTest.java | 272 ++-
.../database/FreeListImplSelfTest.java | 5 +
.../platform/PlatformEventsWriteEventTask.java | 7 +-
.../junits/common/GridCommonAbstractTest.java | 2 +-
.../processors/query/h2/database/H2Tree.java | 2 +-
.../processors/query/h2/opt/GridH2Row.java | 5 +
.../processors/query/h2/opt/GridH2Table.java | 10 +-
.../query/h2/opt/GridH2TreeIndex.java | 5 +
.../Apache.Ignite.Core.Tests.csproj | 1 -
.../Cache/CacheAbstractTest.cs | 17 +-
.../Cache/CacheConfigurationTest.cs | 8 -
.../Cache/CacheSwapSpaceTest.cs | 122 --
.../Cache/Store/CacheStoreTest.cs | 24 +-
.../Config/native-client-test-cache.xml | 5 -
.../Apache.Ignite.Core.Tests/DeploymentTest.cs | 1 -
.../Apache.Ignite.Core.Tests/EventsTest.cs | 37 +-
.../IgniteConfigurationSerializerTest.cs | 20 -
.../IgniteConfigurationTest.cs | 20 +-
.../Apache.Ignite.Core.csproj | 5 -
.../Apache.Ignite.Core/Cache/CachePeekMode.cs | 7 +-
.../Cache/Configuration/CacheConfiguration.cs | 26 -
.../Cache/Configuration/CacheMemoryMode.cs | 60 -
.../Apache.Ignite.Core/Events/EventReader.cs | 1 -
.../Apache.Ignite.Core/Events/EventType.cs | 57 -
.../Apache.Ignite.Core/Events/SwapSpaceEvent.cs | 51 -
.../Apache.Ignite.Core/IgniteConfiguration.cs | 15 +-
.../IgniteConfigurationSection.xsd | 55 -
.../Binary/BinaryEqualityComparerSerializer.cs | 2 +-
.../Impl/SwapSpace/SwapSpaceSerializer.cs | 99 -
.../SwapSpace/File/FileSwapSpaceSpi.cs | 105 --
.../SwapSpace/ISwapSpaceSpi.cs | 35 -
.../Datagrid/MultiTieredCacheExample.cs | 24 +-
49 files changed, 2543 insertions(+), 1740 deletions(-)
----------------------------------------------------------------------