Merge remote-tracking branch 'remotes/origin/master' into ignite-5293
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/17b29c79 Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/17b29c79 Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/17b29c79 Branch: refs/heads/ignite-5293 Commit: 17b29c79525cc30e6a81e39359d627d0abf227ba Parents: 558968b eaf8e14 Author: sboikov <[email protected]> Authored: Tue Jun 6 10:48:38 2017 +0300 Committer: sboikov <[email protected]> Committed: Tue Jun 6 10:48:38 2017 +0300 ---------------------------------------------------------------------- .../jdbc2/JdbcAbstractDmlStatementSelfTest.java | 2 - .../jdbc2/JdbcComplexQuerySelfTest.java | 2 - .../internal/jdbc2/JdbcConnectionSelfTest.java | 2 - .../jdbc2/JdbcDistributedJoinsQueryTest.java | 2 - .../internal/jdbc2/JdbcEmptyCacheSelfTest.java | 2 - .../internal/jdbc2/JdbcLocalCachesSelfTest.java | 2 - .../internal/jdbc2/JdbcMetadataSelfTest.java | 2 - .../internal/jdbc2/JdbcNoDefaultCacheTest.java | 2 - .../jdbc2/JdbcPreparedStatementSelfTest.java | 2 - .../internal/jdbc2/JdbcResultSetSelfTest.java | 2 - .../internal/jdbc2/JdbcSpringSelfTest.java | 2 - .../internal/jdbc2/JdbcStatementSelfTest.java | 2 - .../internal/jdbc2/JdbcStreamingSelfTest.java | 2 - .../jdbc/AbstractJdbcPojoQuerySelfTest.java | 2 - .../ignite/jdbc/JdbcComplexQuerySelfTest.java | 2 - .../ignite/jdbc/JdbcConnectionSelfTest.java | 2 - .../ignite/jdbc/JdbcEmptyCacheSelfTest.java | 2 - .../ignite/jdbc/JdbcLocalCachesSelfTest.java | 2 - .../ignite/jdbc/JdbcMetadataSelfTest.java | 2 - .../ignite/jdbc/JdbcNoDefaultCacheTest.java | 2 - .../jdbc/JdbcPreparedStatementSelfTest.java | 2 - .../ignite/jdbc/JdbcResultSetSelfTest.java | 2 - .../ignite/jdbc/JdbcStatementSelfTest.java | 2 - .../JdbcThinAbstractDmlStatementSelfTest.java | 5 - .../jdbc/thin/JdbcThinAbstractSelfTest.java | 16 +- .../jdbc/thin/JdbcThinConnectionSelfTest.java | 84 +++++- .../jdbc/thin/JdbcThinEmptyCacheSelfTest.java | 3 - .../jdbc/thin/JdbcThinNoDefaultSchemaTest.java | 2 - .../thin/JdbcThinPreparedStatementSelfTest.java | 3 - .../jdbc/thin/JdbcThinStatementSelfTest.java | 3 - .../main/java/META-INF/services/java.sql.Driver | 2 + .../org/apache/ignite/IgniteJdbcDriver.java | 9 +- .../org/apache/ignite/IgniteJdbcThinDriver.java | 19 +- .../ignite/cache/query/SqlFieldsQuery.java | 12 +- .../configuration/IgniteConfiguration.java | 30 ++ .../ignite/configuration/OdbcConfiguration.java | 4 + .../SqlConnectorConfiguration.java | 275 +++++++++++++++++++ .../internal/jdbc/thin/JdbcThinConnection.java | 8 +- .../internal/jdbc/thin/JdbcThinTcpIo.java | 49 +++- .../internal/jdbc/thin/JdbcThinUtils.java | 15 +- .../processors/cache/ClusterCachesInfo.java | 11 + .../processors/cache/GridCacheUtils.java | 3 + .../internal/processors/odbc/OdbcTypes.java | 131 --------- .../internal/processors/odbc/OdbcUtils.java | 141 ---------- .../processors/odbc/SqlListenerDataTypes.java | 30 +- .../processors/odbc/SqlListenerNioListener.java | 40 +-- .../processors/odbc/SqlListenerProcessor.java | 187 +++++++++---- .../odbc/jdbc/JdbcRequestHandler.java | 34 ++- .../processors/odbc/odbc/OdbcColumnMeta.java | 1 - .../processors/odbc/odbc/OdbcMessageParser.java | 12 +- .../odbc/odbc/OdbcQueryExecuteRequest.java | 16 +- .../odbc/OdbcQueryGetColumnsMetaRequest.java | 44 +-- .../odbc/OdbcQueryGetParamsMetaRequest.java | 15 +- .../odbc/odbc/OdbcRequestHandler.java | 69 ++--- .../processors/odbc/odbc/OdbcTableMeta.java | 1 - .../processors/odbc/odbc/OdbcTypes.java | 131 +++++++++ .../processors/odbc/odbc/OdbcUtils.java | 142 ++++++++++ .../odbc/odbc/escape/OdbcEscapeUtils.java | 2 +- .../platform/cache/PlatformCache.java | 4 +- .../processors/query/GridQueryProcessor.java | 12 +- .../internal/processors/query/QueryUtils.java | 44 +++ .../service/GridServiceProcessor.java | 86 +++--- ...gniteCacheInvokeReadThroughAbstractTest.java | 92 ++++--- .../OdbcConfigurationValidationSelfTest.java | 186 +++++++++++++ .../SqlListenerProcessorValidationSelfTest.java | 184 ------------- .../testframework/junits/GridAbstractTest.java | 24 ++ .../ignite/testframework/junits/IgniteMock.java | 11 +- .../junits/IgniteTestResources.java | 52 ++-- .../cache/GridAbstractCacheStoreSelfTest.java | 5 +- .../ignite/testsuites/IgniteBasicTestSuite.java | 4 +- .../cache/query/GridCacheTwoStepQuery.java | 1 + .../processors/query/h2/IgniteH2Indexing.java | 2 +- .../query/h2/ddl/DdlStatementsProcessor.java | 18 +- .../cache/IgniteCacheNoClassQuerySelfTest.java | 5 + .../cache/index/H2DynamicTableSelfTest.java | 106 +++++-- .../processors/query/SqlSchemaSelfTest.java | 25 ++ ...onnectorConfigurationValidationSelfTest.java | 240 ++++++++++++++++ .../IgniteCacheQuerySelfTestSuite.java | 3 + .../core-test/config/cache-query-default.xml | 27 +- .../cpp/core-test/src/cache_query_test.cpp | 47 +++- .../ignite/cache/query/query_sql_fields.h | 53 +++- .../odbc-example/config/example-odbc.xml | 6 - .../odbc-test/config/queries-test-default.xml | 9 +- .../odbc-test/config/queries-test-noodbc-32.xml | 4 + .../odbc-test/config/queries-test-noodbc.xml | 6 +- .../project/vs/odbc-test.vcxproj.filters | 4 +- .../cpp/odbc-test/src/api_robustness_test.cpp | 54 ++-- .../cpp/odbc-test/src/configuration_test.cpp | 32 +-- .../cpp/odbc-test/src/queries_test.cpp | 34 +-- .../odbc-test/src/sql_test_suite_fixture.cpp | 2 +- .../include/ignite/odbc/config/configuration.h | 24 +- .../cpp/odbc/include/ignite/odbc/connection.h | 6 +- .../cpp/odbc/include/ignite/odbc/message.h | 30 +- .../odbc/system/ui/dsn_configuration_window.h | 12 +- .../src/system/ui/dsn_configuration_window.cpp | 18 +- .../cpp/odbc/src/config/configuration.cpp | 4 +- modules/platforms/cpp/odbc/src/connection.cpp | 4 +- modules/platforms/cpp/odbc/src/dsn_config.cpp | 4 +- .../odbc/src/query/column_metadata_query.cpp | 2 +- .../platforms/cpp/odbc/src/query/data_query.cpp | 14 +- modules/platforms/cpp/odbc/src/statement.cpp | 12 +- .../Cache/Query/CacheLinqTest.cs | 12 +- .../Cache/Query/CacheQueriesTest.cs | 32 +++ .../Cache/Query/SqlFieldsQuery.cs | 12 +- .../Apache.Ignite.Core/Impl/Cache/CacheImpl.cs | 1 + modules/platforms/dotnet/build.ps1 | 36 +-- 106 files changed, 2115 insertions(+), 1085 deletions(-) ----------------------------------------------------------------------
