Merge branch 'ignite-1.8.3' into ignite-1.9.
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/ee7ae1b6 Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/ee7ae1b6 Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/ee7ae1b6 Branch: refs/heads/ignite-1.9 Commit: ee7ae1b6793b63bf1050ec0b79fb606545536923 Parents: aca315d caa3acb Author: devozerov <[email protected]> Authored: Fri Feb 17 12:54:21 2017 +0300 Committer: devozerov <[email protected]> Committed: Fri Feb 17 12:54:21 2017 +0300 ---------------------------------------------------------------------- .../apache/ignite/IgniteSystemProperties.java | 32 +++++ .../ignite/internal/binary/BinaryContext.java | 3 + .../ignite/internal/binary/BinaryTreeMap.java | 6 +- .../processors/cache/EntryGetResult.java | 40 +++++- .../processors/cache/EntryGetWithTtlResult.java | 58 +++++++++ .../processors/cache/GridCacheAdapter.java | 69 +++++------ .../processors/cache/GridCacheContext.java | 122 +++++++++++++++---- .../processors/cache/GridCacheEntryEx.java | 2 +- .../processors/cache/GridCacheMapEntry.java | 29 +++-- .../distributed/dht/GridDhtCacheAdapter.java | 4 +- .../cache/distributed/dht/GridDhtGetFuture.java | 24 ++-- .../distributed/dht/GridDhtGetSingleFuture.java | 24 ++-- .../dht/GridPartitionedGetFuture.java | 19 ++- .../dht/GridPartitionedSingleGetFuture.java | 7 +- .../dht/atomic/GridDhtAtomicCache.java | 12 +- .../dht/colocated/GridDhtColocatedCache.java | 15 ++- .../distributed/near/GridNearGetFuture.java | 9 +- .../cache/distributed/near/GridNearTxLocal.java | 8 +- .../local/atomic/GridLocalAtomicCache.java | 13 +- .../transactions/IgniteTxLocalAdapter.java | 65 ++++++---- .../processors/cluster/GridUpdateNotifier.java | 2 +- .../processors/hadoop/HadoopJobProperty.java | 2 +- .../processors/query/GridQueryProcessor.java | 1 + .../resources/META-INF/classnames.properties | 6 +- .../cache/GridCacheAbstractFullApiSelfTest.java | 20 ++- .../processors/cache/GridCacheTestEntryEx.java | 104 ++++++++-------- .../CacheLockReleaseNodeLeaveTest.java | 64 +++++++++- .../IgniteCacheExpiryPolicyAbstractTest.java | 42 +++++++ .../tcp/TcpCommunicationSpiDropNodesTest.java | 3 +- .../TcpCommunicationSpiFaultyClientTest.java | 3 +- .../hadoop/impl/v2/HadoopV2TaskContext.java | 1 + .../hadoop/shuffle/HadoopShuffleJob.java | 2 +- .../Properties/AssemblyInfo.cs | 2 +- .../Properties/AssemblyInfo.cs | 2 +- .../Properties/AssemblyInfo.cs | 2 +- .../Properties/AssemblyInfo.cs | 2 +- .../Properties/AssemblyInfo.cs | 2 +- .../Properties/AssemblyInfo.cs | 2 +- modules/yardstick/config/ignite-base-config.xml | 25 ++++ .../yardstick/cache/IgniteGetAllBenchmark.java | 42 +++++++ .../cache/IgniteGetAllOffHeapBenchmark.java | 30 +++++ .../yardstick/cache/IgniteGetBenchmark.java | 35 ++++++ .../cache/IgnitePutAllOffHeapBenchmark.java | 30 +++++ .../cache/IgnitePutAllTxOffHeapBenchmark.java | 30 +++++ .../IgnitePutOffHeapIndexedValue8Benchmark.java | 30 +++++ .../IgnitePutRandomValueSizeBenchmark.java | 41 +++++++ 46 files changed, 857 insertions(+), 229 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ignite/blob/ee7ae1b6/modules/core/src/main/java/org/apache/ignite/IgniteSystemProperties.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ignite/blob/ee7ae1b6/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheAdapter.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ignite/blob/ee7ae1b6/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheContext.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ignite/blob/ee7ae1b6/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheEntryEx.java ---------------------------------------------------------------------- diff --cc modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheEntryEx.java index f26288f,ccd2285..f47e9f3 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheEntryEx.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheEntryEx.java @@@ -761,11 -761,11 +761,11 @@@ public interface GridCacheEntryEx * @throws IgniteCheckedException If index could not be updated. * @throws GridCacheEntryRemovedException If entry was removed. */ - public T2<CacheObject, GridCacheVersion> versionedValue(CacheObject val, + public EntryGetResult versionedValue(CacheObject val, @Nullable GridCacheVersion curVer, @Nullable GridCacheVersion newVer, - @Nullable ReaderArguments readerArgs, - @Nullable IgniteCacheExpiryPolicy loadExpiryPlc) + @Nullable IgniteCacheExpiryPolicy loadExpiryPlc, + @Nullable ReaderArguments readerArgs) throws IgniteCheckedException, GridCacheEntryRemovedException; /** http://git-wip-us.apache.org/repos/asf/ignite/blob/ee7ae1b6/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheMapEntry.java ---------------------------------------------------------------------- diff --cc modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheMapEntry.java index 942ae21,58b4ae3..2237e22 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheMapEntry.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheMapEntry.java @@@ -3621,13 -3634,13 +3634,13 @@@ public abstract class GridCacheMapEntr } /** {@inheritDoc} */ - @Override public synchronized T2<CacheObject, GridCacheVersion> versionedValue(CacheObject val, + @Override public synchronized EntryGetResult versionedValue(CacheObject val, GridCacheVersion curVer, GridCacheVersion newVer, - @Nullable ReaderArguments readerArgs, - @Nullable IgniteCacheExpiryPolicy loadExpiryPlc) - throws IgniteCheckedException, GridCacheEntryRemovedException - { + @Nullable IgniteCacheExpiryPolicy loadExpiryPlc, + @Nullable ReaderArguments readerArgs) + throws IgniteCheckedException, GridCacheEntryRemovedException { + checkObsolete(); addReaderIfNeed(readerArgs); http://git-wip-us.apache.org/repos/asf/ignite/blob/ee7ae1b6/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtCacheAdapter.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ignite/blob/ee7ae1b6/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtGetSingleFuture.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ignite/blob/ee7ae1b6/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridPartitionedGetFuture.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ignite/blob/ee7ae1b6/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridPartitionedSingleGetFuture.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ignite/blob/ee7ae1b6/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/ee7ae1b6/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/colocated/GridDhtColocatedCache.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ignite/blob/ee7ae1b6/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearGetFuture.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ignite/blob/ee7ae1b6/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/transactions/IgniteTxLocalAdapter.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ignite/blob/ee7ae1b6/modules/core/src/main/java/org/apache/ignite/internal/processors/query/GridQueryProcessor.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ignite/blob/ee7ae1b6/modules/core/src/main/resources/META-INF/classnames.properties ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ignite/blob/ee7ae1b6/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheAbstractFullApiSelfTest.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ignite/blob/ee7ae1b6/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheTestEntryEx.java ---------------------------------------------------------------------- diff --cc modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheTestEntryEx.java index e76ab40,8f0d9b1..a631a96 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheTestEntryEx.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheTestEntryEx.java @@@ -684,12 -685,12 +684,12 @@@ public class GridCacheTestEntryEx exten return null; } - /** @inheritDoc */ - @Override public T2<CacheObject, GridCacheVersion> versionedValue(CacheObject val, + /** {@inheritDoc} */ + @Override public EntryGetResult versionedValue(CacheObject val, GridCacheVersion curVer, GridCacheVersion newVer, - @Nullable ReaderArguments readerArgs, - IgniteCacheExpiryPolicy loadExpiryPlc) { + @Nullable IgniteCacheExpiryPolicy loadExpiryPlc, + @Nullable ReaderArguments readerArgs) { assert false; return null; http://git-wip-us.apache.org/repos/asf/ignite/blob/ee7ae1b6/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/CacheLockReleaseNodeLeaveTest.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ignite/blob/ee7ae1b6/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/expiry/IgniteCacheExpiryPolicyAbstractTest.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ignite/blob/ee7ae1b6/modules/core/src/test/java/org/apache/ignite/spi/communication/tcp/TcpCommunicationSpiFaultyClientTest.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ignite/blob/ee7ae1b6/modules/hadoop/src/main/java/org/apache/ignite/internal/processors/hadoop/impl/v2/HadoopV2TaskContext.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ignite/blob/ee7ae1b6/modules/platforms/dotnet/Apache.Ignite.AspNet.Tests/Properties/AssemblyInfo.cs ---------------------------------------------------------------------- diff --cc modules/platforms/dotnet/Apache.Ignite.AspNet.Tests/Properties/AssemblyInfo.cs index 72e65c0,597685e..6981500 --- a/modules/platforms/dotnet/Apache.Ignite.AspNet.Tests/Properties/AssemblyInfo.cs +++ b/modules/platforms/dotnet/Apache.Ignite.AspNet.Tests/Properties/AssemblyInfo.cs @@@ -27,7 -27,7 +27,7 @@@ using System.Runtime.InteropServices [assembly: AssemblyConfiguration("")] [assembly: AssemblyCompany("Apache Software Foundation")] [assembly: AssemblyProduct("Apache Ignite.NET")] --[assembly: AssemblyCopyright("Copyright © 2017")] ++[assembly: AssemblyCopyright("Copyright 2017")] [assembly: AssemblyTrademark("")] [assembly: AssemblyCulture("")] http://git-wip-us.apache.org/repos/asf/ignite/blob/ee7ae1b6/modules/platforms/dotnet/Apache.Ignite.Core.Tests.NuGet/Properties/AssemblyInfo.cs ---------------------------------------------------------------------- diff --cc modules/platforms/dotnet/Apache.Ignite.Core.Tests.NuGet/Properties/AssemblyInfo.cs index 898397d,78541eb..d6b1699 --- a/modules/platforms/dotnet/Apache.Ignite.Core.Tests.NuGet/Properties/AssemblyInfo.cs +++ b/modules/platforms/dotnet/Apache.Ignite.Core.Tests.NuGet/Properties/AssemblyInfo.cs @@@ -23,7 -23,7 +23,7 @@@ using System.Runtime.InteropServices [assembly: AssemblyConfiguration("")] [assembly: AssemblyCompany("Apache Software Foundation")] [assembly: AssemblyProduct("Apache Ignite.NET")] --[assembly: AssemblyCopyright("Copyright © 2017")] ++[assembly: AssemblyCopyright("Copyright 2017")] [assembly: AssemblyTrademark("")] [assembly: AssemblyCulture("")] http://git-wip-us.apache.org/repos/asf/ignite/blob/ee7ae1b6/modules/platforms/dotnet/Apache.Ignite.EntityFramework/Properties/AssemblyInfo.cs ---------------------------------------------------------------------- diff --cc modules/platforms/dotnet/Apache.Ignite.EntityFramework/Properties/AssemblyInfo.cs index 5346eba,acf46b0..4d25f53 --- a/modules/platforms/dotnet/Apache.Ignite.EntityFramework/Properties/AssemblyInfo.cs +++ b/modules/platforms/dotnet/Apache.Ignite.EntityFramework/Properties/AssemblyInfo.cs @@@ -25,7 -25,7 +25,7 @@@ using System.Runtime.InteropServices [assembly: AssemblyConfiguration("")] [assembly: AssemblyCompany("Apache Software Foundation")] [assembly: AssemblyProduct("Apache Ignite.NET")] --[assembly: AssemblyCopyright("Copyright © 2015")] ++[assembly: AssemblyCopyright("Copyright 2017")] [assembly: AssemblyTrademark("")] [assembly: AssemblyCulture("")] http://git-wip-us.apache.org/repos/asf/ignite/blob/ee7ae1b6/modules/platforms/dotnet/Apache.Ignite.Log4Net/Properties/AssemblyInfo.cs ---------------------------------------------------------------------- diff --cc modules/platforms/dotnet/Apache.Ignite.Log4Net/Properties/AssemblyInfo.cs index 396c837,042aed8..09e5749 --- a/modules/platforms/dotnet/Apache.Ignite.Log4Net/Properties/AssemblyInfo.cs +++ b/modules/platforms/dotnet/Apache.Ignite.Log4Net/Properties/AssemblyInfo.cs @@@ -24,7 -24,7 +24,7 @@@ using System.Runtime.InteropServices [assembly: AssemblyConfiguration("")] [assembly: AssemblyCompany("Apache Software Foundation")] [assembly: AssemblyProduct("Apache Ignite.NET")] --[assembly: AssemblyCopyright("Copyright © 2017")] ++[assembly: AssemblyCopyright("Copyright 2017")] [assembly: AssemblyTrademark("")] [assembly: AssemblyCulture("")] http://git-wip-us.apache.org/repos/asf/ignite/blob/ee7ae1b6/modules/platforms/dotnet/Apache.Ignite.NLog/Properties/AssemblyInfo.cs ---------------------------------------------------------------------- diff --cc modules/platforms/dotnet/Apache.Ignite.NLog/Properties/AssemblyInfo.cs index 6802594,f6dbd51..3f2aa71 --- a/modules/platforms/dotnet/Apache.Ignite.NLog/Properties/AssemblyInfo.cs +++ b/modules/platforms/dotnet/Apache.Ignite.NLog/Properties/AssemblyInfo.cs @@@ -24,7 -24,7 +24,7 @@@ using System.Runtime.InteropServices [assembly: AssemblyConfiguration("")] [assembly: AssemblyCompany("Apache Software Foundation")] [assembly: AssemblyProduct("Apache Ignite.NET")] --[assembly: AssemblyCopyright("Copyright © 2017")] ++[assembly: AssemblyCopyright("Copyright 2017")] [assembly: AssemblyTrademark("")] [assembly: AssemblyCulture("")] http://git-wip-us.apache.org/repos/asf/ignite/blob/ee7ae1b6/modules/platforms/dotnet/examples/Apache.Ignite.ExamplesDll/Properties/AssemblyInfo.cs ----------------------------------------------------------------------
