Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/ignite into ignite-6778
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/54ccc9fe Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/54ccc9fe Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/54ccc9fe Branch: refs/heads/ignite-6778 Commit: 54ccc9fe763b1588814356a97ae9d13de53d4d6d Parents: 6d47417 2f468d8 Author: Alexey Goncharuk <[email protected]> Authored: Wed Nov 1 12:28:58 2017 +0300 Committer: Alexey Goncharuk <[email protected]> Committed: Wed Nov 1 12:28:58 2017 +0300 ---------------------------------------------------------------------- .../wal/reader/StandaloneGridKernalContext.java | 20 +- .../processors/odbc/odbc/OdbcMessageParser.java | 60 +++- .../odbc/odbc/OdbcQueryExecuteBatchResult.java | 20 +- .../odbc/odbc/OdbcQueryExecuteResult.java | 11 +- .../odbc/odbc/OdbcQueryMoreResultsRequest.java | 61 ++++ .../odbc/odbc/OdbcQueryMoreResultsResult.java | 66 ++++ .../processors/odbc/odbc/OdbcQueryResults.java | 106 ++++++ .../processors/odbc/odbc/OdbcRequest.java | 3 + .../odbc/odbc/OdbcRequestHandler.java | 175 +++++----- .../processors/odbc/odbc/OdbcResultSet.java | 101 ++++++ .../processors/odbc/odbc/OdbcUtils.java | 31 ++ .../ignite/spi/discovery/tcp/ClientImpl.java | 14 +- .../ignite/spi/discovery/tcp/ServerImpl.java | 14 +- .../spi/discovery/tcp/TcpDiscoverySpi.java | 22 ++ .../db/wal/reader/IgniteWalReaderTest.java | 283 ++++++++++------ .../tcp/TcpDiscoveryWithWrongServerTest.java | 332 +++++++++++++++++++ .../IgniteSpiDiscoverySelfTestSuite.java | 3 + modules/docker/2.3.0/Dockerfile | 46 +++ modules/docker/2.3.0/run.sh | 51 +++ modules/docker/Dockerfile | 2 +- .../math/distributed/keys/BlockMatrixKey.java | 12 +- .../distributed/keys/impl/BlockMatrixKey.java | 49 ++- .../matrix/SparseBlockDistributedMatrix.java | 15 +- .../impls/matrix/SparseDistributedMatrix.java | 2 +- .../storage/matrix/BlockMatrixStorage.java | 213 ++++++------ .../SparseDistributedBlockMatrixTest.java | 15 +- .../examples/odbc-example/src/odbc_example.cpp | 8 +- .../cpp/odbc-test/src/queries_test.cpp | 200 ++++++++++- .../cpp/odbc/include/ignite/odbc/message.h | 97 +++++- .../include/ignite/odbc/query/batch_query.h | 16 +- .../ignite/odbc/query/column_metadata_query.h | 7 + .../odbc/include/ignite/odbc/query/data_query.h | 22 +- .../ignite/odbc/query/foreign_keys_query.h | 7 + .../ignite/odbc/query/primary_keys_query.h | 7 + .../cpp/odbc/include/ignite/odbc/query/query.h | 7 + .../ignite/odbc/query/special_columns_query.h | 7 + .../ignite/odbc/query/table_metadata_query.h | 7 + .../include/ignite/odbc/query/type_info_query.h | 7 + .../cpp/odbc/include/ignite/odbc/statement.h | 6 +- modules/platforms/cpp/odbc/src/cursor.cpp | 2 +- modules/platforms/cpp/odbc/src/message.cpp | 62 +++- modules/platforms/cpp/odbc/src/odbc.cpp | 2 +- .../cpp/odbc/src/query/batch_query.cpp | 80 ++--- .../odbc/src/query/column_metadata_query.cpp | 5 + .../platforms/cpp/odbc/src/query/data_query.cpp | 93 +++++- .../cpp/odbc/src/query/foreign_keys_query.cpp | 5 + .../cpp/odbc/src/query/primary_keys_query.cpp | 5 + .../odbc/src/query/special_columns_query.cpp | 5 + .../cpp/odbc/src/query/table_metadata_query.cpp | 5 + .../cpp/odbc/src/query/type_info_query.cpp | 5 + modules/platforms/cpp/odbc/src/statement.cpp | 14 +- .../Cache/DataStorageMetricsTest.cs | 2 +- .../Apache.Ignite.Core.csproj | 4 - 53 files changed, 1931 insertions(+), 483 deletions(-) ----------------------------------------------------------------------
