You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ignite.apache.org by yz...@apache.org on 2017/01/11 14:21:50 UTC
[7/9] ignite git commit: Merge branches 'ignite-comm-balance-master'
and 'master' of https://git-wip-us.apache.org/repos/asf/ignite into
ignite-comm-balance-master-apache
Merge branches 'ignite-comm-balance-master' and 'master' of https://git-wip-us.apache.org/repos/asf/ignite into ignite-comm-balance-master-apache
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/8f98e625
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/8f98e625
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/8f98e625
Branch: refs/heads/ignite-comm-balance-master
Commit: 8f98e62555310cbe589487f8beede24d5cf596b9
Parents: 3fe7dfb ff0caf8
Author: Yakov Zhdanov <yz...@gridgain.com>
Authored: Wed Jan 11 13:48:21 2017 +0300
Committer: Yakov Zhdanov <yz...@gridgain.com>
Committed: Wed Jan 11 13:48:21 2017 +0300
----------------------------------------------------------------------
.../cpp/common/project/vs/common.vcxproj | 1 +
.../platforms/cpp/jni/project/vs/jni.vcxproj | 1 +
.../cpp/odbc-test/src/api_robustness_test.cpp | 113 +++++++-
modules/platforms/cpp/odbc/Makefile.am | 3 +-
modules/platforms/cpp/odbc/include/Makefile.am | 3 +-
.../cpp/odbc/include/ignite/odbc/common_types.h | 29 +-
.../ignite/odbc/config/connection_info.h | 2 -
.../cpp/odbc/include/ignite/odbc/log.h | 123 ++++++++
.../odbc/include/ignite/odbc/meta/column_meta.h | 2 -
.../cpp/odbc/include/ignite/odbc/statement.h | 143 +++++++---
.../cpp/odbc/include/ignite/odbc/utility.h | 19 +-
.../odbc/os/linux/src/system/socket_client.cpp | 9 +-
.../odbc/os/win/src/system/socket_client.cpp | 9 +-
.../src/system/ui/dsn_configuration_window.cpp | 18 +-
.../cpp/odbc/os/win/src/system_dsn.cpp | 17 +-
.../platforms/cpp/odbc/project/vs/odbc.vcxproj | 2 +
.../cpp/odbc/project/vs/odbc.vcxproj.filters | 6 +
.../cpp/odbc/src/config/connection_info.cpp | 3 -
modules/platforms/cpp/odbc/src/connection.cpp | 21 +-
.../odbc/src/diagnostic/diagnosable_adapter.cpp | 3 +-
.../odbc/src/diagnostic/diagnostic_record.cpp | 38 +++
modules/platforms/cpp/odbc/src/entry_points.cpp | 52 ++--
modules/platforms/cpp/odbc/src/log.cpp | 83 ++++++
.../platforms/cpp/odbc/src/meta/column_meta.cpp | 4 -
modules/platforms/cpp/odbc/src/odbc.cpp | 283 ++++++++-----------
.../odbc/src/query/column_metadata_query.cpp | 13 +-
.../platforms/cpp/odbc/src/query/data_query.cpp | 23 +-
.../cpp/odbc/src/query/table_metadata_query.cpp | 12 +-
modules/platforms/cpp/odbc/src/statement.cpp | 187 ++++++++++--
modules/platforms/cpp/odbc/src/utility.cpp | 18 +-
.../Apache.Ignite.AspNet.Tests.csproj | 7 +-
.../Apache.Ignite.AspNet.csproj | 5 +
.../Apache.Ignite.Benchmarks.csproj | 5 +
.../Apache.Ignite.Core.Tests.TestDll.csproj | 5 +
.../Apache.Ignite.Core.Tests.csproj | 5 +
.../Cache/CacheAbstractTest.cs | 2 +
.../Apache.Ignite.Core.Tests/MessagingTest.cs | 6 +-
.../Apache.Ignite.Core.Tests/TestUtils.cs | 1 -
.../Apache.Ignite.Core.csproj | 16 +-
.../Impl/Unmanaged/UnmanagedUtils.cs | 4 +-
.../Apache.Ignite.EntityFramework.Tests.csproj | 5 +
.../Apache.Ignite.EntityFramework.csproj | 9 +-
.../Impl/ArrayDbDataReader.cs | 5 +
.../Impl/DataReaderResult.cs | 2 +
.../Impl/DbCommandInfo.cs | 11 +
.../Impl/DbCommandProxy.cs | 1 +
.../Apache.Ignite.Linq.csproj | 5 +
.../Apache.Ignite.Log4Net.csproj | 5 +
.../IgniteLog4NetLogger.cs | 16 +-
.../Apache.Ignite.NLog.csproj | 5 +
modules/platforms/dotnet/Apache.Ignite.sln | 3 +
.../dotnet/Apache.Ignite/Apache.Ignite.csproj | 5 +
modules/platforms/dotnet/README.md | 6 +-
modules/platforms/dotnet/build.ps1 | 2 +-
.../Apache.Ignite.Examples.csproj | 3 +
.../Apache.Ignite.ExamplesDll.csproj | 4 +
.../Services/MapService.cs | 2 -
57 files changed, 1015 insertions(+), 370 deletions(-)
----------------------------------------------------------------------