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/5fac5b09 Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/5fac5b09 Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/5fac5b09 Branch: refs/heads/ignite-3478 Commit: 5fac5b0965e97f8951e16e10ca9229a2e78ddb0c Parents: e71ce19 0b6da97 Author: sboikov <[email protected]> Authored: Tue Sep 5 13:16:44 2017 +0300 Committer: sboikov <[email protected]> Committed: Tue Sep 5 13:16:44 2017 +0300 ---------------------------------------------------------------------- .../internal/jdbc2/JdbcMetadataSelfTest.java | 19 + .../jdbc/suite/IgniteJdbcDriverTestSuite.java | 2 + .../JdbcThinMissingLongArrayResultsTest.java | 341 +++++++++ .../java/org/apache/ignite/IgniteServices.java | 112 ++- .../org/apache/ignite/cache/QueryIndex.java | 5 +- .../internal/DuplicateTypeIdException.java | 74 ++ .../apache/ignite/internal/IgniteKernal.java | 7 +- .../ignite/internal/IgniteServicesImpl.java | 64 +- .../ignite/internal/MarshallerContextImpl.java | 24 +- .../ignite/internal/binary/BinaryContext.java | 52 +- .../binary/builder/BinaryObjectBuilderImpl.java | 2 + .../internal/jdbc/JdbcDatabaseMetadata.java | 2 +- .../jdbc/thin/JdbcThinDatabaseMetadata.java | 2 +- .../internal/jdbc2/JdbcDatabaseMetadata.java | 35 +- .../discovery/GridDiscoveryManager.java | 2 - .../cache/binary/BinaryMetadataTransport.java | 14 +- .../distributed/dht/GridDhtTxPrepareFuture.java | 1 - .../dht/preloader/GridDhtPartitionMap.java | 24 +- .../distributed/near/GridNearGetFuture.java | 2 +- .../local/atomic/GridLocalAtomicCache.java | 8 +- .../processors/odbc/SqlListenerUtils.java | 6 + .../odbc/odbc/OdbcRequestHandler.java | 17 +- .../processors/odbc/odbc/OdbcUtils.java | 22 + .../GridServiceDeploymentCompoundFuture.java | 196 +++++ .../service/GridServiceProcessor.java | 555 +++++++++----- .../service/PreparedConfigurations.java | 53 ++ .../service/ServiceDeploymentException.java | 78 ++ .../util/future/GridCompoundFuture.java | 15 +- .../BinaryObjectBuilderAdditionalSelfTest.java | 22 + .../binary/BinaryMetadataUpdatesFlowTest.java | 48 ++ ...ServiceDeploymentCompoundFutureSelfTest.java | 241 ++++++ ...GridServiceProcessorBatchDeploySelfTest.java | 741 +++++++++++++++++++ .../testsuites/IgniteKernalSelfTestSuite.java | 4 + modules/platforms/cpp/odbc-test/Makefile.am | 3 +- .../cpp/odbc-test/project/vs/odbc-test.vcxproj | 8 +- .../cpp/odbc-test/src/queries_test.cpp | 75 +- .../cpp/odbc/include/ignite/odbc/cursor.h | 7 + modules/platforms/cpp/odbc/src/cursor.cpp | 5 + .../platforms/cpp/odbc/src/query/data_query.cpp | 2 +- .../Compute/ComputeApiTest.cs | 6 + .../cache/jdbc/JdbcAbstractBenchmark.java | 4 +- .../yardstick/cache/jdbc/RdbmsBenchmark.java | 6 +- 42 files changed, 2573 insertions(+), 333 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ignite/blob/5fac5b09/modules/core/src/main/java/org/apache/ignite/internal/managers/discovery/GridDiscoveryManager.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ignite/blob/5fac5b09/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 6366b70,ce3c290..3bb4ea8 --- 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 @@@ -1225,26 -1225,6 +1225,25 @@@ public final class GridDhtTxPrepareFutu } } + IgniteInternalFuture<Long> waitCrdCntrFut = null; + + if (req.requestMvccCounter()) { + assert tx.txState().mvccEnabled(cctx); + + ClusterNode crd = cctx.coordinators().coordinator(tx.topologyVersion()); + + assert crd != null : tx.topologyVersion(); + + if (crd.isLocal()) + tx.mvccCoordinatorCounter(cctx.coordinators().requestTxCounterOnCoordinator(tx.nearXidVersion())); + else { + IgniteInternalFuture<Long> crdCntrFut = cctx.coordinators().requestTxCounter(crd, tx); + + if (tx.onePhaseCommit()) + waitCrdCntrFut = crdCntrFut; + } + } + - // We are holding transaction-level locks for entries here, so we can get next write version. onEntriesLocked(); // We are holding transaction-level locks for entries here, so we can get next write version. http://git-wip-us.apache.org/repos/asf/ignite/blob/5fac5b09/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearGetFuture.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ignite/blob/5fac5b09/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/local/atomic/GridLocalAtomicCache.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ignite/blob/5fac5b09/modules/core/src/main/java/org/apache/ignite/internal/processors/service/GridServiceProcessor.java ----------------------------------------------------------------------
