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/7e73d022 Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/7e73d022 Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/7e73d022 Branch: refs/heads/ignite-3477 Commit: 7e73d0223a3f09cbe0b7094a2c04bdf9d63ca9be Parents: c5882a8 06ef846 Author: devozerov <voze...@gridgain.com> Authored: Wed Dec 28 12:54:47 2016 +0300 Committer: devozerov <voze...@gridgain.com> Committed: Wed Dec 28 12:54:47 2016 +0300 ---------------------------------------------------------------------- modules/platforms/cpp/binary/Makefile.am | 2 +- .../ignite/impl/binary/binary_type_manager.h | 2 +- .../src/impl/binary/binary_type_manager.cpp | 6 +- .../binary/src/impl/interop/interop_memory.cpp | 2 +- modules/platforms/cpp/common/Makefile.am | 2 +- .../include/ignite/common/dynamic_size_array.h | 2 +- modules/platforms/cpp/configure.ac | 2 +- modules/platforms/cpp/configure.acrel | 2 +- modules/platforms/cpp/core-test/Makefile.am | 2 +- .../cpp/core-test/src/cache_query_test.cpp | 8 +- .../cpp/core-test/src/reference_test.cpp | 14 +- modules/platforms/cpp/core/Makefile.am | 2 +- .../cache/query/continuous/continuous_query.h | 8 +- .../include/ignite/cache/query/query_cursor.h | 4 +- .../query/continuous/continuous_query_impl.h | 8 +- .../core/include/ignite/impl/handle_registry.h | 2 +- .../cpp/core/include/ignite/impl/operations.h | 4 +- .../cpp/core/src/impl/cache/cache_impl.cpp | 5 +- .../cpp/core/src/impl/handle_registry.cpp | 2 +- modules/platforms/cpp/examples/configure.ac | 2 +- .../cpp/examples/odbc-example/Makefile.am | 2 +- .../cpp/examples/putget-example/Makefile.am | 2 +- .../cpp/examples/query-example/Makefile.am | 2 +- modules/platforms/cpp/ignite/Makefile.am | 2 +- modules/platforms/cpp/jni/Makefile.am | 2 +- modules/platforms/cpp/jni/src/java.cpp | 2 +- modules/platforms/cpp/odbc-test/Makefile.am | 2 +- .../cpp/odbc-test/config/queries-default.xml | 1 + .../odbc-test/include/sql_test_suite_fixture.h | 3 + .../platforms/cpp/odbc-test/include/test_type.h | 20 +- .../platforms/cpp/odbc-test/src/column_test.cpp | 189 +++++++++++++++++++ .../odbc-test/src/sql_test_suite_fixture.cpp | 17 ++ .../cpp/odbc-test/src/sql_types_test.cpp | 131 +++++++++++++ modules/platforms/cpp/odbc/Makefile.am | 2 +- .../cpp/odbc/include/ignite/odbc/utility.h | 9 +- .../cpp/odbc/install/ignite-odbc-amd64.wxs | 2 +- .../cpp/odbc/install/ignite-odbc-x86.wxs | 2 +- modules/platforms/cpp/odbc/src/column.cpp | 28 ++- .../cpp/odbc/src/config/connection_info.cpp | 6 +- modules/platforms/cpp/odbc/src/connection.cpp | 2 + modules/platforms/cpp/odbc/src/odbc.cpp | 5 +- modules/platforms/cpp/odbc/src/utility.cpp | 15 ++ .../Properties/AssemblyInfo.cs | 4 +- .../Properties/AssemblyInfo.cs | 4 +- .../Properties/AssemblyInfo.cs | 4 +- .../Properties/AssemblyInfo.cs | 4 +- .../Properties/AssemblyInfo.cs | 4 +- .../Examples/Example.cs | 5 +- .../Examples/ExamplesTest.cs | 107 ++++++++--- .../Properties/AssemblyInfo.cs | 4 +- .../Apache.Ignite.Core.Tests/ReconnectTest.cs | 26 ++- .../Properties/AssemblyInfo.cs | 4 +- .../Properties/AssemblyInfo.cs | 4 +- .../Properties/AssemblyInfo.cs | 4 +- .../Properties/AssemblyInfo.cs | 4 +- .../Properties/AssemblyInfo.cs | 4 +- .../Properties/AssemblyInfo.cs | 4 +- .../Apache.Ignite/Properties/AssemblyInfo.cs | 4 +- .../examples/Apache.Ignite.Examples/App.config | 2 + .../DataStructures/AtomicSequenceExample.cs | 26 +-- .../Properties/AssemblyInfo.cs | 4 +- .../Properties/AssemblyInfo.cs | 4 +- 62 files changed, 612 insertions(+), 141 deletions(-) ----------------------------------------------------------------------