You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ignite.apache.org by ak...@apache.org on 2017/01/30 11:01:13 UTC

[15/16] ignite git commit: Merge branches 'ignite-4436-2' and 'master' of https://git-wip-us.apache.org/repos/asf/ignite into ignite-4436-2

Merge branches 'ignite-4436-2' and 'master' of https://git-wip-us.apache.org/repos/asf/ignite into ignite-4436-2


Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/33b95ac7
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/33b95ac7
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/33b95ac7

Branch: refs/heads/ignite-4436-2
Commit: 33b95ac71db03674a6bca897d19c82b5daa1ed8a
Parents: 56718e7 ec9a3cd
Author: Alexey Kuznetsov <ak...@apache.org>
Authored: Mon Jan 30 13:35:14 2017 +0700
Committer: Alexey Kuznetsov <ak...@apache.org>
Committed: Mon Jan 30 13:35:14 2017 +0700

----------------------------------------------------------------------
 DEVNOTES.txt                                    |   3 +
 assembly/dependencies-fabric-lgpl.xml           |   1 +
 assembly/dependencies-fabric.xml                |   1 +
 .../configuration/CacheConfiguration.java       |   4 +-
 .../apache/ignite/internal/IgniteKernal.java    |   3 -
 .../cache/distributed/near/GridNearTxLocal.java |   2 +-
 .../transactions/PlatformTransactions.java      |   9 +
 .../processors/igfs/IgfsTaskSelfTest.java       |  87 ++---
 .../ignite/platform/PlatformExceptionTask.java  |  78 +++++
 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 +
 .../Binary/BinaryStructureTest.cs               | 122 +++++++
 .../Cache/CacheAbstractTest.cs                  |  21 ++
 .../Cache/CacheAbstractTransactionalTest.cs     | 324 +++++++++++++++++++
 .../Apache.Ignite.Core.Tests/ExceptionsTest.cs  |  38 +++
 .../Apache.Ignite.Core.csproj                   |   2 +
 .../dotnet/Apache.Ignite.Core/Cache/ICache.cs   |   4 +-
 .../Impl/Binary/BinaryReader.cs                 |   6 +
 .../Apache.Ignite.Core/Impl/Cache/CacheImpl.cs  |  90 +++++-
 .../Apache.Ignite.Core/Impl/ExceptionUtils.cs   |   6 +-
 .../Transactions/CacheTransactionManager.cs     | 160 +++++++++
 .../Impl/Transactions/Transaction.cs            |   8 +
 .../Impl/Transactions/TransactionImpl.cs        |  13 +
 .../Impl/Transactions/TransactionsImpl.cs       |  10 +
 modules/web-console/backend/app/agent.js        |  12 +-
 .../generator/ConfigurationGenerator.js         |   9 +-
 modules/yardstick/DEVNOTES.txt                  |  16 +
 modules/yardstick/README.txt                    |  10 +-
 modules/yardstick/pom-standalone.xml            | 209 ++++++++++++
 modules/yardstick/pom.xml                       |  10 +-
 pom.xml                                         |  95 +++++-
 51 files changed, 2613 insertions(+), 109 deletions(-)
----------------------------------------------------------------------