Merge remote-tracking branch 'remotes/origin/master' into ignite-3478
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/4c06131b Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/4c06131b Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/4c06131b Branch: refs/heads/ignite-5932 Commit: 4c06131bda84bb92a770befe872807c3680b2046 Parents: f29d4bc ae02a1d Author: sboikov <[email protected]> Authored: Fri Oct 13 13:21:47 2017 +0300 Committer: sboikov <[email protected]> Committed: Fri Oct 13 13:21:47 2017 +0300 ---------------------------------------------------------------------- .../internal/jdbc2/JdbcConnectionSelfTest.java | 13 +- .../jdbc/suite/IgniteJdbcDriverTestSuite.java | 11 + .../JdbcThinAbstractDmlStatementSelfTest.java | 14 +- .../thin/JdbcThinComplexDmlDdlSelfTest.java | 10 +- ...omplexDmlDdlSkipReducerOnUpdateSelfTest.java | 33 + .../jdbc/thin/JdbcThinConnectionSelfTest.java | 18 +- .../thin/JdbcThinInsertStatementSelfTest.java | 1 - ...ertStatementSkipReducerOnUpdateSelfTest.java | 33 + ...rgeStatementSkipReducerOnUpdateSelfTest.java | 33 + ...ateStatementSkipReducerOnUpdateSelfTest.java | 33 + .../ignite/codegen/MessageCodeGenerator.java | 2 + .../org/apache/ignite/IgniteJdbcDriver.java | 9 +- .../org/apache/ignite/IgniteJdbcThinDriver.java | 3 +- .../ignite/cache/query/SqlFieldsQuery.java | 7 + .../internal/jdbc/thin/JdbcThinConnection.java | 4 +- .../internal/jdbc/thin/JdbcThinTcpIo.java | 15 +- .../internal/jdbc/thin/JdbcThinUtils.java | 6 + .../internal/jdbc2/JdbcBatchUpdateTask.java | 3 +- .../ignite/internal/jdbc2/JdbcConnection.java | 14 +- .../jdbc2/JdbcQueryMultipleStatementsTask.java | 3 +- .../ignite/internal/jdbc2/JdbcQueryTask.java | 10 +- .../ignite/internal/jdbc2/JdbcQueryTaskV3.java | 19 +- .../ignite/internal/jdbc2/JdbcResultSet.java | 2 +- .../internal/jdbc2/JdbcSqlFieldsQuery.java | 105 --- .../ignite/internal/jdbc2/JdbcStatement.java | 4 +- .../cache/query/GridCacheSqlQuery.java | 24 + .../cache/query/SqlFieldsQueryEx.java | 158 ++++ .../odbc/jdbc/JdbcConnectionContext.java | 7 +- .../odbc/jdbc/JdbcRequestHandler.java | 19 +- .../odbc/odbc/OdbcConnectionContext.java | 13 +- .../odbc/odbc/OdbcRequestHandler.java | 14 +- .../client/cache/ClientCacheRequest.java | 8 +- .../resources/META-INF/classnames.properties | 4 +- .../query/h2/DmlStatementsProcessor.java | 160 ++-- .../processors/query/h2/H2DmlPlanKey.java | 21 +- .../processors/query/h2/IgniteH2Indexing.java | 116 ++- .../processors/query/h2/UpdateResult.java | 63 ++ .../processors/query/h2/dml/UpdatePlan.java | 64 +- .../query/h2/dml/UpdatePlanBuilder.java | 117 ++- .../query/h2/sql/GridSqlQuerySplitter.java | 33 + .../query/h2/twostep/DistributedUpdateRun.java | 133 ++++ .../query/h2/twostep/GridMapQueryExecutor.java | 136 ++++ .../h2/twostep/GridReduceQueryExecutor.java | 294 ++++++- .../query/h2/twostep/MapNodeResults.java | 33 + .../query/h2/twostep/msg/GridH2DmlRequest.java | 516 ++++++++++++ .../query/h2/twostep/msg/GridH2DmlResponse.java | 250 ++++++ .../twostep/msg/GridH2ValueMessageFactory.java | 6 + ...teSqlSkipReducerOnUpdateDmlFlagSelfTest.java | 783 +++++++++++++++++++ ...IgniteSqlSkipReducerOnUpdateDmlSelfTest.java | 755 ++++++++++++++++++ .../IgniteCacheQuerySelfTestSuite.java | 4 + .../cpp/odbc-test/src/configuration_test.cpp | 25 +- .../cpp/odbc-test/src/queries_test.cpp | 8 + .../include/ignite/odbc/config/configuration.h | 26 + .../cpp/odbc/include/ignite/odbc/message.h | 6 +- .../odbc/include/ignite/odbc/protocol_version.h | 1 + .../odbc/system/ui/dsn_configuration_window.h | 4 + .../src/system/ui/dsn_configuration_window.cpp | 20 + .../cpp/odbc/src/config/configuration.cpp | 50 +- modules/platforms/cpp/odbc/src/connection.cpp | 5 +- modules/platforms/cpp/odbc/src/dsn_config.cpp | 4 + modules/platforms/cpp/odbc/src/message.cpp | 12 +- .../platforms/cpp/odbc/src/protocol_version.cpp | 6 +- .../Examples/Example.cs | 6 +- .../Examples/ExamplesTest.cs | 42 +- .../Apache.Ignite.Examples.csproj | 2 + .../examples/Apache.Ignite.Examples/App.config | 4 + .../ThinClient/ThinClientPutGetExample.cs | 93 +++ .../ThinClient/ThinClientQueryExample.cs | 147 ++++ .../agent/handlers/AbstractListener.java | 6 +- 69 files changed, 4287 insertions(+), 316 deletions(-) ----------------------------------------------------------------------
