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 2016/08/03 11:29:07 UTC
[25/48] ignite git commit: Merge remote-tracking branch
'remotes/upstream/ignite-1.7' into UPSTREAM_master
Merge remote-tracking branch 'remotes/upstream/ignite-1.7' into UPSTREAM_master
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/50606051
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/50606051
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/50606051
Branch: refs/heads/ignite-3443
Commit: 5060605142e4fceb2ad416c6a436286423ffc08c
Parents: 4318be6 fcdb765
Author: Pavel Tupitsyn <pt...@apache.org>
Authored: Thu Jul 28 19:04:27 2016 +0300
Committer: Pavel Tupitsyn <pt...@apache.org>
Committed: Thu Jul 28 19:04:27 2016 +0300
----------------------------------------------------------------------
.../cpp/common/include/ignite/common/utils.h | 18 +
.../cpp/core-test/config/cache-query.xml | 42 +-
.../cpp/core-test/src/cache_query_test.cpp | 443 ++++++++++++++++---
.../core/include/ignite/cache/query/query_sql.h | 61 ++-
.../ignite/cache/query/query_sql_fields.h | 112 ++++-
.../cpp/odbc-test/config/queries-test.xml | 9 +-
.../cpp/odbc-test/src/configuration_test.cpp | 110 +++--
.../cpp/odbc-test/src/queries_test.cpp | 91 ++--
.../include/ignite/odbc/config/configuration.h | 121 ++++-
.../cpp/odbc/include/ignite/odbc/connection.h | 38 +-
.../cpp/odbc/src/config/configuration.cpp | 227 +++++-----
modules/platforms/cpp/odbc/src/connection.cpp | 47 +-
modules/platforms/cpp/odbc/src/odbc.cpp | 27 +-
.../Apache.Ignite.Core.Tests.csproj | 1 +
.../Examples/Example.cs | 8 +-
.../Examples/ExamplesTest.cs | 46 +-
.../Examples/PathUtil.cs | 10 +-
.../Examples/ProjectFilesTest.cs | 2 +-
.../Apache.Ignite.Core.Tests/MessagingTest.cs | 16 +-
.../Apache.Ignite.Core.Tests/TestAppConfig.cs | 100 +++++
.../Multicast/TcpDiscoveryMulticastIpFinder.cs | 7 +
.../dotnet/Apache.Ignite.Core/Ignition.cs | 9 +-
modules/platforms/dotnet/Apache.Ignite.sln | 1 -
.../dotnet/examples/Apache.Ignite.Examples.sln | 8 -
.../examples/Apache.Ignite.Examples/App.config | 33 +-
.../Compute/ClosureExample.cs | 4 +-
.../Compute/TaskExample.cs | 4 +-
.../Datagrid/ContinuousQueryExample.cs | 4 +-
.../Datagrid/DataStreamerExample.cs | 4 +-
.../Datagrid/LinqExample.cs | 4 +-
.../Datagrid/PutGetExample.cs | 4 +-
.../Datagrid/QueryExample.cs | 4 +-
.../Datagrid/StoreExample.cs | 4 +-
.../Datagrid/TransactionExample.cs | 4 +-
.../Events/EventsExample.cs | 6 +-
.../Messaging/MessagingExample.cs | 4 +-
.../Misc/LifecycleExample.cs | 13 +-
.../Services/ServicesExample.cs | 4 +-
.../dotnet/examples/Config/examples-config.xml | 98 ----
.../ignite/yardstick/IgniteBenchmarkUtils.java | 96 ++--
.../IgniteSqlQueryDistributedJoinBenchmark.java | 50 +--
41 files changed, 1302 insertions(+), 592 deletions(-)
----------------------------------------------------------------------