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/872a9599 Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/872a9599 Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/872a9599 Branch: refs/heads/ignite-5896 Commit: 872a959987ad154a4627ea5b4d91c6e965e3d694 Parents: 3a33095 075f48d Author: devozerov <[email protected]> Authored: Mon Sep 4 17:41:44 2017 +0300 Committer: devozerov <[email protected]> Committed: Mon Sep 4 17:41:44 2017 +0300 ---------------------------------------------------------------------- .../internal/DuplicateTypeIdException.java | 74 +++++++++++++++++++ .../ignite/internal/MarshallerContextImpl.java | 24 +------ .../ignite/internal/binary/BinaryContext.java | 52 ++++++++++---- .../binary/builder/BinaryObjectBuilderImpl.java | 2 + .../odbc/odbc/OdbcRequestHandler.java | 17 ++--- .../processors/odbc/odbc/OdbcUtils.java | 22 ++++++ .../BinaryObjectBuilderAdditionalSelfTest.java | 22 ++++++ modules/platforms/cpp/odbc-test/Makefile.am | 3 +- .../cpp/odbc-test/project/vs/odbc-test.vcxproj | 8 +-- .../cpp/odbc-test/src/queries_test.cpp | 75 +++++++++++++++++++- .../cpp/odbc/include/ignite/odbc/cursor.h | 7 ++ modules/platforms/cpp/odbc/src/cursor.cpp | 5 ++ .../platforms/cpp/odbc/src/query/data_query.cpp | 2 +- 13 files changed, 260 insertions(+), 53 deletions(-) ----------------------------------------------------------------------
