You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ignite.apache.org by vo...@apache.org on 2016/09/14 11:10:20 UTC

[04/50] ignite git commit: Merge remote-tracking branch 'upstream/ignite-1.6.7' into ignite-1.6.7

Merge remote-tracking branch 'upstream/ignite-1.6.7' into ignite-1.6.7


Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/7bb961fd
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/7bb961fd
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/7bb961fd

Branch: refs/heads/ignite-3661
Commit: 7bb961fd0a2e78334d33b6bc279c4edc323c246a
Parents: 7a84ab6 ae77653
Author: vozerov-gridgain <vo...@gridgain.com>
Authored: Fri Sep 2 18:05:54 2016 +0300
Committer: vozerov-gridgain <vo...@gridgain.com>
Committed: Fri Sep 2 18:05:54 2016 +0300

----------------------------------------------------------------------
 .../store/jdbc/dialect/SQLServerDialect.java    |   2 +-
 .../internal/binary/BinaryMarshaller.java       |   7 +
 .../processors/cache/IgniteCacheProxy.java      |  41 ++
 .../cache/query/GridCacheSqlQuery.java          |  11 +-
 .../processors/odbc/OdbcHandshakeRequest.java   |   8 +-
 .../processors/odbc/OdbcHandshakeResult.java    |  17 +-
 .../processors/odbc/OdbcMessageParser.java      |  22 +-
 .../processors/odbc/OdbcProtocolVersion.java    | 106 +++++
 .../processors/odbc/OdbcRequestHandler.java     |  17 +-
 .../GridCacheQueryTransformerSelfTest.java      |   9 +-
 .../query/h2/opt/GridH2ValueCacheObject.java    |   9 -
 ...niteBinaryObjectLocalQueryArgumentsTest.java |  28 ++
 ...aryObjectQueryArgumentsOffheapLocalTest.java |  28 ++
 ...teBinaryObjectQueryArgumentsOffheapTest.java |  30 ++
 .../IgniteBinaryObjectQueryArgumentsTest.java   | 469 ++++++++++++++++++-
 .../query/h2/sql/GridQueryParsingTest.java      |   2 +-
 .../IgniteCacheQuerySelfTestSuite.java          |   9 +
 .../cpp/common/include/ignite/common/utils.h    |  25 +
 .../cpp/common/os/win/src/common/utils.cpp      |  20 +
 modules/platforms/cpp/odbc-test/Makefile.am     |   1 +
 .../odbc-test/config/queries-test-noodbc.xml    | 103 ++++
 .../cpp/odbc-test/config/queries-test.xml       |  31 +-
 .../cpp/odbc-test/project/vs/odbc-test.vcxproj  |   2 +
 .../project/vs/odbc-test.vcxproj.filters        |   6 +
 .../cpp/odbc-test/src/configuration_test.cpp    | 156 ++++--
 .../cpp/odbc-test/src/queries_test.cpp          | 122 +++--
 .../odbc-test/src/sql_test_suite_fixture.cpp    |  14 +-
 modules/platforms/cpp/odbc/Makefile.am          |   2 +
 modules/platforms/cpp/odbc/include/Makefile.am  |   2 +
 .../cpp/odbc/include/ignite/odbc/common_types.h |   3 +
 .../include/ignite/odbc/config/configuration.h  | 207 +++++++-
 .../cpp/odbc/include/ignite/odbc/connection.h   |  47 +-
 .../ignite/odbc/diagnostic/diagnostic_record.h  |   2 +-
 .../cpp/odbc/include/ignite/odbc/dsn_config.h   |  61 +++
 .../cpp/odbc/include/ignite/odbc/parser.h       |   3 -
 .../odbc/include/ignite/odbc/protocol_version.h | 168 +++++++
 .../include/ignite/odbc/system/odbc_constants.h |   4 -
 .../odbc/system/ui/dsn_configuration_window.h   | 136 ++++++
 .../ignite/odbc/system/ui/custom_window.h       | 189 ++++++++
 .../win/include/ignite/odbc/system/ui/window.h  | 201 ++++++++
 .../odbc/os/win/src/system/ui/custom_window.cpp | 184 ++++++++
 .../src/system/ui/dsn_configuration_window.cpp  | 212 +++++++++
 .../cpp/odbc/os/win/src/system/ui/window.cpp    | 192 ++++++++
 .../cpp/odbc/os/win/src/system_dsn.cpp          | 218 +++++++++
 .../platforms/cpp/odbc/project/vs/odbc.vcxproj  |  27 +-
 .../cpp/odbc/project/vs/odbc.vcxproj.filters    |  36 ++
 .../cpp/odbc/src/config/configuration.cpp       | 266 ++++++-----
 modules/platforms/cpp/odbc/src/connection.cpp   |  66 ++-
 .../odbc/src/diagnostic/diagnostic_record.cpp   |   8 +-
 .../diagnostic/diagnostic_record_storage.cpp    |   2 +-
 modules/platforms/cpp/odbc/src/dsn_config.cpp   | 111 +++++
 modules/platforms/cpp/odbc/src/entry_points.cpp |   8 -
 modules/platforms/cpp/odbc/src/odbc.cpp         |  83 +---
 .../platforms/cpp/odbc/src/protocol_version.cpp | 131 ++++++
 .../commands/cache/VisorCacheStopCommand.scala  |   5 +-
 55 files changed, 3435 insertions(+), 434 deletions(-)
----------------------------------------------------------------------