Return-Path: X-Original-To: archive-asf-public-internal@cust-asf2.ponee.io Delivered-To: archive-asf-public-internal@cust-asf2.ponee.io Received: from cust-asf.ponee.io (cust-asf.ponee.io [163.172.22.183]) by cust-asf2.ponee.io (Postfix) with ESMTP id C6F97200B7C for ; Wed, 24 Aug 2016 16:04:31 +0200 (CEST) Received: by cust-asf.ponee.io (Postfix) id C593A160AC1; Wed, 24 Aug 2016 14:04:31 +0000 (UTC) Delivered-To: archive-asf-public@cust-asf.ponee.io Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by cust-asf.ponee.io (Postfix) with SMTP id 1A2FE160AA4 for ; Wed, 24 Aug 2016 16:04:30 +0200 (CEST) Received: (qmail 95586 invoked by uid 500); 24 Aug 2016 14:04:25 -0000 Mailing-List: contact commits-help@ignite.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@ignite.apache.org Delivered-To: mailing list commits@ignite.apache.org Received: (qmail 95147 invoked by uid 99); 24 Aug 2016 14:04:25 -0000 Received: from git1-us-west.apache.org (HELO git1-us-west.apache.org) (140.211.11.23) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 24 Aug 2016 14:04:25 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id E3ED0E03E8; Wed, 24 Aug 2016 14:04:24 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: vozerov@apache.org To: commits@ignite.apache.org Date: Wed, 24 Aug 2016 14:04:45 -0000 Message-Id: <4a12681509344f2c991a6a433c8a92d4@git.apache.org> In-Reply-To: <6836123d3ae54a6380a447ec97c23218@git.apache.org> References: <6836123d3ae54a6380a447ec97c23218@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: [22/50] [abbrv] ignite git commit: Merge branch 'gridgain-7.5.30' into ignite-1849 archived-at: Wed, 24 Aug 2016 14:04:31 -0000 Merge branch 'gridgain-7.5.30' into ignite-1849 Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/b81dbbf2 Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/b81dbbf2 Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/b81dbbf2 Branch: refs/heads/ignite-2649 Commit: b81dbbf23b7941bfbaac18ce9004ef06b0f1f4f8 Parents: 5ae31fa 448571b Author: Alexander Paschenko Authored: Tue Jul 19 19:55:11 2016 +0300 Committer: Alexander Paschenko Committed: Tue Jul 19 19:55:11 2016 +0300 ---------------------------------------------------------------------- .../ignite/internal/binary/BinaryContext.java | 6 +- .../internal/binary/BinaryObjectImpl.java | 8 + .../internal/binary/GridBinaryMarshaller.java | 11 +- .../GridAffinityFunctionContextImpl.java | 9 + .../processors/cache/GridCacheProcessor.java | 65 +- .../affinity/PlatformAffinityFunction.java | 277 ++++++ .../PlatformAffinityFunctionTarget.java | 113 +++ .../cache/affinity/PlatformAffinityUtils.java | 116 +++ .../callback/PlatformCallbackGateway.java | 89 ++ .../callback/PlatformCallbackUtils.java | 49 ++ .../PlatformDotNetConfigurationClosure.java | 115 ++- .../dotnet/PlatformDotNetAffinityFunction.java | 171 ++++ .../binary/BinaryMarshallerSelfTest.java | 41 + .../processors/igfs/IgfsIgniteMock.java | 492 +++++++++++ .../internal/processors/igfs/IgfsMock.java | 397 +++++++++ .../mapreduce/IgniteHadoopMapReducePlanner.java | 48 +- .../IgniteHadoopWeightedMapReducePlanner.java | 846 +++++++++++++++++++ .../internal/processors/hadoop/HadoopUtils.java | 81 ++ .../planner/HadoopAbstractMapReducePlanner.java | 116 +++ .../planner/HadoopMapReducePlanGroup.java | 150 ++++ .../planner/HadoopMapReducePlanTopology.java | 89 ++ .../HadoopDefaultMapReducePlannerSelfTest.java | 451 +--------- .../processors/hadoop/HadoopMapReduceTest.java | 16 +- .../processors/hadoop/HadoopPlannerMockJob.java | 168 ++++ .../HadoopWeightedMapReducePlannerTest.java | 599 +++++++++++++ .../HadoopWeightedPlannerMapReduceTest.java | 38 + .../testsuites/IgniteHadoopTestSuite.java | 8 +- .../cpp/common/include/ignite/common/java.h | 18 + modules/platforms/cpp/common/src/java.cpp | 36 +- .../Apache.Ignite.Core.Tests.csproj | 9 +- .../Affinity/AffinityFunctionSpringTest.cs | 184 ++++ .../Config/Cache/Affinity/affinity-function.xml | 129 +++ .../Cache/Affinity/affinity-function2.xml | 49 ++ .../Apache.Ignite.Core.Tests/TestRunner.cs | 3 +- .../Apache.Ignite.Core.csproj | 14 +- .../Cache/Affinity/AffinityFunctionContext.cs | 120 +++ .../Cache/Affinity/AffinityTopologyVersion.cs | 138 +++ .../Cache/Affinity/Fair/FairAffinityFunction.cs | 33 + .../Cache/Affinity/Fair/Package-Info.cs | 26 + .../Cache/Affinity/IAffinityFunction.cs | 82 ++ .../Cache/Affinity/Package-Info.cs | 26 + .../Cache/Affinity/Rendezvous/Package-Info.cs | 26 + .../Rendezvous/RendezvousAffinityFunction.cs | 32 + .../Apache.Ignite.Core/Events/EventReader.cs | 8 +- .../dotnet/Apache.Ignite.Core/Ignition.cs | 38 +- .../Impl/Binary/BinaryReaderExtensions.cs | 14 + .../Impl/Binary/Marshaller.cs | 6 +- .../Impl/Cache/Affinity/AffinityFunctionBase.cs | 140 +++ .../Affinity/AffinityFunctionSerializer.cs | 277 ++++++ .../Cache/Affinity/PlatformAffinityFunction.cs | 74 ++ .../Impl/Common/ObjectInfoHolder.cs | 86 ++ .../Apache.Ignite.Core/Impl/IgniteUtils.cs | 10 +- .../Impl/Unmanaged/UnmanagedCallbackHandlers.cs | 6 + .../Impl/Unmanaged/UnmanagedCallbacks.cs | 133 ++- 54 files changed, 5756 insertions(+), 530 deletions(-) ----------------------------------------------------------------------