You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ignite.apache.org by vo...@apache.org on 2016/03/28 15:09:57 UTC
[7/9] ignite git commit: Merge remote-tracking branch 'origin/master'
Merge remote-tracking branch 'origin/master'
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/f03b6c30
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/f03b6c30
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/f03b6c30
Branch: refs/heads/ignite-1786
Commit: f03b6c30a55249d8e3824f66df3aa811f994f122
Parents: 2987728 4df7418
Author: Anton Vinogradov <av...@apache.org>
Authored: Mon Mar 28 14:33:17 2016 +0300
Committer: Anton Vinogradov <av...@apache.org>
Committed: Mon Mar 28 14:33:17 2016 +0300
----------------------------------------------------------------------
.../cache/store/jdbc/CacheJdbcPojoStore.java | 2 +-
.../ignite/internal/binary/BinaryUtils.java | 16 --
.../binary/builder/BinaryObjectBuilderImpl.java | 107 +++++++-----
.../managers/communication/GridIoManager.java | 43 ++++-
.../processors/cache/GridCacheAdapter.java | 2 +-
.../datastreamer/DataStreamProcessor.java | 8 +-
.../datastreamer/DataStreamerImpl.java | 37 +++-
.../datastreamer/PlatformDataStreamer.java | 7 +-
.../util/offheap/unsafe/GridUnsafeMap.java | 4 +-
.../BinaryObjectBuilderAdditionalSelfTest.java | 144 ++++++++++++++--
...naryObjectBuilderDefaultMappersSelfTest.java | 2 +-
.../processors/igfs/IgfsAbstractSelfTest.java | 33 +++-
.../igfs/IgfsPrimaryMultiNodeSelfTest.java | 28 ++++
...maryRelaxedConsistencyMultiNodeSelfTest.java | 28 ++++
.../IgfsPrimaryRelaxedConsistencySelfTest.java | 28 ++++
.../igfs/IgfsPrimaryRelaxedSelfTest.java | 28 ----
.../platform/PlatformAttributeNodeFilter.java | 31 ++++
.../ignite/testsuites/IgniteIgfsTestSuite.java | 12 +-
.../ignite/igfs/Hadoop1DualAbstractTest.java | 3 +-
modules/platforms/cpp/common/src/java.cpp | 74 ++++++--
.../Apache.Ignite.Core.Tests.csproj | 15 ++
.../Binary/BinaryBuilderSelfTest.cs | 60 ++++++-
.../Query/CacheQueriesCodeConfigurationTest.cs | 16 +-
.../Config/Apache.Ignite.exe.config.test2 | 58 +++++++
.../Config/Apache.Ignite.exe.config.test3 | 34 ++++
.../Config/cache-local-node.xml | 65 +++++++
.../Config/ignite-dotnet-cfg.xml | 52 ++++++
.../Dataload/DataStreamerTestTopologyChange.cs | 104 ++++++++++++
.../Examples/ExamplesTest.cs | 3 +-
.../Apache.Ignite.Core.Tests/ExecutableTest.cs | 89 +++++++---
.../IgniteConfigurationSerializerTest.cs | 3 +-
.../Apache.Ignite.Core.Tests/JavaHomeTest.cs | 69 ++++++++
.../Cache/Configuration/QueryEntity.cs | 9 +-
.../Apache.Ignite.Core/IgniteConfiguration.cs | 10 +-
.../IgniteConfigurationSection.xsd | 8 +
.../Impl/Datastream/DataStreamerImpl.cs | 9 +-
.../Apache.Ignite.Core/Impl/IgniteUtils.cs | 34 ++++
.../dotnet/Apache.Ignite/Apache.Ignite.csproj | 2 +-
.../Config/AppSettingsConfigurator.cs | 97 +++--------
.../Apache.Ignite/Config/ArgsConfigurator.cs | 145 ++--------------
.../dotnet/Apache.Ignite/Config/Configurator.cs | 168 +++++++++++++++++++
.../Apache.Ignite/Config/IConfigurator.cs | 34 ----
.../dotnet/Apache.Ignite/IgniteRunner.cs | 24 +--
.../Apache.Ignite/Service/IgniteService.cs | 21 +--
.../Compute/ClosureExample.cs | 2 +-
.../Compute/TaskExample.cs | 2 +-
.../Datagrid/ContinuousQueryExample.cs | 2 +-
.../Datagrid/DataStreamerExample.cs | 2 +-
.../Datagrid/PutGetExample.cs | 2 +-
.../Datagrid/QueryExample.cs | 2 +-
.../Datagrid/StoreExample.cs | 2 +-
.../Datagrid/TransactionExample.cs | 2 +-
.../Events/EventsExample.cs | 2 +-
.../Messaging/MessagingExample.cs | 2 +-
.../Misc/LifecycleExample.cs | 2 +-
.../Services/ServicesExample.cs | 2 +-
parent/pom.xml | 2 +
57 files changed, 1329 insertions(+), 463 deletions(-)
----------------------------------------------------------------------