Merge branch 'master' into ignite-2.0
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/77ca2e63 Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/77ca2e63 Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/77ca2e63 Branch: refs/heads/ignite-3477 Commit: 77ca2e636c73e464f833f227c4894df0785ae9e2 Parents: 6090ebd 82dd912 Author: devozerov <voze...@gridgain.com> Authored: Mon Jan 16 16:07:49 2017 +0300 Committer: devozerov <voze...@gridgain.com> Committed: Mon Jan 16 16:07:49 2017 +0300 ---------------------------------------------------------------------- .../ignite/cache/query/SqlFieldsQuery.java | 6 + .../store/jdbc/dialect/BasicJdbcDialect.java | 31 +- .../GridClientConnectionManagerAdapter.java | 7 +- .../impl/connection/GridClientTopology.java | 53 +++- .../GridNearAtomicAbstractUpdateFuture.java | 34 ++- .../GridNearAtomicSingleUpdateFuture.java | 44 +-- .../dht/atomic/GridNearAtomicUpdateFuture.java | 57 ++-- .../IgniteCacheObjectProcessorImpl.java | 5 +- .../processors/query/GridQueryProcessor.java | 2 +- .../store/jdbc/CacheJdbcPojoStoreTest.java | 48 +++- .../ignite/cache/store/jdbc/model/Person.java | 2 +- .../cache/CacheEntryProcessorCopySelfTest.java | 6 +- .../cache/GridCacheBasicStoreAbstractTest.java | 2 +- .../GridCacheDhtEvictionsDisabledSelfTest.java | 5 +- .../AtomicPutAllChangingTopologyTest.java | 212 ++++++++++++++ .../IgniteCacheFailoverTestSuite.java | 3 + .../apache/ignite/stream/flume/IgniteSink.java | 7 +- .../hadoop/impl/v2/HadoopV2TaskContext.java | 64 +++-- ...niteCacheAbstractInsertSqlQuerySelfTest.java | 14 +- .../IgniteCacheAbstractSqlDmlQuerySelfTest.java | 6 +- .../IgniteCacheInsertSqlQuerySelfTest.java | 18 +- .../cache/IgniteCacheMergeSqlQuerySelfTest.java | 14 +- .../IgniteCacheUpdateSqlQuerySelfTest.java | 4 +- .../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 +- .../Properties/AssemblyInfo.cs | 2 +- .../Apache.Ignite.AspNet.csproj | 5 + .../Properties/AssemblyInfo.cs | 2 +- .../Apache.Ignite.Benchmarks.csproj | 5 + .../Apache.Ignite.Core.Tests.TestDll.csproj | 5 + .../Apache.Ignite.Core.Tests.csproj | 6 + .../Cache/CacheAbstractTest.cs | 2 + .../Log/ConcurrentMemoryTarget.cs | 73 +++++ .../Log/NLogLoggerTest.cs | 5 +- .../Apache.Ignite.Core.Tests/MessagingTest.cs | 6 +- .../Properties/AssemblyInfo.cs | 2 +- .../Apache.Ignite.Core.Tests/TestUtils.cs | 1 - .../Apache.Ignite.Core.csproj | 16 +- .../Impl/Binary/BinaryReader.cs | 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 - 86 files changed, 1602 insertions(+), 528 deletions(-) ----------------------------------------------------------------------