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 2016/12/09 11:27:47 UTC
[25/25] ignite git commit: Merge remote-tracking branch
'remotes/origin/master' into ignite-4371
Merge remote-tracking branch 'remotes/origin/master' into ignite-4371
# Conflicts:
# modules/core/src/main/java/org/apache/ignite/internal/managers/communication/GridIoMessageFactory.java
# modules/core/src/main/java/org/apache/ignite/internal/managers/communication/IgniteIoTestMessage.java
# modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCachePartitionExchangeManager.java
# modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCachePreloader.java
# modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCachePreloaderAdapter.java
# modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/GridDhtPartitionDemander.java
# modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/GridDhtPreloader.java
# modules/core/src/main/java/org/apache/ignite/spi/communication/tcp/TcpCommunicationSpi.java
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/37a76190
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/37a76190
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/37a76190
Branch: refs/heads/ignite-4371
Commit: 37a76190d1447d7fbfe15659b8c52d983daa3775
Parents: 697e2fb 27a81c8
Author: sboikov <sb...@gridgain.com>
Authored: Fri Dec 9 14:27:09 2016 +0300
Committer: sboikov <sb...@gridgain.com>
Committed: Fri Dec 9 14:27:09 2016 +0300
----------------------------------------------------------------------
.../jmh/misc/JmhIncrementBenchmark.java | 95 +++++
.../rendezvous/RendezvousAffinityFunction.java | 80 ++--
.../communication/GridIoMessageFactory.java | 12 +-
.../communication/IgniteIoTestMessage.java | 2 +-
.../discovery/GridDiscoveryManager.java | 118 +-----
.../processors/cache/GridCacheAdapter.java | 13 +-
.../processors/cache/GridCacheEntryEx.java | 4 +-
.../processors/cache/GridCacheMapEntry.java | 17 +-
.../GridCachePartitionExchangeManager.java | 17 +-
.../processors/cache/GridCachePreloader.java | 8 +-
.../cache/GridCachePreloaderAdapter.java | 12 +-
.../processors/cache/GridCacheUtils.java | 17 -
.../processors/cache/IgniteCacheProxy.java | 4 +-
.../binary/CacheObjectBinaryProcessorImpl.java | 3 +-
.../GridDistributedTxFinishResponse.java | 6 +
.../dht/GridClientPartitionTopology.java | 120 +++---
.../distributed/dht/GridDhtLockFuture.java | 23 +-
.../dht/GridDhtPartitionTopology.java | 28 +-
.../dht/GridDhtPartitionTopologyImpl.java | 284 ++++++++------
.../dht/atomic/GridDhtAtomicCache.java | 2 +-
.../dht/preloader/GridDhtPartitionDemander.java | 46 ++-
.../dht/preloader/GridDhtPartitionFullMap.java | 18 +-
.../GridDhtPartitionsExchangeFuture.java | 72 +++-
.../dht/preloader/GridDhtPreloader.java | 11 +-
.../cache/transactions/IgniteTxHandler.java | 2 +-
.../transactions/IgniteTxLocalAdapter.java | 2 +-
.../processors/hadoop/HadoopJobProperty.java | 7 +
.../hadoop/HadoopMapperAwareTaskOutput.java | 32 ++
.../processors/hadoop/HadoopTaskInfo.java | 43 ++
.../shuffle/HadoopDirectShuffleMessage.java | 243 ++++++++++++
.../platform/PlatformAbstractTarget.java | 268 ++-----------
.../platform/PlatformAsyncTarget.java | 44 +++
.../platform/PlatformNoopProcessor.java | 41 +-
.../processors/platform/PlatformProcessor.java | 42 +-
.../platform/PlatformProcessorImpl.java | 87 +++--
.../processors/platform/PlatformTarget.java | 103 +++--
.../platform/PlatformTargetProxy.java | 126 ++++++
.../platform/PlatformTargetProxyImpl.java | 222 +++++++++++
.../binary/PlatformBinaryProcessor.java | 6 +-
.../platform/cache/PlatformCache.java | 15 +-
.../platform/cache/PlatformCacheIterator.java | 2 +-
.../cache/affinity/PlatformAffinity.java | 4 +-
.../affinity/PlatformAffinityFunction.java | 7 +-
.../PlatformAffinityFunctionTarget.java | 4 +-
.../query/PlatformAbstractQueryCursor.java | 4 +-
.../query/PlatformContinuousQueryProxy.java | 3 +-
.../callback/PlatformCallbackGateway.java | 6 +-
.../callback/PlatformCallbackUtils.java | 6 +-
.../platform/cluster/PlatformClusterGroup.java | 18 +-
.../platform/compute/PlatformCompute.java | 15 +-
.../datastreamer/PlatformDataStreamer.java | 4 +-
.../PlatformStreamReceiverImpl.java | 8 +-
.../datastructures/PlatformAtomicLong.java | 4 +-
.../datastructures/PlatformAtomicReference.java | 8 +-
.../datastructures/PlatformAtomicSequence.java | 2 +-
.../platform/events/PlatformEvents.java | 15 +-
.../platform/messaging/PlatformMessaging.java | 9 +-
.../platform/services/PlatformServices.java | 27 +-
.../transactions/PlatformTransactions.java | 8 +-
.../platform/utils/PlatformFutureUtils.java | 14 +-
.../utils/PlatformListenableTarget.java | 62 +++
.../service/GridServiceProcessor.java | 4 +-
.../internal/visor/query/VisorQueryJob.java | 2 +-
.../communication/tcp/TcpCommunicationSpi.java | 4 +-
.../ignite/spi/discovery/tcp/ServerImpl.java | 41 +-
.../tcp/internal/TcpDiscoveryStatistics.java | 4 +
.../AbstractAffinityFunctionSelfTest.java | 2 +-
.../GridDiscoveryManagerAliveCacheSelfTest.java | 2 +-
.../cache/CacheRebalancingSelfTest.java | 75 ++++
.../GridCachePartitionedAffinitySpreadTest.java | 7 +-
.../processors/cache/GridCacheTestEntryEx.java | 3 +-
.../distributed/dht/GridCacheDhtTestUtils.java | 232 -----------
...eCacheExpiryPolicyWithStoreAbstractTest.java | 40 ++
.../testsuites/IgniteCacheTestSuite5.java | 9 +-
.../processors/hadoop/HadoopMapperUtils.java | 56 +++
.../hadoop/impl/v2/HadoopV2Context.java | 11 +
.../hadoop/impl/v2/HadoopV2MapTask.java | 10 +
.../hadoop/jobtracker/HadoopJobTracker.java | 4 +
.../hadoop/shuffle/HadoopShuffle.java | 23 +-
.../hadoop/shuffle/HadoopShuffleJob.java | 389 ++++++++++++++-----
.../shuffle/HadoopShuffleRemoteState.java | 5 +-
.../shuffle/direct/HadoopDirectDataInput.java | 166 ++++++++
.../shuffle/direct/HadoopDirectDataOutput.java | 221 +++++++++++
.../direct/HadoopDirectDataOutputContext.java | 100 +++++
.../direct/HadoopDirectDataOutputState.java | 54 +++
.../child/HadoopChildProcessRunner.java | 2 +-
.../impl/HadoopMapReduceEmbeddedSelfTest.java | 22 +-
.../h2/twostep/GridReduceQueryExecutor.java | 14 +-
.../cpp/jni/include/ignite/jni/exports.h | 3 -
.../platforms/cpp/jni/include/ignite/jni/java.h | 7 -
modules/platforms/cpp/jni/project/vs/module.def | 2 -
modules/platforms/cpp/jni/src/exports.cpp | 8 -
modules/platforms/cpp/jni/src/java.cpp | 76 ++--
.../Services/ServicesTest.cs | 9 +-
.../Apache.Ignite.Core.csproj | 1 +
.../Apache.Ignite.Core/Impl/Common/Future.cs | 13 +-
.../Impl/Common/Listenable.cs | 49 +++
.../Impl/Compute/ComputeImpl.cs | 4 +-
.../Apache.Ignite.Core/Impl/PlatformTarget.cs | 2 +-
.../Impl/Unmanaged/IgniteJniNativeMethods.cs | 8 -
.../Impl/Unmanaged/UnmanagedUtils.cs | 5 -
101 files changed, 2904 insertions(+), 1310 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ignite/blob/37a76190/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCachePartitionExchangeManager.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ignite/blob/37a76190/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheUtils.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ignite/blob/37a76190/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/transactions/IgniteTxHandler.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ignite/blob/37a76190/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/transactions/IgniteTxLocalAdapter.java
----------------------------------------------------------------------