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 2BBD7200C1B for ; Mon, 30 Jan 2017 12:01:02 +0100 (CET) Received: by cust-asf.ponee.io (Postfix) id 2A768160B4D; Mon, 30 Jan 2017 11:01:02 +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 2D6B7160B68 for ; Mon, 30 Jan 2017 12:01:01 +0100 (CET) Received: (qmail 79953 invoked by uid 500); 30 Jan 2017 11:01:00 -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 79657 invoked by uid 99); 30 Jan 2017 11:00:59 -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; Mon, 30 Jan 2017 11:00:59 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id A2A20F1825; Mon, 30 Jan 2017 11:00:59 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: akuznetsov@apache.org To: commits@ignite.apache.org Date: Mon, 30 Jan 2017 11:01:10 -0000 Message-Id: <190b2ef0a6044ff7a56815af1c337578@git.apache.org> In-Reply-To: <18244dd7877d4a02a091d6052ca5f473@git.apache.org> References: <18244dd7877d4a02a091d6052ca5f473@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: [12/16] ignite git commit: Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/ignite archived-at: Mon, 30 Jan 2017 11:01:02 -0000 Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/ignite Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/2caa0c64 Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/2caa0c64 Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/2caa0c64 Branch: refs/heads/ignite-4436-2 Commit: 2caa0c64b04f48bd4e7ee527efddc2925b7b80f6 Parents: 00dc964 c1466d8 Author: Denis Magda Authored: Fri Jan 27 15:14:29 2017 -0800 Committer: Denis Magda Committed: Fri Jan 27 15:14:29 2017 -0800 ---------------------------------------------------------------------- .../cache/distributed/near/GridNearTxLocal.java | 2 +- .../transactions/PlatformTransactions.java | 9 + .../processors/igfs/IgfsTaskSelfTest.java | 87 ++--- modules/platforms/cpp/binary/Makefile.am | 2 + .../platforms/cpp/binary/include/Makefile.am | 3 + .../cpp/binary/include/ignite/binary/binary.h | 15 +- .../include/ignite/binary/binary_object.h | 77 +++++ .../ignite/impl/binary/binary_object_header.h | 250 ++++++++++++++ .../ignite/impl/binary/binary_object_impl.h | 102 ++++++ .../include/ignite/impl/binary/binary_schema.h | 2 +- .../include/ignite/impl/binary/binary_utils.h | 61 ++++ .../cpp/binary/project/vs/binary.vcxproj | 5 + .../binary/project/vs/binary.vcxproj.filters | 15 + .../src/impl/binary/binary_object_header.cpp | 51 +++ .../src/impl/binary/binary_object_impl.cpp | 52 +++ .../cpp/binary/src/impl/binary/binary_utils.cpp | 83 +++++ .../src/impl/binary/binary_writer_impl.cpp | 2 +- modules/platforms/cpp/core-test/Makefile.am | 1 + .../core-test/include/ignite/binary_test_defs.h | 25 ++ .../cpp/core-test/include/ignite/complex_type.h | 135 ++++++++ .../cpp/core-test/include/ignite/test_type.h | 186 +++++++++++ .../cpp/core-test/project/vs/core-test.vcxproj | 3 + .../project/vs/core-test.vcxproj.filters | 16 +- .../cpp/core-test/src/binary_object_test.cpp | 282 ++++++++++++++++ .../Apache.Ignite.Core.Tests.csproj | 1 + .../Cache/CacheAbstractTest.cs | 21 ++ .../Cache/CacheAbstractTransactionalTest.cs | 324 +++++++++++++++++++ .../Apache.Ignite.Core.csproj | 2 + .../dotnet/Apache.Ignite.Core/Cache/ICache.cs | 4 +- .../Apache.Ignite.Core/Impl/Cache/CacheImpl.cs | 90 +++++- .../Transactions/CacheTransactionManager.cs | 160 +++++++++ .../Impl/Transactions/Transaction.cs | 8 + .../Impl/Transactions/TransactionImpl.cs | 13 + .../Impl/Transactions/TransactionsImpl.cs | 10 + .../generator/ConfigurationGenerator.js | 9 +- 35 files changed, 2014 insertions(+), 94 deletions(-) ----------------------------------------------------------------------