Merge branch 'ignite-3478' into ignite-3484
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/c966451d Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/c966451d Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/c966451d Branch: refs/heads/ignite-3484 Commit: c966451d0bf7059575de92bcfae43d72096ebce4 Parents: dd0afb2 dcaf880 Author: sboikov <[email protected]> Authored: Wed Sep 6 11:27:04 2017 +0300 Committer: sboikov <[email protected]> Committed: Wed Sep 6 11:27:04 2017 +0300 ---------------------------------------------------------------------- .../jdbc/thin/JdbcThinStatementSelfTest.java | 62 ++++- .../java/org/apache/ignite/IgniteServices.java | 2 +- .../internal/jdbc/thin/JdbcThinResultSet.java | 29 ++- .../internal/jdbc/thin/JdbcThinStatement.java | 22 +- .../cache/CacheAffinitySharedManager.java | 17 +- .../GridCachePartitionExchangeManager.java | 5 +- .../dht/GridClientPartitionTopology.java | 3 + .../cache/distributed/dht/GridDhtTxLocal.java | 1 - .../GridDhtPartitionsExchangeFuture.java | 10 +- .../odbc/SqlListenerConnectionContext.java | 37 ++- .../processors/odbc/SqlListenerNioListener.java | 95 ++------ .../odbc/jdbc/JdbcConnectionContext.java | 101 ++++++++ .../odbc/odbc/OdbcConnectionContext.java | 99 ++++++++ .../odbc/odbc/OdbcRequestHandler.java | 54 +++-- .../GridServiceDeploymentCompoundFuture.java | 1 + .../service/GridServiceProcessor.java | 1 + .../service/ServiceDeploymentException.java | 78 ------ .../services/ServiceDeploymentException.java | 77 ++++++ .../org.apache.ignite.plugin.PluginProvider | 3 +- ...atformCachePluginConfigurationClosureFactory | 1 - ...rm.PlatformPluginConfigurationClosureFactory | 1 - ...ServiceDeploymentCompoundFutureSelfTest.java | 1 + ...GridServiceProcessorBatchDeploySelfTest.java | 1 + .../platform/plugin/PlatformTestPlugin.java | 27 --- .../plugin/PlatformTestPluginConfiguration.java | 63 ----- ...rmTestPluginConfigurationClosureFactory.java | 61 ----- .../plugin/PlatformTestPluginException.java | 34 --- .../plugin/PlatformTestPluginExtension.java | 51 ---- .../plugin/PlatformTestPluginProvider.java | 103 -------- .../plugin/PlatformTestPluginTarget.java | 236 ------------------- .../cache/PlatformGetCachePluginsTask.java | 85 ------- .../PlatformTestCachePluginConfiguration.java | 55 ----- ...formTestCachePluginConfigurationClosure.java | 48 ---- ...tCachePluginConfigurationClosureFactory.java | 37 --- .../cache/PlatformTestCachePluginProvider.java | 72 ------ modules/extdata/platform/README.txt | 4 + .../extdata/platform/licenses/apache-2.0.txt | 202 ++++++++++++++++ modules/extdata/platform/pom.xml | 46 ++++ .../platform/plugin/PlatformTestPlugin.java | 27 +++ .../plugin/PlatformTestPluginConfiguration.java | 63 +++++ ...rmTestPluginConfigurationClosureFactory.java | 61 +++++ .../plugin/PlatformTestPluginException.java | 34 +++ .../plugin/PlatformTestPluginExtension.java | 51 ++++ .../plugin/PlatformTestPluginProvider.java | 103 ++++++++ .../plugin/PlatformTestPluginTarget.java | 236 +++++++++++++++++++ .../cache/PlatformGetCachePluginsTask.java | 85 +++++++ .../PlatformTestCachePluginConfiguration.java | 55 +++++ ...formTestCachePluginConfigurationClosure.java | 48 ++++ ...tCachePluginConfigurationClosureFactory.java | 37 +++ .../cache/PlatformTestCachePluginProvider.java | 72 ++++++ .../platform/plugin/cache/package-info.java | 22 ++ .../ignite/platform/plugin/package-info.java | 22 ++ .../org.apache.ignite.plugin.PluginProvider | 1 + ...atformCachePluginConfigurationClosureFactory | 1 + ...rm.PlatformPluginConfigurationClosureFactory | 1 + .../DynamicIndexAbstractConcurrentSelfTest.java | 2 +- .../cpp/odbc-test/src/configuration_test.cpp | 11 + .../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 | 34 ++- .../cpp/odbc/src/config/configuration.cpp | 2 + modules/platforms/cpp/odbc/src/connection.cpp | 6 +- modules/platforms/cpp/odbc/src/dsn_config.cpp | 3 + modules/platforms/cpp/odbc/src/message.cpp | 15 +- .../platforms/cpp/odbc/src/protocol_version.cpp | 8 +- .../Apache.Ignite.Core/Impl/Common/Classpath.cs | 1 + pom.xml | 1 + 69 files changed, 1762 insertions(+), 1102 deletions(-) ----------------------------------------------------------------------
