Merge branch 'ignite-1.7.1'
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/00902afb Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/00902afb Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/00902afb Branch: refs/heads/master Commit: 00902afbba538d51283fb17a50c3758a86e1bf31 Parents: 82504a0 311428e Author: vozerov-gridgain <[email protected]> Authored: Fri Aug 5 10:40:28 2016 +0300 Committer: vozerov-gridgain <[email protected]> Committed: Fri Aug 5 10:40:28 2016 +0300 ---------------------------------------------------------------------- .../processors/odbc/OdbcHandshakeRequest.java | 42 +++- .../processors/odbc/OdbcHandshakeResult.java | 17 +- .../processors/odbc/OdbcMessageParser.java | 34 ++- .../processors/odbc/OdbcProtocolVersion.java | 125 +++++++++++ .../processors/odbc/OdbcRequestHandler.java | 26 ++- modules/platforms/cpp/odbc-test/Makefile.am | 1 + .../odbc-test/config/queries-test-noodbc.xml | 103 +++++++++ .../cpp/odbc-test/config/queries-test.xml | 45 ++-- .../cpp/odbc-test/project/vs/odbc-test.vcxproj | 1 + .../project/vs/odbc-test.vcxproj.filters | 3 + .../cpp/odbc-test/src/configuration_test.cpp | 148 +++++++++++-- .../cpp/odbc-test/src/queries_test.cpp | 218 +++++++++++++++++-- modules/platforms/cpp/odbc/Makefile.am | 1 + modules/platforms/cpp/odbc/include/Makefile.am | 1 + .../cpp/odbc/include/ignite/odbc/common_types.h | 3 + .../include/ignite/odbc/config/configuration.h | 67 +++++- .../cpp/odbc/include/ignite/odbc/connection.h | 16 +- .../cpp/odbc/include/ignite/odbc/message.h | 35 ++- .../cpp/odbc/include/ignite/odbc/parser.h | 3 - .../odbc/include/ignite/odbc/protocol_version.h | 172 +++++++++++++++ .../platforms/cpp/odbc/project/vs/odbc.vcxproj | 2 + .../cpp/odbc/project/vs/odbc.vcxproj.filters | 6 + .../cpp/odbc/src/config/configuration.cpp | 92 ++++++-- modules/platforms/cpp/odbc/src/connection.cpp | 23 +- .../odbc/src/diagnostic/diagnostic_record.cpp | 6 + .../platforms/cpp/odbc/src/protocol_version.cpp | 134 ++++++++++++ 26 files changed, 1204 insertions(+), 120 deletions(-) ----------------------------------------------------------------------
