Merge remote-tracking branch 'remotes/origin/master' into ignite-3478 # Conflicts: # modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtTxPrepareFuture.java
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/27b87b41 Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/27b87b41 Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/27b87b41 Branch: refs/heads/ignite-3484 Commit: 27b87b413348b03986a463551db24b7726321732 Parents: 43834aa 788adc0 Author: sboikov <[email protected]> Authored: Wed Sep 6 11:19:18 2017 +0300 Committer: sboikov <[email protected]> Committed: Wed Sep 6 11:19:18 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 - .../distributed/dht/GridDhtTxPrepareFuture.java | 19 +- .../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 + 70 files changed, 1776 insertions(+), 1107 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ignite/blob/27b87b41/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtTxPrepareFuture.java ---------------------------------------------------------------------- diff --cc modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtTxPrepareFuture.java index 3bb4ea8,1c5e1a6..5ac86da --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtTxPrepareFuture.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtTxPrepareFuture.java @@@ -1263,44 -1236,18 +1263,55 @@@ public final class GridDhtTxPrepareFutu if (isDone()) return; - if (last) { - if (waitCrdCntrFut != null) { + if (last) + sendPrepareRequests(); + } + finally { + markInitialized(); + } + } + + /** + * + */ + private void sendPrepareRequests() { ++ if (waitCrdCntrFut != null) { + skipInit = true; + + waitCrdCntrFut.listen(new IgniteInClosure<IgniteInternalFuture<Long>>() { + @Override public void apply(IgniteInternalFuture<Long> fut) { + try { + fut.get(); + + sendPrepareRequests(); + } + catch (Throwable e) { + U.error(log, "Failed to get coordinator counter: " + e, e); + + GridNearTxPrepareResponse res = createPrepareResponse(e); + + onDone(res, res.error()); + } + finally { + markInitialized(); + } + } + }); + } + else + sendPrepareRequests(); + } + } + finally { + if (!skipInit) + markInitialized(); + } + } + + /** + * + */ + private void sendPrepareRequests() { if (tx.onePhaseCommit() && !tx.nearMap().isEmpty()) { for (GridDistributedTxMapping nearMapping : tx.nearMap().values()) { if (!tx.dhtMap().containsKey(nearMapping.primary().id())) { @@@ -1311,9 -1258,7 +1322,7 @@@ } } - assert !tx.txState().mvccEnabled(cctx) || !tx.onePhaseCommit() || tx.mvccCoordinatorCounter() != TxMvccVersion.COUNTER_NA; - -- int miniId = 0; ++ assert !tx.txState().mvccEnabled(cctx) || !tx.onePhaseCommit() || tx.mvccCoordinatorCounter() != TxMvccVersion.COUNTER_NA;int miniId = 0; assert tx.transactionNodes() != null; http://git-wip-us.apache.org/repos/asf/ignite/blob/27b87b41/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/GridDhtPartitionsExchangeFuture.java ----------------------------------------------------------------------
