You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ignite.apache.org by sb...@apache.org on 2017/03/14 08:00:20 UTC
[01/38] ignite git commit: ignite-4768
Repository: ignite
Updated Branches:
refs/heads/ignite-4768 [created] 30611c7b7
ignite-4768
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/d39050c7
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/d39050c7
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/d39050c7
Branch: refs/heads/ignite-4768
Commit: d39050c749c6ec2876058d80ddb591d9b5cdbdcf
Parents: 50f8741
Author: sboikov <sb...@gridgain.com>
Authored: Thu Mar 2 14:32:16 2017 +0300
Committer: sboikov <sb...@gridgain.com>
Committed: Thu Mar 2 15:08:17 2017 +0300
----------------------------------------------------------------------
.../distributed/GridDistributedBaseMessage.java | 2 +-
...arOptimisticSerializableTxPrepareFuture.java | 10 ---
.../near/GridNearTxFinishFuture.java | 72 ++++----------------
.../cache/transactions/IgniteTxHandler.java | 4 +-
4 files changed, 17 insertions(+), 71 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ignite/blob/d39050c7/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/GridDistributedBaseMessage.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/GridDistributedBaseMessage.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/GridDistributedBaseMessage.java
index ebbc9ae..630c79f 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/GridDistributedBaseMessage.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/GridDistributedBaseMessage.java
@@ -142,7 +142,7 @@ public abstract class GridDistributedBaseMessage extends GridCacheMessage implem
/**
* @return Count of keys referenced in candidates array (needed only locally for optimization).
*/
- public int keysCount() {
+ int keysCount() {
return cnt;
}
http://git-wip-us.apache.org/repos/asf/ignite/blob/d39050c7/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearOptimisticSerializableTxPrepareFuture.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearOptimisticSerializableTxPrepareFuture.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearOptimisticSerializableTxPrepareFuture.java
index dbc8096..e450d4b 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearOptimisticSerializableTxPrepareFuture.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearOptimisticSerializableTxPrepareFuture.java
@@ -70,9 +70,6 @@ import static org.apache.ignite.transactions.TransactionState.PREPARING;
*/
public class GridNearOptimisticSerializableTxPrepareFuture extends GridNearOptimisticTxPrepareFutureAdapter {
/** */
- public static final IgniteProductVersion SER_TX_SINCE = IgniteProductVersion.fromString("1.5.0");
-
- /** */
@GridToStringExclude
private KeyLockFuture keyLockFut;
@@ -544,13 +541,6 @@ public class GridNearOptimisticSerializableTxPrepareFuture extends GridNearOptim
", primary=" + U.toShortString(primary) + ", topVer=" + topVer + ']');
}
- if (primary.version().compareTo(SER_TX_SINCE) < 0) {
- onDone(new IgniteCheckedException("Optimistic serializable transactions can be used only with node " +
- "version starting from " + SER_TX_SINCE));
-
- return;
- }
-
// Must re-initialize cached entry while holding topology lock.
if (cacheCtx.isNear())
entry.cached(cacheCtx.nearTx().entryExx(entry.key(), topVer));
http://git-wip-us.apache.org/repos/asf/ignite/blob/d39050c7/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearTxFinishFuture.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearTxFinishFuture.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearTxFinishFuture.java
index 512f63e..b7fdba3 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearTxFinishFuture.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearTxFinishFuture.java
@@ -54,12 +54,11 @@ import org.apache.ignite.internal.util.typedef.F;
import org.apache.ignite.internal.util.typedef.internal.CU;
import org.apache.ignite.internal.util.typedef.internal.S;
import org.apache.ignite.internal.util.typedef.internal.U;
-import org.apache.ignite.lang.IgniteProductVersion;
import org.apache.ignite.lang.IgniteUuid;
import org.apache.ignite.transactions.TransactionRollbackException;
+import static org.apache.ignite.cache.CacheWriteSynchronizationMode.FULL_ASYNC;
import static org.apache.ignite.cache.CacheWriteSynchronizationMode.FULL_SYNC;
-import static org.apache.ignite.cache.CacheWriteSynchronizationMode.PRIMARY_SYNC;
import static org.apache.ignite.internal.processors.cache.GridCacheOperation.NOOP;
import static org.apache.ignite.transactions.TransactionState.UNKNOWN;
@@ -69,18 +68,6 @@ import static org.apache.ignite.transactions.TransactionState.UNKNOWN;
public final class GridNearTxFinishFuture<K, V> extends GridCompoundIdentityFuture<IgniteInternalTx>
implements GridCacheFuture<IgniteInternalTx> {
/** */
- public static final IgniteProductVersion FINISH_NEAR_ONE_PHASE_SINCE = IgniteProductVersion.fromString("1.4.0");
-
- /** */
- public static final IgniteProductVersion WAIT_REMOTE_TXS_SINCE = IgniteProductVersion.fromString("1.5.1");
-
- /** */
- public static final IgniteProductVersion PRIMARY_SYNC_TXS_SINCE = IgniteProductVersion.fromString("1.6.0");
-
- /** */
- public static final IgniteProductVersion ACK_DHT_ONE_PHASE_SINCE = IgniteProductVersion.fromString("1.6.8");
-
- /** */
private static final long serialVersionUID = 0L;
/** Logger reference. */
@@ -157,7 +144,7 @@ public final class GridNearTxFinishFuture<K, V> extends GridCompoundIdentityFutu
@Override public boolean onNodeLeft(UUID nodeId) {
boolean found = false;
- for (IgniteInternalFuture<?> fut : futures())
+ for (IgniteInternalFuture<?> fut : futures()) {
if (isMini(fut)) {
MinFuture f = (MinFuture)fut;
@@ -168,6 +155,7 @@ public final class GridNearTxFinishFuture<K, V> extends GridCompoundIdentityFutu
found = true;
}
}
+ }
return found;
}
@@ -470,10 +458,8 @@ public final class GridNearTxFinishFuture<K, V> extends GridCompoundIdentityFutu
}
else if (backup.isLocal())
cctx.tm().removeTxReturn(tx.xidVersion());
- else {
- if (ACK_DHT_ONE_PHASE_SINCE.compareToIgnoreTimestamp(backup.version()) <= 0)
- cctx.tm().sendDeferredAckResponse(backupId, tx.xidVersion());
- }
+ else
+ cctx.tm().sendDeferredAckResponse(backupId, tx.xidVersion());
}
}
}
@@ -575,24 +561,13 @@ public final class GridNearTxFinishFuture<K, V> extends GridCompoundIdentityFutu
else {
GridDhtTxFinishRequest finishReq = checkCommittedRequest(mini.futureId(), false);
- // Preserve old behavior, otherwise response is not sent.
- if (WAIT_REMOTE_TXS_SINCE.compareTo(backup.version()) > 0)
- finishReq.syncCommit(true);
-
try {
- if (FINISH_NEAR_ONE_PHASE_SINCE.compareTo(backup.version()) <= 0) {
- cctx.io().send(backup, finishReq, tx.ioPolicy());
+ cctx.io().send(backup, finishReq, tx.ioPolicy());
- if (msgLog.isDebugEnabled()) {
- msgLog.debug("Near finish fut, sent check committed request [" +
- "txId=" + tx.nearXidVersion() +
- ", node=" + backup.id() + ']');
- }
- }
- else {
- mini.onDone(new IgniteTxHeuristicCheckedException("Failed to check for tx commit on " +
- "the backup node (node has an old Ignite version) [rmtNodeId=" + backup.id() +
- ", ver=" + backup.version() + ']'));
+ if (msgLog.isDebugEnabled()) {
+ msgLog.debug("Near finish fut, sent check committed request [" +
+ "txId=" + tx.nearXidVersion() +
+ ", node=" + backup.id() + ']');
}
}
catch (ClusterTopologyCheckedException ignored) {
@@ -624,18 +599,7 @@ public final class GridNearTxFinishFuture<K, V> extends GridCompoundIdentityFutu
if (tx.mappings().empty())
return false;
- boolean finish = tx.txState().hasNearCache(cctx) || !commit;
-
- if (finish) {
- GridDistributedTxMapping mapping = tx.mappings().singleMapping();
-
- assert mapping != null : tx;
-
- if (FINISH_NEAR_ONE_PHASE_SINCE.compareTo(mapping.node().version()) > 0)
- finish = false;
- }
-
- return finish;
+ return tx.txState().hasNearCache(cctx) || !commit;
}
/**
@@ -755,12 +719,7 @@ public final class GridNearTxFinishFuture<K, V> extends GridCompoundIdentityFutu
", node=" + n.id() + ']');
}
- boolean wait;
-
- if (syncMode == PRIMARY_SYNC)
- wait = n.version().compareToIgnoreTimestamp(PRIMARY_SYNC_TXS_SINCE) >= 0;
- else
- wait = syncMode == FULL_SYNC;
+ boolean wait = syncMode != FULL_ASYNC;
// If we don't wait for result, then mark future as done.
if (!wait)
@@ -893,8 +852,7 @@ public final class GridNearTxFinishFuture<K, V> extends GridCompoundIdentityFutu
}
/**
- * Mini-future for get operations. Mini-futures are only waiting on a single
- * node as opposed to multiple nodes.
+ *
*/
private class FinishMiniFuture extends MinFuture {
/** */
@@ -949,7 +907,7 @@ public final class GridNearTxFinishFuture<K, V> extends GridCompoundIdentityFutu
for (UUID backupId : backups) {
ClusterNode backup = cctx.discovery().node(backupId);
- if (backup != null && WAIT_REMOTE_TXS_SINCE.compareTo(backup.version()) <= 0) {
+ if (backup != null) {
if (backup.isLocal()) {
IgniteInternalFuture<?> fut = cctx.tm().remoteTxFinishFuture(tx.nearXidVersion());
@@ -1077,7 +1035,7 @@ public final class GridNearTxFinishFuture<K, V> extends GridCompoundIdentityFutu
/**
* @param nodes Backup nodes.
*/
- public CheckRemoteTxMiniFuture(Set<UUID> nodes) {
+ CheckRemoteTxMiniFuture(Set<UUID> nodes) {
this.nodes = nodes;
}
http://git-wip-us.apache.org/repos/asf/ignite/blob/d39050c7/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/transactions/IgniteTxHandler.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/transactions/IgniteTxHandler.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/transactions/IgniteTxHandler.java
index 90a68ad..1b135d7 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/transactions/IgniteTxHandler.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/transactions/IgniteTxHandler.java
@@ -82,7 +82,6 @@ import static org.apache.ignite.internal.managers.communication.GridIoPolicy.SYS
import static org.apache.ignite.internal.managers.communication.GridIoPolicy.UTILITY_CACHE_POOL;
import static org.apache.ignite.internal.processors.cache.GridCacheOperation.TRANSFORM;
import static org.apache.ignite.internal.processors.cache.GridCacheUtils.isNearEnabled;
-import static org.apache.ignite.internal.processors.cache.distributed.near.GridNearTxFinishFuture.FINISH_NEAR_ONE_PHASE_SINCE;
import static org.apache.ignite.internal.processors.cache.transactions.IgniteInternalTx.FinalizationStatus.USER_FINISH;
import static org.apache.ignite.transactions.TransactionConcurrency.OPTIMISTIC;
import static org.apache.ignite.transactions.TransactionConcurrency.PESSIMISTIC;
@@ -449,8 +448,7 @@ public class IgniteTxHandler {
tx.transactionNodes(req.transactionNodes());
- // Set near on originating node flag only if the sender node has new version.
- if (req.near() && FINISH_NEAR_ONE_PHASE_SINCE.compareTo(nearNode.version()) <= 0)
+ if (req.near())
tx.nearOnOriginatingNode(true);
if (req.onePhaseCommit()) {
[29/38] ignite git commit: Merge remote-tracking branch
'remotes/origin/ignite-2.0' into ignite-4768
Posted by sb...@apache.org.
Merge remote-tracking branch 'remotes/origin/ignite-2.0' into ignite-4768
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/4edd7bea
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/4edd7bea
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/4edd7bea
Branch: refs/heads/ignite-4768
Commit: 4edd7beae17533239eb2f70a9c78d0581be454c3
Parents: 0246b74 aab4f30
Author: sboikov <sb...@gridgain.com>
Authored: Mon Mar 13 12:06:07 2017 +0300
Committer: sboikov <sb...@gridgain.com>
Committed: Mon Mar 13 12:06:07 2017 +0300
----------------------------------------------------------------------
DEVNOTES.txt | 2 +-
RELEASE_NOTES.txt | 20 +
assembly/dependencies-hadoop.xml | 3 +
assembly/release-base.xml | 5 -
assembly/release-fabric-base.xml | 5 +
assembly/release-sources.xml | 3 +-
config/example-kube.xml | 53 +
doap_Ignite.rdf | 1 -
examples/pom-standalone-lgpl.xml | 12 +
examples/pom-standalone.xml | 12 +
examples/pom.xml | 14 +
.../examples/java8/spark/SharedRDDExample.java | 110 --
.../ignite/examples/spark/SharedRDDExample.java | 127 ++
.../ignite/examples/spark/package-info.java | 22 +
.../examples/SharedRDDExampleSelfTest.java | 36 -
.../IgniteExamplesJ8SelfTestSuite.java | 2 -
.../examples/SharedRDDExampleSelfTest.java | 36 +
.../IgniteExamplesSparkSelfTestSuite.java | 46 +
modules/clients/src/test/config/jdbc-config.xml | 2 +-
.../jdbc2/JdbcAbstractDmlStatementSelfTest.java | 49 +-
.../jdbc2/JdbcInsertStatementSelfTest.java | 51 +
.../jdbc2/JdbcMergeStatementSelfTest.java | 51 +
.../internal/jdbc2/JdbcStreamingSelfTest.java | 187 ++
.../jdbc2/JdbcUpdateStatementSelfTest.java | 50 +
.../tcp/redis/RedisProtocolSelfTest.java | 13 +-
.../jdbc/suite/IgniteJdbcDriverTestSuite.java | 1 +
.../src/main/java/org/apache/ignite/Ignite.java | 1 +
.../java/org/apache/ignite/IgniteCompute.java | 44 +-
.../org/apache/ignite/IgniteJdbcDriver.java | 30 +
.../apache/ignite/IgniteSystemProperties.java | 38 +
.../configuration/CacheConfiguration.java | 41 +
.../ignite/internal/binary/BinaryContext.java | 3 +
.../ignite/internal/binary/BinaryTreeMap.java | 6 +-
.../ignite/internal/jdbc2/JdbcConnection.java | 72 +-
.../internal/jdbc2/JdbcPreparedStatement.java | 34 +-
.../ignite/internal/jdbc2/JdbcStatement.java | 20 +-
.../jdbc2/JdbcStreamedPreparedStatement.java | 59 +
.../internal/managers/discovery/DiscoCache.java | 310 ++++
.../discovery/GridDiscoveryManager.java | 568 ++----
.../eventstorage/DiscoveryEventListener.java | 33 +
.../eventstorage/GridEventStorageManager.java | 162 +-
.../affinity/GridAffinityAssignmentCache.java | 7 +-
.../cache/CacheAffinitySharedManager.java | 35 +-
.../processors/cache/EntryGetResult.java | 40 +-
.../processors/cache/EntryGetWithTtlResult.java | 58 +
.../processors/cache/GridCacheAdapter.java | 69 +-
.../cache/GridCacheAffinityManager.java | 3 +-
.../processors/cache/GridCacheContext.java | 122 +-
.../processors/cache/GridCacheEntryEx.java | 2 +-
.../processors/cache/GridCacheMapEntry.java | 29 +-
.../GridCachePartitionExchangeManager.java | 64 +-
.../processors/cache/GridCacheProcessor.java | 3 +
.../processors/cache/IgniteCacheProxy.java | 6 +-
.../dht/GridClientPartitionTopology.java | 20 +-
.../dht/GridDhtAssignmentFetchFuture.java | 7 +-
.../distributed/dht/GridDhtCacheAdapter.java | 4 +-
.../cache/distributed/dht/GridDhtGetFuture.java | 24 +-
.../distributed/dht/GridDhtGetSingleFuture.java | 24 +-
.../dht/GridDhtPartitionTopologyImpl.java | 44 +-
.../dht/GridPartitionedGetFuture.java | 19 +-
.../dht/GridPartitionedSingleGetFuture.java | 7 +-
.../dht/atomic/GridDhtAtomicCache.java | 12 +-
.../dht/colocated/GridDhtColocatedCache.java | 15 +-
.../GridDhtPartitionsExchangeFuture.java | 33 +-
.../distributed/near/GridNearGetFuture.java | 9 +-
.../cache/distributed/near/GridNearTxLocal.java | 10 +-
.../local/atomic/GridLocalAtomicCache.java | 13 +-
.../cache/query/GridCacheSqlQuery.java | 127 +-
.../transactions/IgniteTxLocalAdapter.java | 65 +-
.../closure/GridClosureProcessor.java | 2 +-
.../processors/cluster/GridUpdateNotifier.java | 2 +-
.../datastructures/DataStructuresProcessor.java | 3 +-
.../datastructures/GridCacheLockImpl.java | 17 +-
.../processors/query/GridQueryIndexing.java | 58 +-
.../processors/query/GridQueryProcessor.java | 182 +-
.../messages/GridQueryNextPageRequest.java | 29 +-
.../messages/GridQueryNextPageResponse.java | 29 +-
.../handlers/cache/GridCacheCommandHandler.java | 27 +-
.../redis/GridRedisRestCommandHandler.java | 36 +
.../string/GridRedisSetCommandHandler.java | 43 +-
.../service/GridServiceProcessor.java | 21 +-
.../ignite/internal/util/IgniteUtils.java | 14 +-
.../visor/cache/VisorCacheClearTask.java | 57 +-
.../internal/visor/query/VisorQueryArgV3.java | 51 +
.../internal/visor/query/VisorQueryJob.java | 6 +-
.../communication/tcp/TcpCommunicationSpi.java | 25 +
.../resources/META-INF/classnames.properties | 7 +-
.../internal/GridCacheRecreateLockTest.java | 78 +
.../cache/CacheGetEntryAbstractTest.java | 16 +-
.../CacheSerializableTransactionsTest.java | 173 +-
.../processors/cache/CacheTxFastFinishTest.java | 2 +-
.../cache/GridCacheAbstractFullApiSelfTest.java | 20 +-
.../processors/cache/GridCacheTestEntryEx.java | 2 +-
...sExchangeOnDiscoveryHistoryOverflowTest.java | 190 ++
.../CacheLockReleaseNodeLeaveTest.java | 64 +-
.../GridCacheRebalancingSyncSelfTest.java | 69 +-
.../IgniteCacheExpiryPolicyAbstractTest.java | 42 +
.../GridMarshallerPerformanceTest.java | 4 +
.../tcp/TcpCommunicationSpiDropNodesTest.java | 3 +-
.../TcpCommunicationSpiFaultyClientTest.java | 3 +-
.../junits/common/GridCommonAbstractTest.java | 77 +
.../testsuites/IgniteCacheTestSuite5.java | 3 +
.../testsuites/IgniteComputeGridTestSuite.java | 2 +
modules/docker/1.9.0/Dockerfile | 46 +
modules/docker/1.9.0/run.sh | 51 +
modules/docker/Dockerfile | 4 +-
modules/flink/pom.xml | 2 +-
.../query/h2/opt/GridH2SpatialIndex.java | 56 +-
.../query/h2/GridH2IndexingGeoSelfTest.java | 409 +++--
.../h2/GridH2IndexingSegmentedGeoSelfTest.java | 37 +
.../testsuites/GeoSpatialIndexingTestSuite.java | 2 +
.../hadoop/shuffle/HadoopShuffleJob.java | 1 -
.../cache/query/GridCacheTwoStepQuery.java | 17 +
.../query/h2/DmlStatementsProcessor.java | 272 ++-
.../processors/query/h2/IgniteH2Indexing.java | 402 ++++-
.../query/h2/dml/UpdatePlanBuilder.java | 2 +-
.../query/h2/opt/DistributedJoinMode.java | 51 +
.../query/h2/opt/GridH2CollocationModel.java | 82 +-
.../query/h2/opt/GridH2IndexBase.java | 348 +++-
.../query/h2/opt/GridH2QueryContext.java | 84 +-
.../query/h2/opt/GridH2RowDescriptor.java | 5 -
.../query/h2/opt/GridH2ScanIndex.java | 273 +++
.../processors/query/h2/opt/GridH2Table.java | 244 +--
.../query/h2/opt/GridH2TreeIndex.java | 135 +-
.../processors/query/h2/sql/DmlAstUtils.java | 54 +-
.../processors/query/h2/sql/GridSqlAlias.java | 13 +-
.../processors/query/h2/sql/GridSqlArray.java | 8 +-
.../processors/query/h2/sql/GridSqlAst.java | 61 +
.../processors/query/h2/sql/GridSqlColumn.java | 85 +-
.../processors/query/h2/sql/GridSqlConst.java | 6 +-
.../processors/query/h2/sql/GridSqlElement.java | 43 +-
.../query/h2/sql/GridSqlFunction.java | 18 +-
.../processors/query/h2/sql/GridSqlJoin.java | 35 +-
.../processors/query/h2/sql/GridSqlKeyword.java | 3 +-
.../query/h2/sql/GridSqlOperation.java | 6 +-
.../query/h2/sql/GridSqlOperationType.java | 4 +-
.../query/h2/sql/GridSqlParameter.java | 4 +-
.../query/h2/sql/GridSqlPlaceholder.java | 2 +-
.../processors/query/h2/sql/GridSqlQuery.java | 91 +-
.../query/h2/sql/GridSqlQueryParser.java | 248 ++-
.../query/h2/sql/GridSqlQuerySplitter.java | 1684 +++++++++++++++---
.../processors/query/h2/sql/GridSqlSelect.java | 121 +-
.../query/h2/sql/GridSqlSortColumn.java | 41 +
.../query/h2/sql/GridSqlStatement.java | 11 +-
.../query/h2/sql/GridSqlSubquery.java | 31 +-
.../processors/query/h2/sql/GridSqlTable.java | 19 +-
.../processors/query/h2/sql/GridSqlType.java | 6 +-
.../processors/query/h2/sql/GridSqlUnion.java | 66 +-
.../processors/query/h2/sql/GridSqlValue.java | 25 -
.../query/h2/twostep/GridMapQueryExecutor.java | 321 +++-
.../query/h2/twostep/GridMergeIndex.java | 647 +++++--
.../query/h2/twostep/GridMergeIndexSorted.java | 380 ++++
.../h2/twostep/GridMergeIndexUnsorted.java | 101 +-
.../query/h2/twostep/GridMergeTable.java | 70 +-
.../h2/twostep/GridReduceQueryExecutor.java | 211 ++-
.../query/h2/twostep/GridResultPage.java | 34 +-
.../h2/twostep/msg/GridH2IndexRangeRequest.java | 60 +-
.../twostep/msg/GridH2IndexRangeResponse.java | 62 +-
.../h2/twostep/msg/GridH2QueryRequest.java | 19 +-
.../IgniteCacheAbstractFieldsQuerySelfTest.java | 2 +-
...niteCacheAbstractInsertSqlQuerySelfTest.java | 6 +-
.../cache/IgniteCacheAbstractQuerySelfTest.java | 10 +-
.../IgniteCacheInsertSqlQuerySelfTest.java | 14 +
.../IgniteCacheUpdateSqlQuerySelfTest.java | 1 +
.../query/IgniteSqlSegmentedIndexSelfTest.java | 263 +++
.../query/IgniteSqlSplitterSelfTest.java | 331 +++-
.../h2/GridIndexingSpiAbstractSelfTest.java | 26 +-
.../h2/sql/AbstractH2CompareQueryTest.java | 21 +-
.../query/h2/sql/GridQueryParsingTest.java | 72 +-
.../query/h2/sql/H2CompareBigQueryTest.java | 58 +-
.../FetchingQueryCursorStressTest.java | 277 +++
.../IgniteCacheQuerySelfTestSuite.java | 4 +
.../processors/query/h2/sql/bigQuery.sql | 36 +-
modules/kubernetes/config/Dockerfile | 17 +
.../kubernetes/config/ignite-deployment.yaml | 15 +
modules/kubernetes/config/ignite-service.yaml | 15 +
.../cpp/common/project/vs/common.vcxproj | 1 -
.../common/project/vs/common.vcxproj.filters | 6 -
.../platforms/cpp/common/project/vs/targetver.h | 25 -
modules/platforms/cpp/core-test/Makefile.am | 1 +
.../cpp/core-test/config/cache-store.xml | 71 +
.../cpp/core-test/project/vs/core-test.vcxproj | 5 +
.../project/vs/core-test.vcxproj.filters | 9 +
.../src/binary_identity_resolver_test.cpp | 2 +-
.../src/binary_reader_writer_raw_test.cpp | 2 +-
.../core-test/src/binary_reader_writer_test.cpp | 2 +-
.../cpp/core-test/src/binary_session_test.cpp | 2 +-
.../cpp/core-test/src/cache_query_test.cpp | 2 +-
.../cpp/core-test/src/cache_store_test.cpp | 151 ++
.../cpp/core-test/src/continuous_query_test.cpp | 2 +-
.../cpp/core-test/src/handle_registry_test.cpp | 2 +-
.../cpp/core-test/src/ignite_error_test.cpp | 2 +-
.../cpp/core-test/src/ignition_test.cpp | 2 +-
.../cpp/core-test/src/interop_memory_test.cpp | 2 +-
.../cpp/core-test/src/reference_test.cpp | 2 +-
.../platforms/cpp/core-test/src/test_utils.cpp | 7 +
.../cpp/core-test/src/transactions_test.cpp | 2 +-
.../cpp/core/include/ignite/cache/cache.h | 60 +-
.../cache/query/continuous/continuous_query.h | 2 +-
.../core/include/ignite/impl/cache/cache_impl.h | 19 +
.../ignite/impl/interop/interop_target.h | 25 +
.../cpp/core/src/impl/cache/cache_impl.cpp | 48 +
.../core/src/impl/interop/interop_target.cpp | 36 +-
.../cpp/jni/include/ignite/jni/utils.h | 9 +
.../platforms/cpp/jni/os/linux/src/utils.cpp | 6 -
modules/platforms/cpp/jni/os/win/src/utils.cpp | 6 -
.../platforms/cpp/jni/project/vs/jni.vcxproj | 1 -
.../cpp/jni/project/vs/jni.vcxproj.filters | 3 -
.../platforms/cpp/jni/project/vs/targetver.h | 25 -
.../Properties/AssemblyInfo.cs | 2 +-
.../Properties/AssemblyInfo.cs | 2 +-
.../Properties/AssemblyInfo.cs | 2 +-
.../Properties/AssemblyInfo.cs | 2 +-
.../Properties/AssemblyInfo.cs | 2 +-
.../Properties/AssemblyInfo.cs | 2 +-
modules/spark-2.10/pom.xml | 54 +
modules/spark/pom.xml | 183 +-
.../org/apache/ignite/spark/IgniteContext.scala | 22 +-
.../spark/JavaEmbeddedIgniteRDDSelfTest.java | 10 +-
.../spark/JavaStandaloneIgniteRDDSelfTest.java | 22 +-
.../ant/beautifier/GridJavadocAntTask.java | 1 +
modules/web-console/backend/app/agent.js | 36 +
modules/web-console/backend/app/browser.js | 28 +
modules/web-console/backend/app/settings.js | 8 +-
modules/web-console/backend/index.js | 10 -
modules/web-console/frontend/.eslintrc | 1 +
modules/web-console/frontend/.gitignore | 1 +
modules/web-console/frontend/app/app.config.js | 12 +-
modules/web-console/frontend/app/app.js | 7 +-
.../activities-user-dialog.jade | 36 -
.../activities-user-dialog.tpl.pug | 36 +
.../components/activities-user-dialog/index.js | 2 +-
.../form-field-datepicker.jade | 55 -
.../form-field-datepicker.pug | 55 +
.../list-of-registered-users/index.js | 2 +-
.../list-of-registered-users.controller.js | 11 +-
.../list-of-registered-users.jade | 58 -
.../list-of-registered-users.tpl.pug | 58 +
.../ui-grid-header/ui-grid-header.jade | 27 -
.../ui-grid-header/ui-grid-header.scss | 1 +
.../ui-grid-header/ui-grid-header.tpl.pug | 27 +
.../ui-grid-settings/ui-grid-settings.jade | 33 -
.../ui-grid-settings/ui-grid-settings.pug | 33 +
.../app/directives/centered/centered.css | 37 -
.../directives/centered/centered.directive.js | 2 +-
.../app/directives/centered/centered.scss | 37 +
.../information/information.directive.js | 4 +-
.../app/directives/information/information.jade | 20 -
.../app/directives/information/information.pug | 20 +
.../ui-ace-docker/ui-ace-docker.directive.js | 4 +-
.../directives/ui-ace-docker/ui-ace-docker.jade | 31 -
.../directives/ui-ace-docker/ui-ace-docker.pug | 31 +
.../ui-ace-java/ui-ace-java.directive.js | 4 +-
.../app/directives/ui-ace-java/ui-ace-java.jade | 22 -
.../app/directives/ui-ace-java/ui-ace-java.pug | 22 +
.../ui-ace-pojos/ui-ace-pojos.directive.js | 4 +-
.../directives/ui-ace-pojos/ui-ace-pojos.jade | 40 -
.../directives/ui-ace-pojos/ui-ace-pojos.pug | 40 +
.../ui-ace-pom/ui-ace-pom.directive.js | 4 +-
.../app/directives/ui-ace-pom/ui-ace-pom.jade | 17 -
.../app/directives/ui-ace-pom/ui-ace-pom.pug | 17 +
.../ui-ace-sharp/ui-ace-sharp.directive.js | 4 +-
.../directives/ui-ace-sharp/ui-ace-sharp.jade | 22 -
.../directives/ui-ace-sharp/ui-ace-sharp.pug | 22 +
.../ui-ace-spring/ui-ace-spring.directive.js | 4 +-
.../directives/ui-ace-spring/ui-ace-spring.jade | 17 -
.../directives/ui-ace-spring/ui-ace-spring.pug | 17 +
.../frontend/app/helpers/jade/form.jade | 28 -
.../frontend/app/helpers/jade/form.pug | 28 +
.../helpers/jade/form/form-field-checkbox.jade | 38 -
.../helpers/jade/form/form-field-checkbox.pug | 38 +
.../helpers/jade/form/form-field-datalist.jade | 51 -
.../helpers/jade/form/form-field-datalist.pug | 51 +
.../app/helpers/jade/form/form-field-down.jade | 18 -
.../app/helpers/jade/form/form-field-down.pug | 18 +
.../helpers/jade/form/form-field-dropdown.jade | 51 -
.../helpers/jade/form/form-field-dropdown.pug | 51 +
.../helpers/jade/form/form-field-feedback.jade | 32 -
.../helpers/jade/form/form-field-feedback.pug | 32 +
.../app/helpers/jade/form/form-field-label.jade | 23 -
.../app/helpers/jade/form/form-field-label.pug | 23 +
.../helpers/jade/form/form-field-number.jade | 53 -
.../app/helpers/jade/form/form-field-number.pug | 53 +
.../helpers/jade/form/form-field-password.jade | 47 -
.../helpers/jade/form/form-field-password.pug | 47 +
.../app/helpers/jade/form/form-field-text.jade | 64 -
.../app/helpers/jade/form/form-field-text.pug | 64 +
.../app/helpers/jade/form/form-field-up.jade | 18 -
.../app/helpers/jade/form/form-field-up.pug | 18 +
.../app/helpers/jade/form/form-group.jade | 23 -
.../app/helpers/jade/form/form-group.pug | 23 +
.../frontend/app/helpers/jade/mixins.jade | 609 -------
.../frontend/app/helpers/jade/mixins.pug | 609 +++++++
.../frontend/app/modules/agent/agent.module.js | 4 +-
.../modules/branding/header-logo.directive.js | 4 +-
.../app/modules/branding/header-logo.jade | 18 -
.../app/modules/branding/header-logo.pug | 18 +
.../branding/powered-by-apache.directive.js | 4 +-
.../app/modules/branding/powered-by-apache.jade | 18 -
.../app/modules/branding/powered-by-apache.pug | 18 +
.../frontend/app/modules/demo/Demo.module.js | 3 +-
.../app/modules/dialog/dialog.factory.js | 2 +-
.../frontend/app/modules/dialog/dialog.jade | 26 -
.../frontend/app/modules/dialog/dialog.tpl.pug | 26 +
.../getting-started/GettingStarted.provider.js | 3 +-
.../frontend/app/modules/loading/loading.css | 73 -
.../app/modules/loading/loading.directive.js | 8 +-
.../frontend/app/modules/loading/loading.jade | 23 -
.../frontend/app/modules/loading/loading.pug | 23 +
.../frontend/app/modules/loading/loading.scss | 73 +
.../frontend/app/modules/nodes/Nodes.service.js | 4 +-
.../app/modules/nodes/nodes-dialog.jade | 35 -
.../app/modules/nodes/nodes-dialog.tpl.pug | 35 +
.../app/modules/sql/notebook.controller.js | 4 +-
.../frontend/app/modules/sql/sql.controller.js | 14 +-
.../frontend/app/modules/sql/sql.module.js | 15 +-
.../frontend/app/modules/states/admin.state.js | 4 +-
.../app/modules/states/configuration.state.js | 23 +-
.../states/configuration/caches/affinity.jade | 82 -
.../states/configuration/caches/affinity.pug | 82 +
.../configuration/caches/client-near-cache.jade | 50 -
.../configuration/caches/client-near-cache.pug | 50 +
.../configuration/caches/concurrency.jade | 65 -
.../states/configuration/caches/concurrency.pug | 65 +
.../states/configuration/caches/general.jade | 69 -
.../states/configuration/caches/general.pug | 69 +
.../states/configuration/caches/memory.jade | 109 --
.../states/configuration/caches/memory.pug | 108 ++
.../configuration/caches/near-cache-client.jade | 51 -
.../configuration/caches/near-cache-client.pug | 51 +
.../configuration/caches/near-cache-server.jade | 52 -
.../configuration/caches/near-cache-server.pug | 52 +
.../configuration/caches/node-filter.jade | 59 -
.../states/configuration/caches/node-filter.pug | 59 +
.../states/configuration/caches/query.jade | 114 --
.../states/configuration/caches/query.pug | 114 ++
.../states/configuration/caches/rebalance.jade | 66 -
.../states/configuration/caches/rebalance.pug | 66 +
.../states/configuration/caches/statistics.jade | 39 -
.../states/configuration/caches/statistics.pug | 39 +
.../states/configuration/caches/store.jade | 250 ---
.../states/configuration/caches/store.pug | 250 +++
.../states/configuration/clusters/atomic.jade | 54 -
.../states/configuration/clusters/atomic.pug | 54 +
.../configuration/clusters/attributes.jade | 57 -
.../configuration/clusters/attributes.pug | 57 +
.../states/configuration/clusters/binary.jade | 77 -
.../states/configuration/clusters/binary.pug | 77 +
.../configuration/clusters/cache-key-cfg.jade | 50 -
.../configuration/clusters/cache-key-cfg.pug | 50 +
.../configuration/clusters/checkpoint.jade | 86 -
.../configuration/clusters/checkpoint.pug | 86 +
.../configuration/clusters/checkpoint/fs.jade | 66 -
.../configuration/clusters/checkpoint/fs.pug | 66 +
.../configuration/clusters/checkpoint/jdbc.jade | 48 -
.../configuration/clusters/checkpoint/jdbc.pug | 48 +
.../configuration/clusters/checkpoint/s3.jade | 178 --
.../configuration/clusters/checkpoint/s3.pug | 178 ++
.../configuration/clusters/collision.jade | 63 -
.../states/configuration/clusters/collision.pug | 63 +
.../clusters/collision/custom.jade | 24 -
.../configuration/clusters/collision/custom.pug | 24 +
.../clusters/collision/fifo-queue.jade | 27 -
.../clusters/collision/fifo-queue.pug | 27 +
.../clusters/collision/job-stealing.jade | 63 -
.../clusters/collision/job-stealing.pug | 63 +
.../clusters/collision/priority-queue.jade | 42 -
.../clusters/collision/priority-queue.pug | 42 +
.../configuration/clusters/communication.jade | 100 --
.../configuration/clusters/communication.pug | 100 ++
.../configuration/clusters/connector.jade | 104 --
.../states/configuration/clusters/connector.pug | 104 ++
.../configuration/clusters/deployment.jade | 237 ---
.../configuration/clusters/deployment.pug | 237 +++
.../configuration/clusters/discovery.jade | 88 -
.../states/configuration/clusters/discovery.pug | 88 +
.../states/configuration/clusters/events.jade | 68 -
.../states/configuration/clusters/events.pug | 68 +
.../states/configuration/clusters/failover.jade | 73 -
.../states/configuration/clusters/failover.pug | 73 +
.../states/configuration/clusters/general.jade | 76 -
.../states/configuration/clusters/general.pug | 76 +
.../clusters/general/discovery/cloud.jade | 134 --
.../clusters/general/discovery/cloud.pug | 134 ++
.../clusters/general/discovery/google.jade | 38 -
.../clusters/general/discovery/google.pug | 38 +
.../clusters/general/discovery/jdbc.jade | 31 -
.../clusters/general/discovery/jdbc.pug | 31 +
.../clusters/general/discovery/multicast.jade | 99 -
.../clusters/general/discovery/multicast.pug | 99 +
.../clusters/general/discovery/s3.jade | 27 -
.../clusters/general/discovery/s3.pug | 27 +
.../clusters/general/discovery/shared.jade | 23 -
.../clusters/general/discovery/shared.pug | 23 +
.../clusters/general/discovery/vm.jade | 79 -
.../clusters/general/discovery/vm.pug | 79 +
.../clusters/general/discovery/zookeeper.jade | 85 -
.../clusters/general/discovery/zookeeper.pug | 85 +
.../bounded-exponential-backoff.jade | 27 -
.../retrypolicy/bounded-exponential-backoff.pug | 27 +
.../discovery/zookeeper/retrypolicy/custom.jade | 24 -
.../discovery/zookeeper/retrypolicy/custom.pug | 24 +
.../retrypolicy/exponential-backoff.jade | 27 -
.../retrypolicy/exponential-backoff.pug | 27 +
.../zookeeper/retrypolicy/forever.jade | 22 -
.../discovery/zookeeper/retrypolicy/forever.pug | 22 +
.../zookeeper/retrypolicy/n-times.jade | 25 -
.../discovery/zookeeper/retrypolicy/n-times.pug | 25 +
.../zookeeper/retrypolicy/one-time.jade | 23 -
.../zookeeper/retrypolicy/one-time.pug | 23 +
.../zookeeper/retrypolicy/until-elapsed.jade | 25 -
.../zookeeper/retrypolicy/until-elapsed.pug | 25 +
.../states/configuration/clusters/igfs.jade | 38 -
.../states/configuration/clusters/igfs.pug | 38 +
.../configuration/clusters/load-balancing.jade | 107 --
.../configuration/clusters/load-balancing.pug | 107 ++
.../states/configuration/clusters/logger.jade | 66 -
.../states/configuration/clusters/logger.pug | 66 +
.../configuration/clusters/logger/custom.jade | 25 -
.../configuration/clusters/logger/custom.pug | 25 +
.../configuration/clusters/logger/log4j.jade | 50 -
.../configuration/clusters/logger/log4j.pug | 50 +
.../configuration/clusters/logger/log4j2.jade | 39 -
.../configuration/clusters/logger/log4j2.pug | 39 +
.../configuration/clusters/marshaller.jade | 76 -
.../configuration/clusters/marshaller.pug | 76 +
.../states/configuration/clusters/metrics.jade | 51 -
.../states/configuration/clusters/metrics.pug | 51 +
.../states/configuration/clusters/odbc.jade | 48 -
.../states/configuration/clusters/odbc.pug | 48 +
.../states/configuration/clusters/ssl.jade | 110 --
.../states/configuration/clusters/ssl.pug | 110 ++
.../states/configuration/clusters/swap.jade | 72 -
.../states/configuration/clusters/swap.pug | 72 +
.../states/configuration/clusters/thread.jade | 48 -
.../states/configuration/clusters/thread.pug | 48 +
.../states/configuration/clusters/time.jade | 47 -
.../states/configuration/clusters/time.pug | 47 +
.../configuration/clusters/transactions.jade | 69 -
.../configuration/clusters/transactions.pug | 69 +
.../states/configuration/domains/general.jade | 52 -
.../states/configuration/domains/general.pug | 52 +
.../states/configuration/domains/query.jade | 172 --
.../states/configuration/domains/query.pug | 172 ++
.../states/configuration/domains/store.jade | 127 --
.../states/configuration/domains/store.pug | 127 ++
.../modules/states/configuration/igfs/dual.jade | 42 -
.../modules/states/configuration/igfs/dual.pug | 42 +
.../states/configuration/igfs/fragmentizer.jade | 43 -
.../states/configuration/igfs/fragmentizer.pug | 43 +
.../states/configuration/igfs/general.jade | 57 -
.../states/configuration/igfs/general.pug | 57 +
.../modules/states/configuration/igfs/ipc.jade | 60 -
.../modules/states/configuration/igfs/ipc.pug | 60 +
.../modules/states/configuration/igfs/misc.jade | 108 --
.../modules/states/configuration/igfs/misc.pug | 108 ++
.../states/configuration/igfs/secondary.jade | 45 -
.../states/configuration/igfs/secondary.pug | 45 +
.../configuration/summary/summary.controller.js | 5 +
.../frontend/app/modules/states/errors.state.js | 4 +-
.../app/modules/states/password.state.js | 6 +-
.../app/modules/states/profile.state.js | 4 +-
.../frontend/app/modules/states/signin.state.js | 2 +-
.../frontend/app/services/Clone.service.js | 4 +-
.../frontend/app/services/Confirm.service.js | 4 +-
.../app/services/ConfirmBatch.service.js | 4 +-
.../frontend/controllers/caches-controller.js | 4 +-
.../frontend/controllers/domains-controller.js | 4 +-
.../frontend/gulpfile.babel.js/paths.js | 28 +-
.../frontend/gulpfile.babel.js/tasks/build.js | 2 +-
.../frontend/gulpfile.babel.js/tasks/bundle.js | 8 +-
.../frontend/gulpfile.babel.js/tasks/jade.js | 49 -
.../frontend/gulpfile.babel.js/tasks/watch.js | 5 +-
.../gulpfile.babel.js/webpack/common.js | 292 +--
.../webpack/environments/development.js | 90 +-
.../webpack/environments/production.js | 41 +-
.../webpack/environments/test.js | 52 +-
.../frontend/gulpfile.babel.js/webpack/index.js | 4 +-
modules/web-console/frontend/package.json | 60 +-
.../frontend/test/e2e/exampe.test.js | 4 +-
.../frontend/test/karma.conf.babel.js | 7 +-
.../frontend/test/protractor.conf.js | 16 +-
.../frontend/test/unit/JavaTransformer.test.js | 2 +-
.../frontend/test/unit/JavaTypes.test.js | 137 +-
.../frontend/test/unit/SharpTransformer.test.js | 2 +-
.../test/unit/SpringTransformer.test.js | 2 +-
.../frontend/test/unit/SqlTypes.test.js | 7 +-
.../frontend/test/unit/UserAuth.test.js | 4 +-
.../frontend/test/unit/Version.test.js | 1 +
.../test/unit/defaultName.filter.test.js | 27 +-
modules/web-console/frontend/views/403.jade | 22 -
modules/web-console/frontend/views/403.pug | 22 +
modules/web-console/frontend/views/404.jade | 22 -
modules/web-console/frontend/views/404.pug | 22 +
modules/web-console/frontend/views/base.jade | 22 -
modules/web-console/frontend/views/base.pug | 22 +
.../frontend/views/configuration/caches.jade | 55 -
.../frontend/views/configuration/caches.tpl.pug | 55 +
.../frontend/views/configuration/clusters.jade | 68 -
.../views/configuration/clusters.tpl.pug | 68 +
.../views/configuration/domains-import.jade | 170 --
.../views/configuration/domains-import.tpl.pug | 170 ++
.../frontend/views/configuration/domains.jade | 66 -
.../views/configuration/domains.tpl.pug | 66 +
.../frontend/views/configuration/igfs.jade | 51 -
.../frontend/views/configuration/igfs.tpl.pug | 51 +
.../frontend/views/configuration/sidebar.jade | 29 -
.../views/configuration/sidebar.tpl.pug | 29 +
.../summary-project-structure.jade | 27 -
.../summary-project-structure.tpl.pug | 28 +
.../views/configuration/summary-tabs.jade | 25 -
.../views/configuration/summary-tabs.pug | 25 +
.../frontend/views/configuration/summary.jade | 90 -
.../views/configuration/summary.tpl.pug | 90 +
.../frontend/views/includes/footer.jade | 23 -
.../frontend/views/includes/footer.pug | 23 +
.../frontend/views/includes/header.jade | 52 -
.../frontend/views/includes/header.pug | 52 +
modules/web-console/frontend/views/index.jade | 47 -
modules/web-console/frontend/views/index.pug | 47 +
modules/web-console/frontend/views/reset.jade | 48 -
.../web-console/frontend/views/reset.tpl.pug | 48 +
.../frontend/views/settings/admin.jade | 25 -
.../frontend/views/settings/admin.tpl.pug | 25 +
.../frontend/views/settings/profile.jade | 76 -
.../frontend/views/settings/profile.tpl.pug | 76 +
modules/web-console/frontend/views/signin.jade | 163 --
.../web-console/frontend/views/signin.tpl.pug | 163 ++
.../frontend/views/sql/cache-metadata.jade | 40 -
.../frontend/views/sql/cache-metadata.tpl.pug | 40 +
.../frontend/views/sql/chart-settings.jade | 40 -
.../frontend/views/sql/chart-settings.tpl.pug | 40 +
.../frontend/views/sql/notebook-new.jade | 33 -
.../frontend/views/sql/notebook-new.tpl.pug | 33 +
.../frontend/views/sql/paragraph-rate.jade | 31 -
.../frontend/views/sql/paragraph-rate.tpl.pug | 31 +
modules/web-console/frontend/views/sql/sql.jade | 278 ---
.../web-console/frontend/views/sql/sql.tpl.pug | 278 +++
.../views/templates/agent-download.jade | 50 -
.../views/templates/agent-download.tpl.pug | 50 +
.../frontend/views/templates/alert.jade | 21 -
.../frontend/views/templates/alert.tpl.pug | 21 +
.../frontend/views/templates/batch-confirm.jade | 34 -
.../views/templates/batch-confirm.tpl.pug | 34 +
.../frontend/views/templates/clone.jade | 39 -
.../frontend/views/templates/clone.tpl.pug | 39 +
.../frontend/views/templates/confirm.jade | 33 -
.../frontend/views/templates/confirm.tpl.pug | 33 +
.../frontend/views/templates/demo-info.jade | 47 -
.../frontend/views/templates/demo-info.tpl.pug | 47 +
.../frontend/views/templates/dropdown.jade | 24 -
.../frontend/views/templates/dropdown.tpl.pug | 24 +
.../views/templates/getting-started.jade | 34 -
.../views/templates/getting-started.tpl.pug | 34 +
.../frontend/views/templates/message.jade | 28 -
.../frontend/views/templates/message.tpl.pug | 28 +
.../frontend/views/templates/pagination.jade | 32 -
.../frontend/views/templates/select.jade | 26 -
.../frontend/views/templates/select.tpl.pug | 26 +
.../views/templates/validation-error.jade | 25 -
.../views/templates/validation-error.tpl.pug | 25 +
.../demo/service/DemoCachesLoadService.java | 26 +
modules/yardstick/config/ignite-base-config.xml | 25 +
.../yardstick/cache/IgniteGetAllBenchmark.java | 42 +
.../cache/IgniteGetAllOffHeapBenchmark.java | 30 +
.../yardstick/cache/IgniteGetBenchmark.java | 35 +
.../cache/IgnitePutAllOffHeapBenchmark.java | 30 +
.../cache/IgnitePutAllTxOffHeapBenchmark.java | 30 +
.../IgnitePutOffHeapIndexedValue8Benchmark.java | 30 +
.../IgnitePutRandomValueSizeBenchmark.java | 41 +
modules/zeromq/README.txt | 37 +
modules/zeromq/licenses/apache-2.0.txt | 202 +++
modules/zeromq/pom.xml | 75 +
.../stream/zeromq/IgniteZeroMqStreamer.java | 146 ++
.../ignite/stream/zeromq/ZeroMqTypeSocket.java | 56 +
.../ignite/stream/zeromq/package-info.java | 21 +
.../stream/zeromq/IgniteZeroMqStreamerTest.java | 235 +++
.../zeromq/IgniteZeroMqStreamerTestSuite.java | 37 +
.../ZeroMqStringSingleTupleExtractor.java | 46 +
.../ignite/stream/zeromq/package-info.java | 21 +
parent/pom.xml | 6 +-
pom.xml | 1 +
582 files changed, 20662 insertions(+), 12061 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ignite/blob/4edd7bea/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearTxLocal.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ignite/blob/4edd7bea/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/transactions/IgniteTxLocalAdapter.java
----------------------------------------------------------------------
[31/38] ignite git commit: Merge remote-tracking branch
'remotes/origin/ignite-4768' into ignite-4768-1
Posted by sb...@apache.org.
Merge remote-tracking branch 'remotes/origin/ignite-4768' into ignite-4768-1
# Conflicts:
# modules/yardstick/config/ignite-base-config.xml
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/fa77f2e4
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/fa77f2e4
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/fa77f2e4
Branch: refs/heads/ignite-4768
Commit: fa77f2e4af6078b77c67995227b09ffb4920e1f7
Parents: 7c3120a 3ce0496
Author: sboikov <sb...@gridgain.com>
Authored: Mon Mar 13 12:29:02 2017 +0300
Committer: sboikov <sb...@gridgain.com>
Committed: Mon Mar 13 12:29:02 2017 +0300
----------------------------------------------------------------------
DEVNOTES.txt | 2 +-
RELEASE_NOTES.txt | 20 +
assembly/dependencies-hadoop.xml | 3 +
assembly/release-base.xml | 5 -
assembly/release-fabric-base.xml | 5 +
assembly/release-sources.xml | 3 +-
config/example-kube.xml | 53 +
doap_Ignite.rdf | 1 -
examples/pom-standalone-lgpl.xml | 12 +
examples/pom-standalone.xml | 12 +
examples/pom.xml | 14 +
.../examples/java8/spark/SharedRDDExample.java | 110 --
.../ignite/examples/spark/SharedRDDExample.java | 127 ++
.../ignite/examples/spark/package-info.java | 22 +
.../examples/SharedRDDExampleSelfTest.java | 36 -
.../IgniteExamplesJ8SelfTestSuite.java | 2 -
.../examples/SharedRDDExampleSelfTest.java | 36 +
.../IgniteExamplesSparkSelfTestSuite.java | 46 +
modules/clients/src/test/config/jdbc-config.xml | 2 +-
.../jdbc2/JdbcAbstractDmlStatementSelfTest.java | 49 +-
.../jdbc2/JdbcInsertStatementSelfTest.java | 51 +
.../jdbc2/JdbcMergeStatementSelfTest.java | 51 +
.../internal/jdbc2/JdbcStreamingSelfTest.java | 187 ++
.../jdbc2/JdbcUpdateStatementSelfTest.java | 50 +
.../tcp/redis/RedisProtocolSelfTest.java | 13 +-
.../jdbc/suite/IgniteJdbcDriverTestSuite.java | 1 +
.../src/main/java/org/apache/ignite/Ignite.java | 1 +
.../java/org/apache/ignite/IgniteCompute.java | 44 +-
.../org/apache/ignite/IgniteJdbcDriver.java | 30 +
.../apache/ignite/IgniteSystemProperties.java | 38 +
.../configuration/CacheConfiguration.java | 41 +
.../ignite/internal/binary/BinaryContext.java | 3 +
.../ignite/internal/binary/BinaryTreeMap.java | 6 +-
.../ignite/internal/jdbc2/JdbcConnection.java | 72 +-
.../internal/jdbc2/JdbcPreparedStatement.java | 34 +-
.../ignite/internal/jdbc2/JdbcStatement.java | 20 +-
.../jdbc2/JdbcStreamedPreparedStatement.java | 59 +
.../internal/managers/discovery/DiscoCache.java | 310 ++++
.../discovery/GridDiscoveryManager.java | 568 ++----
.../eventstorage/DiscoveryEventListener.java | 33 +
.../eventstorage/GridEventStorageManager.java | 162 +-
.../affinity/GridAffinityAssignmentCache.java | 7 +-
.../cache/CacheAffinitySharedManager.java | 35 +-
.../processors/cache/EntryGetResult.java | 40 +-
.../processors/cache/EntryGetWithTtlResult.java | 58 +
.../processors/cache/GridCacheAdapter.java | 69 +-
.../cache/GridCacheAffinityManager.java | 3 +-
.../processors/cache/GridCacheContext.java | 122 +-
.../processors/cache/GridCacheEntryEx.java | 2 +-
.../processors/cache/GridCacheMapEntry.java | 29 +-
.../GridCachePartitionExchangeManager.java | 64 +-
.../processors/cache/GridCacheProcessor.java | 3 +
.../processors/cache/IgniteCacheProxy.java | 6 +-
.../dht/GridClientPartitionTopology.java | 20 +-
.../dht/GridDhtAssignmentFetchFuture.java | 7 +-
.../distributed/dht/GridDhtCacheAdapter.java | 4 +-
.../cache/distributed/dht/GridDhtGetFuture.java | 24 +-
.../distributed/dht/GridDhtGetSingleFuture.java | 24 +-
.../dht/GridDhtPartitionTopologyImpl.java | 44 +-
.../dht/GridPartitionedGetFuture.java | 19 +-
.../dht/GridPartitionedSingleGetFuture.java | 7 +-
.../dht/atomic/GridDhtAtomicCache.java | 12 +-
.../dht/colocated/GridDhtColocatedCache.java | 15 +-
.../GridDhtPartitionsExchangeFuture.java | 33 +-
.../distributed/near/GridNearGetFuture.java | 9 +-
.../near/GridNearTxFinishResponse.java | 23 +-
.../cache/distributed/near/GridNearTxLocal.java | 10 +-
.../local/atomic/GridLocalAtomicCache.java | 13 +-
.../cache/query/GridCacheSqlQuery.java | 127 +-
.../transactions/IgniteTxLocalAdapter.java | 65 +-
.../closure/GridClosureProcessor.java | 2 +-
.../processors/cluster/GridUpdateNotifier.java | 2 +-
.../datastructures/DataStructuresProcessor.java | 3 +-
.../datastructures/GridCacheLockImpl.java | 17 +-
.../processors/query/GridQueryIndexing.java | 58 +-
.../processors/query/GridQueryProcessor.java | 182 +-
.../messages/GridQueryNextPageRequest.java | 29 +-
.../messages/GridQueryNextPageResponse.java | 29 +-
.../handlers/cache/GridCacheCommandHandler.java | 27 +-
.../redis/GridRedisRestCommandHandler.java | 36 +
.../string/GridRedisSetCommandHandler.java | 43 +-
.../service/GridServiceProcessor.java | 21 +-
.../ignite/internal/util/IgniteUtils.java | 14 +-
.../visor/cache/VisorCacheClearTask.java | 57 +-
.../internal/visor/query/VisorQueryArgV3.java | 51 +
.../internal/visor/query/VisorQueryJob.java | 6 +-
.../communication/tcp/TcpCommunicationSpi.java | 25 +
.../resources/META-INF/classnames.properties | 7 +-
.../internal/GridCacheRecreateLockTest.java | 78 +
.../cache/CacheGetEntryAbstractTest.java | 16 +-
.../CacheSerializableTransactionsTest.java | 173 +-
.../processors/cache/CacheTxFastFinishTest.java | 2 +-
.../cache/GridCacheAbstractFullApiSelfTest.java | 20 +-
.../processors/cache/GridCacheTestEntryEx.java | 2 +-
...sExchangeOnDiscoveryHistoryOverflowTest.java | 190 ++
.../CacheLockReleaseNodeLeaveTest.java | 64 +-
.../GridCacheRebalancingSyncSelfTest.java | 69 +-
.../IgniteCacheExpiryPolicyAbstractTest.java | 42 +
.../GridMarshallerPerformanceTest.java | 4 +
.../tcp/TcpCommunicationSpiDropNodesTest.java | 3 +-
.../TcpCommunicationSpiFaultyClientTest.java | 3 +-
.../junits/common/GridCommonAbstractTest.java | 77 +
.../testsuites/IgniteCacheTestSuite5.java | 3 +
.../testsuites/IgniteComputeGridTestSuite.java | 2 +
modules/docker/1.9.0/Dockerfile | 46 +
modules/docker/1.9.0/run.sh | 51 +
modules/docker/Dockerfile | 4 +-
modules/flink/pom.xml | 2 +-
.../query/h2/opt/GridH2SpatialIndex.java | 56 +-
.../query/h2/GridH2IndexingGeoSelfTest.java | 409 +++--
.../h2/GridH2IndexingSegmentedGeoSelfTest.java | 37 +
.../testsuites/GeoSpatialIndexingTestSuite.java | 2 +
.../hadoop/shuffle/HadoopShuffleJob.java | 1 -
.../cache/query/GridCacheTwoStepQuery.java | 17 +
.../query/h2/DmlStatementsProcessor.java | 272 ++-
.../processors/query/h2/IgniteH2Indexing.java | 402 ++++-
.../query/h2/dml/UpdatePlanBuilder.java | 2 +-
.../query/h2/opt/DistributedJoinMode.java | 51 +
.../query/h2/opt/GridH2CollocationModel.java | 82 +-
.../query/h2/opt/GridH2IndexBase.java | 348 +++-
.../query/h2/opt/GridH2QueryContext.java | 84 +-
.../query/h2/opt/GridH2RowDescriptor.java | 5 -
.../query/h2/opt/GridH2ScanIndex.java | 273 +++
.../processors/query/h2/opt/GridH2Table.java | 244 +--
.../query/h2/opt/GridH2TreeIndex.java | 135 +-
.../processors/query/h2/sql/DmlAstUtils.java | 54 +-
.../processors/query/h2/sql/GridSqlAlias.java | 13 +-
.../processors/query/h2/sql/GridSqlArray.java | 8 +-
.../processors/query/h2/sql/GridSqlAst.java | 61 +
.../processors/query/h2/sql/GridSqlColumn.java | 85 +-
.../processors/query/h2/sql/GridSqlConst.java | 6 +-
.../processors/query/h2/sql/GridSqlElement.java | 43 +-
.../query/h2/sql/GridSqlFunction.java | 18 +-
.../processors/query/h2/sql/GridSqlJoin.java | 35 +-
.../processors/query/h2/sql/GridSqlKeyword.java | 3 +-
.../query/h2/sql/GridSqlOperation.java | 6 +-
.../query/h2/sql/GridSqlOperationType.java | 4 +-
.../query/h2/sql/GridSqlParameter.java | 4 +-
.../query/h2/sql/GridSqlPlaceholder.java | 2 +-
.../processors/query/h2/sql/GridSqlQuery.java | 91 +-
.../query/h2/sql/GridSqlQueryParser.java | 248 ++-
.../query/h2/sql/GridSqlQuerySplitter.java | 1684 +++++++++++++++---
.../processors/query/h2/sql/GridSqlSelect.java | 121 +-
.../query/h2/sql/GridSqlSortColumn.java | 41 +
.../query/h2/sql/GridSqlStatement.java | 11 +-
.../query/h2/sql/GridSqlSubquery.java | 31 +-
.../processors/query/h2/sql/GridSqlTable.java | 19 +-
.../processors/query/h2/sql/GridSqlType.java | 6 +-
.../processors/query/h2/sql/GridSqlUnion.java | 66 +-
.../processors/query/h2/sql/GridSqlValue.java | 25 -
.../query/h2/twostep/GridMapQueryExecutor.java | 321 +++-
.../query/h2/twostep/GridMergeIndex.java | 647 +++++--
.../query/h2/twostep/GridMergeIndexSorted.java | 380 ++++
.../h2/twostep/GridMergeIndexUnsorted.java | 101 +-
.../query/h2/twostep/GridMergeTable.java | 70 +-
.../h2/twostep/GridReduceQueryExecutor.java | 211 ++-
.../query/h2/twostep/GridResultPage.java | 34 +-
.../h2/twostep/msg/GridH2IndexRangeRequest.java | 60 +-
.../twostep/msg/GridH2IndexRangeResponse.java | 62 +-
.../h2/twostep/msg/GridH2QueryRequest.java | 19 +-
.../IgniteCacheAbstractFieldsQuerySelfTest.java | 2 +-
...niteCacheAbstractInsertSqlQuerySelfTest.java | 6 +-
.../cache/IgniteCacheAbstractQuerySelfTest.java | 10 +-
.../IgniteCacheInsertSqlQuerySelfTest.java | 14 +
.../IgniteCacheUpdateSqlQuerySelfTest.java | 1 +
.../query/IgniteSqlSegmentedIndexSelfTest.java | 263 +++
.../query/IgniteSqlSplitterSelfTest.java | 331 +++-
.../h2/GridIndexingSpiAbstractSelfTest.java | 26 +-
.../h2/sql/AbstractH2CompareQueryTest.java | 21 +-
.../query/h2/sql/GridQueryParsingTest.java | 72 +-
.../query/h2/sql/H2CompareBigQueryTest.java | 58 +-
.../FetchingQueryCursorStressTest.java | 277 +++
.../IgniteCacheQuerySelfTestSuite.java | 4 +
.../processors/query/h2/sql/bigQuery.sql | 36 +-
modules/kubernetes/config/Dockerfile | 17 +
.../kubernetes/config/ignite-deployment.yaml | 15 +
modules/kubernetes/config/ignite-service.yaml | 15 +
.../cpp/common/project/vs/common.vcxproj | 1 -
.../common/project/vs/common.vcxproj.filters | 6 -
.../platforms/cpp/common/project/vs/targetver.h | 25 -
modules/platforms/cpp/core-test/Makefile.am | 1 +
.../cpp/core-test/config/cache-store.xml | 71 +
.../cpp/core-test/project/vs/core-test.vcxproj | 5 +
.../project/vs/core-test.vcxproj.filters | 9 +
.../src/binary_identity_resolver_test.cpp | 2 +-
.../src/binary_reader_writer_raw_test.cpp | 2 +-
.../core-test/src/binary_reader_writer_test.cpp | 2 +-
.../cpp/core-test/src/binary_session_test.cpp | 2 +-
.../cpp/core-test/src/cache_query_test.cpp | 2 +-
.../cpp/core-test/src/cache_store_test.cpp | 151 ++
.../cpp/core-test/src/continuous_query_test.cpp | 2 +-
.../cpp/core-test/src/handle_registry_test.cpp | 2 +-
.../cpp/core-test/src/ignite_error_test.cpp | 2 +-
.../cpp/core-test/src/ignition_test.cpp | 2 +-
.../cpp/core-test/src/interop_memory_test.cpp | 2 +-
.../cpp/core-test/src/reference_test.cpp | 2 +-
.../platforms/cpp/core-test/src/test_utils.cpp | 7 +
.../cpp/core-test/src/transactions_test.cpp | 2 +-
.../cpp/core/include/ignite/cache/cache.h | 60 +-
.../cache/query/continuous/continuous_query.h | 2 +-
.../core/include/ignite/impl/cache/cache_impl.h | 19 +
.../ignite/impl/interop/interop_target.h | 25 +
.../cpp/core/src/impl/cache/cache_impl.cpp | 48 +
.../core/src/impl/interop/interop_target.cpp | 36 +-
.../cpp/jni/include/ignite/jni/utils.h | 9 +
.../platforms/cpp/jni/os/linux/src/utils.cpp | 6 -
modules/platforms/cpp/jni/os/win/src/utils.cpp | 6 -
.../platforms/cpp/jni/project/vs/jni.vcxproj | 1 -
.../cpp/jni/project/vs/jni.vcxproj.filters | 3 -
.../platforms/cpp/jni/project/vs/targetver.h | 25 -
.../Properties/AssemblyInfo.cs | 2 +-
.../Properties/AssemblyInfo.cs | 2 +-
.../Properties/AssemblyInfo.cs | 2 +-
.../Properties/AssemblyInfo.cs | 2 +-
.../Properties/AssemblyInfo.cs | 2 +-
.../Properties/AssemblyInfo.cs | 2 +-
modules/spark-2.10/pom.xml | 54 +
modules/spark/pom.xml | 183 +-
.../org/apache/ignite/spark/IgniteContext.scala | 22 +-
.../spark/JavaEmbeddedIgniteRDDSelfTest.java | 10 +-
.../spark/JavaStandaloneIgniteRDDSelfTest.java | 22 +-
.../ant/beautifier/GridJavadocAntTask.java | 1 +
modules/web-console/backend/app/agent.js | 36 +
modules/web-console/backend/app/browser.js | 28 +
modules/web-console/backend/app/settings.js | 8 +-
modules/web-console/backend/index.js | 10 -
modules/web-console/frontend/.eslintrc | 1 +
modules/web-console/frontend/.gitignore | 1 +
modules/web-console/frontend/app/app.config.js | 12 +-
modules/web-console/frontend/app/app.js | 7 +-
.../activities-user-dialog.jade | 36 -
.../activities-user-dialog.tpl.pug | 36 +
.../components/activities-user-dialog/index.js | 2 +-
.../form-field-datepicker.jade | 55 -
.../form-field-datepicker.pug | 55 +
.../list-of-registered-users/index.js | 2 +-
.../list-of-registered-users.controller.js | 11 +-
.../list-of-registered-users.jade | 58 -
.../list-of-registered-users.tpl.pug | 58 +
.../ui-grid-header/ui-grid-header.jade | 27 -
.../ui-grid-header/ui-grid-header.scss | 1 +
.../ui-grid-header/ui-grid-header.tpl.pug | 27 +
.../ui-grid-settings/ui-grid-settings.jade | 33 -
.../ui-grid-settings/ui-grid-settings.pug | 33 +
.../app/directives/centered/centered.css | 37 -
.../directives/centered/centered.directive.js | 2 +-
.../app/directives/centered/centered.scss | 37 +
.../information/information.directive.js | 4 +-
.../app/directives/information/information.jade | 20 -
.../app/directives/information/information.pug | 20 +
.../ui-ace-docker/ui-ace-docker.directive.js | 4 +-
.../directives/ui-ace-docker/ui-ace-docker.jade | 31 -
.../directives/ui-ace-docker/ui-ace-docker.pug | 31 +
.../ui-ace-java/ui-ace-java.directive.js | 4 +-
.../app/directives/ui-ace-java/ui-ace-java.jade | 22 -
.../app/directives/ui-ace-java/ui-ace-java.pug | 22 +
.../ui-ace-pojos/ui-ace-pojos.directive.js | 4 +-
.../directives/ui-ace-pojos/ui-ace-pojos.jade | 40 -
.../directives/ui-ace-pojos/ui-ace-pojos.pug | 40 +
.../ui-ace-pom/ui-ace-pom.directive.js | 4 +-
.../app/directives/ui-ace-pom/ui-ace-pom.jade | 17 -
.../app/directives/ui-ace-pom/ui-ace-pom.pug | 17 +
.../ui-ace-sharp/ui-ace-sharp.directive.js | 4 +-
.../directives/ui-ace-sharp/ui-ace-sharp.jade | 22 -
.../directives/ui-ace-sharp/ui-ace-sharp.pug | 22 +
.../ui-ace-spring/ui-ace-spring.directive.js | 4 +-
.../directives/ui-ace-spring/ui-ace-spring.jade | 17 -
.../directives/ui-ace-spring/ui-ace-spring.pug | 17 +
.../frontend/app/helpers/jade/form.jade | 28 -
.../frontend/app/helpers/jade/form.pug | 28 +
.../helpers/jade/form/form-field-checkbox.jade | 38 -
.../helpers/jade/form/form-field-checkbox.pug | 38 +
.../helpers/jade/form/form-field-datalist.jade | 51 -
.../helpers/jade/form/form-field-datalist.pug | 51 +
.../app/helpers/jade/form/form-field-down.jade | 18 -
.../app/helpers/jade/form/form-field-down.pug | 18 +
.../helpers/jade/form/form-field-dropdown.jade | 51 -
.../helpers/jade/form/form-field-dropdown.pug | 51 +
.../helpers/jade/form/form-field-feedback.jade | 32 -
.../helpers/jade/form/form-field-feedback.pug | 32 +
.../app/helpers/jade/form/form-field-label.jade | 23 -
.../app/helpers/jade/form/form-field-label.pug | 23 +
.../helpers/jade/form/form-field-number.jade | 53 -
.../app/helpers/jade/form/form-field-number.pug | 53 +
.../helpers/jade/form/form-field-password.jade | 47 -
.../helpers/jade/form/form-field-password.pug | 47 +
.../app/helpers/jade/form/form-field-text.jade | 64 -
.../app/helpers/jade/form/form-field-text.pug | 64 +
.../app/helpers/jade/form/form-field-up.jade | 18 -
.../app/helpers/jade/form/form-field-up.pug | 18 +
.../app/helpers/jade/form/form-group.jade | 23 -
.../app/helpers/jade/form/form-group.pug | 23 +
.../frontend/app/helpers/jade/mixins.jade | 609 -------
.../frontend/app/helpers/jade/mixins.pug | 609 +++++++
.../frontend/app/modules/agent/agent.module.js | 4 +-
.../modules/branding/header-logo.directive.js | 4 +-
.../app/modules/branding/header-logo.jade | 18 -
.../app/modules/branding/header-logo.pug | 18 +
.../branding/powered-by-apache.directive.js | 4 +-
.../app/modules/branding/powered-by-apache.jade | 18 -
.../app/modules/branding/powered-by-apache.pug | 18 +
.../frontend/app/modules/demo/Demo.module.js | 3 +-
.../app/modules/dialog/dialog.factory.js | 2 +-
.../frontend/app/modules/dialog/dialog.jade | 26 -
.../frontend/app/modules/dialog/dialog.tpl.pug | 26 +
.../getting-started/GettingStarted.provider.js | 3 +-
.../frontend/app/modules/loading/loading.css | 73 -
.../app/modules/loading/loading.directive.js | 8 +-
.../frontend/app/modules/loading/loading.jade | 23 -
.../frontend/app/modules/loading/loading.pug | 23 +
.../frontend/app/modules/loading/loading.scss | 73 +
.../frontend/app/modules/nodes/Nodes.service.js | 4 +-
.../app/modules/nodes/nodes-dialog.jade | 35 -
.../app/modules/nodes/nodes-dialog.tpl.pug | 35 +
.../app/modules/sql/notebook.controller.js | 4 +-
.../frontend/app/modules/sql/sql.controller.js | 14 +-
.../frontend/app/modules/sql/sql.module.js | 15 +-
.../frontend/app/modules/states/admin.state.js | 4 +-
.../app/modules/states/configuration.state.js | 23 +-
.../states/configuration/caches/affinity.jade | 82 -
.../states/configuration/caches/affinity.pug | 82 +
.../configuration/caches/client-near-cache.jade | 50 -
.../configuration/caches/client-near-cache.pug | 50 +
.../configuration/caches/concurrency.jade | 65 -
.../states/configuration/caches/concurrency.pug | 65 +
.../states/configuration/caches/general.jade | 69 -
.../states/configuration/caches/general.pug | 69 +
.../states/configuration/caches/memory.jade | 109 --
.../states/configuration/caches/memory.pug | 108 ++
.../configuration/caches/near-cache-client.jade | 51 -
.../configuration/caches/near-cache-client.pug | 51 +
.../configuration/caches/near-cache-server.jade | 52 -
.../configuration/caches/near-cache-server.pug | 52 +
.../configuration/caches/node-filter.jade | 59 -
.../states/configuration/caches/node-filter.pug | 59 +
.../states/configuration/caches/query.jade | 114 --
.../states/configuration/caches/query.pug | 114 ++
.../states/configuration/caches/rebalance.jade | 66 -
.../states/configuration/caches/rebalance.pug | 66 +
.../states/configuration/caches/statistics.jade | 39 -
.../states/configuration/caches/statistics.pug | 39 +
.../states/configuration/caches/store.jade | 250 ---
.../states/configuration/caches/store.pug | 250 +++
.../states/configuration/clusters/atomic.jade | 54 -
.../states/configuration/clusters/atomic.pug | 54 +
.../configuration/clusters/attributes.jade | 57 -
.../configuration/clusters/attributes.pug | 57 +
.../states/configuration/clusters/binary.jade | 77 -
.../states/configuration/clusters/binary.pug | 77 +
.../configuration/clusters/cache-key-cfg.jade | 50 -
.../configuration/clusters/cache-key-cfg.pug | 50 +
.../configuration/clusters/checkpoint.jade | 86 -
.../configuration/clusters/checkpoint.pug | 86 +
.../configuration/clusters/checkpoint/fs.jade | 66 -
.../configuration/clusters/checkpoint/fs.pug | 66 +
.../configuration/clusters/checkpoint/jdbc.jade | 48 -
.../configuration/clusters/checkpoint/jdbc.pug | 48 +
.../configuration/clusters/checkpoint/s3.jade | 178 --
.../configuration/clusters/checkpoint/s3.pug | 178 ++
.../configuration/clusters/collision.jade | 63 -
.../states/configuration/clusters/collision.pug | 63 +
.../clusters/collision/custom.jade | 24 -
.../configuration/clusters/collision/custom.pug | 24 +
.../clusters/collision/fifo-queue.jade | 27 -
.../clusters/collision/fifo-queue.pug | 27 +
.../clusters/collision/job-stealing.jade | 63 -
.../clusters/collision/job-stealing.pug | 63 +
.../clusters/collision/priority-queue.jade | 42 -
.../clusters/collision/priority-queue.pug | 42 +
.../configuration/clusters/communication.jade | 100 --
.../configuration/clusters/communication.pug | 100 ++
.../configuration/clusters/connector.jade | 104 --
.../states/configuration/clusters/connector.pug | 104 ++
.../configuration/clusters/deployment.jade | 237 ---
.../configuration/clusters/deployment.pug | 237 +++
.../configuration/clusters/discovery.jade | 88 -
.../states/configuration/clusters/discovery.pug | 88 +
.../states/configuration/clusters/events.jade | 68 -
.../states/configuration/clusters/events.pug | 68 +
.../states/configuration/clusters/failover.jade | 73 -
.../states/configuration/clusters/failover.pug | 73 +
.../states/configuration/clusters/general.jade | 76 -
.../states/configuration/clusters/general.pug | 76 +
.../clusters/general/discovery/cloud.jade | 134 --
.../clusters/general/discovery/cloud.pug | 134 ++
.../clusters/general/discovery/google.jade | 38 -
.../clusters/general/discovery/google.pug | 38 +
.../clusters/general/discovery/jdbc.jade | 31 -
.../clusters/general/discovery/jdbc.pug | 31 +
.../clusters/general/discovery/multicast.jade | 99 -
.../clusters/general/discovery/multicast.pug | 99 +
.../clusters/general/discovery/s3.jade | 27 -
.../clusters/general/discovery/s3.pug | 27 +
.../clusters/general/discovery/shared.jade | 23 -
.../clusters/general/discovery/shared.pug | 23 +
.../clusters/general/discovery/vm.jade | 79 -
.../clusters/general/discovery/vm.pug | 79 +
.../clusters/general/discovery/zookeeper.jade | 85 -
.../clusters/general/discovery/zookeeper.pug | 85 +
.../bounded-exponential-backoff.jade | 27 -
.../retrypolicy/bounded-exponential-backoff.pug | 27 +
.../discovery/zookeeper/retrypolicy/custom.jade | 24 -
.../discovery/zookeeper/retrypolicy/custom.pug | 24 +
.../retrypolicy/exponential-backoff.jade | 27 -
.../retrypolicy/exponential-backoff.pug | 27 +
.../zookeeper/retrypolicy/forever.jade | 22 -
.../discovery/zookeeper/retrypolicy/forever.pug | 22 +
.../zookeeper/retrypolicy/n-times.jade | 25 -
.../discovery/zookeeper/retrypolicy/n-times.pug | 25 +
.../zookeeper/retrypolicy/one-time.jade | 23 -
.../zookeeper/retrypolicy/one-time.pug | 23 +
.../zookeeper/retrypolicy/until-elapsed.jade | 25 -
.../zookeeper/retrypolicy/until-elapsed.pug | 25 +
.../states/configuration/clusters/igfs.jade | 38 -
.../states/configuration/clusters/igfs.pug | 38 +
.../configuration/clusters/load-balancing.jade | 107 --
.../configuration/clusters/load-balancing.pug | 107 ++
.../states/configuration/clusters/logger.jade | 66 -
.../states/configuration/clusters/logger.pug | 66 +
.../configuration/clusters/logger/custom.jade | 25 -
.../configuration/clusters/logger/custom.pug | 25 +
.../configuration/clusters/logger/log4j.jade | 50 -
.../configuration/clusters/logger/log4j.pug | 50 +
.../configuration/clusters/logger/log4j2.jade | 39 -
.../configuration/clusters/logger/log4j2.pug | 39 +
.../configuration/clusters/marshaller.jade | 76 -
.../configuration/clusters/marshaller.pug | 76 +
.../states/configuration/clusters/metrics.jade | 51 -
.../states/configuration/clusters/metrics.pug | 51 +
.../states/configuration/clusters/odbc.jade | 48 -
.../states/configuration/clusters/odbc.pug | 48 +
.../states/configuration/clusters/ssl.jade | 110 --
.../states/configuration/clusters/ssl.pug | 110 ++
.../states/configuration/clusters/swap.jade | 72 -
.../states/configuration/clusters/swap.pug | 72 +
.../states/configuration/clusters/thread.jade | 48 -
.../states/configuration/clusters/thread.pug | 48 +
.../states/configuration/clusters/time.jade | 47 -
.../states/configuration/clusters/time.pug | 47 +
.../configuration/clusters/transactions.jade | 69 -
.../configuration/clusters/transactions.pug | 69 +
.../states/configuration/domains/general.jade | 52 -
.../states/configuration/domains/general.pug | 52 +
.../states/configuration/domains/query.jade | 172 --
.../states/configuration/domains/query.pug | 172 ++
.../states/configuration/domains/store.jade | 127 --
.../states/configuration/domains/store.pug | 127 ++
.../modules/states/configuration/igfs/dual.jade | 42 -
.../modules/states/configuration/igfs/dual.pug | 42 +
.../states/configuration/igfs/fragmentizer.jade | 43 -
.../states/configuration/igfs/fragmentizer.pug | 43 +
.../states/configuration/igfs/general.jade | 57 -
.../states/configuration/igfs/general.pug | 57 +
.../modules/states/configuration/igfs/ipc.jade | 60 -
.../modules/states/configuration/igfs/ipc.pug | 60 +
.../modules/states/configuration/igfs/misc.jade | 108 --
.../modules/states/configuration/igfs/misc.pug | 108 ++
.../states/configuration/igfs/secondary.jade | 45 -
.../states/configuration/igfs/secondary.pug | 45 +
.../configuration/summary/summary.controller.js | 5 +
.../frontend/app/modules/states/errors.state.js | 4 +-
.../app/modules/states/password.state.js | 6 +-
.../app/modules/states/profile.state.js | 4 +-
.../frontend/app/modules/states/signin.state.js | 2 +-
.../frontend/app/services/Clone.service.js | 4 +-
.../frontend/app/services/Confirm.service.js | 4 +-
.../app/services/ConfirmBatch.service.js | 4 +-
.../frontend/controllers/caches-controller.js | 4 +-
.../frontend/controllers/domains-controller.js | 4 +-
.../frontend/gulpfile.babel.js/paths.js | 28 +-
.../frontend/gulpfile.babel.js/tasks/build.js | 2 +-
.../frontend/gulpfile.babel.js/tasks/bundle.js | 8 +-
.../frontend/gulpfile.babel.js/tasks/jade.js | 49 -
.../frontend/gulpfile.babel.js/tasks/watch.js | 5 +-
.../gulpfile.babel.js/webpack/common.js | 292 +--
.../webpack/environments/development.js | 90 +-
.../webpack/environments/production.js | 41 +-
.../webpack/environments/test.js | 52 +-
.../frontend/gulpfile.babel.js/webpack/index.js | 4 +-
modules/web-console/frontend/package.json | 60 +-
.../frontend/test/e2e/exampe.test.js | 4 +-
.../frontend/test/karma.conf.babel.js | 7 +-
.../frontend/test/protractor.conf.js | 16 +-
.../frontend/test/unit/JavaTransformer.test.js | 2 +-
.../frontend/test/unit/JavaTypes.test.js | 137 +-
.../frontend/test/unit/SharpTransformer.test.js | 2 +-
.../test/unit/SpringTransformer.test.js | 2 +-
.../frontend/test/unit/SqlTypes.test.js | 7 +-
.../frontend/test/unit/UserAuth.test.js | 4 +-
.../frontend/test/unit/Version.test.js | 1 +
.../test/unit/defaultName.filter.test.js | 27 +-
modules/web-console/frontend/views/403.jade | 22 -
modules/web-console/frontend/views/403.pug | 22 +
modules/web-console/frontend/views/404.jade | 22 -
modules/web-console/frontend/views/404.pug | 22 +
modules/web-console/frontend/views/base.jade | 22 -
modules/web-console/frontend/views/base.pug | 22 +
.../frontend/views/configuration/caches.jade | 55 -
.../frontend/views/configuration/caches.tpl.pug | 55 +
.../frontend/views/configuration/clusters.jade | 68 -
.../views/configuration/clusters.tpl.pug | 68 +
.../views/configuration/domains-import.jade | 170 --
.../views/configuration/domains-import.tpl.pug | 170 ++
.../frontend/views/configuration/domains.jade | 66 -
.../views/configuration/domains.tpl.pug | 66 +
.../frontend/views/configuration/igfs.jade | 51 -
.../frontend/views/configuration/igfs.tpl.pug | 51 +
.../frontend/views/configuration/sidebar.jade | 29 -
.../views/configuration/sidebar.tpl.pug | 29 +
.../summary-project-structure.jade | 27 -
.../summary-project-structure.tpl.pug | 28 +
.../views/configuration/summary-tabs.jade | 25 -
.../views/configuration/summary-tabs.pug | 25 +
.../frontend/views/configuration/summary.jade | 90 -
.../views/configuration/summary.tpl.pug | 90 +
.../frontend/views/includes/footer.jade | 23 -
.../frontend/views/includes/footer.pug | 23 +
.../frontend/views/includes/header.jade | 52 -
.../frontend/views/includes/header.pug | 52 +
modules/web-console/frontend/views/index.jade | 47 -
modules/web-console/frontend/views/index.pug | 47 +
modules/web-console/frontend/views/reset.jade | 48 -
.../web-console/frontend/views/reset.tpl.pug | 48 +
.../frontend/views/settings/admin.jade | 25 -
.../frontend/views/settings/admin.tpl.pug | 25 +
.../frontend/views/settings/profile.jade | 76 -
.../frontend/views/settings/profile.tpl.pug | 76 +
modules/web-console/frontend/views/signin.jade | 163 --
.../web-console/frontend/views/signin.tpl.pug | 163 ++
.../frontend/views/sql/cache-metadata.jade | 40 -
.../frontend/views/sql/cache-metadata.tpl.pug | 40 +
.../frontend/views/sql/chart-settings.jade | 40 -
.../frontend/views/sql/chart-settings.tpl.pug | 40 +
.../frontend/views/sql/notebook-new.jade | 33 -
.../frontend/views/sql/notebook-new.tpl.pug | 33 +
.../frontend/views/sql/paragraph-rate.jade | 31 -
.../frontend/views/sql/paragraph-rate.tpl.pug | 31 +
modules/web-console/frontend/views/sql/sql.jade | 278 ---
.../web-console/frontend/views/sql/sql.tpl.pug | 278 +++
.../views/templates/agent-download.jade | 50 -
.../views/templates/agent-download.tpl.pug | 50 +
.../frontend/views/templates/alert.jade | 21 -
.../frontend/views/templates/alert.tpl.pug | 21 +
.../frontend/views/templates/batch-confirm.jade | 34 -
.../views/templates/batch-confirm.tpl.pug | 34 +
.../frontend/views/templates/clone.jade | 39 -
.../frontend/views/templates/clone.tpl.pug | 39 +
.../frontend/views/templates/confirm.jade | 33 -
.../frontend/views/templates/confirm.tpl.pug | 33 +
.../frontend/views/templates/demo-info.jade | 47 -
.../frontend/views/templates/demo-info.tpl.pug | 47 +
.../frontend/views/templates/dropdown.jade | 24 -
.../frontend/views/templates/dropdown.tpl.pug | 24 +
.../views/templates/getting-started.jade | 34 -
.../views/templates/getting-started.tpl.pug | 34 +
.../frontend/views/templates/message.jade | 28 -
.../frontend/views/templates/message.tpl.pug | 28 +
.../frontend/views/templates/pagination.jade | 32 -
.../frontend/views/templates/select.jade | 26 -
.../frontend/views/templates/select.tpl.pug | 26 +
.../views/templates/validation-error.jade | 25 -
.../views/templates/validation-error.tpl.pug | 25 +
.../demo/service/DemoCachesLoadService.java | 26 +
modules/yardstick/config/ignite-base-config.xml | 196 +-
.../yardstick/cache/IgniteGetAllBenchmark.java | 42 +
.../cache/IgniteGetAllOffHeapBenchmark.java | 30 +
.../yardstick/cache/IgniteGetBenchmark.java | 35 +
.../cache/IgnitePutAllOffHeapBenchmark.java | 30 +
.../cache/IgnitePutAllTxOffHeapBenchmark.java | 30 +
.../IgnitePutOffHeapIndexedValue8Benchmark.java | 30 +
.../IgnitePutRandomValueSizeBenchmark.java | 41 +
modules/zeromq/README.txt | 37 +
modules/zeromq/licenses/apache-2.0.txt | 202 +++
modules/zeromq/pom.xml | 75 +
.../stream/zeromq/IgniteZeroMqStreamer.java | 146 ++
.../ignite/stream/zeromq/ZeroMqTypeSocket.java | 56 +
.../ignite/stream/zeromq/package-info.java | 21 +
.../stream/zeromq/IgniteZeroMqStreamerTest.java | 235 +++
.../zeromq/IgniteZeroMqStreamerTestSuite.java | 37 +
.../ZeroMqStringSingleTupleExtractor.java | 46 +
.../ignite/stream/zeromq/package-info.java | 21 +
parent/pom.xml | 6 +-
pom.xml | 1 +
583 files changed, 20845 insertions(+), 12072 deletions(-)
----------------------------------------------------------------------
[23/38] ignite git commit: Merge remote-tracking branch
'remotes/origin/ignite-2.0' into ignite-4768
Posted by sb...@apache.org.
Merge remote-tracking branch 'remotes/origin/ignite-2.0' into ignite-4768
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/850e4dc0
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/850e4dc0
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/850e4dc0
Branch: refs/heads/ignite-4768
Commit: 850e4dc03df64863a7ae0473362a42e97c8a2041
Parents: e4e8253 86fad98
Author: sboikov <sb...@gridgain.com>
Authored: Mon Mar 13 11:22:00 2017 +0300
Committer: sboikov <sb...@gridgain.com>
Committed: Mon Mar 13 11:22:00 2017 +0300
----------------------------------------------------------------------
.../configuration/CacheConfiguration.java | 28 +-
.../cache/query/GridCacheQueryManager.java | 22 +-
.../query/GridQueryIndexDescriptor.java | 4 +-
.../processors/query/GridQueryIndexType.java | 32 -
.../processors/query/GridQueryIndexing.java | 8 -
.../processors/query/GridQueryProcessor.java | 1307 ++----------------
.../query/QueryIndexDescriptorImpl.java | 102 ++
.../query/QueryTypeDescriptorImpl.java | 337 +++++
.../processors/query/QueryTypeIdKey.java | 94 ++
.../processors/query/QueryTypeNameKey.java | 68 +
.../query/property/QueryBinaryProperty.java | 267 ++++
.../query/property/QueryClassProperty.java | 130 ++
.../query/property/QueryFieldAccessor.java | 67 +
.../query/property/QueryMethodsAccessor.java | 82 ++
.../query/property/QueryPropertyAccessor.java | 53 +
.../property/QueryReadOnlyMethodsAccessor.java | 71 +
.../resources/META-INF/classnames.properties | 1 -
.../processors/query/h2/IgniteH2Indexing.java | 23 +-
.../query/h2/opt/GridH2IndexBase.java | 10 -
.../processors/query/h2/opt/GridH2Table.java | 33 -
.../query/h2/opt/GridH2TreeIndex.java | 23 -
.../query/h2/opt/GridLuceneIndex.java | 4 +-
.../query/h2/GridH2IndexRebuildTest.java | 261 ----
.../h2/GridIndexingSpiAbstractSelfTest.java | 23 +-
.../query/h2/opt/GridH2TableSelfTest.java | 54 -
.../IgniteCacheQuerySelfTestSuite.java | 2 -
26 files changed, 1392 insertions(+), 1714 deletions(-)
----------------------------------------------------------------------
[34/38] ignite git commit: Merge remote-tracking branch
'remotes/origin/ignite-2.0' into ignite-4768
Posted by sb...@apache.org.
Merge remote-tracking branch 'remotes/origin/ignite-2.0' into ignite-4768
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/ae4af02a
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/ae4af02a
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/ae4af02a
Branch: refs/heads/ignite-4768
Commit: ae4af02aff3b7a59f0e730035111acf20684c9a6
Parents: 3ce0496 f59f46d
Author: sboikov <sb...@gridgain.com>
Authored: Mon Mar 13 14:51:31 2017 +0300
Committer: sboikov <sb...@gridgain.com>
Committed: Mon Mar 13 14:51:31 2017 +0300
----------------------------------------------------------------------
.../aop/aspectj/GridifyAspectJAspect.java | 15 +-
.../aspectj/GridifySetToSetAspectJAspect.java | 15 +-
.../aspectj/GridifySetToValueAspectJAspect.java | 15 +-
.../aop/spring/GridifySetToSetSpringAspect.java | 15 +-
.../spring/GridifySetToValueSpringAspect.java | 15 +-
.../gridify/aop/spring/GridifySpringAspect.java | 15 +-
.../apache/ignite/gridify/AbstractAopTest.java | 6 +-
.../ignite/gridify/GridifySetToSetTarget.java | 18 +-
.../gridify/GridifySetToSetTargetInterface.java | 18 +-
.../ignite/gridify/GridifySetToValueTarget.java | 16 +-
.../GridifySetToValueTargetInterface.java | 16 +-
.../ignite/gridify/NonSpringAopSelfTest.java | 2 +-
.../ignite/gridify/SpringAopSelfTest.java | 2 +-
.../apache/ignite/gridify/TestAopTarget.java | 16 +-
.../ignite/gridify/TestAopTargetInterface.java | 16 +-
.../gridify/hierarchy/GridifyHierarchyTest.java | 2 +-
.../ignite/gridify/hierarchy/SuperTarget.java | 4 +-
.../apache/ignite/p2p/P2PGridifySelfTest.java | 8 +-
.../singlesplit/SingleSplitsLoadTest.java | 2 +-
.../gridify/GridifySingleSplitLoadTest.java | 6 +-
.../org/test/gridify/ExternalAopTarget.java | 16 +-
.../gridify/ExternalNonSpringAopSelfTest.java | 6 +-
.../spi/checkpoint/s3/S3CheckpointSpi.java | 4 +-
.../s3/S3CheckpointManagerSelfTest.java | 6 +-
.../jmh/cache/JmhCacheAbstractBenchmark.java | 6 +-
.../internal/TaskEventSubjectIdSelfTest.java | 4 +-
.../ClientAbstractMultiThreadedSelfTest.java | 4 +-
.../client/ClientDefaultCacheSelfTest.java | 4 +-
.../internal/client/ClientStartNodeTask.java | 14 +-
.../internal/client/ClientStopNodeTask.java | 2 +-
.../ClientTcpSslAuthenticationSelfTest.java | 4 +-
...skExecutionAfterTopologyRestartSelfTest.java | 4 +-
.../internal/client/ClientTestRestServer.java | 6 +-
.../ClientAbstractMultiNodeSelfTest.java | 4 +-
.../integration/ClientAbstractSelfTest.java | 4 +-
.../integration/ClientPreferDirectSelfTest.java | 4 +-
.../client/router/ClientFailedInitSelfTest.java | 4 +-
.../client/router/RouterFactorySelfTest.java | 4 +-
.../jdbc2/JdbcAbstractDmlStatementSelfTest.java | 16 +-
...BinaryMarshallerInsertStatementSelfTest.java | 4 +-
...cBinaryMarshallerMergeStatementSelfTest.java | 4 +-
.../jdbc2/JdbcComplexQuerySelfTest.java | 4 +-
.../internal/jdbc2/JdbcConnectionSelfTest.java | 4 +-
.../jdbc2/JdbcDistributedJoinsQueryTest.java | 4 +-
.../internal/jdbc2/JdbcEmptyCacheSelfTest.java | 4 +-
.../internal/jdbc2/JdbcLocalCachesSelfTest.java | 4 +-
.../internal/jdbc2/JdbcMetadataSelfTest.java | 4 +-
.../internal/jdbc2/JdbcNoDefaultCacheTest.java | 4 +-
.../jdbc2/JdbcPreparedStatementSelfTest.java | 4 +-
.../internal/jdbc2/JdbcResultSetSelfTest.java | 4 +-
.../internal/jdbc2/JdbcStatementSelfTest.java | 4 +-
.../rest/AbstractRestProcessorSelfTest.java | 4 +-
.../rest/ClientMemcachedProtocolSelfTest.java | 4 +-
.../JettyRestProcessorAbstractSelfTest.java | 6 +-
.../rest/JettyRestProcessorSignedSelfTest.java | 4 +-
.../rest/RestBinaryProtocolSelfTest.java | 4 +-
.../rest/RestMemcacheProtocolSelfTest.java | 4 +-
.../rest/RestProcessorMultiStartSelfTest.java | 4 +-
.../rest/RestProcessorStartSelfTest.java | 8 +-
.../rest/TaskCommandHandlerSelfTest.java | 4 +-
.../tcp/redis/RedisProtocolSelfTest.java | 4 +-
.../ignite/jdbc/JdbcComplexQuerySelfTest.java | 4 +-
.../ignite/jdbc/JdbcConnectionSelfTest.java | 6 +-
.../ignite/jdbc/JdbcEmptyCacheSelfTest.java | 4 +-
.../ignite/jdbc/JdbcLocalCachesSelfTest.java | 4 +-
.../ignite/jdbc/JdbcMetadataSelfTest.java | 4 +-
.../ignite/jdbc/JdbcNoDefaultCacheTest.java | 4 +-
.../jdbc/JdbcPreparedStatementSelfTest.java | 4 +-
.../ignite/jdbc/JdbcResultSetSelfTest.java | 4 +-
.../ignite/jdbc/JdbcStatementSelfTest.java | 4 +-
.../src/test/resources/spring-server-node.xml | 2 +-
.../test/resources/spring-server-ssl-node.xml | 2 +-
.../src/main/java/org/apache/ignite/Ignite.java | 15 +-
.../apache/ignite/IgniteSystemProperties.java | 8 +
.../main/java/org/apache/ignite/Ignition.java | 43 +-
.../org/apache/ignite/IgnitionListener.java | 2 +-
.../org/apache/ignite/cache/CacheManager.java | 2 +-
.../apache/ignite/cache/CacheTypeMetadata.java | 4 +-
.../ignite/cache/query/SqlFieldsQuery.java | 4 +-
.../org/apache/ignite/cache/query/SqlQuery.java | 6 +-
.../apache/ignite/cache/query/TextQuery.java | 4 +-
.../apache/ignite/compute/gridify/Gridify.java | 10 +
.../ignite/compute/gridify/GridifySetToSet.java | 10 +
.../compute/gridify/GridifySetToValue.java | 10 +
.../configuration/CacheConfiguration.java | 25 +-
.../configuration/IgniteConfiguration.java | 44 +-
.../apache/ignite/internal/GridDiagnostic.java | 16 +-
.../ignite/internal/GridKernalContext.java | 6 +-
.../ignite/internal/GridKernalContextImpl.java | 6 +-
.../ignite/internal/GridKernalGatewayImpl.java | 14 +-
.../apache/ignite/internal/GridLoggerProxy.java | 25 +-
.../apache/ignite/internal/IgniteKernal.java | 56 +-
.../ignite/internal/IgniteNodeAttributes.java | 10 +-
.../org/apache/ignite/internal/IgnitionEx.java | 150 +--
.../internal/binary/BinaryClassDescriptor.java | 9 +-
.../ignite/internal/binary/BinaryContext.java | 6 +-
.../internal/binary/BinaryReaderExImpl.java | 2 +-
.../internal/binary/BinaryWriterExImpl.java | 2 +-
.../GridClientConnectionManagerAdapter.java | 2 +-
.../client/router/impl/GridTcpRouterImpl.java | 4 +-
.../internal/cluster/ClusterGroupAdapter.java | 10 +-
.../cluster/ClusterNodeLocalMapImpl.java | 2 +-
.../internal/cluster/IgniteClusterImpl.java | 2 +-
.../ignite/internal/jdbc2/JdbcConnection.java | 4 +-
.../apache/ignite/internal/jdbc2/JdbcUtils.java | 4 +-
.../internal/managers/GridManagerAdapter.java | 2 +-
.../checkpoint/GridCheckpointManager.java | 2 +-
.../managers/communication/GridIoManager.java | 2 +-
.../discovery/GridDiscoveryManager.java | 9 +-
.../eventstorage/GridEventStorageManager.java | 2 +-
.../affinity/GridAffinityProcessor.java | 2 +-
.../processors/cache/GridCacheAdapter.java | 2 +-
.../cache/GridCacheClearAllRunnable.java | 4 +-
.../processors/cache/GridCacheContext.java | 11 +-
.../cache/GridCacheDeploymentManager.java | 2 +-
.../processors/cache/GridCacheEventManager.java | 4 +-
.../cache/GridCacheEvictionManager.java | 9 +-
.../processors/cache/GridCacheGateway.java | 3 +-
.../processors/cache/GridCacheIoManager.java | 2 +-
.../processors/cache/GridCacheMvccManager.java | 2 +-
.../GridCachePartitionExchangeManager.java | 8 +-
.../processors/cache/GridCacheProcessor.java | 20 +-
.../cache/GridCacheSharedContext.java | 6 +-
.../cache/GridCacheSharedTtlCleanupManager.java | 2 +-
.../processors/cache/GridCacheSwapManager.java | 4 +-
.../processors/cache/GridCacheTtlManager.java | 3 +-
.../processors/cache/IgniteCacheProxy.java | 4 +-
.../dht/GridClientPartitionTopology.java | 7 +-
.../distributed/dht/GridDhtLocalPartition.java | 10 +-
.../dht/GridDhtPartitionTopologyImpl.java | 9 +-
.../dht/preloader/GridDhtPartitionDemander.java | 9 +-
.../cache/query/GridCacheQueryAdapter.java | 4 +-
.../cache/query/GridCacheQueryManager.java | 7 +-
.../store/GridCacheStoreManagerAdapter.java | 2 +-
.../cache/store/GridCacheWriteBehindStore.java | 16 +-
.../cache/transactions/IgniteTxManager.java | 2 +-
.../IgniteCacheObjectProcessorImpl.java | 4 +-
.../processors/clock/GridClockServer.java | 2 +-
.../clock/GridClockSyncProcessor.java | 2 +-
.../closure/GridClosureProcessor.java | 6 +-
.../processors/cluster/ClusterProcessor.java | 2 +-
.../processors/cluster/GridUpdateNotifier.java | 14 +-
.../continuous/GridContinuousProcessor.java | 2 +-
.../datastreamer/DataStreamProcessor.java | 4 +-
.../datastructures/DataStructuresProcessor.java | 2 +-
.../processors/igfs/IgfsDataManager.java | 8 +-
.../igfs/IgfsFragmentizerManager.java | 4 +-
.../processors/igfs/IgfsIpcHandler.java | 2 +-
.../processors/igfs/IgfsNoopProcessor.java | 2 +-
.../internal/processors/igfs/IgfsProcessor.java | 2 +-
.../internal/processors/igfs/IgfsServer.java | 6 +-
.../processors/igfs/IgfsServerManager.java | 2 +-
.../processors/igfs/IgfsThreadFactory.java | 6 +-
.../internal/processors/igfs/IgfsUtils.java | 6 +-
.../processors/job/GridJobProcessor.java | 2 +-
.../internal/processors/job/GridJobWorker.java | 2 +-
.../jobmetrics/GridJobMetricsProcessor.java | 3 +-
.../internal/processors/odbc/OdbcProcessor.java | 6 +-
.../processors/platform/PlatformIgnition.java | 34 +-
.../platform/PlatformProcessorImpl.java | 2 +-
.../platform/compute/PlatformAbstractJob.java | 2 +-
.../processors/port/GridPortProcessor.java | 2 +-
.../processors/query/GridQueryIndexing.java | 8 +-
.../processors/query/GridQueryProcessor.java | 1028 ++----------------
.../processors/query/QueryTypeCandidate.java | 66 ++
.../internal/processors/query/QueryUtils.java | 989 +++++++++++++++++
.../query/property/QueryBinaryProperty.java | 6 +-
.../resource/GridResourceProcessor.java | 2 +-
.../processors/rest/GridRestProcessor.java | 8 +-
.../version/GridVersionCommandHandler.java | 2 +-
.../rest/protocols/tcp/GridTcpRestProtocol.java | 2 +-
.../service/GridServiceProcessor.java | 4 +-
.../session/GridTaskSessionProcessor.java | 2 +-
.../processors/task/GridTaskProcessor.java | 2 +-
.../processors/task/GridTaskWorker.java | 2 +-
.../timeout/GridTimeoutProcessor.java | 6 +-
.../suggestions/GridPerformanceSuggestions.java | 6 +-
.../ignite/internal/util/IgniteUtils.java | 33 +-
.../ignite/internal/util/StripedExecutor.java | 32 +-
.../shmem/IpcSharedMemoryServerEndpoint.java | 22 +-
.../util/nio/GridNioAsyncNotifyFilter.java | 16 +-
.../ignite/internal/util/nio/GridNioServer.java | 48 +-
.../ignite/internal/util/worker/GridWorker.java | 22 +-
.../internal/visor/igfs/VisorIgfsEndpoint.java | 26 +-
.../visor/node/VisorBasicConfiguration.java | 12 +-
.../visor/node/VisorNodeDataCollectorJob.java | 2 +-
.../node/VisorNodeDataCollectorJobResult.java | 16 +-
.../visor/node/VisorNodeDataCollectorTask.java | 2 +-
.../node/VisorNodeDataCollectorTaskResult.java | 10 +-
.../apache/ignite/mxbean/IgnitionMXBean.java | 14 +-
.../java/org/apache/ignite/spi/IgniteSpi.java | 6 +-
.../org/apache/ignite/spi/IgniteSpiAdapter.java | 15 +-
.../org/apache/ignite/spi/IgniteSpiThread.java | 6 +-
.../ignite/spi/IgniteSpiThreadFactory.java | 10 +-
.../checkpoint/cache/CacheCheckpointSpi.java | 4 +-
.../spi/checkpoint/jdbc/JdbcCheckpointSpi.java | 2 +-
.../spi/checkpoint/noop/NoopCheckpointSpi.java | 2 +-
.../sharedfs/SharedFsCheckpointSpi.java | 12 +-
.../sharedfs/SharedFsTimeoutTask.java | 6 +-
.../fifoqueue/FifoQueueCollisionSpi.java | 4 +-
.../jobstealing/JobStealingCollisionSpi.java | 4 +-
.../spi/collision/noop/NoopCollisionSpi.java | 2 +-
.../PriorityQueueCollisionSpi.java | 4 +-
.../communication/tcp/TcpCommunicationSpi.java | 20 +-
.../deployment/local/LocalDeploymentSpi.java | 4 +-
.../ignite/spi/discovery/tcp/ClientImpl.java | 2 +-
.../ignite/spi/discovery/tcp/ServerImpl.java | 2 +-
.../spi/discovery/tcp/TcpDiscoveryImpl.java | 4 +-
.../spi/discovery/tcp/TcpDiscoverySpi.java | 8 +-
.../memory/MemoryEventStorageSpi.java | 4 +-
.../spi/failover/always/AlwaysFailoverSpi.java | 4 +-
.../jobstealing/JobStealingFailoverSpi.java | 4 +-
.../spi/failover/never/NeverFailoverSpi.java | 4 +-
.../spi/indexing/noop/NoopIndexingSpi.java | 2 +-
.../adaptive/AdaptiveLoadBalancingSpi.java | 4 +-
.../roundrobin/RoundRobinLoadBalancingSpi.java | 4 +-
.../WeightedRandomLoadBalancingSpi.java | 4 +-
.../spi/swapspace/file/FileSwapSpaceSpi.java | 10 +-
.../spi/swapspace/noop/NoopSwapSpaceSpi.java | 2 +-
.../ignite/startup/BasicWarmupClosure.java | 2 +-
.../startup/cmdline/CommandLineStartup.java | 6 +-
.../org/apache/ignite/stream/StreamVisitor.java | 2 +-
.../ignite/stream/socket/SocketStreamer.java | 6 +-
.../thread/IgniteStripedThreadPoolExecutor.java | 6 +-
.../org/apache/ignite/thread/IgniteThread.java | 57 +-
.../ignite/thread/IgniteThreadFactory.java | 18 +-
.../ignite/thread/IgniteThreadPoolExecutor.java | 12 +-
.../test/config/default-spring-url-testing.xml | 2 +-
.../core/src/test/config/load/dsi-load-base.xml | 2 +-
.../test/config/loaders/grid-cfg-2-grids.xml | 4 +-
.../core/src/test/config/loaders/grid-cfg.xml | 2 +-
.../config/websession/example-cache-client.xml | 2 +-
.../test/config/websession/example-cache2.xml | 2 +-
.../test/config/websession/spring-cache-1.xml | 2 +-
.../test/config/websession/spring-cache-2.xml | 2 +-
.../test/config/websession/spring-cache-3.xml | 2 +-
.../GridCacheAffinityBackupsSelfTest.java | 4 +-
.../ignite/IgniteCacheAffinitySelfTest.java | 6 +-
.../cache/IgniteWarmupClosureSelfTest.java | 4 +-
.../affinity/AffinityClientNodeSelfTest.java | 6 +-
...ityFunctionBackupFilterAbstractSelfTest.java | 4 +-
...unctionExcludeNeighborsAbstractSelfTest.java | 4 +-
.../affinity/AffinityHistoryCleanupTest.java | 4 +-
.../fair/FairAffinityDynamicCacheSelfTest.java | 4 +-
.../fair/FairAffinityFunctionNodesSelfTest.java | 4 +-
.../local/LocalAffinityFunctionTest.java | 4 +-
...cheStoreSessionListenerAbstractSelfTest.java | 4 +-
...heStoreSessionListenerLifecycleSelfTest.java | 4 +-
.../GridCacheLoadOnlyStoreAdapterSelfTest.java | 4 +-
.../IgniteCacheExpiryStoreLoadSelfTest.java | 4 +-
.../store/StoreResourceInjectionSelfTest.java | 4 +-
.../CacheJdbcPojoStoreAbstractSelfTest.java | 4 +-
...eJdbcStoreAbstractMultithreadedSelfTest.java | 4 +-
...CacheJdbcBlobStoreMultithreadedSelfTest.java | 4 +-
.../ignite/igfs/IgfsEventsAbstractSelfTest.java | 13 +-
.../igfs/IgfsFragmentizerAbstractSelfTest.java | 4 +-
.../internal/ClusterGroupAbstractTest.java | 4 +-
.../internal/ClusterGroupHostsSelfTest.java | 4 +-
.../ignite/internal/ClusterMetricsSelfTest.java | 4 +-
.../internal/ClusterNodeMetricsSelfTest.java | 4 +-
.../ComputeJobCancelWithServiceSelfTest.java | 4 +-
.../ignite/internal/GridAffinityMappedTest.java | 11 +-
.../internal/GridAffinityP2PSelfTest.java | 11 +-
.../ignite/internal/GridAffinitySelfTest.java | 8 +-
.../GridAlwaysFailoverSpiFailSelfTest.java | 4 +-
.../internal/GridCacheRecreateLockTest.java | 2 +-
.../internal/GridCancelUnusedJobSelfTest.java | 6 +-
.../GridCancelledJobsMetricsSelfTest.java | 4 +-
.../GridCollisionJobsContextSelfTest.java | 10 +-
.../internal/GridCommunicationSelfTest.java | 2 +-
...omputationBinarylizableClosuresSelfTest.java | 4 +-
.../GridContinuousJobAnnotationSelfTest.java | 4 +-
.../ignite/internal/GridDeploymentSelfTest.java | 16 +-
.../internal/GridDiscoveryEventSelfTest.java | 4 +-
.../ignite/internal/GridDiscoverySelfTest.java | 6 +-
.../GridEventStorageCheckAllEventsSelfTest.java | 2 +-
...ventStorageRuntimeConfigurationSelfTest.java | 4 +-
.../internal/GridFactoryVmShutdownTest.java | 2 +-
...ridFailFastNodeFailureDetectionSelfTest.java | 4 +-
.../GridFailedInputParametersSelfTest.java | 2 +-
.../GridFailoverCustomTopologySelfTest.java | 4 +-
.../ignite/internal/GridFailoverSelfTest.java | 4 +-
.../GridFailoverTaskWithPredicateSelfTest.java | 6 +-
.../internal/GridFailoverTopologySelfTest.java | 4 +-
.../ignite/internal/GridGetOrStartSelfTest.java | 8 +-
.../ignite/internal/GridHomePathSelfTest.java | 8 +-
.../GridJobCheckpointCleanupSelfTest.java | 6 +-
.../GridJobCollisionCancelSelfTest.java | 4 +-
.../GridJobMasterLeaveAwareSelfTest.java | 4 +-
.../internal/GridJobStealingSelfTest.java | 4 +-
.../GridJobStealingZeroActiveJobsSelfTest.java | 6 +-
.../internal/GridLifecycleAwareSelfTest.java | 4 +-
.../internal/GridLifecycleBeanSelfTest.java | 16 +-
.../GridLocalEventListenerSelfTest.java | 6 +-
.../internal/GridMultipleJobsSelfTest.java | 6 +-
.../internal/GridMultipleSpisSelfTest.java | 4 +-
.../GridMultipleVersionsDeploymentSelfTest.java | 4 +-
.../GridMultithreadedJobStealingSelfTest.java | 4 +-
.../ignite/internal/GridNodeLocalSelfTest.java | 2 +-
.../internal/GridNodeMetricsLogSelfTest.java | 4 +-
.../GridNodeVisorAttributesSelfTest.java | 4 +-
.../internal/GridNonHistoryMetricsSelfTest.java | 4 +-
.../GridProjectionForCachesSelfTest.java | 18 +-
...ectionLocalJobMultipleArgumentsSelfTest.java | 4 +-
.../internal/GridReleaseTypeSelfTest.java | 4 +-
.../internal/GridRuntimeExceptionSelfTest.java | 8 +-
.../internal/GridSpiExceptionSelfTest.java | 8 +-
.../ignite/internal/GridStartStopSelfTest.java | 6 +-
.../internal/GridStopWithWaitSelfTest.java | 12 +-
.../GridTaskFailoverAffinityRunTest.java | 6 +-
.../GridTaskFutureImplStopGridSelfTest.java | 8 +-
.../GridTaskInstanceExecutionSelfTest.java | 2 +-
.../internal/GridTaskJobRejectSelfTest.java | 4 +-
.../internal/GridTaskListenerSelfTest.java | 2 +-
.../internal/GridTaskMapAsyncSelfTest.java | 6 +-
.../internal/GridTaskResultCacheSelfTest.java | 4 +-
.../internal/GridTaskTimeoutSelfTest.java | 8 +-
.../IgniteClientReconnectAbstractTest.java | 4 +-
.../IgniteClientReconnectApiExceptionTest.java | 4 +-
.../IgniteClientReconnectCacheTest.java | 13 +-
...niteClientReconnectFailoverAbstractTest.java | 4 +-
.../IgniteClientReconnectFailoverTest.java | 4 +-
.../IgniteClientReconnectStreamerTest.java | 4 +-
.../IgniteComputeEmptyClusterGroupTest.java | 4 +-
.../internal/IgniteExecutorServiceTest.java | 14 +-
...gniteExplicitImplicitDeploymentSelfTest.java | 4 +-
.../IgniteLocalNodeMapBeforeStartTest.java | 2 +-
...RoundRobinErrorAfterClientReconnectTest.java | 6 +-
.../IgniteSlowClientDetectionSelfTest.java | 7 +-
...UpdateNotifierPerClusterSettingSelfTest.java | 4 +-
.../ignite/internal/TaskNodeRestartTest.java | 4 +-
.../internal/TestRecordingCommunicationSpi.java | 4 +-
.../BinaryArrayIdentityResolverSelfTest.java | 4 +-
.../BinaryConfigurationConsistencySelfTest.java | 4 +-
.../internal/binary/BinaryEnumsSelfTest.java | 4 +-
.../BinaryFieldIdentityResolverSelfTest.java | 4 +-
...ryIdentityResolverConfigurationSelfTest.java | 4 +-
.../BinaryObjectBuilderAdditionalSelfTest.java | 4 +-
...naryObjectBuilderDefaultMappersSelfTest.java | 4 +-
...ilderSimpleNameLowerCaseMappersSelfTest.java | 4 +-
.../binary/BinaryObjectToStringSelfTest.java | 4 +-
.../BinarySerialiedFieldComparatorSelfTest.java | 4 +-
.../internal/binary/BinaryTreeSelfTest.java | 2 +-
.../binary/GridBinaryAffinityKeySelfTest.java | 6 +-
...aultBinaryMappersBinaryMetaDataSelfTest.java | 4 +-
...CaseBinaryMappersBinaryMetaDataSelfTest.java | 4 +-
...GridManagerLocalMessageListenerSelfTest.java | 6 +-
.../managers/GridNoopManagerSelfTest.java | 2 +-
.../GridCheckpointManagerAbstractSelfTest.java | 33 +-
.../checkpoint/GridCheckpointTaskSelfTest.java | 4 +-
...idCommunicationManagerListenersSelfTest.java | 6 +-
.../GridCommunicationSendMessageSelfTest.java | 4 +-
.../IgniteCommunicationBalanceTest.java | 4 +-
.../communication/IgniteIoTestMessagesTest.java | 4 +-
.../IgniteVariousConnectionNumberTest.java | 6 +-
.../GridDeploymentManagerStopSelfTest.java | 2 +-
.../GridDeploymentMessageCountSelfTest.java | 6 +-
.../GridDiscoveryManagerAliveCacheSelfTest.java | 6 +-
.../GridDiscoveryManagerAttributesSelfTest.java | 10 +-
.../IgniteTopologyPrintFormatSelfTest.java | 8 +-
.../events/GridEventStorageManagerSelfTest.java | 4 +-
.../swapspace/GridSwapSpaceManagerSelfTest.java | 4 +-
.../GridCacheTxLoadFromStoreOnLockSelfTest.java | 4 +-
.../GridAffinityProcessorAbstractSelfTest.java | 4 +-
.../BinaryObjectOffHeapUnswapTemporaryTest.java | 4 +-
.../cache/CacheAffinityCallSelfTest.java | 6 +-
.../CacheAtomicSingleMessageCountSelfTest.java | 4 +-
.../cache/CacheClientStoreSelfTest.java | 6 +-
...cheDhtLocalPartitionAfterRemoveSelfTest.java | 4 +-
.../cache/CacheEntryProcessorCopySelfTest.java | 4 +-
.../cache/CacheEnumOperationsAbstractTest.java | 4 +-
...CacheExchangeMessageDuplicatedStateTest.java | 6 +-
.../cache/CacheFutureExceptionSelfTest.java | 6 +-
.../cache/CacheGetEntryAbstractTest.java | 4 +-
...erceptorPartitionCounterLocalSanityTest.java | 4 +-
...torPartitionCounterRandomOperationsTest.java | 4 +-
.../CacheMetricsForClusterGroupSelfTest.java | 4 +-
.../processors/cache/CacheNamesSelfTest.java | 4 +-
.../CacheNamesWithSpecialCharactersTest.java | 4 +-
.../cache/CacheNearReaderUpdateTest.java | 4 +-
.../cache/CacheOffheapMapEntrySelfTest.java | 6 +-
.../CachePutEventListenerErrorSelfTest.java | 4 +-
.../processors/cache/CachePutIfAbsentTest.java | 4 +-
.../cache/CacheReadThroughRestartSelfTest.java | 6 +-
.../cache/CacheRebalancingSelfTest.java | 4 +-
.../CacheSerializableTransactionsTest.java | 4 +-
.../CacheStartupInDeploymentModesTest.java | 4 +-
.../cache/CacheStopAndDestroySelfTest.java | 6 +-
.../CacheStoreUsageMultinodeAbstractTest.java | 10 +-
.../cache/CacheSwapUnswapGetTest.java | 4 +-
.../CacheSwapUnswapGetTestSmallQueueSize.java | 4 +-
.../processors/cache/CacheTxFastFinishTest.java | 4 +-
.../CacheTxNotAllowReadFromBackupTest.java | 4 +-
.../processors/cache/CrossCacheLockTest.java | 6 +-
.../cache/CrossCacheTxRandomOperationsTest.java | 6 +-
.../EntryVersionConsistencyReadThroughTest.java | 4 +-
...idAbstractCacheInterceptorRebalanceTest.java | 4 +-
...ridCacheAbstractByteArrayValuesSelfTest.java | 4 +-
.../GridCacheAbstractFailoverSelfTest.java | 14 +-
.../cache/GridCacheAbstractFullApiSelfTest.java | 20 +-
.../GridCacheAbstractLocalStoreSelfTest.java | 24 +-
.../GridCacheAbstractRemoveFailureTest.java | 6 +-
.../cache/GridCacheAbstractSelfTest.java | 10 +-
.../cache/GridCacheAbstractTxReadTest.java | 8 +-
...acheAbstractUsersAffinityMapperSelfTest.java | 4 +-
.../cache/GridCacheAffinityApiSelfTest.java | 4 +-
.../cache/GridCacheAffinityRoutingSelfTest.java | 6 +-
.../GridCacheAsyncOperationsLimitSelfTest.java | 4 +-
...eAtomicEntryProcessorDeploymentSelfTest.java | 4 +-
.../GridCacheAtomicMessageCountSelfTest.java | 4 +-
.../cache/GridCacheBasicApiAbstractTest.java | 4 +-
.../cache/GridCacheBasicStoreAbstractTest.java | 4 +-
...acheBasicStoreMultithreadedAbstractTest.java | 4 +-
.../cache/GridCacheClearAllSelfTest.java | 4 +-
.../cache/GridCacheClearLocallySelfTest.java | 10 +-
.../cache/GridCacheClearSelfTest.java | 4 +-
.../cache/GridCacheConcurrentMapSelfTest.java | 4 +-
.../cache/GridCacheConcurrentMapTest.java | 4 +-
.../GridCacheConcurrentTxMultiNodeTest.java | 18 +-
.../GridCacheConditionalDeploymentSelfTest.java | 4 +-
...idCacheConfigurationConsistencySelfTest.java | 4 +-
...ridCacheConfigurationValidationSelfTest.java | 46 +-
.../GridCacheDaemonNodeAbstractSelfTest.java | 4 +-
.../cache/GridCacheDeploymentSelfTest.java | 22 +-
.../cache/GridCacheEntryMemorySizeSelfTest.java | 4 +-
.../cache/GridCacheEntryVersionSelfTest.java | 4 +-
.../GridCacheFinishPartitionsSelfTest.java | 4 +-
...CacheFullTextQueryMultithreadedSelfTest.java | 4 +-
...idCacheGetAndTransformStoreAbstractTest.java | 4 +-
.../cache/GridCacheIncrementTransformTest.java | 4 +-
.../GridCacheInterceptorAbstractSelfTest.java | 8 +-
.../cache/GridCacheIteratorPerformanceTest.java | 4 +-
.../cache/GridCacheKeyCheckSelfTest.java | 4 +-
.../processors/cache/GridCacheLeakTest.java | 4 +-
.../cache/GridCacheLifecycleAwareSelfTest.java | 4 +-
.../cache/GridCacheLuceneQueryIndexTest.java | 4 +-
.../GridCacheMarshallerTxAbstractTest.java | 4 +-
.../GridCacheMarshallingNodeJoinSelfTest.java | 4 +-
.../cache/GridCacheMemoryModeSelfTest.java | 4 +-
...GridCacheMixedPartitionExchangeSelfTest.java | 4 +-
.../cache/GridCacheMultiUpdateLockSelfTest.java | 4 +-
...ridCacheMultinodeUpdateAbstractSelfTest.java | 4 +-
...inodeUpdateNearEnabledNoBackupsSelfTest.java | 4 +-
.../cache/GridCacheMvccManagerSelfTest.java | 4 +-
.../cache/GridCacheNestedTxAbstractTest.java | 4 +-
.../cache/GridCacheObjectToStringSelfTest.java | 4 +-
.../cache/GridCacheOffHeapCleanupTest.java | 4 +-
...HeapMultiThreadedUpdateAbstractSelfTest.java | 2 +-
.../GridCacheOffHeapTieredAbstractSelfTest.java | 4 +-
...heOffHeapTieredEvictionAbstractSelfTest.java | 4 +-
.../cache/GridCacheOffheapUpdateSelfTest.java | 4 +-
.../GridCacheOnCopyFlagAbstractSelfTest.java | 4 +-
.../GridCacheOrderedPreloadingSelfTest.java | 4 +-
.../cache/GridCacheP2PUndeploySelfTest.java | 4 +-
.../cache/GridCachePartitionedGetSelfTest.java | 4 +-
...hePartitionedProjectionAffinitySelfTest.java | 4 +-
.../cache/GridCachePartitionedWritesTest.java | 4 +-
.../GridCachePreloadingEvictionsSelfTest.java | 4 +-
.../cache/GridCachePutAllFailoverSelfTest.java | 10 +-
.../GridCacheQueryIndexingDisabledSelfTest.java | 4 +-
.../GridCacheQueryInternalKeysSelfTest.java | 4 +-
.../GridCacheReferenceCleanupSelfTest.java | 4 +-
.../cache/GridCacheReloadSelfTest.java | 4 +-
...ridCacheReplicatedSynchronousCommitTest.java | 6 +-
.../GridCacheReturnValueTransferSelfTest.java | 4 +-
.../cache/GridCacheSlowTxWarnTest.java | 4 +-
.../processors/cache/GridCacheStopSelfTest.java | 4 +-
...ridCacheStoreManagerDeserializationTest.java | 6 +-
.../cache/GridCacheStorePutxSelfTest.java | 4 +-
.../cache/GridCacheStoreValueBytesSelfTest.java | 4 +-
.../cache/GridCacheSwapCleanupTest.java | 4 +-
.../cache/GridCacheSwapPreloadSelfTest.java | 4 +-
.../cache/GridCacheSwapReloadSelfTest.java | 4 +-
...ridCacheSwapSpaceSpiConsistencySelfTest.java | 10 +-
...acheTcpClientDiscoveryMultiThreadedTest.java | 4 +-
.../GridCacheTtlManagerEvictionSelfTest.java | 4 +-
.../GridCacheTtlManagerNotificationTest.java | 4 +-
.../cache/GridCacheTtlManagerSelfTest.java | 4 +-
.../GridCacheValueBytesPreloadingSelfTest.java | 10 +-
...idCacheValueConsistencyAbstractSelfTest.java | 4 +-
.../GridCacheVariableTopologySelfTest.java | 4 +-
.../cache/GridCacheVersionMultinodeTest.java | 4 +-
.../GridCacheVersionTopologyChangeTest.java | 4 +-
.../cache/GridLocalIgniteSerializationTest.java | 10 +-
...ProjectionForCachesOnDaemonNodeSelfTest.java | 4 +-
.../IgniteCacheAbstractStopBusySelfTest.java | 6 +-
.../cache/IgniteCacheAbstractTest.java | 10 +-
...IgniteCacheBinaryEntryProcessorSelfTest.java | 6 +-
.../IgniteCacheBinaryObjectsScanSelfTest.java | 6 +-
...teCacheConfigurationDefaultTemplateTest.java | 4 +-
.../IgniteCacheConfigurationTemplateTest.java | 4 +-
.../IgniteCacheContainsKeyAbstractSelfTest.java | 8 +-
...niteCacheCopyOnReadDisabledAbstractTest.java | 4 +-
.../cache/IgniteCacheCreateRestartSelfTest.java | 4 +-
.../IgniteCacheEntryListenerAbstractTest.java | 8 +-
...niteCacheEntryListenerExpiredEventsTest.java | 4 +-
.../IgniteCacheEntryProcessorCallTest.java | 8 +-
.../IgniteCacheEntryProcessorNodeJoinTest.java | 4 +-
...niteCacheExpireAndUpdateConsistencyTest.java | 4 +-
...IgniteCacheGetCustomCollectionsSelfTest.java | 4 +-
.../cache/IgniteCacheIncrementTxTest.java | 6 +-
...gniteCacheInvokeReadThroughAbstractTest.java | 4 +-
...gniteCacheLoadRebalanceEvictionSelfTest.java | 4 +-
.../IgniteCacheManyAsyncOperationsTest.java | 6 +-
.../cache/IgniteCacheNearLockValueSelfTest.java | 6 +-
.../IgniteCacheP2pUnmarshallingErrorTest.java | 8 +-
...gniteCacheP2pUnmarshallingNearErrorTest.java | 4 +-
.../IgniteCacheP2pUnmarshallingTxErrorTest.java | 6 +-
.../IgniteCachePartitionMapUpdateTest.java | 4 +-
.../cache/IgniteCachePeekModesAbstractTest.java | 8 +-
.../cache/IgniteCachePutAllRestartTest.java | 4 +-
.../IgniteCachePutStackOverflowSelfTest.java | 4 +-
.../IgniteCacheReadThroughEvictionSelfTest.java | 2 +-
.../IgniteCacheReadThroughStoreCallTest.java | 4 +-
...iteCacheScanPredicateDeploymentSelfTest.java | 6 +-
.../cache/IgniteCacheSerializationSelfTest.java | 6 +-
.../cache/IgniteCacheStartStopLoadTest.java | 4 +-
.../cache/IgniteCacheStoreCollectionTest.java | 4 +-
.../IgniteCacheStoreValueAbstractTest.java | 8 +-
.../IgniteCacheTopologySafeGetSelfTest.java | 4 +-
.../cache/IgniteCacheTxPreloadNoWriteTest.java | 4 +-
.../cache/IgniteCachingProviderSelfTest.java | 8 +-
.../IgniteClientAffinityAssignmentSelfTest.java | 4 +-
.../IgniteDaemonNodeMarshallerCacheTest.java | 4 +-
.../cache/IgniteDynamicCacheAndNodeStop.java | 4 +-
.../cache/IgniteDynamicCacheFilterTest.java | 4 +-
...eDynamicCacheStartNoExchangeTimeoutTest.java | 6 +-
.../cache/IgniteDynamicCacheStartSelfTest.java | 4 +-
...niteDynamicCacheStartStopConcurrentTest.java | 4 +-
...niteDynamicCacheWithConfigStartSelfTest.java | 4 +-
.../IgniteDynamicClientCacheStartSelfTest.java | 8 +-
.../cache/IgniteInternalCacheTypesTest.java | 6 +-
...eMarshallerCacheConcurrentReadWriteTest.java | 4 +-
.../cache/IgniteOnePhaseCommitNearSelfTest.java | 10 +-
.../cache/IgnitePutAllLargeBatchSelfTest.java | 10 +-
...tAllUpdateNonPreloadedPartitionSelfTest.java | 10 +-
.../IgniteStartCacheInTransactionSelfTest.java | 4 +-
.../cache/IgniteStaticCacheStartSelfTest.java | 4 +-
.../cache/IgniteSystemCacheOnClientTest.java | 6 +-
...gniteTopologyValidatorAbstractCacheTest.java | 10 +-
...niteTopologyValidatorGridSplitCacheTest.java | 2 +-
.../processors/cache/IgniteTxAbstractTest.java | 4 +-
.../IgniteTxConcurrentGetAbstractTest.java | 4 +-
.../cache/IgniteTxConfigCacheSelfTest.java | 4 +-
.../IgniteTxExceptionAbstractSelfTest.java | 10 +-
.../cache/IgniteTxMultiNodeAbstractTest.java | 4 +-
.../cache/IgniteTxReentryAbstractSelfTest.java | 4 +-
.../IgniteTxStoreExceptionAbstractSelfTest.java | 8 +-
.../MarshallerCacheJobRunNodeRestartTest.java | 4 +-
.../cache/OffHeapTieredTransactionSelfTest.java | 4 +-
...heapCacheMetricsForClusterGroupSelfTest.java | 4 +-
.../cache/OffheapCacheOnClientsTest.java | 4 +-
...sExchangeOnDiscoveryHistoryOverflowTest.java | 2 +-
.../CacheKeepBinaryWithInterceptorTest.java | 4 +-
...ryDuplicateIndexObjectsAbstractSelfTest.java | 8 +-
...acheBinaryObjectUserClassloaderSelfTest.java | 10 +-
...naryObjectsAbstractDataStreamerSelfTest.java | 4 +-
...aryObjectsAbstractMultiThreadedSelfTest.java | 4 +-
.../GridCacheBinaryObjectsAbstractSelfTest.java | 4 +-
.../GridCacheBinaryStoreAbstractSelfTest.java | 4 +-
...yStoreBinariesSimpleNameMappersSelfTest.java | 4 +-
...ntNodeBinaryObjectMetadataMultinodeTest.java | 4 +-
...CacheClientNodeBinaryObjectMetadataTest.java | 6 +-
.../DataStreamProcessorBinarySelfTest.java | 4 +-
.../GridDataStreamerImplSelfTest.java | 4 +-
.../GridCacheAffinityRoutingBinarySelfTest.java | 4 +-
...sNearPartitionedByteArrayValuesSelfTest.java | 4 +-
...sPartitionedOnlyByteArrayValuesSelfTest.java | 4 +-
.../dht/GridCacheMemoryModeBinarySelfTest.java | 4 +-
...dCacheOffHeapTieredAtomicBinarySelfTest.java | 4 +-
.../GridCacheOffHeapTieredBinarySelfTest.java | 4 +-
...fHeapTieredEvictionAtomicBinarySelfTest.java | 4 +-
...acheOffHeapTieredEvictionBinarySelfTest.java | 4 +-
...IgniteCacheAbstractExecutionContextTest.java | 8 +-
...niteCacheContinuousExecutionContextTest.java | 4 +-
...IgniteCacheIsolatedExecutionContextTest.java | 4 +-
...niteCacheP2PDisableExecutionContextTest.java | 4 +-
.../IgniteCachePrivateExecutionContextTest.java | 4 +-
.../IgniteCacheSharedExecutionContextTest.java | 4 +-
...eAbstractDataStructuresFailoverSelfTest.java | 46 +-
...actQueueFailoverDataConsistencySelfTest.java | 4 +-
.../GridCacheQueueCleanupSelfTest.java | 4 +-
...GridCacheQueueMultiNodeAbstractSelfTest.java | 6 +-
.../GridCacheSequenceApiSelfAbstractTest.java | 4 +-
.../IgniteAtomicLongApiAbstractSelfTest.java | 4 +-
.../IgniteAtomicsAbstractTest.java | 4 +-
.../IgniteClientDataStructuresAbstractTest.java | 6 +-
.../IgniteCollectionAbstractTest.java | 4 +-
.../IgniteDataStructureUniqueNameTest.java | 4 +-
.../IgniteDataStructureWithJobTest.java | 4 +-
.../IgniteSemaphoreAbstractSelfTest.java | 2 +-
...SemaphoreFailoverSafeReleasePermitsTest.java | 4 +-
...achePartitionedAtomicSequenceTxSelfTest.java | 4 +-
...idCachePartitionedNodeRestartTxSelfTest.java | 4 +-
...PartitionedQueueCreateMultiNodeSelfTest.java | 4 +-
.../CacheAbstractRestartSelfTest.java | 6 +-
.../distributed/CacheAffinityEarlyTest.java | 4 +-
...acheAsyncOperationsFailoverAbstractTest.java | 8 +-
.../distributed/CacheAsyncOperationsTest.java | 6 +-
.../CacheGetFutureHangsSelfTest.java | 4 +-
.../CacheGetInsideLockChangingTopologyTest.java | 4 +-
...ffinityAssignmentNodeJoinValidationTest.java | 4 +-
.../CacheLateAffinityAssignmentTest.java | 59 +-
...CacheLoadingConcurrentGridStartSelfTest.java | 12 +-
.../CacheLockReleaseNodeLeaveTest.java | 4 +-
.../CachePutAllFailoverAbstractTest.java | 8 +-
.../CacheTryLockMultithreadedTest.java | 4 +-
...tractDistributedByteArrayValuesSelfTest.java | 4 +-
.../GridCacheAbstractJobExecutionTest.java | 8 +-
.../GridCacheAbstractNodeRestartSelfTest.java | 4 +-
...tractPartitionedByteArrayValuesSelfTest.java | 4 +-
.../GridCacheAbstractPrimarySyncSelfTest.java | 4 +-
.../GridCacheBasicOpAbstractTest.java | 4 +-
.../GridCacheClientModesAbstractSelfTest.java | 24 +-
...ientModesTcpClientDiscoveryAbstractTest.java | 4 +-
...acheEntrySetIterationPreloadingSelfTest.java | 4 +-
.../distributed/GridCacheEventAbstractTest.java | 2 +-
...heExpiredEntriesPreloadAbstractSelfTest.java | 4 +-
.../distributed/GridCacheLockAbstractTest.java | 4 +-
.../distributed/GridCacheMixedModeSelfTest.java | 12 +-
.../GridCacheMultiNodeAbstractTest.java | 4 +-
.../GridCacheMultiNodeLockAbstractTest.java | 4 +-
...dCacheMultithreadedFailoverAbstractTest.java | 8 +-
.../GridCacheNodeFailureAbstractTest.java | 4 +-
...ridCachePartitionNotLoadedEventSelfTest.java | 8 +-
...chePartitionedReloadAllAbstractSelfTest.java | 4 +-
.../GridCachePreloadEventsAbstractSelfTest.java | 4 +-
.../GridCachePreloadLifecycleAbstractTest.java | 4 +-
...GridCachePreloadRestartAbstractSelfTest.java | 4 +-
.../GridCacheTransformEventSelfTest.java | 4 +-
...yMetadataUpdateChangingTopologySelfTest.java | 11 +-
...niteBinaryMetadataUpdateNodeRestartTest.java | 4 +-
.../distributed/IgniteCache150ClientsTest.java | 6 +-
...micMessageRecoveryPairedConnectionsTest.java | 4 +-
...niteCacheClientNodeChangingTopologyTest.java | 15 +-
.../IgniteCacheClientNodeConcurrentStart.java | 6 +-
...teCacheClientNodePartitionsExchangeTest.java | 8 +-
.../IgniteCacheClientReconnectTest.java | 4 +-
...acheConnectionRecovery10ConnectionsTest.java | 4 +-
.../IgniteCacheConnectionRecoveryTest.java | 4 +-
.../IgniteCacheCreatePutMultiNodeSelfTest.java | 4 +-
.../distributed/IgniteCacheCreatePutTest.java | 4 +-
.../distributed/IgniteCacheGetRestartTest.java | 6 +-
.../distributed/IgniteCacheManyClientsTest.java | 4 +-
.../IgniteCacheMessageRecoveryAbstractTest.java | 4 +-
...eCacheMessageRecoveryIdleConnectionTest.java | 4 +-
.../IgniteCacheMessageWriteTimeoutTest.java | 4 +-
.../IgniteCacheNearOffheapGetSelfTest.java | 12 +-
.../IgniteCacheNearRestartRollbackSelfTest.java | 12 +-
.../IgniteCacheNodeJoinAbstractTest.java | 4 +-
.../distributed/IgniteCachePrimarySyncTest.java | 4 +-
.../IgniteCachePutGetRestartAbstractTest.java | 10 +-
.../IgniteCacheReadFromBackupTest.java | 4 +-
.../IgniteCacheServerNodeConcurrentStart.java | 4 +-
.../IgniteCacheSingleGetMessageTest.java | 4 +-
.../IgniteCacheSizeFailoverTest.java | 4 +-
.../IgniteCacheSystemTransactionsSelfTest.java | 4 +-
.../IgniteCacheTxFairAffinityNodeJoinTest.java | 4 +-
.../IgniteCacheTxIteratorSelfTest.java | 4 +-
...arDisabledFairAffinityPutGetRestartTest.java | 4 +-
.../IgniteCrossCacheTxStoreSelfTest.java | 16 +-
.../IgniteTxCachePrimarySyncTest.java | 4 +-
...teSynchronizationModesMultithreadedTest.java | 4 +-
...iteTxConsistencyRestartAbstractSelfTest.java | 10 +-
...xOriginatingNodeFailureAbstractSelfTest.java | 8 +-
...cOriginatingNodeFailureAbstractSelfTest.java | 8 +-
.../IgniteTxPreloadAbstractTest.java | 4 +-
...tPartitionedOnlyByteArrayValuesSelfTest.java | 4 +-
...heAbstractTransformWriteThroughSelfTest.java | 4 +-
.../dht/GridCacheAtomicFullApiSelfTest.java | 4 +-
.../dht/GridCacheAtomicNearCacheSelfTest.java | 18 +-
.../dht/GridCacheColocatedDebugTest.java | 4 +-
...eColocatedOptimisticTransactionSelfTest.java | 4 +-
...dCacheColocatedTxSingleThreadedSelfTest.java | 4 +-
.../dht/GridCacheDhtEntrySelfTest.java | 4 +-
.../dht/GridCacheDhtEntrySetSelfTest.java | 4 +-
...GridCacheDhtEvictionNearReadersSelfTest.java | 4 +-
.../dht/GridCacheDhtEvictionSelfTest.java | 4 +-
.../GridCacheDhtEvictionsDisabledSelfTest.java | 4 +-
.../dht/GridCacheDhtMappingSelfTest.java | 4 +-
.../dht/GridCacheDhtPreloadBigDataSelfTest.java | 4 +-
.../dht/GridCacheDhtPreloadDelayedSelfTest.java | 9 +-
.../GridCacheDhtPreloadDisabledSelfTest.java | 6 +-
.../GridCacheDhtPreloadMessageCountTest.java | 4 +-
...ridCacheDhtPreloadMultiThreadedSelfTest.java | 10 +-
.../dht/GridCacheDhtPreloadOffHeapSelfTest.java | 4 +-
.../dht/GridCacheDhtPreloadPerformanceTest.java | 4 +-
.../dht/GridCacheDhtPreloadPutGetSelfTest.java | 4 +-
.../dht/GridCacheDhtPreloadSelfTest.java | 16 +-
.../GridCacheDhtPreloadStartStopSelfTest.java | 8 +-
.../dht/GridCacheDhtPreloadUnloadSelfTest.java | 4 +-
.../dht/GridCacheDhtTxPreloadSelfTest.java | 4 +-
.../dht/GridCacheGlobalLoadTest.java | 4 +-
...ledFairAffinityMultiNodeFullApiSelfTest.java | 4 +-
...ePartitionedNearDisabledMetricsSelfTest.java | 8 +-
...idCachePartitionedPreloadEventsSelfTest.java | 4 +-
...dCachePartitionedTopologyChangeSelfTest.java | 6 +-
...itionedTxOriginatingNodeFailureSelfTest.java | 4 +-
...ridCachePartitionedUnloadEventsSelfTest.java | 4 +-
.../dht/GridCacheTxNodeFailureSelfTest.java | 10 +-
.../dht/GridNearCacheTxNodeFailureSelfTest.java | 4 +-
...gniteAtomicLongChangingTopologySelfTest.java | 4 +-
.../IgniteCacheCommitDelayTxRecoveryTest.java | 4 +-
.../dht/IgniteCacheConcurrentPutGetRemove.java | 4 +-
.../IgniteCacheCrossCacheTxFailoverTest.java | 6 +-
.../dht/IgniteCacheLockFailoverSelfTest.java | 8 +-
.../dht/IgniteCacheMultiTxLockSelfTest.java | 4 +-
...artitionedBackupNodeFailureRecoveryTest.java | 4 +-
...woBackupsPrimaryNodeFailureRecoveryTest.java | 4 +-
...ePrimaryNodeFailureRecoveryAbstractTest.java | 4 +-
.../IgniteCachePutRetryAbstractSelfTest.java | 4 +-
.../dht/IgniteCrossCacheTxSelfTest.java | 4 +-
.../AtomicPutAllChangingTopologyTest.java | 2 +-
.../atomic/GridCacheAtomicFailoverSelfTest.java | 4 +-
...eAtomicInvalidPartitionHandlingSelfTest.java | 6 +-
.../atomic/GridCacheAtomicPreloadSelfTest.java | 4 +-
...AtomicPrimaryWriteOrderFailoverSelfTest.java | 4 +-
...tionedMultiNodeLongTxTimeoutFullApiTest.java | 4 +-
...nabledMultiNodeLongTxTimeoutFullApiTest.java | 4 +-
...nlyFairAffinityMultiNodeFullApiSelfTest.java | 4 +-
...tomicClientOnlyMultiNodeFullApiSelfTest.java | 4 +-
...OnlyMultiNodeP2PDisabledFullApiSelfTest.java | 4 +-
...yOnReadDisabledMultiNodeFullApiSelfTest.java | 4 +-
...micFairAffinityMultiNodeFullApiSelfTest.java | 4 +-
...imaryWriteOrderMultiNodeFullApiSelfTest.java | 4 +-
...GridCacheAtomicMultiNodeFullApiSelfTest.java | 4 +-
...omicMultiNodeP2PDisabledFullApiSelfTest.java | 4 +-
...ledFairAffinityMultiNodeFullApiSelfTest.java | 4 +-
...eAtomicNearOnlyMultiNodeFullApiSelfTest.java | 4 +-
...OnlyMultiNodeP2PDisabledFullApiSelfTest.java | 4 +-
.../GridCacheAtomicOffHeapFullApiSelfTest.java | 4 +-
...heAtomicOffHeapMultiNodeFullApiSelfTest.java | 4 +-
...idCacheAtomicPartitionedMetricsSelfTest.java | 4 +-
...derFairAffinityMultiNodeFullApiSelfTest.java | 4 +-
...erNoStripedPoolMultiNodeFullApiSelfTest.java | 4 +-
.../near/GridCacheGetStoreErrorSelfTest.java | 4 +-
.../near/GridCacheNearEvictionSelfTest.java | 4 +-
.../near/GridCacheNearJobExecutionSelfTest.java | 4 +-
.../near/GridCacheNearMetricsSelfTest.java | 4 +-
.../near/GridCacheNearMultiGetSelfTest.java | 8 +-
.../near/GridCacheNearMultiNodeSelfTest.java | 4 +-
...nlyFairAffinityMultiNodeFullApiSelfTest.java | 4 +-
...idCacheNearOnlyMultiNodeFullApiSelfTest.java | 10 +-
...OnlyMultiNodeP2PDisabledFullApiSelfTest.java | 4 +-
.../near/GridCacheNearOnlyTopologySelfTest.java | 4 +-
.../GridCacheNearPartitionedClearSelfTest.java | 4 +-
.../GridCacheNearReaderPreloadSelfTest.java | 6 +-
.../near/GridCacheNearReadersSelfTest.java | 4 +-
.../near/GridCacheNearTxForceKeyTest.java | 4 +-
.../near/GridCacheNearTxMultiNodeSelfTest.java | 4 +-
.../near/GridCacheNearTxPreloadSelfTest.java | 4 +-
...AffinityExcludeNeighborsPerformanceTest.java | 4 +-
...rtitionedAffinityHashIdResolverSelfTest.java | 4 +-
.../GridCachePartitionedAffinitySelfTest.java | 20 +-
.../near/GridCachePartitionedBasicApiTest.java | 4 +-
.../GridCachePartitionedBasicOpSelfTest.java | 4 +-
...ePartitionedBasicStoreMultiNodeSelfTest.java | 4 +-
...ionedClientOnlyNoPrimaryFullApiSelfTest.java | 4 +-
...yOnReadDisabledMultiNodeFullApiSelfTest.java | 4 +-
.../near/GridCachePartitionedEventSelfTest.java | 2 +-
.../GridCachePartitionedEvictionSelfTest.java | 4 +-
...titionedExplicitLockNodeFailureSelfTest.java | 4 +-
...GridCachePartitionedFilteredPutSelfTest.java | 4 +-
.../GridCachePartitionedFullApiSelfTest.java | 8 +-
...idCachePartitionedHitsAndMissesSelfTest.java | 4 +-
...LateAffDisabledMultiNodeFullApiSelfTest.java | 4 +-
.../GridCachePartitionedLoadCacheSelfTest.java | 4 +-
.../near/GridCachePartitionedLockSelfTest.java | 4 +-
.../GridCachePartitionedMetricsSelfTest.java | 8 +-
...achePartitionedMultiNodeCounterSelfTest.java | 79 +-
...achePartitionedMultiNodeFullApiSelfTest.java | 4 +-
...onedMultiNodeP2PDisabledFullApiSelfTest.java | 4 +-
.../GridCachePartitionedMultiNodeSelfTest.java | 4 +-
...ePartitionedMultiThreadedPutGetSelfTest.java | 4 +-
.../near/GridCachePartitionedNestedTxTest.java | 4 +-
...edNoStripedPoolMultiNodeFullApiSelfTest.java | 4 +-
...GridCachePartitionedNodeFailureSelfTest.java | 4 +-
.../GridCachePartitionedNodeRestartTest.java | 4 +-
...ePartitionedOptimisticTxNodeRestartTest.java | 4 +-
...achePartitionedPreloadLifecycleSelfTest.java | 4 +-
.../GridCachePartitionedStorePutSelfTest.java | 4 +-
...GridCachePartitionedTxConcurrentGetTest.java | 4 +-
...GridCachePartitionedTxMultiNodeSelfTest.java | 4 +-
...CachePartitionedTxMultiThreadedSelfTest.java | 4 +-
.../GridCachePartitionedTxSalvageSelfTest.java | 4 +-
...achePartitionedTxSingleThreadedSelfTest.java | 4 +-
.../GridCachePartitionedTxTimeoutSelfTest.java | 4 +-
.../near/GridCachePutArrayValueSelfTest.java | 4 +-
...idCacheRendezvousAffinityClientSelfTest.java | 4 +-
.../near/GridPartitionedBackupLoadSelfTest.java | 4 +-
.../near/IgniteCacheNearOnlyTxTest.java | 6 +-
.../near/IgniteCacheNearTxRollbackTest.java | 4 +-
.../near/NearCacheMultithreadedUpdateTest.java | 4 +-
.../near/NearCachePutAllMultinodeTest.java | 4 +-
.../near/NearCacheSyncUpdateTest.java | 4 +-
.../near/NoneRebalanceModeSelfTest.java | 4 +-
...cingDelayedPartitionMapExchangeSelfTest.java | 4 +-
.../GridCacheRebalancingAsyncSelfTest.java | 4 +-
.../GridCacheRebalancingOrderingTest.java | 6 +-
.../GridCacheRebalancingSyncCheckDataTest.java | 4 +-
.../GridCacheRebalancingSyncSelfTest.java | 6 +-
...eRebalancingUnmarshallingFailedSelfTest.java | 4 +-
...xcludeNeighborsMultiNodeFullApiSelfTest.java | 4 +-
...tedFairAffinityMultiNodeFullApiSelfTest.java | 4 +-
...xcludeNeighborsMultiNodeFullApiSelfTest.java | 4 +-
...dezvousAffinityMultiNodeFullApiSelfTest.java | 4 +-
...stractReplicatedByteArrayValuesSelfTest.java | 4 +-
...ridCacheAtomicReplicatedMetricsSelfTest.java | 4 +-
...nedFairAffinityMultiNodeFullApiSelfTest.java | 4 +-
...eplicatedAtomicMultiNodeFullApiSelfTest.java | 4 +-
.../GridCacheReplicatedBasicApiTest.java | 4 +-
.../GridCacheReplicatedBasicOpSelfTest.java | 4 +-
.../GridCacheReplicatedEvictionSelfTest.java | 4 +-
.../GridCacheReplicatedFullApiSelfTest.java | 8 +-
.../GridCacheReplicatedJobExecutionTest.java | 4 +-
.../GridCacheReplicatedMarshallerTxTest.java | 4 +-
.../GridCacheReplicatedMetricsSelfTest.java | 4 +-
...atedMultiNodeP2PDisabledFullApiSelfTest.java | 4 +-
.../GridCacheReplicatedMultiNodeSelfTest.java | 4 +-
.../GridCacheReplicatedNodeFailureSelfTest.java | 4 +-
.../GridCacheReplicatedTxConcurrentGetTest.java | 4 +-
...GridCacheReplicatedTxMultiNodeBasicTest.java | 4 +-
...dCacheReplicatedTxMultiThreadedSelfTest.java | 4 +-
...CacheReplicatedTxSingleThreadedSelfTest.java | 4 +-
.../GridCacheReplicatedTxTimeoutSelfTest.java | 4 +-
...idCacheReplicatedUnswapAdvancedSelfTest.java | 6 +-
.../GridCacheSyncReplicatedPreloadSelfTest.java | 4 +-
.../replicated/GridReplicatedTxPreloadTest.java | 4 +-
.../IgniteCacheSyncRebalanceModeSelfTest.java | 4 +-
...CacheReplicatedPreloadLifecycleSelfTest.java | 4 +-
...idCacheReplicatedPreloadOffHeapSelfTest.java | 4 +-
.../GridCacheReplicatedPreloadSelfTest.java | 14 +-
...eplicatedPreloadStartStopEventsSelfTest.java | 4 +-
.../cache/eviction/EvictionAbstractTest.java | 4 +-
.../GridCacheBatchEvictUnswapSelfTest.java | 4 +-
...heConcurrentEvictionConsistencySelfTest.java | 4 +-
.../GridCacheConcurrentEvictionsSelfTest.java | 4 +-
.../GridCacheDistributedEvictionsSelfTest.java | 4 +-
.../GridCacheEmptyEntriesAbstractSelfTest.java | 4 +-
.../GridCacheEvictionFilterSelfTest.java | 4 +-
.../GridCacheEvictionLockUnlockSelfTest.java | 4 +-
.../GridCacheEvictionTouchSelfTest.java | 4 +-
...cheSynchronousEvictionsFailoverSelfTest.java | 4 +-
.../lru/LruNearEvictionPolicySelfTest.java | 4 +-
.../LruNearOnlyNearEvictionPolicySelfTest.java | 4 +-
.../SortedEvictionPolicyPerformanceTest.java | 4 +-
.../IgniteCacheClientNearCacheExpiryTest.java | 6 +-
.../IgniteCacheExpiryPolicyAbstractTest.java | 4 +-
...eCacheExpiryPolicyWithStoreAbstractTest.java | 4 +-
.../expiry/IgniteCacheTtlCleanupSelfTest.java | 4 +-
.../IgniteCacheLoadAllAbstractTest.java | 4 +-
...iteCacheNoLoadPreviousValueAbstractTest.java | 8 +-
.../IgniteCacheNoReadThroughAbstractTest.java | 8 +-
.../IgniteCacheNoWriteThroughAbstractTest.java | 8 +-
...IgniteCacheStoreNodeRestartAbstractTest.java | 6 +-
.../IgniteCacheStoreSessionAbstractTest.java | 6 +-
...acheStoreSessionWriteBehindAbstractTest.java | 6 +-
...dCacheAtomicLocalMetricsNoStoreSelfTest.java | 4 +-
.../GridCacheAtomicLocalMetricsSelfTest.java | 4 +-
.../local/GridCacheLocalBasicApiSelfTest.java | 4 +-
.../GridCacheLocalByteArrayValuesSelfTest.java | 4 +-
.../local/GridCacheLocalFullApiSelfTest.java | 8 +-
.../local/GridCacheLocalLoadAllSelfTest.java | 4 +-
.../local/GridCacheLocalMetricsSelfTest.java | 8 +-
.../GridCacheLocalTxMultiThreadedSelfTest.java | 4 +-
.../GridCacheLocalTxSingleThreadedSelfTest.java | 4 +-
...LocalCacheOffHeapAndSwapMetricsSelfTest.java | 4 +-
.../BinaryTxCacheLocalEntriesSelfTest.java | 8 +-
.../GridCacheQueryTransformerSelfTest.java | 4 +-
.../GridCacheSwapScanQueryAbstractSelfTest.java | 4 +-
.../cache/query/IndexingSpiQuerySelfTest.java | 2 +-
.../cache/query/IndexingSpiQueryTxSelfTest.java | 8 +-
.../continuous/CacheContinuousBatchAckTest.java | 12 +-
...heContinuousBatchForceServerModeAckTest.java | 8 +-
...eContinuousQueryAsyncFilterListenerTest.java | 4 +-
...CacheContinuousQueryCounterAbstractTest.java | 8 +-
...acheContinuousQueryExecuteInPrimaryTest.java | 4 +-
...ContinuousQueryFailoverAbstractSelfTest.java | 4 +-
.../CacheContinuousQueryLostPartitionTest.java | 6 +-
...ontinuousQueryOperationFromCallbackTest.java | 4 +-
.../CacheContinuousQueryOperationP2PTest.java | 4 +-
.../CacheContinuousQueryOrderingEventTest.java | 4 +-
...acheContinuousQueryRandomOperationsTest.java | 4 +-
.../CacheContinuousQueryVariationsTest.java | 6 +-
...eEntryProcessorExternalizableFailedTest.java | 4 +-
.../CacheEntryProcessorNonSerializableTest.java | 4 +-
...CacheKeepBinaryIterationSwapEnabledTest.java | 4 +-
.../CacheKeepBinaryIterationTest.java | 4 +-
.../ClientReconnectContinuousQueryTest.java | 2 +-
...yRemoteFilterMissingInClassPathSelfTest.java | 4 +-
...ridCacheContinuousQueryAbstractSelfTest.java | 10 +-
.../GridCacheContinuousQueryConcurrentTest.java | 6 +-
...eContinuousQueryMultiNodesFilteringTest.java | 10 +-
...eContinuousQueryReplicatedTxOneNodeTest.java | 4 +-
...niteCacheContinuousQueryBackupQueueTest.java | 4 +-
...CacheContinuousQueryClientReconnectTest.java | 4 +-
.../IgniteCacheContinuousQueryClientTest.java | 4 +-
...eCacheContinuousQueryImmutableEntryTest.java | 4 +-
...teCacheContinuousQueryNoUnsubscribeTest.java | 4 +-
...IgniteCacheContinuousQueryReconnectTest.java | 4 +-
...BehindStorePartitionedMultiNodeSelfTest.java | 4 +-
.../IgniteCacheWriteBehindNoUpdateSelfTest.java | 4 +-
...CacheClientWriteBehindStoreAbstractTest.java | 12 +-
.../TxDeadlockDetectionNoHangsTest.java | 4 +-
.../transactions/TxDeadlockDetectionTest.java | 4 +-
...timisticDeadlockDetectionCrossCacheTest.java | 4 +-
.../TxOptimisticDeadlockDetectionTest.java | 4 +-
...simisticDeadlockDetectionCrossCacheTest.java | 4 +-
.../TxPessimisticDeadlockDetectionTest.java | 4 +-
...edEntryPartitionedAtomicOffHeapSelfTest.java | 4 +-
...PartitionedTransactionalOffHeapSelfTest.java | 4 +-
...nedEntryReplicatedAtomicOffHeapSelfTest.java | 4 +-
...yReplicatedTransactionalOffHeapSelfTest.java | 4 +-
.../clock/GridTimeSyncProcessorSelfTest.java | 4 +-
.../closure/GridClosureProcessorRemoteTest.java | 2 +-
.../closure/GridClosureProcessorSelfTest.java | 4 +-
.../closure/GridClosureSerializationTest.java | 4 +-
.../cluster/GridAddressResolverSelfTest.java | 6 +-
...ComputeJobExecutionErrorToLogManualTest.java | 4 +-
.../compute/PublicThreadpoolStarvationTest.java | 4 +-
.../continuous/GridEventConsumeSelfTest.java | 4 +-
.../continuous/GridMessageListenSelfTest.java | 4 +-
.../IgniteNoCustomEventsOnNodeStart.java | 4 +-
.../DataStreamProcessorSelfTest.java | 10 +-
.../datastreamer/DataStreamerImplSelfTest.java | 4 +-
.../DataStreamerMultiThreadedSelfTest.java | 4 +-
.../DataStreamerMultinodeCreateCacheTest.java | 4 +-
.../datastreamer/DataStreamerTimeoutTest.java | 4 +-
.../DataStreamerUpdateAfterLoadTest.java | 4 +-
.../IgniteDataStreamerPerformanceTest.java | 4 +-
.../igfs/IgfsAbstractBaseSelfTest.java | 6 +-
.../igfs/IgfsBackupFailoverSelfTest.java | 13 +-
...sCachePerBlockLruEvictionPolicySelfTest.java | 4 +-
.../processors/igfs/IgfsCacheSelfTest.java | 4 +-
.../processors/igfs/IgfsCommonAbstractTest.java | 8 +-
.../igfs/IgfsDataManagerSelfTest.java | 4 +-
.../processors/igfs/IgfsMaxSizeSelfTest.java | 6 +-
.../igfs/IgfsMetaManagerSelfTest.java | 4 +-
.../processors/igfs/IgfsMetricsSelfTest.java | 4 +-
.../processors/igfs/IgfsModesSelfTest.java | 4 +-
.../processors/igfs/IgfsOneClientNodeTest.java | 4 +-
.../processors/igfs/IgfsProcessorSelfTest.java | 4 +-
.../igfs/IgfsProcessorValidationSelfTest.java | 4 +-
...IpcEndpointRegistrationAbstractSelfTest.java | 4 +-
.../processors/igfs/IgfsSizeSelfTest.java | 4 +-
.../processors/igfs/IgfsStartCacheTest.java | 2 +-
.../processors/igfs/IgfsStreamsSelfTest.java | 4 +-
.../processors/igfs/IgfsTaskSelfTest.java | 2 +-
.../IgfsAbstractRecordResolverSelfTest.java | 2 +-
...niteMessagingConfigVariationFullApiTest.java | 6 +-
.../odbc/OdbcProcessorValidationSelfTest.java | 2 +-
.../service/ClosureServiceClientsNodesTest.java | 10 +-
.../service/GridServiceClientNodeTest.java | 4 +-
.../GridServiceProcessorAbstractSelfTest.java | 4 +-
...GridServiceProxyClientReconnectSelfTest.java | 6 +-
.../GridServiceProxyNodeStopSelfTest.java | 4 +-
.../GridServiceSerializationSelfTest.java | 6 +-
...gniteServiceConfigVariationsFullApiTest.java | 4 +-
...yment2ClassLoadersDefaultMarshallerTest.java | 18 +-
...oymentClassLoadingDefaultMarshallerTest.java | 16 +-
.../IgniteServiceDynamicCachesSelfTest.java | 4 +-
...gniteServiceProxyTimeoutInitializedTest.java | 6 +-
.../service/IgniteServiceReassignmentTest.java | 4 +-
.../ServicePredicateAccessCacheTest.java | 4 +-
.../ipc/shmem/IpcSharedMemorySpaceSelfTest.java | 6 +-
.../ipc/shmem/IpcSharedMemoryUtilsSelfTest.java | 2 +-
.../internal/util/nio/GridNioSelfTest.java | 2 +-
.../internal/util/nio/GridNioSslSelfTest.java | 2 +-
.../nio/IgniteExceptionInNioWorkerSelfTest.java | 4 +-
.../loadtests/GridCacheMultiNodeLoadTest.java | 4 +-
.../communication/GridIoManagerBenchmark0.java | 4 +-
.../GridTcpCommunicationBenchmark.java | 2 +-
.../GridCachePartitionedAtomicLongLoadTest.java | 4 +-
.../multisplit/GridMultiSplitsLoadTest.java | 4 +-
.../GridMultiSplitsRedeployLoadTest.java | 2 +-
...ridSingleSplitsNewNodesAbstractLoadTest.java | 8 +-
.../GridSingleSplitsRedeployLoadTest.java | 2 +-
.../direct/session/GridSessionLoadTest.java | 2 +-
.../direct/stealing/GridStealingLoadTest.java | 4 +-
.../ignite/loadtests/job/GridJobLoadTest.java | 6 +-
.../loadtests/nio/GridNioBenchmarkTest.java | 2 +-
...namicProxySerializationMultiJvmSelfTest.java | 4 +-
.../marshaller/GridMarshallerAbstractTest.java | 15 +-
.../OptimizedMarshallerNodeFailoverTest.java | 4 +-
...GridMessagingNoPeerClassLoadingSelfTest.java | 4 +-
.../ignite/messaging/GridMessagingSelfTest.java | 4 +-
.../IgniteMessagingWithClientTest.java | 6 +-
.../p2p/GridAbstractMultinodeRedeployTest.java | 4 +-
.../GridP2PContinuousDeploymentSelfTest.java | 18 +-
.../GridP2PDifferentClassLoaderSelfTest.java | 4 +-
.../p2p/GridP2PDoubleDeploymentSelfTest.java | 4 +-
.../p2p/GridP2PHotRedeploymentSelfTest.java | 4 +-
.../p2p/GridP2PJobClassLoaderSelfTest.java | 4 +-
.../p2p/GridP2PLocalDeploymentSelfTest.java | 4 +-
.../GridP2PMissedResourceCacheSizeSelfTest.java | 4 +-
.../ignite/p2p/GridP2PNodeLeftSelfTest.java | 4 +-
.../p2p/GridP2PRecursionTaskSelfTest.java | 4 +-
.../p2p/GridP2PRemoteClassLoadersSelfTest.java | 4 +-
.../p2p/GridP2PSameClassLoaderSelfTest.java | 4 +-
.../ignite/p2p/GridP2PTimeoutSelfTest.java | 4 +-
.../ignite/p2p/GridP2PUndeploySelfTest.java | 6 +-
.../PlatformJavaObjectFactoryProxySelfTest.java | 2 +-
.../ignite/platform/PlatformStopIgniteTask.java | 10 +-
...SessionCancelSiblingsFromFutureSelfTest.java | 6 +-
...ridSessionCancelSiblingsFromJobSelfTest.java | 6 +-
...idSessionCancelSiblingsFromTaskSelfTest.java | 6 +-
.../GridSessionCheckpointAbstractSelfTest.java | 2 +-
.../GridSessionCollisionSpiSelfTest.java | 2 +-
...idSessionFutureWaitJobAttributeSelfTest.java | 6 +-
...dSessionFutureWaitTaskAttributeSelfTest.java | 6 +-
.../session/GridSessionJobFailoverSelfTest.java | 4 +-
...GridSessionJobWaitTaskAttributeSelfTest.java | 6 +-
.../ignite/session/GridSessionLoadSelfTest.java | 4 +-
.../GridSessionSetFutureAttributeSelfTest.java | 6 +-
...nSetFutureAttributeWaitListenerSelfTest.java | 6 +-
.../GridSessionSetJobAttributeSelfTest.java | 6 +-
...sionSetJobAttributeWaitListenerSelfTest.java | 6 +-
.../GridSessionSetTaskAttributeSelfTest.java | 6 +-
...GridSessionTaskWaitJobAttributeSelfTest.java | 6 +-
.../GridSessionWaitAttributeSelfTest.java | 8 +-
.../spi/GridSpiStartStopAbstractTest.java | 2 +-
.../spi/GridTcpSpiForwardingSelfTest.java | 10 +-
.../CacheCheckpointSpiSecondCacheSelfTest.java | 4 +-
.../GridAbstractCommunicationSelfTest.java | 4 +-
.../communication/GridCacheMessageSelfTest.java | 4 +-
.../tcp/GridCacheDhtLockBackupSelfTest.java | 4 +-
.../GridTcpCommunicationSpiAbstractTest.java | 4 +-
...mmunicationSpiConcurrentConnectSelfTest.java | 4 +-
.../GridTcpCommunicationSpiConfigSelfTest.java | 2 +-
.../tcp/GridTcpCommunicationSpiLanTest.java | 2 +-
...cpCommunicationSpiMultithreadedSelfTest.java | 4 +-
...dTcpCommunicationSpiRecoveryAckSelfTest.java | 4 +-
...GridTcpCommunicationSpiRecoverySelfTest.java | 4 +-
.../tcp/IgniteCacheSslStartStopSelfTest.java | 4 +-
...CommunicationRecoveryAckClosureSelfTest.java | 4 +-
.../discovery/AbstractDiscoverySelfTest.java | 2 +-
...gniteClientReconnectMassiveShutdownTest.java | 4 +-
...pClientDiscoveryMarshallerCheckSelfTest.java | 6 +-
.../tcp/TcpClientDiscoverySpiMulticastTest.java | 4 +-
.../tcp/TcpClientDiscoverySpiSelfTest.java | 16 +-
.../tcp/TcpDiscoveryConcurrentStartTest.java | 4 +-
.../TcpDiscoveryMarshallerCheckSelfTest.java | 4 +-
.../tcp/TcpDiscoveryMultiThreadedTest.java | 8 +-
...DiscoveryNodeConfigConsistentIdSelfTest.java | 6 +-
.../TcpDiscoveryNodeConsistentIdSelfTest.java | 4 +-
.../discovery/tcp/TcpDiscoveryRestartTest.java | 4 +-
.../spi/discovery/tcp/TcpDiscoverySelfTest.java | 36 +-
.../tcp/TcpDiscoverySnapshotHistoryTest.java | 4 +-
.../tcp/TcpDiscoverySpiConfigSelfTest.java | 2 +-
.../tcp/TcpDiscoverySpiWildcardSelfTest.java | 4 +-
.../discovery/tcp/TcpDiscoverySslSelfTest.java | 4 +-
.../vm/TcpDiscoveryVmIpFinderSelfTest.java | 2 +-
.../GridInternalTasksLoadBalancingSelfTest.java | 6 +-
.../GridSwapSpaceSpiConsistencySelfTest.java | 12 +-
.../inmemory/GridTestSwapSpaceSpi.java | 2 +-
.../noop/GridNoopSwapSpaceSpiSelfTest.java | 4 +-
.../ignite/startup/GridVmNodesStarter.java | 4 +-
.../stream/socket/SocketStreamerSelfTest.java | 4 +-
.../ignite/testframework/GridTestNode.java | 2 +-
.../ignite/testframework/GridTestUtils.java | 10 +-
.../configvariations/ConfigFactory.java | 8 +-
.../ConfigVariationsFactory.java | 6 +-
.../testframework/junits/GridAbstractTest.java | 185 ++--
...IgniteCacheConfigVariationsAbstractTest.java | 12 +-
.../IgniteConfigVariationsAbstractTest.java | 12 +-
.../junits/common/GridAbstractExamplesTest.java | 2 +-
.../junits/common/GridCommonAbstractTest.java | 15 +-
.../common/GridRollingRestartAbstractTest.java | 6 +-
.../junits/multijvm/IgniteProcessProxy.java | 51 +-
.../junits/spi/GridSpiAbstractConfigTest.java | 2 +-
.../junits/spi/GridSpiAbstractTest.java | 4 +-
.../util/AttributeNodeFilterSelfTest.java | 4 +-
.../util/GridTopologyHeapSizeSelfTest.java | 4 +-
.../h2/GridBinaryH2IndexingGeoSelfTest.java | 4 +-
.../hadoop/impl/igfs/HadoopIgfsInProc.java | 2 +-
.../hadoop/shuffle/HadoopShuffle.java | 2 +-
.../hadoop/shuffle/HadoopShuffleJob.java | 6 +-
.../HadoopEmbeddedTaskExecutor.java | 2 +-
.../taskexecutor/HadoopExecutorService.java | 10 +-
.../external/HadoopExternalTaskExecutor.java | 2 +-
.../HadoopExternalCommunication.java | 20 +-
.../impl/HadoopAbstractMapReduceTest.java | 6 +-
.../hadoop/impl/HadoopAbstractSelfTest.java | 10 +-
.../hadoop/impl/HadoopGroupingTest.java | 4 +-
.../hadoop/impl/HadoopJobTrackerSelfTest.java | 4 +-
.../impl/HadoopMapReduceEmbeddedSelfTest.java | 4 +-
.../impl/HadoopNoHadoopMapReduceTest.java | 4 +-
.../hadoop/impl/HadoopSortingExternalTest.java | 8 +-
.../hadoop/impl/HadoopSortingTest.java | 4 +-
.../impl/HadoopTaskExecutionSelfTest.java | 4 +-
.../hadoop/impl/HadoopTeraSortTest.java | 4 +-
.../hadoop/impl/HadoopValidationSelfTest.java | 4 +-
.../HadoopClientProtocolEmbeddedSelfTest.java | 4 +-
...opClientProtocolMultipleServersSelfTest.java | 4 +-
.../impl/igfs/Hadoop1DualAbstractTest.java | 6 +-
.../igfs/HadoopFIleSystemFactorySelfTest.java | 2 +-
.../HadoopIgfs20FileSystemAbstractSelfTest.java | 28 +-
...Igfs20FileSystemLoopbackPrimarySelfTest.java | 4 +-
...oopIgfs20FileSystemShmemPrimarySelfTest.java | 4 +-
.../igfs/HadoopIgfsDualAbstractSelfTest.java | 6 +-
...oopSecondaryFileSystemConfigurationTest.java | 22 +-
.../igfs/IgfsNearOnlyMultiNodeSelfTest.java | 12 +-
.../IgniteHadoopFileSystemAbstractSelfTest.java | 32 +-
...niteHadoopFileSystemClientBasedOpenTest.java | 6 +-
.../IgniteHadoopFileSystemClientSelfTest.java | 4 +-
...IgniteHadoopFileSystemHandshakeSelfTest.java | 99 +-
.../IgniteHadoopFileSystemIpcCacheSelfTest.java | 6 +-
...niteHadoopFileSystemLoggerStateSelfTest.java | 2 +-
...adoopFileSystemLoopbackAbstractSelfTest.java | 4 +-
...oopbackExternalToClientAbstractSelfTest.java | 4 +-
...condaryFileSystemInitializationSelfTest.java | 4 +-
...teHadoopFileSystemShmemAbstractSelfTest.java | 4 +-
...emShmemExternalToClientAbstractSelfTest.java | 4 +-
.../HadoopExternalTaskExecutionSelfTest.java | 16 +-
.../cache/hibernate/HibernateRegionFactory.java | 25 +-
.../src/test/config/factory-cache1.xml | 2 +-
.../HibernateL2CacheConfigurationSelfTest.java | 20 +-
.../hibernate/HibernateL2CacheSelfTest.java | 24 +-
.../HibernateL2CacheTransactionalSelfTest.java | 4 +-
.../query/h2/DmlStatementsProcessor.java | 6 +-
.../processors/query/h2/IgniteH2Indexing.java | 20 +-
.../query/h2/dml/UpdatePlanBuilder.java | 4 +-
...CacheAbstractQueryDetailMetricsSelfTest.java | 4 +-
.../CacheAbstractQueryMetricsSelfTest.java | 4 +-
.../CacheBinaryKeyConcurrentQueryTest.java | 4 +-
.../cache/CacheIndexStreamerTest.java | 4 +-
.../CacheOffheapBatchIndexingBaseTest.java | 4 +-
.../cache/CacheQueryBuildValueTest.java | 4 +-
.../cache/CacheQueryNewClientSelfTest.java | 4 +-
.../CacheRandomOperationsMultithreadedTest.java | 4 +-
...CacheScanPartitionQueryFallbackSelfTest.java | 6 +-
.../cache/CacheSqlQueryValueCopySelfTest.java | 6 +-
.../ClientReconnectAfterClusterRestartTest.java | 6 +-
.../cache/GridCacheCrossCacheQuerySelfTest.java | 4 +-
.../cache/GridCacheOffHeapAndSwapSelfTest.java | 4 +-
.../cache/GridCacheOffHeapSelfTest.java | 4 +-
.../GridCacheOffheapIndexEntryEvictTest.java | 4 +-
.../cache/GridCacheOffheapIndexGetSelfTest.java | 4 +-
.../GridCacheQueryIndexDisabledSelfTest.java | 4 +-
.../GridCacheQuerySerializationSelfTest.java | 4 +-
.../cache/GridCacheQuerySimpleBenchmark.java | 4 +-
.../processors/cache/GridCacheSwapSelfTest.java | 4 +-
.../cache/GridIndexingWithNoopSwapSelfTest.java | 4 +-
.../IgniteBinaryObjectFieldsQuerySelfTest.java | 6 +-
.../IgniteBinaryObjectQueryArgumentsTest.java | 4 +-
.../IgniteCacheAbstractFieldsQuerySelfTest.java | 4 +-
...niteCacheAbstractInsertSqlQuerySelfTest.java | 4 +-
.../cache/IgniteCacheAbstractQuerySelfTest.java | 6 +-
.../IgniteCacheAbstractSqlDmlQuerySelfTest.java | 4 +-
.../IgniteCacheCollocatedQuerySelfTest.java | 4 +-
...acheConfigurationPrimitiveTypesSelfTest.java | 4 +-
.../IgniteCacheCrossCacheJoinRandomTest.java | 4 +-
...acheDistributedJoinCollocatedAndNotTest.java | 4 +-
...acheDistributedJoinCustomAffinityMapper.java | 4 +-
.../IgniteCacheDistributedJoinNoIndexTest.java | 4 +-
...ributedJoinPartitionedAndReplicatedTest.java | 4 +-
...CacheDistributedJoinQueryConditionsTest.java | 4 +-
.../cache/IgniteCacheDistributedJoinTest.java | 4 +-
...cheDuplicateEntityConfigurationSelfTest.java | 4 +-
.../IgniteCacheFieldsQueryNoDataSelfTest.java | 4 +-
...teCacheFullTextQueryNodeJoiningSelfTest.java | 4 +-
.../IgniteCacheInsertSqlQuerySelfTest.java | 4 +-
...PartitionedAndReplicatedCollocationTest.java | 4 +-
...teCacheJoinPartitionedAndReplicatedTest.java | 4 +-
...IgniteCacheJoinQueryWithAffinityKeyTest.java | 4 +-
.../cache/IgniteCacheLargeResultSelfTest.java | 4 +-
...eLockPartitionOnAffinityRunAbstractTest.java | 4 +-
...PartitionOnAffinityRunAtomicCacheOpTest.java | 4 +-
...titionOnAffinityRunWithCollisionSpiTest.java | 6 +-
.../cache/IgniteCacheNoClassQuerySelfTest.java | 4 +-
.../cache/IgniteCacheOffheapEvictQueryTest.java | 4 +-
.../cache/IgniteCacheOffheapIndexScanTest.java | 4 +-
...CacheOffheapTieredMultithreadedSelfTest.java | 4 +-
...niteCacheP2pUnmarshallingQueryErrorTest.java | 4 +-
...hePartitionedQueryMultiThreadedSelfTest.java | 4 +-
...IgniteCachePrimitiveFieldsQuerySelfTest.java | 4 +-
.../cache/IgniteCacheQueriesLoadTest1.java | 4 +-
.../IgniteCacheQueryH2IndexingLeakTest.java | 4 +-
.../cache/IgniteCacheQueryLoadSelfTest.java | 8 +-
.../IgniteCacheQueryMultiThreadedSelfTest.java | 4 +-
...gniteCacheSqlQueryMultiThreadedSelfTest.java | 4 +-
.../IgniteCacheStarvationOnRebalanceTest.java | 4 +-
...ClientReconnectCacheQueriesFailoverTest.java | 4 +-
.../cache/IgniteClientReconnectQueriesTest.java | 4 +-
.../cache/IgniteCrossCachesJoinsQueryTest.java | 4 +-
.../cache/SqlFieldsQuerySelfTest.java | 4 +-
...lientQueryReplicatedNodeRestartSelfTest.java | 10 +-
...niteCacheDistributedQueryCancelSelfTest.java | 6 +-
...butedQueryStopOnCancelOrTimeoutSelfTest.java | 6 +-
...artitionedFieldsQueryP2PEnabledSelfTest.java | 4 +-
...achePartitionedQueryP2PDisabledSelfTest.java | 4 +-
...cheQueryAbstractDistributedJoinSelfTest.java | 6 +-
.../near/IgniteCacheQueryNodeFailTest.java | 4 +-
.../IgniteCacheQueryNodeRestartSelfTest.java | 4 +-
.../IgniteCacheQueryNodeRestartSelfTest2.java | 4 +-
...ReplicatedFieldsQueryP2PEnabledSelfTest.java | 4 +-
...CacheReplicatedQueryP2PDisabledSelfTest.java | 4 +-
...eCacheLocalQueryCancelOrTimeoutSelfTest.java | 4 +-
.../cache/ttl/CacheTtlAbstractSelfTest.java | 4 +-
.../query/IgniteSqlSplitterSelfTest.java | 4 +-
.../h2/GridIndexingSpiAbstractSelfTest.java | 7 +-
.../h2/sql/AbstractH2CompareQueryTest.java | 4 +-
.../query/h2/sql/GridQueryParsingTest.java | 4 +-
.../FetchingQueryCursorStressTest.java | 2 +-
.../tcp/GridOrderedMessageCancelSelfTest.java | 4 +-
.../cache/AbstractCacheJtaSelfTest.java | 8 +-
...CacheJtaConfigurationValidationSelfTest.java | 4 +-
...CacheJtaFactoryConfigValidationSelfTest.java | 4 +-
.../cache/GridJtaLifecycleAwareSelfTest.java | 4 +-
.../log4j/GridLog4jCorrectFileNameTest.java | 6 +-
.../log4j2/GridLog4j2CorrectFileNameTest.java | 6 +-
.../log4j2/GridLog4j2InitializedTest.java | 2 +-
.../logger/log4j2/Log4j2LoggerSelfTest.java | 6 +-
.../log4j2/Log4j2LoggerVerboseModeSelfTest.java | 6 +-
.../IgniteAbstractOsgiContextActivator.java | 2 +-
.../activators/BasicIgniteTestActivator.java | 2 +-
.../scala/org/apache/ignite/scalar/scalar.scala | 17 +-
.../test/resources/spring-ping-pong-partner.xml | 2 +-
.../scalar/tests/ScalarProjectionSpec.scala | 4 +-
.../schedule/IgniteScheduleProcessor.java | 2 +-
.../processors/schedule/ScheduleFutureImpl.java | 4 +-
.../org/apache/ignite/spark/IgniteContext.scala | 2 +-
.../spark/JavaEmbeddedIgniteRDDSelfTest.java | 14 +-
.../spark/JavaStandaloneIgniteRDDSelfTest.java | 6 +-
.../org/apache/ignite/spark/IgniteRDDSpec.scala | 14 +-
.../org/apache/ignite/IgniteSpringBean.java | 2 +-
.../ignite/cache/spring/SpringCacheManager.java | 42 +-
.../spring/SpringTransactionManager.java | 50 +-
.../src/test/config/jdbc-pojo-store-builtin.xml | 2 +-
.../src/test/config/jdbc-pojo-store-obj.xml | 2 +-
modules/spring/src/test/config/node1.xml | 2 +-
modules/spring/src/test/config/store-cache1.xml | 2 +-
.../src/test/java/config/ignite-test-config.xml | 2 +-
.../test/java/config/spring-transactions.xml | 2 +-
.../spring/GridSpringCacheManagerSelfTest.java | 6 +-
.../SpringCacheManagerContextInjectionTest.java | 2 +-
.../ignite/cache/spring/spring-caching.xml | 2 +-
.../store/jdbc/CachePojoStoreXmlSelfTest.java | 4 +-
.../ignite/internal/GridFactorySelfTest.java | 154 +--
.../GridSpringBeanSerializationSelfTest.java | 2 +-
.../internal/IgniteDynamicCacheConfigTest.java | 4 +-
.../GridSpringResourceInjectionSelfTest.java | 4 +-
.../GridTransformSpringInjectionSelfTest.java | 2 +-
.../p2p/GridP2PUserVersionChangeSelfTest.java | 6 +-
.../org/apache/ignite/spring-injection-test.xml | 2 +-
.../spring/injection/spring-resource.tmpl.xml | 2 +-
.../GridSpringTransactionManagerSelfTest.java | 6 +-
...gTransactionManagerContextInjectionTest.java | 2 +-
.../spi/deployment/uri/UriDeploymentSpi.java | 6 +-
.../scanners/UriDeploymentScannerManager.java | 12 +-
.../GridTaskUriDeploymentDeadlockSelfTest.java | 6 +-
.../ignite/p2p/GridP2PDisabledSelfTest.java | 4 +-
.../config/VisorConfigurationCommand.scala | 2 +-
.../visor/commands/node/VisorNodeCommand.scala | 6 +-
.../scala/org/apache/ignite/visor/visor.scala | 10 +-
.../ignite/visor/VisorRuntimeBaseSpec.scala | 4 +-
.../commands/alert/VisorAlertCommandSpec.scala | 4 +-
.../cache/VisorCacheClearCommandSpec.scala | 4 +-
.../commands/cache/VisorCacheCommandSpec.scala | 4 +-
.../cache/VisorCacheResetCommandSpec.scala | 4 +-
.../config/VisorConfigurationCommandSpec.scala | 4 +-
.../cswap/VisorCacheSwapCommandSpec.scala | 4 +-
.../disco/VisorDiscoveryCommandSpec.scala | 4 +-
.../events/VisorEventsCommandSpec.scala | 4 +-
.../visor/commands/gc/VisorGcCommandSpec.scala | 4 +-
.../commands/tasks/VisorTasksCommandSpec.scala | 4 +-
.../ignite/console/demo/AgentClusterDemo.java | 4 +-
.../cache/websession/WebSessionFilter.java | 12 +-
.../servlet/ServletContextListenerStartup.java | 12 +-
.../ignite/startup/servlet/ServletStartup.java | 8 +-
.../internal/websession/WebSessionSelfTest.java | 21 +-
.../ignite/yardstick/IgniteBenchmarkUtils.java | 2 +-
.../tcp/ipfinder/zk/ZookeeperIpFinderTest.java | 10 +-
1273 files changed, 5255 insertions(+), 4883 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ignite/blob/ae4af02a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheIoManager.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ignite/blob/ae4af02a/modules/core/src/main/java/org/apache/ignite/internal/processors/cacheobject/IgniteCacheObjectProcessorImpl.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ignite/blob/ae4af02a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/query/continuous/IgniteCacheContinuousQueryImmutableEntryTest.java
----------------------------------------------------------------------
[24/38] ignite git commit: ignite-4768
Posted by sb...@apache.org.
ignite-4768
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/bc5dbb08
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/bc5dbb08
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/bc5dbb08
Branch: refs/heads/ignite-4768
Commit: bc5dbb08143dd6088bc5551da4e830be17e3d4f4
Parents: 850e4dc
Author: sboikov <sb...@gridgain.com>
Authored: Mon Mar 13 11:35:48 2017 +0300
Committer: sboikov <sb...@gridgain.com>
Committed: Mon Mar 13 11:35:48 2017 +0300
----------------------------------------------------------------------
.../distributed/near/GridNearOptimisticTxPrepareFuture.java | 1 -
.../distributed/near/GridNearPessimisticTxPrepareFuture.java | 2 +-
.../cache/distributed/near/GridNearTxFinishFuture.java | 4 ++--
.../internal/processors/cache/transactions/IgniteTxHandler.java | 1 -
4 files changed, 3 insertions(+), 5 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ignite/blob/bc5dbb08/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearOptimisticTxPrepareFuture.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearOptimisticTxPrepareFuture.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearOptimisticTxPrepareFuture.java
index 4233002..6189b38 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearOptimisticTxPrepareFuture.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearOptimisticTxPrepareFuture.java
@@ -58,7 +58,6 @@ import org.apache.ignite.internal.util.typedef.X;
import org.apache.ignite.internal.util.typedef.internal.S;
import org.apache.ignite.internal.util.typedef.internal.U;
import org.apache.ignite.lang.IgniteBiClosure;
-import org.apache.ignite.lang.IgniteUuid;
import org.apache.ignite.transactions.TransactionDeadlockException;
import org.apache.ignite.transactions.TransactionTimeoutException;
import org.jetbrains.annotations.Nullable;
http://git-wip-us.apache.org/repos/asf/ignite/blob/bc5dbb08/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearPessimisticTxPrepareFuture.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearPessimisticTxPrepareFuture.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearPessimisticTxPrepareFuture.java
index ddee7b7..4a443a9 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearPessimisticTxPrepareFuture.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearPessimisticTxPrepareFuture.java
@@ -200,7 +200,7 @@ public class GridNearPessimisticTxPrepareFuture extends GridNearTxPrepareFutureA
if (!cacheCtx.isLocal()) {
GridDhtPartitionTopology top = cacheCtx.topology();
- nodes = cacheCtx.topology().nodes(cacheCtx.affinity().partition(txEntry.key()), topVer);
+ nodes = top.nodes(cacheCtx.affinity().partition(txEntry.key()), topVer);
}
else
nodes = cacheCtx.affinity().nodesByKey(txEntry.key(), topVer);
http://git-wip-us.apache.org/repos/asf/ignite/blob/bc5dbb08/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearTxFinishFuture.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearTxFinishFuture.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearTxFinishFuture.java
index 28f2ce1..7387501 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearTxFinishFuture.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearTxFinishFuture.java
@@ -303,7 +303,7 @@ public final class GridNearTxFinishFuture<K, V> extends GridCompoundIdentityFutu
}
if (initialized() || err != null) {
- if (tx.needCheckBackup() && !nodeStop) {
+ if (tx.needCheckBackup()) {
assert tx.onePhaseCommit();
if (err != null)
@@ -478,7 +478,7 @@ public final class GridNearTxFinishFuture<K, V> extends GridCompoundIdentityFutu
*
*/
private void checkBackup() {
- assert !hasFutures();
+ assert !hasFutures() : futures();
GridDistributedTxMapping mapping = mappings.singleMapping();
http://git-wip-us.apache.org/repos/asf/ignite/blob/bc5dbb08/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/transactions/IgniteTxHandler.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/transactions/IgniteTxHandler.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/transactions/IgniteTxHandler.java
index a3f1356..6daec14 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/transactions/IgniteTxHandler.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/transactions/IgniteTxHandler.java
@@ -76,7 +76,6 @@ import org.apache.ignite.lang.IgniteFutureCancelledException;
import org.apache.ignite.transactions.TransactionState;
import org.jetbrains.annotations.Nullable;
-import static org.apache.ignite.cache.CacheWriteSynchronizationMode.FULL_ASYNC;
import static org.apache.ignite.cache.CacheWriteSynchronizationMode.FULL_SYNC;
import static org.apache.ignite.internal.managers.communication.GridIoPolicy.SYSTEM_POOL;
import static org.apache.ignite.internal.managers.communication.GridIoPolicy.UTILITY_CACHE_POOL;
[30/38] ignite git commit: Merge remote-tracking branch
'remotes/origin/ignite-4768' into ignite-4768-1
Posted by sb...@apache.org.
Merge remote-tracking branch 'remotes/origin/ignite-4768' into ignite-4768-1
# Conflicts:
# modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtTxFinishResponse.java
# modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearTxFinishResponse.java
# modules/core/src/main/java/org/apache/ignite/internal/processors/cache/transactions/IgniteTxHandler.java
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/3ce0496a
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/3ce0496a
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/3ce0496a
Branch: refs/heads/ignite-4768
Commit: 3ce0496aa2a6ebc92a692335427a0d5558badffd
Parents: 4edd7be
Author: sboikov <sb...@gridgain.com>
Authored: Mon Mar 13 12:26:19 2017 +0300
Committer: sboikov <sb...@gridgain.com>
Committed: Mon Mar 13 12:26:19 2017 +0300
----------------------------------------------------------------------
.../near/GridNearTxFinishResponse.java | 23 ++++++++++++--------
1 file changed, 14 insertions(+), 9 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ignite/blob/3ce0496a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearTxFinishResponse.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearTxFinishResponse.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearTxFinishResponse.java
index efe96b8..310e90d 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearTxFinishResponse.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearTxFinishResponse.java
@@ -66,8 +66,13 @@ public class GridNearTxFinishResponse extends GridDistributedTxFinishResponse {
* @param miniId Mini future Id.
* @param err Error.
*/
- public GridNearTxFinishResponse(int part, GridCacheVersion xid, long nearThreadId, IgniteUuid futId, int miniId,
- @Nullable Throwable err) {
+ public GridNearTxFinishResponse(int part,
+ GridCacheVersion xid,
+ long nearThreadId,
+ IgniteUuid futId,
+ int miniId,
+ @Nullable Throwable err)
+ {
super(part, xid, futId);
assert miniId != 0;
@@ -128,19 +133,19 @@ public class GridNearTxFinishResponse extends GridDistributedTxFinishResponse {
}
switch (writer.state()) {
- case 5:
+ case 7:
if (!writer.writeByteArray("errBytes", errBytes))
return false;
writer.incrementState();
- case 6:
+ case 8:
if (!writer.writeInt("miniId", miniId))
return false;
writer.incrementState();
- case 7:
+ case 9:
if (!writer.writeLong("nearThreadId", nearThreadId))
return false;
@@ -162,7 +167,7 @@ public class GridNearTxFinishResponse extends GridDistributedTxFinishResponse {
return false;
switch (reader.state()) {
- case 5:
+ case 7:
errBytes = reader.readByteArray("errBytes");
if (!reader.isLastRead())
@@ -170,7 +175,7 @@ public class GridNearTxFinishResponse extends GridDistributedTxFinishResponse {
reader.incrementState();
- case 6:
+ case 8:
miniId = reader.readInt("miniId");
if (!reader.isLastRead())
@@ -178,7 +183,7 @@ public class GridNearTxFinishResponse extends GridDistributedTxFinishResponse {
reader.incrementState();
- case 7:
+ case 9:
nearThreadId = reader.readLong("nearThreadId");
if (!reader.isLastRead())
@@ -198,7 +203,7 @@ public class GridNearTxFinishResponse extends GridDistributedTxFinishResponse {
/** {@inheritDoc} */
@Override public byte fieldsCount() {
- return 8;
+ return 10;
}
/** {@inheritDoc} */
[36/38] ignite git commit: ignite-4768
Posted by sb...@apache.org.
ignite-4768
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/baeb2036
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/baeb2036
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/baeb2036
Branch: refs/heads/ignite-4768
Commit: baeb2036e4f29ef1336cbfe5d8f8fcac012cbfb4
Parents: df80606
Author: sboikov <sb...@gridgain.com>
Authored: Mon Mar 13 15:31:52 2017 +0300
Committer: sboikov <sb...@gridgain.com>
Committed: Mon Mar 13 18:45:44 2017 +0300
----------------------------------------------------------------------
.../apache/ignite/internal/IgniteKernal.java | 1 +
.../processors/cache/GridCacheIoManager.java | 4 +-
.../processors/cache/GridCacheMvccManager.java | 7 ++
.../distributed/GridCacheTxFinishSync.java | 6 +-
.../GridCacheTxRecoveryResponse.java | 2 +
.../GridDistributedTxFinishRequest.java | 8 ++
.../GridDistributedTxPrepareRequest.java | 13 ++-
.../GridDistributedTxPrepareResponse.java | 1 +
.../distributed/dht/GridDhtTxFinishFuture.java | 7 +-
.../cache/distributed/dht/GridDhtTxLocal.java | 64 ++----------
.../distributed/dht/GridDhtTxLocalAdapter.java | 65 ++++++++++--
.../distributed/dht/GridDhtTxPrepareFuture.java | 37 +++----
...arOptimisticSerializableTxPrepareFuture.java | 100 ++++++++++++++++---
.../GridNearPessimisticTxPrepareFuture.java | 12 +--
.../near/GridNearTxFinishFuture.java | 5 +-
.../cache/distributed/near/GridNearTxLocal.java | 10 +-
.../cache/transactions/IgniteTxHandler.java | 19 ++--
17 files changed, 215 insertions(+), 146 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ignite/blob/baeb2036/modules/core/src/main/java/org/apache/ignite/internal/IgniteKernal.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/IgniteKernal.java b/modules/core/src/main/java/org/apache/ignite/internal/IgniteKernal.java
index 2a6706e..0ee02fa 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/IgniteKernal.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/IgniteKernal.java
@@ -1155,6 +1155,7 @@ public class IgniteKernal implements IgniteEx, IgniteMXBean, Externalizable {
String msg = NL +
"Metrics for local node (to disable set 'metricsLogFrequency' to 0)" + NL +
+ "Futures " + ctx.cache().context().mvcc().activeFuturesCount()+ NL +
" ^-- Node [id=" + id + ", name=" + name() + ", uptime=" + getUpTimeFormatted() + "]" + NL +
" ^-- H/N/C [hosts=" + hosts + ", nodes=" + nodes + ", CPUs=" + cpus + "]" + NL +
" ^-- CPU [cur=" + dblFmt.format(cpuLoadPct) + "%, avg=" +
http://git-wip-us.apache.org/repos/asf/ignite/blob/baeb2036/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheIoManager.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheIoManager.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheIoManager.java
index 2c255a5..e433825 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheIoManager.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheIoManager.java
@@ -367,8 +367,8 @@ public class GridCacheIoManager extends GridCacheSharedManagerAdapter {
unmarshall(nodeId, cacheMsg);
- if (!cacheMsg.partitionExchangeMessage())
- log.info("Message [from=" + nodeId + ", msg=" + cacheMsg + ']');
+// if (!cacheMsg.partitionExchangeMessage())
+// log.info("Message [from=" + nodeId + ", msg=" + cacheMsg + ']');
if (cacheMsg.classError() != null)
processFailedMessage(nodeId, cacheMsg, c);
http://git-wip-us.apache.org/repos/asf/ignite/blob/baeb2036/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheMvccManager.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheMvccManager.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheMvccManager.java
index 4ec13fc..7d14fa9 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheMvccManager.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheMvccManager.java
@@ -312,6 +312,13 @@ public class GridCacheMvccManager extends GridCacheSharedManagerAdapter {
}
/**
+ * TODO IGNITE-4768.
+ */
+ public int activeFuturesCount() {
+ return mvccFuts.size();
+ }
+
+ /**
* @param leftNodeId Left node ID.
* @param topVer Topology version.
*/
http://git-wip-us.apache.org/repos/asf/ignite/blob/baeb2036/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/GridCacheTxFinishSync.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/GridCacheTxFinishSync.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/GridCacheTxFinishSync.java
index 1e323d0..64d3122 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/GridCacheTxFinishSync.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/GridCacheTxFinishSync.java
@@ -137,7 +137,7 @@ public class GridCacheTxFinishSync<K, V> {
/**
* @param nodeId Node ID request being sent to.
*/
- public void onSend(UUID nodeId) {
+ void onSend(UUID nodeId) {
TxFinishSync sync = nodeMap.get(nodeId);
if (sync == null) {
@@ -169,7 +169,7 @@ public class GridCacheTxFinishSync<K, V> {
* @param nodeId Node ID to wait ack from.
* @return {@code null} if ack has been received or future that will be completed when ack is received.
*/
- public IgniteInternalFuture<?> awaitAckAsync(UUID nodeId) {
+ IgniteInternalFuture<?> awaitAckAsync(UUID nodeId) {
TxFinishSync sync = nodeMap.get(nodeId);
if (sync == null)
@@ -191,7 +191,7 @@ public class GridCacheTxFinishSync<K, V> {
/**
* @param nodeId Node ID response received from.
*/
- public void onReceive(UUID nodeId) {
+ void onReceive(UUID nodeId) {
TxFinishSync sync = nodeMap.get(nodeId);
if (sync != null)
http://git-wip-us.apache.org/repos/asf/ignite/blob/baeb2036/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/GridCacheTxRecoveryResponse.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/GridCacheTxRecoveryResponse.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/GridCacheTxRecoveryResponse.java
index c087a3d..b5bb1b3 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/GridCacheTxRecoveryResponse.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/GridCacheTxRecoveryResponse.java
@@ -25,6 +25,7 @@ import org.apache.ignite.internal.processors.cache.GridCacheSharedContext;
import org.apache.ignite.internal.processors.cache.transactions.IgniteTxState;
import org.apache.ignite.internal.processors.cache.transactions.IgniteTxStateAware;
import org.apache.ignite.internal.processors.cache.version.GridCacheVersion;
+import org.apache.ignite.internal.util.tostring.GridToStringExclude;
import org.apache.ignite.internal.util.typedef.internal.S;
import org.apache.ignite.lang.IgniteUuid;
import org.apache.ignite.plugin.extensions.communication.MessageReader;
@@ -48,6 +49,7 @@ public class GridCacheTxRecoveryResponse extends GridDistributedBaseMessage impl
/** Transient TX state. */
@GridDirectTransient
+ @GridToStringExclude
private IgniteTxState txState;
/**
http://git-wip-us.apache.org/repos/asf/ignite/blob/baeb2036/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/GridDistributedTxFinishRequest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/GridDistributedTxFinishRequest.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/GridDistributedTxFinishRequest.java
index c794f96..03d16e5 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/GridDistributedTxFinishRequest.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/GridDistributedTxFinishRequest.java
@@ -30,6 +30,7 @@ import org.apache.ignite.internal.processors.cache.transactions.IgniteTxState;
import org.apache.ignite.internal.processors.cache.transactions.IgniteTxStateAware;
import org.apache.ignite.internal.processors.cache.version.GridCacheVersion;
import org.apache.ignite.internal.util.tostring.GridToStringBuilder;
+import org.apache.ignite.internal.util.tostring.GridToStringExclude;
import org.apache.ignite.lang.IgniteUuid;
import org.apache.ignite.plugin.extensions.communication.MessageReader;
import org.apache.ignite.plugin.extensions.communication.MessageWriter;
@@ -110,6 +111,7 @@ public class GridDistributedTxFinishRequest extends GridDistributedBaseMessage i
/** Transient TX state. */
@GridDirectTransient
+ @GridToStringExclude
private IgniteTxState txState;
/**
@@ -571,7 +573,13 @@ public class GridDistributedTxFinishRequest extends GridDistributedBaseMessage i
/** {@inheritDoc} */
@Override public String toString() {
+ StringBuilder flags = new StringBuilder();
+
+ if (dhtReplyNear())
+ appendFlag(flags, "dht2near");
+
return GridToStringBuilder.toString(GridDistributedTxFinishRequest.class, this,
+ "flags", flags.toString(),
"super", super.toString());
}
}
http://git-wip-us.apache.org/repos/asf/ignite/blob/baeb2036/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/GridDistributedTxPrepareRequest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/GridDistributedTxPrepareRequest.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/GridDistributedTxPrepareRequest.java
index c013c1a..1f06696 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/GridDistributedTxPrepareRequest.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/GridDistributedTxPrepareRequest.java
@@ -151,6 +151,7 @@ public class GridDistributedTxPrepareRequest extends GridDistributedBaseMessage
/** Transient TX state. */
@GridDirectTransient
+ @GridToStringExclude
private IgniteTxState txState;
/** */
@@ -699,15 +700,17 @@ public class GridDistributedTxPrepareRequest extends GridDistributedBaseMessage
StringBuilder flags = new StringBuilder();
if (needReturnValue())
- flags.append("retVal");
+ appendFlag(flags, "retVal");
if (isInvalidate())
- flags.append("invalidate");
+ appendFlag(flags, "invalidate");
if (onePhaseCommit())
- flags.append("onePhase");
+ appendFlag(flags, "onePhase");
if (last())
- flags.append("last");
+ appendFlag(flags, "last");
if (system())
- flags.append("sys");
+ appendFlag(flags, "sys");
+ if (dhtReplyNear())
+ appendFlag(flags, "dht2near");
return GridToStringBuilder.toString(GridDistributedTxPrepareRequest.class, this,
"flags", flags.toString(),
http://git-wip-us.apache.org/repos/asf/ignite/blob/baeb2036/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/GridDistributedTxPrepareResponse.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/GridDistributedTxPrepareResponse.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/GridDistributedTxPrepareResponse.java
index 53a1391..aaa8db5 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/GridDistributedTxPrepareResponse.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/GridDistributedTxPrepareResponse.java
@@ -49,6 +49,7 @@ public class GridDistributedTxPrepareResponse extends GridDistributedBaseMessage
/** Transient TX state. */
@GridDirectTransient
+ @GridToStringExclude
private IgniteTxState txState;
/** */
http://git-wip-us.apache.org/repos/asf/ignite/blob/baeb2036/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtTxFinishFuture.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtTxFinishFuture.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtTxFinishFuture.java
index 72a9b73..eb5d58f 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtTxFinishFuture.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtTxFinishFuture.java
@@ -100,6 +100,9 @@ public final class GridDhtTxFinishFuture<K, V> extends GridCompoundIdentityFutur
public GridDhtTxFinishFuture(GridCacheSharedContext<K, V> cctx, GridDhtTxLocalAdapter tx, boolean commit) {
super(F.<IgniteInternalTx>identityReducer(tx));
+ assert tx.nearFinishFutureId() != null : tx;
+ assert tx.nearFinishMiniId() != 0 : tx;
+
this.cctx = cctx;
this.tx = tx;
this.commit = commit;
@@ -424,8 +427,8 @@ public final class GridDhtTxFinishFuture<K, V> extends GridCompoundIdentityFutur
GridDhtTxFinishRequest req = new GridDhtTxFinishRequest(
tx.nearNodeId(),
- dhtReplyNear ? tx.nearFutureId() : futId,
- dhtReplyNear ? 0 : fut.futureId(),
+ dhtReplyNear ? tx.nearFinishFutureId() : futId,
+ dhtReplyNear ? tx.nearFinishMiniId() : fut.futureId(),
tx.topologyVersion(),
tx.xidVersion(),
tx.commitVersion(),
http://git-wip-us.apache.org/repos/asf/ignite/blob/baeb2036/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtTxLocal.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtTxLocal.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtTxLocal.java
index bff69bc..7ddf415 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtTxLocal.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtTxLocal.java
@@ -68,18 +68,6 @@ public class GridDhtTxLocal extends GridDhtTxLocalAdapter implements GridCacheMa
/** */
private UUID nearNodeId;
- /** Near future ID. */
- private IgniteUuid nearFutId;
-
- /** Near future ID. */
- private int nearMiniId;
-
- /** Near future ID. */
- private IgniteUuid nearFinFutId;
-
- /** Near future ID. */
- private int nearFinMiniId;
-
/** Near XID. */
private GridCacheVersion nearXidVer;
@@ -164,8 +152,8 @@ public class GridDhtTxLocal extends GridDhtTxLocalAdapter implements GridCacheMa
this.nearNodeId = nearNodeId;
this.nearXidVer = nearXidVer;
- this.nearFutId = nearFutId;
- this.nearMiniId = nearMiniId;
+ this.nearPrepFutId = nearFutId;
+ this.nearPrepMiniId = nearMiniId;
this.txNodes = txNodes;
threadId = nearThreadId;
@@ -219,18 +207,6 @@ public class GridDhtTxLocal extends GridDhtTxLocalAdapter implements GridCacheMa
}
/** {@inheritDoc} */
- @Override protected IgniteUuid nearFutureId() {
- return nearFutId;
- }
-
- /**
- * @param nearFutId Near future ID.
- */
- public void nearFutureId(IgniteUuid nearFutId) {
- this.nearFutId = nearFutId;
- }
-
- /** {@inheritDoc} */
@Override public boolean dht() {
return true;
}
@@ -240,27 +216,6 @@ public class GridDhtTxLocal extends GridDhtTxLocalAdapter implements GridCacheMa
return cacheCtx.isDht() && isNearEnabled(cacheCtx) && !cctx.localNodeId().equals(nearNodeId());
}
- /**
- * @return Near future ID.
- */
- public IgniteUuid nearFinishFutureId() {
- return nearFinFutId;
- }
-
- /**
- * @param nearFinFutId Near future ID.
- */
- public void nearFinishFutureId(IgniteUuid nearFinFutId) {
- this.nearFinFutId = nearFinFutId;
- }
-
- /**
- * @param nearFinMiniId Near future mini ID.
- */
- public void nearFinishMiniId(int nearFinMiniId) {
- this.nearFinMiniId = nearFinMiniId;
- }
-
/** {@inheritDoc} */
@Override @Nullable protected IgniteInternalFuture<Boolean> addReader(long msgId, GridDhtCacheEntry cached,
IgniteTxEntry entry, AffinityTopologyVersion topVer) {
@@ -301,7 +256,6 @@ public class GridDhtTxLocal extends GridDhtTxLocalAdapter implements GridCacheMa
null,
Collections.<IgniteTxKey, GridCacheVersion>emptyMap(),
0,
- nearMiniId,
null,
true);
}
@@ -317,7 +271,6 @@ public class GridDhtTxLocal extends GridDhtTxLocalAdapter implements GridCacheMa
cctx,
this,
timeout,
- nearMiniId,
Collections.<IgniteTxKey, GridCacheVersion>emptyMap(),
true,
needReturnValue()))) {
@@ -377,7 +330,6 @@ public class GridDhtTxLocal extends GridDhtTxLocalAdapter implements GridCacheMa
* @param writes Write entries.
* @param verMap Version map.
* @param msgId Message ID.
- * @param nearMiniId Near mini future ID.
* @param txNodes Transaction nodes mapping.
* @param last {@code True} if this is last prepare request.
* @return Future that will be completed when locks are acquired.
@@ -387,7 +339,6 @@ public class GridDhtTxLocal extends GridDhtTxLocalAdapter implements GridCacheMa
@Nullable Collection<IgniteTxEntry> writes,
Map<IgniteTxKey, GridCacheVersion> verMap,
long msgId,
- int nearMiniId,
Map<UUID, Collection<UUID>> txNodes,
boolean last
) {
@@ -404,14 +355,13 @@ public class GridDhtTxLocal extends GridDhtTxLocalAdapter implements GridCacheMa
cctx,
this,
timeout,
- nearMiniId,
verMap,
last,
needReturnValue()))) {
GridDhtTxPrepareFuture f = prepFut;
- assert f.nearMiniId() == nearMiniId : "Wrong near mini id on existing future " +
- "[futMiniId=" + f.nearMiniId() + ", miniId=" + nearMiniId + ", fut=" + f + ']';
+ assert f.nearMiniId() == nearPrepMiniId : "Wrong near mini id on existing future " +
+ "[futMiniId=" + f.nearMiniId() + ", miniId=" + nearPrepMiniId + ", fut=" + f + ']';
if (timeout == -1)
f.onError(timeoutException());
@@ -420,8 +370,8 @@ public class GridDhtTxLocal extends GridDhtTxLocalAdapter implements GridCacheMa
}
}
else {
- assert fut.nearMiniId() == nearMiniId : "Wrong near mini id on existing future " +
- "[futMiniId=" + fut.nearMiniId() + ", miniId=" + nearMiniId + ", fut=" + fut + ']';
+ assert fut.nearMiniId() == nearPrepMiniId : "Wrong near mini id on existing future " +
+ "[futMiniId=" + fut.nearMiniId() + ", miniId=" + nearPrepMiniId + ", fut=" + fut + ']';
// Prepare was called explicitly.
return chainOnePhasePrepare(fut);
@@ -619,7 +569,7 @@ public class GridDhtTxLocal extends GridDhtTxLocalAdapter implements GridCacheMa
"Invalid state [nearFinFutId=" + nearFinFutId + ", isInvalidate=" + isInvalidate() + ", commit=" + commit +
", sysInvalidate=" + isSystemInvalidate() + ", state=" + state() + ']';
- assert nearMiniId != 0;
+ assert nearPrepMiniId != 0;
return super.finish(commit);
}
http://git-wip-us.apache.org/repos/asf/ignite/blob/baeb2036/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtTxLocalAdapter.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtTxLocalAdapter.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtTxLocalAdapter.java
index 67e1993..81b5208 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtTxLocalAdapter.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtTxLocalAdapter.java
@@ -97,6 +97,18 @@ public abstract class GridDhtTxLocalAdapter extends IgniteTxLocalAdapter {
/** Nodes where transactions were started on lock step. */
private Set<ClusterNode> lockTxNodes;
+ /** Near future ID. */
+ protected IgniteUuid nearPrepFutId;
+
+ /** Prepare future mini ID. */
+ protected int nearPrepMiniId;
+
+ /** Near future ID. */
+ protected IgniteUuid nearFinFutId;
+
+ /** Prepare future mini ID. */
+ protected int nearFinMiniId;
+
/**
* Empty constructor required for {@link Externalizable}.
*/
@@ -159,9 +171,55 @@ public abstract class GridDhtTxLocalAdapter extends IgniteTxLocalAdapter {
}
/**
+ * @return Near future ID.
+ */
+ final IgniteUuid nearPrepareFutureId() {
+ return nearPrepFutId;
+ }
+
+ /**
+ * @param futId Near future ID.
+ * @param miniId Near mini future ID.
+ */
+ public final void nearPrepareFutureId(IgniteUuid futId, int miniId) {
+ this.nearPrepFutId = futId;
+ this.nearPrepMiniId = miniId;
+ }
+
+ /**
+ * @return Near prepare mini future ID.
+ */
+ final int nearPrepareMiniId() {
+ return nearPrepMiniId;
+ }
+
+ /**
+ * @return Near future ID.
+ */
+ final IgniteUuid nearFinishFutureId() {
+ return nearFinFutId;
+ }
+
+ /**
+ * @param futId Near future ID.
+ * @param miniId Near mini future ID.
+ */
+ public final void nearFinishFutureId(IgniteUuid futId, int miniId) {
+ nearFinFutId = futId;
+ nearFinMiniId = miniId;
+ }
+
+ /**
+ * @return Near future mini ID.
+ */
+ public final int nearFinishMiniId() {
+ return nearFinMiniId;
+ }
+
+ /**
* @param node Node.
*/
- public void addLockTransactionNode(ClusterNode node) {
+ void addLockTransactionNode(ClusterNode node) {
assert node != null;
assert !node.isLocal();
@@ -216,11 +274,6 @@ public abstract class GridDhtTxLocalAdapter extends IgniteTxLocalAdapter {
protected abstract UUID nearNodeId();
/**
- * @return Near future ID.
- */
- protected abstract IgniteUuid nearFutureId();
-
- /**
* Adds reader to cached entry.
*
* @param msgId Message ID.
http://git-wip-us.apache.org/repos/asf/ignite/blob/baeb2036/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtTxPrepareFuture.java
----------------------------------------------------------------------
diff --git 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
index c8e06af..7c69021 100644
--- 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
@@ -175,9 +175,6 @@ public final class GridDhtTxPrepareFuture extends GridCompoundFuture<IgniteInter
/** Trackable flag. */
private boolean trackable = true;
- /** Near mini future id. */
- private int nearMiniId;
-
/** DHT versions map. */
private Map<IgniteTxKey, GridCacheVersion> dhtVerMap;
@@ -213,7 +210,6 @@ public final class GridDhtTxPrepareFuture extends GridCompoundFuture<IgniteInter
* @param cctx Context.
* @param tx Transaction.
* @param timeout Timeout.
- * @param nearMiniId Near mini future id.
* @param dhtVerMap DHT versions map.
* @param last {@code True} if this is last prepare operation for node.
* @param retVal Return value flag.
@@ -222,13 +218,15 @@ public final class GridDhtTxPrepareFuture extends GridCompoundFuture<IgniteInter
GridCacheSharedContext cctx,
final GridDhtTxLocalAdapter tx,
long timeout,
- int nearMiniId,
Map<IgniteTxKey, GridCacheVersion> dhtVerMap,
boolean last,
boolean retVal
) {
super(REDUCER);
+ assert tx.nearPrepareFutureId() != null;
+ assert tx.nearPrepareMiniId() != 0;
+
this.cctx = cctx;
this.tx = tx;
this.dhtVerMap = dhtVerMap;
@@ -236,8 +234,6 @@ public final class GridDhtTxPrepareFuture extends GridCompoundFuture<IgniteInter
futId = IgniteUuid.randomUuid();
- this.nearMiniId = nearMiniId;
-
if (log == null) {
msgLog = cctx.txPrepareMessageLogger();
log = U.logger(cctx.kernalContext(), logRef, GridDhtTxPrepareFuture.class);
@@ -263,7 +259,7 @@ public final class GridDhtTxPrepareFuture extends GridCompoundFuture<IgniteInter
* @return Near mini future id.
*/
int nearMiniId() {
- return nearMiniId;
+ return tx.nearPrepareMiniId();
}
/** {@inheritDoc} */
@@ -860,8 +856,8 @@ public final class GridDhtTxPrepareFuture extends GridCompoundFuture<IgniteInter
GridNearTxPrepareResponse res = new GridNearTxPrepareResponse(
-1,
tx.nearXidVersion(),
- tx.colocated() ? tx.xid() : tx.nearFutureId(),
- nearMiniId,
+ tx.nearPrepareFutureId(),
+ nearMiniId(),
tx.xidVersion(),
tx.writeVersion(),
ret,
@@ -1223,17 +1219,7 @@ public final class GridDhtTxPrepareFuture extends GridCompoundFuture<IgniteInter
final boolean dhtReplyNear = tx.dhtReplyNear();
- Collection<UUID> backupNodes;
- IgniteUuid nearFutId;
-
- if (dhtReplyNear) {
- backupNodes = tx.transactionNodes().get(cctx.localNodeId());
- nearFutId = tx.colocated() ? tx.xid() : tx.nearFutureId();
- }
- else {
- backupNodes = null;
- nearFutId = null;
- }
+ Collection<UUID> backupNodes = dhtReplyNear ? tx.transactionNodes().get(cctx.localNodeId()) : null;
// Assign keys to primary nodes.
if (!F.isEmpty(writes)) {
@@ -1285,8 +1271,8 @@ public final class GridDhtTxPrepareFuture extends GridCompoundFuture<IgniteInter
assert txNodes != null;
GridDhtTxPrepareRequest req = new GridDhtTxPrepareRequest(
- dhtReplyNear ? nearFutId : futId,
- dhtReplyNear ? nearMiniId : fut.futureId(),
+ dhtReplyNear ? tx.nearPrepareFutureId() : futId,
+ dhtReplyNear ? tx.nearPrepareMiniId() : fut.futureId(),
tx.topologyVersion(),
tx,
timeout,
@@ -1403,8 +1389,8 @@ public final class GridDhtTxPrepareFuture extends GridCompoundFuture<IgniteInter
add(fut); // Append new future.
GridDhtTxPrepareRequest req = new GridDhtTxPrepareRequest(
- dhtReplyNear ? nearFutId : futId,
- dhtReplyNear ? nearMiniId : fut.futureId(),
+ dhtReplyNear ? tx.nearPrepareFutureId() : futId,
+ dhtReplyNear ? tx.nearPrepareMiniId() : fut.futureId(),
tx.topologyVersion(),
tx,
timeout,
@@ -1503,6 +1489,7 @@ public final class GridDhtTxPrepareFuture extends GridCompoundFuture<IgniteInter
/**
* @param entry Transaction entry.
+ * @param backupNodes Node IDs collection if tx was mapped on near node.
*/
private void map(IgniteTxEntry entry, @Nullable Collection<UUID> backupNodes) {
if (entry.cached().isLocal())
http://git-wip-us.apache.org/repos/asf/ignite/blob/baeb2036/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearOptimisticSerializableTxPrepareFuture.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearOptimisticSerializableTxPrepareFuture.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearOptimisticSerializableTxPrepareFuture.java
index cd0e7fd..6b2daf8 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearOptimisticSerializableTxPrepareFuture.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearOptimisticSerializableTxPrepareFuture.java
@@ -19,9 +19,11 @@ package org.apache.ignite.internal.processors.cache.distributed.near;
import java.util.Collection;
import java.util.HashMap;
+import java.util.HashSet;
import java.util.Iterator;
import java.util.List;
import java.util.Map;
+import java.util.Set;
import java.util.UUID;
import java.util.concurrent.atomic.AtomicIntegerFieldUpdater;
import org.apache.ignite.IgniteCheckedException;
@@ -36,6 +38,7 @@ import org.apache.ignite.internal.processors.cache.GridCacheEntryRemovedExceptio
import org.apache.ignite.internal.processors.cache.GridCacheMvccCandidate;
import org.apache.ignite.internal.processors.cache.GridCacheSharedContext;
import org.apache.ignite.internal.processors.cache.distributed.GridDistributedTxMapping;
+import org.apache.ignite.internal.processors.cache.distributed.dht.GridDhtPartitionTopology;
import org.apache.ignite.internal.processors.cache.distributed.dht.GridDhtTxMapping;
import org.apache.ignite.internal.processors.cache.distributed.dht.GridDhtTxPrepareResponse;
import org.apache.ignite.internal.processors.cache.transactions.IgniteInternalTx;
@@ -200,13 +203,18 @@ public class GridNearOptimisticSerializableTxPrepareFuture extends GridNearOptim
MiniFuture mini = miniFuture(res.miniId());
if (mini != null)
- mini.onResult(res);
+ mini.onPrimaryResponse(res);
}
}
/** {@inheritDoc} */
@Override public void onDhtResponse(UUID nodeId, GridDhtTxPrepareResponse res) {
- assert false; // TODO IGNITE-4768.
+ assert res.nearNodeResponse() : res;
+
+ MiniFuture mini = miniFuture(res.miniId());
+
+ if (mini != null)
+ mini.onDhtResponse(nodeId, res);
}
/** {@inheritDoc} */
@@ -347,11 +355,13 @@ public class GridNearOptimisticSerializableTxPrepareFuture extends GridNearOptim
Map<IgniteBiTuple<ClusterNode, Boolean>, GridDistributedTxMapping> mappings = new HashMap<>();
+ boolean dhtReplyNear = true;
+
for (IgniteTxEntry write : writes)
- map(write, topVer, mappings, txMapping, remap, topLocked);
+ dhtReplyNear = map(write, topVer, mappings, txMapping, remap, topLocked, dhtReplyNear);
for (IgniteTxEntry read : reads)
- map(read, topVer, mappings, txMapping, remap, topLocked);
+ dhtReplyNear = map(read, topVer, mappings, txMapping, remap, topLocked, dhtReplyNear);
if (keyLockFut != null)
keyLockFut.onAllKeysAdded();
@@ -371,10 +381,25 @@ public class GridNearOptimisticSerializableTxPrepareFuture extends GridNearOptim
checkOnePhase(txMapping);
+ if (tx.onePhaseCommit())
+ dhtReplyNear = false;
+
+ tx.dhtReplyNear(dhtReplyNear);
+
for (GridDistributedTxMapping m : mappings.values()) {
assert !m.empty();
- add(new MiniFuture(this, m, ++miniId));
+ Set<UUID> dhtNodes;
+
+ if (dhtReplyNear) {
+ dhtNodes = new HashSet<>(txMapping.transactionNodes().get(m.primary().id()));
+
+ assert !dhtNodes.isEmpty();
+ }
+ else
+ dhtNodes = null;
+
+ add(new MiniFuture(this, m, ++miniId, dhtNodes));
}
Collection<IgniteInternalFuture<?>> futs = (Collection)futures();
@@ -389,7 +414,7 @@ public class GridNearOptimisticSerializableTxPrepareFuture extends GridNearOptim
MiniFuture fut = (MiniFuture)fut0;
- IgniteCheckedException err = prepare(fut, txMapping);
+ IgniteCheckedException err = prepare(fut, txMapping, dhtReplyNear);
if (err != null) {
while (it.hasNext()) {
@@ -425,7 +450,9 @@ public class GridNearOptimisticSerializableTxPrepareFuture extends GridNearOptim
* @param fut Mini future.
* @return Prepare error if any.
*/
- @Nullable private IgniteCheckedException prepare(final MiniFuture fut, GridDhtTxMapping txMapping) {
+ @Nullable private IgniteCheckedException prepare(final MiniFuture fut,
+ GridDhtTxMapping txMapping,
+ boolean dhtReplyNear) {
GridDistributedTxMapping m = fut.mapping();
final ClusterNode primary = m.primary();
@@ -449,7 +476,7 @@ public class GridNearOptimisticSerializableTxPrepareFuture extends GridNearOptim
m.writes(),
m.near(),
txMapping.transactionNodes(),
- false,
+ dhtReplyNear,
m.last(),
tx.onePhaseCommit(),
tx.needReturnValue() && tx.implicit(),
@@ -490,7 +517,7 @@ public class GridNearOptimisticSerializableTxPrepareFuture extends GridNearOptim
prepFut.listen(new CI1<IgniteInternalFuture<GridNearTxPrepareResponse>>() {
@Override public void apply(IgniteInternalFuture<GridNearTxPrepareResponse> prepFut) {
try {
- fut.onResult(prepFut.get());
+ fut.onPrimaryResponse(prepFut.get());
}
catch (IgniteCheckedException e) {
fut.onResult(e);
@@ -526,19 +553,30 @@ public class GridNearOptimisticSerializableTxPrepareFuture extends GridNearOptim
* @param remap Remap flag.
* @param topLocked Topology locked flag.
*/
- private void map(
+ private boolean map(
IgniteTxEntry entry,
AffinityTopologyVersion topVer,
Map<IgniteBiTuple<ClusterNode, Boolean>, GridDistributedTxMapping> curMapping,
GridDhtTxMapping txMapping,
boolean remap,
- boolean topLocked
+ boolean topLocked,
+ boolean dhtReplyNear
) {
GridCacheContext cacheCtx = entry.context();
- List<ClusterNode> nodes = cacheCtx.isLocal() ?
- cacheCtx.affinity().nodesByKey(entry.key(), topVer) :
- cacheCtx.topology().nodes(cacheCtx.affinity().partition(entry.key()), topVer);
+ List<ClusterNode> nodes;
+
+ if (!cacheCtx.isLocal()) {
+ GridDhtPartitionTopology top = cacheCtx.topology();
+
+ nodes = top.nodes(cacheCtx.affinity().partition(entry.key()), topVer);
+
+ if (dhtReplyNear &&
+ (!top.rebalanceFinished(topVer) || cctx.discovery().hasNearCache(cacheCtx.cacheId(), topVer) || nodes.size() == 1))
+ dhtReplyNear = false;
+ }
+ else
+ nodes = cacheCtx.topology().nodes(cacheCtx.affinity().partition(entry.key()), topVer);
txMapping.addMapping(nodes);
@@ -620,6 +658,8 @@ public class GridNearOptimisticSerializableTxPrepareFuture extends GridNearOptim
}
}
}
+
+ return dhtReplyNear;
}
/** {@inheritDoc} */
@@ -711,15 +751,24 @@ public class GridNearOptimisticSerializableTxPrepareFuture extends GridNearOptim
@SuppressWarnings("UnusedDeclaration")
private volatile int rcvRes;
+ /** */
+ private final Set<UUID> dhtNodes;
+
/**
* @param parent Parent future.
* @param m Mapping.
* @param futId Mini future ID.
*/
- MiniFuture(GridNearOptimisticSerializableTxPrepareFuture parent, GridDistributedTxMapping m, int futId) {
+ MiniFuture(GridNearOptimisticSerializableTxPrepareFuture parent,
+ GridDistributedTxMapping m,
+ int futId,
+ Set<UUID> dhtNodes) {
+ assert dhtNodes == null || !dhtNodes.isEmpty();
+
this.parent = parent;
this.m = m;
this.futId = futId;
+ this.dhtNodes = dhtNodes;
}
/**
@@ -779,10 +828,27 @@ public class GridNearOptimisticSerializableTxPrepareFuture extends GridNearOptim
}
/**
+ * @param nodeId Node ID.
+ * @param res Response.
+ */
+ void onDhtResponse(UUID nodeId, GridDhtTxPrepareResponse res) {
+ assert dhtNodes != null;
+
+ boolean done;
+
+ synchronized (dhtNodes) {
+ done = dhtNodes.remove(nodeId) && dhtNodes.isEmpty();
+ }
+
+ if (done)
+ onDone();
+ }
+
+ /**
* @param res Result callback.
*/
@SuppressWarnings({"unchecked", "ThrowableResultOfMethodCallIgnored"})
- void onResult(final GridNearTxPrepareResponse res) {
+ void onPrimaryResponse(final GridNearTxPrepareResponse res) {
if (isDone())
return;
@@ -885,6 +951,8 @@ public class GridNearOptimisticSerializableTxPrepareFuture extends GridNearOptim
onDone(res);
}
else {
+ assert dhtNodes == null;
+
parent.processPrimaryPrepareResponse(m, res);
// Finish this mini future (need result only on client node).
http://git-wip-us.apache.org/repos/asf/ignite/blob/baeb2036/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearPessimisticTxPrepareFuture.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearPessimisticTxPrepareFuture.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearPessimisticTxPrepareFuture.java
index 1d3eaec..857f237 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearPessimisticTxPrepareFuture.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearPessimisticTxPrepareFuture.java
@@ -104,7 +104,7 @@ public class GridNearPessimisticTxPrepareFuture extends GridNearTxPrepareFutureA
if (f != null) {
assert f.primary().id().equals(nodeId);
- f.onPrimaryResult(res);
+ f.onPrimaryResponse(res);
}
else {
if (msgLog.isDebugEnabled()) {
@@ -223,12 +223,10 @@ public class GridNearPessimisticTxPrepareFuture extends GridNearTxPrepareFutureA
if (!cacheCtx.isLocal()) {
GridDhtPartitionTopology top = cacheCtx.topology();
- if (dhtReplyNear && (!top.rebalanceFinished(topVer) || cctx.discovery().hasNearCache(cacheCtx.cacheId(), topVer)))
- dhtReplyNear = false;
-
nodes = top.nodes(cacheCtx.affinity().partition(txEntry.key()), topVer);
- if (nodes.size() == 1)
+ if (dhtReplyNear &&
+ (!top.rebalanceFinished(topVer) || cctx.discovery().hasNearCache(cacheCtx.cacheId(), topVer) || nodes.size() == 1))
dhtReplyNear = false;
}
else
@@ -319,7 +317,7 @@ public class GridNearPessimisticTxPrepareFuture extends GridNearTxPrepareFutureA
prepFut.listen(new CI1<IgniteInternalFuture<GridNearTxPrepareResponse>>() {
@Override public void apply(IgniteInternalFuture<GridNearTxPrepareResponse> prepFut) {
try {
- fut.onPrimaryResult(prepFut.get());
+ fut.onPrimaryResponse(prepFut.get());
}
catch (IgniteCheckedException e) {
fut.onError(e);
@@ -466,7 +464,7 @@ public class GridNearPessimisticTxPrepareFuture extends GridNearTxPrepareFutureA
/**
* @param res Response.
*/
- void onPrimaryResult(GridNearTxPrepareResponse res) {
+ void onPrimaryResponse(GridNearTxPrepareResponse res) {
if (res.error() != null)
onError(res.error());
else {
http://git-wip-us.apache.org/repos/asf/ignite/blob/baeb2036/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearTxFinishFuture.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearTxFinishFuture.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearTxFinishFuture.java
index 44455ca..56b7284 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearTxFinishFuture.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearTxFinishFuture.java
@@ -1029,8 +1029,11 @@ public final class GridNearTxFinishFuture<K, V> extends GridCompoundIdentityFutu
done = dhtNodes.remove(nodeId) && dhtNodes.isEmpty();
}
- if (done)
+ if (done) {
+ cctx.tm().onFinishedRemote(primary().id(), tx.threadId());
+
onDone(tx);
+ }
}
/**
http://git-wip-us.apache.org/repos/asf/ignite/blob/baeb2036/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearTxLocal.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearTxLocal.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearTxLocal.java
index 8ed749c..80b93e2 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearTxLocal.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearTxLocal.java
@@ -214,13 +214,6 @@ public class GridNearTxLocal extends GridDhtTxLocalAdapter {
}
/** {@inheritDoc} */
- @Override protected IgniteUuid nearFutureId() {
- assert false : "nearFutureId should not be called for colocated transactions.";
-
- return null;
- }
-
- /** {@inheritDoc} */
@Override protected IgniteInternalFuture<Boolean> addReader(
long msgId,
GridDhtCacheEntry cached,
@@ -1002,7 +995,6 @@ public class GridNearTxLocal extends GridDhtTxLocalAdapter {
cctx,
this,
timeout,
- 0,
Collections.<IgniteTxKey, GridCacheVersion>emptyMap(),
last,
needReturnValue() && implicit());
@@ -1065,7 +1057,7 @@ public class GridNearTxLocal extends GridDhtTxLocalAdapter {
// Do not create finish future if there are no remote nodes.
if (F.isEmpty(dhtMap) && F.isEmpty(nearMap)) {
if (prep != null)
- return (IgniteInternalFuture<IgniteInternalTx>)(IgniteInternalFuture)prep;
+ return (IgniteInternalFuture<IgniteInternalTx>)prep;
return new GridFinishedFuture<IgniteInternalTx>(this);
}
http://git-wip-us.apache.org/repos/asf/ignite/blob/baeb2036/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/transactions/IgniteTxHandler.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/transactions/IgniteTxHandler.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/transactions/IgniteTxHandler.java
index 71b847a..aad0e34 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/transactions/IgniteTxHandler.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/transactions/IgniteTxHandler.java
@@ -356,10 +356,6 @@ public class IgniteTxHandler {
if (tx == null)
U.warn(log, "Missing local transaction for mapped near version [nearVer=" + req.version()
+ ", mappedVer=" + mappedVer + ']');
- else {
- if (req.concurrency() == PESSIMISTIC)
- tx.nearFutureId(req.futureId());
- }
}
else {
GridDhtPartitionTopology top = null;
@@ -470,6 +466,7 @@ public class IgniteTxHandler {
tx.explicitLock(true);
tx.transactionNodes(req.transactionNodes());
+ tx.nearPrepareFutureId(req.futureId(), req.miniId());
tx.dhtReplyNear(req.dhtReplyNear());
@@ -490,7 +487,6 @@ public class IgniteTxHandler {
req.writes(),
req.dhtVersions(),
req.messageId(),
- req.miniId(),
req.transactionNodes(),
req.last());
@@ -771,8 +767,10 @@ public class IgniteTxHandler {
* @param req Finish request.
* @return Finish future.
*/
- private IgniteInternalFuture<IgniteInternalTx> finishDhtLocal(UUID nodeId, @Nullable GridNearTxLocal locTx,
- GridNearTxFinishRequest req) {
+ private IgniteInternalFuture<IgniteInternalTx> finishDhtLocal(UUID nodeId,
+ @Nullable GridNearTxLocal locTx,
+ GridNearTxFinishRequest req)
+ {
GridCacheVersion dhtVer = ctx.tm().mappedVersion(req.version());
GridDhtTxLocal tx = null;
@@ -853,6 +851,7 @@ public class IgniteTxHandler {
assert req.syncMode() != null : req;
tx.syncMode(req.syncMode());
+ tx.nearFinishFutureId(req.futureId(), req.miniId());
if (req.commit()) {
tx.storeEnabled(req.storeEnabled());
@@ -864,9 +863,6 @@ public class IgniteTxHandler {
return null;
}
- tx.nearFinishFutureId(req.futureId());
- tx.nearFinishMiniId(req.miniId());
-
IgniteInternalFuture<IgniteInternalTx> commitFut = tx.commitAsync();
// Only for error logging.
@@ -875,9 +871,6 @@ public class IgniteTxHandler {
return commitFut;
}
else {
- tx.nearFinishFutureId(req.futureId());
- tx.nearFinishMiniId(req.miniId());
-
IgniteInternalFuture<IgniteInternalTx> rollbackFut = tx.rollbackAsync();
// Only for error logging.
[35/38] ignite git commit: Merge remote-tracking branch
'remotes/origin/ignite-4768' into ignite-4768-1
Posted by sb...@apache.org.
Merge remote-tracking branch 'remotes/origin/ignite-4768' into ignite-4768-1
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/df806068
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/df806068
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/df806068
Branch: refs/heads/ignite-4768
Commit: df80606846e399ee9561924b3e269db35908f788
Parents: 8d10806 ae4af02
Author: sboikov <sb...@gridgain.com>
Authored: Mon Mar 13 14:59:56 2017 +0300
Committer: sboikov <sb...@gridgain.com>
Committed: Mon Mar 13 14:59:56 2017 +0300
----------------------------------------------------------------------
.../aop/aspectj/GridifyAspectJAspect.java | 15 +-
.../aspectj/GridifySetToSetAspectJAspect.java | 15 +-
.../aspectj/GridifySetToValueAspectJAspect.java | 15 +-
.../aop/spring/GridifySetToSetSpringAspect.java | 15 +-
.../spring/GridifySetToValueSpringAspect.java | 15 +-
.../gridify/aop/spring/GridifySpringAspect.java | 15 +-
.../apache/ignite/gridify/AbstractAopTest.java | 6 +-
.../ignite/gridify/GridifySetToSetTarget.java | 18 +-
.../gridify/GridifySetToSetTargetInterface.java | 18 +-
.../ignite/gridify/GridifySetToValueTarget.java | 16 +-
.../GridifySetToValueTargetInterface.java | 16 +-
.../ignite/gridify/NonSpringAopSelfTest.java | 2 +-
.../ignite/gridify/SpringAopSelfTest.java | 2 +-
.../apache/ignite/gridify/TestAopTarget.java | 16 +-
.../ignite/gridify/TestAopTargetInterface.java | 16 +-
.../gridify/hierarchy/GridifyHierarchyTest.java | 2 +-
.../ignite/gridify/hierarchy/SuperTarget.java | 4 +-
.../apache/ignite/p2p/P2PGridifySelfTest.java | 8 +-
.../singlesplit/SingleSplitsLoadTest.java | 2 +-
.../gridify/GridifySingleSplitLoadTest.java | 6 +-
.../org/test/gridify/ExternalAopTarget.java | 16 +-
.../gridify/ExternalNonSpringAopSelfTest.java | 6 +-
.../spi/checkpoint/s3/S3CheckpointSpi.java | 4 +-
.../s3/S3CheckpointManagerSelfTest.java | 6 +-
.../jmh/cache/JmhCacheAbstractBenchmark.java | 6 +-
.../internal/TaskEventSubjectIdSelfTest.java | 4 +-
.../ClientAbstractMultiThreadedSelfTest.java | 4 +-
.../client/ClientDefaultCacheSelfTest.java | 4 +-
.../internal/client/ClientStartNodeTask.java | 14 +-
.../internal/client/ClientStopNodeTask.java | 2 +-
.../ClientTcpSslAuthenticationSelfTest.java | 4 +-
...skExecutionAfterTopologyRestartSelfTest.java | 4 +-
.../internal/client/ClientTestRestServer.java | 6 +-
.../ClientAbstractMultiNodeSelfTest.java | 4 +-
.../integration/ClientAbstractSelfTest.java | 4 +-
.../integration/ClientPreferDirectSelfTest.java | 4 +-
.../client/router/ClientFailedInitSelfTest.java | 4 +-
.../client/router/RouterFactorySelfTest.java | 4 +-
.../jdbc2/JdbcAbstractDmlStatementSelfTest.java | 16 +-
...BinaryMarshallerInsertStatementSelfTest.java | 4 +-
...cBinaryMarshallerMergeStatementSelfTest.java | 4 +-
.../jdbc2/JdbcComplexQuerySelfTest.java | 4 +-
.../internal/jdbc2/JdbcConnectionSelfTest.java | 4 +-
.../jdbc2/JdbcDistributedJoinsQueryTest.java | 4 +-
.../internal/jdbc2/JdbcEmptyCacheSelfTest.java | 4 +-
.../internal/jdbc2/JdbcLocalCachesSelfTest.java | 4 +-
.../internal/jdbc2/JdbcMetadataSelfTest.java | 4 +-
.../internal/jdbc2/JdbcNoDefaultCacheTest.java | 4 +-
.../jdbc2/JdbcPreparedStatementSelfTest.java | 4 +-
.../internal/jdbc2/JdbcResultSetSelfTest.java | 4 +-
.../internal/jdbc2/JdbcStatementSelfTest.java | 4 +-
.../rest/AbstractRestProcessorSelfTest.java | 4 +-
.../rest/ClientMemcachedProtocolSelfTest.java | 4 +-
.../JettyRestProcessorAbstractSelfTest.java | 6 +-
.../rest/JettyRestProcessorSignedSelfTest.java | 4 +-
.../rest/RestBinaryProtocolSelfTest.java | 4 +-
.../rest/RestMemcacheProtocolSelfTest.java | 4 +-
.../rest/RestProcessorMultiStartSelfTest.java | 4 +-
.../rest/RestProcessorStartSelfTest.java | 8 +-
.../rest/TaskCommandHandlerSelfTest.java | 4 +-
.../tcp/redis/RedisProtocolSelfTest.java | 4 +-
.../ignite/jdbc/JdbcComplexQuerySelfTest.java | 4 +-
.../ignite/jdbc/JdbcConnectionSelfTest.java | 6 +-
.../ignite/jdbc/JdbcEmptyCacheSelfTest.java | 4 +-
.../ignite/jdbc/JdbcLocalCachesSelfTest.java | 4 +-
.../ignite/jdbc/JdbcMetadataSelfTest.java | 4 +-
.../ignite/jdbc/JdbcNoDefaultCacheTest.java | 4 +-
.../jdbc/JdbcPreparedStatementSelfTest.java | 4 +-
.../ignite/jdbc/JdbcResultSetSelfTest.java | 4 +-
.../ignite/jdbc/JdbcStatementSelfTest.java | 4 +-
.../src/test/resources/spring-server-node.xml | 2 +-
.../test/resources/spring-server-ssl-node.xml | 2 +-
.../src/main/java/org/apache/ignite/Ignite.java | 15 +-
.../apache/ignite/IgniteSystemProperties.java | 8 +
.../main/java/org/apache/ignite/Ignition.java | 43 +-
.../org/apache/ignite/IgnitionListener.java | 2 +-
.../org/apache/ignite/cache/CacheManager.java | 2 +-
.../apache/ignite/cache/CacheTypeMetadata.java | 4 +-
.../ignite/cache/query/SqlFieldsQuery.java | 4 +-
.../org/apache/ignite/cache/query/SqlQuery.java | 6 +-
.../apache/ignite/cache/query/TextQuery.java | 4 +-
.../apache/ignite/compute/gridify/Gridify.java | 10 +
.../ignite/compute/gridify/GridifySetToSet.java | 10 +
.../compute/gridify/GridifySetToValue.java | 10 +
.../configuration/CacheConfiguration.java | 25 +-
.../configuration/IgniteConfiguration.java | 44 +-
.../apache/ignite/internal/GridDiagnostic.java | 16 +-
.../ignite/internal/GridKernalContext.java | 6 +-
.../ignite/internal/GridKernalContextImpl.java | 6 +-
.../ignite/internal/GridKernalGatewayImpl.java | 14 +-
.../apache/ignite/internal/GridLoggerProxy.java | 25 +-
.../apache/ignite/internal/IgniteKernal.java | 56 +-
.../ignite/internal/IgniteNodeAttributes.java | 10 +-
.../org/apache/ignite/internal/IgnitionEx.java | 150 +--
.../internal/binary/BinaryClassDescriptor.java | 9 +-
.../ignite/internal/binary/BinaryContext.java | 6 +-
.../internal/binary/BinaryReaderExImpl.java | 2 +-
.../internal/binary/BinaryWriterExImpl.java | 2 +-
.../GridClientConnectionManagerAdapter.java | 2 +-
.../client/router/impl/GridTcpRouterImpl.java | 4 +-
.../internal/cluster/ClusterGroupAdapter.java | 10 +-
.../cluster/ClusterNodeLocalMapImpl.java | 2 +-
.../internal/cluster/IgniteClusterImpl.java | 2 +-
.../ignite/internal/jdbc2/JdbcConnection.java | 4 +-
.../apache/ignite/internal/jdbc2/JdbcUtils.java | 4 +-
.../internal/managers/GridManagerAdapter.java | 2 +-
.../checkpoint/GridCheckpointManager.java | 2 +-
.../managers/communication/GridIoManager.java | 2 +-
.../discovery/GridDiscoveryManager.java | 9 +-
.../eventstorage/GridEventStorageManager.java | 2 +-
.../affinity/GridAffinityProcessor.java | 2 +-
.../processors/cache/GridCacheAdapter.java | 2 +-
.../cache/GridCacheClearAllRunnable.java | 4 +-
.../processors/cache/GridCacheContext.java | 11 +-
.../cache/GridCacheDeploymentManager.java | 2 +-
.../processors/cache/GridCacheEventManager.java | 4 +-
.../cache/GridCacheEvictionManager.java | 9 +-
.../processors/cache/GridCacheGateway.java | 3 +-
.../processors/cache/GridCacheIoManager.java | 2 +-
.../processors/cache/GridCacheMvccManager.java | 2 +-
.../GridCachePartitionExchangeManager.java | 8 +-
.../processors/cache/GridCacheProcessor.java | 20 +-
.../cache/GridCacheSharedContext.java | 6 +-
.../cache/GridCacheSharedTtlCleanupManager.java | 2 +-
.../processors/cache/GridCacheSwapManager.java | 4 +-
.../processors/cache/GridCacheTtlManager.java | 3 +-
.../processors/cache/IgniteCacheProxy.java | 4 +-
.../dht/GridClientPartitionTopology.java | 7 +-
.../distributed/dht/GridDhtLocalPartition.java | 10 +-
.../dht/GridDhtPartitionTopologyImpl.java | 9 +-
.../dht/preloader/GridDhtPartitionDemander.java | 9 +-
.../cache/query/GridCacheQueryAdapter.java | 4 +-
.../cache/query/GridCacheQueryManager.java | 7 +-
.../store/GridCacheStoreManagerAdapter.java | 2 +-
.../cache/store/GridCacheWriteBehindStore.java | 16 +-
.../cache/transactions/IgniteTxManager.java | 2 +-
.../IgniteCacheObjectProcessorImpl.java | 4 +-
.../processors/clock/GridClockServer.java | 2 +-
.../clock/GridClockSyncProcessor.java | 2 +-
.../closure/GridClosureProcessor.java | 6 +-
.../processors/cluster/ClusterProcessor.java | 2 +-
.../processors/cluster/GridUpdateNotifier.java | 14 +-
.../continuous/GridContinuousProcessor.java | 2 +-
.../datastreamer/DataStreamProcessor.java | 4 +-
.../datastructures/DataStructuresProcessor.java | 2 +-
.../processors/igfs/IgfsDataManager.java | 8 +-
.../igfs/IgfsFragmentizerManager.java | 4 +-
.../processors/igfs/IgfsIpcHandler.java | 2 +-
.../processors/igfs/IgfsNoopProcessor.java | 2 +-
.../internal/processors/igfs/IgfsProcessor.java | 2 +-
.../internal/processors/igfs/IgfsServer.java | 6 +-
.../processors/igfs/IgfsServerManager.java | 2 +-
.../processors/igfs/IgfsThreadFactory.java | 6 +-
.../internal/processors/igfs/IgfsUtils.java | 6 +-
.../processors/job/GridJobProcessor.java | 2 +-
.../internal/processors/job/GridJobWorker.java | 2 +-
.../jobmetrics/GridJobMetricsProcessor.java | 3 +-
.../internal/processors/odbc/OdbcProcessor.java | 6 +-
.../processors/platform/PlatformIgnition.java | 34 +-
.../platform/PlatformProcessorImpl.java | 2 +-
.../platform/compute/PlatformAbstractJob.java | 2 +-
.../processors/port/GridPortProcessor.java | 2 +-
.../processors/query/GridQueryIndexing.java | 8 +-
.../processors/query/GridQueryProcessor.java | 1028 ++----------------
.../processors/query/QueryTypeCandidate.java | 66 ++
.../internal/processors/query/QueryUtils.java | 989 +++++++++++++++++
.../query/property/QueryBinaryProperty.java | 6 +-
.../resource/GridResourceProcessor.java | 2 +-
.../processors/rest/GridRestProcessor.java | 8 +-
.../version/GridVersionCommandHandler.java | 2 +-
.../rest/protocols/tcp/GridTcpRestProtocol.java | 2 +-
.../service/GridServiceProcessor.java | 4 +-
.../session/GridTaskSessionProcessor.java | 2 +-
.../processors/task/GridTaskProcessor.java | 2 +-
.../processors/task/GridTaskWorker.java | 2 +-
.../timeout/GridTimeoutProcessor.java | 6 +-
.../suggestions/GridPerformanceSuggestions.java | 6 +-
.../ignite/internal/util/IgniteUtils.java | 33 +-
.../ignite/internal/util/StripedExecutor.java | 32 +-
.../shmem/IpcSharedMemoryServerEndpoint.java | 22 +-
.../util/nio/GridNioAsyncNotifyFilter.java | 16 +-
.../ignite/internal/util/nio/GridNioServer.java | 48 +-
.../ignite/internal/util/worker/GridWorker.java | 22 +-
.../internal/visor/igfs/VisorIgfsEndpoint.java | 26 +-
.../visor/node/VisorBasicConfiguration.java | 12 +-
.../visor/node/VisorNodeDataCollectorJob.java | 2 +-
.../node/VisorNodeDataCollectorJobResult.java | 16 +-
.../visor/node/VisorNodeDataCollectorTask.java | 2 +-
.../node/VisorNodeDataCollectorTaskResult.java | 10 +-
.../apache/ignite/mxbean/IgnitionMXBean.java | 14 +-
.../java/org/apache/ignite/spi/IgniteSpi.java | 6 +-
.../org/apache/ignite/spi/IgniteSpiAdapter.java | 15 +-
.../org/apache/ignite/spi/IgniteSpiThread.java | 6 +-
.../ignite/spi/IgniteSpiThreadFactory.java | 10 +-
.../checkpoint/cache/CacheCheckpointSpi.java | 4 +-
.../spi/checkpoint/jdbc/JdbcCheckpointSpi.java | 2 +-
.../spi/checkpoint/noop/NoopCheckpointSpi.java | 2 +-
.../sharedfs/SharedFsCheckpointSpi.java | 12 +-
.../sharedfs/SharedFsTimeoutTask.java | 6 +-
.../fifoqueue/FifoQueueCollisionSpi.java | 4 +-
.../jobstealing/JobStealingCollisionSpi.java | 4 +-
.../spi/collision/noop/NoopCollisionSpi.java | 2 +-
.../PriorityQueueCollisionSpi.java | 4 +-
.../communication/tcp/TcpCommunicationSpi.java | 20 +-
.../deployment/local/LocalDeploymentSpi.java | 4 +-
.../ignite/spi/discovery/tcp/ClientImpl.java | 2 +-
.../ignite/spi/discovery/tcp/ServerImpl.java | 2 +-
.../spi/discovery/tcp/TcpDiscoveryImpl.java | 4 +-
.../spi/discovery/tcp/TcpDiscoverySpi.java | 8 +-
.../memory/MemoryEventStorageSpi.java | 4 +-
.../spi/failover/always/AlwaysFailoverSpi.java | 4 +-
.../jobstealing/JobStealingFailoverSpi.java | 4 +-
.../spi/failover/never/NeverFailoverSpi.java | 4 +-
.../spi/indexing/noop/NoopIndexingSpi.java | 2 +-
.../adaptive/AdaptiveLoadBalancingSpi.java | 4 +-
.../roundrobin/RoundRobinLoadBalancingSpi.java | 4 +-
.../WeightedRandomLoadBalancingSpi.java | 4 +-
.../spi/swapspace/file/FileSwapSpaceSpi.java | 10 +-
.../spi/swapspace/noop/NoopSwapSpaceSpi.java | 2 +-
.../ignite/startup/BasicWarmupClosure.java | 2 +-
.../startup/cmdline/CommandLineStartup.java | 6 +-
.../org/apache/ignite/stream/StreamVisitor.java | 2 +-
.../ignite/stream/socket/SocketStreamer.java | 6 +-
.../thread/IgniteStripedThreadPoolExecutor.java | 6 +-
.../org/apache/ignite/thread/IgniteThread.java | 57 +-
.../ignite/thread/IgniteThreadFactory.java | 18 +-
.../ignite/thread/IgniteThreadPoolExecutor.java | 12 +-
.../test/config/default-spring-url-testing.xml | 2 +-
.../core/src/test/config/load/dsi-load-base.xml | 2 +-
.../test/config/loaders/grid-cfg-2-grids.xml | 4 +-
.../core/src/test/config/loaders/grid-cfg.xml | 2 +-
.../config/websession/example-cache-client.xml | 2 +-
.../test/config/websession/example-cache2.xml | 2 +-
.../test/config/websession/spring-cache-1.xml | 2 +-
.../test/config/websession/spring-cache-2.xml | 2 +-
.../test/config/websession/spring-cache-3.xml | 2 +-
.../GridCacheAffinityBackupsSelfTest.java | 4 +-
.../ignite/IgniteCacheAffinitySelfTest.java | 6 +-
.../cache/IgniteWarmupClosureSelfTest.java | 4 +-
.../affinity/AffinityClientNodeSelfTest.java | 6 +-
...ityFunctionBackupFilterAbstractSelfTest.java | 4 +-
...unctionExcludeNeighborsAbstractSelfTest.java | 4 +-
.../affinity/AffinityHistoryCleanupTest.java | 4 +-
.../fair/FairAffinityDynamicCacheSelfTest.java | 4 +-
.../fair/FairAffinityFunctionNodesSelfTest.java | 4 +-
.../local/LocalAffinityFunctionTest.java | 4 +-
...cheStoreSessionListenerAbstractSelfTest.java | 4 +-
...heStoreSessionListenerLifecycleSelfTest.java | 4 +-
.../GridCacheLoadOnlyStoreAdapterSelfTest.java | 4 +-
.../IgniteCacheExpiryStoreLoadSelfTest.java | 4 +-
.../store/StoreResourceInjectionSelfTest.java | 4 +-
.../CacheJdbcPojoStoreAbstractSelfTest.java | 4 +-
...eJdbcStoreAbstractMultithreadedSelfTest.java | 4 +-
...CacheJdbcBlobStoreMultithreadedSelfTest.java | 4 +-
.../ignite/igfs/IgfsEventsAbstractSelfTest.java | 13 +-
.../igfs/IgfsFragmentizerAbstractSelfTest.java | 4 +-
.../internal/ClusterGroupAbstractTest.java | 4 +-
.../internal/ClusterGroupHostsSelfTest.java | 4 +-
.../ignite/internal/ClusterMetricsSelfTest.java | 4 +-
.../internal/ClusterNodeMetricsSelfTest.java | 4 +-
.../ComputeJobCancelWithServiceSelfTest.java | 4 +-
.../ignite/internal/GridAffinityMappedTest.java | 11 +-
.../internal/GridAffinityP2PSelfTest.java | 11 +-
.../ignite/internal/GridAffinitySelfTest.java | 8 +-
.../GridAlwaysFailoverSpiFailSelfTest.java | 4 +-
.../internal/GridCacheRecreateLockTest.java | 2 +-
.../internal/GridCancelUnusedJobSelfTest.java | 6 +-
.../GridCancelledJobsMetricsSelfTest.java | 4 +-
.../GridCollisionJobsContextSelfTest.java | 10 +-
.../internal/GridCommunicationSelfTest.java | 2 +-
...omputationBinarylizableClosuresSelfTest.java | 4 +-
.../GridContinuousJobAnnotationSelfTest.java | 4 +-
.../ignite/internal/GridDeploymentSelfTest.java | 16 +-
.../internal/GridDiscoveryEventSelfTest.java | 4 +-
.../ignite/internal/GridDiscoverySelfTest.java | 6 +-
.../GridEventStorageCheckAllEventsSelfTest.java | 2 +-
...ventStorageRuntimeConfigurationSelfTest.java | 4 +-
.../internal/GridFactoryVmShutdownTest.java | 2 +-
...ridFailFastNodeFailureDetectionSelfTest.java | 4 +-
.../GridFailedInputParametersSelfTest.java | 2 +-
.../GridFailoverCustomTopologySelfTest.java | 4 +-
.../ignite/internal/GridFailoverSelfTest.java | 4 +-
.../GridFailoverTaskWithPredicateSelfTest.java | 6 +-
.../internal/GridFailoverTopologySelfTest.java | 4 +-
.../ignite/internal/GridGetOrStartSelfTest.java | 8 +-
.../ignite/internal/GridHomePathSelfTest.java | 8 +-
.../GridJobCheckpointCleanupSelfTest.java | 6 +-
.../GridJobCollisionCancelSelfTest.java | 4 +-
.../GridJobMasterLeaveAwareSelfTest.java | 4 +-
.../internal/GridJobStealingSelfTest.java | 4 +-
.../GridJobStealingZeroActiveJobsSelfTest.java | 6 +-
.../internal/GridLifecycleAwareSelfTest.java | 4 +-
.../internal/GridLifecycleBeanSelfTest.java | 16 +-
.../GridLocalEventListenerSelfTest.java | 6 +-
.../internal/GridMultipleJobsSelfTest.java | 6 +-
.../internal/GridMultipleSpisSelfTest.java | 4 +-
.../GridMultipleVersionsDeploymentSelfTest.java | 4 +-
.../GridMultithreadedJobStealingSelfTest.java | 4 +-
.../ignite/internal/GridNodeLocalSelfTest.java | 2 +-
.../internal/GridNodeMetricsLogSelfTest.java | 4 +-
.../GridNodeVisorAttributesSelfTest.java | 4 +-
.../internal/GridNonHistoryMetricsSelfTest.java | 4 +-
.../GridProjectionForCachesSelfTest.java | 18 +-
...ectionLocalJobMultipleArgumentsSelfTest.java | 4 +-
.../internal/GridReleaseTypeSelfTest.java | 4 +-
.../internal/GridRuntimeExceptionSelfTest.java | 8 +-
.../internal/GridSpiExceptionSelfTest.java | 8 +-
.../ignite/internal/GridStartStopSelfTest.java | 6 +-
.../internal/GridStopWithWaitSelfTest.java | 12 +-
.../GridTaskFailoverAffinityRunTest.java | 6 +-
.../GridTaskFutureImplStopGridSelfTest.java | 8 +-
.../GridTaskInstanceExecutionSelfTest.java | 2 +-
.../internal/GridTaskJobRejectSelfTest.java | 4 +-
.../internal/GridTaskListenerSelfTest.java | 2 +-
.../internal/GridTaskMapAsyncSelfTest.java | 6 +-
.../internal/GridTaskResultCacheSelfTest.java | 4 +-
.../internal/GridTaskTimeoutSelfTest.java | 8 +-
.../IgniteClientReconnectAbstractTest.java | 4 +-
.../IgniteClientReconnectApiExceptionTest.java | 4 +-
.../IgniteClientReconnectCacheTest.java | 13 +-
...niteClientReconnectFailoverAbstractTest.java | 4 +-
.../IgniteClientReconnectFailoverTest.java | 4 +-
.../IgniteClientReconnectStreamerTest.java | 4 +-
.../IgniteComputeEmptyClusterGroupTest.java | 4 +-
.../internal/IgniteExecutorServiceTest.java | 14 +-
...gniteExplicitImplicitDeploymentSelfTest.java | 4 +-
.../IgniteLocalNodeMapBeforeStartTest.java | 2 +-
...RoundRobinErrorAfterClientReconnectTest.java | 6 +-
.../IgniteSlowClientDetectionSelfTest.java | 7 +-
...UpdateNotifierPerClusterSettingSelfTest.java | 4 +-
.../ignite/internal/TaskNodeRestartTest.java | 4 +-
.../internal/TestRecordingCommunicationSpi.java | 4 +-
.../BinaryArrayIdentityResolverSelfTest.java | 4 +-
.../BinaryConfigurationConsistencySelfTest.java | 4 +-
.../internal/binary/BinaryEnumsSelfTest.java | 4 +-
.../BinaryFieldIdentityResolverSelfTest.java | 4 +-
...ryIdentityResolverConfigurationSelfTest.java | 4 +-
.../BinaryObjectBuilderAdditionalSelfTest.java | 4 +-
...naryObjectBuilderDefaultMappersSelfTest.java | 4 +-
...ilderSimpleNameLowerCaseMappersSelfTest.java | 4 +-
.../binary/BinaryObjectToStringSelfTest.java | 4 +-
.../BinarySerialiedFieldComparatorSelfTest.java | 4 +-
.../internal/binary/BinaryTreeSelfTest.java | 2 +-
.../binary/GridBinaryAffinityKeySelfTest.java | 6 +-
...aultBinaryMappersBinaryMetaDataSelfTest.java | 4 +-
...CaseBinaryMappersBinaryMetaDataSelfTest.java | 4 +-
...GridManagerLocalMessageListenerSelfTest.java | 6 +-
.../managers/GridNoopManagerSelfTest.java | 2 +-
.../GridCheckpointManagerAbstractSelfTest.java | 33 +-
.../checkpoint/GridCheckpointTaskSelfTest.java | 4 +-
...idCommunicationManagerListenersSelfTest.java | 6 +-
.../GridCommunicationSendMessageSelfTest.java | 4 +-
.../IgniteCommunicationBalanceTest.java | 4 +-
.../communication/IgniteIoTestMessagesTest.java | 4 +-
.../IgniteVariousConnectionNumberTest.java | 6 +-
.../GridDeploymentManagerStopSelfTest.java | 2 +-
.../GridDeploymentMessageCountSelfTest.java | 6 +-
.../GridDiscoveryManagerAliveCacheSelfTest.java | 6 +-
.../GridDiscoveryManagerAttributesSelfTest.java | 10 +-
.../IgniteTopologyPrintFormatSelfTest.java | 8 +-
.../events/GridEventStorageManagerSelfTest.java | 4 +-
.../swapspace/GridSwapSpaceManagerSelfTest.java | 4 +-
.../GridCacheTxLoadFromStoreOnLockSelfTest.java | 4 +-
.../GridAffinityProcessorAbstractSelfTest.java | 4 +-
.../BinaryObjectOffHeapUnswapTemporaryTest.java | 4 +-
.../cache/CacheAffinityCallSelfTest.java | 6 +-
.../CacheAtomicSingleMessageCountSelfTest.java | 4 +-
.../cache/CacheClientStoreSelfTest.java | 6 +-
...cheDhtLocalPartitionAfterRemoveSelfTest.java | 4 +-
.../cache/CacheEntryProcessorCopySelfTest.java | 4 +-
.../cache/CacheEnumOperationsAbstractTest.java | 4 +-
...CacheExchangeMessageDuplicatedStateTest.java | 6 +-
.../cache/CacheFutureExceptionSelfTest.java | 6 +-
.../cache/CacheGetEntryAbstractTest.java | 4 +-
...erceptorPartitionCounterLocalSanityTest.java | 4 +-
...torPartitionCounterRandomOperationsTest.java | 4 +-
.../CacheMetricsForClusterGroupSelfTest.java | 4 +-
.../processors/cache/CacheNamesSelfTest.java | 4 +-
.../CacheNamesWithSpecialCharactersTest.java | 4 +-
.../cache/CacheNearReaderUpdateTest.java | 4 +-
.../cache/CacheOffheapMapEntrySelfTest.java | 6 +-
.../CachePutEventListenerErrorSelfTest.java | 4 +-
.../processors/cache/CachePutIfAbsentTest.java | 4 +-
.../cache/CacheReadThroughRestartSelfTest.java | 6 +-
.../cache/CacheRebalancingSelfTest.java | 4 +-
.../CacheSerializableTransactionsTest.java | 4 +-
.../CacheStartupInDeploymentModesTest.java | 4 +-
.../cache/CacheStopAndDestroySelfTest.java | 6 +-
.../CacheStoreUsageMultinodeAbstractTest.java | 10 +-
.../cache/CacheSwapUnswapGetTest.java | 4 +-
.../CacheSwapUnswapGetTestSmallQueueSize.java | 4 +-
.../processors/cache/CacheTxFastFinishTest.java | 4 +-
.../CacheTxNotAllowReadFromBackupTest.java | 4 +-
.../processors/cache/CrossCacheLockTest.java | 6 +-
.../cache/CrossCacheTxRandomOperationsTest.java | 6 +-
.../EntryVersionConsistencyReadThroughTest.java | 4 +-
...idAbstractCacheInterceptorRebalanceTest.java | 4 +-
...ridCacheAbstractByteArrayValuesSelfTest.java | 4 +-
.../GridCacheAbstractFailoverSelfTest.java | 14 +-
.../cache/GridCacheAbstractFullApiSelfTest.java | 20 +-
.../GridCacheAbstractLocalStoreSelfTest.java | 24 +-
.../GridCacheAbstractRemoveFailureTest.java | 6 +-
.../cache/GridCacheAbstractSelfTest.java | 10 +-
.../cache/GridCacheAbstractTxReadTest.java | 8 +-
...acheAbstractUsersAffinityMapperSelfTest.java | 4 +-
.../cache/GridCacheAffinityApiSelfTest.java | 4 +-
.../cache/GridCacheAffinityRoutingSelfTest.java | 6 +-
.../GridCacheAsyncOperationsLimitSelfTest.java | 4 +-
...eAtomicEntryProcessorDeploymentSelfTest.java | 4 +-
.../GridCacheAtomicMessageCountSelfTest.java | 4 +-
.../cache/GridCacheBasicApiAbstractTest.java | 4 +-
.../cache/GridCacheBasicStoreAbstractTest.java | 4 +-
...acheBasicStoreMultithreadedAbstractTest.java | 4 +-
.../cache/GridCacheClearAllSelfTest.java | 4 +-
.../cache/GridCacheClearLocallySelfTest.java | 10 +-
.../cache/GridCacheClearSelfTest.java | 4 +-
.../cache/GridCacheConcurrentMapSelfTest.java | 4 +-
.../cache/GridCacheConcurrentMapTest.java | 4 +-
.../GridCacheConcurrentTxMultiNodeTest.java | 18 +-
.../GridCacheConditionalDeploymentSelfTest.java | 4 +-
...idCacheConfigurationConsistencySelfTest.java | 4 +-
...ridCacheConfigurationValidationSelfTest.java | 46 +-
.../GridCacheDaemonNodeAbstractSelfTest.java | 4 +-
.../cache/GridCacheDeploymentSelfTest.java | 22 +-
.../cache/GridCacheEntryMemorySizeSelfTest.java | 4 +-
.../cache/GridCacheEntryVersionSelfTest.java | 4 +-
.../GridCacheFinishPartitionsSelfTest.java | 4 +-
...CacheFullTextQueryMultithreadedSelfTest.java | 4 +-
...idCacheGetAndTransformStoreAbstractTest.java | 4 +-
.../cache/GridCacheIncrementTransformTest.java | 4 +-
.../GridCacheInterceptorAbstractSelfTest.java | 8 +-
.../cache/GridCacheIteratorPerformanceTest.java | 4 +-
.../cache/GridCacheKeyCheckSelfTest.java | 4 +-
.../processors/cache/GridCacheLeakTest.java | 4 +-
.../cache/GridCacheLifecycleAwareSelfTest.java | 4 +-
.../cache/GridCacheLuceneQueryIndexTest.java | 4 +-
.../GridCacheMarshallerTxAbstractTest.java | 4 +-
.../GridCacheMarshallingNodeJoinSelfTest.java | 4 +-
.../cache/GridCacheMemoryModeSelfTest.java | 4 +-
...GridCacheMixedPartitionExchangeSelfTest.java | 4 +-
.../cache/GridCacheMultiUpdateLockSelfTest.java | 4 +-
...ridCacheMultinodeUpdateAbstractSelfTest.java | 4 +-
...inodeUpdateNearEnabledNoBackupsSelfTest.java | 4 +-
.../cache/GridCacheMvccManagerSelfTest.java | 4 +-
.../cache/GridCacheNestedTxAbstractTest.java | 4 +-
.../cache/GridCacheObjectToStringSelfTest.java | 4 +-
.../cache/GridCacheOffHeapCleanupTest.java | 4 +-
...HeapMultiThreadedUpdateAbstractSelfTest.java | 2 +-
.../GridCacheOffHeapTieredAbstractSelfTest.java | 4 +-
...heOffHeapTieredEvictionAbstractSelfTest.java | 4 +-
.../cache/GridCacheOffheapUpdateSelfTest.java | 4 +-
.../GridCacheOnCopyFlagAbstractSelfTest.java | 4 +-
.../GridCacheOrderedPreloadingSelfTest.java | 4 +-
.../cache/GridCacheP2PUndeploySelfTest.java | 4 +-
.../cache/GridCachePartitionedGetSelfTest.java | 4 +-
...hePartitionedProjectionAffinitySelfTest.java | 4 +-
.../cache/GridCachePartitionedWritesTest.java | 4 +-
.../GridCachePreloadingEvictionsSelfTest.java | 4 +-
.../cache/GridCachePutAllFailoverSelfTest.java | 10 +-
.../GridCacheQueryIndexingDisabledSelfTest.java | 4 +-
.../GridCacheQueryInternalKeysSelfTest.java | 4 +-
.../GridCacheReferenceCleanupSelfTest.java | 4 +-
.../cache/GridCacheReloadSelfTest.java | 4 +-
...ridCacheReplicatedSynchronousCommitTest.java | 6 +-
.../GridCacheReturnValueTransferSelfTest.java | 4 +-
.../cache/GridCacheSlowTxWarnTest.java | 4 +-
.../processors/cache/GridCacheStopSelfTest.java | 4 +-
...ridCacheStoreManagerDeserializationTest.java | 6 +-
.../cache/GridCacheStorePutxSelfTest.java | 4 +-
.../cache/GridCacheStoreValueBytesSelfTest.java | 4 +-
.../cache/GridCacheSwapCleanupTest.java | 4 +-
.../cache/GridCacheSwapPreloadSelfTest.java | 4 +-
.../cache/GridCacheSwapReloadSelfTest.java | 4 +-
...ridCacheSwapSpaceSpiConsistencySelfTest.java | 10 +-
...acheTcpClientDiscoveryMultiThreadedTest.java | 4 +-
.../GridCacheTtlManagerEvictionSelfTest.java | 4 +-
.../GridCacheTtlManagerNotificationTest.java | 4 +-
.../cache/GridCacheTtlManagerSelfTest.java | 4 +-
.../GridCacheValueBytesPreloadingSelfTest.java | 10 +-
...idCacheValueConsistencyAbstractSelfTest.java | 4 +-
.../GridCacheVariableTopologySelfTest.java | 4 +-
.../cache/GridCacheVersionMultinodeTest.java | 4 +-
.../GridCacheVersionTopologyChangeTest.java | 4 +-
.../cache/GridLocalIgniteSerializationTest.java | 10 +-
...ProjectionForCachesOnDaemonNodeSelfTest.java | 4 +-
.../IgniteCacheAbstractStopBusySelfTest.java | 6 +-
.../cache/IgniteCacheAbstractTest.java | 10 +-
...IgniteCacheBinaryEntryProcessorSelfTest.java | 6 +-
.../IgniteCacheBinaryObjectsScanSelfTest.java | 6 +-
...teCacheConfigurationDefaultTemplateTest.java | 4 +-
.../IgniteCacheConfigurationTemplateTest.java | 4 +-
.../IgniteCacheContainsKeyAbstractSelfTest.java | 8 +-
...niteCacheCopyOnReadDisabledAbstractTest.java | 4 +-
.../cache/IgniteCacheCreateRestartSelfTest.java | 4 +-
.../IgniteCacheEntryListenerAbstractTest.java | 8 +-
...niteCacheEntryListenerExpiredEventsTest.java | 4 +-
.../IgniteCacheEntryProcessorCallTest.java | 8 +-
.../IgniteCacheEntryProcessorNodeJoinTest.java | 4 +-
...niteCacheExpireAndUpdateConsistencyTest.java | 4 +-
...IgniteCacheGetCustomCollectionsSelfTest.java | 4 +-
.../cache/IgniteCacheIncrementTxTest.java | 6 +-
...gniteCacheInvokeReadThroughAbstractTest.java | 4 +-
...gniteCacheLoadRebalanceEvictionSelfTest.java | 4 +-
.../IgniteCacheManyAsyncOperationsTest.java | 6 +-
.../cache/IgniteCacheNearLockValueSelfTest.java | 6 +-
.../IgniteCacheP2pUnmarshallingErrorTest.java | 8 +-
...gniteCacheP2pUnmarshallingNearErrorTest.java | 4 +-
.../IgniteCacheP2pUnmarshallingTxErrorTest.java | 6 +-
.../IgniteCachePartitionMapUpdateTest.java | 4 +-
.../cache/IgniteCachePeekModesAbstractTest.java | 8 +-
.../cache/IgniteCachePutAllRestartTest.java | 4 +-
.../IgniteCachePutStackOverflowSelfTest.java | 4 +-
.../IgniteCacheReadThroughEvictionSelfTest.java | 2 +-
.../IgniteCacheReadThroughStoreCallTest.java | 4 +-
...iteCacheScanPredicateDeploymentSelfTest.java | 6 +-
.../cache/IgniteCacheSerializationSelfTest.java | 6 +-
.../cache/IgniteCacheStartStopLoadTest.java | 4 +-
.../cache/IgniteCacheStoreCollectionTest.java | 4 +-
.../IgniteCacheStoreValueAbstractTest.java | 8 +-
.../IgniteCacheTopologySafeGetSelfTest.java | 4 +-
.../cache/IgniteCacheTxPreloadNoWriteTest.java | 4 +-
.../cache/IgniteCachingProviderSelfTest.java | 8 +-
.../IgniteClientAffinityAssignmentSelfTest.java | 4 +-
.../IgniteDaemonNodeMarshallerCacheTest.java | 4 +-
.../cache/IgniteDynamicCacheAndNodeStop.java | 4 +-
.../cache/IgniteDynamicCacheFilterTest.java | 4 +-
...eDynamicCacheStartNoExchangeTimeoutTest.java | 6 +-
.../cache/IgniteDynamicCacheStartSelfTest.java | 4 +-
...niteDynamicCacheStartStopConcurrentTest.java | 4 +-
...niteDynamicCacheWithConfigStartSelfTest.java | 4 +-
.../IgniteDynamicClientCacheStartSelfTest.java | 8 +-
.../cache/IgniteInternalCacheTypesTest.java | 6 +-
...eMarshallerCacheConcurrentReadWriteTest.java | 4 +-
.../cache/IgniteOnePhaseCommitNearSelfTest.java | 10 +-
.../cache/IgnitePutAllLargeBatchSelfTest.java | 10 +-
...tAllUpdateNonPreloadedPartitionSelfTest.java | 10 +-
.../IgniteStartCacheInTransactionSelfTest.java | 4 +-
.../cache/IgniteStaticCacheStartSelfTest.java | 4 +-
.../cache/IgniteSystemCacheOnClientTest.java | 6 +-
...gniteTopologyValidatorAbstractCacheTest.java | 10 +-
...niteTopologyValidatorGridSplitCacheTest.java | 2 +-
.../processors/cache/IgniteTxAbstractTest.java | 4 +-
.../IgniteTxConcurrentGetAbstractTest.java | 4 +-
.../cache/IgniteTxConfigCacheSelfTest.java | 4 +-
.../IgniteTxExceptionAbstractSelfTest.java | 10 +-
.../cache/IgniteTxMultiNodeAbstractTest.java | 4 +-
.../cache/IgniteTxReentryAbstractSelfTest.java | 4 +-
.../IgniteTxStoreExceptionAbstractSelfTest.java | 8 +-
.../MarshallerCacheJobRunNodeRestartTest.java | 4 +-
.../cache/OffHeapTieredTransactionSelfTest.java | 4 +-
...heapCacheMetricsForClusterGroupSelfTest.java | 4 +-
.../cache/OffheapCacheOnClientsTest.java | 4 +-
...sExchangeOnDiscoveryHistoryOverflowTest.java | 2 +-
.../CacheKeepBinaryWithInterceptorTest.java | 4 +-
...ryDuplicateIndexObjectsAbstractSelfTest.java | 8 +-
...acheBinaryObjectUserClassloaderSelfTest.java | 10 +-
...naryObjectsAbstractDataStreamerSelfTest.java | 4 +-
...aryObjectsAbstractMultiThreadedSelfTest.java | 4 +-
.../GridCacheBinaryObjectsAbstractSelfTest.java | 4 +-
.../GridCacheBinaryStoreAbstractSelfTest.java | 4 +-
...yStoreBinariesSimpleNameMappersSelfTest.java | 4 +-
...ntNodeBinaryObjectMetadataMultinodeTest.java | 4 +-
...CacheClientNodeBinaryObjectMetadataTest.java | 6 +-
.../DataStreamProcessorBinarySelfTest.java | 4 +-
.../GridDataStreamerImplSelfTest.java | 4 +-
.../GridCacheAffinityRoutingBinarySelfTest.java | 4 +-
...sNearPartitionedByteArrayValuesSelfTest.java | 4 +-
...sPartitionedOnlyByteArrayValuesSelfTest.java | 4 +-
.../dht/GridCacheMemoryModeBinarySelfTest.java | 4 +-
...dCacheOffHeapTieredAtomicBinarySelfTest.java | 4 +-
.../GridCacheOffHeapTieredBinarySelfTest.java | 4 +-
...fHeapTieredEvictionAtomicBinarySelfTest.java | 4 +-
...acheOffHeapTieredEvictionBinarySelfTest.java | 4 +-
...IgniteCacheAbstractExecutionContextTest.java | 8 +-
...niteCacheContinuousExecutionContextTest.java | 4 +-
...IgniteCacheIsolatedExecutionContextTest.java | 4 +-
...niteCacheP2PDisableExecutionContextTest.java | 4 +-
.../IgniteCachePrivateExecutionContextTest.java | 4 +-
.../IgniteCacheSharedExecutionContextTest.java | 4 +-
...eAbstractDataStructuresFailoverSelfTest.java | 46 +-
...actQueueFailoverDataConsistencySelfTest.java | 4 +-
.../GridCacheQueueCleanupSelfTest.java | 4 +-
...GridCacheQueueMultiNodeAbstractSelfTest.java | 6 +-
.../GridCacheSequenceApiSelfAbstractTest.java | 4 +-
.../IgniteAtomicLongApiAbstractSelfTest.java | 4 +-
.../IgniteAtomicsAbstractTest.java | 4 +-
.../IgniteClientDataStructuresAbstractTest.java | 6 +-
.../IgniteCollectionAbstractTest.java | 4 +-
.../IgniteDataStructureUniqueNameTest.java | 4 +-
.../IgniteDataStructureWithJobTest.java | 4 +-
.../IgniteSemaphoreAbstractSelfTest.java | 2 +-
...SemaphoreFailoverSafeReleasePermitsTest.java | 4 +-
...achePartitionedAtomicSequenceTxSelfTest.java | 4 +-
...idCachePartitionedNodeRestartTxSelfTest.java | 4 +-
...PartitionedQueueCreateMultiNodeSelfTest.java | 4 +-
.../CacheAbstractRestartSelfTest.java | 6 +-
.../distributed/CacheAffinityEarlyTest.java | 4 +-
...acheAsyncOperationsFailoverAbstractTest.java | 8 +-
.../distributed/CacheAsyncOperationsTest.java | 6 +-
.../CacheGetFutureHangsSelfTest.java | 4 +-
.../CacheGetInsideLockChangingTopologyTest.java | 4 +-
...ffinityAssignmentNodeJoinValidationTest.java | 4 +-
.../CacheLateAffinityAssignmentTest.java | 59 +-
...CacheLoadingConcurrentGridStartSelfTest.java | 12 +-
.../CacheLockReleaseNodeLeaveTest.java | 4 +-
.../CachePutAllFailoverAbstractTest.java | 8 +-
.../CacheTryLockMultithreadedTest.java | 4 +-
...tractDistributedByteArrayValuesSelfTest.java | 4 +-
.../GridCacheAbstractJobExecutionTest.java | 8 +-
.../GridCacheAbstractNodeRestartSelfTest.java | 4 +-
...tractPartitionedByteArrayValuesSelfTest.java | 4 +-
.../GridCacheAbstractPrimarySyncSelfTest.java | 4 +-
.../GridCacheBasicOpAbstractTest.java | 4 +-
.../GridCacheClientModesAbstractSelfTest.java | 24 +-
...ientModesTcpClientDiscoveryAbstractTest.java | 4 +-
...acheEntrySetIterationPreloadingSelfTest.java | 4 +-
.../distributed/GridCacheEventAbstractTest.java | 2 +-
...heExpiredEntriesPreloadAbstractSelfTest.java | 4 +-
.../distributed/GridCacheLockAbstractTest.java | 4 +-
.../distributed/GridCacheMixedModeSelfTest.java | 12 +-
.../GridCacheMultiNodeAbstractTest.java | 4 +-
.../GridCacheMultiNodeLockAbstractTest.java | 4 +-
...dCacheMultithreadedFailoverAbstractTest.java | 8 +-
.../GridCacheNodeFailureAbstractTest.java | 4 +-
...ridCachePartitionNotLoadedEventSelfTest.java | 8 +-
...chePartitionedReloadAllAbstractSelfTest.java | 4 +-
.../GridCachePreloadEventsAbstractSelfTest.java | 4 +-
.../GridCachePreloadLifecycleAbstractTest.java | 4 +-
...GridCachePreloadRestartAbstractSelfTest.java | 4 +-
.../GridCacheTransformEventSelfTest.java | 4 +-
...yMetadataUpdateChangingTopologySelfTest.java | 11 +-
...niteBinaryMetadataUpdateNodeRestartTest.java | 4 +-
.../distributed/IgniteCache150ClientsTest.java | 6 +-
...micMessageRecoveryPairedConnectionsTest.java | 4 +-
...niteCacheClientNodeChangingTopologyTest.java | 15 +-
.../IgniteCacheClientNodeConcurrentStart.java | 6 +-
...teCacheClientNodePartitionsExchangeTest.java | 8 +-
.../IgniteCacheClientReconnectTest.java | 4 +-
...acheConnectionRecovery10ConnectionsTest.java | 4 +-
.../IgniteCacheConnectionRecoveryTest.java | 4 +-
.../IgniteCacheCreatePutMultiNodeSelfTest.java | 4 +-
.../distributed/IgniteCacheCreatePutTest.java | 4 +-
.../distributed/IgniteCacheGetRestartTest.java | 6 +-
.../distributed/IgniteCacheManyClientsTest.java | 4 +-
.../IgniteCacheMessageRecoveryAbstractTest.java | 4 +-
...eCacheMessageRecoveryIdleConnectionTest.java | 4 +-
.../IgniteCacheMessageWriteTimeoutTest.java | 4 +-
.../IgniteCacheNearOffheapGetSelfTest.java | 12 +-
.../IgniteCacheNearRestartRollbackSelfTest.java | 12 +-
.../IgniteCacheNodeJoinAbstractTest.java | 4 +-
.../distributed/IgniteCachePrimarySyncTest.java | 4 +-
.../IgniteCachePutGetRestartAbstractTest.java | 10 +-
.../IgniteCacheReadFromBackupTest.java | 4 +-
.../IgniteCacheServerNodeConcurrentStart.java | 4 +-
.../IgniteCacheSingleGetMessageTest.java | 4 +-
.../IgniteCacheSizeFailoverTest.java | 4 +-
.../IgniteCacheSystemTransactionsSelfTest.java | 4 +-
.../IgniteCacheTxFairAffinityNodeJoinTest.java | 4 +-
.../IgniteCacheTxIteratorSelfTest.java | 4 +-
...arDisabledFairAffinityPutGetRestartTest.java | 4 +-
.../IgniteCrossCacheTxStoreSelfTest.java | 16 +-
.../IgniteTxCachePrimarySyncTest.java | 4 +-
...teSynchronizationModesMultithreadedTest.java | 4 +-
...iteTxConsistencyRestartAbstractSelfTest.java | 10 +-
...xOriginatingNodeFailureAbstractSelfTest.java | 8 +-
...cOriginatingNodeFailureAbstractSelfTest.java | 8 +-
.../IgniteTxPreloadAbstractTest.java | 4 +-
...tPartitionedOnlyByteArrayValuesSelfTest.java | 4 +-
...heAbstractTransformWriteThroughSelfTest.java | 4 +-
.../dht/GridCacheAtomicFullApiSelfTest.java | 4 +-
.../dht/GridCacheAtomicNearCacheSelfTest.java | 18 +-
.../dht/GridCacheColocatedDebugTest.java | 4 +-
...eColocatedOptimisticTransactionSelfTest.java | 4 +-
...dCacheColocatedTxSingleThreadedSelfTest.java | 4 +-
.../dht/GridCacheDhtEntrySelfTest.java | 4 +-
.../dht/GridCacheDhtEntrySetSelfTest.java | 4 +-
...GridCacheDhtEvictionNearReadersSelfTest.java | 4 +-
.../dht/GridCacheDhtEvictionSelfTest.java | 4 +-
.../GridCacheDhtEvictionsDisabledSelfTest.java | 4 +-
.../dht/GridCacheDhtMappingSelfTest.java | 4 +-
.../dht/GridCacheDhtPreloadBigDataSelfTest.java | 4 +-
.../dht/GridCacheDhtPreloadDelayedSelfTest.java | 9 +-
.../GridCacheDhtPreloadDisabledSelfTest.java | 6 +-
.../GridCacheDhtPreloadMessageCountTest.java | 4 +-
...ridCacheDhtPreloadMultiThreadedSelfTest.java | 10 +-
.../dht/GridCacheDhtPreloadOffHeapSelfTest.java | 4 +-
.../dht/GridCacheDhtPreloadPerformanceTest.java | 4 +-
.../dht/GridCacheDhtPreloadPutGetSelfTest.java | 4 +-
.../dht/GridCacheDhtPreloadSelfTest.java | 16 +-
.../GridCacheDhtPreloadStartStopSelfTest.java | 8 +-
.../dht/GridCacheDhtPreloadUnloadSelfTest.java | 4 +-
.../dht/GridCacheDhtTxPreloadSelfTest.java | 4 +-
.../dht/GridCacheGlobalLoadTest.java | 4 +-
...ledFairAffinityMultiNodeFullApiSelfTest.java | 4 +-
...ePartitionedNearDisabledMetricsSelfTest.java | 8 +-
...idCachePartitionedPreloadEventsSelfTest.java | 4 +-
...dCachePartitionedTopologyChangeSelfTest.java | 6 +-
...itionedTxOriginatingNodeFailureSelfTest.java | 4 +-
...ridCachePartitionedUnloadEventsSelfTest.java | 4 +-
.../dht/GridCacheTxNodeFailureSelfTest.java | 10 +-
.../dht/GridNearCacheTxNodeFailureSelfTest.java | 4 +-
...gniteAtomicLongChangingTopologySelfTest.java | 4 +-
.../IgniteCacheCommitDelayTxRecoveryTest.java | 4 +-
.../dht/IgniteCacheConcurrentPutGetRemove.java | 4 +-
.../IgniteCacheCrossCacheTxFailoverTest.java | 6 +-
.../dht/IgniteCacheLockFailoverSelfTest.java | 8 +-
.../dht/IgniteCacheMultiTxLockSelfTest.java | 4 +-
...artitionedBackupNodeFailureRecoveryTest.java | 4 +-
...woBackupsPrimaryNodeFailureRecoveryTest.java | 4 +-
...ePrimaryNodeFailureRecoveryAbstractTest.java | 4 +-
.../IgniteCachePutRetryAbstractSelfTest.java | 4 +-
.../dht/IgniteCrossCacheTxSelfTest.java | 4 +-
.../AtomicPutAllChangingTopologyTest.java | 2 +-
.../atomic/GridCacheAtomicFailoverSelfTest.java | 4 +-
...eAtomicInvalidPartitionHandlingSelfTest.java | 6 +-
.../atomic/GridCacheAtomicPreloadSelfTest.java | 4 +-
...AtomicPrimaryWriteOrderFailoverSelfTest.java | 4 +-
...tionedMultiNodeLongTxTimeoutFullApiTest.java | 4 +-
...nabledMultiNodeLongTxTimeoutFullApiTest.java | 4 +-
...nlyFairAffinityMultiNodeFullApiSelfTest.java | 4 +-
...tomicClientOnlyMultiNodeFullApiSelfTest.java | 4 +-
...OnlyMultiNodeP2PDisabledFullApiSelfTest.java | 4 +-
...yOnReadDisabledMultiNodeFullApiSelfTest.java | 4 +-
...micFairAffinityMultiNodeFullApiSelfTest.java | 4 +-
...imaryWriteOrderMultiNodeFullApiSelfTest.java | 4 +-
...GridCacheAtomicMultiNodeFullApiSelfTest.java | 4 +-
...omicMultiNodeP2PDisabledFullApiSelfTest.java | 4 +-
...ledFairAffinityMultiNodeFullApiSelfTest.java | 4 +-
...eAtomicNearOnlyMultiNodeFullApiSelfTest.java | 4 +-
...OnlyMultiNodeP2PDisabledFullApiSelfTest.java | 4 +-
.../GridCacheAtomicOffHeapFullApiSelfTest.java | 4 +-
...heAtomicOffHeapMultiNodeFullApiSelfTest.java | 4 +-
...idCacheAtomicPartitionedMetricsSelfTest.java | 4 +-
...derFairAffinityMultiNodeFullApiSelfTest.java | 4 +-
...erNoStripedPoolMultiNodeFullApiSelfTest.java | 4 +-
.../near/GridCacheGetStoreErrorSelfTest.java | 4 +-
.../near/GridCacheNearEvictionSelfTest.java | 4 +-
.../near/GridCacheNearJobExecutionSelfTest.java | 4 +-
.../near/GridCacheNearMetricsSelfTest.java | 4 +-
.../near/GridCacheNearMultiGetSelfTest.java | 8 +-
.../near/GridCacheNearMultiNodeSelfTest.java | 4 +-
...nlyFairAffinityMultiNodeFullApiSelfTest.java | 4 +-
...idCacheNearOnlyMultiNodeFullApiSelfTest.java | 10 +-
...OnlyMultiNodeP2PDisabledFullApiSelfTest.java | 4 +-
.../near/GridCacheNearOnlyTopologySelfTest.java | 4 +-
.../GridCacheNearPartitionedClearSelfTest.java | 4 +-
.../GridCacheNearReaderPreloadSelfTest.java | 6 +-
.../near/GridCacheNearReadersSelfTest.java | 4 +-
.../near/GridCacheNearTxForceKeyTest.java | 4 +-
.../near/GridCacheNearTxMultiNodeSelfTest.java | 4 +-
.../near/GridCacheNearTxPreloadSelfTest.java | 4 +-
...AffinityExcludeNeighborsPerformanceTest.java | 4 +-
...rtitionedAffinityHashIdResolverSelfTest.java | 4 +-
.../GridCachePartitionedAffinitySelfTest.java | 20 +-
.../near/GridCachePartitionedBasicApiTest.java | 4 +-
.../GridCachePartitionedBasicOpSelfTest.java | 4 +-
...ePartitionedBasicStoreMultiNodeSelfTest.java | 4 +-
...ionedClientOnlyNoPrimaryFullApiSelfTest.java | 4 +-
...yOnReadDisabledMultiNodeFullApiSelfTest.java | 4 +-
.../near/GridCachePartitionedEventSelfTest.java | 2 +-
.../GridCachePartitionedEvictionSelfTest.java | 4 +-
...titionedExplicitLockNodeFailureSelfTest.java | 4 +-
...GridCachePartitionedFilteredPutSelfTest.java | 4 +-
.../GridCachePartitionedFullApiSelfTest.java | 8 +-
...idCachePartitionedHitsAndMissesSelfTest.java | 4 +-
...LateAffDisabledMultiNodeFullApiSelfTest.java | 4 +-
.../GridCachePartitionedLoadCacheSelfTest.java | 4 +-
.../near/GridCachePartitionedLockSelfTest.java | 4 +-
.../GridCachePartitionedMetricsSelfTest.java | 8 +-
...achePartitionedMultiNodeCounterSelfTest.java | 79 +-
...achePartitionedMultiNodeFullApiSelfTest.java | 4 +-
...onedMultiNodeP2PDisabledFullApiSelfTest.java | 4 +-
.../GridCachePartitionedMultiNodeSelfTest.java | 4 +-
...ePartitionedMultiThreadedPutGetSelfTest.java | 4 +-
.../near/GridCachePartitionedNestedTxTest.java | 4 +-
...edNoStripedPoolMultiNodeFullApiSelfTest.java | 4 +-
...GridCachePartitionedNodeFailureSelfTest.java | 4 +-
.../GridCachePartitionedNodeRestartTest.java | 4 +-
...ePartitionedOptimisticTxNodeRestartTest.java | 4 +-
...achePartitionedPreloadLifecycleSelfTest.java | 4 +-
.../GridCachePartitionedStorePutSelfTest.java | 4 +-
...GridCachePartitionedTxConcurrentGetTest.java | 4 +-
...GridCachePartitionedTxMultiNodeSelfTest.java | 4 +-
...CachePartitionedTxMultiThreadedSelfTest.java | 4 +-
.../GridCachePartitionedTxSalvageSelfTest.java | 4 +-
...achePartitionedTxSingleThreadedSelfTest.java | 4 +-
.../GridCachePartitionedTxTimeoutSelfTest.java | 4 +-
.../near/GridCachePutArrayValueSelfTest.java | 4 +-
...idCacheRendezvousAffinityClientSelfTest.java | 4 +-
.../near/GridPartitionedBackupLoadSelfTest.java | 4 +-
.../near/IgniteCacheNearOnlyTxTest.java | 6 +-
.../near/IgniteCacheNearTxRollbackTest.java | 4 +-
.../near/NearCacheMultithreadedUpdateTest.java | 4 +-
.../near/NearCachePutAllMultinodeTest.java | 4 +-
.../near/NearCacheSyncUpdateTest.java | 4 +-
.../near/NoneRebalanceModeSelfTest.java | 4 +-
...cingDelayedPartitionMapExchangeSelfTest.java | 4 +-
.../GridCacheRebalancingAsyncSelfTest.java | 4 +-
.../GridCacheRebalancingOrderingTest.java | 6 +-
.../GridCacheRebalancingSyncCheckDataTest.java | 4 +-
.../GridCacheRebalancingSyncSelfTest.java | 6 +-
...eRebalancingUnmarshallingFailedSelfTest.java | 4 +-
...xcludeNeighborsMultiNodeFullApiSelfTest.java | 4 +-
...tedFairAffinityMultiNodeFullApiSelfTest.java | 4 +-
...xcludeNeighborsMultiNodeFullApiSelfTest.java | 4 +-
...dezvousAffinityMultiNodeFullApiSelfTest.java | 4 +-
...stractReplicatedByteArrayValuesSelfTest.java | 4 +-
...ridCacheAtomicReplicatedMetricsSelfTest.java | 4 +-
...nedFairAffinityMultiNodeFullApiSelfTest.java | 4 +-
...eplicatedAtomicMultiNodeFullApiSelfTest.java | 4 +-
.../GridCacheReplicatedBasicApiTest.java | 4 +-
.../GridCacheReplicatedBasicOpSelfTest.java | 4 +-
.../GridCacheReplicatedEvictionSelfTest.java | 4 +-
.../GridCacheReplicatedFullApiSelfTest.java | 8 +-
.../GridCacheReplicatedJobExecutionTest.java | 4 +-
.../GridCacheReplicatedMarshallerTxTest.java | 4 +-
.../GridCacheReplicatedMetricsSelfTest.java | 4 +-
...atedMultiNodeP2PDisabledFullApiSelfTest.java | 4 +-
.../GridCacheReplicatedMultiNodeSelfTest.java | 4 +-
.../GridCacheReplicatedNodeFailureSelfTest.java | 4 +-
.../GridCacheReplicatedTxConcurrentGetTest.java | 4 +-
...GridCacheReplicatedTxMultiNodeBasicTest.java | 4 +-
...dCacheReplicatedTxMultiThreadedSelfTest.java | 4 +-
...CacheReplicatedTxSingleThreadedSelfTest.java | 4 +-
.../GridCacheReplicatedTxTimeoutSelfTest.java | 4 +-
...idCacheReplicatedUnswapAdvancedSelfTest.java | 6 +-
.../GridCacheSyncReplicatedPreloadSelfTest.java | 4 +-
.../replicated/GridReplicatedTxPreloadTest.java | 4 +-
.../IgniteCacheSyncRebalanceModeSelfTest.java | 4 +-
...CacheReplicatedPreloadLifecycleSelfTest.java | 4 +-
...idCacheReplicatedPreloadOffHeapSelfTest.java | 4 +-
.../GridCacheReplicatedPreloadSelfTest.java | 14 +-
...eplicatedPreloadStartStopEventsSelfTest.java | 4 +-
.../cache/eviction/EvictionAbstractTest.java | 4 +-
.../GridCacheBatchEvictUnswapSelfTest.java | 4 +-
...heConcurrentEvictionConsistencySelfTest.java | 4 +-
.../GridCacheConcurrentEvictionsSelfTest.java | 4 +-
.../GridCacheDistributedEvictionsSelfTest.java | 4 +-
.../GridCacheEmptyEntriesAbstractSelfTest.java | 4 +-
.../GridCacheEvictionFilterSelfTest.java | 4 +-
.../GridCacheEvictionLockUnlockSelfTest.java | 4 +-
.../GridCacheEvictionTouchSelfTest.java | 4 +-
...cheSynchronousEvictionsFailoverSelfTest.java | 4 +-
.../lru/LruNearEvictionPolicySelfTest.java | 4 +-
.../LruNearOnlyNearEvictionPolicySelfTest.java | 4 +-
.../SortedEvictionPolicyPerformanceTest.java | 4 +-
.../IgniteCacheClientNearCacheExpiryTest.java | 6 +-
.../IgniteCacheExpiryPolicyAbstractTest.java | 4 +-
...eCacheExpiryPolicyWithStoreAbstractTest.java | 4 +-
.../expiry/IgniteCacheTtlCleanupSelfTest.java | 4 +-
.../IgniteCacheLoadAllAbstractTest.java | 4 +-
...iteCacheNoLoadPreviousValueAbstractTest.java | 8 +-
.../IgniteCacheNoReadThroughAbstractTest.java | 8 +-
.../IgniteCacheNoWriteThroughAbstractTest.java | 8 +-
...IgniteCacheStoreNodeRestartAbstractTest.java | 6 +-
.../IgniteCacheStoreSessionAbstractTest.java | 6 +-
...acheStoreSessionWriteBehindAbstractTest.java | 6 +-
...dCacheAtomicLocalMetricsNoStoreSelfTest.java | 4 +-
.../GridCacheAtomicLocalMetricsSelfTest.java | 4 +-
.../local/GridCacheLocalBasicApiSelfTest.java | 4 +-
.../GridCacheLocalByteArrayValuesSelfTest.java | 4 +-
.../local/GridCacheLocalFullApiSelfTest.java | 8 +-
.../local/GridCacheLocalLoadAllSelfTest.java | 4 +-
.../local/GridCacheLocalMetricsSelfTest.java | 8 +-
.../GridCacheLocalTxMultiThreadedSelfTest.java | 4 +-
.../GridCacheLocalTxSingleThreadedSelfTest.java | 4 +-
...LocalCacheOffHeapAndSwapMetricsSelfTest.java | 4 +-
.../BinaryTxCacheLocalEntriesSelfTest.java | 8 +-
.../GridCacheQueryTransformerSelfTest.java | 4 +-
.../GridCacheSwapScanQueryAbstractSelfTest.java | 4 +-
.../cache/query/IndexingSpiQuerySelfTest.java | 2 +-
.../cache/query/IndexingSpiQueryTxSelfTest.java | 8 +-
.../continuous/CacheContinuousBatchAckTest.java | 12 +-
...heContinuousBatchForceServerModeAckTest.java | 8 +-
...eContinuousQueryAsyncFilterListenerTest.java | 4 +-
...CacheContinuousQueryCounterAbstractTest.java | 8 +-
...acheContinuousQueryExecuteInPrimaryTest.java | 4 +-
...ContinuousQueryFailoverAbstractSelfTest.java | 4 +-
.../CacheContinuousQueryLostPartitionTest.java | 6 +-
...ontinuousQueryOperationFromCallbackTest.java | 4 +-
.../CacheContinuousQueryOperationP2PTest.java | 4 +-
.../CacheContinuousQueryOrderingEventTest.java | 4 +-
...acheContinuousQueryRandomOperationsTest.java | 4 +-
.../CacheContinuousQueryVariationsTest.java | 6 +-
...eEntryProcessorExternalizableFailedTest.java | 4 +-
.../CacheEntryProcessorNonSerializableTest.java | 4 +-
...CacheKeepBinaryIterationSwapEnabledTest.java | 4 +-
.../CacheKeepBinaryIterationTest.java | 4 +-
.../ClientReconnectContinuousQueryTest.java | 2 +-
...yRemoteFilterMissingInClassPathSelfTest.java | 4 +-
...ridCacheContinuousQueryAbstractSelfTest.java | 10 +-
.../GridCacheContinuousQueryConcurrentTest.java | 6 +-
...eContinuousQueryMultiNodesFilteringTest.java | 10 +-
...eContinuousQueryReplicatedTxOneNodeTest.java | 4 +-
...niteCacheContinuousQueryBackupQueueTest.java | 4 +-
...CacheContinuousQueryClientReconnectTest.java | 4 +-
.../IgniteCacheContinuousQueryClientTest.java | 4 +-
...eCacheContinuousQueryImmutableEntryTest.java | 4 +-
...teCacheContinuousQueryNoUnsubscribeTest.java | 4 +-
...IgniteCacheContinuousQueryReconnectTest.java | 4 +-
...BehindStorePartitionedMultiNodeSelfTest.java | 4 +-
.../IgniteCacheWriteBehindNoUpdateSelfTest.java | 4 +-
...CacheClientWriteBehindStoreAbstractTest.java | 12 +-
.../TxDeadlockDetectionNoHangsTest.java | 4 +-
.../transactions/TxDeadlockDetectionTest.java | 4 +-
...timisticDeadlockDetectionCrossCacheTest.java | 4 +-
.../TxOptimisticDeadlockDetectionTest.java | 4 +-
...simisticDeadlockDetectionCrossCacheTest.java | 4 +-
.../TxPessimisticDeadlockDetectionTest.java | 4 +-
...edEntryPartitionedAtomicOffHeapSelfTest.java | 4 +-
...PartitionedTransactionalOffHeapSelfTest.java | 4 +-
...nedEntryReplicatedAtomicOffHeapSelfTest.java | 4 +-
...yReplicatedTransactionalOffHeapSelfTest.java | 4 +-
.../clock/GridTimeSyncProcessorSelfTest.java | 4 +-
.../closure/GridClosureProcessorRemoteTest.java | 2 +-
.../closure/GridClosureProcessorSelfTest.java | 4 +-
.../closure/GridClosureSerializationTest.java | 4 +-
.../cluster/GridAddressResolverSelfTest.java | 6 +-
...ComputeJobExecutionErrorToLogManualTest.java | 4 +-
.../compute/PublicThreadpoolStarvationTest.java | 4 +-
.../continuous/GridEventConsumeSelfTest.java | 4 +-
.../continuous/GridMessageListenSelfTest.java | 4 +-
.../IgniteNoCustomEventsOnNodeStart.java | 4 +-
.../DataStreamProcessorSelfTest.java | 10 +-
.../datastreamer/DataStreamerImplSelfTest.java | 4 +-
.../DataStreamerMultiThreadedSelfTest.java | 4 +-
.../DataStreamerMultinodeCreateCacheTest.java | 4 +-
.../datastreamer/DataStreamerTimeoutTest.java | 4 +-
.../DataStreamerUpdateAfterLoadTest.java | 4 +-
.../IgniteDataStreamerPerformanceTest.java | 4 +-
.../igfs/IgfsAbstractBaseSelfTest.java | 6 +-
.../igfs/IgfsBackupFailoverSelfTest.java | 13 +-
...sCachePerBlockLruEvictionPolicySelfTest.java | 4 +-
.../processors/igfs/IgfsCacheSelfTest.java | 4 +-
.../processors/igfs/IgfsCommonAbstractTest.java | 8 +-
.../igfs/IgfsDataManagerSelfTest.java | 4 +-
.../processors/igfs/IgfsMaxSizeSelfTest.java | 6 +-
.../igfs/IgfsMetaManagerSelfTest.java | 4 +-
.../processors/igfs/IgfsMetricsSelfTest.java | 4 +-
.../processors/igfs/IgfsModesSelfTest.java | 4 +-
.../processors/igfs/IgfsOneClientNodeTest.java | 4 +-
.../processors/igfs/IgfsProcessorSelfTest.java | 4 +-
.../igfs/IgfsProcessorValidationSelfTest.java | 4 +-
...IpcEndpointRegistrationAbstractSelfTest.java | 4 +-
.../processors/igfs/IgfsSizeSelfTest.java | 4 +-
.../processors/igfs/IgfsStartCacheTest.java | 2 +-
.../processors/igfs/IgfsStreamsSelfTest.java | 4 +-
.../processors/igfs/IgfsTaskSelfTest.java | 2 +-
.../IgfsAbstractRecordResolverSelfTest.java | 2 +-
...niteMessagingConfigVariationFullApiTest.java | 6 +-
.../odbc/OdbcProcessorValidationSelfTest.java | 2 +-
.../service/ClosureServiceClientsNodesTest.java | 10 +-
.../service/GridServiceClientNodeTest.java | 4 +-
.../GridServiceProcessorAbstractSelfTest.java | 4 +-
...GridServiceProxyClientReconnectSelfTest.java | 6 +-
.../GridServiceProxyNodeStopSelfTest.java | 4 +-
.../GridServiceSerializationSelfTest.java | 6 +-
...gniteServiceConfigVariationsFullApiTest.java | 4 +-
...yment2ClassLoadersDefaultMarshallerTest.java | 18 +-
...oymentClassLoadingDefaultMarshallerTest.java | 16 +-
.../IgniteServiceDynamicCachesSelfTest.java | 4 +-
...gniteServiceProxyTimeoutInitializedTest.java | 6 +-
.../service/IgniteServiceReassignmentTest.java | 4 +-
.../ServicePredicateAccessCacheTest.java | 4 +-
.../ipc/shmem/IpcSharedMemorySpaceSelfTest.java | 6 +-
.../ipc/shmem/IpcSharedMemoryUtilsSelfTest.java | 2 +-
.../internal/util/nio/GridNioSelfTest.java | 2 +-
.../internal/util/nio/GridNioSslSelfTest.java | 2 +-
.../nio/IgniteExceptionInNioWorkerSelfTest.java | 4 +-
.../loadtests/GridCacheMultiNodeLoadTest.java | 4 +-
.../communication/GridIoManagerBenchmark0.java | 4 +-
.../GridTcpCommunicationBenchmark.java | 2 +-
.../GridCachePartitionedAtomicLongLoadTest.java | 4 +-
.../multisplit/GridMultiSplitsLoadTest.java | 4 +-
.../GridMultiSplitsRedeployLoadTest.java | 2 +-
...ridSingleSplitsNewNodesAbstractLoadTest.java | 8 +-
.../GridSingleSplitsRedeployLoadTest.java | 2 +-
.../direct/session/GridSessionLoadTest.java | 2 +-
.../direct/stealing/GridStealingLoadTest.java | 4 +-
.../ignite/loadtests/job/GridJobLoadTest.java | 6 +-
.../loadtests/nio/GridNioBenchmarkTest.java | 2 +-
...namicProxySerializationMultiJvmSelfTest.java | 4 +-
.../marshaller/GridMarshallerAbstractTest.java | 15 +-
.../OptimizedMarshallerNodeFailoverTest.java | 4 +-
...GridMessagingNoPeerClassLoadingSelfTest.java | 4 +-
.../ignite/messaging/GridMessagingSelfTest.java | 4 +-
.../IgniteMessagingWithClientTest.java | 6 +-
.../p2p/GridAbstractMultinodeRedeployTest.java | 4 +-
.../GridP2PContinuousDeploymentSelfTest.java | 18 +-
.../GridP2PDifferentClassLoaderSelfTest.java | 4 +-
.../p2p/GridP2PDoubleDeploymentSelfTest.java | 4 +-
.../p2p/GridP2PHotRedeploymentSelfTest.java | 4 +-
.../p2p/GridP2PJobClassLoaderSelfTest.java | 4 +-
.../p2p/GridP2PLocalDeploymentSelfTest.java | 4 +-
.../GridP2PMissedResourceCacheSizeSelfTest.java | 4 +-
.../ignite/p2p/GridP2PNodeLeftSelfTest.java | 4 +-
.../p2p/GridP2PRecursionTaskSelfTest.java | 4 +-
.../p2p/GridP2PRemoteClassLoadersSelfTest.java | 4 +-
.../p2p/GridP2PSameClassLoaderSelfTest.java | 4 +-
.../ignite/p2p/GridP2PTimeoutSelfTest.java | 4 +-
.../ignite/p2p/GridP2PUndeploySelfTest.java | 6 +-
.../PlatformJavaObjectFactoryProxySelfTest.java | 2 +-
.../ignite/platform/PlatformStopIgniteTask.java | 10 +-
...SessionCancelSiblingsFromFutureSelfTest.java | 6 +-
...ridSessionCancelSiblingsFromJobSelfTest.java | 6 +-
...idSessionCancelSiblingsFromTaskSelfTest.java | 6 +-
.../GridSessionCheckpointAbstractSelfTest.java | 2 +-
.../GridSessionCollisionSpiSelfTest.java | 2 +-
...idSessionFutureWaitJobAttributeSelfTest.java | 6 +-
...dSessionFutureWaitTaskAttributeSelfTest.java | 6 +-
.../session/GridSessionJobFailoverSelfTest.java | 4 +-
...GridSessionJobWaitTaskAttributeSelfTest.java | 6 +-
.../ignite/session/GridSessionLoadSelfTest.java | 4 +-
.../GridSessionSetFutureAttributeSelfTest.java | 6 +-
...nSetFutureAttributeWaitListenerSelfTest.java | 6 +-
.../GridSessionSetJobAttributeSelfTest.java | 6 +-
...sionSetJobAttributeWaitListenerSelfTest.java | 6 +-
.../GridSessionSetTaskAttributeSelfTest.java | 6 +-
...GridSessionTaskWaitJobAttributeSelfTest.java | 6 +-
.../GridSessionWaitAttributeSelfTest.java | 8 +-
.../spi/GridSpiStartStopAbstractTest.java | 2 +-
.../spi/GridTcpSpiForwardingSelfTest.java | 10 +-
.../CacheCheckpointSpiSecondCacheSelfTest.java | 4 +-
.../GridAbstractCommunicationSelfTest.java | 4 +-
.../communication/GridCacheMessageSelfTest.java | 4 +-
.../tcp/GridCacheDhtLockBackupSelfTest.java | 4 +-
.../GridTcpCommunicationSpiAbstractTest.java | 4 +-
...mmunicationSpiConcurrentConnectSelfTest.java | 4 +-
.../GridTcpCommunicationSpiConfigSelfTest.java | 2 +-
.../tcp/GridTcpCommunicationSpiLanTest.java | 2 +-
...cpCommunicationSpiMultithreadedSelfTest.java | 4 +-
...dTcpCommunicationSpiRecoveryAckSelfTest.java | 4 +-
...GridTcpCommunicationSpiRecoverySelfTest.java | 4 +-
.../tcp/IgniteCacheSslStartStopSelfTest.java | 4 +-
...CommunicationRecoveryAckClosureSelfTest.java | 4 +-
.../discovery/AbstractDiscoverySelfTest.java | 2 +-
...gniteClientReconnectMassiveShutdownTest.java | 4 +-
...pClientDiscoveryMarshallerCheckSelfTest.java | 6 +-
.../tcp/TcpClientDiscoverySpiMulticastTest.java | 4 +-
.../tcp/TcpClientDiscoverySpiSelfTest.java | 16 +-
.../tcp/TcpDiscoveryConcurrentStartTest.java | 4 +-
.../TcpDiscoveryMarshallerCheckSelfTest.java | 4 +-
.../tcp/TcpDiscoveryMultiThreadedTest.java | 8 +-
...DiscoveryNodeConfigConsistentIdSelfTest.java | 6 +-
.../TcpDiscoveryNodeConsistentIdSelfTest.java | 4 +-
.../discovery/tcp/TcpDiscoveryRestartTest.java | 4 +-
.../spi/discovery/tcp/TcpDiscoverySelfTest.java | 36 +-
.../tcp/TcpDiscoverySnapshotHistoryTest.java | 4 +-
.../tcp/TcpDiscoverySpiConfigSelfTest.java | 2 +-
.../tcp/TcpDiscoverySpiWildcardSelfTest.java | 4 +-
.../discovery/tcp/TcpDiscoverySslSelfTest.java | 4 +-
.../vm/TcpDiscoveryVmIpFinderSelfTest.java | 2 +-
.../GridInternalTasksLoadBalancingSelfTest.java | 6 +-
.../GridSwapSpaceSpiConsistencySelfTest.java | 12 +-
.../inmemory/GridTestSwapSpaceSpi.java | 2 +-
.../noop/GridNoopSwapSpaceSpiSelfTest.java | 4 +-
.../ignite/startup/GridVmNodesStarter.java | 4 +-
.../stream/socket/SocketStreamerSelfTest.java | 4 +-
.../ignite/testframework/GridTestNode.java | 2 +-
.../ignite/testframework/GridTestUtils.java | 10 +-
.../configvariations/ConfigFactory.java | 8 +-
.../ConfigVariationsFactory.java | 6 +-
.../testframework/junits/GridAbstractTest.java | 185 ++--
...IgniteCacheConfigVariationsAbstractTest.java | 12 +-
.../IgniteConfigVariationsAbstractTest.java | 12 +-
.../junits/common/GridAbstractExamplesTest.java | 2 +-
.../junits/common/GridCommonAbstractTest.java | 15 +-
.../common/GridRollingRestartAbstractTest.java | 6 +-
.../junits/multijvm/IgniteProcessProxy.java | 51 +-
.../junits/spi/GridSpiAbstractConfigTest.java | 2 +-
.../junits/spi/GridSpiAbstractTest.java | 4 +-
.../util/AttributeNodeFilterSelfTest.java | 4 +-
.../util/GridTopologyHeapSizeSelfTest.java | 4 +-
.../h2/GridBinaryH2IndexingGeoSelfTest.java | 4 +-
.../hadoop/impl/igfs/HadoopIgfsInProc.java | 2 +-
.../hadoop/shuffle/HadoopShuffle.java | 2 +-
.../hadoop/shuffle/HadoopShuffleJob.java | 6 +-
.../HadoopEmbeddedTaskExecutor.java | 2 +-
.../taskexecutor/HadoopExecutorService.java | 10 +-
.../external/HadoopExternalTaskExecutor.java | 2 +-
.../HadoopExternalCommunication.java | 20 +-
.../impl/HadoopAbstractMapReduceTest.java | 6 +-
.../hadoop/impl/HadoopAbstractSelfTest.java | 10 +-
.../hadoop/impl/HadoopGroupingTest.java | 4 +-
.../hadoop/impl/HadoopJobTrackerSelfTest.java | 4 +-
.../impl/HadoopMapReduceEmbeddedSelfTest.java | 4 +-
.../impl/HadoopNoHadoopMapReduceTest.java | 4 +-
.../hadoop/impl/HadoopSortingExternalTest.java | 8 +-
.../hadoop/impl/HadoopSortingTest.java | 4 +-
.../impl/HadoopTaskExecutionSelfTest.java | 4 +-
.../hadoop/impl/HadoopTeraSortTest.java | 4 +-
.../hadoop/impl/HadoopValidationSelfTest.java | 4 +-
.../HadoopClientProtocolEmbeddedSelfTest.java | 4 +-
...opClientProtocolMultipleServersSelfTest.java | 4 +-
.../impl/igfs/Hadoop1DualAbstractTest.java | 6 +-
.../igfs/HadoopFIleSystemFactorySelfTest.java | 2 +-
.../HadoopIgfs20FileSystemAbstractSelfTest.java | 28 +-
...Igfs20FileSystemLoopbackPrimarySelfTest.java | 4 +-
...oopIgfs20FileSystemShmemPrimarySelfTest.java | 4 +-
.../igfs/HadoopIgfsDualAbstractSelfTest.java | 6 +-
...oopSecondaryFileSystemConfigurationTest.java | 22 +-
.../igfs/IgfsNearOnlyMultiNodeSelfTest.java | 12 +-
.../IgniteHadoopFileSystemAbstractSelfTest.java | 32 +-
...niteHadoopFileSystemClientBasedOpenTest.java | 6 +-
.../IgniteHadoopFileSystemClientSelfTest.java | 4 +-
...IgniteHadoopFileSystemHandshakeSelfTest.java | 99 +-
.../IgniteHadoopFileSystemIpcCacheSelfTest.java | 6 +-
...niteHadoopFileSystemLoggerStateSelfTest.java | 2 +-
...adoopFileSystemLoopbackAbstractSelfTest.java | 4 +-
...oopbackExternalToClientAbstractSelfTest.java | 4 +-
...condaryFileSystemInitializationSelfTest.java | 4 +-
...teHadoopFileSystemShmemAbstractSelfTest.java | 4 +-
...emShmemExternalToClientAbstractSelfTest.java | 4 +-
.../HadoopExternalTaskExecutionSelfTest.java | 16 +-
.../cache/hibernate/HibernateRegionFactory.java | 25 +-
.../src/test/config/factory-cache1.xml | 2 +-
.../HibernateL2CacheConfigurationSelfTest.java | 20 +-
.../hibernate/HibernateL2CacheSelfTest.java | 24 +-
.../HibernateL2CacheTransactionalSelfTest.java | 4 +-
.../query/h2/DmlStatementsProcessor.java | 6 +-
.../processors/query/h2/IgniteH2Indexing.java | 20 +-
.../query/h2/dml/UpdatePlanBuilder.java | 4 +-
...CacheAbstractQueryDetailMetricsSelfTest.java | 4 +-
.../CacheAbstractQueryMetricsSelfTest.java | 4 +-
.../CacheBinaryKeyConcurrentQueryTest.java | 4 +-
.../cache/CacheIndexStreamerTest.java | 4 +-
.../CacheOffheapBatchIndexingBaseTest.java | 4 +-
.../cache/CacheQueryBuildValueTest.java | 4 +-
.../cache/CacheQueryNewClientSelfTest.java | 4 +-
.../CacheRandomOperationsMultithreadedTest.java | 4 +-
...CacheScanPartitionQueryFallbackSelfTest.java | 6 +-
.../cache/CacheSqlQueryValueCopySelfTest.java | 6 +-
.../ClientReconnectAfterClusterRestartTest.java | 6 +-
.../cache/GridCacheCrossCacheQuerySelfTest.java | 4 +-
.../cache/GridCacheOffHeapAndSwapSelfTest.java | 4 +-
.../cache/GridCacheOffHeapSelfTest.java | 4 +-
.../GridCacheOffheapIndexEntryEvictTest.java | 4 +-
.../cache/GridCacheOffheapIndexGetSelfTest.java | 4 +-
.../GridCacheQueryIndexDisabledSelfTest.java | 4 +-
.../GridCacheQuerySerializationSelfTest.java | 4 +-
.../cache/GridCacheQuerySimpleBenchmark.java | 4 +-
.../processors/cache/GridCacheSwapSelfTest.java | 4 +-
.../cache/GridIndexingWithNoopSwapSelfTest.java | 4 +-
.../IgniteBinaryObjectFieldsQuerySelfTest.java | 6 +-
.../IgniteBinaryObjectQueryArgumentsTest.java | 4 +-
.../IgniteCacheAbstractFieldsQuerySelfTest.java | 4 +-
...niteCacheAbstractInsertSqlQuerySelfTest.java | 4 +-
.../cache/IgniteCacheAbstractQuerySelfTest.java | 6 +-
.../IgniteCacheAbstractSqlDmlQuerySelfTest.java | 4 +-
.../IgniteCacheCollocatedQuerySelfTest.java | 4 +-
...acheConfigurationPrimitiveTypesSelfTest.java | 4 +-
.../IgniteCacheCrossCacheJoinRandomTest.java | 4 +-
...acheDistributedJoinCollocatedAndNotTest.java | 4 +-
...acheDistributedJoinCustomAffinityMapper.java | 4 +-
.../IgniteCacheDistributedJoinNoIndexTest.java | 4 +-
...ributedJoinPartitionedAndReplicatedTest.java | 4 +-
...CacheDistributedJoinQueryConditionsTest.java | 4 +-
.../cache/IgniteCacheDistributedJoinTest.java | 4 +-
...cheDuplicateEntityConfigurationSelfTest.java | 4 +-
.../IgniteCacheFieldsQueryNoDataSelfTest.java | 4 +-
...teCacheFullTextQueryNodeJoiningSelfTest.java | 4 +-
.../IgniteCacheInsertSqlQuerySelfTest.java | 4 +-
...PartitionedAndReplicatedCollocationTest.java | 4 +-
...teCacheJoinPartitionedAndReplicatedTest.java | 4 +-
...IgniteCacheJoinQueryWithAffinityKeyTest.java | 4 +-
.../cache/IgniteCacheLargeResultSelfTest.java | 4 +-
...eLockPartitionOnAffinityRunAbstractTest.java | 4 +-
...PartitionOnAffinityRunAtomicCacheOpTest.java | 4 +-
...titionOnAffinityRunWithCollisionSpiTest.java | 6 +-
.../cache/IgniteCacheNoClassQuerySelfTest.java | 4 +-
.../cache/IgniteCacheOffheapEvictQueryTest.java | 4 +-
.../cache/IgniteCacheOffheapIndexScanTest.java | 4 +-
...CacheOffheapTieredMultithreadedSelfTest.java | 4 +-
...niteCacheP2pUnmarshallingQueryErrorTest.java | 4 +-
...hePartitionedQueryMultiThreadedSelfTest.java | 4 +-
...IgniteCachePrimitiveFieldsQuerySelfTest.java | 4 +-
.../cache/IgniteCacheQueriesLoadTest1.java | 4 +-
.../IgniteCacheQueryH2IndexingLeakTest.java | 4 +-
.../cache/IgniteCacheQueryLoadSelfTest.java | 8 +-
.../IgniteCacheQueryMultiThreadedSelfTest.java | 4 +-
...gniteCacheSqlQueryMultiThreadedSelfTest.java | 4 +-
.../IgniteCacheStarvationOnRebalanceTest.java | 4 +-
...ClientReconnectCacheQueriesFailoverTest.java | 4 +-
.../cache/IgniteClientReconnectQueriesTest.java | 4 +-
.../cache/IgniteCrossCachesJoinsQueryTest.java | 4 +-
.../cache/SqlFieldsQuerySelfTest.java | 4 +-
...lientQueryReplicatedNodeRestartSelfTest.java | 10 +-
...niteCacheDistributedQueryCancelSelfTest.java | 6 +-
...butedQueryStopOnCancelOrTimeoutSelfTest.java | 6 +-
...artitionedFieldsQueryP2PEnabledSelfTest.java | 4 +-
...achePartitionedQueryP2PDisabledSelfTest.java | 4 +-
...cheQueryAbstractDistributedJoinSelfTest.java | 6 +-
.../near/IgniteCacheQueryNodeFailTest.java | 4 +-
.../IgniteCacheQueryNodeRestartSelfTest.java | 4 +-
.../IgniteCacheQueryNodeRestartSelfTest2.java | 4 +-
...ReplicatedFieldsQueryP2PEnabledSelfTest.java | 4 +-
...CacheReplicatedQueryP2PDisabledSelfTest.java | 4 +-
...eCacheLocalQueryCancelOrTimeoutSelfTest.java | 4 +-
.../cache/ttl/CacheTtlAbstractSelfTest.java | 4 +-
.../query/IgniteSqlSplitterSelfTest.java | 4 +-
.../h2/GridIndexingSpiAbstractSelfTest.java | 7 +-
.../h2/sql/AbstractH2CompareQueryTest.java | 4 +-
.../query/h2/sql/GridQueryParsingTest.java | 4 +-
.../FetchingQueryCursorStressTest.java | 2 +-
.../tcp/GridOrderedMessageCancelSelfTest.java | 4 +-
.../cache/AbstractCacheJtaSelfTest.java | 8 +-
...CacheJtaConfigurationValidationSelfTest.java | 4 +-
...CacheJtaFactoryConfigValidationSelfTest.java | 4 +-
.../cache/GridJtaLifecycleAwareSelfTest.java | 4 +-
.../log4j/GridLog4jCorrectFileNameTest.java | 6 +-
.../log4j2/GridLog4j2CorrectFileNameTest.java | 6 +-
.../log4j2/GridLog4j2InitializedTest.java | 2 +-
.../logger/log4j2/Log4j2LoggerSelfTest.java | 6 +-
.../log4j2/Log4j2LoggerVerboseModeSelfTest.java | 6 +-
.../IgniteAbstractOsgiContextActivator.java | 2 +-
.../activators/BasicIgniteTestActivator.java | 2 +-
.../scala/org/apache/ignite/scalar/scalar.scala | 17 +-
.../test/resources/spring-ping-pong-partner.xml | 2 +-
.../scalar/tests/ScalarProjectionSpec.scala | 4 +-
.../schedule/IgniteScheduleProcessor.java | 2 +-
.../processors/schedule/ScheduleFutureImpl.java | 4 +-
.../org/apache/ignite/spark/IgniteContext.scala | 2 +-
.../spark/JavaEmbeddedIgniteRDDSelfTest.java | 14 +-
.../spark/JavaStandaloneIgniteRDDSelfTest.java | 6 +-
.../org/apache/ignite/spark/IgniteRDDSpec.scala | 14 +-
.../org/apache/ignite/IgniteSpringBean.java | 2 +-
.../ignite/cache/spring/SpringCacheManager.java | 42 +-
.../spring/SpringTransactionManager.java | 50 +-
.../src/test/config/jdbc-pojo-store-builtin.xml | 2 +-
.../src/test/config/jdbc-pojo-store-obj.xml | 2 +-
modules/spring/src/test/config/node1.xml | 2 +-
modules/spring/src/test/config/store-cache1.xml | 2 +-
.../src/test/java/config/ignite-test-config.xml | 2 +-
.../test/java/config/spring-transactions.xml | 2 +-
.../spring/GridSpringCacheManagerSelfTest.java | 6 +-
.../SpringCacheManagerContextInjectionTest.java | 2 +-
.../ignite/cache/spring/spring-caching.xml | 2 +-
.../store/jdbc/CachePojoStoreXmlSelfTest.java | 4 +-
.../ignite/internal/GridFactorySelfTest.java | 154 +--
.../GridSpringBeanSerializationSelfTest.java | 2 +-
.../internal/IgniteDynamicCacheConfigTest.java | 4 +-
.../GridSpringResourceInjectionSelfTest.java | 4 +-
.../GridTransformSpringInjectionSelfTest.java | 2 +-
.../p2p/GridP2PUserVersionChangeSelfTest.java | 6 +-
.../org/apache/ignite/spring-injection-test.xml | 2 +-
.../spring/injection/spring-resource.tmpl.xml | 2 +-
.../GridSpringTransactionManagerSelfTest.java | 6 +-
...gTransactionManagerContextInjectionTest.java | 2 +-
.../spi/deployment/uri/UriDeploymentSpi.java | 6 +-
.../scanners/UriDeploymentScannerManager.java | 12 +-
.../GridTaskUriDeploymentDeadlockSelfTest.java | 6 +-
.../ignite/p2p/GridP2PDisabledSelfTest.java | 4 +-
.../config/VisorConfigurationCommand.scala | 2 +-
.../visor/commands/node/VisorNodeCommand.scala | 6 +-
.../scala/org/apache/ignite/visor/visor.scala | 10 +-
.../ignite/visor/VisorRuntimeBaseSpec.scala | 4 +-
.../commands/alert/VisorAlertCommandSpec.scala | 4 +-
.../cache/VisorCacheClearCommandSpec.scala | 4 +-
.../commands/cache/VisorCacheCommandSpec.scala | 4 +-
.../cache/VisorCacheResetCommandSpec.scala | 4 +-
.../config/VisorConfigurationCommandSpec.scala | 4 +-
.../cswap/VisorCacheSwapCommandSpec.scala | 4 +-
.../disco/VisorDiscoveryCommandSpec.scala | 4 +-
.../events/VisorEventsCommandSpec.scala | 4 +-
.../visor/commands/gc/VisorGcCommandSpec.scala | 4 +-
.../commands/tasks/VisorTasksCommandSpec.scala | 4 +-
.../ignite/console/demo/AgentClusterDemo.java | 4 +-
.../cache/websession/WebSessionFilter.java | 12 +-
.../servlet/ServletContextListenerStartup.java | 12 +-
.../ignite/startup/servlet/ServletStartup.java | 8 +-
.../internal/websession/WebSessionSelfTest.java | 21 +-
.../ignite/yardstick/IgniteBenchmarkUtils.java | 2 +-
.../tcp/ipfinder/zk/ZookeeperIpFinderTest.java | 10 +-
1273 files changed, 5255 insertions(+), 4883 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ignite/blob/df806068/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheIoManager.java
----------------------------------------------------------------------
[32/38] ignite git commit: ignite-4768
Posted by sb...@apache.org.
ignite-4768
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/de2697d8
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/de2697d8
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/de2697d8
Branch: refs/heads/ignite-4768
Commit: de2697d81e996b3a5dfe6b80a0638e38cc25cd89
Parents: fa77f2e
Author: sboikov <sb...@gridgain.com>
Authored: Mon Mar 13 12:39:21 2017 +0300
Committer: sboikov <sb...@gridgain.com>
Committed: Mon Mar 13 12:39:21 2017 +0300
----------------------------------------------------------------------
.../ignite/internal/processors/cache/GridCacheMvccFuture.java | 6 +++++-
.../processors/cache/transactions/IgniteTxHandler.java | 2 +-
.../apache/ignite/yardstick/cache/IgnitePutTxBenchmark.java | 5 +----
3 files changed, 7 insertions(+), 6 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ignite/blob/de2697d8/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheMvccFuture.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheMvccFuture.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheMvccFuture.java
index a0acf18..d217562 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheMvccFuture.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheMvccFuture.java
@@ -19,6 +19,7 @@ package org.apache.ignite.internal.processors.cache;
import org.apache.ignite.internal.processors.cache.transactions.IgniteInternalTx;
import org.apache.ignite.internal.processors.cache.version.GridCacheVersion;
+import org.jetbrains.annotations.Nullable;
/**
* Distributed future aware of MVCC locking.
@@ -36,5 +37,8 @@ public interface GridCacheMvccFuture<T> extends GridCacheFuture<T> {
*/
public boolean onOwnerChanged(GridCacheEntryEx entry, GridCacheMvccCandidate owner);
- public IgniteInternalTx tx();
+ /**
+ * @return Transaction related to future if any.
+ */
+ @Nullable public IgniteInternalTx tx();
}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/ignite/blob/de2697d8/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/transactions/IgniteTxHandler.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/transactions/IgniteTxHandler.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/transactions/IgniteTxHandler.java
index b4fe426..754979c 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/transactions/IgniteTxHandler.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/transactions/IgniteTxHandler.java
@@ -1438,7 +1438,7 @@ public class IgniteTxHandler {
/**
* @param nodeId Node ID.
* @param req Request.
- * @param res Response.
+ * @param res Response or {@code null} if should not reply to primary.
* @return Remote transaction.
* @throws IgniteCheckedException If failed.
*/
http://git-wip-us.apache.org/repos/asf/ignite/blob/de2697d8/modules/yardstick/src/main/java/org/apache/ignite/yardstick/cache/IgnitePutTxBenchmark.java
----------------------------------------------------------------------
diff --git a/modules/yardstick/src/main/java/org/apache/ignite/yardstick/cache/IgnitePutTxBenchmark.java b/modules/yardstick/src/main/java/org/apache/ignite/yardstick/cache/IgnitePutTxBenchmark.java
index 3ad5a9d..15b7cd6 100644
--- a/modules/yardstick/src/main/java/org/apache/ignite/yardstick/cache/IgnitePutTxBenchmark.java
+++ b/modules/yardstick/src/main/java/org/apache/ignite/yardstick/cache/IgnitePutTxBenchmark.java
@@ -22,12 +22,9 @@ import java.util.concurrent.Callable;
import org.apache.ignite.IgniteCache;
import org.apache.ignite.IgniteSystemProperties;
import org.apache.ignite.IgniteTransactions;
-import org.apache.ignite.transactions.TransactionConcurrency;
-import org.apache.ignite.transactions.TransactionIsolation;
import org.apache.ignite.yardstick.IgniteBenchmarkUtils;
import org.apache.ignite.yardstick.cache.model.SampleValue;
import org.yardstickframework.BenchmarkConfiguration;
-import org.yardstickframework.BenchmarkUtils;
/**
* Ignite benchmark that performs transactional put operations.
@@ -61,7 +58,7 @@ public class IgnitePutTxBenchmark extends IgniteCacheAbstractBenchmark<Integer,
/** {@inheritDoc} */
@Override public boolean test(Map<Object, Object> ctx) throws Exception {
- IgniteBenchmarkUtils.doInTransaction(txs, TransactionConcurrency.PESSIMISTIC, TransactionIsolation.REPEATABLE_READ, clo);
+ IgniteBenchmarkUtils.doInTransaction(txs, args.txConcurrency(), args.txIsolation(), clo);
return true;
}
[21/38] ignite git commit: ignite-4768
Posted by sb...@apache.org.
ignite-4768
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/763f1b0b
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/763f1b0b
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/763f1b0b
Branch: refs/heads/ignite-4768
Commit: 763f1b0b950737f00c2356fa9018f4c15bdef242
Parents: eeb10b8
Author: sboikov <sb...@gridgain.com>
Authored: Fri Mar 10 16:54:37 2017 +0300
Committer: sboikov <sb...@gridgain.com>
Committed: Fri Mar 10 16:54:37 2017 +0300
----------------------------------------------------------------------
.../processors/cache/GridCacheIoManager.java | 2 +
.../GridDistributedTxFinishRequest.java | 217 ++++++++++++----
.../GridDistributedTxPrepareResponse.java | 76 +++++-
.../distributed/dht/GridDhtTxFinishFuture.java | 33 +--
.../distributed/dht/GridDhtTxFinishRequest.java | 251 ++++++-------------
.../dht/GridDhtTxFinishResponse.java | 12 +-
.../cache/distributed/dht/GridDhtTxLocal.java | 18 +-
.../distributed/dht/GridDhtTxPrepareFuture.java | 1 +
.../dht/GridDhtTxPrepareResponse.java | 58 +++--
.../near/GridNearTxFinishFuture.java | 71 ++++--
.../near/GridNearTxFinishRequest.java | 174 ++-----------
.../near/GridNearTxFinishResponse.java | 12 +-
.../near/GridNearTxPrepareResponse.java | 47 ++--
.../cache/transactions/IgniteTxHandler.java | 33 ++-
14 files changed, 501 insertions(+), 504 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ignite/blob/763f1b0b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheIoManager.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheIoManager.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheIoManager.java
index 7cac367..71f4e1c 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheIoManager.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheIoManager.java
@@ -547,6 +547,7 @@ public class GridCacheIoManager extends GridCacheSharedManagerAdapter {
GridDhtTxPrepareRequest req = (GridDhtTxPrepareRequest)msg;
GridDhtTxPrepareResponse res = new GridDhtTxPrepareResponse(
+ req.partition(),
req.version(),
req.futureId(),
req.miniId(),
@@ -672,6 +673,7 @@ public class GridCacheIoManager extends GridCacheSharedManagerAdapter {
GridNearTxPrepareRequest req = (GridNearTxPrepareRequest)msg;
GridNearTxPrepareResponse res = new GridNearTxPrepareResponse(
+ req.partition(),
req.version(),
req.futureId(),
req.miniId(),
http://git-wip-us.apache.org/repos/asf/ignite/blob/763f1b0b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/GridDistributedTxFinishRequest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/GridDistributedTxFinishRequest.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/GridDistributedTxFinishRequest.java
index 3e47cc9..ab9f0ff 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/GridDistributedTxFinishRequest.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/GridDistributedTxFinishRequest.java
@@ -20,18 +20,24 @@ package org.apache.ignite.internal.processors.cache.distributed;
import java.io.Externalizable;
import java.nio.ByteBuffer;
import java.util.Collection;
+import java.util.UUID;
+import org.apache.ignite.IgniteLogger;
+import org.apache.ignite.cache.CacheWriteSynchronizationMode;
import org.apache.ignite.internal.GridDirectTransient;
+import org.apache.ignite.internal.processors.affinity.AffinityTopologyVersion;
+import org.apache.ignite.internal.processors.cache.GridCacheSharedContext;
import org.apache.ignite.internal.processors.cache.transactions.IgniteTxState;
import org.apache.ignite.internal.processors.cache.transactions.IgniteTxStateAware;
-import org.apache.ignite.IgniteLogger;
-import org.apache.ignite.internal.processors.cache.GridCacheSharedContext;
import org.apache.ignite.internal.processors.cache.version.GridCacheVersion;
import org.apache.ignite.internal.util.tostring.GridToStringBuilder;
import org.apache.ignite.lang.IgniteUuid;
import org.apache.ignite.plugin.extensions.communication.MessageReader;
import org.apache.ignite.plugin.extensions.communication.MessageWriter;
+import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable;
+import static org.apache.ignite.cache.CacheWriteSynchronizationMode.*;
+
/**
* Transaction completion message.
*/
@@ -39,6 +45,27 @@ public class GridDistributedTxFinishRequest extends GridDistributedBaseMessage i
/** */
private static final long serialVersionUID = 0L;
+ /** */
+ protected static final int WAIT_REMOTE_TX_FLAG_MASK = 0x01;
+
+ /** */
+ protected static final int CHECK_COMMITTED_FLAG_MASK = 0x02;
+
+ /** */
+ protected static final int NEED_RETURN_VALUE_FLAG_MASK = 0x04;
+
+ /** */
+ protected static final int SYS_INVALIDATE_FLAG_MASK = 0x08;
+
+ /** */
+ protected static final int EXPLICIT_LOCK_FLAG_MASK = 0x10;
+
+ /** */
+ protected static final int STORE_ENABLED_FLAG_MASK = 0x20;
+
+ /** Topology version. */
+ private AffinityTopologyVersion topVer;
+
/** Future ID. */
private IgniteUuid futId;
@@ -54,14 +81,6 @@ public class GridDistributedTxFinishRequest extends GridDistributedBaseMessage i
/** Commit flag. */
private boolean commit;
- /** Sync commit flag. */
- @Deprecated
- private boolean syncCommit;
-
- /** Sync commit flag. */
- @Deprecated
- private boolean syncRollback;
-
/** Min version used as base for completed versions. */
private GridCacheVersion baseVer;
@@ -74,6 +93,18 @@ public class GridDistributedTxFinishRequest extends GridDistributedBaseMessage i
/** IO policy. */
private byte plc;
+ /** Subject ID. */
+ private UUID subjId;
+
+ /** Task name hash. */
+ private int taskNameHash;
+
+ /** */
+ private byte flags;
+
+ /** Write synchronization mode. */
+ private CacheWriteSynchronizationMode syncMode;
+
/** Transient TX state. */
@GridDirectTransient
private IgniteTxState txState;
@@ -94,8 +125,7 @@ public class GridDistributedTxFinishRequest extends GridDistributedBaseMessage i
* @param invalidate Invalidate flag.
* @param sys System transaction flag.
* @param plc IO policy.
- * @param syncCommit Sync commit flag.
- * @param syncRollback Sync rollback flag.
+ * @param syncMode Write synchronization mode.
* @param baseVer Base version.
* @param committedVers Committed versions.
* @param rolledbackVers Rolled back versions.
@@ -105,39 +135,93 @@ public class GridDistributedTxFinishRequest extends GridDistributedBaseMessage i
public GridDistributedTxFinishRequest(
GridCacheVersion xidVer,
IgniteUuid futId,
+ @NotNull AffinityTopologyVersion topVer,
@Nullable GridCacheVersion commitVer,
long threadId,
boolean commit,
boolean invalidate,
boolean sys,
byte plc,
- boolean syncCommit,
- boolean syncRollback,
+ CacheWriteSynchronizationMode syncMode,
GridCacheVersion baseVer,
Collection<GridCacheVersion> committedVers,
Collection<GridCacheVersion> rolledbackVers,
+ @Nullable UUID subjId,
+ int taskNameHash,
int txSize,
boolean addDepInfo
) {
super(xidVer, 0, addDepInfo);
+
assert xidVer != null;
+ assert syncMode != null;
this.futId = futId;
+ this.topVer = topVer;
this.commitVer = commitVer;
this.threadId = threadId;
this.commit = commit;
this.invalidate = invalidate;
this.sys = sys;
this.plc = plc;
- this.syncCommit = syncCommit;
- this.syncRollback = syncRollback;
+ this.syncMode = syncMode;
this.baseVer = baseVer;
+ this.subjId = subjId;
+ this.taskNameHash = taskNameHash;
this.txSize = txSize;
completedVersions(committedVers, rolledbackVers);
}
/**
+ * @return Transaction write synchronization mode (can be null is message sent from old nodes).
+ */
+ public final CacheWriteSynchronizationMode syncMode() {
+ return syncMode;
+ }
+
+ /**
+ * Sets flag mask.
+ *
+ * @param flag Set or clear.
+ * @param mask Mask.
+ */
+ protected final void setFlag(boolean flag, int mask) {
+ flags = flag ? (byte)(flags | mask) : (byte)(flags & ~mask);
+ }
+
+ /**
+ * Reags flag mask.
+ *
+ * @param mask Mask to read.
+ * @return Flag value.
+ */
+ protected final boolean isFlag(int mask) {
+ return (flags & mask) != 0;
+ }
+
+ /**
+ * @return Subject ID.
+ */
+ @Nullable public final UUID subjectId() {
+ return subjId;
+ }
+
+ /**
+ * @return Task name hash.
+ */
+ public final int taskNameHash() {
+ return taskNameHash;
+ }
+
+ /**
+ * @return Topology version.
+ */
+ @Override public final AffinityTopologyVersion topologyVersion() {
+ return topVer;
+ }
+
+ /**
* @return System transaction flag.
*/
public boolean system() {
@@ -188,27 +272,6 @@ public class GridDistributedTxFinishRequest extends GridDistributedBaseMessage i
}
/**
- * @return Sync commit flag.
- */
- public boolean syncCommit() {
- return syncCommit;
- }
-
- /**
- * @param syncCommit Sync commit flag.
- */
- public void syncCommit(boolean syncCommit) {
- this.syncCommit = syncCommit;
- }
-
- /**
- * @return Sync rollback flag.
- */
- public boolean syncRollback() {
- return syncRollback;
- }
-
- /**
* @return Base version.
*/
public GridCacheVersion baseVersion() {
@@ -227,7 +290,9 @@ public class GridDistributedTxFinishRequest extends GridDistributedBaseMessage i
* @return {@code True} if reply is required.
*/
public boolean replyRequired() {
- return commit ? syncCommit : syncRollback;
+ assert syncMode != null;
+
+ return syncMode == FULL_SYNC;
}
/** {@inheritDoc} */
@@ -279,48 +344,66 @@ public class GridDistributedTxFinishRequest extends GridDistributedBaseMessage i
writer.incrementState();
case 10:
- if (!writer.writeIgniteUuid("futId", futId))
+ if (!writer.writeByte("flags", flags))
return false;
writer.incrementState();
case 11:
- if (!writer.writeBoolean("invalidate", invalidate))
+ if (!writer.writeIgniteUuid("futId", futId))
return false;
writer.incrementState();
case 12:
- if (!writer.writeByte("plc", plc))
+ if (!writer.writeBoolean("invalidate", invalidate))
return false;
writer.incrementState();
case 13:
- if (!writer.writeBoolean("syncCommit", syncCommit))
+ if (!writer.writeByte("plc", plc))
return false;
writer.incrementState();
case 14:
- if (!writer.writeBoolean("syncRollback", syncRollback))
+ if (!writer.writeUuid("subjId", subjId))
return false;
writer.incrementState();
case 15:
- if (!writer.writeBoolean("sys", sys))
+ if (!writer.writeByte("syncMode", syncMode != null ? (byte)syncMode.ordinal() : -1))
return false;
writer.incrementState();
case 16:
- if (!writer.writeLong("threadId", threadId))
+ if (!writer.writeBoolean("sys", sys))
return false;
writer.incrementState();
case 17:
+ if (!writer.writeInt("taskNameHash", taskNameHash))
+ return false;
+
+ writer.incrementState();
+
+ case 18:
+ if (!writer.writeLong("threadId", threadId))
+ return false;
+
+ writer.incrementState();
+
+ case 19:
+ if (!writer.writeMessage("topVer", topVer))
+ return false;
+
+ writer.incrementState();
+
+ case 20:
if (!writer.writeInt("txSize", txSize))
return false;
@@ -367,7 +450,7 @@ public class GridDistributedTxFinishRequest extends GridDistributedBaseMessage i
reader.incrementState();
case 10:
- futId = reader.readIgniteUuid("futId");
+ flags = reader.readByte("flags");
if (!reader.isLastRead())
return false;
@@ -375,7 +458,7 @@ public class GridDistributedTxFinishRequest extends GridDistributedBaseMessage i
reader.incrementState();
case 11:
- invalidate = reader.readBoolean("invalidate");
+ futId = reader.readIgniteUuid("futId");
if (!reader.isLastRead())
return false;
@@ -383,7 +466,7 @@ public class GridDistributedTxFinishRequest extends GridDistributedBaseMessage i
reader.incrementState();
case 12:
- plc = reader.readByte("plc");
+ invalidate = reader.readBoolean("invalidate");
if (!reader.isLastRead())
return false;
@@ -391,7 +474,7 @@ public class GridDistributedTxFinishRequest extends GridDistributedBaseMessage i
reader.incrementState();
case 13:
- syncCommit = reader.readBoolean("syncCommit");
+ plc = reader.readByte("plc");
if (!reader.isLastRead())
return false;
@@ -399,7 +482,7 @@ public class GridDistributedTxFinishRequest extends GridDistributedBaseMessage i
reader.incrementState();
case 14:
- syncRollback = reader.readBoolean("syncRollback");
+ subjId = reader.readUuid("subjId");
if (!reader.isLastRead())
return false;
@@ -407,15 +490,19 @@ public class GridDistributedTxFinishRequest extends GridDistributedBaseMessage i
reader.incrementState();
case 15:
- sys = reader.readBoolean("sys");
+ byte syncModeOrd;
+
+ syncModeOrd = reader.readByte("syncMode");
if (!reader.isLastRead())
return false;
+ syncMode = CacheWriteSynchronizationMode.fromOrdinal(syncModeOrd);
+
reader.incrementState();
case 16:
- threadId = reader.readLong("threadId");
+ sys = reader.readBoolean("sys");
if (!reader.isLastRead())
return false;
@@ -423,6 +510,30 @@ public class GridDistributedTxFinishRequest extends GridDistributedBaseMessage i
reader.incrementState();
case 17:
+ taskNameHash = reader.readInt("taskNameHash");
+
+ if (!reader.isLastRead())
+ return false;
+
+ reader.incrementState();
+
+ case 18:
+ threadId = reader.readLong("threadId");
+
+ if (!reader.isLastRead())
+ return false;
+
+ reader.incrementState();
+
+ case 19:
+ topVer = reader.readMessage("topVer");
+
+ if (!reader.isLastRead())
+ return false;
+
+ reader.incrementState();
+
+ case 20:
txSize = reader.readInt("txSize");
if (!reader.isLastRead())
@@ -442,7 +553,7 @@ public class GridDistributedTxFinishRequest extends GridDistributedBaseMessage i
/** {@inheritDoc} */
@Override public byte fieldsCount() {
- return 18;
+ return 21;
}
/** {@inheritDoc} */
http://git-wip-us.apache.org/repos/asf/ignite/blob/763f1b0b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/GridDistributedTxPrepareResponse.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/GridDistributedTxPrepareResponse.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/GridDistributedTxPrepareResponse.java
index 76a5e31..53a1391 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/GridDistributedTxPrepareResponse.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/GridDistributedTxPrepareResponse.java
@@ -51,6 +51,12 @@ public class GridDistributedTxPrepareResponse extends GridDistributedBaseMessage
@GridDirectTransient
private IgniteTxState txState;
+ /** */
+ private int part;
+
+ /** */
+ private byte flags;
+
/**
* Empty constructor (required by {@link Externalizable}).
*/
@@ -59,24 +65,54 @@ public class GridDistributedTxPrepareResponse extends GridDistributedBaseMessage
}
/**
- * @param xid Transaction ID.
+ * @param part Partition.
+ * @param xid Lock or transaction ID.
* @param addDepInfo Deployment info flag.
*/
- public GridDistributedTxPrepareResponse(GridCacheVersion xid, boolean addDepInfo) {
+ public GridDistributedTxPrepareResponse(int part, GridCacheVersion xid, boolean addDepInfo) {
super(xid, 0, addDepInfo);
+
+ this.part = part;
}
/**
- * @param xid Lock ID.
+ * @param part Partition.
+ * @param xid Lock or transaction ID.
* @param err Error.
* @param addDepInfo Deployment info flag.
*/
- public GridDistributedTxPrepareResponse(GridCacheVersion xid, Throwable err, boolean addDepInfo) {
+ public GridDistributedTxPrepareResponse(int part, GridCacheVersion xid, Throwable err, boolean addDepInfo) {
super(xid, 0, addDepInfo);
+ this.part = part;
this.err = err;
}
+ /**
+ * Sets flag mask.
+ *
+ * @param flag Set or clear.
+ * @param mask Mask.
+ */
+ protected final void setFlag(boolean flag, int mask) {
+ flags = flag ? (byte)(flags | mask) : (byte)(flags & ~mask);
+ }
+
+ /**
+ * Reags flag mask.
+ *
+ * @param mask Mask to read.
+ * @return Flag value.
+ */
+ protected final boolean isFlag(int mask) {
+ return (flags & mask) != 0;
+ }
+
+ /** {@inheritDoc} */
+ @Override public int partition() {
+ return part;
+ }
+
/** {@inheritDoc} */
@Override public Throwable error() {
return err;
@@ -106,8 +142,6 @@ public class GridDistributedTxPrepareResponse extends GridDistributedBaseMessage
this.txState = txState;
}
- /** {@inheritDoc}
- * @param ctx*/
/** {@inheritDoc} */
@Override public IgniteLogger messageLogger(GridCacheSharedContext ctx) {
return ctx.txPrepareMessageLogger();
@@ -150,6 +184,18 @@ public class GridDistributedTxPrepareResponse extends GridDistributedBaseMessage
writer.incrementState();
+ case 8:
+ if (!writer.writeByte("flags", flags))
+ return false;
+
+ writer.incrementState();
+
+ case 9:
+ if (!writer.writeInt("part", part))
+ return false;
+
+ writer.incrementState();
+
}
return true;
@@ -174,6 +220,22 @@ public class GridDistributedTxPrepareResponse extends GridDistributedBaseMessage
reader.incrementState();
+ case 8:
+ flags = reader.readByte("flags");
+
+ if (!reader.isLastRead())
+ return false;
+
+ reader.incrementState();
+
+ case 9:
+ part = reader.readInt("part");
+
+ if (!reader.isLastRead())
+ return false;
+
+ reader.incrementState();
+
}
return reader.afterMessageRead(GridDistributedTxPrepareResponse.class);
@@ -186,7 +248,7 @@ public class GridDistributedTxPrepareResponse extends GridDistributedBaseMessage
/** {@inheritDoc} */
@Override public byte fieldsCount() {
- return 8;
+ return 10;
}
/** {@inheritDoc} */
http://git-wip-us.apache.org/repos/asf/ignite/blob/763f1b0b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtTxFinishFuture.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtTxFinishFuture.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtTxFinishFuture.java
index 5d4e610..17e9047 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtTxFinishFuture.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtTxFinishFuture.java
@@ -179,7 +179,7 @@ public final class GridDhtTxFinishFuture<K, V> extends GridCompoundIdentityFutur
if (isMini(fut)) {
MiniFuture f = (MiniFuture)fut;
- if (f.futureId().equals(res.miniId())) {
+ if (f.futureId() == res.miniId()) {
found = true;
assert f.node().id().equals(nodeId);
@@ -304,10 +304,12 @@ public final class GridDhtTxFinishFuture<K, V> extends GridCompoundIdentityFutur
boolean res = false;
+ int miniId = 0;
+
for (ClusterNode n : nodes) {
assert !n.isLocal();
- MiniFuture fut = new MiniFuture(n);
+ MiniFuture fut = new MiniFuture(++miniId, n);
add(fut); // Append new future.
@@ -325,8 +327,7 @@ public final class GridDhtTxFinishFuture<K, V> extends GridCompoundIdentityFutur
tx.system(),
tx.ioPolicy(),
tx.isSystemInvalidate(),
- sync,
- sync,
+ sync ? FULL_SYNC : tx.syncMode(),
tx.completedBase(),
tx.committedVersions(),
tx.rolledbackVersions(),
@@ -391,6 +392,8 @@ public final class GridDhtTxFinishFuture<K, V> extends GridCompoundIdentityFutur
boolean res = false;
+ int miniId = 0;
+
// Create mini futures.
for (GridDistributedTxMapping dhtMapping : dhtMap.values()) {
ClusterNode n = dhtMapping.primary();
@@ -403,7 +406,7 @@ public final class GridDhtTxFinishFuture<K, V> extends GridCompoundIdentityFutur
// Nothing to send.
continue;
- MiniFuture fut = new MiniFuture(dhtMapping, nearMapping);
+ MiniFuture fut = new MiniFuture(++miniId, dhtMapping, nearMapping);
add(fut); // Append new future.
@@ -426,8 +429,7 @@ public final class GridDhtTxFinishFuture<K, V> extends GridCompoundIdentityFutur
tx.system(),
tx.ioPolicy(),
tx.isSystemInvalidate(),
- sync,
- sync,
+ sync ? FULL_SYNC : tx.syncMode(),
tx.completedBase(),
tx.committedVersions(),
tx.rolledbackVersions(),
@@ -479,7 +481,7 @@ public final class GridDhtTxFinishFuture<K, V> extends GridCompoundIdentityFutur
// Nothing to send.
continue;
- MiniFuture fut = new MiniFuture(null, nearMapping);
+ MiniFuture fut = new MiniFuture(++miniId, null, nearMapping);
add(fut); // Append new future.
@@ -497,8 +499,7 @@ public final class GridDhtTxFinishFuture<K, V> extends GridCompoundIdentityFutur
tx.system(),
tx.ioPolicy(),
tx.isSystemInvalidate(),
- sync,
- sync,
+ sync ? FULL_SYNC : tx.syncMode(),
tx.completedBase(),
tx.committedVersions(),
tx.rolledbackVersions(),
@@ -573,7 +574,7 @@ public final class GridDhtTxFinishFuture<K, V> extends GridCompoundIdentityFutur
private static final long serialVersionUID = 0L;
/** */
- private final IgniteUuid futId = IgniteUuid.randomUuid();
+ private final int futId;
/** DHT mapping. */
@GridToStringInclude
@@ -588,19 +589,23 @@ public final class GridDhtTxFinishFuture<K, V> extends GridCompoundIdentityFutur
private ClusterNode node;
/**
+ * @param futId Future ID.
* @param node Node.
*/
- private MiniFuture(ClusterNode node) {
+ private MiniFuture(int futId, ClusterNode node) {
+ this.futId = futId;
this.node = node;
}
/**
+ * @param futId Future ID.
* @param dhtMapping Mapping.
* @param nearMapping nearMapping.
*/
- MiniFuture(GridDistributedTxMapping dhtMapping, GridDistributedTxMapping nearMapping) {
+ MiniFuture(int futId, GridDistributedTxMapping dhtMapping, GridDistributedTxMapping nearMapping) {
assert dhtMapping == null || nearMapping == null || dhtMapping.primary().equals(nearMapping.primary());
+ this.futId = futId;
this.dhtMapping = dhtMapping;
this.nearMapping = nearMapping;
}
@@ -608,7 +613,7 @@ public final class GridDhtTxFinishFuture<K, V> extends GridCompoundIdentityFutur
/**
* @return Future ID.
*/
- IgniteUuid futureId() {
+ int futureId() {
return futId;
}
http://git-wip-us.apache.org/repos/asf/ignite/blob/763f1b0b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtTxFinishRequest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtTxFinishRequest.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtTxFinishRequest.java
index c618a18..d9b3ae7 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtTxFinishRequest.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtTxFinishRequest.java
@@ -21,6 +21,7 @@ import java.io.Externalizable;
import java.nio.ByteBuffer;
import java.util.Collection;
import java.util.UUID;
+import org.apache.ignite.cache.CacheWriteSynchronizationMode;
import org.apache.ignite.internal.GridDirectCollection;
import org.apache.ignite.internal.processors.affinity.AffinityTopologyVersion;
import org.apache.ignite.internal.processors.cache.distributed.GridDistributedTxFinishRequest;
@@ -43,12 +44,6 @@ public class GridDhtTxFinishRequest extends GridDistributedTxFinishRequest {
/** */
private static final long serialVersionUID = 0L;
- /** */
- public static final int WAIT_REMOTE_TX_FLAG_MASK = 0x01;
-
- /** */
- public static final int NEED_RETURN_VALUE_FLAG_MASK = 0x02;
-
/** Near node ID. */
private UUID nearNodeId;
@@ -56,22 +51,13 @@ public class GridDhtTxFinishRequest extends GridDistributedTxFinishRequest {
private TransactionIsolation isolation;
/** Mini future ID. */
- private IgniteUuid miniId;
-
- /** System invalidation flag. */
- private boolean sysInvalidate;
-
- /** Topology version. */
- private AffinityTopologyVersion topVer;
+ private int miniId;
/** Pending versions with order less than one for this message (needed for commit ordering). */
@GridToStringInclude
@GridDirectCollection(GridCacheVersion.class)
private Collection<GridCacheVersion> pendingVers;
- /** Check committed flag. */
- private boolean checkCommitted;
-
/** Partition update counter. */
@GridToStringInclude
@GridDirectCollection(Long.class)
@@ -80,15 +66,6 @@ public class GridDhtTxFinishRequest extends GridDistributedTxFinishRequest {
/** One phase commit write version. */
private GridCacheVersion writeVer;
- /** Subject ID. */
- private UUID subjId;
-
- /** Task name hash. */
- private int taskNameHash;
-
- /** */
- private byte flags;
-
/**
* Empty constructor required for {@link Externalizable}.
*/
@@ -110,8 +87,7 @@ public class GridDhtTxFinishRequest extends GridDistributedTxFinishRequest {
* @param sys System flag.
* @param plc IO policy.
* @param sysInvalidate System invalidation flag.
- * @param syncCommit Synchronous commit flag.
- * @param syncRollback Synchronous rollback flag.
+ * @param syncMode Write synchronization mode.
* @param baseVer Base version.
* @param committedVers Committed versions.
* @param rolledbackVers Rolled back versions.
@@ -124,7 +100,7 @@ public class GridDhtTxFinishRequest extends GridDistributedTxFinishRequest {
public GridDhtTxFinishRequest(
UUID nearNodeId,
IgniteUuid futId,
- IgniteUuid miniId,
+ int miniId,
@NotNull AffinityTopologyVersion topVer,
GridCacheVersion xidVer,
GridCacheVersion commitVer,
@@ -135,8 +111,7 @@ public class GridDhtTxFinishRequest extends GridDistributedTxFinishRequest {
boolean sys,
byte plc,
boolean sysInvalidate,
- boolean syncCommit,
- boolean syncRollback,
+ CacheWriteSynchronizationMode syncMode,
GridCacheVersion baseVer,
Collection<GridCacheVersion> committedVers,
Collection<GridCacheVersion> rolledbackVers,
@@ -151,35 +126,34 @@ public class GridDhtTxFinishRequest extends GridDistributedTxFinishRequest {
super(
xidVer,
futId,
+ topVer,
commitVer,
threadId,
commit,
invalidate,
sys,
plc,
- syncCommit,
- syncRollback,
+ syncMode,
baseVer,
committedVers,
rolledbackVers,
+ subjId,
+ taskNameHash,
txSize,
addDepInfo);
- assert miniId != null;
+ assert miniId != 0;
assert nearNodeId != null;
assert isolation != null;
this.pendingVers = pendingVers;
- this.topVer = topVer;
this.nearNodeId = nearNodeId;
this.isolation = isolation;
this.miniId = miniId;
- this.sysInvalidate = sysInvalidate;
- this.subjId = subjId;
- this.taskNameHash = taskNameHash;
needReturnValue(retVal);
waitRemoteTransactions(waitRemoteTxs);
+ systemInvalidate(sysInvalidate);
}
/**
@@ -196,8 +170,7 @@ public class GridDhtTxFinishRequest extends GridDistributedTxFinishRequest {
* @param sys System flag.
* @param plc IO policy.
* @param sysInvalidate System invalidation flag.
- * @param syncCommit Synchronous commit flag.
- * @param syncRollback Synchronous rollback flag.
+ * @param syncMode Write synchronization mode.
* @param baseVer Base version.
* @param committedVers Committed versions.
* @param rolledbackVers Rolled back versions.
@@ -211,7 +184,7 @@ public class GridDhtTxFinishRequest extends GridDistributedTxFinishRequest {
public GridDhtTxFinishRequest(
UUID nearNodeId,
IgniteUuid futId,
- IgniteUuid miniId,
+ int miniId,
@NotNull AffinityTopologyVersion topVer,
GridCacheVersion xidVer,
GridCacheVersion commitVer,
@@ -222,8 +195,7 @@ public class GridDhtTxFinishRequest extends GridDistributedTxFinishRequest {
boolean sys,
byte plc,
boolean sysInvalidate,
- boolean syncCommit,
- boolean syncRollback,
+ CacheWriteSynchronizationMode syncMode,
GridCacheVersion baseVer,
Collection<GridCacheVersion> committedVers,
Collection<GridCacheVersion> rolledbackVers,
@@ -236,9 +208,30 @@ public class GridDhtTxFinishRequest extends GridDistributedTxFinishRequest {
boolean retVal,
boolean waitRemoteTxs
) {
- this(nearNodeId, futId, miniId, topVer, xidVer, commitVer, threadId, isolation, commit, invalidate, sys, plc,
- sysInvalidate, syncCommit, syncRollback, baseVer, committedVers, rolledbackVers, pendingVers, txSize,
- subjId, taskNameHash, addDepInfo, retVal, waitRemoteTxs);
+ this(nearNodeId,
+ futId,
+ miniId,
+ topVer,
+ xidVer,
+ commitVer,
+ threadId,
+ isolation,
+ commit,
+ invalidate,
+ sys,
+ plc,
+ sysInvalidate,
+ syncMode,
+ baseVer,
+ committedVers,
+ rolledbackVers,
+ pendingVers,
+ txSize,
+ subjId,
+ taskNameHash,
+ addDepInfo,
+ retVal,
+ waitRemoteTxs);
if (updateIdxs != null && !updateIdxs.isEmpty()) {
partUpdateCnt = new GridLongList(updateIdxs.size());
@@ -258,25 +251,11 @@ public class GridDhtTxFinishRequest extends GridDistributedTxFinishRequest {
/**
* @return Mini ID.
*/
- public IgniteUuid miniId() {
+ public int miniId() {
return miniId;
}
/**
- * @return Subject ID.
- */
- @Nullable public UUID subjectId() {
- return subjId;
- }
-
- /**
- * @return Task name hash.
- */
- public int taskNameHash() {
- return taskNameHash;
- }
-
- /**
* @return Transaction isolation.
*/
public TransactionIsolation isolation() {
@@ -294,7 +273,14 @@ public class GridDhtTxFinishRequest extends GridDistributedTxFinishRequest {
* @return System invalidate flag.
*/
public boolean isSystemInvalidate() {
- return sysInvalidate;
+ return isFlag(SYS_INVALIDATE_FLAG_MASK);
+ }
+
+ /**
+ * @param sysInvalidate System invalidation flag.
+ */
+ private void systemInvalidate(boolean sysInvalidate) {
+ setFlag(sysInvalidate, SYS_INVALIDATE_FLAG_MASK);
}
/**
@@ -312,63 +298,45 @@ public class GridDhtTxFinishRequest extends GridDistributedTxFinishRequest {
}
/**
- * @return Topology version.
- */
- @Override public AffinityTopologyVersion topologyVersion() {
- return topVer;
- }
-
- /**
* @return Check committed flag.
*/
public boolean checkCommitted() {
- return checkCommitted;
+ return isFlag(CHECK_COMMITTED_FLAG_MASK);
}
/**
* @param checkCommitted Check committed flag.
*/
public void checkCommitted(boolean checkCommitted) {
- this.checkCommitted = checkCommitted;
+ setFlag(checkCommitted, CHECK_COMMITTED_FLAG_MASK);
}
/**
* @return {@code True}
*/
public boolean waitRemoteTransactions() {
- return (flags & WAIT_REMOTE_TX_FLAG_MASK) != 0;
+ return isFlag(WAIT_REMOTE_TX_FLAG_MASK);
}
/**
* @param waitRemoteTxs Wait remote transactions flag.
*/
- public void waitRemoteTransactions(boolean waitRemoteTxs) {
- if (waitRemoteTxs)
- flags = (byte)(flags | WAIT_REMOTE_TX_FLAG_MASK);
- else
- flags &= ~WAIT_REMOTE_TX_FLAG_MASK;
+ private void waitRemoteTransactions(boolean waitRemoteTxs) {
+ setFlag(waitRemoteTxs, WAIT_REMOTE_TX_FLAG_MASK);
}
/**
* @return Flag indicating whether transaction needs return value.
*/
public boolean needReturnValue() {
- return (flags & NEED_RETURN_VALUE_FLAG_MASK) != 0;
+ return isFlag(NEED_RETURN_VALUE_FLAG_MASK);
}
/**
* @param retVal Need return value.
*/
public void needReturnValue(boolean retVal) {
- if (retVal)
- flags = (byte)(flags | NEED_RETURN_VALUE_FLAG_MASK);
- else
- flags &= ~NEED_RETURN_VALUE_FLAG_MASK;
- }
-
- /** {@inheritDoc} */
- @Override public String toString() {
- return S.toString(GridDhtTxFinishRequest.class, this, super.toString());
+ setFlag(retVal, NEED_RETURN_VALUE_FLAG_MASK);
}
/** {@inheritDoc} */
@@ -386,73 +354,37 @@ public class GridDhtTxFinishRequest extends GridDistributedTxFinishRequest {
}
switch (writer.state()) {
- case 18:
- if (!writer.writeBoolean("checkCommitted", checkCommitted))
- return false;
-
- writer.incrementState();
-
- case 19:
- if (!writer.writeByte("flags", flags))
- return false;
-
- writer.incrementState();
-
- case 20:
- if (!writer.writeByte("isolation", isolation != null ? (byte)isolation.ordinal() : -1))
- return false;
-
- writer.incrementState();
-
case 21:
- if (!writer.writeIgniteUuid("miniId", miniId))
+ if (!writer.writeByte("isolation", isolation != null ? (byte)isolation.ordinal() : -1))
return false;
writer.incrementState();
case 22:
- if (!writer.writeUuid("nearNodeId", nearNodeId))
+ if (!writer.writeInt("miniId", miniId))
return false;
writer.incrementState();
case 23:
- if (!writer.writeMessage("partUpdateCnt", partUpdateCnt))
+ if (!writer.writeUuid("nearNodeId", nearNodeId))
return false;
writer.incrementState();
case 24:
- if (!writer.writeCollection("pendingVers", pendingVers, MessageCollectionItemType.MSG))
+ if (!writer.writeMessage("partUpdateCnt", partUpdateCnt))
return false;
writer.incrementState();
case 25:
- if (!writer.writeUuid("subjId", subjId))
+ if (!writer.writeCollection("pendingVers", pendingVers, MessageCollectionItemType.MSG))
return false;
writer.incrementState();
case 26:
- if (!writer.writeBoolean("sysInvalidate", sysInvalidate))
- return false;
-
- writer.incrementState();
-
- case 27:
- if (!writer.writeInt("taskNameHash", taskNameHash))
- return false;
-
- writer.incrementState();
-
- case 28:
- if (!writer.writeMessage("topVer", topVer))
- return false;
-
- writer.incrementState();
-
- case 29:
if (!writer.writeMessage("writeVer", writeVer))
return false;
@@ -474,23 +406,7 @@ public class GridDhtTxFinishRequest extends GridDistributedTxFinishRequest {
return false;
switch (reader.state()) {
- case 18:
- checkCommitted = reader.readBoolean("checkCommitted");
-
- if (!reader.isLastRead())
- return false;
-
- reader.incrementState();
-
- case 19:
- flags = reader.readByte("flags");
-
- if (!reader.isLastRead())
- return false;
-
- reader.incrementState();
-
- case 20:
+ case 21:
byte isolationOrd;
isolationOrd = reader.readByte("isolation");
@@ -502,16 +418,8 @@ public class GridDhtTxFinishRequest extends GridDistributedTxFinishRequest {
reader.incrementState();
- case 21:
- miniId = reader.readIgniteUuid("miniId");
-
- if (!reader.isLastRead())
- return false;
-
- reader.incrementState();
-
case 22:
- nearNodeId = reader.readUuid("nearNodeId");
+ miniId = reader.readInt("miniId");
if (!reader.isLastRead())
return false;
@@ -519,7 +427,7 @@ public class GridDhtTxFinishRequest extends GridDistributedTxFinishRequest {
reader.incrementState();
case 23:
- partUpdateCnt = reader.readMessage("partUpdateCnt");
+ nearNodeId = reader.readUuid("nearNodeId");
if (!reader.isLastRead())
return false;
@@ -527,7 +435,7 @@ public class GridDhtTxFinishRequest extends GridDistributedTxFinishRequest {
reader.incrementState();
case 24:
- pendingVers = reader.readCollection("pendingVers", MessageCollectionItemType.MSG);
+ partUpdateCnt = reader.readMessage("partUpdateCnt");
if (!reader.isLastRead())
return false;
@@ -535,7 +443,7 @@ public class GridDhtTxFinishRequest extends GridDistributedTxFinishRequest {
reader.incrementState();
case 25:
- subjId = reader.readUuid("subjId");
+ pendingVers = reader.readCollection("pendingVers", MessageCollectionItemType.MSG);
if (!reader.isLastRead())
return false;
@@ -543,30 +451,6 @@ public class GridDhtTxFinishRequest extends GridDistributedTxFinishRequest {
reader.incrementState();
case 26:
- sysInvalidate = reader.readBoolean("sysInvalidate");
-
- if (!reader.isLastRead())
- return false;
-
- reader.incrementState();
-
- case 27:
- taskNameHash = reader.readInt("taskNameHash");
-
- if (!reader.isLastRead())
- return false;
-
- reader.incrementState();
-
- case 28:
- topVer = reader.readMessage("topVer");
-
- if (!reader.isLastRead())
- return false;
-
- reader.incrementState();
-
- case 29:
writeVer = reader.readMessage("writeVer");
if (!reader.isLastRead())
@@ -586,6 +470,11 @@ public class GridDhtTxFinishRequest extends GridDistributedTxFinishRequest {
/** {@inheritDoc} */
@Override public byte fieldsCount() {
- return 30;
+ return 27;
+ }
+
+ /** {@inheritDoc} */
+ @Override public String toString() {
+ return S.toString(GridDhtTxFinishRequest.class, this, super.toString());
}
}
http://git-wip-us.apache.org/repos/asf/ignite/blob/763f1b0b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtTxFinishResponse.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtTxFinishResponse.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtTxFinishResponse.java
index 8fb1f4e..7648178 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtTxFinishResponse.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtTxFinishResponse.java
@@ -40,7 +40,7 @@ public class GridDhtTxFinishResponse extends GridDistributedTxFinishResponse {
private static final long serialVersionUID = 0L;
/** Mini future ID. */
- private IgniteUuid miniId;
+ private int miniId;
/** Error. */
@GridDirectTransient
@@ -67,10 +67,10 @@ public class GridDhtTxFinishResponse extends GridDistributedTxFinishResponse {
* @param futId Future ID.
* @param miniId Mini future ID.
*/
- public GridDhtTxFinishResponse(GridCacheVersion xid, IgniteUuid futId, IgniteUuid miniId) {
+ public GridDhtTxFinishResponse(GridCacheVersion xid, IgniteUuid futId, int miniId) {
super(xid, futId);
- assert miniId != null;
+ assert miniId != 0;
this.miniId = miniId;
}
@@ -78,7 +78,7 @@ public class GridDhtTxFinishResponse extends GridDistributedTxFinishResponse {
/**
* @return Mini future ID.
*/
- public IgniteUuid miniId() {
+ public int miniId() {
return miniId;
}
@@ -190,7 +190,7 @@ public class GridDhtTxFinishResponse extends GridDistributedTxFinishResponse {
writer.incrementState();
case 7:
- if (!writer.writeIgniteUuid("miniId", miniId))
+ if (!writer.writeInt("miniId", miniId))
return false;
writer.incrementState();
@@ -234,7 +234,7 @@ public class GridDhtTxFinishResponse extends GridDistributedTxFinishResponse {
reader.incrementState();
case 7:
- miniId = reader.readIgniteUuid("miniId");
+ miniId = reader.readInt("miniId");
if (!reader.isLastRead())
return false;
http://git-wip-us.apache.org/repos/asf/ignite/blob/763f1b0b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtTxLocal.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtTxLocal.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtTxLocal.java
index 79c371c..1b543bf 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtTxLocal.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtTxLocal.java
@@ -78,7 +78,7 @@ public class GridDhtTxLocal extends GridDhtTxLocalAdapter implements GridCacheMa
private IgniteUuid nearFinFutId;
/** Near future ID. */
- private IgniteUuid nearFinMiniId;
+ private int nearFinMiniId;
/** Near XID. */
private GridCacheVersion nearXidVer;
@@ -255,16 +255,9 @@ public class GridDhtTxLocal extends GridDhtTxLocalAdapter implements GridCacheMa
}
/**
- * @return Near future mini ID.
- */
- public IgniteUuid nearFinishMiniId() {
- return nearFinMiniId;
- }
-
- /**
* @param nearFinMiniId Near future mini ID.
*/
- public void nearFinishMiniId(IgniteUuid nearFinMiniId) {
+ public void nearFinishMiniId(int nearFinMiniId) {
this.nearFinMiniId = nearFinMiniId;
}
@@ -641,8 +634,11 @@ public class GridDhtTxLocal extends GridDhtTxLocalAdapter implements GridCacheMa
return;
}
- GridNearTxFinishResponse res = new GridNearTxFinishResponse(nearXidVer, threadId, nearFinFutId,
- nearFinMiniId, err);
+ GridNearTxFinishResponse res = new GridNearTxFinishResponse(nearXidVer,
+ threadId,
+ nearFinFutId,
+ nearFinMiniId,
+ err);
try {
cctx.io().send(nearNodeId, res, ioPolicy());
http://git-wip-us.apache.org/repos/asf/ignite/blob/763f1b0b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtTxPrepareFuture.java
----------------------------------------------------------------------
diff --git 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
index 735653d..56884ff 100644
--- 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
@@ -856,6 +856,7 @@ public final class GridDhtTxPrepareFuture extends GridCompoundFuture<IgniteInter
assert F.isEmpty(tx.invalidPartitions());
GridNearTxPrepareResponse res = new GridNearTxPrepareResponse(
+ -1,
tx.nearXidVersion(),
tx.colocated() ? tx.xid() : tx.nearFutureId(),
nearMiniId,
http://git-wip-us.apache.org/repos/asf/ignite/blob/763f1b0b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtTxPrepareResponse.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtTxPrepareResponse.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtTxPrepareResponse.java
index 416540a..fba68ce 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtTxPrepareResponse.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtTxPrepareResponse.java
@@ -76,13 +76,19 @@ public class GridDhtTxPrepareResponse extends GridDistributedTxPrepareResponse {
}
/**
+ * @param part Partition.
* @param xid Xid version.
* @param futId Future ID.
* @param miniId Mini future ID.
* @param addDepInfo Deployment info flag.
*/
- public GridDhtTxPrepareResponse(GridCacheVersion xid, IgniteUuid futId, int miniId, boolean addDepInfo) {
- super(xid, addDepInfo);
+ public GridDhtTxPrepareResponse(
+ int part,
+ GridCacheVersion xid,
+ IgniteUuid futId,
+ int miniId,
+ boolean addDepInfo) {
+ super(part, xid, addDepInfo);
assert futId != null;
assert miniId != 0;
@@ -92,15 +98,21 @@ public class GridDhtTxPrepareResponse extends GridDistributedTxPrepareResponse {
}
/**
+ * @param part Partition.
* @param xid Xid version.
* @param futId Future ID.
* @param miniId Mini future ID.
* @param err Error.
* @param addDepInfo Deployment enabled.
*/
- public GridDhtTxPrepareResponse(GridCacheVersion xid, IgniteUuid futId, int miniId, Throwable err,
+ public GridDhtTxPrepareResponse(
+ int part,
+ GridCacheVersion xid,
+ IgniteUuid futId,
+ int miniId,
+ Throwable err,
boolean addDepInfo) {
- super(xid, err, addDepInfo);
+ super(part, xid, err, addDepInfo);
assert futId != null;
assert miniId != 0;
@@ -156,7 +168,7 @@ public class GridDhtTxPrepareResponse extends GridDistributedTxPrepareResponse {
*
* @return Collection of entry infos need to be preloaded.
*/
- public Collection<GridCacheEntryInfo> preloadEntries() {
+ Collection<GridCacheEntryInfo> preloadEntries() {
return preloadEntries == null ? Collections.<GridCacheEntryInfo>emptyList() : preloadEntries;
}
@@ -174,8 +186,7 @@ public class GridDhtTxPrepareResponse extends GridDistributedTxPrepareResponse {
preloadEntries.add(info);
}
- /** {@inheritDoc}
- * @param ctx*/
+ /** {@inheritDoc} */
@Override public void prepareMarshal(GridCacheSharedContext ctx) throws IgniteCheckedException {
super.prepareMarshal(ctx);
@@ -218,11 +229,6 @@ public class GridDhtTxPrepareResponse extends GridDistributedTxPrepareResponse {
}
/** {@inheritDoc} */
- @Override public String toString() {
- return S.toString(GridDhtTxPrepareResponse.class, this, "super", super.toString());
- }
-
- /** {@inheritDoc} */
@Override public boolean writeTo(ByteBuffer buf, MessageWriter writer) {
writer.setBuffer(buf);
@@ -237,31 +243,31 @@ public class GridDhtTxPrepareResponse extends GridDistributedTxPrepareResponse {
}
switch (writer.state()) {
- case 8:
+ case 10:
if (!writer.writeIgniteUuid("futId", futId))
return false;
writer.incrementState();
- case 9:
+ case 11:
if (!writer.writeMap("invalidParts", invalidParts, MessageCollectionItemType.INT, MessageCollectionItemType.INT_ARR))
return false;
writer.incrementState();
- case 10:
+ case 12:
if (!writer.writeInt("miniId", miniId))
return false;
writer.incrementState();
- case 11:
+ case 13:
if (!writer.writeCollection("nearEvicted", nearEvicted, MessageCollectionItemType.MSG))
return false;
writer.incrementState();
- case 12:
+ case 14:
if (!writer.writeCollection("preloadEntries", preloadEntries, MessageCollectionItemType.MSG))
return false;
@@ -283,7 +289,7 @@ public class GridDhtTxPrepareResponse extends GridDistributedTxPrepareResponse {
return false;
switch (reader.state()) {
- case 8:
+ case 10:
futId = reader.readIgniteUuid("futId");
if (!reader.isLastRead())
@@ -291,7 +297,7 @@ public class GridDhtTxPrepareResponse extends GridDistributedTxPrepareResponse {
reader.incrementState();
- case 9:
+ case 11:
invalidParts = reader.readMap("invalidParts", MessageCollectionItemType.INT, MessageCollectionItemType.INT_ARR, false);
if (!reader.isLastRead())
@@ -299,7 +305,7 @@ public class GridDhtTxPrepareResponse extends GridDistributedTxPrepareResponse {
reader.incrementState();
- case 10:
+ case 12:
miniId = reader.readInt("miniId");
if (!reader.isLastRead())
@@ -307,7 +313,7 @@ public class GridDhtTxPrepareResponse extends GridDistributedTxPrepareResponse {
reader.incrementState();
- case 11:
+ case 13:
nearEvicted = reader.readCollection("nearEvicted", MessageCollectionItemType.MSG);
if (!reader.isLastRead())
@@ -315,7 +321,7 @@ public class GridDhtTxPrepareResponse extends GridDistributedTxPrepareResponse {
reader.incrementState();
- case 12:
+ case 14:
preloadEntries = reader.readCollection("preloadEntries", MessageCollectionItemType.MSG);
if (!reader.isLastRead())
@@ -335,6 +341,12 @@ public class GridDhtTxPrepareResponse extends GridDistributedTxPrepareResponse {
/** {@inheritDoc} */
@Override public byte fieldsCount() {
- return 13;
+ return 15;
+ }
+
+ /** {@inheritDoc} */
+ @Override public String toString() {
+ return S.toString(GridDhtTxPrepareResponse.class, this,
+ "super", super.toString());
}
}
http://git-wip-us.apache.org/repos/asf/ignite/blob/763f1b0b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearTxFinishFuture.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearTxFinishFuture.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearTxFinishFuture.java
index c13650e..3e9069c 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearTxFinishFuture.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearTxFinishFuture.java
@@ -197,7 +197,7 @@ public final class GridNearTxFinishFuture<K, V> extends GridCompoundIdentityFutu
if (fut.getClass() == FinishMiniFuture.class) {
FinishMiniFuture f = (FinishMiniFuture)fut;
- if (f.futureId().equals(res.miniId())) {
+ if (f.futureId() == res.miniId()) {
assert f.primary().id().equals(nodeId);
finishFut = f;
@@ -241,7 +241,7 @@ public final class GridNearTxFinishFuture<K, V> extends GridCompoundIdentityFutu
if (fut.getClass() == CheckBackupMiniFuture.class) {
CheckBackupMiniFuture f = (CheckBackupMiniFuture)fut;
- if (f.futureId().equals(res.miniId())) {
+ if (f.futureId() == res.miniId()) {
found = true;
assert f.node().id().equals(nodeId);
@@ -255,7 +255,7 @@ public final class GridNearTxFinishFuture<K, V> extends GridCompoundIdentityFutu
else if (fut.getClass() == CheckRemoteTxMiniFuture.class) {
CheckRemoteTxMiniFuture f = (CheckRemoteTxMiniFuture)fut;
- if (f.futureId().equals(res.miniId()))
+ if (f.futureId() == res.miniId())
f.onDhtFinishResponse(nodeId, false);
}
}
@@ -400,8 +400,11 @@ public final class GridNearTxFinishFuture<K, V> extends GridCompoundIdentityFutu
if (mappings.single()) {
GridDistributedTxMapping mapping = mappings.singleMapping();
- if (mapping != null)
- finish(mapping, commit);
+ if (mapping != null) {
+ assert !hasFutures();
+
+ finish(1, mapping, commit);
+ }
}
else
finish(mappings.mappings(), commit);
@@ -468,6 +471,8 @@ public final class GridNearTxFinishFuture<K, V> extends GridCompoundIdentityFutu
*
*/
private void checkBackup() {
+ assert !hasFutures();
+
GridDistributedTxMapping mapping = mappings.singleMapping();
if (mapping != null) {
@@ -495,7 +500,7 @@ public final class GridNearTxFinishFuture<K, V> extends GridCompoundIdentityFutu
"(backup has left grid): " + tx.xidVersion(), cause));
}
else {
- final CheckBackupMiniFuture mini = new CheckBackupMiniFuture(backup, mapping);
+ final CheckBackupMiniFuture mini = new CheckBackupMiniFuture(1, backup, mapping);
add(mini);
@@ -647,16 +652,21 @@ public final class GridNearTxFinishFuture<K, V> extends GridCompoundIdentityFutu
* @param commit Commit flag.
*/
private void finish(Iterable<GridDistributedTxMapping> mappings, boolean commit) {
+ assert !hasFutures();
+
+ int miniId = 0;
+
// Create mini futures.
for (GridDistributedTxMapping m : mappings)
- finish(m, commit);
+ finish(++miniId, m, commit);
}
/**
+ * @param miniId Mini future ID.
* @param m Mapping.
* @param commit Commit flag.
*/
- private void finish(GridDistributedTxMapping m, boolean commit) {
+ private void finish(int miniId, GridDistributedTxMapping m, boolean commit) {
ClusterNode n = m.primary();
assert !m.empty();
@@ -692,7 +702,7 @@ public final class GridNearTxFinishFuture<K, V> extends GridCompoundIdentityFutu
// If this is the primary node for the keys.
if (n.isLocal()) {
- req.miniId(IgniteUuid.randomUuid());
+ req.miniId(miniId);
IgniteInternalFuture<IgniteInternalTx> fut = cctx.tm().txHandler().finish(n.id(), tx, req);
@@ -701,7 +711,7 @@ public final class GridNearTxFinishFuture<K, V> extends GridCompoundIdentityFutu
add(fut);
}
else {
- FinishMiniFuture fut = new FinishMiniFuture(m);
+ FinishMiniFuture fut = new FinishMiniFuture(miniId, m);
req.miniId(fut.futureId());
@@ -796,7 +806,7 @@ public final class GridNearTxFinishFuture<K, V> extends GridCompoundIdentityFutu
* @param waitRemoteTxs Wait for remote txs.
* @return Finish request.
*/
- private GridDhtTxFinishRequest checkCommittedRequest(IgniteUuid miniId, boolean waitRemoteTxs) {
+ private GridDhtTxFinishRequest checkCommittedRequest(int miniId, boolean waitRemoteTxs) {
GridDhtTxFinishRequest finishReq = new GridDhtTxFinishRequest(
cctx.localNodeId(),
futureId(),
@@ -811,8 +821,7 @@ public final class GridNearTxFinishFuture<K, V> extends GridCompoundIdentityFutu
tx.system(),
tx.ioPolicy(),
false,
- tx.syncMode() == FULL_SYNC,
- tx.syncMode() == FULL_SYNC,
+ tx.syncMode(),
null,
null,
null,
@@ -834,7 +843,14 @@ public final class GridNearTxFinishFuture<K, V> extends GridCompoundIdentityFutu
*/
private abstract class MinFuture extends GridFutureAdapter<IgniteInternalTx> {
/** */
- private final IgniteUuid futId = IgniteUuid.randomUuid();
+ private final int futId;
+
+ /**
+ * @param futId Future ID.
+ */
+ MinFuture(int futId) {
+ this.futId = futId;
+ }
/**
* @param nodeId Node ID.
@@ -846,7 +862,7 @@ public final class GridNearTxFinishFuture<K, V> extends GridCompoundIdentityFutu
/**
* @return Future ID.
*/
- final IgniteUuid futureId() {
+ final int futureId() {
return futId;
}
}
@@ -863,9 +879,12 @@ public final class GridNearTxFinishFuture<K, V> extends GridCompoundIdentityFutu
private GridDistributedTxMapping m;
/**
+ * @param futId Future ID.
* @param m Mapping.
*/
- FinishMiniFuture(GridDistributedTxMapping m) {
+ FinishMiniFuture(int futId, GridDistributedTxMapping m) {
+ super(futId);
+
this.m = m;
}
@@ -898,9 +917,15 @@ public final class GridNearTxFinishFuture<K, V> extends GridCompoundIdentityFutu
Collection<UUID> backups = txNodes.get(nodeId);
if (!F.isEmpty(backups)) {
- final CheckRemoteTxMiniFuture mini = new CheckRemoteTxMiniFuture(new HashSet<>(backups));
+ final CheckRemoteTxMiniFuture mini;
+
+ synchronized (sync) {
+ int futId = Integer.MIN_VALUE + futuresCountNoLock();
- add(mini);
+ mini = new CheckRemoteTxMiniFuture(futId, new HashSet<>(backups));
+
+ add(mini);
+ }
GridDhtTxFinishRequest req = checkCommittedRequest(mini.futureId(), true);
@@ -972,10 +997,13 @@ public final class GridNearTxFinishFuture<K, V> extends GridCompoundIdentityFutu
private ClusterNode backup;
/**
+ * @param futId Future ID.
* @param backup Backup to check.
* @param m Mapping associated with the backup.
*/
- CheckBackupMiniFuture(ClusterNode backup, GridDistributedTxMapping m) {
+ CheckBackupMiniFuture(int futId, ClusterNode backup, GridDistributedTxMapping m) {
+ super(futId);
+
this.backup = backup;
this.m = m;
}
@@ -1033,9 +1061,12 @@ public final class GridNearTxFinishFuture<K, V> extends GridCompoundIdentityFutu
private Set<UUID> nodes;
/**
+ * @param futId Future ID.
* @param nodes Backup nodes.
*/
- CheckRemoteTxMiniFuture(Set<UUID> nodes) {
+ CheckRemoteTxMiniFuture(int futId, Set<UUID> nodes) {
+ super(futId);
+
this.nodes = nodes;
}
http://git-wip-us.apache.org/repos/asf/ignite/blob/763f1b0b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearTxFinishRequest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearTxFinishRequest.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearTxFinishRequest.java
index dfbbe18..05c1f3e 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearTxFinishRequest.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearTxFinishRequest.java
@@ -40,25 +40,7 @@ public class GridNearTxFinishRequest extends GridDistributedTxFinishRequest {
private static final long serialVersionUID = 0L;
/** Mini future ID. */
- private IgniteUuid miniId;
-
- /** Explicit lock flag. */
- private boolean explicitLock;
-
- /** Store enabled flag. */
- private boolean storeEnabled;
-
- /** Topology version. */
- private AffinityTopologyVersion topVer;
-
- /** Subject ID. */
- private UUID subjId;
-
- /** Task name hash. */
- private int taskNameHash;
-
- /** Write synchronization mode. */
- private CacheWriteSynchronizationMode syncMode;
+ private int miniId;
/**
* Empty constructor required for {@link Externalizable}.
@@ -109,83 +91,69 @@ public class GridNearTxFinishRequest extends GridDistributedTxFinishRequest {
super(
xidVer,
futId,
+ topVer,
null,
threadId,
commit,
invalidate,
sys,
plc,
- syncMode == CacheWriteSynchronizationMode.FULL_SYNC,
- syncMode == CacheWriteSynchronizationMode.FULL_SYNC,
+ syncMode,
baseVer,
committedVers,
rolledbackVers,
+ subjId,
+ taskNameHash,
txSize,
addDepInfo
);
- this.syncMode = syncMode;
- this.explicitLock = explicitLock;
- this.storeEnabled = storeEnabled;
- this.topVer = topVer;
- this.subjId = subjId;
- this.taskNameHash = taskNameHash;
+ explicitLock(explicitLock);
+ storeEnabled(storeEnabled);
}
/**
- * @return Transaction write synchronization mode (can be null is message sent from old nodes).
+ * @return Explicit lock flag.
*/
- @Nullable public CacheWriteSynchronizationMode syncMode() {
- return syncMode;
+ public boolean explicitLock() {
+ return isFlag(EXPLICIT_LOCK_FLAG_MASK);
}
/**
- * @return Explicit lock flag.
+ * @param explicitLock Explicit lock flag.
*/
- public boolean explicitLock() {
- return explicitLock;
+ private void explicitLock(boolean explicitLock) {
+ setFlag(explicitLock, EXPLICIT_LOCK_FLAG_MASK);
}
/**
* @return Store enabled flag.
*/
public boolean storeEnabled() {
- return storeEnabled;
+ return isFlag(STORE_ENABLED_FLAG_MASK);
}
/**
- * @return Mini future ID.
+ * @param storeEnabled Store enabled flag.
*/
- public IgniteUuid miniId() {
- return miniId;
+ private void storeEnabled(boolean storeEnabled) {
+ setFlag(storeEnabled, STORE_ENABLED_FLAG_MASK);
}
/**
- * @param miniId Mini future ID.
+ * @return Mini future ID.
*/
- public void miniId(IgniteUuid miniId) {
- this.miniId = miniId;
+ public int miniId() {
+ return miniId;
}
/**
- * @return Subject ID.
+ * @param miniId Mini future ID.
*/
- @Nullable public UUID subjectId() {
- return subjId;
- }
+ public void miniId(int miniId) {
+ assert miniId > 0;
- /**
- * @return Task name hash.
- */
- public int taskNameHash() {
- return taskNameHash;
- }
-
- /**
- * @return Topology version.
- */
- @Override public AffinityTopologyVersion topologyVersion() {
- return topVer;
+ this.miniId = miniId;
}
/** {@inheritDoc} */
@@ -203,44 +171,8 @@ public class GridNearTxFinishRequest extends GridDistributedTxFinishRequest {
}
switch (writer.state()) {
- case 18:
- if (!writer.writeBoolean("explicitLock", explicitLock))
- return false;
-
- writer.incrementState();
-
- case 19:
- if (!writer.writeIgniteUuid("miniId", miniId))
- return false;
-
- writer.incrementState();
-
- case 20:
- if (!writer.writeBoolean("storeEnabled", storeEnabled))
- return false;
-
- writer.incrementState();
-
case 21:
- if (!writer.writeUuid("subjId", subjId))
- return false;
-
- writer.incrementState();
-
- case 22:
- if (!writer.writeByte("syncMode", syncMode != null ? (byte)syncMode.ordinal() : -1))
- return false;
-
- writer.incrementState();
-
- case 23:
- if (!writer.writeInt("taskNameHash", taskNameHash))
- return false;
-
- writer.incrementState();
-
- case 24:
- if (!writer.writeMessage("topVer", topVer))
+ if (!writer.writeInt("miniId", miniId))
return false;
writer.incrementState();
@@ -261,60 +193,8 @@ public class GridNearTxFinishRequest extends GridDistributedTxFinishRequest {
return false;
switch (reader.state()) {
- case 18:
- explicitLock = reader.readBoolean("explicitLock");
-
- if (!reader.isLastRead())
- return false;
-
- reader.incrementState();
-
- case 19:
- miniId = reader.readIgniteUuid("miniId");
-
- if (!reader.isLastRead())
- return false;
-
- reader.incrementState();
-
- case 20:
- storeEnabled = reader.readBoolean("storeEnabled");
-
- if (!reader.isLastRead())
- return false;
-
- reader.incrementState();
-
case 21:
- subjId = reader.readUuid("subjId");
-
- if (!reader.isLastRead())
- return false;
-
- reader.incrementState();
-
- case 22:
- byte syncModeOrd;
-
- syncModeOrd = reader.readByte("syncMode");
-
- if (!reader.isLastRead())
- return false;
-
- syncMode = CacheWriteSynchronizationMode.fromOrdinal(syncModeOrd);
-
- reader.incrementState();
-
- case 23:
- taskNameHash = reader.readInt("taskNameHash");
-
- if (!reader.isLastRead())
- return false;
-
- reader.incrementState();
-
- case 24:
- topVer = reader.readMessage("topVer");
+ miniId = reader.readInt("miniId");
if (!reader.isLastRead())
return false;
@@ -333,7 +213,7 @@ public class GridNearTxFinishRequest extends GridDistributedTxFinishRequest {
/** {@inheritDoc} */
@Override public byte fieldsCount() {
- return 25;
+ return 22;
}
/** {@inheritDoc} */
http://git-wip-us.apache.org/repos/asf/ignite/blob/763f1b0b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearTxFinishResponse.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearTxFinishResponse.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearTxFinishResponse.java
index 37fbb36..e9043ed 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearTxFinishResponse.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearTxFinishResponse.java
@@ -46,7 +46,7 @@ public class GridNearTxFinishResponse extends GridDistributedTxFinishResponse {
private byte[] errBytes;
/** Mini future ID. */
- private IgniteUuid miniId;
+ private int miniId;
/** Near tx thread ID. */
private long nearThreadId;
@@ -65,11 +65,11 @@ public class GridNearTxFinishResponse extends GridDistributedTxFinishResponse {
* @param miniId Mini future Id.
* @param err Error.
*/
- public GridNearTxFinishResponse(GridCacheVersion xid, long nearThreadId, IgniteUuid futId, IgniteUuid miniId,
+ public GridNearTxFinishResponse(GridCacheVersion xid, long nearThreadId, IgniteUuid futId, int miniId,
@Nullable Throwable err) {
super(xid, futId);
- assert miniId != null;
+ assert miniId != 0;
this.nearThreadId = nearThreadId;
this.miniId = miniId;
@@ -84,7 +84,7 @@ public class GridNearTxFinishResponse extends GridDistributedTxFinishResponse {
/**
* @return Mini future ID.
*/
- public IgniteUuid miniId() {
+ public int miniId() {
return miniId;
}
@@ -134,7 +134,7 @@ public class GridNearTxFinishResponse extends GridDistributedTxFinishResponse {
writer.incrementState();
case 6:
- if (!writer.writeIgniteUuid("miniId", miniId))
+ if (!writer.writeInt("miniId", miniId))
return false;
writer.incrementState();
@@ -170,7 +170,7 @@ public class GridNearTxFinishResponse extends GridDistributedTxFinishResponse {
reader.incrementState();
case 6:
- miniId = reader.readIgniteUuid("miniId");
+ miniId = reader.readInt("miniId");
if (!reader.isLastRead())
return false;
http://git-wip-us.apache.org/repos/asf/ignite/blob/763f1b0b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearTxPrepareResponse.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearTxPrepareResponse.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearTxPrepareResponse.java
index 9dad722..66fe902 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearTxPrepareResponse.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearTxPrepareResponse.java
@@ -102,6 +102,7 @@ public class GridNearTxPrepareResponse extends GridDistributedTxPrepareResponse
}
/**
+ * @param part Partition.
* @param xid Xid version.
* @param futId Future ID.
* @param miniId Mini future ID.
@@ -113,6 +114,7 @@ public class GridNearTxPrepareResponse extends GridDistributedTxPrepareResponse
* @param addDepInfo Deployment info flag.
*/
public GridNearTxPrepareResponse(
+ int part,
GridCacheVersion xid,
IgniteUuid futId,
int miniId,
@@ -123,7 +125,7 @@ public class GridNearTxPrepareResponse extends GridDistributedTxPrepareResponse
AffinityTopologyVersion clientRemapVer,
boolean addDepInfo
) {
- super(xid, err, addDepInfo);
+ super(part, xid, err, addDepInfo);
assert futId != null;
assert dhtVer != null;
@@ -342,61 +344,61 @@ public class GridNearTxPrepareResponse extends GridDistributedTxPrepareResponse
}
switch (writer.state()) {
- case 8:
+ case 10:
if (!writer.writeMessage("clientRemapVer", clientRemapVer))
return false;
writer.incrementState();
- case 9:
+ case 11:
if (!writer.writeMessage("dhtVer", dhtVer))
return false;
writer.incrementState();
- case 10:
+ case 12:
if (!writer.writeCollection("filterFailedKeys", filterFailedKeys, MessageCollectionItemType.MSG))
return false;
writer.incrementState();
- case 11:
+ case 13:
if (!writer.writeIgniteUuid("futId", futId))
return false;
writer.incrementState();
- case 12:
+ case 14:
if (!writer.writeInt("miniId", miniId))
return false;
writer.incrementState();
- case 13:
+ case 15:
if (!writer.writeCollection("ownedValKeys", ownedValKeys, MessageCollectionItemType.MSG))
return false;
writer.incrementState();
- case 14:
+ case 16:
if (!writer.writeCollection("ownedValVals", ownedValVals, MessageCollectionItemType.MSG))
return false;
writer.incrementState();
- case 15:
+ case 17:
if (!writer.writeCollection("pending", pending, MessageCollectionItemType.MSG))
return false;
writer.incrementState();
- case 16:
+ case 18:
if (!writer.writeMessage("retVal", retVal))
return false;
writer.incrementState();
- case 17:
+ case 19:
if (!writer.writeMessage("writeVer", writeVer))
return false;
@@ -418,7 +420,7 @@ public class GridNearTxPrepareResponse extends GridDistributedTxPrepareResponse
return false;
switch (reader.state()) {
- case 8:
+ case 10:
clientRemapVer = reader.readMessage("clientRemapVer");
if (!reader.isLastRead())
@@ -426,7 +428,7 @@ public class GridNearTxPrepareResponse extends GridDistributedTxPrepareResponse
reader.incrementState();
- case 9:
+ case 11:
dhtVer = reader.readMessage("dhtVer");
if (!reader.isLastRead())
@@ -434,7 +436,7 @@ public class GridNearTxPrepareResponse extends GridDistributedTxPrepareResponse
reader.incrementState();
- case 10:
+ case 12:
filterFailedKeys = reader.readCollection("filterFailedKeys", MessageCollectionItemType.MSG);
if (!reader.isLastRead())
@@ -442,7 +444,7 @@ public class GridNearTxPrepareResponse extends GridDistributedTxPrepareResponse
reader.incrementState();
- case 11:
+ case 13:
futId = reader.readIgniteUuid("futId");
if (!reader.isLastRead())
@@ -450,7 +452,7 @@ public class GridNearTxPrepareResponse extends GridDistributedTxPrepareResponse
reader.incrementState();
- case 12:
+ case 14:
miniId = reader.readInt("miniId");
if (!reader.isLastRead())
@@ -458,7 +460,7 @@ public class GridNearTxPrepareResponse extends GridDistributedTxPrepareResponse
reader.incrementState();
- case 13:
+ case 15:
ownedValKeys = reader.readCollection("ownedValKeys", MessageCollectionItemType.MSG);
if (!reader.isLastRead())
@@ -466,7 +468,7 @@ public class GridNearTxPrepareResponse extends GridDistributedTxPrepareResponse
reader.incrementState();
- case 14:
+ case 16:
ownedValVals = reader.readCollection("ownedValVals", MessageCollectionItemType.MSG);
if (!reader.isLastRead())
@@ -474,7 +476,7 @@ public class GridNearTxPrepareResponse extends GridDistributedTxPrepareResponse
reader.incrementState();
- case 15:
+ case 17:
pending = reader.readCollection("pending", MessageCollectionItemType.MSG);
if (!reader.isLastRead())
@@ -482,7 +484,7 @@ public class GridNearTxPrepareResponse extends GridDistributedTxPrepareResponse
reader.incrementState();
- case 16:
+ case 18:
retVal = reader.readMessage("retVal");
if (!reader.isLastRead())
@@ -490,7 +492,7 @@ public class GridNearTxPrepareResponse extends GridDistributedTxPrepareResponse
reader.incrementState();
- case 17:
+ case 19:
writeVer = reader.readMessage("writeVer");
if (!reader.isLastRead())
@@ -510,12 +512,11 @@ public class GridNearTxPrepareResponse extends GridDistributedTxPrepareResponse
/** {@inheritDoc} */
@Override public byte fieldsCount() {
- return 18;
+ return 20;
}
/** {@inheritDoc} */
@Override public String toString() {
return S.toString(GridNearTxPrepareResponse.class, this, "super", super.toString());
}
-
}
http://git-wip-us.apache.org/repos/asf/ignite/blob/763f1b0b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/transactions/IgniteTxHandler.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/transactions/IgniteTxHandler.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/transactions/IgniteTxHandler.java
index f3f67a2..a3f1356 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/transactions/IgniteTxHandler.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/transactions/IgniteTxHandler.java
@@ -271,6 +271,7 @@ public class IgniteTxHandler {
U.error(log, "Failed to prepare DHT transaction: " + locTx, e);
return new GridNearTxPrepareResponse(
+ req.partition(),
req.version(),
req.futureId(),
req.miniId(),
@@ -382,6 +383,7 @@ public class IgniteTxHandler {
}
GridNearTxPrepareResponse res = new GridNearTxPrepareResponse(
+ req.partition(),
req.version(),
req.futureId(),
req.miniId(),
@@ -836,14 +838,9 @@ public class IgniteTxHandler {
try {
assert tx != null : "Transaction is null for near finish request [nodeId=" +
nodeId + ", req=" + req + "]";
+ assert req.syncMode() != null : req;
- if (req.syncMode() == null) {
- boolean sync = req.commit() ? req.syncCommit() : req.syncRollback();
-
- tx.syncMode(sync ? FULL_SYNC : FULL_ASYNC);
- }
- else
- tx.syncMode(req.syncMode());
+ tx.syncMode(req.syncMode());
if (req.commit()) {
tx.storeEnabled(req.storeEnabled());
@@ -937,7 +934,7 @@ public class IgniteTxHandler {
* @param nodeId Sender node ID.
* @param req Request.
*/
- protected final void processDhtTxPrepareRequest(final UUID nodeId, final GridDhtTxPrepareRequest req) {
+ private void processDhtTxPrepareRequest(final UUID nodeId, final GridDhtTxPrepareRequest req) {
if (txPrepareMsgLog.isDebugEnabled()) {
txPrepareMsgLog.debug("Received dht prepare request [txId=" + req.nearXidVersion() +
", dhtTxId=" + req.version() +
@@ -955,7 +952,12 @@ public class IgniteTxHandler {
GridDhtTxPrepareResponse res;
try {
- res = new GridDhtTxPrepareResponse(req.version(), req.futureId(), req.miniId(), req.deployInfo() != null);
+ res = new GridDhtTxPrepareResponse(
+ req.partition(),
+ req.version(),
+ req.futureId(),
+ req.miniId(),
+ req.deployInfo() != null);
// Start near transaction first.
nearTx = !F.isEmpty(req.nearWrites()) ? startNearRemoteTx(ctx.deploy().globalLoader(), nodeId, req) : null;
@@ -1007,7 +1009,12 @@ public class IgniteTxHandler {
if (nearTx != null)
nearTx.rollback();
- res = new GridDhtTxPrepareResponse(req.version(), req.futureId(), req.miniId(), e,
+ res = new GridDhtTxPrepareResponse(
+ req.partition(),
+ req.version(),
+ req.futureId(),
+ req.miniId(),
+ e,
req.deployInfo() != null);
}
@@ -1058,7 +1065,7 @@ public class IgniteTxHandler {
* @param nodeId Node ID.
* @param req Request.
*/
- protected final void processDhtTxOnePhaseCommitAckRequest(final UUID nodeId,
+ private void processDhtTxOnePhaseCommitAckRequest(final UUID nodeId,
final GridDhtTxOnePhaseCommitAckRequest req) {
assert nodeId != null;
assert req != null;
@@ -1075,14 +1082,14 @@ public class IgniteTxHandler {
* @param req Request.
*/
@SuppressWarnings({"unchecked"})
- protected final void processDhtTxFinishRequest(final UUID nodeId, final GridDhtTxFinishRequest req) {
+ private void processDhtTxFinishRequest(final UUID nodeId, final GridDhtTxFinishRequest req) {
assert nodeId != null;
assert req != null;
if (req.checkCommitted()) {
boolean committed = req.waitRemoteTransactions() || !ctx.tm().addRolledbackTx(null, req.version());
- if (!committed || !req.syncCommit())
+ if (!committed || req.syncMode() != FULL_SYNC)
sendReply(nodeId, req, committed, null);
else {
IgniteInternalFuture<?> fut = ctx.tm().remoteTxFinishFuture(req.version());
[22/38] ignite git commit: ignite-4768
Posted by sb...@apache.org.
ignite-4768
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/e4e82538
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/e4e82538
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/e4e82538
Branch: refs/heads/ignite-4768
Commit: e4e825380c960f5d539c73473a827a09052145fa
Parents: 763f1b0
Author: sboikov <sb...@gridgain.com>
Authored: Mon Mar 13 11:10:06 2017 +0300
Committer: sboikov <sb...@gridgain.com>
Committed: Mon Mar 13 11:20:04 2017 +0300
----------------------------------------------------------------------
.../distributed/near/GridNearTxFinishFuture.java | 17 ++++++++++++-----
.../cache/distributed/near/GridNearTxLocal.java | 4 +++-
.../cache/transactions/IgniteTxLocalAdapter.java | 4 +++-
3 files changed, 18 insertions(+), 7 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ignite/blob/e4e82538/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearTxFinishFuture.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearTxFinishFuture.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearTxFinishFuture.java
index 3e9069c..28f2ce1 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearTxFinishFuture.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearTxFinishFuture.java
@@ -29,6 +29,7 @@ import org.apache.ignite.IgniteLogger;
import org.apache.ignite.cache.CacheWriteSynchronizationMode;
import org.apache.ignite.cluster.ClusterNode;
import org.apache.ignite.internal.IgniteInternalFuture;
+import org.apache.ignite.internal.NodeStoppingException;
import org.apache.ignite.internal.cluster.ClusterTopologyCheckedException;
import org.apache.ignite.internal.processors.affinity.AffinityTopologyVersion;
import org.apache.ignite.internal.processors.cache.GridCacheContext;
@@ -286,9 +287,14 @@ public final class GridNearTxFinishFuture<K, V> extends GridCompoundIdentityFutu
if (isDone())
return false;
- if (err != null)
+ boolean nodeStop = false;
+
+ if (err != null) {
tx.setRollbackOnly();
+ nodeStop = err instanceof NodeStoppingException;
+ }
+
if (commit) {
if (tx.commitError() != null)
err = tx.commitError();
@@ -297,7 +303,7 @@ public final class GridNearTxFinishFuture<K, V> extends GridCompoundIdentityFutu
}
if (initialized() || err != null) {
- if (tx.needCheckBackup()) {
+ if (tx.needCheckBackup() && !nodeStop) {
assert tx.onePhaseCommit();
if (err != null)
@@ -317,7 +323,8 @@ public final class GridNearTxFinishFuture<K, V> extends GridCompoundIdentityFutu
if (tx.onePhaseCommit()) {
boolean commit = this.commit && err == null;
- finishOnePhase(commit);
+ if (!nodeStop)
+ finishOnePhase(commit);
try {
tx.tmFinish(commit);
@@ -401,7 +408,7 @@ public final class GridNearTxFinishFuture<K, V> extends GridCompoundIdentityFutu
GridDistributedTxMapping mapping = mappings.singleMapping();
if (mapping != null) {
- assert !hasFutures();
+ assert !hasFutures() : futures();
finish(1, mapping, commit);
}
@@ -652,7 +659,7 @@ public final class GridNearTxFinishFuture<K, V> extends GridCompoundIdentityFutu
* @param commit Commit flag.
*/
private void finish(Iterable<GridDistributedTxMapping> mappings, boolean commit) {
- assert !hasFutures();
+ assert !hasFutures() : futures();
int miniId = 0;
http://git-wip-us.apache.org/repos/asf/ignite/blob/e4e82538/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearTxLocal.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearTxLocal.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearTxLocal.java
index 1954c34..aab115c 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearTxLocal.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearTxLocal.java
@@ -28,6 +28,7 @@ import javax.cache.expiry.ExpiryPolicy;
import org.apache.ignite.IgniteCheckedException;
import org.apache.ignite.cluster.ClusterNode;
import org.apache.ignite.internal.IgniteInternalFuture;
+import org.apache.ignite.internal.NodeStoppingException;
import org.apache.ignite.internal.processors.affinity.AffinityTopologyVersion;
import org.apache.ignite.internal.processors.cache.GridCacheContext;
import org.apache.ignite.internal.processors.cache.GridCacheEntryEx;
@@ -883,7 +884,8 @@ public class GridNearTxLocal extends GridDhtTxLocalAdapter {
catch (IgniteCheckedException e) {
COMMIT_ERR_UPD.compareAndSet(GridNearTxLocal.this, null, e);
- fut0.finish(false);
+ if (!(e instanceof NodeStoppingException))
+ fut0.finish(false);
}
}
});
http://git-wip-us.apache.org/repos/asf/ignite/blob/e4e82538/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/transactions/IgniteTxLocalAdapter.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/transactions/IgniteTxLocalAdapter.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/transactions/IgniteTxLocalAdapter.java
index cd4c55c..50197b4 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/transactions/IgniteTxLocalAdapter.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/transactions/IgniteTxLocalAdapter.java
@@ -37,6 +37,7 @@ import javax.cache.expiry.ExpiryPolicy;
import javax.cache.processor.EntryProcessor;
import org.apache.ignite.IgniteCheckedException;
import org.apache.ignite.internal.IgniteInternalFuture;
+import org.apache.ignite.internal.NodeStoppingException;
import org.apache.ignite.internal.cluster.ClusterTopologyCheckedException;
import org.apache.ignite.internal.processors.affinity.AffinityTopologyVersion;
import org.apache.ignite.internal.processors.cache.CacheEntryPredicate;
@@ -3257,7 +3258,8 @@ public abstract class IgniteTxLocalAdapter extends IgniteTxAdapter implements Ig
return new GridCacheReturn(cacheCtx, true, keepBinary, res, implicitRes.success());
}
catch (IgniteCheckedException | RuntimeException e) {
- rollbackAsync();
+ if (!(e instanceof NodeStoppingException))
+ rollbackAsync();
throw e;
}
[13/38] ignite git commit: ignite-4768
Posted by sb...@apache.org.
ignite-4768
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/d3d4a36b
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/d3d4a36b
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/d3d4a36b
Branch: refs/heads/ignite-4768
Commit: d3d4a36b4f0c71b5635dadd9211f73e728e29483
Parents: 784b171
Author: sboikov <sb...@gridgain.com>
Authored: Thu Mar 9 16:38:54 2017 +0300
Committer: sboikov <sb...@gridgain.com>
Committed: Thu Mar 9 16:38:54 2017 +0300
----------------------------------------------------------------------
.../distributed/dht/GridDhtTxPrepareFuture.java | 85 +++++++++++---------
.../dht/GridDhtTxPrepareRequest.java | 12 +--
.../dht/GridDhtTxPrepareResponse.java | 20 ++---
3 files changed, 64 insertions(+), 53 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ignite/blob/d3d4a36b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtTxPrepareFuture.java
----------------------------------------------------------------------
diff --git 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
index d093b4a..735653d 100644
--- 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
@@ -562,7 +562,7 @@ public final class GridDhtTxPrepareFuture extends GridCompoundFuture<IgniteInter
* @return Mini future.
*/
@SuppressWarnings("ForLoopReplaceableByForEach")
- private MiniFuture miniFuture(IgniteUuid miniId) {
+ private MiniFuture miniFuture(int miniId) {
// We iterate directly over the futs collection here to avoid copy.
synchronized (sync) {
int size = futuresCountNoLock();
@@ -576,7 +576,7 @@ public final class GridDhtTxPrepareFuture extends GridCompoundFuture<IgniteInter
MiniFuture mini = (MiniFuture)fut;
- if (mini.futureId().equals(miniId)) {
+ if (mini.futureId() == miniId) {
if (!mini.isDone())
return mini;
else
@@ -1233,6 +1233,8 @@ public final class GridDhtTxPrepareFuture extends GridCompoundFuture<IgniteInter
return;
if (last) {
+ int miniId = 0;
+
assert tx.transactionNodes() != null;
final long timeout = timeoutObj != null ? timeoutObj.timeout : 0;
@@ -1257,7 +1259,7 @@ public final class GridDhtTxPrepareFuture extends GridCompoundFuture<IgniteInter
if (tx.remainingTime() == -1)
return;
- MiniFuture fut = new MiniFuture(n.id(), dhtMapping, nearMapping);
+ MiniFuture fut = new MiniFuture(n.id(), ++miniId, dhtMapping, nearMapping);
add(fut); // Append new future.
@@ -1371,7 +1373,7 @@ public final class GridDhtTxPrepareFuture extends GridCompoundFuture<IgniteInter
if (tx.remainingTime() == -1)
return;
- MiniFuture fut = new MiniFuture(nearMapping.primary().id(), null, nearMapping);
+ MiniFuture fut = new MiniFuture(nearMapping.primary().id(), ++miniId, null, nearMapping);
add(fut); // Append new future.
@@ -1481,25 +1483,35 @@ public final class GridDhtTxPrepareFuture extends GridCompoundFuture<IgniteInter
try {
List<ClusterNode> dhtNodes = dht.topology().nodes(cached.partition(), tx.topologyVersion());
+ assert dhtNodes.size() > 0 && dhtNodes.get(0).id().equals(cctx.localNodeId()) : dhtNodes;
+
if (log.isDebugEnabled())
log.debug("Mapping entry to DHT nodes [nodes=" + U.toShortString(dhtNodes) +
", entry=" + entry + ']');
- // Exclude local node.
- map(entry, F.view(dhtNodes, F.remoteNodes(cctx.localNodeId())), dhtMap);
+ for (int i = 1; i < dhtNodes.size(); i++) {
+ ClusterNode node = dhtNodes.get(i);
+
+ addMapping(entry, node, dhtMap);
+ }
Collection<UUID> readers = cached.readers();
if (!F.isEmpty(readers)) {
- Collection<ClusterNode> nearNodes =
- cctx.discovery().nodes(readers, F0.not(F.idForNodeId(tx.nearNodeId())));
+ for (UUID readerId : readers) {
+ if (readerId.equals(tx.nearNodeId()))
+ continue;
- if (log.isDebugEnabled())
- log.debug("Mapping entry to near nodes [nodes=" + U.toShortString(nearNodes) +
- ", entry=" + entry + ']');
+ ClusterNode readerNode = cctx.discovery().node(readerId);
+
+ if (readerNode == null || dhtNodes.contains(readerNode))
+ continue;
+
+ if (log.isDebugEnabled())
+ log.debug("Mapping entry to near node [node=" + readerNode + ", entry=" + entry + ']');
- // Exclude DHT nodes.
- map(entry, F.view(nearNodes, F0.notIn(dhtNodes)), nearMap);
+ addMapping(entry, readerNode, nearMap);
+ }
}
else if (log.isDebugEnabled())
log.debug("Entry has no near readers: " + entry);
@@ -1516,39 +1528,35 @@ public final class GridDhtTxPrepareFuture extends GridCompoundFuture<IgniteInter
/**
* @param entry Entry.
- * @param nodes Nodes.
+ * @param n Node.
* @param globalMap Map.
*/
- private void map(
+ private void addMapping(
IgniteTxEntry entry,
- Iterable<ClusterNode> nodes,
+ ClusterNode n,
Map<UUID, GridDistributedTxMapping> globalMap
) {
- if (nodes != null) {
- for (ClusterNode n : nodes) {
- GridDistributedTxMapping global = globalMap.get(n.id());
-
- if (!F.isEmpty(entry.entryProcessors())) {
- GridDhtPartitionState state = entry.context().topology().partitionState(n.id(),
- entry.cached().partition());
+ GridDistributedTxMapping global = globalMap.get(n.id());
- if (state != GridDhtPartitionState.OWNING && state != GridDhtPartitionState.EVICTED) {
- T2<GridCacheOperation, CacheObject> procVal = entry.entryProcessorCalculatedValue();
+ if (!F.isEmpty(entry.entryProcessors())) {
+ GridDhtPartitionState state = entry.context().topology().partitionState(n.id(),
+ entry.cached().partition());
- assert procVal != null : entry;
+ if (state != GridDhtPartitionState.OWNING && state != GridDhtPartitionState.EVICTED) {
+ T2<GridCacheOperation, CacheObject> procVal = entry.entryProcessorCalculatedValue();
- entry.op(procVal.get1());
- entry.value(procVal.get2(), true, false);
- entry.entryProcessors(null);
- }
- }
+ assert procVal != null : entry;
- if (global == null)
- globalMap.put(n.id(), global = new GridDistributedTxMapping(n));
-
- global.add(entry);
+ entry.op(procVal.get1());
+ entry.value(procVal.get2(), true, false);
+ entry.entryProcessors(null);
}
}
+
+ if (global == null)
+ globalMap.put(n.id(), global = new GridDistributedTxMapping(n));
+
+ global.add(entry);
}
/**
@@ -1602,7 +1610,7 @@ public final class GridDhtTxPrepareFuture extends GridCompoundFuture<IgniteInter
private static final long serialVersionUID = 0L;
/** */
- private final IgniteUuid futId = IgniteUuid.randomUuid();
+ private final int futId;
/** Node ID. */
private UUID nodeId;
@@ -1617,17 +1625,20 @@ public final class GridDhtTxPrepareFuture extends GridCompoundFuture<IgniteInter
/**
* @param nodeId Node ID.
+ * @param futId Future ID.
* @param dhtMapping Mapping.
* @param nearMapping nearMapping.
*/
MiniFuture(
UUID nodeId,
+ int futId,
GridDistributedTxMapping dhtMapping,
GridDistributedTxMapping nearMapping
) {
assert dhtMapping == null || nearMapping == null || dhtMapping.primary().equals(nearMapping.primary());
this.nodeId = nodeId;
+ this.futId = futId;
this.dhtMapping = dhtMapping;
this.nearMapping = nearMapping;
}
@@ -1635,7 +1646,7 @@ public final class GridDhtTxPrepareFuture extends GridCompoundFuture<IgniteInter
/**
* @return Future ID.
*/
- IgniteUuid futureId() {
+ int futureId() {
return futId;
}
http://git-wip-us.apache.org/repos/asf/ignite/blob/d3d4a36b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtTxPrepareRequest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtTxPrepareRequest.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtTxPrepareRequest.java
index 8c01302..8898803 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtTxPrepareRequest.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtTxPrepareRequest.java
@@ -59,7 +59,7 @@ public class GridDhtTxPrepareRequest extends GridDistributedTxPrepareRequest {
private IgniteUuid futId;
/** Mini future ID. */
- private IgniteUuid miniId;
+ private int miniId;
/** Topology version. */
private AffinityTopologyVersion topVer;
@@ -120,7 +120,7 @@ public class GridDhtTxPrepareRequest extends GridDistributedTxPrepareRequest {
*/
public GridDhtTxPrepareRequest(
IgniteUuid futId,
- IgniteUuid miniId,
+ int miniId,
AffinityTopologyVersion topVer,
GridDhtTxLocalAdapter tx,
long timeout,
@@ -145,7 +145,7 @@ public class GridDhtTxPrepareRequest extends GridDistributedTxPrepareRequest {
addDepInfo);
assert futId != null;
- assert miniId != null;
+ assert miniId != 0;
this.topVer = topVer;
this.futId = futId;
@@ -245,7 +245,7 @@ public class GridDhtTxPrepareRequest extends GridDistributedTxPrepareRequest {
/**
* @return Mini future ID.
*/
- public IgniteUuid miniId() {
+ public int miniId() {
return miniId;
}
@@ -361,7 +361,7 @@ public class GridDhtTxPrepareRequest extends GridDistributedTxPrepareRequest {
writer.incrementState();
case 22:
- if (!writer.writeIgniteUuid("miniId", miniId))
+ if (!writer.writeInt("miniId", miniId))
return false;
writer.incrementState();
@@ -453,7 +453,7 @@ public class GridDhtTxPrepareRequest extends GridDistributedTxPrepareRequest {
reader.incrementState();
case 22:
- miniId = reader.readIgniteUuid("miniId");
+ miniId = reader.readInt("miniId");
if (!reader.isLastRead())
return false;
http://git-wip-us.apache.org/repos/asf/ignite/blob/d3d4a36b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtTxPrepareResponse.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtTxPrepareResponse.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtTxPrepareResponse.java
index fdead95..416540a 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtTxPrepareResponse.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtTxPrepareResponse.java
@@ -58,7 +58,7 @@ public class GridDhtTxPrepareResponse extends GridDistributedTxPrepareResponse {
private IgniteUuid futId;
/** Mini future ID. */
- private IgniteUuid miniId;
+ private int miniId;
/** Invalid partitions by cache ID. */
@GridDirectMap(keyType = Integer.class, valueType = int[].class)
@@ -81,11 +81,11 @@ public class GridDhtTxPrepareResponse extends GridDistributedTxPrepareResponse {
* @param miniId Mini future ID.
* @param addDepInfo Deployment info flag.
*/
- public GridDhtTxPrepareResponse(GridCacheVersion xid, IgniteUuid futId, IgniteUuid miniId, boolean addDepInfo) {
+ public GridDhtTxPrepareResponse(GridCacheVersion xid, IgniteUuid futId, int miniId, boolean addDepInfo) {
super(xid, addDepInfo);
assert futId != null;
- assert miniId != null;
+ assert miniId != 0;
this.futId = futId;
this.miniId = miniId;
@@ -98,12 +98,12 @@ public class GridDhtTxPrepareResponse extends GridDistributedTxPrepareResponse {
* @param err Error.
* @param addDepInfo Deployment enabled.
*/
- public GridDhtTxPrepareResponse(GridCacheVersion xid, IgniteUuid futId, IgniteUuid miniId, Throwable err,
+ public GridDhtTxPrepareResponse(GridCacheVersion xid, IgniteUuid futId, int miniId, Throwable err,
boolean addDepInfo) {
super(xid, err, addDepInfo);
assert futId != null;
- assert miniId != null;
+ assert miniId != 0;
this.futId = futId;
this.miniId = miniId;
@@ -112,7 +112,7 @@ public class GridDhtTxPrepareResponse extends GridDistributedTxPrepareResponse {
/**
* @return Evicted readers.
*/
- public Collection<IgniteTxKey> nearEvicted() {
+ Collection<IgniteTxKey> nearEvicted() {
return nearEvicted;
}
@@ -133,14 +133,14 @@ public class GridDhtTxPrepareResponse extends GridDistributedTxPrepareResponse {
/**
* @return Mini future ID.
*/
- public IgniteUuid miniId() {
+ public int miniId() {
return miniId;
}
/**
* @return Map from cacheId to an array of invalid partitions.
*/
- public Map<Integer, int[]> invalidPartitionsByCacheId() {
+ Map<Integer, int[]> invalidPartitionsByCacheId() {
return invalidParts;
}
@@ -250,7 +250,7 @@ public class GridDhtTxPrepareResponse extends GridDistributedTxPrepareResponse {
writer.incrementState();
case 10:
- if (!writer.writeIgniteUuid("miniId", miniId))
+ if (!writer.writeInt("miniId", miniId))
return false;
writer.incrementState();
@@ -300,7 +300,7 @@ public class GridDhtTxPrepareResponse extends GridDistributedTxPrepareResponse {
reader.incrementState();
case 10:
- miniId = reader.readIgniteUuid("miniId");
+ miniId = reader.readInt("miniId");
if (!reader.isLastRead())
return false;
[14/38] ignite git commit: ignite-4768
Posted by sb...@apache.org.
ignite-4768
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/4b440918
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/4b440918
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/4b440918
Branch: refs/heads/ignite-4768
Commit: 4b440918922bbc4c6b7f66b49a7352dd2e16633a
Parents: 35dad8f
Author: sboikov <sb...@gridgain.com>
Authored: Thu Mar 9 15:39:04 2017 +0300
Committer: sboikov <sb...@gridgain.com>
Committed: Thu Mar 9 18:11:35 2017 +0300
----------------------------------------------------------------------
.../communication/GridIoMessageFactory.java | 6 +
.../processors/cache/GridCacheIoManager.java | 3 +
.../GridDistributedTxPrepareRequest.java | 13 +-
.../GridDistributedTxPrepareResponse.java | 2 -
.../dht/GridDhtTransactionalCacheAdapter.java | 1 +
.../cache/distributed/dht/GridDhtTxMapping.java | 9 +-
.../dht/GridDhtTxNearPrepareResponse.java | 232 +++++++++++++++++++
.../distributed/dht/GridDhtTxPrepareFuture.java | 167 ++++++++-----
.../dht/GridDhtTxPrepareRequest.java | 97 ++++++--
.../cache/distributed/dht/GridDhtTxRemote.java | 6 +
...arOptimisticSerializableTxPrepareFuture.java | 8 +-
.../near/GridNearOptimisticTxPrepareFuture.java | 9 +-
.../GridNearPessimisticTxPrepareFuture.java | 193 +++++++++++----
.../near/GridNearTxPrepareFutureAdapter.java | 17 +-
.../near/GridNearTxPrepareRequest.java | 4 +-
.../near/GridNearTxPrepareResponse.java | 1 -
.../GridNearTxPrimaryPrepareCheckRequest.java | 84 +++++++
.../cache/transactions/IgniteInternalTx.java | 5 +
.../cache/transactions/IgniteTxAdapter.java | 22 +-
.../cache/transactions/IgniteTxHandler.java | 104 +++++++--
20 files changed, 819 insertions(+), 164 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ignite/blob/4b440918/modules/core/src/main/java/org/apache/ignite/internal/managers/communication/GridIoMessageFactory.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/managers/communication/GridIoMessageFactory.java b/modules/core/src/main/java/org/apache/ignite/internal/managers/communication/GridIoMessageFactory.java
index 6f95400..df3d7e8 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/managers/communication/GridIoMessageFactory.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/managers/communication/GridIoMessageFactory.java
@@ -62,6 +62,7 @@ import org.apache.ignite.internal.processors.cache.distributed.dht.GridDhtLockRe
import org.apache.ignite.internal.processors.cache.distributed.dht.GridDhtLockResponse;
import org.apache.ignite.internal.processors.cache.distributed.dht.GridDhtTxFinishRequest;
import org.apache.ignite.internal.processors.cache.distributed.dht.GridDhtTxFinishResponse;
+import org.apache.ignite.internal.processors.cache.distributed.dht.GridDhtTxNearPrepareResponse;
import org.apache.ignite.internal.processors.cache.distributed.dht.GridDhtTxOnePhaseCommitAckRequest;
import org.apache.ignite.internal.processors.cache.distributed.dht.GridDhtTxPrepareRequest;
import org.apache.ignite.internal.processors.cache.distributed.dht.GridDhtTxPrepareResponse;
@@ -173,6 +174,11 @@ public class GridIoMessageFactory implements MessageFactory {
Message msg = null;
switch (type) {
+ case -50:
+ msg = new GridDhtTxNearPrepareResponse();
+
+ break;
+
case -44:
msg = new TcpCommunicationSpi.HandshakeMessage2();
http://git-wip-us.apache.org/repos/asf/ignite/blob/4b440918/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheIoManager.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheIoManager.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheIoManager.java
index 50f58cc..7cac367 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheIoManager.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheIoManager.java
@@ -367,6 +367,9 @@ public class GridCacheIoManager extends GridCacheSharedManagerAdapter {
unmarshall(nodeId, cacheMsg);
+// if (!cacheMsg.partitionExchangeMessage())
+// log.info("Message [from=" + nodeId + ", msg=" + cacheMsg + ']');
+
if (cacheMsg.classError() != null)
processFailedMessage(nodeId, cacheMsg, c);
else
http://git-wip-us.apache.org/repos/asf/ignite/blob/4b440918/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/GridDistributedTxPrepareRequest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/GridDistributedTxPrepareRequest.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/GridDistributedTxPrepareRequest.java
index e30c456..b0d1ba7 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/GridDistributedTxPrepareRequest.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/GridDistributedTxPrepareRequest.java
@@ -75,7 +75,7 @@ public class GridDistributedTxPrepareRequest extends GridDistributedBaseMessage
private static final int SYSTEM_TX_FLAG_MASK = 0x10;
/** */
- private static final int MAPPING_KNOWN_FLAG_MASK = 0x20;
+ private static final int DHT_REPLY_NEAR_FLAG_MASK = 0x20;
/** Collection to message converter. */
private static final C1<Collection<UUID>, UUIDCollectionMessage> COL_TO_MSG = new C1<Collection<UUID>, UUIDCollectionMessage>() {
@@ -177,7 +177,7 @@ public class GridDistributedTxPrepareRequest extends GridDistributedBaseMessage
@Nullable Collection<IgniteTxEntry> reads,
Collection<IgniteTxEntry> writes,
Map<UUID, Collection<UUID>> txNodes,
- boolean mappingKnown,
+ boolean dhtReplyNear,
boolean retVal,
boolean last,
boolean onePhaseCommit,
@@ -202,11 +202,14 @@ public class GridDistributedTxPrepareRequest extends GridDistributedBaseMessage
setFlag(tx.isInvalidate(), INVALIDATE_FLAG_MASK);
setFlag(onePhaseCommit, ONE_PHASE_COMMIT_FLAG_MASK);
setFlag(last, LAST_REQ_FLAG_MASK);
- setFlag(mappingKnown, MAPPING_KNOWN_FLAG_MASK);
+ setFlag(dhtReplyNear, DHT_REPLY_NEAR_FLAG_MASK);
}
- public final boolean mappingKnown() {
- return isFlag(MAPPING_KNOWN_FLAG_MASK);
+ /**
+ * @return {@code True} if transaction works in mode when DHT nodes reply directly to near node.
+ */
+ public final boolean dhtReplyNear() {
+ return isFlag(DHT_REPLY_NEAR_FLAG_MASK);
}
/**
http://git-wip-us.apache.org/repos/asf/ignite/blob/4b440918/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/GridDistributedTxPrepareResponse.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/GridDistributedTxPrepareResponse.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/GridDistributedTxPrepareResponse.java
index 76a5e31..99f36c2 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/GridDistributedTxPrepareResponse.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/GridDistributedTxPrepareResponse.java
@@ -106,8 +106,6 @@ public class GridDistributedTxPrepareResponse extends GridDistributedBaseMessage
this.txState = txState;
}
- /** {@inheritDoc}
- * @param ctx*/
/** {@inheritDoc} */
@Override public IgniteLogger messageLogger(GridCacheSharedContext ctx) {
return ctx.txPrepareMessageLogger();
http://git-wip-us.apache.org/repos/asf/ignite/blob/4b440918/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtTransactionalCacheAdapter.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtTransactionalCacheAdapter.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtTransactionalCacheAdapter.java
index dea4072..97e40b5 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtTransactionalCacheAdapter.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtTransactionalCacheAdapter.java
@@ -230,6 +230,7 @@ public abstract class GridDhtTransactionalCacheAdapter<K, V> extends GridDhtCach
if (tx == null) {
tx = new GridDhtTxRemote(
ctx.shared(),
+ false, // TODO IGNITE-4768.
req.nodeId(),
req.futureId(),
nodeId,
http://git-wip-us.apache.org/repos/asf/ignite/blob/4b440918/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtTxMapping.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtTxMapping.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtTxMapping.java
index 9ec35b6..ce00352 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtTxMapping.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtTxMapping.java
@@ -56,8 +56,13 @@ public class GridDhtTxMapping {
txNodes.put(primary.id(), backups);
}
- for (int i = 1; i < size; i++)
- backups.add(nodes.get(i).id());
+ for (int i = 1; i < size; i++) {
+ ClusterNode backup = nodes.get(i);
+
+ assert !primary.equals(backup) : primary;
+
+ backups.add(backup.id());
+ }
}
else
txNodes.put(primary.id(), new GridLeanSet<UUID>());
http://git-wip-us.apache.org/repos/asf/ignite/blob/4b440918/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtTxNearPrepareResponse.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtTxNearPrepareResponse.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtTxNearPrepareResponse.java
new file mode 100644
index 0000000..e582bd2
--- /dev/null
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtTxNearPrepareResponse.java
@@ -0,0 +1,232 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.apache.ignite.internal.processors.cache.distributed.dht;
+
+import java.nio.ByteBuffer;
+import org.apache.ignite.IgniteLogger;
+import org.apache.ignite.internal.GridDirectTransient;
+import org.apache.ignite.internal.processors.cache.GridCacheMessage;
+import org.apache.ignite.internal.processors.cache.GridCacheSharedContext;
+import org.apache.ignite.internal.processors.cache.transactions.IgniteTxState;
+import org.apache.ignite.internal.processors.cache.transactions.IgniteTxStateAware;
+import org.apache.ignite.internal.processors.cache.version.GridCacheVersion;
+import org.apache.ignite.internal.util.typedef.internal.S;
+import org.apache.ignite.lang.IgniteUuid;
+import org.apache.ignite.plugin.extensions.communication.MessageReader;
+import org.apache.ignite.plugin.extensions.communication.MessageWriter;
+
+/**
+ *
+ */
+public class GridDhtTxNearPrepareResponse extends GridCacheMessage implements IgniteTxStateAware {
+ /** */
+ private static final long serialVersionUID = 0L;
+
+ /** */
+ private int partId;
+
+ /** */
+ private GridCacheVersion nearTxId;
+
+ /** Future ID. */
+ private IgniteUuid futId;
+
+ /** Mini future ID. */
+ private int miniId;
+
+ /** Transient TX state. */
+ @GridDirectTransient
+ private IgniteTxState txState;
+
+ /**
+ *
+ */
+ public GridDhtTxNearPrepareResponse() {
+ // No-op.
+ }
+
+ /**
+ * @param partId Partition ID.
+ * @param nearTxId Near transaction ID.
+ * @param futId Future ID.
+ * @param miniId Mini future ID.
+ */
+ public GridDhtTxNearPrepareResponse(int partId, GridCacheVersion nearTxId, IgniteUuid futId, int miniId) {
+ assert nearTxId != null;
+ assert futId != null;
+ assert miniId > 0;
+
+ this.partId = partId;
+ this.nearTxId = nearTxId;
+ this.futId = futId;
+ this.miniId = miniId;
+ }
+
+ /**
+ * @return Near transaction ID.
+ */
+ public GridCacheVersion nearTxId() {
+ return nearTxId;
+ }
+
+ /**
+ * @return Future ID.
+ */
+ public IgniteUuid futureId() {
+ return futId;
+ }
+
+ /**
+ * @return Mini future ID.
+ */
+ public int miniId() {
+ return miniId;
+ }
+
+ /** {@inheritDoc} */
+ @Override public int partition() {
+ return partId;
+ }
+
+ /** {@inheritDoc} */
+ @Override public IgniteTxState txState() {
+ return txState;
+ }
+
+ /** {@inheritDoc} */
+ @Override public void txState(IgniteTxState txState) {
+ this.txState = txState;
+ }
+
+ /** {@inheritDoc} */
+ @Override public IgniteLogger messageLogger(GridCacheSharedContext ctx) {
+ return ctx.txPrepareMessageLogger();
+ }
+
+ /** {@inheritDoc} */
+ @Override public byte directType() {
+ return -50;
+ }
+
+ /** {@inheritDoc} */
+ @Override public byte fieldsCount() {
+ return 7;
+ }
+
+ /** {@inheritDoc} */
+ @Override public boolean addDeploymentInfo() {
+ return false;
+ }
+
+ /** {@inheritDoc} */
+ @Override public boolean writeTo(ByteBuffer buf, MessageWriter writer) {
+ writer.setBuffer(buf);
+
+ if (!super.writeTo(buf, writer))
+ return false;
+
+ if (!writer.isHeaderWritten()) {
+ if (!writer.writeHeader(directType(), fieldsCount()))
+ return false;
+
+ writer.onHeaderWritten();
+ }
+
+ switch (writer.state()) {
+ case 3:
+ if (!writer.writeIgniteUuid("futId", futId))
+ return false;
+
+ writer.incrementState();
+
+ case 4:
+ if (!writer.writeInt("miniId", miniId))
+ return false;
+
+ writer.incrementState();
+
+ case 5:
+ if (!writer.writeMessage("nearTxId", nearTxId))
+ return false;
+
+ writer.incrementState();
+
+ case 6:
+ if (!writer.writeInt("partId", partId))
+ return false;
+
+ writer.incrementState();
+
+ }
+
+ return true;
+ }
+
+ /** {@inheritDoc} */
+ @Override public boolean readFrom(ByteBuffer buf, MessageReader reader) {
+ reader.setBuffer(buf);
+
+ if (!reader.beforeMessageRead())
+ return false;
+
+ if (!super.readFrom(buf, reader))
+ return false;
+
+ switch (reader.state()) {
+ case 3:
+ futId = reader.readIgniteUuid("futId");
+
+ if (!reader.isLastRead())
+ return false;
+
+ reader.incrementState();
+
+ case 4:
+ miniId = reader.readInt("miniId");
+
+ if (!reader.isLastRead())
+ return false;
+
+ reader.incrementState();
+
+ case 5:
+ nearTxId = reader.readMessage("nearTxId");
+
+ if (!reader.isLastRead())
+ return false;
+
+ reader.incrementState();
+
+ case 6:
+ partId = reader.readInt("partId");
+
+ if (!reader.isLastRead())
+ return false;
+
+ reader.incrementState();
+
+ }
+
+ return reader.afterMessageRead(GridDhtTxNearPrepareResponse.class);
+ }
+
+ /** {@inheritDoc} */
+ @Override public String toString() {
+ return S.toString(GridDhtTxNearPrepareResponse.class, this);
+ }
+}
http://git-wip-us.apache.org/repos/asf/ignite/blob/4b440918/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtTxPrepareFuture.java
----------------------------------------------------------------------
diff --git 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
index 053c3b2..7f0cddd 100644
--- 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
@@ -64,7 +64,6 @@ import org.apache.ignite.internal.processors.timeout.GridTimeoutObjectAdapter;
import org.apache.ignite.internal.transactions.IgniteTxHeuristicCheckedException;
import org.apache.ignite.internal.transactions.IgniteTxOptimisticCheckedException;
import org.apache.ignite.internal.transactions.IgniteTxTimeoutCheckedException;
-import org.apache.ignite.internal.util.F0;
import org.apache.ignite.internal.util.GridLeanSet;
import org.apache.ignite.internal.util.future.GridCompoundFuture;
import org.apache.ignite.internal.util.future.GridFutureAdapter;
@@ -778,6 +777,9 @@ public final class GridDhtTxPrepareFuture extends GridCompoundFuture<IgniteInter
return true;
}
else {
+ if (tx.dhtReplyNear())
+ return onComplete(null);
+
if (REPLIED_UPD.compareAndSet(this, 0, 1)) {
GridNearTxPrepareResponse res = createPrepareResponse(this.err);
@@ -1216,25 +1218,37 @@ public final class GridDhtTxPrepareFuture extends GridCompoundFuture<IgniteInter
// We are holding transaction-level locks for entries here, so we can get next write version.
tx.writeVersion(cctx.versions().next(tx.topologyVersion()));
- {
- // Assign keys to primary nodes.
- if (!F.isEmpty(writes)) {
- for (IgniteTxEntry write : writes)
- map(tx.entry(write.txKey()));
- }
+ assert tx.transactionNodes() != null;
- if (!F.isEmpty(reads)) {
- for (IgniteTxEntry read : reads)
- map(tx.entry(read.txKey()));
- }
+ final boolean dhtReplyNear = tx.dhtReplyNear();
+
+ Collection<UUID> backupNodes;
+ IgniteUuid nearFutId;
+
+ if (dhtReplyNear) {
+ backupNodes = tx.transactionNodes().get(cctx.localNodeId());
+ nearFutId = tx.colocated() ? tx.xid() : tx.nearFutureId();
+ }
+ else {
+ backupNodes = null;
+ nearFutId = null;
+ }
+
+ // Assign keys to primary nodes.
+ if (!F.isEmpty(writes)) {
+ for (IgniteTxEntry write : writes)
+ map(tx.entry(write.txKey()), backupNodes);
+ }
+
+ if (!F.isEmpty(reads)) {
+ for (IgniteTxEntry read : reads)
+ map(tx.entry(read.txKey()), backupNodes);
}
if (isDone())
return;
if (last) {
- assert tx.transactionNodes() != null;
-
final long timeout = timeoutObj != null ? timeoutObj.timeout : 0;
// Create mini futures.
@@ -1257,15 +1271,21 @@ public final class GridDhtTxPrepareFuture extends GridCompoundFuture<IgniteInter
if (tx.remainingTime() == -1)
return;
- MiniFuture fut = new MiniFuture(n.id(), dhtMapping, nearMapping);
+ MiniFuture fut = null;
- add(fut); // Append new future.
+ if (!tx.dhtReplyNear()) {
+ fut = new MiniFuture(n.id(), dhtMapping, nearMapping);
+
+ add(fut); // Append new future.
+ }
assert txNodes != null;
GridDhtTxPrepareRequest req = new GridDhtTxPrepareRequest(
futId,
- fut.futureId(),
+ fut != null ? fut.futureId() : null,
+ nearFutId,
+ nearMiniId,
tx.topologyVersion(),
tx,
timeout,
@@ -1273,8 +1293,8 @@ public final class GridDhtTxPrepareFuture extends GridCompoundFuture<IgniteInter
nearWrites,
txNodes,
tx.nearXidVersion(),
- false,
- true,
+ tx.dhtReplyNear(),
+ /*last*/true,
tx.onePhaseCommit(),
tx.subjectId(),
tx.taskNameHash(),
@@ -1344,7 +1364,8 @@ public final class GridDhtTxPrepareFuture extends GridCompoundFuture<IgniteInter
}
}
catch (ClusterTopologyCheckedException ignored) {
- fut.onNodeLeft();
+ if (fut != null)
+ fut.onNodeLeft();
}
catch (IgniteCheckedException e) {
if (!cctx.kernalContext().isStopping()) {
@@ -1354,7 +1375,9 @@ public final class GridDhtTxPrepareFuture extends GridCompoundFuture<IgniteInter
", node=" + n.id() + ']');
}
- fut.onResult(e);
+ // TODO IGNITE-4768, reply on near with error.
+ if (fut != null)
+ fut.onResult(e);
}
else {
if (msgLog.isDebugEnabled()) {
@@ -1368,6 +1391,8 @@ public final class GridDhtTxPrepareFuture extends GridCompoundFuture<IgniteInter
}
for (GridDistributedTxMapping nearMapping : tx.nearMap().values()) {
+ assert !tx.dhtReplyNear();
+
if (!tx.dhtMap().containsKey(nearMapping.primary().id())) {
if (tx.remainingTime() == -1)
return;
@@ -1379,6 +1404,8 @@ public final class GridDhtTxPrepareFuture extends GridCompoundFuture<IgniteInter
GridDhtTxPrepareRequest req = new GridDhtTxPrepareRequest(
futId,
fut.futureId(),
+ nearFutId,
+ nearMiniId,
tx.topologyVersion(),
tx,
timeout,
@@ -1459,49 +1486,73 @@ public final class GridDhtTxPrepareFuture extends GridCompoundFuture<IgniteInter
}
/**
+ * @param entry Entry.
+ */
+ private void onPrepare(IgniteTxEntry entry) {
+ if (entry.op() == READ || entry.op() == NOOP) {
+ GridCacheContext cacheCtx = entry.context();
+
+ ExpiryPolicy expiry = cacheCtx.expiryForTxEntry(entry);
+
+ if (expiry != null) {
+ entry.op(NOOP);
+
+ entry.ttl(CU.toTtl(expiry.getExpiryForAccess()));
+ }
+ }
+ }
+
+ /**
* @param entry Transaction entry.
*/
- private void map(IgniteTxEntry entry) {
+ private void map(IgniteTxEntry entry, @Nullable Collection<UUID> backupNodes) {
if (entry.cached().isLocal())
return;
- GridDhtCacheEntry cached = (GridDhtCacheEntry)entry.cached();
+ onPrepare(entry);
GridCacheContext cacheCtx = entry.context();
GridDhtCacheAdapter<?, ?> dht = cacheCtx.isNear() ? cacheCtx.near().dht() : cacheCtx.dht();
- ExpiryPolicy expiry = cacheCtx.expiryForTxEntry(entry);
-
- if (expiry != null && (entry.op() == READ || entry.op() == NOOP)) {
- entry.op(NOOP);
-
- entry.ttl(CU.toTtl(expiry.getExpiryForAccess()));
- }
+ GridDhtCacheEntry cached = (GridDhtCacheEntry)entry.cached();
while (true) {
try {
List<ClusterNode> dhtNodes = dht.topology().nodes(cached.partition(), tx.topologyVersion());
+ assert dhtNodes.size() > 0 && dhtNodes.get(0).id().equals(cctx.localNodeId()) : dhtNodes;
+
if (log.isDebugEnabled())
log.debug("Mapping entry to DHT nodes [nodes=" + U.toShortString(dhtNodes) +
", entry=" + entry + ']');
- // Exclude local node.
- map(entry, F.view(dhtNodes, F.remoteNodes(cctx.localNodeId())), dhtMap);
+ for (int i = 1; i < dhtNodes.size(); i++) {
+ ClusterNode node = dhtNodes.get(i);
+
+ if (backupNodes != null && !backupNodes.contains(node.id()))
+ continue;
+
+ addMapping(entry, node, dhtMap);
+ }
Collection<UUID> readers = cached.readers();
if (!F.isEmpty(readers)) {
- Collection<ClusterNode> nearNodes =
- cctx.discovery().nodes(readers, F0.not(F.idForNodeId(tx.nearNodeId())));
+ for (UUID readerId : readers) {
+ if (readerId.equals(tx.nearNodeId()))
+ continue;
- if (log.isDebugEnabled())
- log.debug("Mapping entry to near nodes [nodes=" + U.toShortString(nearNodes) +
- ", entry=" + entry + ']');
+ ClusterNode readerNode = cctx.discovery().node(readerId);
+
+ if (readerNode == null || dhtNodes.contains(readerNode))
+ continue;
- // Exclude DHT nodes.
- map(entry, F.view(nearNodes, F0.notIn(dhtNodes)), nearMap);
+ if (log.isDebugEnabled())
+ log.debug("Mapping entry to near node [node=" + readerNode + ", entry=" + entry + ']');
+
+ addMapping(entry, readerNode, nearMap);
+ }
}
else if (log.isDebugEnabled())
log.debug("Entry has no near readers: " + entry);
@@ -1518,39 +1569,35 @@ public final class GridDhtTxPrepareFuture extends GridCompoundFuture<IgniteInter
/**
* @param entry Entry.
- * @param nodes Nodes.
+ * @param n Node.
* @param globalMap Map.
*/
- private void map(
+ private void addMapping(
IgniteTxEntry entry,
- Iterable<ClusterNode> nodes,
+ ClusterNode n,
Map<UUID, GridDistributedTxMapping> globalMap
) {
- if (nodes != null) {
- for (ClusterNode n : nodes) {
- GridDistributedTxMapping global = globalMap.get(n.id());
+ GridDistributedTxMapping global = globalMap.get(n.id());
- if (!F.isEmpty(entry.entryProcessors())) {
- GridDhtPartitionState state = entry.context().topology().partitionState(n.id(),
- entry.cached().partition());
+ if (!F.isEmpty(entry.entryProcessors())) {
+ GridDhtPartitionState state = entry.context().topology().partitionState(n.id(),
+ entry.cached().partition());
- if (state != GridDhtPartitionState.OWNING && state != GridDhtPartitionState.EVICTED) {
- T2<GridCacheOperation, CacheObject> procVal = entry.entryProcessorCalculatedValue();
+ if (state != GridDhtPartitionState.OWNING && state != GridDhtPartitionState.EVICTED) {
+ T2<GridCacheOperation, CacheObject> procVal = entry.entryProcessorCalculatedValue();
- assert procVal != null : entry;
+ assert procVal != null : entry;
- entry.op(procVal.get1());
- entry.value(procVal.get2(), true, false);
- entry.entryProcessors(null);
- }
- }
-
- if (global == null)
- globalMap.put(n.id(), global = new GridDistributedTxMapping(n));
-
- global.add(entry);
+ entry.op(procVal.get1());
+ entry.value(procVal.get2(), true, false);
+ entry.entryProcessors(null);
}
}
+
+ if (global == null)
+ globalMap.put(n.id(), global = new GridDistributedTxMapping(n));
+
+ global.add(entry);
}
/**
http://git-wip-us.apache.org/repos/asf/ignite/blob/4b440918/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtTxPrepareRequest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtTxPrepareRequest.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtTxPrepareRequest.java
index e55d189..fe2d293 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtTxPrepareRequest.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtTxPrepareRequest.java
@@ -61,6 +61,12 @@ public class GridDhtTxPrepareRequest extends GridDistributedTxPrepareRequest {
/** Mini future ID. */
private IgniteUuid miniId;
+ /** Future ID. */
+ private IgniteUuid nearFutId;
+
+ /** Mini future ID. */
+ private int nearMiniId;
+
/** Topology version. */
private AffinityTopologyVersion topVer;
@@ -107,6 +113,8 @@ public class GridDhtTxPrepareRequest extends GridDistributedTxPrepareRequest {
/**
* @param futId Future ID.
* @param miniId Mini future ID.
+ * @param nearFutId Near node future ID.
+ * @param nearMiniId Near node mini future ID.
* @param topVer Topology version.
* @param tx Transaction.
* @param timeout Transaction timeout.
@@ -121,6 +129,8 @@ public class GridDhtTxPrepareRequest extends GridDistributedTxPrepareRequest {
public GridDhtTxPrepareRequest(
IgniteUuid futId,
IgniteUuid miniId,
+ IgniteUuid nearFutId,
+ int nearMiniId,
AffinityTopologyVersion topVer,
GridDhtTxLocalAdapter tx,
long timeout,
@@ -128,7 +138,7 @@ public class GridDhtTxPrepareRequest extends GridDistributedTxPrepareRequest {
Collection<IgniteTxEntry> nearWrites,
Map<UUID, Collection<UUID>> txNodes,
GridCacheVersion nearXidVer,
- boolean mappingKnown,
+ boolean dhtNearReply,
boolean last,
boolean onePhaseCommit,
UUID subjId,
@@ -140,14 +150,14 @@ public class GridDhtTxPrepareRequest extends GridDistributedTxPrepareRequest {
null,
dhtWrites,
txNodes,
- mappingKnown,
+ dhtNearReply,
retVal,
last,
onePhaseCommit,
addDepInfo);
- assert futId != null;
- assert miniId != null;
+ assert dhtNearReply || (futId != null && miniId != null);
+ assert !dhtNearReply || (nearFutId != null && nearMiniId != 0);
this.topVer = topVer;
this.futId = futId;
@@ -156,6 +166,8 @@ public class GridDhtTxPrepareRequest extends GridDistributedTxPrepareRequest {
this.nearXidVer = nearXidVer;
this.subjId = subjId;
this.taskNameHash = taskNameHash;
+ this.nearFutId = nearFutId;
+ this.nearMiniId = nearMiniId;
needReturnValue(retVal);
@@ -252,6 +264,21 @@ public class GridDhtTxPrepareRequest extends GridDistributedTxPrepareRequest {
}
/**
+ * @return Near future ID.
+ */
+ public IgniteUuid nearFutureId() {
+ return nearFutId;
+ }
+
+ /**
+ * @return Near mini future ID.
+ */
+ public int nearMiniId() {
+ return nearMiniId;
+ }
+
+
+ /**
* @return Topology version.
*/
@Override public AffinityTopologyVersion topologyVersion() {
@@ -369,54 +396,66 @@ public class GridDhtTxPrepareRequest extends GridDistributedTxPrepareRequest {
writer.incrementState();
case 23:
- if (!writer.writeUuid("nearNodeId", nearNodeId))
+ if (!writer.writeIgniteUuid("nearFutId", nearFutId))
return false;
writer.incrementState();
case 24:
- if (!writer.writeCollection("nearWrites", nearWrites, MessageCollectionItemType.MSG))
+ if (!writer.writeInt("nearMiniId", nearMiniId))
return false;
writer.incrementState();
case 25:
- if (!writer.writeMessage("nearXidVer", nearXidVer))
+ if (!writer.writeUuid("nearNodeId", nearNodeId))
return false;
writer.incrementState();
case 26:
- if (!writer.writeCollection("ownedKeys", ownedKeys, MessageCollectionItemType.MSG))
+ if (!writer.writeCollection("nearWrites", nearWrites, MessageCollectionItemType.MSG))
return false;
writer.incrementState();
case 27:
- if (!writer.writeCollection("ownedVals", ownedVals, MessageCollectionItemType.MSG))
+ if (!writer.writeMessage("nearXidVer", nearXidVer))
return false;
writer.incrementState();
case 28:
- if (!writer.writeBitSet("preloadKeys", preloadKeys))
+ if (!writer.writeCollection("ownedKeys", ownedKeys, MessageCollectionItemType.MSG))
return false;
writer.incrementState();
case 29:
- if (!writer.writeUuid("subjId", subjId))
+ if (!writer.writeCollection("ownedVals", ownedVals, MessageCollectionItemType.MSG))
return false;
writer.incrementState();
case 30:
- if (!writer.writeInt("taskNameHash", taskNameHash))
+ if (!writer.writeBitSet("preloadKeys", preloadKeys))
return false;
writer.incrementState();
case 31:
+ if (!writer.writeUuid("subjId", subjId))
+ return false;
+
+ writer.incrementState();
+
+ case 32:
+ if (!writer.writeInt("taskNameHash", taskNameHash))
+ return false;
+
+ writer.incrementState();
+
+ case 33:
if (!writer.writeMessage("topVer", topVer))
return false;
@@ -463,7 +502,7 @@ public class GridDhtTxPrepareRequest extends GridDistributedTxPrepareRequest {
reader.incrementState();
case 23:
- nearNodeId = reader.readUuid("nearNodeId");
+ nearFutId = reader.readIgniteUuid("nearFutId");
if (!reader.isLastRead())
return false;
@@ -471,7 +510,7 @@ public class GridDhtTxPrepareRequest extends GridDistributedTxPrepareRequest {
reader.incrementState();
case 24:
- nearWrites = reader.readCollection("nearWrites", MessageCollectionItemType.MSG);
+ nearMiniId = reader.readInt("nearMiniId");
if (!reader.isLastRead())
return false;
@@ -479,7 +518,7 @@ public class GridDhtTxPrepareRequest extends GridDistributedTxPrepareRequest {
reader.incrementState();
case 25:
- nearXidVer = reader.readMessage("nearXidVer");
+ nearNodeId = reader.readUuid("nearNodeId");
if (!reader.isLastRead())
return false;
@@ -487,7 +526,7 @@ public class GridDhtTxPrepareRequest extends GridDistributedTxPrepareRequest {
reader.incrementState();
case 26:
- ownedKeys = reader.readCollection("ownedKeys", MessageCollectionItemType.MSG);
+ nearWrites = reader.readCollection("nearWrites", MessageCollectionItemType.MSG);
if (!reader.isLastRead())
return false;
@@ -495,7 +534,7 @@ public class GridDhtTxPrepareRequest extends GridDistributedTxPrepareRequest {
reader.incrementState();
case 27:
- ownedVals = reader.readCollection("ownedVals", MessageCollectionItemType.MSG);
+ nearXidVer = reader.readMessage("nearXidVer");
if (!reader.isLastRead())
return false;
@@ -503,7 +542,7 @@ public class GridDhtTxPrepareRequest extends GridDistributedTxPrepareRequest {
reader.incrementState();
case 28:
- preloadKeys = reader.readBitSet("preloadKeys");
+ ownedKeys = reader.readCollection("ownedKeys", MessageCollectionItemType.MSG);
if (!reader.isLastRead())
return false;
@@ -511,7 +550,7 @@ public class GridDhtTxPrepareRequest extends GridDistributedTxPrepareRequest {
reader.incrementState();
case 29:
- subjId = reader.readUuid("subjId");
+ ownedVals = reader.readCollection("ownedVals", MessageCollectionItemType.MSG);
if (!reader.isLastRead())
return false;
@@ -519,7 +558,7 @@ public class GridDhtTxPrepareRequest extends GridDistributedTxPrepareRequest {
reader.incrementState();
case 30:
- taskNameHash = reader.readInt("taskNameHash");
+ preloadKeys = reader.readBitSet("preloadKeys");
if (!reader.isLastRead())
return false;
@@ -527,6 +566,22 @@ public class GridDhtTxPrepareRequest extends GridDistributedTxPrepareRequest {
reader.incrementState();
case 31:
+ subjId = reader.readUuid("subjId");
+
+ if (!reader.isLastRead())
+ return false;
+
+ reader.incrementState();
+
+ case 32:
+ taskNameHash = reader.readInt("taskNameHash");
+
+ if (!reader.isLastRead())
+ return false;
+
+ reader.incrementState();
+
+ case 33:
topVer = reader.readMessage("topVer");
if (!reader.isLastRead())
@@ -546,6 +601,6 @@ public class GridDhtTxPrepareRequest extends GridDistributedTxPrepareRequest {
/** {@inheritDoc} */
@Override public byte fieldsCount() {
- return 32;
+ return 34;
}
}
http://git-wip-us.apache.org/repos/asf/ignite/blob/4b440918/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtTxRemote.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtTxRemote.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtTxRemote.java
index f3c4963..97725bc 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtTxRemote.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtTxRemote.java
@@ -92,6 +92,7 @@ public class GridDhtTxRemote extends GridDistributedTxRemoteAdapter {
*/
public GridDhtTxRemote(
GridCacheSharedContext ctx,
+ boolean dhtReplyNear,
UUID nearNodeId,
IgniteUuid rmtFutId,
UUID nodeId,
@@ -143,6 +144,8 @@ public class GridDhtTxRemote extends GridDistributedTxRemoteAdapter {
assert topVer != null && topVer.topologyVersion() > 0 : topVer;
topologyVersion(topVer);
+
+ dhtReplyNear(dhtReplyNear);
}
/**
@@ -165,6 +168,7 @@ public class GridDhtTxRemote extends GridDistributedTxRemoteAdapter {
*/
public GridDhtTxRemote(
GridCacheSharedContext ctx,
+ boolean dhtReplyNear,
UUID nearNodeId,
IgniteUuid rmtFutId,
UUID nodeId,
@@ -212,6 +216,8 @@ public class GridDhtTxRemote extends GridDistributedTxRemoteAdapter {
assert topVer != null && topVer.topologyVersion() > 0 : topVer;
topologyVersion(topVer);
+
+ dhtReplyNear(dhtReplyNear);
}
/**
http://git-wip-us.apache.org/repos/asf/ignite/blob/4b440918/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearOptimisticSerializableTxPrepareFuture.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearOptimisticSerializableTxPrepareFuture.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearOptimisticSerializableTxPrepareFuture.java
index bb1609d..fcd714b 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearOptimisticSerializableTxPrepareFuture.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearOptimisticSerializableTxPrepareFuture.java
@@ -37,6 +37,7 @@ import org.apache.ignite.internal.processors.cache.GridCacheMvccCandidate;
import org.apache.ignite.internal.processors.cache.GridCacheSharedContext;
import org.apache.ignite.internal.processors.cache.distributed.GridDistributedTxMapping;
import org.apache.ignite.internal.processors.cache.distributed.dht.GridDhtTxMapping;
+import org.apache.ignite.internal.processors.cache.distributed.dht.GridDhtTxNearPrepareResponse;
import org.apache.ignite.internal.processors.cache.transactions.IgniteInternalTx;
import org.apache.ignite.internal.processors.cache.transactions.IgniteTxEntry;
import org.apache.ignite.internal.processors.cache.version.GridCacheVersion;
@@ -201,6 +202,11 @@ public class GridNearOptimisticSerializableTxPrepareFuture extends GridNearOptim
}
/** {@inheritDoc} */
+ @Override public void onDhtResponse(UUID nodeId, GridDhtTxNearPrepareResponse res) {
+ assert false; // TODO IGNITE-4768.
+ }
+
+ /** {@inheritDoc} */
@Override public boolean onDone(IgniteInternalTx t, Throwable err) {
if (isDone())
return false;
@@ -878,7 +884,7 @@ public class GridNearOptimisticSerializableTxPrepareFuture extends GridNearOptim
onDone(res);
}
else {
- parent.onPrepareResponse(m, res);
+ parent.onPrimaryPrepareResponse(m, res);
// Finish this mini future (need result only on client node).
onDone(parent.cctx.kernalContext().clientNode() ? res : null);
http://git-wip-us.apache.org/repos/asf/ignite/blob/4b440918/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearOptimisticTxPrepareFuture.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearOptimisticTxPrepareFuture.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearOptimisticTxPrepareFuture.java
index 8bb79c1..9a7f500 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearOptimisticTxPrepareFuture.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearOptimisticTxPrepareFuture.java
@@ -40,6 +40,7 @@ import org.apache.ignite.internal.processors.cache.GridCacheMvccCandidate;
import org.apache.ignite.internal.processors.cache.GridCacheSharedContext;
import org.apache.ignite.internal.processors.cache.distributed.GridDistributedTxMapping;
import org.apache.ignite.internal.processors.cache.distributed.dht.GridDhtTxMapping;
+import org.apache.ignite.internal.processors.cache.distributed.dht.GridDhtTxNearPrepareResponse;
import org.apache.ignite.internal.processors.cache.transactions.IgniteInternalTx;
import org.apache.ignite.internal.processors.cache.transactions.IgniteTxEntry;
import org.apache.ignite.internal.processors.cache.transactions.IgniteTxKey;
@@ -58,7 +59,6 @@ import org.apache.ignite.internal.util.typedef.X;
import org.apache.ignite.internal.util.typedef.internal.S;
import org.apache.ignite.internal.util.typedef.internal.U;
import org.apache.ignite.lang.IgniteBiClosure;
-import org.apache.ignite.lang.IgniteUuid;
import org.apache.ignite.transactions.TransactionDeadlockException;
import org.apache.ignite.transactions.TransactionTimeoutException;
import org.jetbrains.annotations.Nullable;
@@ -202,6 +202,11 @@ public class GridNearOptimisticTxPrepareFuture extends GridNearOptimisticTxPrepa
}
}
+ /** {@inheritDoc} */
+ @Override public void onDhtResponse(UUID nodeId, GridDhtTxNearPrepareResponse res) {
+ assert false; // TODO IGNITE-4768.
+ }
+
/**
* @return Keys for which MiniFuture isn't completed.
*/
@@ -913,7 +918,7 @@ public class GridNearOptimisticTxPrepareFuture extends GridNearOptimisticTxPrepa
remap();
}
else {
- parent.onPrepareResponse(m, res);
+ parent.onPrimaryPrepareResponse(m, res);
// Proceed prepare before finishing mini future.
if (mappings != null)
http://git-wip-us.apache.org/repos/asf/ignite/blob/4b440918/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearPessimisticTxPrepareFuture.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearPessimisticTxPrepareFuture.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearPessimisticTxPrepareFuture.java
index fb2c2fd..ed3f2f1 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearPessimisticTxPrepareFuture.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearPessimisticTxPrepareFuture.java
@@ -19,8 +19,10 @@ package org.apache.ignite.internal.processors.cache.distributed.near;
import java.util.Collection;
import java.util.HashMap;
+import java.util.HashSet;
import java.util.List;
import java.util.Map;
+import java.util.Set;
import java.util.UUID;
import org.apache.ignite.IgniteCheckedException;
import org.apache.ignite.cluster.ClusterNode;
@@ -29,11 +31,13 @@ import org.apache.ignite.internal.cluster.ClusterTopologyCheckedException;
import org.apache.ignite.internal.processors.affinity.AffinityTopologyVersion;
import org.apache.ignite.internal.processors.cache.GridCacheContext;
import org.apache.ignite.internal.processors.cache.GridCacheEntryEx;
+import org.apache.ignite.internal.processors.cache.GridCacheMessage;
import org.apache.ignite.internal.processors.cache.GridCacheMvccCandidate;
import org.apache.ignite.internal.processors.cache.GridCacheSharedContext;
import org.apache.ignite.internal.processors.cache.distributed.GridDistributedTxMapping;
import org.apache.ignite.internal.processors.cache.distributed.dht.GridDhtPartitionTopology;
import org.apache.ignite.internal.processors.cache.distributed.dht.GridDhtTxMapping;
+import org.apache.ignite.internal.processors.cache.distributed.dht.GridDhtTxNearPrepareResponse;
import org.apache.ignite.internal.processors.cache.transactions.IgniteInternalTx;
import org.apache.ignite.internal.processors.cache.transactions.IgniteTxEntry;
import org.apache.ignite.internal.transactions.IgniteTxRollbackCheckedException;
@@ -72,8 +76,6 @@ public class GridNearPessimisticTxPrepareFuture extends GridNearTxPrepareFutureA
/** {@inheritDoc} */
@Override public boolean onNodeLeft(UUID nodeId) {
- boolean found = false;
-
for (IgniteInternalFuture<?> fut : futures()) {
MiniFuture f = (MiniFuture)fut;
@@ -83,13 +85,13 @@ public class GridNearPessimisticTxPrepareFuture extends GridNearTxPrepareFutureA
e.retryReadyFuture(cctx.nextAffinityReadyFuture(tx.topologyVersion()));
- f.onNodeLeft(e);
-
- found = true;
+ f.onPrimaryLeft(e);
}
+ else
+ f.checkDhtFailed(nodeId);
}
- return found;
+ return false;
}
/** {@inheritDoc} */
@@ -102,7 +104,7 @@ public class GridNearPessimisticTxPrepareFuture extends GridNearTxPrepareFutureA
if (f != null) {
assert f.primary().id().equals(nodeId);
- f.onResult(res);
+ f.onPrimaryResult(res);
}
else {
if (msgLog.isDebugEnabled()) {
@@ -123,6 +125,22 @@ public class GridNearPessimisticTxPrepareFuture extends GridNearTxPrepareFutureA
}
}
+ /** {@inheritDoc} */
+ @Override public void onDhtResponse(UUID nodeId, GridDhtTxNearPrepareResponse res) {
+ MiniFuture f = miniFuture(res.miniId());
+
+ if (f != null)
+ f.onDhtResponse(nodeId, res);
+ else {
+ if (msgLog.isDebugEnabled()) {
+ msgLog.debug("Near pessimistic prepare, failed to find mini future [txId=" + tx.nearXidVersion() +
+ ", node=" + nodeId +
+ ", res=" + res +
+ ", fut=" + this + ']');
+ }
+ }
+ }
+
/**
* Finds pending mini future by the given mini ID.
*
@@ -184,7 +202,9 @@ public class GridNearPessimisticTxPrepareFuture extends GridNearTxPrepareFutureA
*
*/
private void preparePessimistic() {
- boolean mappingKnown = true;
+ // TODO IGNITE-4768: need detect on lock step?
+
+ boolean dhtReplyNear = true;
Map<IgniteBiTuple<ClusterNode, Boolean>, GridDistributedTxMapping> mappings = new HashMap<>();
@@ -202,10 +222,13 @@ public class GridNearPessimisticTxPrepareFuture extends GridNearTxPrepareFutureA
if (!cacheCtx.isLocal()) {
GridDhtPartitionTopology top = cacheCtx.topology();
- if (mappingKnown && (!top.rebalanceFinished(topVer) || cctx.discovery().hasNearCache(cacheCtx.cacheId(), topVer)))
- mappingKnown = false;
+ if (dhtReplyNear && (!top.rebalanceFinished(topVer) || cctx.discovery().hasNearCache(cacheCtx.cacheId(), topVer)))
+ dhtReplyNear = false;
nodes = cacheCtx.topology().nodes(cacheCtx.affinity().partition(txEntry.key()), topVer);
+
+ if (nodes.size() == 1)
+ dhtReplyNear = false;
}
else
nodes = cacheCtx.affinity().nodesByKey(txEntry.key(), topVer);
@@ -237,8 +260,11 @@ public class GridNearPessimisticTxPrepareFuture extends GridNearTxPrepareFutureA
checkOnePhase(txMapping);
- if (mappingKnown && tx.onePhaseCommit())
- mappingKnown = false;
+ // TODO IGNITE-4768.
+ if (dhtReplyNear && tx.onePhaseCommit())
+ dhtReplyNear = false;
+
+ tx.dhtReplyNear(dhtReplyNear);
long timeout = tx.remainingTime();
@@ -262,7 +288,7 @@ public class GridNearPessimisticTxPrepareFuture extends GridNearTxPrepareFutureA
m.writes(),
m.near(),
txMapping.transactionNodes(),
- mappingKnown,
+ dhtReplyNear,
true,
tx.onePhaseCommit(),
tx.needReturnValue() && tx.implicit(),
@@ -278,7 +304,7 @@ public class GridNearPessimisticTxPrepareFuture extends GridNearTxPrepareFutureA
req.addDhtVersion(txEntry.txKey(), null);
}
- final MiniFuture fut = new MiniFuture(m, ++miniId);
+ final MiniFuture fut = new MiniFuture(m, ++miniId, req);
req.miniId(fut.futureId());
@@ -292,7 +318,7 @@ public class GridNearPessimisticTxPrepareFuture extends GridNearTxPrepareFutureA
prepFut.listen(new CI1<IgniteInternalFuture<GridNearTxPrepareResponse>>() {
@Override public void apply(IgniteInternalFuture<GridNearTxPrepareResponse> prepFut) {
try {
- fut.onResult(prepFut.get());
+ fut.onPrimaryResult(prepFut.get());
}
catch (IgniteCheckedException e) {
fut.onError(e);
@@ -301,33 +327,48 @@ public class GridNearPessimisticTxPrepareFuture extends GridNearTxPrepareFutureA
});
}
else {
- try {
- cctx.io().send(primary, req, tx.ioPolicy());
-
- if (msgLog.isDebugEnabled()) {
- msgLog.debug("Near pessimistic prepare, sent request [txId=" + tx.nearXidVersion() +
- ", node=" + primary.id() + ']');
- }
- }
- catch (ClusterTopologyCheckedException e) {
- e.retryReadyFuture(cctx.nextAffinityReadyFuture(topVer));
+ if (!sendPrimaryRequest(primary, fut, req))
+ break;
+ }
+ }
- fut.onNodeLeft(e);
- }
- catch (IgniteCheckedException e) {
- if (msgLog.isDebugEnabled()) {
- msgLog.debug("Near pessimistic prepare, failed send request [txId=" + tx.nearXidVersion() +
- ", node=" + primary.id() + ", err=" + e + ']');
- }
+ markInitialized();
+ }
- fut.onError(e);
+ /**
+ * @param primary Primary node.
+ * @param fut Future.
+ * @param req Request.
+ * @return {@code False} if failed to send request.
+ */
+ private boolean sendPrimaryRequest(ClusterNode primary, MiniFuture fut, GridCacheMessage req) {
+ try {
+ cctx.io().send(primary, req, tx.ioPolicy());
- break;
- }
+ if (msgLog.isDebugEnabled()) {
+ msgLog.debug("Near pessimistic prepare, sent request [txId=" + tx.nearXidVersion() +
+ ", node=" + primary.id() + ']');
}
+
+ return true;
}
+ catch (ClusterTopologyCheckedException e) {
+ e.retryReadyFuture(cctx.nextAffinityReadyFuture(tx.topologyVersion()));
- markInitialized();
+ fut.onPrimaryLeft(e);
+
+ return false;
+ }
+ catch (IgniteCheckedException e) {
+ if (msgLog.isDebugEnabled()) {
+ msgLog.debug("Near pessimistic prepare, failed send request [txId=" + tx.nearXidVersion() +
+ ", node=" + primary.id() + ", err=" + e + ']');
+ }
+
+ fut.onError(e);
+
+ return false;
+ }
}
/** {@inheritDoc} */
@@ -372,7 +413,7 @@ public class GridNearPessimisticTxPrepareFuture extends GridNearTxPrepareFutureA
/**
*
*/
- private class MiniFuture extends GridFutureAdapter<GridNearTxPrepareResponse> {
+ private class MiniFuture extends GridFutureAdapter {
/** */
private static final long serialVersionUID = 0L;
@@ -382,13 +423,28 @@ public class GridNearPessimisticTxPrepareFuture extends GridNearTxPrepareFutureA
/** */
private GridDistributedTxMapping m;
+ /** */
+ private final Set<UUID> dhtNodes;
+
+ /** */
+ private boolean primaryProcessed;
+
/**
* @param m Mapping.
* @param futId Mini future ID.
+ * @param req Request.
*/
- MiniFuture(GridDistributedTxMapping m, int futId) {
+ MiniFuture(GridDistributedTxMapping m, int futId, GridNearTxPrepareRequest req) {
this.m = m;
this.futId = futId;
+
+ if (req.dhtReplyNear()) {
+ dhtNodes = new HashSet<>(req.transactionNodes().get(m.primary().id()));
+
+ assert !F.isEmpty(dhtNodes) : dhtNodes;
+ }
+ else
+ dhtNodes = null;
}
/**
@@ -408,20 +464,71 @@ public class GridNearPessimisticTxPrepareFuture extends GridNearTxPrepareFutureA
/**
* @param res Response.
*/
- void onResult(GridNearTxPrepareResponse res) {
+ void onPrimaryResult(GridNearTxPrepareResponse res) {
if (res.error() != null)
onError(res.error());
else {
- onPrepareResponse(m, res);
+ assert dhtNodes == null;
+
+ onPrimaryPrepareResponse(m, res);
- onDone(res);
+ onDone();
}
}
/**
+ * @param failedNodeId Failed node ID.
+ */
+ void checkDhtFailed(UUID failedNodeId) {
+ if (dhtNodes == null)
+ return;
+
+ boolean done = false;
+ GridNearTxPrimaryPrepareCheckRequest checkReq = null;
+
+ synchronized (dhtNodes) {
+ if (dhtNodes.remove(failedNodeId) && dhtNodes.isEmpty()) {
+ if (primaryProcessed)
+ done = true;
+ else
+ checkReq = new GridNearTxPrimaryPrepareCheckRequest();
+ }
+ }
+
+ if (checkReq != null) {
+ if (cctx.localNodeId().equals(primary().id())) {
+ // TODO IGNITE-4768.
+ }
+ else
+ sendPrimaryRequest(primary(), this, checkReq);
+ }
+ else if (done)
+ onDone();
+ }
+
+ /**
+ * @param nodeId Node ID.
+ * @param res Response.
+ */
+ void onDhtResponse(UUID nodeId, GridDhtTxNearPrepareResponse res) {
+ assert dhtNodes != null;
+
+ boolean done;
+
+ synchronized (dhtNodes) {
+ primaryProcessed = true;
+
+ done = dhtNodes.remove(nodeId) && dhtNodes.isEmpty();
+ }
+
+ if (done)
+ onDone();
+ }
+
+ /**
* @param e Error.
*/
- void onNodeLeft(ClusterTopologyCheckedException e) {
+ void onPrimaryLeft(ClusterTopologyCheckedException e) {
if (msgLog.isDebugEnabled()) {
msgLog.debug("Near pessimistic prepare, mini future node left [txId=" + tx.nearXidVersion() +
", nodeId=" + m.primary().id() + ']');
@@ -431,7 +538,7 @@ public class GridNearPessimisticTxPrepareFuture extends GridNearTxPrepareFutureA
tx.markForBackupCheck();
// Do not fail future for one-phase transaction right away.
- onDone((GridNearTxPrepareResponse)null);
+ onDone();
}
onError(e);
http://git-wip-us.apache.org/repos/asf/ignite/blob/4b440918/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearTxPrepareFutureAdapter.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearTxPrepareFutureAdapter.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearTxPrepareFutureAdapter.java
index a0f28c5..7f94e9f 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearTxPrepareFutureAdapter.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearTxPrepareFutureAdapter.java
@@ -30,6 +30,7 @@ import org.apache.ignite.internal.processors.cache.GridCacheMvccFuture;
import org.apache.ignite.internal.processors.cache.GridCacheSharedContext;
import org.apache.ignite.internal.processors.cache.distributed.GridDistributedTxMapping;
import org.apache.ignite.internal.processors.cache.distributed.dht.GridDhtTxMapping;
+import org.apache.ignite.internal.processors.cache.distributed.dht.GridDhtTxNearPrepareResponse;
import org.apache.ignite.internal.processors.cache.distributed.dht.colocated.GridDhtDetachedCacheEntry;
import org.apache.ignite.internal.processors.cache.transactions.IgniteInternalTx;
import org.apache.ignite.internal.processors.cache.transactions.IgniteTxEntry;
@@ -155,6 +156,12 @@ public abstract class GridNearTxPrepareFutureAdapter extends
public abstract void onResult(UUID nodeId, GridNearTxPrepareResponse res);
/**
+ * @param nodeId Sender.
+ * @param res Response.
+ */
+ public abstract void onDhtResponse(UUID nodeId, GridDhtTxNearPrepareResponse res);
+
+ /**
* Checks if mapped transaction can be committed on one phase.
* One-phase commit can be done if transaction maps to one primary node and not more than one backup.
*
@@ -182,8 +189,16 @@ public abstract class GridNearTxPrepareFutureAdapter extends
* @param m Mapping.
* @param res Response.
*/
+ final void onDhtPrepareResponse(GridDistributedTxMapping m, GridDhtTxNearPrepareResponse res) {
+
+ }
+
+ /**
+ * @param m Mapping.
+ * @param res Response.
+ */
@SuppressWarnings("ThrowableResultOfMethodCallIgnored")
- final void onPrepareResponse(GridDistributedTxMapping m, GridNearTxPrepareResponse res) {
+ final void onPrimaryPrepareResponse(GridDistributedTxMapping m, GridNearTxPrepareResponse res) {
if (res == null)
return;
http://git-wip-us.apache.org/repos/asf/ignite/blob/4b440918/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearTxPrepareRequest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearTxPrepareRequest.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearTxPrepareRequest.java
index 3eff9e5..eb124bd 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearTxPrepareRequest.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearTxPrepareRequest.java
@@ -107,7 +107,7 @@ public class GridNearTxPrepareRequest extends GridDistributedTxPrepareRequest {
Collection<IgniteTxEntry> writes,
boolean near,
Map<UUID, Collection<UUID>> txNodes,
- boolean mappingKnown,
+ boolean dhtReplyNear,
boolean last,
boolean onePhaseCommit,
boolean retVal,
@@ -123,7 +123,7 @@ public class GridNearTxPrepareRequest extends GridDistributedTxPrepareRequest {
reads,
writes,
txNodes,
- mappingKnown,
+ dhtReplyNear,
retVal,
last,
onePhaseCommit,
http://git-wip-us.apache.org/repos/asf/ignite/blob/4b440918/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearTxPrepareResponse.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearTxPrepareResponse.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearTxPrepareResponse.java
index 9dad722..08b071d 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearTxPrepareResponse.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearTxPrepareResponse.java
@@ -517,5 +517,4 @@ public class GridNearTxPrepareResponse extends GridDistributedTxPrepareResponse
@Override public String toString() {
return S.toString(GridNearTxPrepareResponse.class, this, "super", super.toString());
}
-
}
http://git-wip-us.apache.org/repos/asf/ignite/blob/4b440918/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearTxPrimaryPrepareCheckRequest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearTxPrimaryPrepareCheckRequest.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearTxPrimaryPrepareCheckRequest.java
new file mode 100644
index 0000000..9c366fd
--- /dev/null
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearTxPrimaryPrepareCheckRequest.java
@@ -0,0 +1,84 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.apache.ignite.internal.processors.cache.distributed.near;
+
+import java.nio.ByteBuffer;
+import org.apache.ignite.internal.processors.cache.GridCacheMessage;
+import org.apache.ignite.internal.util.typedef.internal.S;
+import org.apache.ignite.lang.IgniteUuid;
+import org.apache.ignite.plugin.extensions.communication.MessageReader;
+import org.apache.ignite.plugin.extensions.communication.MessageWriter;
+
+/**
+ *
+ */
+public class GridNearTxPrimaryPrepareCheckRequest extends GridCacheMessage {
+ /** */
+ private static final long serialVersionUID = 0L;
+
+ /** */
+ private int partId;
+
+ /** Future ID. */
+ private IgniteUuid futId;
+
+ /** Mini future ID. */
+ private int miniId;
+
+ /**
+ *
+ */
+ public GridNearTxPrimaryPrepareCheckRequest() {
+ // No-op.
+ }
+
+ /** {@inheritDoc} */
+ @Override public int partition() {
+ return partId;
+ }
+
+ /** {@inheritDoc} */
+ @Override public byte directType() {
+ return 0;
+ }
+
+ /** {@inheritDoc} */
+ @Override public byte fieldsCount() {
+ return 0;
+ }
+
+ /** {@inheritDoc} */
+ @Override public boolean addDeploymentInfo() {
+ return false;
+ }
+
+ /** {@inheritDoc} */
+ @Override public boolean writeTo(ByteBuffer buf, MessageWriter writer) {
+ return super.writeTo(buf, writer);
+ }
+
+ /** {@inheritDoc} */
+ @Override public boolean readFrom(ByteBuffer buf, MessageReader reader) {
+ return super.readFrom(buf, reader);
+ }
+
+ /** {@inheritDoc} */
+ @Override public String toString() {
+ return S.toString(GridNearTxPrimaryPrepareCheckRequest.class, this);
+ }
+}
http://git-wip-us.apache.org/repos/asf/ignite/blob/4b440918/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/transactions/IgniteInternalTx.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/transactions/IgniteInternalTx.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/transactions/IgniteInternalTx.java
index dd900fe..be26159 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/transactions/IgniteInternalTx.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/transactions/IgniteInternalTx.java
@@ -683,6 +683,11 @@ public interface IgniteInternalTx extends AutoCloseable {
public boolean onePhaseCommit();
/**
+ * @return {@code True} if transaction works in mode when DHT nodes reply directly to near node.
+ */
+ public boolean dhtReplyNear();
+
+ /**
* @return {@code True} if transaction has transform entries. This flag will be only set for local
* transactions.
*/
http://git-wip-us.apache.org/repos/asf/ignite/blob/4b440918/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/transactions/IgniteTxAdapter.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/transactions/IgniteTxAdapter.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/transactions/IgniteTxAdapter.java
index b07a117..9ded2a9 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/transactions/IgniteTxAdapter.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/transactions/IgniteTxAdapter.java
@@ -193,6 +193,9 @@ public abstract class IgniteTxAdapter extends GridMetadataAwareAdapter implement
protected boolean onePhaseCommit;
/** */
+ protected boolean dhtReplyNear;
+
+ /** */
protected CacheWriteSynchronizationMode syncMode;
/** If this transaction contains transform entries. */
@@ -665,7 +668,7 @@ public abstract class IgniteTxAdapter extends GridMetadataAwareAdapter implement
/** {@inheritDoc} */
@Override public Map<Integer, Set<Integer>> invalidPartitions() {
- return invalidParts == null ? Collections.<Integer, Set<Integer>>emptyMap() : invalidParts;
+ return invalidParts;
}
/** {@inheritDoc} */
@@ -979,6 +982,18 @@ public abstract class IgniteTxAdapter extends GridMetadataAwareAdapter implement
return onePhaseCommit;
}
+ /**
+ * @param dhtReplyNear {@code True} if transaction works in mode when DHT nodes reply directly to near node.
+ */
+ public void dhtReplyNear(boolean dhtReplyNear) {
+ this.dhtReplyNear = dhtReplyNear;
+ }
+
+ /** {@inheritDoc} */
+ @Override public boolean dhtReplyNear() {
+ return dhtReplyNear;
+ }
+
/** {@inheritDoc} */
@Override public boolean optimistic() {
return concurrency == OPTIMISTIC;
@@ -2393,6 +2408,11 @@ public abstract class IgniteTxAdapter extends GridMetadataAwareAdapter implement
}
/** {@inheritDoc} */
+ @Override public boolean dhtReplyNear() {
+ return false;
+ }
+
+ /** {@inheritDoc} */
@Override public boolean hasTransforms() {
return false;
}
http://git-wip-us.apache.org/repos/asf/ignite/blob/4b440918/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/transactions/IgniteTxHandler.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/transactions/IgniteTxHandler.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/transactions/IgniteTxHandler.java
index f3f67a2..07777e2 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/transactions/IgniteTxHandler.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/transactions/IgniteTxHandler.java
@@ -45,6 +45,7 @@ import org.apache.ignite.internal.processors.cache.distributed.dht.GridDhtTxFini
import org.apache.ignite.internal.processors.cache.distributed.dht.GridDhtTxFinishRequest;
import org.apache.ignite.internal.processors.cache.distributed.dht.GridDhtTxFinishResponse;
import org.apache.ignite.internal.processors.cache.distributed.dht.GridDhtTxLocal;
+import org.apache.ignite.internal.processors.cache.distributed.dht.GridDhtTxNearPrepareResponse;
import org.apache.ignite.internal.processors.cache.distributed.dht.GridDhtTxOnePhaseCommitAckRequest;
import org.apache.ignite.internal.processors.cache.distributed.dht.GridDhtTxPrepareFuture;
import org.apache.ignite.internal.processors.cache.distributed.dht.GridDhtTxPrepareRequest;
@@ -151,6 +152,12 @@ public class IgniteTxHandler {
}
});
+ ctx.io().addHandler(0, GridDhtTxNearPrepareResponse.class, new CI2<UUID, GridCacheMessage>() {
+ @Override public void apply(UUID nodeId, GridCacheMessage msg) {
+ processDhtTxNearPrepareResponse(nodeId, (GridDhtTxNearPrepareResponse)msg);
+ }
+ });
+
ctx.io().addHandler(0, GridNearTxFinishRequest.class, new CI2<UUID, GridCacheMessage>() {
@Override public void apply(UUID nodeId, GridCacheMessage msg) {
processNearTxFinishRequest(nodeId, (GridNearTxFinishRequest)msg);
@@ -467,6 +474,8 @@ public class IgniteTxHandler {
tx.transactionNodes(req.transactionNodes());
+ tx.dhtReplyNear(req.dhtReplyNear());
+
if (req.near())
tx.nearOnOriginatingNode(true);
@@ -556,6 +565,34 @@ public class IgniteTxHandler {
* @param nodeId Node ID.
* @param res Response.
*/
+ private void processDhtTxNearPrepareResponse(UUID nodeId, GridDhtTxNearPrepareResponse res) {
+ if (txPrepareMsgLog.isDebugEnabled())
+ txPrepareMsgLog.debug("Received dht near prepare response [txId=" + res.nearTxId() + ", node=" + nodeId + ']');
+
+ GridNearTxPrepareFutureAdapter fut = (GridNearTxPrepareFutureAdapter)ctx.mvcc()
+ .<IgniteInternalTx>mvccFuture(res.nearTxId(), res.futureId());
+
+ if (fut == null) {
+ U.warn(log, "Failed to find future for dht near prepare response [txId=" + res.nearTxId() +
+ ", node=" + nodeId +
+ ", res=" + res + ']');
+
+ return;
+ }
+
+ IgniteInternalTx tx = fut.tx();
+
+ assert tx != null;
+
+ res.txState(tx.txState());
+
+ fut.onDhtResponse(nodeId, res);
+ }
+
+ /**
+ * @param nodeId Node ID.
+ * @param res Response.
+ */
private void processNearTxPrepareResponse(UUID nodeId, GridNearTxPrepareResponse res) {
if (txPrepareMsgLog.isDebugEnabled())
txPrepareMsgLog.debug("Received near prepare response [txId=" + res.version() + ", node=" + nodeId + ']');
@@ -937,7 +974,7 @@ public class IgniteTxHandler {
* @param nodeId Sender node ID.
* @param req Request.
*/
- protected final void processDhtTxPrepareRequest(final UUID nodeId, final GridDhtTxPrepareRequest req) {
+ private void processDhtTxPrepareRequest(final UUID nodeId, final GridDhtTxPrepareRequest req) {
if (txPrepareMsgLog.isDebugEnabled()) {
txPrepareMsgLog.debug("Received dht prepare request [txId=" + req.nearXidVersion() +
", dhtTxId=" + req.version() +
@@ -952,17 +989,30 @@ public class IgniteTxHandler {
GridDhtTxRemote dhtTx = null;
GridNearTxRemote nearTx = null;
- GridDhtTxPrepareResponse res;
+ GridDhtTxPrepareResponse res = null;
+ GridDhtTxNearPrepareResponse nearRes = null;
try {
- res = new GridDhtTxPrepareResponse(req.version(), req.futureId(), req.miniId(), req.deployInfo() != null);
+ if (req.dhtReplyNear()) {
+ nearRes = new GridDhtTxNearPrepareResponse(
+ req.partition(),
+ req.nearXidVersion(),
+ req.nearFutureId(),
+ req.nearMiniId());
+ }
+ else {
+ res = new GridDhtTxPrepareResponse(req.version(),
+ req.futureId(),
+ req.miniId(),
+ req.deployInfo() != null);
+ }
// Start near transaction first.
nearTx = !F.isEmpty(req.nearWrites()) ? startNearRemoteTx(ctx.deploy().globalLoader(), nodeId, req) : null;
dhtTx = startRemoteTx(nodeId, req, res);
// Set evicted keys from near transaction.
- if (nearTx != null)
+ if (nearTx != null) // TODO IGNITE-4768 support near cache.
res.nearEvicted(nearTx.evicted());
if (dhtTx != null)
@@ -970,8 +1020,12 @@ public class IgniteTxHandler {
else if (nearTx != null)
req.txState(nearTx.txState());
- if (dhtTx != null && !F.isEmpty(dhtTx.invalidPartitions()))
- res.invalidPartitionsByCacheId(dhtTx.invalidPartitions());
+ if (dhtTx != null) {
+ if (res != null && dhtTx.invalidPartitions() != null)
+ res.invalidPartitionsByCacheId(dhtTx.invalidPartitions());
+ else
+ assert F.isEmpty(dhtTx.invalidPartitions()) : dhtTx.invalidPartitions();
+ }
if (req.onePhaseCommit()) {
assert req.last();
@@ -1040,15 +1094,20 @@ public class IgniteTxHandler {
completeFut.listen(new CI1<IgniteInternalFuture<IgniteInternalTx>>() {
@Override public void apply(IgniteInternalFuture<IgniteInternalTx> fut) {
- sendReply(nodeId, req, res0, dhtTx0, nearTx0);
+ sendPrepareReply(nodeId, req, res0, dhtTx0, nearTx0);
}
});
}
else
- sendReply(nodeId, req, res, dhtTx, nearTx);
+ sendPrepareReply(nodeId, req, res, dhtTx, nearTx);
+ }
+ else {
+ if (res != null)
+ sendPrepareReply(nodeId, req, res, dhtTx, nearTx);
+
+ if (nearRes != null)
+ sendPrepareReply(req.nearNodeId(), req, nearRes, dhtTx, nearTx);
}
- else
- sendReply(nodeId, req, res, dhtTx, nearTx);
assert req.txState() != null || res.error() != null ||
(ctx.tm().tx(req.version()) == null && ctx.tm().nearTx(req.version()) == null);
@@ -1058,7 +1117,7 @@ public class IgniteTxHandler {
* @param nodeId Node ID.
* @param req Request.
*/
- protected final void processDhtTxOnePhaseCommitAckRequest(final UUID nodeId,
+ private void processDhtTxOnePhaseCommitAckRequest(final UUID nodeId,
final GridDhtTxOnePhaseCommitAckRequest req) {
assert nodeId != null;
assert req != null;
@@ -1075,7 +1134,7 @@ public class IgniteTxHandler {
* @param req Request.
*/
@SuppressWarnings({"unchecked"})
- protected final void processDhtTxFinishRequest(final UUID nodeId, final GridDhtTxFinishRequest req) {
+ private void processDhtTxFinishRequest(final UUID nodeId, final GridDhtTxFinishRequest req) {
assert nodeId != null;
assert req != null;
@@ -1271,9 +1330,9 @@ public class IgniteTxHandler {
* @param dhtTx Dht tx.
* @param nearTx Near tx.
*/
- protected void sendReply(UUID nodeId,
+ private void sendPrepareReply(UUID nodeId,
GridDhtTxPrepareRequest req,
- GridDhtTxPrepareResponse res,
+ GridCacheMessage res,
GridDhtTxRemote dhtTx,
GridNearTxRemote nearTx) {
try {
@@ -1318,7 +1377,7 @@ public class IgniteTxHandler {
* @param committed {@code True} if transaction committed on this node.
* @param nearTxId Near tx version.
*/
- protected void sendReply(UUID nodeId, GridDhtTxFinishRequest req, boolean committed, GridCacheVersion nearTxId) {
+ private void sendReply(UUID nodeId, GridDhtTxFinishRequest req, boolean committed, GridCacheVersion nearTxId) {
if (req.replyRequired() || req.checkCommitted()) {
GridDhtTxFinishResponse res = new GridDhtTxFinishResponse(req.version(), req.futureId(), req.miniId());
@@ -1399,10 +1458,10 @@ public class IgniteTxHandler {
* @return Remote transaction.
* @throws IgniteCheckedException If failed.
*/
- @Nullable GridDhtTxRemote startRemoteTx(
+ @Nullable private GridDhtTxRemote startRemoteTx(
UUID nodeId,
GridDhtTxPrepareRequest req,
- GridDhtTxPrepareResponse res
+ @Nullable GridDhtTxPrepareResponse res
) throws IgniteCheckedException {
if (!F.isEmpty(req.writes())) {
GridDhtTxRemote tx = ctx.tm().tx(req.version());
@@ -1412,6 +1471,7 @@ public class IgniteTxHandler {
tx = new GridDhtTxRemote(
ctx,
+ req.dhtReplyNear(),
req.nearNodeId(),
req.futureId(),
nodeId,
@@ -1469,7 +1529,7 @@ public class IgniteTxHandler {
invalidateNearEntry(cacheCtx, entry.key(), req.version());
try {
- if (req.needPreloadKey(idx)) {
+ if (res != null && req.needPreloadKey(idx)) {
GridCacheEntryEx cached = entry.cached();
if (cached == null)
@@ -1547,8 +1607,6 @@ public class IgniteTxHandler {
tx.state(PREPARED);
}
- res.invalidPartitionsByCacheId(tx.invalidPartitions());
-
if (tx.empty() && req.last()) {
tx.rollback();
@@ -1586,7 +1644,7 @@ public class IgniteTxHandler {
* @return Remote transaction.
* @throws IgniteCheckedException If failed.
*/
- @Nullable public GridNearTxRemote startNearRemoteTx(ClassLoader ldr, UUID nodeId,
+ @Nullable private GridNearTxRemote startNearRemoteTx(ClassLoader ldr, UUID nodeId,
GridDhtTxPrepareRequest req) throws IgniteCheckedException {
if (!F.isEmpty(req.nearWrites())) {
@@ -1644,7 +1702,7 @@ public class IgniteTxHandler {
* @param nodeId Node ID.
* @param req Request.
*/
- protected void processCheckPreparedTxRequest(final UUID nodeId,
+ private void processCheckPreparedTxRequest(final UUID nodeId,
final GridCacheTxRecoveryRequest req) {
if (txRecoveryMsgLog.isDebugEnabled()) {
txRecoveryMsgLog.debug("Received tx recovery request [txId=" + req.nearXidVersion() +
@@ -1729,7 +1787,7 @@ public class IgniteTxHandler {
* @param nodeId Node ID.
* @param res Response.
*/
- protected void processCheckPreparedTxResponse(UUID nodeId, GridCacheTxRecoveryResponse res) {
+ private void processCheckPreparedTxResponse(UUID nodeId, GridCacheTxRecoveryResponse res) {
if (txRecoveryMsgLog.isDebugEnabled()) {
txRecoveryMsgLog.debug("Received tx recovery response [txId=" + res.version() +
", node=" + nodeId +
[18/38] ignite git commit: Merge remote-tracking branch
'remotes/origin/ignite-4768' into ignite-4768-1
Posted by sb...@apache.org.
Merge remote-tracking branch 'remotes/origin/ignite-4768' into ignite-4768-1
# Conflicts:
# modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/GridDistributedTxPrepareRequest.java
# modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtTxPrepareFuture.java
# modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtTxPrepareRequest.java
# modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtTxPrepareResponse.java
# modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearPessimisticTxPrepareFuture.java
# modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearTxPrepareRequest.java
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/7cf4b986
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/7cf4b986
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/7cf4b986
Branch: refs/heads/ignite-4768
Commit: 7cf4b9860a6b64d3cb63b347e166988b568ec5b6
Parents: e1961ff
Author: sboikov <sb...@gridgain.com>
Authored: Fri Mar 10 13:09:44 2017 +0300
Committer: sboikov <sb...@gridgain.com>
Committed: Fri Mar 10 13:09:44 2017 +0300
----------------------------------------------------------------------
.../managers/communication/GridIoMessageFactory.java | 1 -
.../processors/cache/distributed/dht/GridDhtLockFuture.java | 6 ++++++
.../cache/distributed/dht/GridDhtTxPrepareFuture.java | 1 +
.../cache/distributed/dht/GridDhtTxPrepareResponse.java | 2 +-
.../dht/colocated/GridDhtColocatedLockFuture.java | 6 ++++++
.../cache/distributed/near/GridNearLockFuture.java | 8 +++++++-
.../near/GridNearOptimisticSerializableTxPrepareFuture.java | 1 +
.../distributed/near/GridNearOptimisticTxPrepareFuture.java | 1 +
.../internal/processors/cache/local/GridLocalLockFuture.java | 6 ++++++
.../processors/cache/transactions/IgniteTxHandler.java | 4 +++-
10 files changed, 32 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ignite/blob/7cf4b986/modules/core/src/main/java/org/apache/ignite/internal/managers/communication/GridIoMessageFactory.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/managers/communication/GridIoMessageFactory.java b/modules/core/src/main/java/org/apache/ignite/internal/managers/communication/GridIoMessageFactory.java
index ce2c72c..6f95400 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/managers/communication/GridIoMessageFactory.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/managers/communication/GridIoMessageFactory.java
@@ -62,7 +62,6 @@ import org.apache.ignite.internal.processors.cache.distributed.dht.GridDhtLockRe
import org.apache.ignite.internal.processors.cache.distributed.dht.GridDhtLockResponse;
import org.apache.ignite.internal.processors.cache.distributed.dht.GridDhtTxFinishRequest;
import org.apache.ignite.internal.processors.cache.distributed.dht.GridDhtTxFinishResponse;
-import org.apache.ignite.internal.processors.cache.distributed.dht.GridDhtTxNearPrepareResponse;
import org.apache.ignite.internal.processors.cache.distributed.dht.GridDhtTxOnePhaseCommitAckRequest;
import org.apache.ignite.internal.processors.cache.distributed.dht.GridDhtTxPrepareRequest;
import org.apache.ignite.internal.processors.cache.distributed.dht.GridDhtTxPrepareResponse;
http://git-wip-us.apache.org/repos/asf/ignite/blob/7cf4b986/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtLockFuture.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtLockFuture.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtLockFuture.java
index a0270b0..cda4641 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtLockFuture.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtLockFuture.java
@@ -49,6 +49,7 @@ import org.apache.ignite.internal.processors.cache.KeyCacheObject;
import org.apache.ignite.internal.processors.cache.distributed.GridCacheMappedVersion;
import org.apache.ignite.internal.processors.cache.distributed.GridDistributedCacheEntry;
import org.apache.ignite.internal.processors.cache.distributed.GridDistributedLockCancelledException;
+import org.apache.ignite.internal.processors.cache.transactions.IgniteInternalTx;
import org.apache.ignite.internal.processors.cache.transactions.IgniteTxEntry;
import org.apache.ignite.internal.processors.cache.transactions.IgniteTxKey;
import org.apache.ignite.internal.processors.cache.version.GridCacheVersion;
@@ -660,6 +661,11 @@ public final class GridDhtLockFuture extends GridCompoundIdentityFuture<Boolean>
return false;
}
+ /** {@inheritDoc} */
+ @Override public IgniteInternalTx tx() {
+ return tx;
+ }
+
/**
* @return {@code True} if locks have been acquired.
*/
http://git-wip-us.apache.org/repos/asf/ignite/blob/7cf4b986/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtTxPrepareFuture.java
----------------------------------------------------------------------
diff --git 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
index a787f5f..7645d58 100644
--- 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
@@ -1418,6 +1418,7 @@ public final class GridDhtTxPrepareFuture extends GridCompoundFuture<IgniteInter
nearMapping.writes(),
tx.transactionNodes(),
tx.nearXidVersion(),
+ false,
true,
tx.onePhaseCommit(),
tx.subjectId(),
http://git-wip-us.apache.org/repos/asf/ignite/blob/7cf4b986/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtTxPrepareResponse.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtTxPrepareResponse.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtTxPrepareResponse.java
index cb10374..e7153da 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtTxPrepareResponse.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtTxPrepareResponse.java
@@ -134,7 +134,7 @@ public class GridDhtTxPrepareResponse extends GridDistributedTxPrepareResponse {
/**
* @param val {@code True} if this is reply for near node.
*/
- void nearNodeResponse(boolean val) {
+ public void nearNodeResponse(boolean val) {
setFlag(val, NEAR_RES_FLAG_MASK);
}
http://git-wip-us.apache.org/repos/asf/ignite/blob/7cf4b986/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/colocated/GridDhtColocatedLockFuture.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/colocated/GridDhtColocatedLockFuture.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/colocated/GridDhtColocatedLockFuture.java
index 0ce380d..3a84535 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/colocated/GridDhtColocatedLockFuture.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/colocated/GridDhtColocatedLockFuture.java
@@ -50,6 +50,7 @@ import org.apache.ignite.internal.processors.cache.distributed.near.GridNearLock
import org.apache.ignite.internal.processors.cache.distributed.near.GridNearLockRequest;
import org.apache.ignite.internal.processors.cache.distributed.near.GridNearLockResponse;
import org.apache.ignite.internal.processors.cache.distributed.near.GridNearTxLocal;
+import org.apache.ignite.internal.processors.cache.transactions.IgniteInternalTx;
import org.apache.ignite.internal.processors.cache.transactions.IgniteTxEntry;
import org.apache.ignite.internal.processors.cache.transactions.IgniteTxKey;
import org.apache.ignite.internal.processors.cache.transactions.TxDeadlock;
@@ -235,6 +236,11 @@ public final class GridDhtColocatedLockFuture extends GridCompoundIdentityFuture
return false;
}
+ /** {@inheritDoc} */
+ @Override public IgniteInternalTx tx() {
+ return tx;
+ }
+
/**
* @return Future ID.
*/
http://git-wip-us.apache.org/repos/asf/ignite/blob/7cf4b986/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearLockFuture.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearLockFuture.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearLockFuture.java
index ffc84d8..6b07857 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearLockFuture.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearLockFuture.java
@@ -48,6 +48,7 @@ import org.apache.ignite.internal.processors.cache.distributed.GridDistributedCa
import org.apache.ignite.internal.processors.cache.distributed.dht.GridDhtCacheEntry;
import org.apache.ignite.internal.processors.cache.distributed.dht.GridDhtTopologyFuture;
import org.apache.ignite.internal.processors.cache.distributed.dht.GridDhtTransactionalCacheAdapter;
+import org.apache.ignite.internal.processors.cache.transactions.IgniteInternalTx;
import org.apache.ignite.internal.processors.cache.transactions.IgniteTxEntry;
import org.apache.ignite.internal.processors.cache.transactions.IgniteTxKey;
import org.apache.ignite.internal.processors.cache.transactions.TxDeadlock;
@@ -236,10 +237,15 @@ public final class GridNearLockFuture extends GridCompoundIdentityFuture<Boolean
return lockVer;
}
+ /** {@inheritDoc} */
+ @Override public IgniteInternalTx tx() {
+ return tx;
+ }
+
/**
* @return Entries.
*/
- public synchronized List<GridDistributedCacheEntry> entriesCopy() {
+ synchronized List<GridDistributedCacheEntry> entriesCopy() {
return new ArrayList<>(entries);
}
http://git-wip-us.apache.org/repos/asf/ignite/blob/7cf4b986/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearOptimisticSerializableTxPrepareFuture.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearOptimisticSerializableTxPrepareFuture.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearOptimisticSerializableTxPrepareFuture.java
index aef40ce..652eec2 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearOptimisticSerializableTxPrepareFuture.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearOptimisticSerializableTxPrepareFuture.java
@@ -449,6 +449,7 @@ public class GridNearOptimisticSerializableTxPrepareFuture extends GridNearOptim
m.writes(),
m.near(),
txMapping.transactionNodes(),
+ false,
m.last(),
tx.onePhaseCommit(),
tx.needReturnValue() && tx.implicit(),
http://git-wip-us.apache.org/repos/asf/ignite/blob/7cf4b986/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearOptimisticTxPrepareFuture.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearOptimisticTxPrepareFuture.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearOptimisticTxPrepareFuture.java
index 0e840fe..5cfb1a2 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearOptimisticTxPrepareFuture.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearOptimisticTxPrepareFuture.java
@@ -505,6 +505,7 @@ public class GridNearOptimisticTxPrepareFuture extends GridNearOptimisticTxPrepa
m.writes(),
m.near(),
txMapping.transactionNodes(),
+ false,
m.last(),
tx.onePhaseCommit(),
tx.needReturnValue() && tx.implicit(),
http://git-wip-us.apache.org/repos/asf/ignite/blob/7cf4b986/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/local/GridLocalLockFuture.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/local/GridLocalLockFuture.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/local/GridLocalLockFuture.java
index 8e224c8..e954821 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/local/GridLocalLockFuture.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/local/GridLocalLockFuture.java
@@ -35,6 +35,7 @@ import org.apache.ignite.internal.processors.cache.GridCacheEntryRemovedExceptio
import org.apache.ignite.internal.processors.cache.GridCacheMvccCandidate;
import org.apache.ignite.internal.processors.cache.GridCacheMvccFuture;
import org.apache.ignite.internal.processors.cache.KeyCacheObject;
+import org.apache.ignite.internal.processors.cache.transactions.IgniteInternalTx;
import org.apache.ignite.internal.processors.cache.transactions.IgniteTxKey;
import org.apache.ignite.internal.processors.cache.transactions.IgniteTxLocalEx;
import org.apache.ignite.internal.processors.cache.transactions.TxDeadlock;
@@ -378,6 +379,11 @@ public final class GridLocalLockFuture<K, V> extends GridFutureAdapter<Boolean>
}
/** {@inheritDoc} */
+ @Override public IgniteInternalTx tx() {
+ return tx;
+ }
+
+ /** {@inheritDoc} */
@SuppressWarnings({"ThrowableInstanceNeverThrown"})
@Override public boolean cancel() {
if (onCancelled()) {
http://git-wip-us.apache.org/repos/asf/ignite/blob/7cf4b986/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/transactions/IgniteTxHandler.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/transactions/IgniteTxHandler.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/transactions/IgniteTxHandler.java
index 33c8a18..aaba610 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/transactions/IgniteTxHandler.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/transactions/IgniteTxHandler.java
@@ -969,8 +969,10 @@ public class IgniteTxHandler {
req.partition(),
req.nearXidVersion(),
req.nearFutureId(),
- null, //req.nearMiniId(),
+ req.nearMiniId(),
req.deployInfo() != null);
+
+ nearRes.nearNodeResponse(true);
}
else {
res = new GridDhtTxPrepareResponse(
[17/38] ignite git commit: Merge remote-tracking branch
'remotes/origin/ignite-4768' into ignite-4768-1
Posted by sb...@apache.org.
Merge remote-tracking branch 'remotes/origin/ignite-4768' into ignite-4768-1
# Conflicts:
# modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/GridDistributedTxPrepareRequest.java
# modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtTxPrepareFuture.java
# modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtTxPrepareRequest.java
# modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtTxPrepareResponse.java
# modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearPessimisticTxPrepareFuture.java
# modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearTxPrepareRequest.java
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/e1961ff6
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/e1961ff6
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/e1961ff6
Branch: refs/heads/ignite-4768
Commit: e1961ff620d8f73469101da96eccda9ed2eddc99
Parents: 5596e69 eeb10b8
Author: sboikov <sb...@gridgain.com>
Authored: Fri Mar 10 13:09:28 2017 +0300
Committer: sboikov <sb...@gridgain.com>
Committed: Fri Mar 10 13:09:28 2017 +0300
----------------------------------------------------------------------
.../processors/cache/GridCacheMessage.java | 11 +++++++++++
.../processors/cache/KeyCacheObjectImpl.java | 9 +++++++++
.../GridDistributedTxPrepareRequest.java | 16 ++++++++++++++++
.../distributed/dht/GridDhtTxPrepareFuture.java | 20 +++++++++++++-------
.../dht/GridDhtTxPrepareRequest.java | 12 ++++++------
.../dht/GridDhtTxPrepareResponse.java | 16 ++++++++--------
.../distributed/near/GridNearLockFuture.java | 2 ++
...arOptimisticSerializableTxPrepareFuture.java | 8 ++++----
.../near/GridNearOptimisticTxPrepareFuture.java | 1 -
.../near/GridNearTxPrepareRequest.java | 17 ++++++++++++++++-
10 files changed, 85 insertions(+), 27 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ignite/blob/e1961ff6/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/GridDistributedTxPrepareRequest.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ignite/blob/e1961ff6/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 454c8fb,735653d..a787f5f
--- 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
@@@ -1272,13 -1259,9 +1276,13 @@@ public final class GridDhtTxPrepareFutu
if (tx.remainingTime() == -1)
return;
- MiniFuture fut = new MiniFuture(n.id(), ++miniId, dhtMapping, nearMapping);
+ MiniFuture fut = null;
- add(fut); // Append new future.
+ if (!tx.dhtReplyNear()) {
- fut = new MiniFuture(n.id(), dhtMapping, nearMapping);
++ fut = new MiniFuture(n.id(), ++miniId, dhtMapping, nearMapping);
+
+ add(fut); // Append new future.
+ }
assert txNodes != null;
http://git-wip-us.apache.org/repos/asf/ignite/blob/e1961ff6/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtTxPrepareRequest.java
----------------------------------------------------------------------
diff --cc modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtTxPrepareRequest.java
index fe2d293,8898803..85a65a8
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtTxPrepareRequest.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtTxPrepareRequest.java
@@@ -59,14 -59,8 +59,14 @@@ public class GridDhtTxPrepareRequest ex
private IgniteUuid futId;
/** Mini future ID. */
- private IgniteUuid miniId;
+ private int miniId;
+ /** Future ID. */
+ private IgniteUuid nearFutId;
+
+ /** Mini future ID. */
+ private int nearMiniId;
+
/** Topology version. */
private AffinityTopologyVersion topVer;
@@@ -128,9 -120,7 +128,9 @@@
*/
public GridDhtTxPrepareRequest(
IgniteUuid futId,
- IgniteUuid miniId,
+ int miniId,
+ IgniteUuid nearFutId,
+ int nearMiniId,
AffinityTopologyVersion topVer,
GridDhtTxLocalAdapter tx,
long timeout,
@@@ -156,8 -144,8 +156,8 @@@
onePhaseCommit,
addDepInfo);
- assert dhtNearReply || (futId != null && miniId != null);
- assert futId != null;
- assert miniId != 0;
++ assert dhtNearReply || (futId != null && miniId != 0);
+ assert !dhtNearReply || (nearFutId != null && nearMiniId != 0);
this.topVer = topVer;
this.futId = futId;
http://git-wip-us.apache.org/repos/asf/ignite/blob/e1961ff6/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtTxPrepareResponse.java
----------------------------------------------------------------------
diff --cc modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtTxPrepareResponse.java
index c37ac80,416540a..cb10374
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtTxPrepareResponse.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtTxPrepareResponse.java
@@@ -85,16 -81,11 +85,16 @@@ public class GridDhtTxPrepareResponse e
* @param miniId Mini future ID.
* @param addDepInfo Deployment info flag.
*/
- public GridDhtTxPrepareResponse(GridCacheVersion xid, IgniteUuid futId, int miniId, boolean addDepInfo) {
- super(xid, addDepInfo);
+ public GridDhtTxPrepareResponse(
+ int part,
+ GridCacheVersion xid,
+ IgniteUuid futId,
- IgniteUuid miniId,
++ int miniId,
+ boolean addDepInfo) {
+ super(part, xid, addDepInfo);
assert futId != null;
- assert miniId != null;
+ assert miniId != 0;
this.futId = futId;
this.miniId = miniId;
@@@ -108,17 -98,12 +108,17 @@@
* @param err Error.
* @param addDepInfo Deployment enabled.
*/
- public GridDhtTxPrepareResponse(GridCacheVersion xid, IgniteUuid futId, int miniId, Throwable err,
+ public GridDhtTxPrepareResponse(
+ int part,
+ GridCacheVersion xid,
+ IgniteUuid futId,
- IgniteUuid miniId,
++ int miniId,
+ Throwable err,
boolean addDepInfo) {
- super(xid, err, addDepInfo);
+ super(part, xid, err, addDepInfo);
assert futId != null;
- assert miniId != null;
+ assert miniId != 0;
this.futId = futId;
this.miniId = miniId;
http://git-wip-us.apache.org/repos/asf/ignite/blob/e1961ff6/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearOptimisticSerializableTxPrepareFuture.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ignite/blob/e1961ff6/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearOptimisticTxPrepareFuture.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ignite/blob/e1961ff6/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearTxPrepareRequest.java
----------------------------------------------------------------------
[38/38] ignite git commit: Merge remote-tracking branch
'remotes/origin/ignite-2.0' into ignite-4768-1
Posted by sb...@apache.org.
Merge remote-tracking branch 'remotes/origin/ignite-2.0' into ignite-4768-1
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/30611c7b
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/30611c7b
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/30611c7b
Branch: refs/heads/ignite-4768
Commit: 30611c7b77dc457d9c8589af505329f67ac71a56
Parents: 32468ea
Author: sboikov <sb...@gridgain.com>
Authored: Mon Mar 13 19:33:36 2017 +0300
Committer: sboikov <sb...@gridgain.com>
Committed: Mon Mar 13 19:33:36 2017 +0300
----------------------------------------------------------------------
.../GridDistributedTxFinishRequest.java | 47 --------------------
1 file changed, 47 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ignite/blob/30611c7b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/GridDistributedTxFinishRequest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/GridDistributedTxFinishRequest.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/GridDistributedTxFinishRequest.java
index 5dcdbff..fbf333e 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/GridDistributedTxFinishRequest.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/GridDistributedTxFinishRequest.java
@@ -229,53 +229,6 @@ public class GridDistributedTxFinishRequest extends GridDistributedBaseMessage i
return taskNameHash;
}
- /**
- * @return Topology version.
- */
- @Override public final AffinityTopologyVersion topologyVersion() {
- return topVer;
- }
-
- /**
- * @return Transaction write synchronization mode (can be null is message sent from old nodes).
- */
- public final CacheWriteSynchronizationMode syncMode() {
- return syncMode;
- }
-
- /**
- * Sets flag mask.
- *
- * @param flag Set or clear.
- * @param mask Mask.
- */
- protected final void setFlag(boolean flag, int mask) {
- flags = flag ? (byte)(flags | mask) : (byte)(flags & ~mask);
- }
-
- /**
- * Reags flag mask.
- *
- * @param mask Mask to read.
- * @return Flag value.
- */
- protected final boolean isFlag(int mask) {
- return (flags & mask) != 0;
- }
-
- /**
- * @return Subject ID.
- */
- @Nullable public final UUID subjectId() {
- return subjId;
- }
-
- /**
- * @return Task name hash.
- */
- public final int taskNameHash() {
- return taskNameHash;
- }
/**
* @return Topology version.
[27/38] ignite git commit: ignite-4768
Posted by sb...@apache.org.
ignite-4768
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/0246b74e
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/0246b74e
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/0246b74e
Branch: refs/heads/ignite-4768
Commit: 0246b74e22c547769e99aa890448b017205b62e2
Parents: bc5dbb0
Author: sboikov <sb...@gridgain.com>
Authored: Mon Mar 13 11:59:08 2017 +0300
Committer: sboikov <sb...@gridgain.com>
Committed: Mon Mar 13 11:59:08 2017 +0300
----------------------------------------------------------------------
.../GridDistributedTxFinishResponse.java | 75 ++++++++++++++++++--
.../dht/GridDhtTxFinishResponse.java | 60 +++++++---------
.../cache/distributed/dht/GridDhtTxLocal.java | 4 +-
.../near/GridNearTxFinishResponse.java | 5 +-
.../cache/transactions/IgniteTxHandler.java | 17 +++--
5 files changed, 115 insertions(+), 46 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ignite/blob/0246b74e/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/GridDistributedTxFinishResponse.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/GridDistributedTxFinishResponse.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/GridDistributedTxFinishResponse.java
index 109d665..2c446c3 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/GridDistributedTxFinishResponse.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/GridDistributedTxFinishResponse.java
@@ -17,13 +17,14 @@
package org.apache.ignite.internal.processors.cache.distributed;
-import java.io.Externalizable;
import java.nio.ByteBuffer;
import org.apache.ignite.IgniteLogger;
+import org.apache.ignite.internal.managers.communication.GridIoMessageFactory;
import org.apache.ignite.internal.processors.cache.GridCacheMessage;
import org.apache.ignite.internal.processors.cache.GridCacheSharedContext;
import org.apache.ignite.internal.processors.cache.version.GridCacheVersion;
import org.apache.ignite.internal.util.tostring.GridToStringBuilder;
+import org.apache.ignite.internal.util.tostring.GridToStringExclude;
import org.apache.ignite.lang.IgniteUuid;
import org.apache.ignite.plugin.extensions.communication.MessageReader;
import org.apache.ignite.plugin.extensions.communication.MessageWriter;
@@ -41,25 +42,59 @@ public class GridDistributedTxFinishResponse extends GridCacheMessage {
/** Future ID. */
private IgniteUuid futId;
+ /** */
+ @GridToStringExclude
+ private byte flags;
+
+ /** */
+ private int part;
+
/**
- * Empty constructor required by {@link Externalizable}.
+ * Empty constructor required by {@link GridIoMessageFactory}.
*/
public GridDistributedTxFinishResponse() {
/* No-op. */
}
/**
+ * @param part Partition.
* @param txId Transaction id.
* @param futId Future ID.
*/
- public GridDistributedTxFinishResponse(GridCacheVersion txId, IgniteUuid futId) {
+ public GridDistributedTxFinishResponse(int part, GridCacheVersion txId, IgniteUuid futId) {
assert txId != null;
assert futId != null;
+ this.part = part;
this.txId = txId;
this.futId = futId;
}
+ /** {@inheritDoc} */
+ @Override public final int partition() {
+ return part;
+ }
+
+ /**
+ * Sets flag mask.
+ *
+ * @param flag Set or clear.
+ * @param mask Mask.
+ */
+ protected final void setFlag(boolean flag, int mask) {
+ flags = flag ? (byte)(flags | mask) : (byte)(flags & ~mask);
+ }
+
+ /**
+ * Reags flag mask.
+ *
+ * @param mask Mask to read.
+ * @return Flag value.
+ */
+ protected final boolean isFlag(int mask) {
+ return (flags & mask) != 0;
+ }
+
/**
*
* @return Transaction id.
@@ -101,12 +136,24 @@ public class GridDistributedTxFinishResponse extends GridCacheMessage {
switch (writer.state()) {
case 3:
- if (!writer.writeIgniteUuid("futId", futId))
+ if (!writer.writeByte("flags", flags))
return false;
writer.incrementState();
case 4:
+ if (!writer.writeIgniteUuid("futId", futId))
+ return false;
+
+ writer.incrementState();
+
+ case 5:
+ if (!writer.writeInt("part", part))
+ return false;
+
+ writer.incrementState();
+
+ case 6:
if (!writer.writeMessage("txId", txId))
return false;
@@ -129,7 +176,7 @@ public class GridDistributedTxFinishResponse extends GridCacheMessage {
switch (reader.state()) {
case 3:
- futId = reader.readIgniteUuid("futId");
+ flags = reader.readByte("flags");
if (!reader.isLastRead())
return false;
@@ -137,6 +184,22 @@ public class GridDistributedTxFinishResponse extends GridCacheMessage {
reader.incrementState();
case 4:
+ futId = reader.readIgniteUuid("futId");
+
+ if (!reader.isLastRead())
+ return false;
+
+ reader.incrementState();
+
+ case 5:
+ part = reader.readInt("part");
+
+ if (!reader.isLastRead())
+ return false;
+
+ reader.incrementState();
+
+ case 6:
txId = reader.readMessage("txId");
if (!reader.isLastRead())
@@ -156,7 +219,7 @@ public class GridDistributedTxFinishResponse extends GridCacheMessage {
/** {@inheritDoc} */
@Override public byte fieldsCount() {
- return 5;
+ return 7;
}
/** {@inheritDoc} */
http://git-wip-us.apache.org/repos/asf/ignite/blob/0246b74e/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtTxFinishResponse.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtTxFinishResponse.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtTxFinishResponse.java
index 7648178..bc9503f 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtTxFinishResponse.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtTxFinishResponse.java
@@ -39,6 +39,9 @@ public class GridDhtTxFinishResponse extends GridDistributedTxFinishResponse {
/** */
private static final long serialVersionUID = 0L;
+ /** Flag indicating if this is a check-committed response. */
+ private static final int CHECK_COMMITTED_FLAG_MASK = 0x01;
+
/** Mini future ID. */
private int miniId;
@@ -49,9 +52,6 @@ public class GridDhtTxFinishResponse extends GridDistributedTxFinishResponse {
/** Serialized error. */
private byte[] checkCommittedErrBytes;
- /** Flag indicating if this is a check-committed response. */
- private boolean checkCommitted;
-
/** Cache return value. */
private GridCacheReturn retVal;
@@ -63,12 +63,13 @@ public class GridDhtTxFinishResponse extends GridDistributedTxFinishResponse {
}
/**
+ * @param part Partition.
* @param xid Xid version.
* @param futId Future ID.
* @param miniId Mini future ID.
*/
- public GridDhtTxFinishResponse(GridCacheVersion xid, IgniteUuid futId, int miniId) {
- super(xid, futId);
+ public GridDhtTxFinishResponse(int part, GridCacheVersion xid, IgniteUuid futId, int miniId) {
+ super(part, xid, futId);
assert miniId != 0;
@@ -100,14 +101,14 @@ public class GridDhtTxFinishResponse extends GridDistributedTxFinishResponse {
* @return Check committed flag.
*/
public boolean checkCommitted() {
- return checkCommitted;
+ return isFlag(CHECK_COMMITTED_FLAG_MASK);
}
/**
* @param checkCommitted Check committed flag.
*/
public void checkCommitted(boolean checkCommitted) {
- this.checkCommitted = checkCommitted;
+ setFlag(checkCommitted, CHECK_COMMITTED_FLAG_MASK);
}
/** {@inheritDoc} */
@@ -158,11 +159,6 @@ public class GridDhtTxFinishResponse extends GridDistributedTxFinishResponse {
}
/** {@inheritDoc} */
- @Override public String toString() {
- return S.toString(GridDhtTxFinishResponse.class, this, super.toString());
- }
-
- /** {@inheritDoc} */
@Override public boolean writeTo(ByteBuffer buf, MessageWriter writer) {
writer.setBuffer(buf);
@@ -177,25 +173,19 @@ public class GridDhtTxFinishResponse extends GridDistributedTxFinishResponse {
}
switch (writer.state()) {
- case 5:
- if (!writer.writeBoolean("checkCommitted", checkCommitted))
- return false;
-
- writer.incrementState();
-
- case 6:
+ case 7:
if (!writer.writeByteArray("checkCommittedErrBytes", checkCommittedErrBytes))
return false;
writer.incrementState();
- case 7:
+ case 8:
if (!writer.writeInt("miniId", miniId))
return false;
writer.incrementState();
- case 8:
+ case 9:
if (!writer.writeMessage("retVal", retVal))
return false;
@@ -217,15 +207,7 @@ public class GridDhtTxFinishResponse extends GridDistributedTxFinishResponse {
return false;
switch (reader.state()) {
- case 5:
- checkCommitted = reader.readBoolean("checkCommitted");
-
- if (!reader.isLastRead())
- return false;
-
- reader.incrementState();
-
- case 6:
+ case 7:
checkCommittedErrBytes = reader.readByteArray("checkCommittedErrBytes");
if (!reader.isLastRead())
@@ -233,7 +215,7 @@ public class GridDhtTxFinishResponse extends GridDistributedTxFinishResponse {
reader.incrementState();
- case 7:
+ case 8:
miniId = reader.readInt("miniId");
if (!reader.isLastRead())
@@ -241,7 +223,7 @@ public class GridDhtTxFinishResponse extends GridDistributedTxFinishResponse {
reader.incrementState();
- case 8:
+ case 9:
retVal = reader.readMessage("retVal");
if (!reader.isLastRead())
@@ -261,6 +243,18 @@ public class GridDhtTxFinishResponse extends GridDistributedTxFinishResponse {
/** {@inheritDoc} */
@Override public byte fieldsCount() {
- return 9;
+ return 10;
+ }
+
+ /** {@inheritDoc} */
+ @Override public String toString() {
+ StringBuilder flags = new StringBuilder();
+
+ if (checkCommitted())
+ appendFlag(flags, "checkComm");
+
+ return S.toString(GridDhtTxFinishResponse.class, this,
+ "flags", flags.toString(),
+ "super", super.toString());
}
}
http://git-wip-us.apache.org/repos/asf/ignite/blob/0246b74e/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtTxLocal.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtTxLocal.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtTxLocal.java
index 1b543bf..bff69bc 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtTxLocal.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtTxLocal.java
@@ -634,7 +634,9 @@ public class GridDhtTxLocal extends GridDhtTxLocalAdapter implements GridCacheMa
return;
}
- GridNearTxFinishResponse res = new GridNearTxFinishResponse(nearXidVer,
+ GridNearTxFinishResponse res = new GridNearTxFinishResponse(
+ -1,
+ nearXidVer,
threadId,
nearFinFutId,
nearFinMiniId,
http://git-wip-us.apache.org/repos/asf/ignite/blob/0246b74e/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearTxFinishResponse.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearTxFinishResponse.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearTxFinishResponse.java
index e9043ed..efe96b8 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearTxFinishResponse.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearTxFinishResponse.java
@@ -59,15 +59,16 @@ public class GridNearTxFinishResponse extends GridDistributedTxFinishResponse {
}
/**
+ * @param part Partition.
* @param xid Xid version.
* @param nearThreadId Near tx thread ID.
* @param futId Future ID.
* @param miniId Mini future Id.
* @param err Error.
*/
- public GridNearTxFinishResponse(GridCacheVersion xid, long nearThreadId, IgniteUuid futId, int miniId,
+ public GridNearTxFinishResponse(int part, GridCacheVersion xid, long nearThreadId, IgniteUuid futId, int miniId,
@Nullable Throwable err) {
- super(xid, futId);
+ super(part, xid, futId);
assert miniId != 0;
http://git-wip-us.apache.org/repos/asf/ignite/blob/0246b74e/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/transactions/IgniteTxHandler.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/transactions/IgniteTxHandler.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/transactions/IgniteTxHandler.java
index 6daec14..56a7fa2 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/transactions/IgniteTxHandler.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/transactions/IgniteTxHandler.java
@@ -796,8 +796,13 @@ public class IgniteTxHandler {
", commit=" + req.commit() + ']');
// Always send finish response.
- GridCacheMessage res = new GridNearTxFinishResponse(req.version(), req.threadId(), req.futureId(),
- req.miniId(), new IgniteCheckedException("Transaction has been already completed."));
+ GridCacheMessage res = new GridNearTxFinishResponse(
+ req.partition(),
+ req.version(),
+ req.threadId(),
+ req.futureId(),
+ req.miniId(),
+ new IgniteCheckedException("Transaction has been already completed."));
try {
ctx.io().send(nodeId, res, req.policy());
@@ -1324,9 +1329,13 @@ public class IgniteTxHandler {
* @param committed {@code True} if transaction committed on this node.
* @param nearTxId Near tx version.
*/
- protected void sendReply(UUID nodeId, GridDhtTxFinishRequest req, boolean committed, GridCacheVersion nearTxId) {
+ protected final void sendReply(UUID nodeId, GridDhtTxFinishRequest req, boolean committed, GridCacheVersion nearTxId) {
if (req.replyRequired() || req.checkCommitted()) {
- GridDhtTxFinishResponse res = new GridDhtTxFinishResponse(req.version(), req.futureId(), req.miniId());
+ GridDhtTxFinishResponse res = new GridDhtTxFinishResponse(
+ req.partition(),
+ req.version(),
+ req.futureId(),
+ req.miniId());
if (req.checkCommitted()) {
res.checkCommitted(true);
[06/38] ignite git commit: ignite-4768
Posted by sb...@apache.org.
ignite-4768
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/0f069f8d
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/0f069f8d
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/0f069f8d
Branch: refs/heads/ignite-4768
Commit: 0f069f8d6d24b0bea4197f3249f42c1ded8d1923
Parents: ca67537
Author: sboikov <sb...@gridgain.com>
Authored: Tue Mar 7 15:36:45 2017 +0300
Committer: sboikov <sb...@gridgain.com>
Committed: Tue Mar 7 15:36:45 2017 +0300
----------------------------------------------------------------------
.../near/GridNearTxPrepareRequest.java | 33 +++++---------------
1 file changed, 7 insertions(+), 26 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ignite/blob/0f069f8d/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearTxPrepareRequest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearTxPrepareRequest.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearTxPrepareRequest.java
index c9ab48f..86f7060 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearTxPrepareRequest.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearTxPrepareRequest.java
@@ -66,11 +66,6 @@ public class GridNearTxPrepareRequest extends GridDistributedTxPrepareRequest {
/** Topology version. */
private AffinityTopologyVersion topVer;
- /** IDs of backup nodes receiving last prepare request during this prepare. */
- @GridDirectCollection(UUID.class)
- @GridToStringInclude
- private Collection<UUID> lastBackups;
-
/** Subject ID. */
private UUID subjId;
@@ -306,30 +301,24 @@ public class GridNearTxPrepareRequest extends GridDistributedTxPrepareRequest {
writer.incrementState();
case 22:
- if (!writer.writeCollection("lastBackups", lastBackups, MessageCollectionItemType.UUID))
- return false;
-
- writer.incrementState();
-
- case 23:
if (!writer.writeIgniteUuid("miniId", miniId))
return false;
writer.incrementState();
- case 24:
+ case 23:
if (!writer.writeUuid("subjId", subjId))
return false;
writer.incrementState();
- case 25:
+ case 24:
if (!writer.writeInt("taskNameHash", taskNameHash))
return false;
writer.incrementState();
- case 26:
+ case 25:
if (!writer.writeMessage("topVer", topVer))
return false;
@@ -368,14 +357,6 @@ public class GridNearTxPrepareRequest extends GridDistributedTxPrepareRequest {
reader.incrementState();
case 22:
- lastBackups = reader.readCollection("lastBackups", MessageCollectionItemType.UUID);
-
- if (!reader.isLastRead())
- return false;
-
- reader.incrementState();
-
- case 23:
miniId = reader.readIgniteUuid("miniId");
if (!reader.isLastRead())
@@ -383,7 +364,7 @@ public class GridNearTxPrepareRequest extends GridDistributedTxPrepareRequest {
reader.incrementState();
- case 24:
+ case 23:
subjId = reader.readUuid("subjId");
if (!reader.isLastRead())
@@ -391,7 +372,7 @@ public class GridNearTxPrepareRequest extends GridDistributedTxPrepareRequest {
reader.incrementState();
- case 25:
+ case 24:
taskNameHash = reader.readInt("taskNameHash");
if (!reader.isLastRead())
@@ -399,7 +380,7 @@ public class GridNearTxPrepareRequest extends GridDistributedTxPrepareRequest {
reader.incrementState();
- case 26:
+ case 25:
topVer = reader.readMessage("topVer");
if (!reader.isLastRead())
@@ -419,7 +400,7 @@ public class GridNearTxPrepareRequest extends GridDistributedTxPrepareRequest {
/** {@inheritDoc} */
@Override public byte fieldsCount() {
- return 27;
+ return 26;
}
/** {@inheritDoc} */
[33/38] ignite git commit: ignite-4768
Posted by sb...@apache.org.
ignite-4768
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/8d10806f
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/8d10806f
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/8d10806f
Branch: refs/heads/ignite-4768
Commit: 8d10806f40c24cd77ba72430811ff1464be7a01e
Parents: de2697d
Author: sboikov <sb...@gridgain.com>
Authored: Mon Mar 13 14:50:23 2017 +0300
Committer: sboikov <sb...@gridgain.com>
Committed: Mon Mar 13 14:50:23 2017 +0300
----------------------------------------------------------------------
.../ignite/codegen/MessageCodeGenerator.java | 3 +-
.../processors/cache/GridCacheIoManager.java | 4 +-
.../GridDistributedTxFinishRequest.java | 13 ++
.../distributed/dht/GridDhtTxFinishFuture.java | 83 +++++----
.../distributed/dht/GridDhtTxFinishRequest.java | 4 +
.../distributed/dht/GridDhtTxPrepareFuture.java | 14 +-
.../dht/GridDhtTxPrepareRequest.java | 59 +------
.../near/GridNearTxFinishFuture.java | 12 +-
.../near/GridNearTxFinishRequest.java | 2 +
.../cache/transactions/IgniteTxHandler.java | 174 +++++++++++--------
10 files changed, 193 insertions(+), 175 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ignite/blob/8d10806f/modules/codegen/src/main/java/org/apache/ignite/codegen/MessageCodeGenerator.java
----------------------------------------------------------------------
diff --git a/modules/codegen/src/main/java/org/apache/ignite/codegen/MessageCodeGenerator.java b/modules/codegen/src/main/java/org/apache/ignite/codegen/MessageCodeGenerator.java
index 5a26187..85e2cbe 100644
--- a/modules/codegen/src/main/java/org/apache/ignite/codegen/MessageCodeGenerator.java
+++ b/modules/codegen/src/main/java/org/apache/ignite/codegen/MessageCodeGenerator.java
@@ -44,6 +44,7 @@ import org.apache.ignite.internal.GridDirectCollection;
import org.apache.ignite.internal.GridDirectMap;
import org.apache.ignite.internal.GridDirectTransient;
import org.apache.ignite.internal.IgniteCodeGeneratingFail;
+import org.apache.ignite.internal.processors.cache.distributed.dht.GridDhtTxPrepareRequest;
import org.apache.ignite.internal.util.typedef.internal.SB;
import org.apache.ignite.internal.util.typedef.internal.U;
import org.apache.ignite.lang.IgniteUuid;
@@ -170,7 +171,7 @@ public class MessageCodeGenerator {
// gen.generateAndWrite(GridNearAtomicUpdateRequest.class);
-// gen.generateAndWrite(GridMessageCollection.class);
+ gen.generateAndWrite(GridDhtTxPrepareRequest.class);
// gen.generateAndWrite(DataStreamerEntry.class);
// gen.generateAndWrite(GridDistributedLockRequest.class);
http://git-wip-us.apache.org/repos/asf/ignite/blob/8d10806f/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheIoManager.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheIoManager.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheIoManager.java
index 71f4e1c..e91bc9a 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheIoManager.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheIoManager.java
@@ -367,8 +367,8 @@ public class GridCacheIoManager extends GridCacheSharedManagerAdapter {
unmarshall(nodeId, cacheMsg);
-// if (!cacheMsg.partitionExchangeMessage())
-// log.info("Message [from=" + nodeId + ", msg=" + cacheMsg + ']');
+ if (!cacheMsg.partitionExchangeMessage())
+ log.info("Message [from=" + nodeId + ", msg=" + cacheMsg + ']');
if (cacheMsg.classError() != null)
processFailedMessage(nodeId, cacheMsg, c);
http://git-wip-us.apache.org/repos/asf/ignite/blob/8d10806f/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/GridDistributedTxFinishRequest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/GridDistributedTxFinishRequest.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/GridDistributedTxFinishRequest.java
index ab9f0ff..c794f96 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/GridDistributedTxFinishRequest.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/GridDistributedTxFinishRequest.java
@@ -63,6 +63,9 @@ public class GridDistributedTxFinishRequest extends GridDistributedBaseMessage i
/** */
protected static final int STORE_ENABLED_FLAG_MASK = 0x20;
+ /** */
+ private static final int DHT_REPLY_NEAR_FLAG_MASK = 0x40;
+
/** Topology version. */
private AffinityTopologyVersion topVer;
@@ -138,6 +141,7 @@ public class GridDistributedTxFinishRequest extends GridDistributedBaseMessage i
@NotNull AffinityTopologyVersion topVer,
@Nullable GridCacheVersion commitVer,
long threadId,
+ boolean dhtReplyNear,
boolean commit,
boolean invalidate,
boolean sys,
@@ -171,6 +175,15 @@ public class GridDistributedTxFinishRequest extends GridDistributedBaseMessage i
this.txSize = txSize;
completedVersions(committedVers, rolledbackVers);
+
+ setFlag(dhtReplyNear, DHT_REPLY_NEAR_FLAG_MASK);
+ }
+
+ /**
+ * @return {@code True} if transaction works in mode when DHT nodes reply directly to near node.
+ */
+ public final boolean dhtReplyNear() {
+ return isFlag(DHT_REPLY_NEAR_FLAG_MASK);
}
/**
http://git-wip-us.apache.org/repos/asf/ignite/blob/8d10806f/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtTxFinishFuture.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtTxFinishFuture.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtTxFinishFuture.java
index 17e9047..72a9b73 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtTxFinishFuture.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtTxFinishFuture.java
@@ -236,7 +236,7 @@ public final class GridDhtTxFinishFuture<K, V> extends GridCompoundIdentityFutur
if (finishErr == null)
finishErr = this.tx.commitError();
- if (this.tx.syncMode() != PRIMARY_SYNC)
+ if (this.tx.syncMode() != PRIMARY_SYNC && !this.tx.dhtReplyNear())
this.tx.sendFinishReply(finishErr);
// Don't forget to clean up.
@@ -322,7 +322,8 @@ public final class GridDhtTxFinishFuture<K, V> extends GridCompoundIdentityFutur
tx.commitVersion(),
tx.threadId(),
tx.isolation(),
- false,
+ /*dhtReplyNear*/false, // TODO IGNITE-4768.
+ /*commit*/false,
tx.isInvalidate(),
tx.system(),
tx.ioPolicy(),
@@ -387,6 +388,8 @@ public final class GridDhtTxFinishFuture<K, V> extends GridCompoundIdentityFutur
boolean sync = tx.syncMode() == FULL_SYNC;
+ boolean dhtReplyNear = tx.dhtReplyNear() && tx.syncMode() == FULL_SYNC;
+
if (tx.explicitLock())
sync = true;
@@ -406,9 +409,13 @@ public final class GridDhtTxFinishFuture<K, V> extends GridCompoundIdentityFutur
// Nothing to send.
continue;
- MiniFuture fut = new MiniFuture(++miniId, dhtMapping, nearMapping);
+ MiniFuture fut = null;
- add(fut); // Append new future.
+ if (!dhtReplyNear) {
+ fut = new MiniFuture(++miniId, dhtMapping, nearMapping);
+
+ add(fut); // Append new future.
+ }
Collection<Long> updCntrs = new ArrayList<>(dhtMapping.entries().size());
@@ -417,13 +424,14 @@ public final class GridDhtTxFinishFuture<K, V> extends GridCompoundIdentityFutur
GridDhtTxFinishRequest req = new GridDhtTxFinishRequest(
tx.nearNodeId(),
- futId,
- fut.futureId(),
+ dhtReplyNear ? tx.nearFutureId() : futId,
+ dhtReplyNear ? 0 : fut.futureId(),
tx.topologyVersion(),
tx.xidVersion(),
tx.commitVersion(),
tx.threadId(),
tx.isolation(),
+ dhtReplyNear,
commit,
tx.isInvalidate(),
tx.system(),
@@ -455,22 +463,24 @@ public final class GridDhtTxFinishFuture<K, V> extends GridCompoundIdentityFutur
if (sync)
res = true;
- else
+ else if (fut != null)
fut.onDone();
}
catch (IgniteCheckedException e) {
- // Fail the whole thing.
- if (e instanceof ClusterTopologyCheckedException)
- fut.onNodeLeft((ClusterTopologyCheckedException)e);
- else {
- if (msgLog.isDebugEnabled()) {
- msgLog.debug("DHT finish fut, failed to send request dht [txId=" + tx.nearXidVersion() +
- ", dhtTxId=" + tx.xidVersion() +
- ", node=" + n.id() +
- ", err=" + e + ']');
- }
+ if (fut != null) {
+ if (e instanceof ClusterTopologyCheckedException)
+ fut.onNodeLeft((ClusterTopologyCheckedException)e);
+ else {
+ if (msgLog.isDebugEnabled()) {
+ msgLog.debug("DHT finish fut, failed to send request dht [txId=" + tx.nearXidVersion() +
+ ", dhtTxId=" + tx.xidVersion() +
+ ", node=" + n.id() +
+ ", err=" + e + ']');
+ }
- fut.onResult(e);
+ // TODO IGNITE-4768: reply on near with error?
+ fut.onResult(e);
+ }
}
}
}
@@ -481,19 +491,24 @@ public final class GridDhtTxFinishFuture<K, V> extends GridCompoundIdentityFutur
// Nothing to send.
continue;
- MiniFuture fut = new MiniFuture(++miniId, null, nearMapping);
+ MiniFuture fut = null;
- add(fut); // Append new future.
+ if (!dhtReplyNear) {
+ fut = new MiniFuture(++miniId, null, nearMapping);
+
+ add(fut); // Append new future.
+ }
GridDhtTxFinishRequest req = new GridDhtTxFinishRequest(
tx.nearNodeId(),
futId,
- fut.futureId(),
+ fut != null ? fut.futureId() : -1,
tx.topologyVersion(),
tx.xidVersion(),
tx.commitVersion(),
tx.threadId(),
tx.isolation(),
+ dhtReplyNear,
commit,
tx.isInvalidate(),
tx.system(),
@@ -524,22 +539,24 @@ public final class GridDhtTxFinishFuture<K, V> extends GridCompoundIdentityFutur
if (sync)
res = true;
- else
+ else if (fut != null)
fut.onDone();
}
catch (IgniteCheckedException e) {
- // Fail the whole thing.
- if (e instanceof ClusterTopologyCheckedException)
- fut.onNodeLeft((ClusterTopologyCheckedException)e);
- else {
- if (msgLog.isDebugEnabled()) {
- msgLog.debug("DHT finish fut, failed to send request near [txId=" + tx.nearXidVersion() +
- ", dhtTxId=" + tx.xidVersion() +
- ", node=" + nearMapping.primary().id() +
- ", err=" + e + ']');
+ if (fut != null) {
+ if (e instanceof ClusterTopologyCheckedException)
+ fut.onNodeLeft((ClusterTopologyCheckedException)e);
+ else {
+ if (msgLog.isDebugEnabled()) {
+ msgLog.debug("DHT finish fut, failed to send request near [txId=" + tx.nearXidVersion() +
+ ", dhtTxId=" + tx.xidVersion() +
+ ", node=" + nearMapping.primary().id() +
+ ", err=" + e + ']');
+ }
+
+ // TODO IGNITE-4768: reply on near with error?
+ fut.onResult(e);
}
-
- fut.onResult(e);
}
}
}
http://git-wip-us.apache.org/repos/asf/ignite/blob/8d10806f/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtTxFinishRequest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtTxFinishRequest.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtTxFinishRequest.java
index d9b3ae7..40f96c6 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtTxFinishRequest.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtTxFinishRequest.java
@@ -106,6 +106,7 @@ public class GridDhtTxFinishRequest extends GridDistributedTxFinishRequest {
GridCacheVersion commitVer,
long threadId,
TransactionIsolation isolation,
+ boolean dhtReplyNear,
boolean commit,
boolean invalidate,
boolean sys,
@@ -129,6 +130,7 @@ public class GridDhtTxFinishRequest extends GridDistributedTxFinishRequest {
topVer,
commitVer,
threadId,
+ dhtReplyNear,
commit,
invalidate,
sys,
@@ -190,6 +192,7 @@ public class GridDhtTxFinishRequest extends GridDistributedTxFinishRequest {
GridCacheVersion commitVer,
long threadId,
TransactionIsolation isolation,
+ boolean dhtReplyNear,
boolean commit,
boolean invalidate,
boolean sys,
@@ -216,6 +219,7 @@ public class GridDhtTxFinishRequest extends GridDistributedTxFinishRequest {
commitVer,
threadId,
isolation,
+ dhtReplyNear,
commit,
invalidate,
sys,
http://git-wip-us.apache.org/repos/asf/ignite/blob/8d10806f/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtTxPrepareFuture.java
----------------------------------------------------------------------
diff --git 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
index ca028f8..c8e06af 100644
--- 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
@@ -1276,7 +1276,7 @@ public final class GridDhtTxPrepareFuture extends GridCompoundFuture<IgniteInter
MiniFuture fut = null;
- if (!tx.dhtReplyNear()) {
+ if (!dhtReplyNear) {
fut = new MiniFuture(n.id(), ++miniId, dhtMapping, nearMapping);
add(fut); // Append new future.
@@ -1285,10 +1285,8 @@ public final class GridDhtTxPrepareFuture extends GridCompoundFuture<IgniteInter
assert txNodes != null;
GridDhtTxPrepareRequest req = new GridDhtTxPrepareRequest(
- futId,
- fut != null ? fut.futureId() : 0,
- nearFutId,
- nearMiniId,
+ dhtReplyNear ? nearFutId : futId,
+ dhtReplyNear ? nearMiniId : fut.futureId(),
tx.topologyVersion(),
tx,
timeout,
@@ -1405,10 +1403,8 @@ public final class GridDhtTxPrepareFuture extends GridCompoundFuture<IgniteInter
add(fut); // Append new future.
GridDhtTxPrepareRequest req = new GridDhtTxPrepareRequest(
- futId,
- fut.futureId(),
- nearFutId,
- nearMiniId,
+ dhtReplyNear ? nearFutId : futId,
+ dhtReplyNear ? nearMiniId : fut.futureId(),
tx.topologyVersion(),
tx,
timeout,
http://git-wip-us.apache.org/repos/asf/ignite/blob/8d10806f/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtTxPrepareRequest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtTxPrepareRequest.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtTxPrepareRequest.java
index 85a65a8..04a296d 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtTxPrepareRequest.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtTxPrepareRequest.java
@@ -61,12 +61,6 @@ public class GridDhtTxPrepareRequest extends GridDistributedTxPrepareRequest {
/** Mini future ID. */
private int miniId;
- /** Future ID. */
- private IgniteUuid nearFutId;
-
- /** Mini future ID. */
- private int nearMiniId;
-
/** Topology version. */
private AffinityTopologyVersion topVer;
@@ -113,8 +107,6 @@ public class GridDhtTxPrepareRequest extends GridDistributedTxPrepareRequest {
/**
* @param futId Future ID.
* @param miniId Mini future ID.
- * @param nearFutId Near node future ID.
- * @param nearMiniId Near node mini future ID.
* @param topVer Topology version.
* @param tx Transaction.
* @param timeout Transaction timeout.
@@ -129,8 +121,6 @@ public class GridDhtTxPrepareRequest extends GridDistributedTxPrepareRequest {
public GridDhtTxPrepareRequest(
IgniteUuid futId,
int miniId,
- IgniteUuid nearFutId,
- int nearMiniId,
AffinityTopologyVersion topVer,
GridDhtTxLocalAdapter tx,
long timeout,
@@ -156,8 +146,8 @@ public class GridDhtTxPrepareRequest extends GridDistributedTxPrepareRequest {
onePhaseCommit,
addDepInfo);
- assert dhtNearReply || (futId != null && miniId != 0);
- assert !dhtNearReply || (nearFutId != null && nearMiniId != 0);
+ assert futId != null;
+ assert miniId != 0;
this.topVer = topVer;
this.futId = futId;
@@ -166,8 +156,6 @@ public class GridDhtTxPrepareRequest extends GridDistributedTxPrepareRequest {
this.nearXidVer = nearXidVer;
this.subjId = subjId;
this.taskNameHash = taskNameHash;
- this.nearFutId = nearFutId;
- this.nearMiniId = nearMiniId;
needReturnValue(retVal);
@@ -264,21 +252,6 @@ public class GridDhtTxPrepareRequest extends GridDistributedTxPrepareRequest {
}
/**
- * @return Near future ID.
- */
- public IgniteUuid nearFutureId() {
- return nearFutId;
- }
-
- /**
- * @return Near mini future ID.
- */
- public int nearMiniId() {
- return nearMiniId;
- }
-
-
- /**
* @return Topology version.
*/
@Override public AffinityTopologyVersion topologyVersion() {
@@ -395,18 +368,6 @@ public class GridDhtTxPrepareRequest extends GridDistributedTxPrepareRequest {
writer.incrementState();
- case 23:
- if (!writer.writeIgniteUuid("nearFutId", nearFutId))
- return false;
-
- writer.incrementState();
-
- case 24:
- if (!writer.writeInt("nearMiniId", nearMiniId))
- return false;
-
- writer.incrementState();
-
case 25:
if (!writer.writeUuid("nearNodeId", nearNodeId))
return false;
@@ -501,22 +462,6 @@ public class GridDhtTxPrepareRequest extends GridDistributedTxPrepareRequest {
reader.incrementState();
- case 23:
- nearFutId = reader.readIgniteUuid("nearFutId");
-
- if (!reader.isLastRead())
- return false;
-
- reader.incrementState();
-
- case 24:
- nearMiniId = reader.readInt("nearMiniId");
-
- if (!reader.isLastRead())
- return false;
-
- reader.incrementState();
-
case 25:
nearNodeId = reader.readUuid("nearNodeId");
http://git-wip-us.apache.org/repos/asf/ignite/blob/8d10806f/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearTxFinishFuture.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearTxFinishFuture.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearTxFinishFuture.java
index c55d515..44455ca 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearTxFinishFuture.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearTxFinishFuture.java
@@ -716,10 +716,13 @@ public final class GridNearTxFinishFuture<K, V> extends GridCompoundIdentityFutu
// Version to be added in completed versions on primary node.
GridCacheVersion completedVer = !commit && tx.timeout() > 0 ? tx.xidVersion() : null;
+ boolean dhtReplyNear = tx.dhtReplyNear() && syncMode == FULL_SYNC;
+
GridNearTxFinishRequest req = new GridNearTxFinishRequest(
futId,
tx.xidVersion(),
tx.threadId(),
+ dhtReplyNear,
commit,
tx.isInvalidate(),
tx.system(),
@@ -737,8 +740,6 @@ public final class GridNearTxFinishFuture<K, V> extends GridCompoundIdentityFutu
tx.activeCachesDeploymentEnabled()
);
- boolean dhtReplyNear = tx.dhtReplyNear() && syncMode == FULL_SYNC;
-
// If this is the primary node for the keys.
if (n.isLocal()) {
req.miniId(miniId);
@@ -855,11 +856,12 @@ public final class GridNearTxFinishFuture<K, V> extends GridCompoundIdentityFutu
tx.commitVersion(),
tx.threadId(),
tx.isolation(),
- true,
- false,
+ /*dhtReplyNear*/false,
+ /*commit*/true,
+ /*invalidate*/false,
tx.system(),
tx.ioPolicy(),
- false,
+ /*sysInvalidate*/false,
tx.syncMode(),
null,
null,
http://git-wip-us.apache.org/repos/asf/ignite/blob/8d10806f/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearTxFinishRequest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearTxFinishRequest.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearTxFinishRequest.java
index 05c1f3e..58e75f2 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearTxFinishRequest.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearTxFinishRequest.java
@@ -73,6 +73,7 @@ public class GridNearTxFinishRequest extends GridDistributedTxFinishRequest {
IgniteUuid futId,
GridCacheVersion xidVer,
long threadId,
+ boolean dhtReplyNear,
boolean commit,
boolean invalidate,
boolean sys,
@@ -94,6 +95,7 @@ public class GridNearTxFinishRequest extends GridDistributedTxFinishRequest {
topVer,
null,
threadId,
+ dhtReplyNear,
commit,
invalidate,
sys,
http://git-wip-us.apache.org/repos/asf/ignite/blob/8d10806f/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/transactions/IgniteTxHandler.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/transactions/IgniteTxHandler.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/transactions/IgniteTxHandler.java
index 754979c..71b847a 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/transactions/IgniteTxHandler.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/transactions/IgniteTxHandler.java
@@ -39,6 +39,8 @@ import org.apache.ignite.internal.processors.cache.KeyCacheObject;
import org.apache.ignite.internal.processors.cache.distributed.GridCacheTxRecoveryFuture;
import org.apache.ignite.internal.processors.cache.distributed.GridCacheTxRecoveryRequest;
import org.apache.ignite.internal.processors.cache.distributed.GridCacheTxRecoveryResponse;
+import org.apache.ignite.internal.processors.cache.distributed.GridDistributedTxFinishRequest;
+import org.apache.ignite.internal.processors.cache.distributed.GridDistributedTxFinishResponse;
import org.apache.ignite.internal.processors.cache.distributed.GridDistributedTxRemoteAdapter;
import org.apache.ignite.internal.processors.cache.distributed.dht.GridDhtInvalidPartitionException;
import org.apache.ignite.internal.processors.cache.distributed.dht.GridDhtPartitionTopology;
@@ -967,8 +969,8 @@ public class IgniteTxHandler {
nearRes = new GridDhtTxPrepareResponse(
req.partition(),
req.nearXidVersion(),
- req.nearFutureId(),
- req.nearMiniId(),
+ req.futureId(),
+ req.miniId(),
req.deployInfo() != null);
nearRes.nearNodeResponse(true);
@@ -1036,6 +1038,7 @@ public class IgniteTxHandler {
if (nearTx != null)
nearTx.rollback();
+ // TODO IGNITE-4768.
res = new GridDhtTxPrepareResponse(
req.partition(),
req.version(),
@@ -1116,19 +1119,19 @@ public class IgniteTxHandler {
@SuppressWarnings({"unchecked"})
private void processDhtTxFinishRequest(final UUID nodeId, final GridDhtTxFinishRequest req) {
assert nodeId != null;
- assert req != null;
+ assert req.nearNodeId() != null : req;
if (req.checkCommitted()) {
boolean committed = req.waitRemoteTransactions() || !ctx.tm().addRolledbackTx(null, req.version());
if (!committed || req.syncMode() != FULL_SYNC)
- sendReply(nodeId, req, committed, null);
+ sendCheckCommittedReply(nodeId, req, committed);
else {
IgniteInternalFuture<?> fut = ctx.tm().remoteTxFinishFuture(req.version());
fut.listen(new CI1<IgniteInternalFuture<?>>() {
@Override public void apply(IgniteInternalFuture<?> fut) {
- sendReply(nodeId, req, true, null);
+ sendCheckCommittedReply(nodeId, req, true);
}
});
}
@@ -1181,16 +1184,16 @@ public class IgniteTxHandler {
if (completeFut != null) {
completeFut.listen(new CI1<IgniteInternalFuture<IgniteInternalTx>>() {
- @Override public void apply(IgniteInternalFuture<IgniteInternalTx> igniteTxIgniteFuture) {
- sendReply(nodeId, req, true, nearTxId);
+ @Override public void apply(IgniteInternalFuture<IgniteInternalTx> fut) {
+ sendFinishReply(nodeId, req, nearTxId);
}
});
}
else
- sendReply(nodeId, req, true, nearTxId);
+ sendFinishReply(nodeId, req, nearTxId);
}
else
- sendReply(nodeId, req, true, null);
+ sendFinishReply(nodeId, req, null);
assert req.txState() != null || (ctx.tm().tx(req.version()) == null && ctx.tm().nearTx(req.version()) == null) : req;
}
@@ -1350,81 +1353,75 @@ public class IgniteTxHandler {
}
/**
- * Sends tx finish response to remote node, if response is requested.
- *
* @param nodeId Node id that originated finish request.
* @param req Request.
* @param committed {@code True} if transaction committed on this node.
- * @param nearTxId Near tx version.
*/
- private void sendReply(UUID nodeId, GridDhtTxFinishRequest req, boolean committed, GridCacheVersion nearTxId) {
- if (req.replyRequired() || req.checkCommitted()) {
- GridDhtTxFinishResponse res = new GridDhtTxFinishResponse(
- req.partition(),
- req.version(),
- req.futureId(),
- req.miniId());
+ private void sendCheckCommittedReply(UUID nodeId, GridDhtTxFinishRequest req, boolean committed) {
+ assert req.checkCommitted() : req;
- if (req.checkCommitted()) {
- res.checkCommitted(true);
-
- if (committed) {
- if (req.needReturnValue()) {
- try {
- GridCacheReturnCompletableWrapper wrapper = ctx.tm().getCommittedTxReturn(req.version());
-
- if (wrapper != null)
- res.returnValue(wrapper.fut().get());
- else
- assert !ctx.discovery().alive(nodeId) : nodeId;
- }
- catch (IgniteCheckedException ignored) {
- if (txFinishMsgLog.isDebugEnabled()) {
- txFinishMsgLog.debug("Failed to gain entry processor return value. [txId=" + nearTxId +
- ", dhtTxId=" + req.version() +
- ", node=" + nodeId + ']');
- }
- }
- }
- }
- else {
- ClusterTopologyCheckedException cause =
- new ClusterTopologyCheckedException("Primary node left grid.");
+ GridDhtTxFinishResponse res = new GridDhtTxFinishResponse(
+ req.partition(),
+ req.version(),
+ req.futureId(),
+ req.miniId());
- res.checkCommittedError(new IgniteTxRollbackCheckedException("Failed to commit transaction " +
- "(transaction has been rolled back on backup node): " + req.version(), cause));
- }
- }
+ res.checkCommitted(true);
- try {
- ctx.io().send(nodeId, res, req.policy());
+ if (committed) {
+ if (req.needReturnValue()) {
+ try {
+ GridCacheReturnCompletableWrapper wrapper = ctx.tm().getCommittedTxReturn(req.version());
- if (txFinishMsgLog.isDebugEnabled()) {
- txFinishMsgLog.debug("Sent dht tx finish response [txId=" + nearTxId +
- ", dhtTxId=" + req.version() +
- ", node=" + nodeId +
- ", checkCommitted=" + req.checkCommitted() + ']');
+ if (wrapper != null)
+ res.returnValue(wrapper.fut().get());
+ else
+ assert !ctx.discovery().alive(nodeId) : nodeId;
}
- }
- catch (Throwable e) {
- // Double-check.
- if (ctx.discovery().node(nodeId) == null) {
+ catch (IgniteCheckedException ignored) {
if (txFinishMsgLog.isDebugEnabled()) {
- txFinishMsgLog.debug("Node left while send dht tx finish response [txId=" + nearTxId +
+ txFinishMsgLog.debug("Failed to get return value. [txId=null" +
", dhtTxId=" + req.version() +
", node=" + nodeId + ']');
}
}
- else {
- U.error(log, "Failed to send finish response to node [txId=" + nearTxId +
- ", dhtTxId=" + req.version() +
- ", nodeId=" + nodeId +
- ", res=" + res + ']', e);
- }
+ }
+ }
+ else {
+ ClusterTopologyCheckedException cause =
+ new ClusterTopologyCheckedException("Primary node left grid.");
- if (e instanceof Error)
- throw (Error)e;
+ res.checkCommittedError(new IgniteTxRollbackCheckedException("Failed to commit transaction " +
+ "(transaction has been rolled back on backup node): " + req.version(), cause));
+ }
+
+ sendFinishResponse(nodeId, res, req, null);
+ }
+
+ /**
+ * Sends tx finish response to remote node, if response is requested.
+ *
+ * @param nodeId Node id that originated finish request.
+ * @param req Request.
+ * @param nearTxId Near tx version.
+ */
+ private void sendFinishReply(UUID nodeId, GridDhtTxFinishRequest req, GridCacheVersion nearTxId) {
+ assert !req.checkCommitted();
+
+ if (req.replyRequired()) {
+ GridDhtTxFinishResponse res = new GridDhtTxFinishResponse(
+ req.partition(),
+ req.version(),
+ req.futureId(),
+ req.miniId());
+
+ if (req.dhtReplyNear()) {
+ nodeId = req.nearNodeId();
+
+ res.nearNodeResponse(true);
}
+
+ sendFinishResponse(nodeId, res, req, nearTxId);
}
else {
if (txFinishMsgLog.isDebugEnabled()) {
@@ -1437,6 +1434,47 @@ public class IgniteTxHandler {
/**
* @param nodeId Node ID.
+ * @param res Response.
+ * @param req Request (for debug info logging).
+ * @param nearTxId (for debug info logging).
+ */
+ private void sendFinishResponse(UUID nodeId,
+ GridDistributedTxFinishResponse res,
+ GridDhtTxFinishRequest req,
+ @Nullable GridCacheVersion nearTxId) {
+ try {
+ ctx.io().send(nodeId, res, req.policy());
+
+ if (txFinishMsgLog.isDebugEnabled()) {
+ txFinishMsgLog.debug("Sent dht tx finish response [txId=" + nearTxId +
+ ", dhtTxId=" + req.version() +
+ ", node=" + nodeId +
+ ", checkCommitted=" + req.checkCommitted() + ']');
+ }
+ }
+ catch (Throwable e) {
+ // Double-check.
+ if (ctx.discovery().node(nodeId) == null) {
+ if (txFinishMsgLog.isDebugEnabled()) {
+ txFinishMsgLog.debug("Node left while send dht tx finish response [txId=" + nearTxId +
+ ", dhtTxId=" + req.version() +
+ ", node=" + nodeId + ']');
+ }
+ }
+ else {
+ U.error(log, "Failed to send finish response to node [txId=" + nearTxId +
+ ", dhtTxId=" + req.version() +
+ ", nodeId=" + nodeId +
+ ", res=" + res + ']', e);
+ }
+
+ if (e instanceof Error)
+ throw (Error)e;
+ }
+ }
+
+ /**
+ * @param nodeId Node ID.
* @param req Request.
* @param res Response or {@code null} if should not reply to primary.
* @return Remote transaction.
[12/38] ignite git commit: ignite-4768
Posted by sb...@apache.org.
ignite-4768
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/784b171d
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/784b171d
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/784b171d
Branch: refs/heads/ignite-4768
Commit: 784b171deefbc573e7ec6b59128a274acc307946
Parents: 35dad8f
Author: sboikov <sb...@gridgain.com>
Authored: Thu Mar 9 15:45:55 2017 +0300
Committer: sboikov <sb...@gridgain.com>
Committed: Thu Mar 9 15:49:52 2017 +0300
----------------------------------------------------------------------
.../cache/distributed/GridDistributedTxPrepareRequest.java | 9 ---------
.../cache/distributed/dht/GridDhtTxPrepareFuture.java | 2 --
.../cache/distributed/dht/GridDhtTxPrepareRequest.java | 2 --
.../cache/distributed/near/GridNearLockFuture.java | 2 ++
.../near/GridNearOptimisticSerializableTxPrepareFuture.java | 1 -
.../distributed/near/GridNearOptimisticTxPrepareFuture.java | 1 -
.../near/GridNearPessimisticTxPrepareFuture.java | 9 ---------
.../cache/distributed/near/GridNearTxPrepareRequest.java | 2 --
8 files changed, 2 insertions(+), 26 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ignite/blob/784b171d/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/GridDistributedTxPrepareRequest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/GridDistributedTxPrepareRequest.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/GridDistributedTxPrepareRequest.java
index e30c456..329dc8b 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/GridDistributedTxPrepareRequest.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/GridDistributedTxPrepareRequest.java
@@ -74,9 +74,6 @@ public class GridDistributedTxPrepareRequest extends GridDistributedBaseMessage
/** */
private static final int SYSTEM_TX_FLAG_MASK = 0x10;
- /** */
- private static final int MAPPING_KNOWN_FLAG_MASK = 0x20;
-
/** Collection to message converter. */
private static final C1<Collection<UUID>, UUIDCollectionMessage> COL_TO_MSG = new C1<Collection<UUID>, UUIDCollectionMessage>() {
@Override public UUIDCollectionMessage apply(Collection<UUID> uuids) {
@@ -177,7 +174,6 @@ public class GridDistributedTxPrepareRequest extends GridDistributedBaseMessage
@Nullable Collection<IgniteTxEntry> reads,
Collection<IgniteTxEntry> writes,
Map<UUID, Collection<UUID>> txNodes,
- boolean mappingKnown,
boolean retVal,
boolean last,
boolean onePhaseCommit,
@@ -202,11 +198,6 @@ public class GridDistributedTxPrepareRequest extends GridDistributedBaseMessage
setFlag(tx.isInvalidate(), INVALIDATE_FLAG_MASK);
setFlag(onePhaseCommit, ONE_PHASE_COMMIT_FLAG_MASK);
setFlag(last, LAST_REQ_FLAG_MASK);
- setFlag(mappingKnown, MAPPING_KNOWN_FLAG_MASK);
- }
-
- public final boolean mappingKnown() {
- return isFlag(MAPPING_KNOWN_FLAG_MASK);
}
/**
http://git-wip-us.apache.org/repos/asf/ignite/blob/784b171d/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtTxPrepareFuture.java
----------------------------------------------------------------------
diff --git 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
index 053c3b2..d093b4a 100644
--- 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
@@ -1273,7 +1273,6 @@ public final class GridDhtTxPrepareFuture extends GridCompoundFuture<IgniteInter
nearWrites,
txNodes,
tx.nearXidVersion(),
- false,
true,
tx.onePhaseCommit(),
tx.subjectId(),
@@ -1386,7 +1385,6 @@ public final class GridDhtTxPrepareFuture extends GridCompoundFuture<IgniteInter
nearMapping.writes(),
tx.transactionNodes(),
tx.nearXidVersion(),
- false,
true,
tx.onePhaseCommit(),
tx.subjectId(),
http://git-wip-us.apache.org/repos/asf/ignite/blob/784b171d/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtTxPrepareRequest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtTxPrepareRequest.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtTxPrepareRequest.java
index e55d189..8c01302 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtTxPrepareRequest.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtTxPrepareRequest.java
@@ -128,7 +128,6 @@ public class GridDhtTxPrepareRequest extends GridDistributedTxPrepareRequest {
Collection<IgniteTxEntry> nearWrites,
Map<UUID, Collection<UUID>> txNodes,
GridCacheVersion nearXidVer,
- boolean mappingKnown,
boolean last,
boolean onePhaseCommit,
UUID subjId,
@@ -140,7 +139,6 @@ public class GridDhtTxPrepareRequest extends GridDistributedTxPrepareRequest {
null,
dhtWrites,
txNodes,
- mappingKnown,
retVal,
last,
onePhaseCommit,
http://git-wip-us.apache.org/repos/asf/ignite/blob/784b171d/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearLockFuture.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearLockFuture.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearLockFuture.java
index 7b19884..ffc84d8 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearLockFuture.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearLockFuture.java
@@ -1181,6 +1181,8 @@ public final class GridNearLockFuture extends GridCompoundIdentityFuture<Boolean
req.filter(filter, cctx);
if (node.isLocal()) {
+ req.miniId(-1);
+
if (log.isDebugEnabled())
log.debug("Before locally locking near request: " + req);
http://git-wip-us.apache.org/repos/asf/ignite/blob/784b171d/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearOptimisticSerializableTxPrepareFuture.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearOptimisticSerializableTxPrepareFuture.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearOptimisticSerializableTxPrepareFuture.java
index bb1609d..f8e0584 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearOptimisticSerializableTxPrepareFuture.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearOptimisticSerializableTxPrepareFuture.java
@@ -442,7 +442,6 @@ public class GridNearOptimisticSerializableTxPrepareFuture extends GridNearOptim
m.writes(),
m.near(),
txMapping.transactionNodes(),
- false,
m.last(),
tx.onePhaseCommit(),
tx.needReturnValue() && tx.implicit(),
http://git-wip-us.apache.org/repos/asf/ignite/blob/784b171d/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearOptimisticTxPrepareFuture.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearOptimisticTxPrepareFuture.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearOptimisticTxPrepareFuture.java
index 8bb79c1..4233002 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearOptimisticTxPrepareFuture.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearOptimisticTxPrepareFuture.java
@@ -500,7 +500,6 @@ public class GridNearOptimisticTxPrepareFuture extends GridNearOptimisticTxPrepa
m.writes(),
m.near(),
txMapping.transactionNodes(),
- false,
m.last(),
tx.onePhaseCommit(),
tx.needReturnValue() && tx.implicit(),
http://git-wip-us.apache.org/repos/asf/ignite/blob/784b171d/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearPessimisticTxPrepareFuture.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearPessimisticTxPrepareFuture.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearPessimisticTxPrepareFuture.java
index fb2c2fd..ddee7b7 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearPessimisticTxPrepareFuture.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearPessimisticTxPrepareFuture.java
@@ -184,8 +184,6 @@ public class GridNearPessimisticTxPrepareFuture extends GridNearTxPrepareFutureA
*
*/
private void preparePessimistic() {
- boolean mappingKnown = true;
-
Map<IgniteBiTuple<ClusterNode, Boolean>, GridDistributedTxMapping> mappings = new HashMap<>();
AffinityTopologyVersion topVer = tx.topologyVersion();
@@ -202,9 +200,6 @@ public class GridNearPessimisticTxPrepareFuture extends GridNearTxPrepareFutureA
if (!cacheCtx.isLocal()) {
GridDhtPartitionTopology top = cacheCtx.topology();
- if (mappingKnown && (!top.rebalanceFinished(topVer) || cctx.discovery().hasNearCache(cacheCtx.cacheId(), topVer)))
- mappingKnown = false;
-
nodes = cacheCtx.topology().nodes(cacheCtx.affinity().partition(txEntry.key()), topVer);
}
else
@@ -237,9 +232,6 @@ public class GridNearPessimisticTxPrepareFuture extends GridNearTxPrepareFutureA
checkOnePhase(txMapping);
- if (mappingKnown && tx.onePhaseCommit())
- mappingKnown = false;
-
long timeout = tx.remainingTime();
if (timeout == -1) {
@@ -262,7 +254,6 @@ public class GridNearPessimisticTxPrepareFuture extends GridNearTxPrepareFutureA
m.writes(),
m.near(),
txMapping.transactionNodes(),
- mappingKnown,
true,
tx.onePhaseCommit(),
tx.needReturnValue() && tx.implicit(),
http://git-wip-us.apache.org/repos/asf/ignite/blob/784b171d/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearTxPrepareRequest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearTxPrepareRequest.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearTxPrepareRequest.java
index 3eff9e5..cccc7b4 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearTxPrepareRequest.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearTxPrepareRequest.java
@@ -107,7 +107,6 @@ public class GridNearTxPrepareRequest extends GridDistributedTxPrepareRequest {
Collection<IgniteTxEntry> writes,
boolean near,
Map<UUID, Collection<UUID>> txNodes,
- boolean mappingKnown,
boolean last,
boolean onePhaseCommit,
boolean retVal,
@@ -123,7 +122,6 @@ public class GridNearTxPrepareRequest extends GridDistributedTxPrepareRequest {
reads,
writes,
txNodes,
- mappingKnown,
retVal,
last,
onePhaseCommit,
[16/38] ignite git commit: ignite-4768
Posted by sb...@apache.org.
ignite-4768
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/5596e69f
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/5596e69f
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/5596e69f
Branch: refs/heads/ignite-4768
Commit: 5596e69f021a8e3da21479a11ee6079314e33144
Parents: 4b44091
Author: sboikov <sb...@gridgain.com>
Authored: Fri Mar 10 12:58:34 2017 +0300
Committer: sboikov <sb...@gridgain.com>
Committed: Fri Mar 10 12:58:34 2017 +0300
----------------------------------------------------------------------
.../communication/GridIoMessageFactory.java | 5 -
.../processors/cache/GridCacheIoManager.java | 2 +
.../processors/cache/GridCacheMvccFuture.java | 3 +
.../GridDistributedTxPrepareResponse.java | 44 +++-
.../dht/GridDhtTxNearPrepareResponse.java | 232 -------------------
.../distributed/dht/GridDhtTxPrepareFuture.java | 1 +
.../dht/GridDhtTxPrepareResponse.java | 43 +++-
...arOptimisticSerializableTxPrepareFuture.java | 4 +-
.../near/GridNearOptimisticTxPrepareFuture.java | 4 +-
.../GridNearPessimisticTxPrepareFuture.java | 9 +-
.../near/GridNearTxFinishFuture.java | 40 ++--
.../near/GridNearTxPrepareFutureAdapter.java | 9 +-
.../near/GridNearTxPrepareResponse.java | 4 +-
.../cache/transactions/IgniteTxHandler.java | 62 ++---
modules/yardstick/config/ignite-base-config.xml | 171 +-------------
.../yardstick/cache/IgnitePutTxBenchmark.java | 5 +-
16 files changed, 150 insertions(+), 488 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ignite/blob/5596e69f/modules/core/src/main/java/org/apache/ignite/internal/managers/communication/GridIoMessageFactory.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/managers/communication/GridIoMessageFactory.java b/modules/core/src/main/java/org/apache/ignite/internal/managers/communication/GridIoMessageFactory.java
index df3d7e8..ce2c72c 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/managers/communication/GridIoMessageFactory.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/managers/communication/GridIoMessageFactory.java
@@ -174,11 +174,6 @@ public class GridIoMessageFactory implements MessageFactory {
Message msg = null;
switch (type) {
- case -50:
- msg = new GridDhtTxNearPrepareResponse();
-
- break;
-
case -44:
msg = new TcpCommunicationSpi.HandshakeMessage2();
http://git-wip-us.apache.org/repos/asf/ignite/blob/5596e69f/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheIoManager.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheIoManager.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheIoManager.java
index 7cac367..71f4e1c 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheIoManager.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheIoManager.java
@@ -547,6 +547,7 @@ public class GridCacheIoManager extends GridCacheSharedManagerAdapter {
GridDhtTxPrepareRequest req = (GridDhtTxPrepareRequest)msg;
GridDhtTxPrepareResponse res = new GridDhtTxPrepareResponse(
+ req.partition(),
req.version(),
req.futureId(),
req.miniId(),
@@ -672,6 +673,7 @@ public class GridCacheIoManager extends GridCacheSharedManagerAdapter {
GridNearTxPrepareRequest req = (GridNearTxPrepareRequest)msg;
GridNearTxPrepareResponse res = new GridNearTxPrepareResponse(
+ req.partition(),
req.version(),
req.futureId(),
req.miniId(),
http://git-wip-us.apache.org/repos/asf/ignite/blob/5596e69f/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheMvccFuture.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheMvccFuture.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheMvccFuture.java
index 080a6f1..a0acf18 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheMvccFuture.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheMvccFuture.java
@@ -17,6 +17,7 @@
package org.apache.ignite.internal.processors.cache;
+import org.apache.ignite.internal.processors.cache.transactions.IgniteInternalTx;
import org.apache.ignite.internal.processors.cache.version.GridCacheVersion;
/**
@@ -34,4 +35,6 @@ public interface GridCacheMvccFuture<T> extends GridCacheFuture<T> {
* @return {@code True} if future cares about this entry.
*/
public boolean onOwnerChanged(GridCacheEntryEx entry, GridCacheMvccCandidate owner);
+
+ public IgniteInternalTx tx();
}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/ignite/blob/5596e69f/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/GridDistributedTxPrepareResponse.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/GridDistributedTxPrepareResponse.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/GridDistributedTxPrepareResponse.java
index 99f36c2..c19b8c1 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/GridDistributedTxPrepareResponse.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/GridDistributedTxPrepareResponse.java
@@ -51,6 +51,12 @@ public class GridDistributedTxPrepareResponse extends GridDistributedBaseMessage
@GridDirectTransient
private IgniteTxState txState;
+ /** */
+ private int part;
+
+ /** */
+ private byte flags;
+
/**
* Empty constructor (required by {@link Externalizable}).
*/
@@ -59,24 +65,54 @@ public class GridDistributedTxPrepareResponse extends GridDistributedBaseMessage
}
/**
- * @param xid Transaction ID.
+ * @param part Partition.
+ * @param xid Lock or transaction ID.
* @param addDepInfo Deployment info flag.
*/
- public GridDistributedTxPrepareResponse(GridCacheVersion xid, boolean addDepInfo) {
+ public GridDistributedTxPrepareResponse(int part, GridCacheVersion xid, boolean addDepInfo) {
super(xid, 0, addDepInfo);
+
+ this.part = part;
}
/**
- * @param xid Lock ID.
+ * @param part Partition.
+ * @param xid Lock or transaction ID.
* @param err Error.
* @param addDepInfo Deployment info flag.
*/
- public GridDistributedTxPrepareResponse(GridCacheVersion xid, Throwable err, boolean addDepInfo) {
+ public GridDistributedTxPrepareResponse(int part, GridCacheVersion xid, Throwable err, boolean addDepInfo) {
super(xid, 0, addDepInfo);
+ this.part = part;
this.err = err;
}
+ /**
+ * Sets flag mask.
+ *
+ * @param flag Set or clear.
+ * @param mask Mask.
+ */
+ protected final void setFlag(boolean flag, int mask) {
+ flags = flag ? (byte)(flags | mask) : (byte)(flags & ~mask);
+ }
+
+ /**
+ * Reags flag mask.
+ *
+ * @param mask Mask to read.
+ * @return Flag value.
+ */
+ protected final boolean isFlag(int mask) {
+ return (flags & mask) != 0;
+ }
+
+ /** {@inheritDoc} */
+ @Override public int partition() {
+ return part;
+ }
+
/** {@inheritDoc} */
@Override public Throwable error() {
return err;
http://git-wip-us.apache.org/repos/asf/ignite/blob/5596e69f/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtTxNearPrepareResponse.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtTxNearPrepareResponse.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtTxNearPrepareResponse.java
deleted file mode 100644
index e582bd2..0000000
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtTxNearPrepareResponse.java
+++ /dev/null
@@ -1,232 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.apache.ignite.internal.processors.cache.distributed.dht;
-
-import java.nio.ByteBuffer;
-import org.apache.ignite.IgniteLogger;
-import org.apache.ignite.internal.GridDirectTransient;
-import org.apache.ignite.internal.processors.cache.GridCacheMessage;
-import org.apache.ignite.internal.processors.cache.GridCacheSharedContext;
-import org.apache.ignite.internal.processors.cache.transactions.IgniteTxState;
-import org.apache.ignite.internal.processors.cache.transactions.IgniteTxStateAware;
-import org.apache.ignite.internal.processors.cache.version.GridCacheVersion;
-import org.apache.ignite.internal.util.typedef.internal.S;
-import org.apache.ignite.lang.IgniteUuid;
-import org.apache.ignite.plugin.extensions.communication.MessageReader;
-import org.apache.ignite.plugin.extensions.communication.MessageWriter;
-
-/**
- *
- */
-public class GridDhtTxNearPrepareResponse extends GridCacheMessage implements IgniteTxStateAware {
- /** */
- private static final long serialVersionUID = 0L;
-
- /** */
- private int partId;
-
- /** */
- private GridCacheVersion nearTxId;
-
- /** Future ID. */
- private IgniteUuid futId;
-
- /** Mini future ID. */
- private int miniId;
-
- /** Transient TX state. */
- @GridDirectTransient
- private IgniteTxState txState;
-
- /**
- *
- */
- public GridDhtTxNearPrepareResponse() {
- // No-op.
- }
-
- /**
- * @param partId Partition ID.
- * @param nearTxId Near transaction ID.
- * @param futId Future ID.
- * @param miniId Mini future ID.
- */
- public GridDhtTxNearPrepareResponse(int partId, GridCacheVersion nearTxId, IgniteUuid futId, int miniId) {
- assert nearTxId != null;
- assert futId != null;
- assert miniId > 0;
-
- this.partId = partId;
- this.nearTxId = nearTxId;
- this.futId = futId;
- this.miniId = miniId;
- }
-
- /**
- * @return Near transaction ID.
- */
- public GridCacheVersion nearTxId() {
- return nearTxId;
- }
-
- /**
- * @return Future ID.
- */
- public IgniteUuid futureId() {
- return futId;
- }
-
- /**
- * @return Mini future ID.
- */
- public int miniId() {
- return miniId;
- }
-
- /** {@inheritDoc} */
- @Override public int partition() {
- return partId;
- }
-
- /** {@inheritDoc} */
- @Override public IgniteTxState txState() {
- return txState;
- }
-
- /** {@inheritDoc} */
- @Override public void txState(IgniteTxState txState) {
- this.txState = txState;
- }
-
- /** {@inheritDoc} */
- @Override public IgniteLogger messageLogger(GridCacheSharedContext ctx) {
- return ctx.txPrepareMessageLogger();
- }
-
- /** {@inheritDoc} */
- @Override public byte directType() {
- return -50;
- }
-
- /** {@inheritDoc} */
- @Override public byte fieldsCount() {
- return 7;
- }
-
- /** {@inheritDoc} */
- @Override public boolean addDeploymentInfo() {
- return false;
- }
-
- /** {@inheritDoc} */
- @Override public boolean writeTo(ByteBuffer buf, MessageWriter writer) {
- writer.setBuffer(buf);
-
- if (!super.writeTo(buf, writer))
- return false;
-
- if (!writer.isHeaderWritten()) {
- if (!writer.writeHeader(directType(), fieldsCount()))
- return false;
-
- writer.onHeaderWritten();
- }
-
- switch (writer.state()) {
- case 3:
- if (!writer.writeIgniteUuid("futId", futId))
- return false;
-
- writer.incrementState();
-
- case 4:
- if (!writer.writeInt("miniId", miniId))
- return false;
-
- writer.incrementState();
-
- case 5:
- if (!writer.writeMessage("nearTxId", nearTxId))
- return false;
-
- writer.incrementState();
-
- case 6:
- if (!writer.writeInt("partId", partId))
- return false;
-
- writer.incrementState();
-
- }
-
- return true;
- }
-
- /** {@inheritDoc} */
- @Override public boolean readFrom(ByteBuffer buf, MessageReader reader) {
- reader.setBuffer(buf);
-
- if (!reader.beforeMessageRead())
- return false;
-
- if (!super.readFrom(buf, reader))
- return false;
-
- switch (reader.state()) {
- case 3:
- futId = reader.readIgniteUuid("futId");
-
- if (!reader.isLastRead())
- return false;
-
- reader.incrementState();
-
- case 4:
- miniId = reader.readInt("miniId");
-
- if (!reader.isLastRead())
- return false;
-
- reader.incrementState();
-
- case 5:
- nearTxId = reader.readMessage("nearTxId");
-
- if (!reader.isLastRead())
- return false;
-
- reader.incrementState();
-
- case 6:
- partId = reader.readInt("partId");
-
- if (!reader.isLastRead())
- return false;
-
- reader.incrementState();
-
- }
-
- return reader.afterMessageRead(GridDhtTxNearPrepareResponse.class);
- }
-
- /** {@inheritDoc} */
- @Override public String toString() {
- return S.toString(GridDhtTxNearPrepareResponse.class, this);
- }
-}
http://git-wip-us.apache.org/repos/asf/ignite/blob/5596e69f/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtTxPrepareFuture.java
----------------------------------------------------------------------
diff --git 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
index 7f0cddd..454c8fb 100644
--- 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
@@ -858,6 +858,7 @@ public final class GridDhtTxPrepareFuture extends GridCompoundFuture<IgniteInter
assert F.isEmpty(tx.invalidPartitions());
GridNearTxPrepareResponse res = new GridNearTxPrepareResponse(
+ -1,
tx.nearXidVersion(),
tx.colocated() ? tx.xid() : tx.nearFutureId(),
nearMiniId,
http://git-wip-us.apache.org/repos/asf/ignite/blob/5596e69f/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtTxPrepareResponse.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtTxPrepareResponse.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtTxPrepareResponse.java
index fdead95..c37ac80 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtTxPrepareResponse.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtTxPrepareResponse.java
@@ -49,6 +49,9 @@ public class GridDhtTxPrepareResponse extends GridDistributedTxPrepareResponse {
/** */
private static final long serialVersionUID = 0L;
+ /** */
+ private static final int NEAR_RES_FLAG_MASK = 0x01;
+
/** Evicted readers. */
@GridToStringInclude
@GridDirectCollection(IgniteTxKey.class)
@@ -76,13 +79,19 @@ public class GridDhtTxPrepareResponse extends GridDistributedTxPrepareResponse {
}
/**
+ * @param part Partition.
* @param xid Xid version.
* @param futId Future ID.
* @param miniId Mini future ID.
* @param addDepInfo Deployment info flag.
*/
- public GridDhtTxPrepareResponse(GridCacheVersion xid, IgniteUuid futId, IgniteUuid miniId, boolean addDepInfo) {
- super(xid, addDepInfo);
+ public GridDhtTxPrepareResponse(
+ int part,
+ GridCacheVersion xid,
+ IgniteUuid futId,
+ IgniteUuid miniId,
+ boolean addDepInfo) {
+ super(part, xid, addDepInfo);
assert futId != null;
assert miniId != null;
@@ -92,15 +101,21 @@ public class GridDhtTxPrepareResponse extends GridDistributedTxPrepareResponse {
}
/**
+ * @param part Partition.
* @param xid Xid version.
* @param futId Future ID.
* @param miniId Mini future ID.
* @param err Error.
* @param addDepInfo Deployment enabled.
*/
- public GridDhtTxPrepareResponse(GridCacheVersion xid, IgniteUuid futId, IgniteUuid miniId, Throwable err,
+ public GridDhtTxPrepareResponse(
+ int part,
+ GridCacheVersion xid,
+ IgniteUuid futId,
+ IgniteUuid miniId,
+ Throwable err,
boolean addDepInfo) {
- super(xid, err, addDepInfo);
+ super(part, xid, err, addDepInfo);
assert futId != null;
assert miniId != null;
@@ -110,9 +125,23 @@ public class GridDhtTxPrepareResponse extends GridDistributedTxPrepareResponse {
}
/**
+ * @return {@code True} if this is reply for near node.
+ */
+ public boolean nearNodeResponse() {
+ return isFlag(NEAR_RES_FLAG_MASK);
+ }
+
+ /**
+ * @param val {@code True} if this is reply for near node.
+ */
+ void nearNodeResponse(boolean val) {
+ setFlag(val, NEAR_RES_FLAG_MASK);
+ }
+
+ /**
* @return Evicted readers.
*/
- public Collection<IgniteTxKey> nearEvicted() {
+ Collection<IgniteTxKey> nearEvicted() {
return nearEvicted;
}
@@ -140,7 +169,7 @@ public class GridDhtTxPrepareResponse extends GridDistributedTxPrepareResponse {
/**
* @return Map from cacheId to an array of invalid partitions.
*/
- public Map<Integer, int[]> invalidPartitionsByCacheId() {
+ Map<Integer, int[]> invalidPartitionsByCacheId() {
return invalidParts;
}
@@ -156,7 +185,7 @@ public class GridDhtTxPrepareResponse extends GridDistributedTxPrepareResponse {
*
* @return Collection of entry infos need to be preloaded.
*/
- public Collection<GridCacheEntryInfo> preloadEntries() {
+ Collection<GridCacheEntryInfo> preloadEntries() {
return preloadEntries == null ? Collections.<GridCacheEntryInfo>emptyList() : preloadEntries;
}
http://git-wip-us.apache.org/repos/asf/ignite/blob/5596e69f/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearOptimisticSerializableTxPrepareFuture.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearOptimisticSerializableTxPrepareFuture.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearOptimisticSerializableTxPrepareFuture.java
index fcd714b..3d919f9 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearOptimisticSerializableTxPrepareFuture.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearOptimisticSerializableTxPrepareFuture.java
@@ -37,7 +37,7 @@ import org.apache.ignite.internal.processors.cache.GridCacheMvccCandidate;
import org.apache.ignite.internal.processors.cache.GridCacheSharedContext;
import org.apache.ignite.internal.processors.cache.distributed.GridDistributedTxMapping;
import org.apache.ignite.internal.processors.cache.distributed.dht.GridDhtTxMapping;
-import org.apache.ignite.internal.processors.cache.distributed.dht.GridDhtTxNearPrepareResponse;
+import org.apache.ignite.internal.processors.cache.distributed.dht.GridDhtTxPrepareResponse;
import org.apache.ignite.internal.processors.cache.transactions.IgniteInternalTx;
import org.apache.ignite.internal.processors.cache.transactions.IgniteTxEntry;
import org.apache.ignite.internal.processors.cache.version.GridCacheVersion;
@@ -202,7 +202,7 @@ public class GridNearOptimisticSerializableTxPrepareFuture extends GridNearOptim
}
/** {@inheritDoc} */
- @Override public void onDhtResponse(UUID nodeId, GridDhtTxNearPrepareResponse res) {
+ @Override public void onDhtResponse(UUID nodeId, GridDhtTxPrepareResponse res) {
assert false; // TODO IGNITE-4768.
}
http://git-wip-us.apache.org/repos/asf/ignite/blob/5596e69f/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearOptimisticTxPrepareFuture.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearOptimisticTxPrepareFuture.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearOptimisticTxPrepareFuture.java
index 9a7f500..5cfb1a2 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearOptimisticTxPrepareFuture.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearOptimisticTxPrepareFuture.java
@@ -40,7 +40,7 @@ import org.apache.ignite.internal.processors.cache.GridCacheMvccCandidate;
import org.apache.ignite.internal.processors.cache.GridCacheSharedContext;
import org.apache.ignite.internal.processors.cache.distributed.GridDistributedTxMapping;
import org.apache.ignite.internal.processors.cache.distributed.dht.GridDhtTxMapping;
-import org.apache.ignite.internal.processors.cache.distributed.dht.GridDhtTxNearPrepareResponse;
+import org.apache.ignite.internal.processors.cache.distributed.dht.GridDhtTxPrepareResponse;
import org.apache.ignite.internal.processors.cache.transactions.IgniteInternalTx;
import org.apache.ignite.internal.processors.cache.transactions.IgniteTxEntry;
import org.apache.ignite.internal.processors.cache.transactions.IgniteTxKey;
@@ -203,7 +203,7 @@ public class GridNearOptimisticTxPrepareFuture extends GridNearOptimisticTxPrepa
}
/** {@inheritDoc} */
- @Override public void onDhtResponse(UUID nodeId, GridDhtTxNearPrepareResponse res) {
+ @Override public void onDhtResponse(UUID nodeId, GridDhtTxPrepareResponse res) {
assert false; // TODO IGNITE-4768.
}
http://git-wip-us.apache.org/repos/asf/ignite/blob/5596e69f/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearPessimisticTxPrepareFuture.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearPessimisticTxPrepareFuture.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearPessimisticTxPrepareFuture.java
index ed3f2f1..b476336 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearPessimisticTxPrepareFuture.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearPessimisticTxPrepareFuture.java
@@ -37,7 +37,7 @@ import org.apache.ignite.internal.processors.cache.GridCacheSharedContext;
import org.apache.ignite.internal.processors.cache.distributed.GridDistributedTxMapping;
import org.apache.ignite.internal.processors.cache.distributed.dht.GridDhtPartitionTopology;
import org.apache.ignite.internal.processors.cache.distributed.dht.GridDhtTxMapping;
-import org.apache.ignite.internal.processors.cache.distributed.dht.GridDhtTxNearPrepareResponse;
+import org.apache.ignite.internal.processors.cache.distributed.dht.GridDhtTxPrepareResponse;
import org.apache.ignite.internal.processors.cache.transactions.IgniteInternalTx;
import org.apache.ignite.internal.processors.cache.transactions.IgniteTxEntry;
import org.apache.ignite.internal.transactions.IgniteTxRollbackCheckedException;
@@ -126,7 +126,9 @@ public class GridNearPessimisticTxPrepareFuture extends GridNearTxPrepareFutureA
}
/** {@inheritDoc} */
- @Override public void onDhtResponse(UUID nodeId, GridDhtTxNearPrepareResponse res) {
+ @Override public void onDhtResponse(UUID nodeId, GridDhtTxPrepareResponse res) {
+ assert res.nearNodeResponse() : res;
+
MiniFuture f = miniFuture(res.miniId());
if (f != null)
@@ -438,6 +440,7 @@ public class GridNearPessimisticTxPrepareFuture extends GridNearTxPrepareFutureA
this.m = m;
this.futId = futId;
+ // TODO: IGNITE-4768, check nodes alive.
if (req.dhtReplyNear()) {
dhtNodes = new HashSet<>(req.transactionNodes().get(m.primary().id()));
@@ -510,7 +513,7 @@ public class GridNearPessimisticTxPrepareFuture extends GridNearTxPrepareFutureA
* @param nodeId Node ID.
* @param res Response.
*/
- void onDhtResponse(UUID nodeId, GridDhtTxNearPrepareResponse res) {
+ void onDhtResponse(UUID nodeId, GridDhtTxPrepareResponse res) {
assert dhtNodes != null;
boolean done;
http://git-wip-us.apache.org/repos/asf/ignite/blob/5596e69f/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearTxFinishFuture.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearTxFinishFuture.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearTxFinishFuture.java
index c13650e..06cf878 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearTxFinishFuture.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearTxFinishFuture.java
@@ -256,7 +256,7 @@ public final class GridNearTxFinishFuture<K, V> extends GridCompoundIdentityFutu
CheckRemoteTxMiniFuture f = (CheckRemoteTxMiniFuture)fut;
if (f.futureId().equals(res.miniId()))
- f.onDhtFinishResponse(nodeId, false);
+ f.onDhtFinishResponse(nodeId);
}
}
@@ -690,6 +690,8 @@ public final class GridNearTxFinishFuture<K, V> extends GridCompoundIdentityFutu
tx.activeCachesDeploymentEnabled()
);
+ boolean dhtReplyNear = tx.dhtReplyNear() && syncMode == FULL_SYNC;
+
// If this is the primary node for the keys.
if (n.isLocal()) {
req.miniId(IgniteUuid.randomUuid());
@@ -701,7 +703,7 @@ public final class GridNearTxFinishFuture<K, V> extends GridCompoundIdentityFutu
add(fut);
}
else {
- FinishMiniFuture fut = new FinishMiniFuture(m);
+ FinishMiniFuture fut = new FinishMiniFuture(m, dhtReplyNear);
req.miniId(fut.futureId());
@@ -862,11 +864,22 @@ public final class GridNearTxFinishFuture<K, V> extends GridCompoundIdentityFutu
@GridToStringInclude
private GridDistributedTxMapping m;
+ /** */
+ private final Set<UUID> dhtNodes;
+
/**
* @param m Mapping.
*/
- FinishMiniFuture(GridDistributedTxMapping m) {
+ FinishMiniFuture(GridDistributedTxMapping m, boolean dhtReplyNear) {
this.m = m;
+
+ if (dhtReplyNear) {
+ dhtNodes = new HashSet<>(tx.transactionNodes().get(m.primary().id()));
+
+ assert !dhtNodes.isEmpty();
+ }
+ else
+ dhtNodes = null;
}
/**
@@ -876,13 +889,6 @@ public final class GridNearTxFinishFuture<K, V> extends GridCompoundIdentityFutu
return m.primary();
}
- /**
- * @return Keys.
- */
- public GridDistributedTxMapping mapping() {
- return m;
- }
-
/** {@inheritDoc} */
boolean onNodeLeft(UUID nodeId, boolean discoThread) {
if (nodeId.equals(m.primary().id())) {
@@ -913,7 +919,7 @@ public final class GridNearTxFinishFuture<K, V> extends GridCompoundIdentityFutu
fut.listen(new CI1<IgniteInternalFuture<?>>() {
@Override public void apply(IgniteInternalFuture<?> fut) {
- mini.onDhtFinishResponse(cctx.localNodeId(), true);
+ mini.onDhtFinishResponse(cctx.localNodeId());
}
});
}
@@ -930,7 +936,7 @@ public final class GridNearTxFinishFuture<K, V> extends GridCompoundIdentityFutu
}
}
else
- mini.onDhtFinishResponse(backupId, true);
+ mini.onDhtFinishResponse(backupId);
}
}
}
@@ -948,6 +954,8 @@ public final class GridNearTxFinishFuture<K, V> extends GridCompoundIdentityFutu
* @param res Result callback.
*/
void onNearFinishResponse(GridNearTxFinishResponse res) {
+ assert dhtNodes == null || res.error() != null;
+
if (res.error() != null)
onDone(res.error());
else
@@ -956,7 +964,10 @@ public final class GridNearTxFinishFuture<K, V> extends GridCompoundIdentityFutu
/** {@inheritDoc} */
@Override public String toString() {
- return S.toString(FinishMiniFuture.class, this, "done", isDone(), "cancelled", isCancelled(), "err", error());
+ return S.toString(FinishMiniFuture.class, this,
+ "done", isDone(),
+ "cancelled", isCancelled(),
+ "err", error());
}
}
@@ -1055,9 +1066,8 @@ public final class GridNearTxFinishFuture<K, V> extends GridCompoundIdentityFutu
/**
* @param nodeId Node ID.
- * @param discoThread {@code True} if executed from discovery thread.
*/
- void onDhtFinishResponse(UUID nodeId, boolean discoThread) {
+ void onDhtFinishResponse(UUID nodeId) {
onResponse(nodeId);
}
http://git-wip-us.apache.org/repos/asf/ignite/blob/5596e69f/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearTxPrepareFutureAdapter.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearTxPrepareFutureAdapter.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearTxPrepareFutureAdapter.java
index 7f94e9f..71d2353 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearTxPrepareFutureAdapter.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearTxPrepareFutureAdapter.java
@@ -30,7 +30,7 @@ import org.apache.ignite.internal.processors.cache.GridCacheMvccFuture;
import org.apache.ignite.internal.processors.cache.GridCacheSharedContext;
import org.apache.ignite.internal.processors.cache.distributed.GridDistributedTxMapping;
import org.apache.ignite.internal.processors.cache.distributed.dht.GridDhtTxMapping;
-import org.apache.ignite.internal.processors.cache.distributed.dht.GridDhtTxNearPrepareResponse;
+import org.apache.ignite.internal.processors.cache.distributed.dht.GridDhtTxPrepareResponse;
import org.apache.ignite.internal.processors.cache.distributed.dht.colocated.GridDhtDetachedCacheEntry;
import org.apache.ignite.internal.processors.cache.transactions.IgniteInternalTx;
import org.apache.ignite.internal.processors.cache.transactions.IgniteTxEntry;
@@ -39,7 +39,6 @@ import org.apache.ignite.internal.processors.cache.version.GridCacheVersion;
import org.apache.ignite.internal.util.future.GridCompoundFuture;
import org.apache.ignite.internal.util.tostring.GridToStringExclude;
import org.apache.ignite.internal.util.tostring.GridToStringInclude;
-import org.apache.ignite.internal.util.typedef.F;
import org.apache.ignite.internal.util.typedef.internal.CU;
import org.apache.ignite.internal.util.typedef.internal.U;
import org.apache.ignite.lang.IgniteReducer;
@@ -159,7 +158,7 @@ public abstract class GridNearTxPrepareFutureAdapter extends
* @param nodeId Sender.
* @param res Response.
*/
- public abstract void onDhtResponse(UUID nodeId, GridDhtTxNearPrepareResponse res);
+ public abstract void onDhtResponse(UUID nodeId, GridDhtTxPrepareResponse res);
/**
* Checks if mapped transaction can be committed on one phase.
@@ -189,8 +188,8 @@ public abstract class GridNearTxPrepareFutureAdapter extends
* @param m Mapping.
* @param res Response.
*/
- final void onDhtPrepareResponse(GridDistributedTxMapping m, GridDhtTxNearPrepareResponse res) {
-
+ final void processDhtPrepareResponse(GridDistributedTxMapping m, GridDhtTxPrepareResponse res) {
+ // TODO IGNITE-4768.
}
/**
http://git-wip-us.apache.org/repos/asf/ignite/blob/5596e69f/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearTxPrepareResponse.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearTxPrepareResponse.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearTxPrepareResponse.java
index 08b071d..d9b648c 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearTxPrepareResponse.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearTxPrepareResponse.java
@@ -102,6 +102,7 @@ public class GridNearTxPrepareResponse extends GridDistributedTxPrepareResponse
}
/**
+ * @param part Partition.
* @param xid Xid version.
* @param futId Future ID.
* @param miniId Mini future ID.
@@ -113,6 +114,7 @@ public class GridNearTxPrepareResponse extends GridDistributedTxPrepareResponse
* @param addDepInfo Deployment info flag.
*/
public GridNearTxPrepareResponse(
+ int part,
GridCacheVersion xid,
IgniteUuid futId,
int miniId,
@@ -123,7 +125,7 @@ public class GridNearTxPrepareResponse extends GridDistributedTxPrepareResponse
AffinityTopologyVersion clientRemapVer,
boolean addDepInfo
) {
- super(xid, err, addDepInfo);
+ super(part, xid, err, addDepInfo);
assert futId != null;
assert dhtVer != null;
http://git-wip-us.apache.org/repos/asf/ignite/blob/5596e69f/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/transactions/IgniteTxHandler.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/transactions/IgniteTxHandler.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/transactions/IgniteTxHandler.java
index 07777e2..33c8a18 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/transactions/IgniteTxHandler.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/transactions/IgniteTxHandler.java
@@ -32,6 +32,7 @@ import org.apache.ignite.internal.processors.cache.GridCacheEntryEx;
import org.apache.ignite.internal.processors.cache.GridCacheEntryInfo;
import org.apache.ignite.internal.processors.cache.GridCacheEntryRemovedException;
import org.apache.ignite.internal.processors.cache.GridCacheMessage;
+import org.apache.ignite.internal.processors.cache.GridCacheMvccFuture;
import org.apache.ignite.internal.processors.cache.GridCacheReturnCompletableWrapper;
import org.apache.ignite.internal.processors.cache.GridCacheSharedContext;
import org.apache.ignite.internal.processors.cache.KeyCacheObject;
@@ -45,7 +46,6 @@ import org.apache.ignite.internal.processors.cache.distributed.dht.GridDhtTxFini
import org.apache.ignite.internal.processors.cache.distributed.dht.GridDhtTxFinishRequest;
import org.apache.ignite.internal.processors.cache.distributed.dht.GridDhtTxFinishResponse;
import org.apache.ignite.internal.processors.cache.distributed.dht.GridDhtTxLocal;
-import org.apache.ignite.internal.processors.cache.distributed.dht.GridDhtTxNearPrepareResponse;
import org.apache.ignite.internal.processors.cache.distributed.dht.GridDhtTxOnePhaseCommitAckRequest;
import org.apache.ignite.internal.processors.cache.distributed.dht.GridDhtTxPrepareFuture;
import org.apache.ignite.internal.processors.cache.distributed.dht.GridDhtTxPrepareRequest;
@@ -152,12 +152,6 @@ public class IgniteTxHandler {
}
});
- ctx.io().addHandler(0, GridDhtTxNearPrepareResponse.class, new CI2<UUID, GridCacheMessage>() {
- @Override public void apply(UUID nodeId, GridCacheMessage msg) {
- processDhtTxNearPrepareResponse(nodeId, (GridDhtTxNearPrepareResponse)msg);
- }
- });
-
ctx.io().addHandler(0, GridNearTxFinishRequest.class, new CI2<UUID, GridCacheMessage>() {
@Override public void apply(UUID nodeId, GridCacheMessage msg) {
processNearTxFinishRequest(nodeId, (GridNearTxFinishRequest)msg);
@@ -278,6 +272,7 @@ public class IgniteTxHandler {
U.error(log, "Failed to prepare DHT transaction: " + locTx, e);
return new GridNearTxPrepareResponse(
+ req.partition(),
req.version(),
req.futureId(),
req.miniId(),
@@ -389,6 +384,7 @@ public class IgniteTxHandler {
}
GridNearTxPrepareResponse res = new GridNearTxPrepareResponse(
+ req.partition(),
req.version(),
req.futureId(),
req.miniId(),
@@ -565,34 +561,6 @@ public class IgniteTxHandler {
* @param nodeId Node ID.
* @param res Response.
*/
- private void processDhtTxNearPrepareResponse(UUID nodeId, GridDhtTxNearPrepareResponse res) {
- if (txPrepareMsgLog.isDebugEnabled())
- txPrepareMsgLog.debug("Received dht near prepare response [txId=" + res.nearTxId() + ", node=" + nodeId + ']');
-
- GridNearTxPrepareFutureAdapter fut = (GridNearTxPrepareFutureAdapter)ctx.mvcc()
- .<IgniteInternalTx>mvccFuture(res.nearTxId(), res.futureId());
-
- if (fut == null) {
- U.warn(log, "Failed to find future for dht near prepare response [txId=" + res.nearTxId() +
- ", node=" + nodeId +
- ", res=" + res + ']');
-
- return;
- }
-
- IgniteInternalTx tx = fut.tx();
-
- assert tx != null;
-
- res.txState(tx.txState());
-
- fut.onDhtResponse(nodeId, res);
- }
-
- /**
- * @param nodeId Node ID.
- * @param res Response.
- */
private void processNearTxPrepareResponse(UUID nodeId, GridNearTxPrepareResponse res) {
if (txPrepareMsgLog.isDebugEnabled())
txPrepareMsgLog.debug("Received near prepare response [txId=" + res.version() + ", node=" + nodeId + ']');
@@ -647,7 +615,7 @@ public class IgniteTxHandler {
* @param res Response.
*/
private void processDhtTxPrepareResponse(UUID nodeId, GridDhtTxPrepareResponse res) {
- GridDhtTxPrepareFuture fut = (GridDhtTxPrepareFuture)ctx.mvcc().mvccFuture(res.version(), res.futureId());
+ GridCacheMvccFuture<?> fut = ctx.mvcc().mvccFuture(res.version(), res.futureId());
if (fut == null) {
if (txPrepareMsgLog.isDebugEnabled()) {
@@ -668,7 +636,10 @@ public class IgniteTxHandler {
res.txState(tx.txState());
- fut.onResult(nodeId, res);
+ if (res.nearNodeResponse())
+ ((GridNearTxPrepareFutureAdapter)fut).onDhtResponse(nodeId, res);
+ else
+ ((GridDhtTxPrepareFuture)fut).onResult(nodeId, res);
}
/**
@@ -990,18 +961,21 @@ public class IgniteTxHandler {
GridNearTxRemote nearTx = null;
GridDhtTxPrepareResponse res = null;
- GridDhtTxNearPrepareResponse nearRes = null;
+ GridDhtTxPrepareResponse nearRes = null;
try {
if (req.dhtReplyNear()) {
- nearRes = new GridDhtTxNearPrepareResponse(
+ nearRes = new GridDhtTxPrepareResponse(
req.partition(),
req.nearXidVersion(),
req.nearFutureId(),
- req.nearMiniId());
+ null, //req.nearMiniId(),
+ req.deployInfo() != null);
}
else {
- res = new GridDhtTxPrepareResponse(req.version(),
+ res = new GridDhtTxPrepareResponse(
+ req.partition(),
+ req.version(),
req.futureId(),
req.miniId(),
req.deployInfo() != null);
@@ -1061,7 +1035,11 @@ public class IgniteTxHandler {
if (nearTx != null)
nearTx.rollback();
- res = new GridDhtTxPrepareResponse(req.version(), req.futureId(), req.miniId(), e,
+ res = new GridDhtTxPrepareResponse(req.partition(),
+ req.version(),
+ req.futureId(),
+ req.miniId(),
+ e,
req.deployInfo() != null);
}
http://git-wip-us.apache.org/repos/asf/ignite/blob/5596e69f/modules/yardstick/config/ignite-base-config.xml
----------------------------------------------------------------------
diff --git a/modules/yardstick/config/ignite-base-config.xml b/modules/yardstick/config/ignite-base-config.xml
index 615cb42..5ee42a7 100644
--- a/modules/yardstick/config/ignite-base-config.xml
+++ b/modules/yardstick/config/ignite-base-config.xml
@@ -32,41 +32,6 @@
<property name="cacheConfiguration">
<list>
<bean class="org.apache.ignite.configuration.CacheConfiguration">
- <property name="name" value="atomic"/>
-
- <property name="cacheMode" value="PARTITIONED"/>
-
- <property name="atomicityMode" value="ATOMIC"/>
-
- <property name="swapEnabled" value="false"/>
- </bean>
-
- <bean class="org.apache.ignite.configuration.CacheConfiguration">
- <property name="name" value="atomic-offheap"/>
-
- <property name="cacheMode" value="PARTITIONED"/>
-
- <property name="atomicityMode" value="ATOMIC"/>
-
- <property name="swapEnabled" value="false"/>
-
- <property name="memoryMode" value="OFFHEAP_TIERED"/>
- </bean>
-
- <bean class="org.apache.ignite.configuration.CacheConfiguration">
- <property name="name" value="atomic-offheap-values"/>
-
- <property name="cacheMode" value="PARTITIONED"/>
-
- <property name="atomicityMode" value="ATOMIC"/>
-
- <property name="swapEnabled" value="false"/>
-
- <property name="memoryMode" value="OFFHEAP_VALUES"/>
-
- </bean>
-
- <bean class="org.apache.ignite.configuration.CacheConfiguration">
<property name="name" value="tx"/>
<property name="cacheMode" value="PARTITIONED"/>
@@ -75,141 +40,9 @@
<property name="swapEnabled" value="false"/>
- </bean>
-
- <bean class="org.apache.ignite.configuration.CacheConfiguration">
- <property name="name" value="tx-offheap"/>
-
- <property name="cacheMode" value="PARTITIONED"/>
-
- <property name="atomicityMode" value="TRANSACTIONAL"/>
-
- <property name="swapEnabled" value="false"/>
-
- <property name="memoryMode" value="OFFHEAP_TIERED"/>
-
- </bean>
+ <property name="writeSynchronizationMode" value="FULL_SYNC"/>
- <bean class="org.apache.ignite.configuration.CacheConfiguration">
- <property name="name" value="tx-offheap-values"/>
-
- <property name="cacheMode" value="PARTITIONED"/>
-
- <property name="atomicityMode" value="TRANSACTIONAL"/>
-
- <property name="swapEnabled" value="false"/>
-
- <property name="memoryMode" value="OFFHEAP_VALUES"/>
-
- </bean>
-
- <bean class="org.apache.ignite.configuration.CacheConfiguration">
- <property name="name" value="atomic-index"/>
-
- <property name="cacheMode" value="PARTITIONED"/>
-
- <property name="atomicityMode" value="ATOMIC"/>
-
- <property name="swapEnabled" value="false"/>
-
- <property name="indexedTypes">
- <list>
- <value>java.lang.Integer</value>
- <value>org.apache.ignite.yardstick.cache.model.Person1</value>
-
- <value>java.lang.Integer</value>
- <value>org.apache.ignite.yardstick.cache.model.Person2</value>
-
- <value>java.lang.Integer</value>
- <value>org.apache.ignite.yardstick.cache.model.Person8</value>
- </list>
- </property>
- </bean>
-
- <bean class="org.apache.ignite.configuration.CacheConfiguration">
- <property name="name" value="atomic-index-with-eviction"/>
-
- <property name="evictionPolicy">
- <bean class="org.apache.ignite.cache.eviction.fifo.FifoEvictionPolicy">
- <!-- default range (1000000) x (1 + default backups number (1)) / default nodes number (4) -->
- <constructor-arg value="500000"/>
- </bean>
- </property>
-
- <property name="cacheMode" value="PARTITIONED"/>
-
- <property name="atomicityMode" value="ATOMIC"/>
-
- <property name="swapEnabled" value="false"/>
-
- <property name="indexedTypes">
- <list>
- <value>java.lang.Integer</value>
- <value>org.apache.ignite.yardstick.cache.model.Person1</value>
-
- <value>java.lang.Integer</value>
- <value>org.apache.ignite.yardstick.cache.model.Person2</value>
-
- <value>java.lang.Integer</value>
- <value>org.apache.ignite.yardstick.cache.model.Person8</value>
- </list>
- </property>
- </bean>
-
- <bean class="org.apache.ignite.configuration.CacheConfiguration">
- <property name="name" value="query"/>
-
- <property name="cacheMode" value="PARTITIONED"/>
-
- <property name="atomicityMode" value="ATOMIC"/>
-
- <property name="indexedTypes">
- <list>
- <value>java.lang.Integer</value>
- <value>org.apache.ignite.yardstick.cache.model.Organization</value>
-
- <value>java.lang.Integer</value>
- <value>org.apache.ignite.yardstick.cache.model.Person</value>
-
- <value>java.lang.Integer</value>
- <value>org.apache.ignite.yardstick.cache.model.SampleValue</value>
-
- <value>java.lang.Integer</value>
- <value>java.lang.Integer</value>
- </list>
- </property>
- </bean>
-
- <bean class="org.apache.ignite.configuration.CacheConfiguration">
- <property name="name" value="query-offheap"/>
-
- <property name="cacheMode" value="PARTITIONED"/>
-
- <property name="atomicityMode" value="ATOMIC"/>
-
- <property name="swapEnabled" value="false"/>
-
- <property name="memoryMode" value="OFFHEAP_TIERED"/>
-
- <property name="indexedTypes">
- <list>
- <value>java.lang.Integer</value>
- <value>org.apache.ignite.yardstick.cache.model.Organization</value>
-
- <value>java.lang.Integer</value>
- <value>org.apache.ignite.yardstick.cache.model.Person</value>
- </list>
- </property>
- </bean>
-
- <bean class="org.apache.ignite.configuration.CacheConfiguration">
- <property name="name" value="compute"/>
-
- <property name="cacheMode" value="PARTITIONED"/>
-
- <property name="atomicityMode" value="TRANSACTIONAL"/>
-
- <property name="swapEnabled" value="false"/>
+ <property name="backups" value="2"/>
</bean>
</list>
</property>
http://git-wip-us.apache.org/repos/asf/ignite/blob/5596e69f/modules/yardstick/src/main/java/org/apache/ignite/yardstick/cache/IgnitePutTxBenchmark.java
----------------------------------------------------------------------
diff --git a/modules/yardstick/src/main/java/org/apache/ignite/yardstick/cache/IgnitePutTxBenchmark.java b/modules/yardstick/src/main/java/org/apache/ignite/yardstick/cache/IgnitePutTxBenchmark.java
index 15b7cd6..3ad5a9d 100644
--- a/modules/yardstick/src/main/java/org/apache/ignite/yardstick/cache/IgnitePutTxBenchmark.java
+++ b/modules/yardstick/src/main/java/org/apache/ignite/yardstick/cache/IgnitePutTxBenchmark.java
@@ -22,9 +22,12 @@ import java.util.concurrent.Callable;
import org.apache.ignite.IgniteCache;
import org.apache.ignite.IgniteSystemProperties;
import org.apache.ignite.IgniteTransactions;
+import org.apache.ignite.transactions.TransactionConcurrency;
+import org.apache.ignite.transactions.TransactionIsolation;
import org.apache.ignite.yardstick.IgniteBenchmarkUtils;
import org.apache.ignite.yardstick.cache.model.SampleValue;
import org.yardstickframework.BenchmarkConfiguration;
+import org.yardstickframework.BenchmarkUtils;
/**
* Ignite benchmark that performs transactional put operations.
@@ -58,7 +61,7 @@ public class IgnitePutTxBenchmark extends IgniteCacheAbstractBenchmark<Integer,
/** {@inheritDoc} */
@Override public boolean test(Map<Object, Object> ctx) throws Exception {
- IgniteBenchmarkUtils.doInTransaction(txs, args.txConcurrency(), args.txIsolation(), clo);
+ IgniteBenchmarkUtils.doInTransaction(txs, TransactionConcurrency.PESSIMISTIC, TransactionIsolation.REPEATABLE_READ, clo);
return true;
}
[28/38] ignite git commit: Merge remote-tracking branch
'remotes/origin/ignite-4768' into ignite-4768-1
Posted by sb...@apache.org.
Merge remote-tracking branch 'remotes/origin/ignite-4768' into ignite-4768-1
# Conflicts:
# modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtTxFinishResponse.java
# modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearTxFinishResponse.java
# modules/core/src/main/java/org/apache/ignite/internal/processors/cache/transactions/IgniteTxHandler.java
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/7c3120a9
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/7c3120a9
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/7c3120a9
Branch: refs/heads/ignite-4768
Commit: 7c3120a9482acefd9195f981559c297c1442cc88
Parents: c4e0ce3 0246b74
Author: sboikov <sb...@gridgain.com>
Authored: Mon Mar 13 12:05:48 2017 +0300
Committer: sboikov <sb...@gridgain.com>
Committed: Mon Mar 13 12:05:48 2017 +0300
----------------------------------------------------------------------
.../dht/GridDhtTxFinishResponse.java | 62 +++++++++-----------
.../near/GridNearTxFinishResponse.java | 5 +-
2 files changed, 31 insertions(+), 36 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ignite/blob/7c3120a9/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtTxFinishResponse.java
----------------------------------------------------------------------
diff --cc modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtTxFinishResponse.java
index 5646cb2,bc9503f..db4e801
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtTxFinishResponse.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtTxFinishResponse.java
@@@ -39,9 -39,9 +39,12 @@@ public class GridDhtTxFinishResponse ex
/** */
private static final long serialVersionUID = 0L;
+ /** Flag indicating if this is a check-committed response. */
+ private static final int CHECK_COMMITTED_FLAG_MASK = 0x01;
+
+ /** */
- private static final int NEAR_RES_FLAG_MASK = 0x01;
++ private static final int NEAR_RES_FLAG_MASK = 0x02;
+
/** Mini future ID. */
private int miniId;
[15/38] ignite git commit: ignite-4768
Posted by sb...@apache.org.
ignite-4768
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/eeb10b85
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/eeb10b85
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/eeb10b85
Branch: refs/heads/ignite-4768
Commit: eeb10b85ba41b14d0beb590a32bff06225c7de57
Parents: d3d4a36
Author: sboikov <sb...@gridgain.com>
Authored: Fri Mar 10 11:00:04 2017 +0300
Committer: sboikov <sb...@gridgain.com>
Committed: Fri Mar 10 11:04:42 2017 +0300
----------------------------------------------------------------------
.../processors/cache/GridCacheIoManager.java | 3 +++
.../processors/cache/GridCacheMessage.java | 11 +++++++++++
.../processors/cache/KeyCacheObjectImpl.java | 9 +++++++++
.../GridDistributedTxPrepareRequest.java | 16 ++++++++++++++++
...dNearOptimisticSerializableTxPrepareFuture.java | 7 ++++---
.../distributed/near/GridNearTxPrepareRequest.java | 17 ++++++++++++++++-
6 files changed, 59 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ignite/blob/eeb10b85/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheIoManager.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheIoManager.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheIoManager.java
index 50f58cc..7cac367 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheIoManager.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheIoManager.java
@@ -367,6 +367,9 @@ public class GridCacheIoManager extends GridCacheSharedManagerAdapter {
unmarshall(nodeId, cacheMsg);
+// if (!cacheMsg.partitionExchangeMessage())
+// log.info("Message [from=" + nodeId + ", msg=" + cacheMsg + ']');
+
if (cacheMsg.classError() != null)
processFailedMessage(nodeId, cacheMsg, c);
else
http://git-wip-us.apache.org/repos/asf/ignite/blob/eeb10b85/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheMessage.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheMessage.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheMessage.java
index 0646d5a..023d12c 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheMessage.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheMessage.java
@@ -701,6 +701,17 @@ public abstract class GridCacheMessage implements Message {
return reader.afterMessageRead(GridCacheMessage.class);
}
+ /**
+ * @param str Bulder.
+ * @param name Flag name.
+ */
+ protected final void appendFlag(StringBuilder str, String name) {
+ if (str.length() > 0)
+ str.append('|');
+
+ str.append(name);
+ }
+
/** {@inheritDoc} */
@Override public String toString() {
return S.toString(GridCacheMessage.class, this, "cacheId", cacheId);
http://git-wip-us.apache.org/repos/asf/ignite/blob/eeb10b85/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/KeyCacheObjectImpl.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/KeyCacheObjectImpl.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/KeyCacheObjectImpl.java
index 4f8570c..48797b8 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/KeyCacheObjectImpl.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/KeyCacheObjectImpl.java
@@ -19,6 +19,7 @@ package org.apache.ignite.internal.processors.cache;
import java.nio.ByteBuffer;
import org.apache.ignite.IgniteCheckedException;
+import org.apache.ignite.internal.util.typedef.internal.S;
import org.apache.ignite.plugin.extensions.communication.MessageReader;
import org.apache.ignite.plugin.extensions.communication.MessageWriter;
import org.jetbrains.annotations.Nullable;
@@ -200,4 +201,12 @@ public class KeyCacheObjectImpl extends CacheObjectAdapter implements KeyCacheOb
return val.equals(other.val);
}
+
+ /** {@inheritDoc} */
+ @Override public String toString() {
+ return S.toString(S.INCLUDE_SENSITIVE ? getClass().getSimpleName() : "KeyCacheObject",
+ "part", part, true,
+ "val", val, true,
+ "hasValBytes", valBytes != null, false);
+ }
}
http://git-wip-us.apache.org/repos/asf/ignite/blob/eeb10b85/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/GridDistributedTxPrepareRequest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/GridDistributedTxPrepareRequest.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/GridDistributedTxPrepareRequest.java
index 329dc8b..b5848a7 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/GridDistributedTxPrepareRequest.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/GridDistributedTxPrepareRequest.java
@@ -40,6 +40,7 @@ import org.apache.ignite.internal.processors.cache.transactions.IgniteTxStateAwa
import org.apache.ignite.internal.processors.cache.version.GridCacheVersion;
import org.apache.ignite.internal.util.UUIDCollectionMessage;
import org.apache.ignite.internal.util.tostring.GridToStringBuilder;
+import org.apache.ignite.internal.util.tostring.GridToStringExclude;
import org.apache.ignite.internal.util.tostring.GridToStringInclude;
import org.apache.ignite.internal.util.typedef.C1;
import org.apache.ignite.internal.util.typedef.F;
@@ -150,6 +151,7 @@ public class GridDistributedTxPrepareRequest extends GridDistributedBaseMessage
private IgniteTxState txState;
/** */
+ @GridToStringExclude
private byte flags;
/**
@@ -682,7 +684,21 @@ public class GridDistributedTxPrepareRequest extends GridDistributedBaseMessage
/** {@inheritDoc} */
@Override public String toString() {
+ StringBuilder flags = new StringBuilder();
+
+ if (needReturnValue())
+ flags.append("retVal");
+ if (isInvalidate())
+ flags.append("invalidate");
+ if (onePhaseCommit())
+ flags.append("onePhase");
+ if (last())
+ flags.append("last");
+ if (system())
+ flags.append("sys");
+
return GridToStringBuilder.toString(GridDistributedTxPrepareRequest.class, this,
+ "flags", flags.toString(),
"super", super.toString());
}
}
http://git-wip-us.apache.org/repos/asf/ignite/blob/eeb10b85/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearOptimisticSerializableTxPrepareFuture.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearOptimisticSerializableTxPrepareFuture.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearOptimisticSerializableTxPrepareFuture.java
index f8e0584..80508dc 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearOptimisticSerializableTxPrepareFuture.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearOptimisticSerializableTxPrepareFuture.java
@@ -75,6 +75,9 @@ public class GridNearOptimisticSerializableTxPrepareFuture extends GridNearOptim
@GridToStringExclude
private ClientRemapFuture remapFut;
+ /** */
+ private int miniId;
+
/**
* @param cctx Context.
* @param tx Transaction.
@@ -222,7 +225,7 @@ public class GridNearOptimisticSerializableTxPrepareFuture extends GridNearOptim
* @return Mini future.
*/
@SuppressWarnings("ForLoopReplaceableByForEach")
- private MiniFuture miniFuture(long miniId) {
+ private MiniFuture miniFuture(int miniId) {
// We iterate directly over the futs collection here to avoid copy.
synchronized (sync) {
int size = futuresCountNoLock();
@@ -362,8 +365,6 @@ public class GridNearOptimisticSerializableTxPrepareFuture extends GridNearOptim
checkOnePhase(txMapping);
- int miniId = 0;
-
for (GridDistributedTxMapping m : mappings.values()) {
assert !m.empty();
http://git-wip-us.apache.org/repos/asf/ignite/blob/eeb10b85/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearTxPrepareRequest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearTxPrepareRequest.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearTxPrepareRequest.java
index cccc7b4..ffeeb51 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearTxPrepareRequest.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearTxPrepareRequest.java
@@ -28,6 +28,7 @@ import org.apache.ignite.internal.processors.cache.GridCacheContext;
import org.apache.ignite.internal.processors.cache.distributed.GridDistributedTxPrepareRequest;
import org.apache.ignite.internal.processors.cache.transactions.IgniteInternalTx;
import org.apache.ignite.internal.processors.cache.transactions.IgniteTxEntry;
+import org.apache.ignite.internal.util.tostring.GridToStringExclude;
import org.apache.ignite.internal.util.typedef.F;
import org.apache.ignite.internal.util.typedef.internal.S;
import org.apache.ignite.lang.IgniteUuid;
@@ -70,6 +71,7 @@ public class GridNearTxPrepareRequest extends GridDistributedTxPrepareRequest {
private int taskNameHash;
/** */
+ @GridToStringExclude
private byte flags;
/**
@@ -402,6 +404,19 @@ public class GridNearTxPrepareRequest extends GridDistributedTxPrepareRequest {
/** {@inheritDoc} */
@Override public String toString() {
- return S.toString(GridNearTxPrepareRequest.class, this, super.toString());
+ StringBuilder flags = new StringBuilder();
+
+ if (near())
+ flags.append("near");
+ if (firstClientRequest())
+ flags.append("clientReq");
+ if (implicitSingle())
+ flags.append("single");
+ if (explicitLock())
+ flags.append("explicitLock");
+
+ return S.toString(GridNearTxPrepareRequest.class, this,
+ "flags", flags.toString(),
+ "super", super.toString());
}
}
[08/38] ignite git commit: ignite-4768
Posted by sb...@apache.org.
ignite-4768
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/7dcd6cdd
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/7dcd6cdd
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/7dcd6cdd
Branch: refs/heads/ignite-4768
Commit: 7dcd6cdd30e3b1aac165ce7f476c12367aed09f2
Parents: 43429ff
Author: sboikov <sb...@gridgain.com>
Authored: Thu Mar 9 10:55:59 2017 +0300
Committer: sboikov <sb...@gridgain.com>
Committed: Thu Mar 9 10:55:59 2017 +0300
----------------------------------------------------------------------
.../GridDistributedTxPrepareRequest.java | 12 ++++----
.../cache/distributed/dht/GridDhtTxLocal.java | 14 ++++-----
.../distributed/dht/GridDhtTxPrepareFuture.java | 10 ++++---
.../dht/GridDhtTxPrepareRequest.java | 12 +++++++-
.../colocated/GridDhtColocatedLockFuture.java | 18 ++++++++----
.../distributed/near/GridNearLockFuture.java | 20 +++++++------
.../distributed/near/GridNearLockRequest.java | 10 +++----
.../distributed/near/GridNearLockResponse.java | 12 ++++----
...arOptimisticSerializableTxPrepareFuture.java | 19 +++++++------
.../near/GridNearOptimisticTxPrepareFuture.java | 20 +++++++++----
.../GridNearPessimisticTxPrepareFuture.java | 30 +++++++++++---------
.../cache/distributed/near/GridNearTxLocal.java | 2 +-
.../near/GridNearTxPrepareRequest.java | 15 +++++-----
.../near/GridNearTxPrepareResponse.java | 13 ++++-----
14 files changed, 122 insertions(+), 85 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ignite/blob/7dcd6cdd/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/GridDistributedTxPrepareRequest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/GridDistributedTxPrepareRequest.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/GridDistributedTxPrepareRequest.java
index 1934a84..e30c456 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/GridDistributedTxPrepareRequest.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/GridDistributedTxPrepareRequest.java
@@ -75,7 +75,7 @@ public class GridDistributedTxPrepareRequest extends GridDistributedBaseMessage
private static final int SYSTEM_TX_FLAG_MASK = 0x10;
/** */
- private static final int KNOWN_MAPPING_FLAG_MASK = 0x20;
+ private static final int MAPPING_KNOWN_FLAG_MASK = 0x20;
/** Collection to message converter. */
private static final C1<Collection<UUID>, UUIDCollectionMessage> COL_TO_MSG = new C1<Collection<UUID>, UUIDCollectionMessage>() {
@@ -177,6 +177,7 @@ public class GridDistributedTxPrepareRequest extends GridDistributedBaseMessage
@Nullable Collection<IgniteTxEntry> reads,
Collection<IgniteTxEntry> writes,
Map<UUID, Collection<UUID>> txNodes,
+ boolean mappingKnown,
boolean retVal,
boolean last,
boolean onePhaseCommit,
@@ -197,14 +198,15 @@ public class GridDistributedTxPrepareRequest extends GridDistributedBaseMessage
this.txNodes = txNodes;
setFlag(tx.system(), SYSTEM_TX_FLAG_MASK);
-
setFlag(retVal, NEED_RETURN_VALUE_FLAG_MASK);
-
setFlag(tx.isInvalidate(), INVALIDATE_FLAG_MASK);
-
setFlag(onePhaseCommit, ONE_PHASE_COMMIT_FLAG_MASK);
-
setFlag(last, LAST_REQ_FLAG_MASK);
+ setFlag(mappingKnown, MAPPING_KNOWN_FLAG_MASK);
+ }
+
+ public final boolean mappingKnown() {
+ return isFlag(MAPPING_KNOWN_FLAG_MASK);
}
/**
http://git-wip-us.apache.org/repos/asf/ignite/blob/7dcd6cdd/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtTxLocal.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtTxLocal.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtTxLocal.java
index 7199ede..79c371c 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtTxLocal.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtTxLocal.java
@@ -72,7 +72,7 @@ public class GridDhtTxLocal extends GridDhtTxLocalAdapter implements GridCacheMa
private IgniteUuid nearFutId;
/** Near future ID. */
- private IgniteUuid nearMiniId;
+ private int nearMiniId;
/** Near future ID. */
private IgniteUuid nearFinFutId;
@@ -121,7 +121,7 @@ public class GridDhtTxLocal extends GridDhtTxLocalAdapter implements GridCacheMa
UUID nearNodeId,
GridCacheVersion nearXidVer,
IgniteUuid nearFutId,
- IgniteUuid nearMiniId,
+ int nearMiniId,
long nearThreadId,
boolean implicit,
boolean implicitSingle,
@@ -159,7 +159,7 @@ public class GridDhtTxLocal extends GridDhtTxLocalAdapter implements GridCacheMa
assert nearNodeId != null;
assert nearFutId != null;
- assert nearMiniId != null;
+ assert nearMiniId != 0;
assert nearXidVer != null;
this.nearNodeId = nearNodeId;
@@ -394,7 +394,7 @@ public class GridDhtTxLocal extends GridDhtTxLocalAdapter implements GridCacheMa
@Nullable Collection<IgniteTxEntry> writes,
Map<IgniteTxKey, GridCacheVersion> verMap,
long msgId,
- IgniteUuid nearMiniId,
+ int nearMiniId,
Map<UUID, Collection<UUID>> txNodes,
boolean last
) {
@@ -417,7 +417,7 @@ public class GridDhtTxLocal extends GridDhtTxLocalAdapter implements GridCacheMa
needReturnValue()))) {
GridDhtTxPrepareFuture f = prepFut;
- assert f.nearMiniId().equals(nearMiniId) : "Wrong near mini id on existing future " +
+ assert f.nearMiniId() == nearMiniId : "Wrong near mini id on existing future " +
"[futMiniId=" + f.nearMiniId() + ", miniId=" + nearMiniId + ", fut=" + f + ']';
if (timeout == -1)
@@ -427,7 +427,7 @@ public class GridDhtTxLocal extends GridDhtTxLocalAdapter implements GridCacheMa
}
}
else {
- assert fut.nearMiniId().equals(nearMiniId) : "Wrong near mini id on existing future " +
+ assert fut.nearMiniId() == nearMiniId : "Wrong near mini id on existing future " +
"[futMiniId=" + fut.nearMiniId() + ", miniId=" + nearMiniId + ", fut=" + fut + ']';
// Prepare was called explicitly.
@@ -626,7 +626,7 @@ public class GridDhtTxLocal extends GridDhtTxLocalAdapter implements GridCacheMa
"Invalid state [nearFinFutId=" + nearFinFutId + ", isInvalidate=" + isInvalidate() + ", commit=" + commit +
", sysInvalidate=" + isSystemInvalidate() + ", state=" + state() + ']';
- assert nearMiniId != null;
+ assert nearMiniId != 0;
return super.finish(commit);
}
http://git-wip-us.apache.org/repos/asf/ignite/blob/7dcd6cdd/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtTxPrepareFuture.java
----------------------------------------------------------------------
diff --git 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
index 84b8e7a..dd882f9 100644
--- 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
@@ -177,7 +177,7 @@ public final class GridDhtTxPrepareFuture extends GridCompoundFuture<IgniteInter
private boolean trackable = true;
/** Near mini future id. */
- private IgniteUuid nearMiniId;
+ private int nearMiniId;
/** DHT versions map. */
private Map<IgniteTxKey, GridCacheVersion> dhtVerMap;
@@ -223,7 +223,7 @@ public final class GridDhtTxPrepareFuture extends GridCompoundFuture<IgniteInter
GridCacheSharedContext cctx,
final GridDhtTxLocalAdapter tx,
long timeout,
- IgniteUuid nearMiniId,
+ int nearMiniId,
Map<IgniteTxKey, GridCacheVersion> dhtVerMap,
boolean last,
boolean retVal
@@ -263,7 +263,7 @@ public final class GridDhtTxPrepareFuture extends GridCompoundFuture<IgniteInter
/**
* @return Near mini future id.
*/
- public IgniteUuid nearMiniId() {
+ int nearMiniId() {
return nearMiniId;
}
@@ -858,7 +858,7 @@ public final class GridDhtTxPrepareFuture extends GridCompoundFuture<IgniteInter
GridNearTxPrepareResponse res = new GridNearTxPrepareResponse(
tx.nearXidVersion(),
tx.colocated() ? tx.xid() : tx.nearFutureId(),
- nearMiniId == null ? tx.xid() : nearMiniId,
+ nearMiniId,
tx.xidVersion(),
tx.writeVersion(),
ret,
@@ -1273,6 +1273,7 @@ public final class GridDhtTxPrepareFuture extends GridCompoundFuture<IgniteInter
nearWrites,
txNodes,
tx.nearXidVersion(),
+ false,
true,
tx.onePhaseCommit(),
tx.subjectId(),
@@ -1385,6 +1386,7 @@ public final class GridDhtTxPrepareFuture extends GridCompoundFuture<IgniteInter
nearMapping.writes(),
tx.transactionNodes(),
tx.nearXidVersion(),
+ false,
true,
tx.onePhaseCommit(),
tx.subjectId(),
http://git-wip-us.apache.org/repos/asf/ignite/blob/7dcd6cdd/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtTxPrepareRequest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtTxPrepareRequest.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtTxPrepareRequest.java
index 4c8a22d..e55d189 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtTxPrepareRequest.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtTxPrepareRequest.java
@@ -128,13 +128,23 @@ public class GridDhtTxPrepareRequest extends GridDistributedTxPrepareRequest {
Collection<IgniteTxEntry> nearWrites,
Map<UUID, Collection<UUID>> txNodes,
GridCacheVersion nearXidVer,
+ boolean mappingKnown,
boolean last,
boolean onePhaseCommit,
UUID subjId,
int taskNameHash,
boolean addDepInfo,
boolean retVal) {
- super(tx, timeout, null, dhtWrites, txNodes, retVal, last, onePhaseCommit, addDepInfo);
+ super(tx,
+ timeout,
+ null,
+ dhtWrites,
+ txNodes,
+ mappingKnown,
+ retVal,
+ last,
+ onePhaseCommit,
+ addDepInfo);
assert futId != null;
assert miniId != null;
http://git-wip-us.apache.org/repos/asf/ignite/blob/7dcd6cdd/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/colocated/GridDhtColocatedLockFuture.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/colocated/GridDhtColocatedLockFuture.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/colocated/GridDhtColocatedLockFuture.java
index 79ca108..0ce380d 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/colocated/GridDhtColocatedLockFuture.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/colocated/GridDhtColocatedLockFuture.java
@@ -160,6 +160,9 @@ public final class GridDhtColocatedLockFuture extends GridCompoundIdentityFuture
/** Keep binary. */
private final boolean keepBinary;
+ /** */
+ private int miniId;
+
/**
* @param cctx Registry.
* @param keys Keys to lock.
@@ -485,7 +488,7 @@ public final class GridDhtColocatedLockFuture extends GridCompoundIdentityFuture
* @return Mini future.
*/
@SuppressWarnings({"ForLoopReplaceableByForEach", "IfMayBeConditional"})
- private MiniFuture miniFuture(IgniteUuid miniId) {
+ private MiniFuture miniFuture(int miniId) {
// We iterate directly over the futs collection here to avoid copy.
synchronized (sync) {
int size = futuresCountNoLock();
@@ -499,7 +502,7 @@ public final class GridDhtColocatedLockFuture extends GridCompoundIdentityFuture
MiniFuture mini = (MiniFuture)fut;
- if (mini.futureId().equals(miniId)) {
+ if (mini.futureId() == miniId) {
if (!mini.isDone())
return mini;
else
@@ -1049,7 +1052,7 @@ public final class GridDhtColocatedLockFuture extends GridCompoundIdentityFuture
if (node.isLocal())
lockLocally(mappedKeys, req.topologyVersion());
else {
- final MiniFuture fut = new MiniFuture(node, mappedKeys);
+ final MiniFuture fut = new MiniFuture(node, mappedKeys, ++miniId);
req.miniId(fut.futureId());
@@ -1393,7 +1396,7 @@ public final class GridDhtColocatedLockFuture extends GridCompoundIdentityFuture
private static final long serialVersionUID = 0L;
/** */
- private final IgniteUuid futId = IgniteUuid.randomUuid();
+ private final int futId;
/** Node ID. */
@GridToStringExclude
@@ -1409,19 +1412,22 @@ public final class GridDhtColocatedLockFuture extends GridCompoundIdentityFuture
/**
* @param node Node.
* @param keys Keys.
+ * @param futId Mini future ID.
*/
MiniFuture(
ClusterNode node,
- Collection<KeyCacheObject> keys
+ Collection<KeyCacheObject> keys,
+ int futId
) {
this.node = node;
this.keys = keys;
+ this.futId = futId;
}
/**
* @return Future ID.
*/
- IgniteUuid futureId() {
+ int futureId() {
return futId;
}
http://git-wip-us.apache.org/repos/asf/ignite/blob/7dcd6cdd/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearLockFuture.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearLockFuture.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearLockFuture.java
index d3e3a15..7b19884 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearLockFuture.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearLockFuture.java
@@ -164,6 +164,9 @@ public final class GridNearLockFuture extends GridCompoundIdentityFuture<Boolean
/** Keep binary context flag. */
private final boolean keepBinary;
+ /** */
+ private int miniId;
+
/**
* @param cctx Registry.
* @param keys Keys to lock.
@@ -532,7 +535,7 @@ public final class GridNearLockFuture extends GridCompoundIdentityFuture<Boolean
* @return Mini future.
*/
@SuppressWarnings({"ForLoopReplaceableByForEach", "IfMayBeConditional"})
- private MiniFuture miniFuture(IgniteUuid miniId) {
+ private MiniFuture miniFuture(int miniId) {
// We iterate directly over the futs collection here to avoid copy.
synchronized (sync) {
int size = futuresCountNoLock();
@@ -546,7 +549,7 @@ public final class GridNearLockFuture extends GridCompoundIdentityFuture<Boolean
MiniFuture mini = (MiniFuture)fut;
- if (mini.futureId().equals(miniId)) {
+ if (mini.futureId() == miniId) {
if (!mini.isDone())
return mini;
else
@@ -1178,8 +1181,6 @@ public final class GridNearLockFuture extends GridCompoundIdentityFuture<Boolean
req.filter(filter, cctx);
if (node.isLocal()) {
- req.miniId(IgniteUuid.randomUuid());
-
if (log.isDebugEnabled())
log.debug("Before locally locking near request: " + req);
@@ -1316,7 +1317,7 @@ public final class GridNearLockFuture extends GridCompoundIdentityFuture<Boolean
fut));
}
else {
- final MiniFuture fut = new MiniFuture(node, mappedKeys);
+ final MiniFuture fut = new MiniFuture(node, mappedKeys, ++miniId);
req.miniId(fut.futureId());
@@ -1489,7 +1490,7 @@ public final class GridNearLockFuture extends GridCompoundIdentityFuture<Boolean
private static final long serialVersionUID = 0L;
/** */
- private final IgniteUuid futId = IgniteUuid.randomUuid();
+ private final int futId;
/** Node ID. */
@GridToStringExclude
@@ -1505,19 +1506,22 @@ public final class GridNearLockFuture extends GridCompoundIdentityFuture<Boolean
/**
* @param node Node.
* @param keys Keys.
+ * @param futId Mini future ID.
*/
MiniFuture(
ClusterNode node,
- Collection<KeyCacheObject> keys
+ Collection<KeyCacheObject> keys,
+ int futId
) {
this.node = node;
this.keys = keys;
+ this.futId = futId;
}
/**
* @return Future ID.
*/
- IgniteUuid futureId() {
+ int futureId() {
return futId;
}
http://git-wip-us.apache.org/repos/asf/ignite/blob/7dcd6cdd/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearLockRequest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearLockRequest.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearLockRequest.java
index 3091b45..229961e 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearLockRequest.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearLockRequest.java
@@ -50,7 +50,7 @@ public class GridNearLockRequest extends GridDistributedLockRequest {
private AffinityTopologyVersion topVer;
/** Mini future ID. */
- private IgniteUuid miniId;
+ private int miniId;
/** Filter. */
private CacheEntryPredicate[] filter;
@@ -256,14 +256,14 @@ public class GridNearLockRequest extends GridDistributedLockRequest {
/**
* @return Mini future ID.
*/
- public IgniteUuid miniId() {
+ public int miniId() {
return miniId;
}
/**
* @param miniId Mini future Id.
*/
- public void miniId(IgniteUuid miniId) {
+ public void miniId(int miniId) {
this.miniId = miniId;
}
@@ -423,7 +423,7 @@ public class GridNearLockRequest extends GridDistributedLockRequest {
writer.incrementState();
case 28:
- if (!writer.writeIgniteUuid("miniId", miniId))
+ if (!writer.writeInt("miniId", miniId))
return false;
writer.incrementState();
@@ -545,7 +545,7 @@ public class GridNearLockRequest extends GridDistributedLockRequest {
reader.incrementState();
case 28:
- miniId = reader.readIgniteUuid("miniId");
+ miniId = reader.readInt("miniId");
if (!reader.isLastRead())
return false;
http://git-wip-us.apache.org/repos/asf/ignite/blob/7dcd6cdd/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearLockResponse.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearLockResponse.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearLockResponse.java
index e48a098..b10591d 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearLockResponse.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearLockResponse.java
@@ -47,7 +47,7 @@ public class GridNearLockResponse extends GridDistributedLockResponse {
private Collection<GridCacheVersion> pending;
/** */
- private IgniteUuid miniId;
+ private int miniId;
/** DHT versions. */
@GridToStringInclude
@@ -85,7 +85,7 @@ public class GridNearLockResponse extends GridDistributedLockResponse {
int cacheId,
GridCacheVersion lockVer,
IgniteUuid futId,
- IgniteUuid miniId,
+ int miniId,
boolean filterRes,
int cnt,
Throwable err,
@@ -94,7 +94,7 @@ public class GridNearLockResponse extends GridDistributedLockResponse {
) {
super(cacheId, lockVer, futId, cnt, err, addDepInfo);
- assert miniId != null;
+ assert miniId != 0;
this.miniId = miniId;
this.clientRemapVer = clientRemapVer;
@@ -134,7 +134,7 @@ public class GridNearLockResponse extends GridDistributedLockResponse {
/**
* @return Mini future ID.
*/
- public IgniteUuid miniId() {
+ public int miniId() {
return miniId;
}
@@ -233,7 +233,7 @@ public class GridNearLockResponse extends GridDistributedLockResponse {
writer.incrementState();
case 14:
- if (!writer.writeIgniteUuid("miniId", miniId))
+ if (!writer.writeInt("miniId", miniId))
return false;
writer.incrementState();
@@ -293,7 +293,7 @@ public class GridNearLockResponse extends GridDistributedLockResponse {
reader.incrementState();
case 14:
- miniId = reader.readIgniteUuid("miniId");
+ miniId = reader.readInt("miniId");
if (!reader.isLastRead())
return false;
http://git-wip-us.apache.org/repos/asf/ignite/blob/7dcd6cdd/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearOptimisticSerializableTxPrepareFuture.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearOptimisticSerializableTxPrepareFuture.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearOptimisticSerializableTxPrepareFuture.java
index e450d4b..7b130d2 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearOptimisticSerializableTxPrepareFuture.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearOptimisticSerializableTxPrepareFuture.java
@@ -56,9 +56,7 @@ import org.apache.ignite.internal.util.typedef.X;
import org.apache.ignite.internal.util.typedef.internal.S;
import org.apache.ignite.internal.util.typedef.internal.U;
import org.apache.ignite.lang.IgniteBiTuple;
-import org.apache.ignite.lang.IgniteProductVersion;
import org.apache.ignite.lang.IgniteReducer;
-import org.apache.ignite.lang.IgniteUuid;
import org.jetbrains.annotations.Nullable;
import static org.apache.ignite.internal.processors.cache.GridCacheOperation.TRANSFORM;
@@ -224,7 +222,7 @@ public class GridNearOptimisticSerializableTxPrepareFuture extends GridNearOptim
* @return Mini future.
*/
@SuppressWarnings("ForLoopReplaceableByForEach")
- private MiniFuture miniFuture(IgniteUuid miniId) {
+ private MiniFuture miniFuture(long miniId) {
// We iterate directly over the futs collection here to avoid copy.
synchronized (sync) {
int size = futuresCountNoLock();
@@ -238,7 +236,7 @@ public class GridNearOptimisticSerializableTxPrepareFuture extends GridNearOptim
MiniFuture mini = (MiniFuture)fut;
- if (mini.futureId().equals(miniId)) {
+ if (mini.futureId() == miniId) {
if (!mini.isDone())
return mini;
else
@@ -364,10 +362,12 @@ public class GridNearOptimisticSerializableTxPrepareFuture extends GridNearOptim
checkOnePhase();
+ int miniId = 0;
+
for (GridDistributedTxMapping m : mappings.values()) {
assert !m.empty();
- add(new MiniFuture(this, m));
+ add(new MiniFuture(this, m, ++miniId));
}
Collection<IgniteInternalFuture<?>> futs = (Collection)futures();
@@ -442,6 +442,7 @@ public class GridNearOptimisticSerializableTxPrepareFuture extends GridNearOptim
m.writes(),
m.near(),
txMapping.transactionNodes(),
+ false,
m.last(),
tx.onePhaseCommit(),
tx.needReturnValue() && tx.implicit(),
@@ -687,7 +688,7 @@ public class GridNearOptimisticSerializableTxPrepareFuture extends GridNearOptim
AtomicIntegerFieldUpdater.newUpdater(MiniFuture.class, "rcvRes");
/** */
- private final IgniteUuid futId = IgniteUuid.randomUuid();
+ private final int futId;
/** Parent future. */
private final GridNearOptimisticSerializableTxPrepareFuture parent;
@@ -703,16 +704,18 @@ public class GridNearOptimisticSerializableTxPrepareFuture extends GridNearOptim
/**
* @param parent Parent future.
* @param m Mapping.
+ * @param futId Mini future ID.
*/
- MiniFuture(GridNearOptimisticSerializableTxPrepareFuture parent, GridDistributedTxMapping m) {
+ MiniFuture(GridNearOptimisticSerializableTxPrepareFuture parent, GridDistributedTxMapping m, int futId) {
this.parent = parent;
this.m = m;
+ this.futId = futId;
}
/**
* @return Future ID.
*/
- IgniteUuid futureId() {
+ int futureId() {
return futId;
}
http://git-wip-us.apache.org/repos/asf/ignite/blob/7dcd6cdd/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearOptimisticTxPrepareFuture.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearOptimisticTxPrepareFuture.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearOptimisticTxPrepareFuture.java
index a2cb182..3428bd1 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearOptimisticTxPrepareFuture.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearOptimisticTxPrepareFuture.java
@@ -75,6 +75,9 @@ public class GridNearOptimisticTxPrepareFuture extends GridNearOptimisticTxPrepa
@GridToStringExclude
private KeyLockFuture keyLockFut;
+ /** */
+ private int miniId;
+
/**
* @param cctx Context.
* @param tx Transaction.
@@ -232,7 +235,7 @@ public class GridNearOptimisticTxPrepareFuture extends GridNearOptimisticTxPrepa
* @return Mini future.
*/
@SuppressWarnings("ForLoopReplaceableByForEach")
- private MiniFuture miniFuture(IgniteUuid miniId) {
+ private MiniFuture miniFuture(int miniId) {
// We iterate directly over the futs collection here to avoid copy.
synchronized (sync) {
int size = futuresCountNoLock();
@@ -246,7 +249,7 @@ public class GridNearOptimisticTxPrepareFuture extends GridNearOptimisticTxPrepa
MiniFuture mini = (MiniFuture)fut;
- if (mini.futureId().equals(miniId)) {
+ if (mini.futureId() == miniId) {
if (!mini.isDone())
return mini;
else
@@ -494,6 +497,7 @@ public class GridNearOptimisticTxPrepareFuture extends GridNearOptimisticTxPrepa
m.writes(),
m.near(),
txMapping.transactionNodes(),
+ false,
m.last(),
tx.onePhaseCommit(),
tx.needReturnValue() && tx.implicit(),
@@ -521,7 +525,7 @@ public class GridNearOptimisticTxPrepareFuture extends GridNearOptimisticTxPrepa
}
}
- final MiniFuture fut = new MiniFuture(this, m, mappings);
+ final MiniFuture fut = new MiniFuture(this, m, ++miniId, mappings);
req.miniId(fut.futureId());
@@ -771,7 +775,7 @@ public class GridNearOptimisticTxPrepareFuture extends GridNearOptimisticTxPrepa
private final GridNearOptimisticTxPrepareFuture parent;
/** */
- private final IgniteUuid futId = IgniteUuid.randomUuid();
+ private final int futId;
/** Keys. */
@GridToStringInclude
@@ -787,19 +791,23 @@ public class GridNearOptimisticTxPrepareFuture extends GridNearOptimisticTxPrepa
/**
* @param parent Parent.
* @param m Mapping.
+ * @param futId Mini future ID.
* @param mappings Queue of mappings to proceed with.
*/
- MiniFuture(GridNearOptimisticTxPrepareFuture parent, GridDistributedTxMapping m,
+ MiniFuture(GridNearOptimisticTxPrepareFuture parent,
+ GridDistributedTxMapping m,
+ int futId,
Queue<GridDistributedTxMapping> mappings) {
this.parent = parent;
this.m = m;
+ this.futId = futId;
this.mappings = mappings;
}
/**
* @return Future ID.
*/
- IgniteUuid futureId() {
+ int futureId() {
return futId;
}
http://git-wip-us.apache.org/repos/asf/ignite/blob/7dcd6cdd/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearPessimisticTxPrepareFuture.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearPessimisticTxPrepareFuture.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearPessimisticTxPrepareFuture.java
index 4154102..05f3931 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearPessimisticTxPrepareFuture.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearPessimisticTxPrepareFuture.java
@@ -45,7 +45,6 @@ import org.apache.ignite.internal.util.typedef.F;
import org.apache.ignite.internal.util.typedef.internal.S;
import org.apache.ignite.internal.util.typedef.internal.U;
import org.apache.ignite.lang.IgniteBiTuple;
-import org.apache.ignite.lang.IgniteUuid;
import org.jetbrains.annotations.Nullable;
import static org.apache.ignite.internal.processors.cache.GridCacheOperation.TRANSFORM;
@@ -78,7 +77,7 @@ public class GridNearPessimisticTxPrepareFuture extends GridNearTxPrepareFutureA
for (IgniteInternalFuture<?> fut : futures()) {
MiniFuture f = (MiniFuture)fut;
- if (f.node().id().equals(nodeId)) {
+ if (f.primary().id().equals(nodeId)) {
ClusterTopologyCheckedException e = new ClusterTopologyCheckedException("Remote node left grid: " +
nodeId);
@@ -101,7 +100,7 @@ public class GridNearPessimisticTxPrepareFuture extends GridNearTxPrepareFutureA
MiniFuture f = miniFuture(res.miniId());
if (f != null) {
- assert f.node().id().equals(nodeId);
+ assert f.primary().id().equals(nodeId);
f.onResult(res);
}
@@ -131,16 +130,16 @@ public class GridNearPessimisticTxPrepareFuture extends GridNearTxPrepareFutureA
* @return Mini future.
*/
@SuppressWarnings("ForLoopReplaceableByForEach")
- private MiniFuture miniFuture(IgniteUuid miniId) {
+ private MiniFuture miniFuture(int miniId) {
// We iterate directly over the futs collection here to avoid copy.
synchronized (sync) {
int size = futuresCountNoLock();
// Avoid iterator creation.
for (int i = 0; i < size; i++) {
- MiniFuture mini = (MiniFuture) future(i);
+ MiniFuture mini = (MiniFuture)future(i);
- if (mini.futureId().equals(miniId)) {
+ if (mini.futureId() == miniId) {
if (!mini.isDone())
return mini;
else
@@ -246,6 +245,8 @@ public class GridNearPessimisticTxPrepareFuture extends GridNearTxPrepareFutureA
return;
}
+ int miniId = 0;
+
for (final GridDistributedTxMapping m : mappings.values()) {
final ClusterNode node = m.node();
@@ -258,6 +259,7 @@ public class GridNearPessimisticTxPrepareFuture extends GridNearTxPrepareFutureA
m.writes(),
m.near(),
txMapping.transactionNodes(),
+ mappingKnown,
true,
tx.onePhaseCommit(),
tx.needReturnValue() && tx.implicit(),
@@ -273,7 +275,7 @@ public class GridNearPessimisticTxPrepareFuture extends GridNearTxPrepareFutureA
req.addDhtVersion(txEntry.txKey(), null);
}
- final MiniFuture fut = new MiniFuture(m);
+ final MiniFuture fut = new MiniFuture(m, ++miniId);
req.miniId(fut.futureId());
@@ -353,8 +355,8 @@ public class GridNearPessimisticTxPrepareFuture extends GridNearTxPrepareFutureA
@Override public String toString() {
Collection<String> futs = F.viewReadOnly(futures(), new C1<IgniteInternalFuture<?>, String>() {
@Override public String apply(IgniteInternalFuture<?> f) {
- return "[node=" + ((MiniFuture)f).node().id() +
- ", loc=" + ((MiniFuture)f).node().isLocal() +
+ return "[node=" + ((MiniFuture)f).primary().id() +
+ ", loc=" + ((MiniFuture)f).primary().isLocal() +
", done=" + f.isDone() + "]";
}
});
@@ -372,29 +374,31 @@ public class GridNearPessimisticTxPrepareFuture extends GridNearTxPrepareFutureA
private static final long serialVersionUID = 0L;
/** */
- private final IgniteUuid futId = IgniteUuid.randomUuid();
+ private final int futId;
/** */
private GridDistributedTxMapping m;
/**
* @param m Mapping.
+ * @param futId Mini future ID.
*/
- MiniFuture(GridDistributedTxMapping m) {
+ MiniFuture(GridDistributedTxMapping m, int futId) {
this.m = m;
+ this.futId = futId;
}
/**
* @return Future ID.
*/
- IgniteUuid futureId() {
+ int futureId() {
return futId;
}
/**
* @return Node ID.
*/
- public ClusterNode node() {
+ public ClusterNode primary() {
return m.node();
}
http://git-wip-us.apache.org/repos/asf/ignite/blob/7dcd6cdd/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearTxLocal.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearTxLocal.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearTxLocal.java
index 197792b..0dede22 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearTxLocal.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearTxLocal.java
@@ -1000,7 +1000,7 @@ public class GridNearTxLocal extends GridDhtTxLocalAdapter {
cctx,
this,
timeout,
- IgniteUuid.randomUuid(),
+ 0,
Collections.<IgniteTxKey, GridCacheVersion>emptyMap(),
last,
needReturnValue() && implicit());
http://git-wip-us.apache.org/repos/asf/ignite/blob/7dcd6cdd/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearTxPrepareRequest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearTxPrepareRequest.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearTxPrepareRequest.java
index 86f7060..3eff9e5 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearTxPrepareRequest.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearTxPrepareRequest.java
@@ -23,17 +23,14 @@ import java.util.ArrayList;
import java.util.Collection;
import java.util.Map;
import java.util.UUID;
-import org.apache.ignite.internal.GridDirectCollection;
import org.apache.ignite.internal.processors.affinity.AffinityTopologyVersion;
import org.apache.ignite.internal.processors.cache.GridCacheContext;
import org.apache.ignite.internal.processors.cache.distributed.GridDistributedTxPrepareRequest;
import org.apache.ignite.internal.processors.cache.transactions.IgniteInternalTx;
import org.apache.ignite.internal.processors.cache.transactions.IgniteTxEntry;
-import org.apache.ignite.internal.util.tostring.GridToStringInclude;
import org.apache.ignite.internal.util.typedef.F;
import org.apache.ignite.internal.util.typedef.internal.S;
import org.apache.ignite.lang.IgniteUuid;
-import org.apache.ignite.plugin.extensions.communication.MessageCollectionItemType;
import org.apache.ignite.plugin.extensions.communication.MessageReader;
import org.apache.ignite.plugin.extensions.communication.MessageWriter;
import org.jetbrains.annotations.Nullable;
@@ -61,7 +58,7 @@ public class GridNearTxPrepareRequest extends GridDistributedTxPrepareRequest {
private IgniteUuid futId;
/** Mini future ID. */
- private IgniteUuid miniId;
+ private int miniId;
/** Topology version. */
private AffinityTopologyVersion topVer;
@@ -110,6 +107,7 @@ public class GridNearTxPrepareRequest extends GridDistributedTxPrepareRequest {
Collection<IgniteTxEntry> writes,
boolean near,
Map<UUID, Collection<UUID>> txNodes,
+ boolean mappingKnown,
boolean last,
boolean onePhaseCommit,
boolean retVal,
@@ -125,6 +123,7 @@ public class GridNearTxPrepareRequest extends GridDistributedTxPrepareRequest {
reads,
writes,
txNodes,
+ mappingKnown,
retVal,
last,
onePhaseCommit,
@@ -168,14 +167,14 @@ public class GridNearTxPrepareRequest extends GridDistributedTxPrepareRequest {
/**
* @return Mini future ID.
*/
- public IgniteUuid miniId() {
+ public int miniId() {
return miniId;
}
/**
* @param miniId Mini future ID.
*/
- public void miniId(IgniteUuid miniId) {
+ public void miniId(int miniId) {
this.miniId = miniId;
}
@@ -301,7 +300,7 @@ public class GridNearTxPrepareRequest extends GridDistributedTxPrepareRequest {
writer.incrementState();
case 22:
- if (!writer.writeIgniteUuid("miniId", miniId))
+ if (!writer.writeInt("miniId", miniId))
return false;
writer.incrementState();
@@ -357,7 +356,7 @@ public class GridNearTxPrepareRequest extends GridDistributedTxPrepareRequest {
reader.incrementState();
case 22:
- miniId = reader.readIgniteUuid("miniId");
+ miniId = reader.readInt("miniId");
if (!reader.isLastRead())
return false;
http://git-wip-us.apache.org/repos/asf/ignite/blob/7dcd6cdd/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearTxPrepareResponse.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearTxPrepareResponse.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearTxPrepareResponse.java
index a374bdc..9dad722 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearTxPrepareResponse.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearTxPrepareResponse.java
@@ -61,7 +61,7 @@ public class GridNearTxPrepareResponse extends GridDistributedTxPrepareResponse
private IgniteUuid futId;
/** Mini future ID. */
- private IgniteUuid miniId;
+ private int miniId;
/** DHT version. */
private GridCacheVersion dhtVer;
@@ -115,7 +115,7 @@ public class GridNearTxPrepareResponse extends GridDistributedTxPrepareResponse
public GridNearTxPrepareResponse(
GridCacheVersion xid,
IgniteUuid futId,
- IgniteUuid miniId,
+ int miniId,
GridCacheVersion dhtVer,
GridCacheVersion writeVer,
GridCacheReturn retVal,
@@ -126,7 +126,6 @@ public class GridNearTxPrepareResponse extends GridDistributedTxPrepareResponse
super(xid, err, addDepInfo);
assert futId != null;
- assert miniId != null;
assert dhtVer != null;
this.futId = futId;
@@ -140,7 +139,7 @@ public class GridNearTxPrepareResponse extends GridDistributedTxPrepareResponse
/**
* @return {@code True} if client node should remap transaction.
*/
- @Nullable public AffinityTopologyVersion clientRemapVersion() {
+ @Nullable AffinityTopologyVersion clientRemapVersion() {
return clientRemapVer;
}
@@ -165,7 +164,7 @@ public class GridNearTxPrepareResponse extends GridDistributedTxPrepareResponse
/**
* @return Mini future ID.
*/
- public IgniteUuid miniId() {
+ public int miniId() {
return miniId;
}
@@ -368,7 +367,7 @@ public class GridNearTxPrepareResponse extends GridDistributedTxPrepareResponse
writer.incrementState();
case 12:
- if (!writer.writeIgniteUuid("miniId", miniId))
+ if (!writer.writeInt("miniId", miniId))
return false;
writer.incrementState();
@@ -452,7 +451,7 @@ public class GridNearTxPrepareResponse extends GridDistributedTxPrepareResponse
reader.incrementState();
case 12:
- miniId = reader.readIgniteUuid("miniId");
+ miniId = reader.readInt("miniId");
if (!reader.isLastRead())
return false;
[25/38] ignite git commit: Merge remote-tracking branch
'remotes/origin/ignite-4768' into ignite-4768-1
Posted by sb...@apache.org.
Merge remote-tracking branch 'remotes/origin/ignite-4768' into ignite-4768-1
# Conflicts:
# modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtTxFinishRequest.java
# modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtTxFinishResponse.java
# modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtTxLocal.java
# modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtTxPrepareResponse.java
# modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearPessimisticTxPrepareFuture.java
# modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearTxFinishFuture.java
# modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearTxFinishRequest.java
# modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearTxFinishResponse.java
# modules/core/src/main/java/org/apache/ignite/internal/processors/cache/transactions/IgniteTxHandler.java
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/2e2d39d4
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/2e2d39d4
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/2e2d39d4
Branch: refs/heads/ignite-4768
Commit: 2e2d39d4b57f572235276289592d2a275f150c0b
Parents: 26316bb bc5dbb0
Author: sboikov <sb...@gridgain.com>
Authored: Mon Mar 13 11:47:11 2017 +0300
Committer: sboikov <sb...@gridgain.com>
Committed: Mon Mar 13 11:47:11 2017 +0300
----------------------------------------------------------------------
.../configuration/CacheConfiguration.java | 28 +-
.../distributed/dht/GridDhtTxFinishFuture.java | 24 +-
.../distributed/dht/GridDhtTxFinishRequest.java | 14 +-
.../dht/GridDhtTxFinishResponse.java | 89 +-
.../cache/distributed/dht/GridDhtTxLocal.java | 11 +-
.../dht/GridDhtTxPrepareResponse.java | 3 +-
.../GridNearPessimisticTxPrepareFuture.java | 2 +-
.../near/GridNearTxFinishFuture.java | 79 +-
.../near/GridNearTxFinishRequest.java | 12 +-
.../near/GridNearTxFinishResponse.java | 29 +-
.../cache/distributed/near/GridNearTxLocal.java | 4 +-
.../cache/query/GridCacheQueryManager.java | 22 +-
.../cache/transactions/IgniteTxHandler.java | 4 +-
.../transactions/IgniteTxLocalAdapter.java | 4 +-
.../query/GridQueryIndexDescriptor.java | 4 +-
.../processors/query/GridQueryIndexType.java | 32 -
.../processors/query/GridQueryIndexing.java | 8 -
.../processors/query/GridQueryProcessor.java | 1307 ++----------------
.../query/QueryIndexDescriptorImpl.java | 102 ++
.../query/QueryTypeDescriptorImpl.java | 337 +++++
.../processors/query/QueryTypeIdKey.java | 94 ++
.../processors/query/QueryTypeNameKey.java | 68 +
.../query/property/QueryBinaryProperty.java | 267 ++++
.../query/property/QueryClassProperty.java | 130 ++
.../query/property/QueryFieldAccessor.java | 67 +
.../query/property/QueryMethodsAccessor.java | 82 ++
.../query/property/QueryPropertyAccessor.java | 53 +
.../property/QueryReadOnlyMethodsAccessor.java | 71 +
.../resources/META-INF/classnames.properties | 1 -
.../processors/query/h2/IgniteH2Indexing.java | 23 +-
.../query/h2/opt/GridH2IndexBase.java | 10 -
.../processors/query/h2/opt/GridH2Table.java | 33 -
.../query/h2/opt/GridH2TreeIndex.java | 23 -
.../query/h2/opt/GridLuceneIndex.java | 4 +-
.../query/h2/GridH2IndexRebuildTest.java | 261 ----
.../h2/GridIndexingSpiAbstractSelfTest.java | 23 +-
.../query/h2/opt/GridH2TableSelfTest.java | 54 -
.../IgniteCacheQuerySelfTestSuite.java | 2 -
38 files changed, 1545 insertions(+), 1836 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ignite/blob/2e2d39d4/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtTxLocal.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ignite/blob/2e2d39d4/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtTxPrepareResponse.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ignite/blob/2e2d39d4/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearPessimisticTxPrepareFuture.java
----------------------------------------------------------------------
diff --cc modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearPessimisticTxPrepareFuture.java
index 03ee7af,4a443a9..1d3eaec
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearPessimisticTxPrepareFuture.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearPessimisticTxPrepareFuture.java
@@@ -223,13 -200,7 +223,13 @@@ public class GridNearPessimisticTxPrepa
if (!cacheCtx.isLocal()) {
GridDhtPartitionTopology top = cacheCtx.topology();
+ if (dhtReplyNear && (!top.rebalanceFinished(topVer) || cctx.discovery().hasNearCache(cacheCtx.cacheId(), topVer)))
+ dhtReplyNear = false;
+
- nodes = cacheCtx.topology().nodes(cacheCtx.affinity().partition(txEntry.key()), topVer);
+ nodes = top.nodes(cacheCtx.affinity().partition(txEntry.key()), topVer);
+
+ if (nodes.size() == 1)
+ dhtReplyNear = false;
}
else
nodes = cacheCtx.affinity().nodesByKey(txEntry.key(), topVer);
http://git-wip-us.apache.org/repos/asf/ignite/blob/2e2d39d4/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearTxFinishFuture.java
----------------------------------------------------------------------
diff --cc modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearTxFinishFuture.java
index 1d52b6d,7387501..fc2c3aa
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearTxFinishFuture.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearTxFinishFuture.java
@@@ -233,58 -234,30 +234,58 @@@ public final class GridNearTxFinishFutu
* @param nodeId Sender.
* @param res Result.
*/
- public void onResult(UUID nodeId, GridDhtTxFinishResponse res) {
+ public void onDhtResponse(UUID nodeId, GridDhtTxFinishResponse res) {
+ assert res.checkCommitted() ^ res.nearNodeResponse() : res;
+
if (!isDone()) {
- boolean found = false;
+ MinFuture foundFut = null;
+
+ synchronized (sync) {
+ int size = futuresCountNoLock();
- for (IgniteInternalFuture<IgniteInternalTx> fut : futures()) {
- if (fut.getClass() == CheckBackupMiniFuture.class) {
- CheckBackupMiniFuture f = (CheckBackupMiniFuture)fut;
+ for (int i = 0; i < size; i++) {
+ IgniteInternalFuture<IgniteInternalTx> fut = future(i);
- if (f.futureId() == res.miniId()) {
- found = true;
+ if (res.nearNodeResponse()) {
+ assert tx.dhtReplyNear() && tx.syncMode() == FULL_SYNC;
- assert f.node().id().equals(nodeId);
+ if (fut.getClass() == FinishMiniFuture.class) {
+ FinishMiniFuture f = (FinishMiniFuture)fut;
- if (res.returnValue() != null)
- tx.implicitSingleResult(res.returnValue());
+ if (f.futureId().equals(res.miniId())) {
+ foundFut = (MinFuture)fut;
- f.onDhtFinishResponse(res);
+ break;
+ }
+ }
}
- }
- else if (fut.getClass() == CheckRemoteTxMiniFuture.class) {
- CheckRemoteTxMiniFuture f = (CheckRemoteTxMiniFuture)fut;
+ else {
+ assert res.checkCommitted();
+
+ if (fut.getClass() == CheckBackupMiniFuture.class) {
+ CheckBackupMiniFuture f = (CheckBackupMiniFuture)fut;
+
- if (f.futureId().equals(res.miniId())) {
++ if (f.futureId() == res.miniId()) {
+ assert f.node().id().equals(nodeId);
- if (f.futureId() == res.miniId())
- f.onDhtFinishResponse(nodeId, false);
+ foundFut = f;
+
+ if (res.returnValue() != null)
+ tx.implicitSingleResult(res.returnValue());
+
+ break;
+ }
+ }
+ else if (fut.getClass() == CheckRemoteTxMiniFuture.class) {
+ CheckRemoteTxMiniFuture f = (CheckRemoteTxMiniFuture)fut;
+
- if (f.futureId().equals(res.miniId())) {
++ if (f.futureId() == res.miniId()) {
+ foundFut = f;
+
+ break;
+ }
+ }
+ }
}
}
@@@ -720,11 -707,9 +737,11 @@@
tx.activeCachesDeploymentEnabled()
);
+ boolean dhtReplyNear = tx.dhtReplyNear() && syncMode == FULL_SYNC;
+
// If this is the primary node for the keys.
if (n.isLocal()) {
- req.miniId(IgniteUuid.randomUuid());
+ req.miniId(miniId);
IgniteInternalFuture<IgniteInternalTx> fut = cctx.tm().txHandler().finish(n.id(), tx, req);
@@@ -733,7 -718,7 +750,7 @@@
add(fut);
}
else {
- FinishMiniFuture fut = new FinishMiniFuture(m, dhtReplyNear);
- FinishMiniFuture fut = new FinishMiniFuture(miniId, m);
++ FinishMiniFuture fut = new FinishMiniFuture(miniId, m, dhtReplyNear);
req.miniId(fut.futureId());
@@@ -898,22 -885,14 +922,25 @@@
@GridToStringInclude
private GridDistributedTxMapping m;
+ /** */
+ private final Set<UUID> dhtNodes;
+
/**
+ * @param futId Future ID.
* @param m Mapping.
*/
- FinishMiniFuture(GridDistributedTxMapping m, boolean dhtReplyNear) {
- FinishMiniFuture(int futId, GridDistributedTxMapping m) {
++ FinishMiniFuture(int futId, GridDistributedTxMapping m, boolean dhtReplyNear) {
+ super(futId);
+
this.m = m;
+
+ if (dhtReplyNear) {
+ dhtNodes = new HashSet<>(tx.transactionNodes().get(m.primary().id()));
+
+ assert !dhtNodes.isEmpty();
+ }
+ else
+ dhtNodes = null;
}
/**
http://git-wip-us.apache.org/repos/asf/ignite/blob/2e2d39d4/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/transactions/IgniteTxHandler.java
----------------------------------------------------------------------
[10/38] ignite git commit: ignite-4768
Posted by sb...@apache.org.
ignite-4768
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/e9d8820c
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/e9d8820c
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/e9d8820c
Branch: refs/heads/ignite-4768
Commit: e9d8820caf63f697593cba7f166c3d5b79ca12ce
Parents: 1d1c58c
Author: sboikov <sb...@gridgain.com>
Authored: Thu Mar 9 11:19:16 2017 +0300
Committer: sboikov <sb...@gridgain.com>
Committed: Thu Mar 9 11:19:16 2017 +0300
----------------------------------------------------------------------
.../distributed/GridDistributedTxMapping.java | 18 ++++++------
.../distributed/dht/GridDhtTxFinishFuture.java | 14 ++++-----
.../distributed/dht/GridDhtTxPrepareFuture.java | 20 ++++++-------
...arOptimisticSerializableTxPrepareFuture.java | 30 +++++++++++---------
.../near/GridNearOptimisticTxPrepareFuture.java | 14 ++++-----
.../GridNearPessimisticTxPrepareFuture.java | 19 +++++++------
.../near/GridNearTxFinishFuture.java | 20 ++++++-------
.../cache/distributed/near/GridNearTxLocal.java | 8 +++---
.../near/GridNearTxPrepareFutureAdapter.java | 4 +--
.../distributed/near/IgniteTxMappingsImpl.java | 4 +--
.../near/IgniteTxMappingsSingleImpl.java | 6 ++--
11 files changed, 81 insertions(+), 76 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ignite/blob/e9d8820c/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/GridDistributedTxMapping.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/GridDistributedTxMapping.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/GridDistributedTxMapping.java
index 8c9f181..2f04f58 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/GridDistributedTxMapping.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/GridDistributedTxMapping.java
@@ -45,7 +45,7 @@ public class GridDistributedTxMapping implements Externalizable {
/** Mapped node. */
@GridToStringExclude
- private ClusterNode node;
+ private ClusterNode primary;
/** Entries. */
@GridToStringInclude
@@ -74,10 +74,10 @@ public class GridDistributedTxMapping implements Externalizable {
}
/**
- * @param node Mapped node.
+ * @param primary Primary node.
*/
- public GridDistributedTxMapping(ClusterNode node) {
- this.node = node;
+ public GridDistributedTxMapping(ClusterNode primary) {
+ this.primary = primary;
entries = new LinkedHashSet<>();
}
@@ -127,8 +127,8 @@ public class GridDistributedTxMapping implements Externalizable {
/**
* @return Node.
*/
- public ClusterNode node() {
- return node;
+ public ClusterNode primary() {
+ return primary;
}
/**
@@ -236,20 +236,20 @@ public class GridDistributedTxMapping implements Externalizable {
/** {@inheritDoc} */
@Override public void writeExternal(ObjectOutput out) throws IOException {
- out.writeObject(node);
+ out.writeObject(primary);
U.writeCollection(out, entries);
}
/** {@inheritDoc} */
@Override public void readExternal(ObjectInput in) throws IOException, ClassNotFoundException {
- node = (ClusterNode)in.readObject();
+ primary = (ClusterNode)in.readObject();
entries = U.readCollection(in);
}
/** {@inheritDoc} */
@Override public String toString() {
- return S.toString(GridDistributedTxMapping.class, this, "node", node.id());
+ return S.toString(GridDistributedTxMapping.class, this, "node", primary.id());
}
}
http://git-wip-us.apache.org/repos/asf/ignite/blob/e9d8820c/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtTxFinishFuture.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtTxFinishFuture.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtTxFinishFuture.java
index 60e07b3..5d4e610 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtTxFinishFuture.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtTxFinishFuture.java
@@ -393,7 +393,7 @@ public final class GridDhtTxFinishFuture<K, V> extends GridCompoundIdentityFutur
// Create mini futures.
for (GridDistributedTxMapping dhtMapping : dhtMap.values()) {
- ClusterNode n = dhtMapping.node();
+ ClusterNode n = dhtMapping.primary();
assert !n.isLocal();
@@ -474,7 +474,7 @@ public final class GridDhtTxFinishFuture<K, V> extends GridCompoundIdentityFutur
}
for (GridDistributedTxMapping nearMapping : nearMap.values()) {
- if (!dhtMap.containsKey(nearMapping.node().id())) {
+ if (!dhtMap.containsKey(nearMapping.primary().id())) {
if (nearMapping.empty())
// Nothing to send.
continue;
@@ -513,12 +513,12 @@ public final class GridDhtTxFinishFuture<K, V> extends GridCompoundIdentityFutur
req.writeVersion(tx.writeVersion());
try {
- cctx.io().send(nearMapping.node(), req, tx.ioPolicy());
+ cctx.io().send(nearMapping.primary(), req, tx.ioPolicy());
if (msgLog.isDebugEnabled()) {
msgLog.debug("DHT finish fut, sent request near [txId=" + tx.nearXidVersion() +
", dhtTxId=" + tx.xidVersion() +
- ", node=" + nearMapping.node().id() + ']');
+ ", node=" + nearMapping.primary().id() + ']');
}
if (sync)
@@ -534,7 +534,7 @@ public final class GridDhtTxFinishFuture<K, V> extends GridCompoundIdentityFutur
if (msgLog.isDebugEnabled()) {
msgLog.debug("DHT finish fut, failed to send request near [txId=" + tx.nearXidVersion() +
", dhtTxId=" + tx.xidVersion() +
- ", node=" + nearMapping.node().id() +
+ ", node=" + nearMapping.primary().id() +
", err=" + e + ']');
}
@@ -599,7 +599,7 @@ public final class GridDhtTxFinishFuture<K, V> extends GridCompoundIdentityFutur
* @param nearMapping nearMapping.
*/
MiniFuture(GridDistributedTxMapping dhtMapping, GridDistributedTxMapping nearMapping) {
- assert dhtMapping == null || nearMapping == null || dhtMapping.node().equals(nearMapping.node());
+ assert dhtMapping == null || nearMapping == null || dhtMapping.primary().equals(nearMapping.primary());
this.dhtMapping = dhtMapping;
this.nearMapping = nearMapping;
@@ -616,7 +616,7 @@ public final class GridDhtTxFinishFuture<K, V> extends GridCompoundIdentityFutur
* @return Node ID.
*/
public ClusterNode node() {
- return node != null ? node : dhtMapping != null ? dhtMapping.node() : nearMapping.node();
+ return node != null ? node : dhtMapping != null ? dhtMapping.primary() : nearMapping.primary();
}
/**
http://git-wip-us.apache.org/repos/asf/ignite/blob/e9d8820c/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtTxPrepareFuture.java
----------------------------------------------------------------------
diff --git 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
index dd882f9..053c3b2 100644
--- 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
@@ -1241,7 +1241,7 @@ public final class GridDhtTxPrepareFuture extends GridCompoundFuture<IgniteInter
for (GridDistributedTxMapping dhtMapping : tx.dhtMap().values()) {
assert !dhtMapping.empty();
- ClusterNode n = dhtMapping.node();
+ ClusterNode n = dhtMapping.primary();
assert !n.isLocal();
@@ -1368,11 +1368,11 @@ public final class GridDhtTxPrepareFuture extends GridCompoundFuture<IgniteInter
}
for (GridDistributedTxMapping nearMapping : tx.nearMap().values()) {
- if (!tx.dhtMap().containsKey(nearMapping.node().id())) {
+ if (!tx.dhtMap().containsKey(nearMapping.primary().id())) {
if (tx.remainingTime() == -1)
return;
- MiniFuture fut = new MiniFuture(nearMapping.node().id(), null, nearMapping);
+ MiniFuture fut = new MiniFuture(nearMapping.primary().id(), null, nearMapping);
add(fut); // Append new future.
@@ -1419,12 +1419,12 @@ public final class GridDhtTxPrepareFuture extends GridCompoundFuture<IgniteInter
assert req.transactionNodes() != null;
try {
- cctx.io().send(nearMapping.node(), req, tx.ioPolicy());
+ cctx.io().send(nearMapping.primary(), req, tx.ioPolicy());
if (msgLog.isDebugEnabled()) {
msgLog.debug("DHT prepare fut, sent request near [txId=" + tx.nearXidVersion() +
", dhtTxId=" + tx.xidVersion() +
- ", node=" + nearMapping.node().id() + ']');
+ ", node=" + nearMapping.primary().id() + ']');
}
}
catch (ClusterTopologyCheckedException ignored) {
@@ -1435,7 +1435,7 @@ public final class GridDhtTxPrepareFuture extends GridCompoundFuture<IgniteInter
if (msgLog.isDebugEnabled()) {
msgLog.debug("DHT prepare fut, failed to send request near [txId=" + tx.nearXidVersion() +
", dhtTxId=" + tx.xidVersion() +
- ", node=" + nearMapping.node().id() + ']');
+ ", node=" + nearMapping.primary().id() + ']');
}
fut.onResult(e);
@@ -1444,7 +1444,7 @@ public final class GridDhtTxPrepareFuture extends GridCompoundFuture<IgniteInter
if (msgLog.isDebugEnabled()) {
msgLog.debug("DHT prepare fut, failed to send request near, ignore [txId=" + tx.nearXidVersion() +
", dhtTxId=" + tx.xidVersion() +
- ", node=" + nearMapping.node().id() +
+ ", node=" + nearMapping.primary().id() +
", err=" + e + ']');
}
}
@@ -1627,7 +1627,7 @@ public final class GridDhtTxPrepareFuture extends GridCompoundFuture<IgniteInter
GridDistributedTxMapping dhtMapping,
GridDistributedTxMapping nearMapping
) {
- assert dhtMapping == null || nearMapping == null || dhtMapping.node().equals(nearMapping.node());
+ assert dhtMapping == null || nearMapping == null || dhtMapping.primary().equals(nearMapping.primary());
this.nodeId = nodeId;
this.dhtMapping = dhtMapping;
@@ -1645,7 +1645,7 @@ public final class GridDhtTxPrepareFuture extends GridCompoundFuture<IgniteInter
* @return Node ID.
*/
public ClusterNode node() {
- return dhtMapping != null ? dhtMapping.node() : nearMapping.node();
+ return dhtMapping != null ? dhtMapping.primary() : nearMapping.primary();
}
/**
@@ -1691,7 +1691,7 @@ public final class GridDhtTxPrepareFuture extends GridCompoundFuture<IgniteInter
try {
GridDhtCacheEntry cached = (GridDhtCacheEntry)entry.cached();
- cached.removeReader(nearMapping.node().id(), res.messageId());
+ cached.removeReader(nearMapping.primary().id(), res.messageId());
break;
}
http://git-wip-us.apache.org/repos/asf/ignite/blob/e9d8820c/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearOptimisticSerializableTxPrepareFuture.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearOptimisticSerializableTxPrepareFuture.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearOptimisticSerializableTxPrepareFuture.java
index 7b130d2..3176fa7 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearOptimisticSerializableTxPrepareFuture.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearOptimisticSerializableTxPrepareFuture.java
@@ -148,7 +148,7 @@ public class GridNearOptimisticSerializableTxPrepareFuture extends GridNearOptim
if (isMini(fut)) {
MiniFuture f = (MiniFuture) fut;
- if (f.node().id().equals(nodeId)) {
+ if (f.primary().id().equals(nodeId)) {
ClusterTopologyCheckedException e = new ClusterTopologyCheckedException("Remote node left grid: " +
nodeId);
@@ -181,7 +181,7 @@ public class GridNearOptimisticSerializableTxPrepareFuture extends GridNearOptim
if (e instanceof IgniteTxOptimisticCheckedException || e instanceof IgniteTxTimeoutCheckedException) {
if (m != null)
- tx.removeMapping(m.node().id());
+ tx.removeMapping(m.primary().id());
}
ERR_UPD.compareAndSet(this, null, e);
@@ -393,7 +393,7 @@ public class GridNearOptimisticSerializableTxPrepareFuture extends GridNearOptim
fut = (MiniFuture)fut0;
- tx.removeMapping(fut.mapping().node().id());
+ tx.removeMapping(fut.mapping().primary().id());
fut.onResult(new IgniteCheckedException("Failed to prepare transaction.", err));
}
@@ -421,7 +421,7 @@ public class GridNearOptimisticSerializableTxPrepareFuture extends GridNearOptim
@Nullable private IgniteCheckedException prepare(final MiniFuture fut) {
GridDistributedTxMapping m = fut.mapping();
- final ClusterNode n = m.node();
+ final ClusterNode primary = m.primary();
long timeout = tx.remainingTime();
@@ -475,8 +475,10 @@ public class GridNearOptimisticSerializableTxPrepareFuture extends GridNearOptim
req.miniId(fut.futureId());
// If this is the primary node for the keys.
- if (n.isLocal()) {
- IgniteInternalFuture<GridNearTxPrepareResponse> prepFut = cctx.tm().txHandler().prepareTx(n.id(), tx, req);
+ if (primary.isLocal()) {
+ IgniteInternalFuture<GridNearTxPrepareResponse> prepFut = cctx.tm().txHandler().prepareTx(primary.id(),
+ tx,
+ req);
prepFut.listen(new CI1<IgniteInternalFuture<GridNearTxPrepareResponse>>() {
@Override public void apply(IgniteInternalFuture<GridNearTxPrepareResponse> prepFut) {
@@ -491,7 +493,7 @@ public class GridNearOptimisticSerializableTxPrepareFuture extends GridNearOptim
}
else {
try {
- cctx.io().send(n, req, tx.ioPolicy());
+ cctx.io().send(primary, req, tx.ioPolicy());
}
catch (ClusterTopologyCheckedException e) {
e.retryReadyFuture(cctx.nextAffinityReadyFuture(tx.topologyVersion()));
@@ -617,8 +619,8 @@ public class GridNearOptimisticSerializableTxPrepareFuture extends GridNearOptim
Collection<String> futs = F.viewReadOnly(futures(),
new C1<IgniteInternalFuture<?>, String>() {
@Override public String apply(IgniteInternalFuture<?> f) {
- return "[node=" + ((MiniFuture)f).node().id() +
- ", loc=" + ((MiniFuture)f).node().isLocal() +
+ return "[node=" + ((MiniFuture)f).primary().id() +
+ ", loc=" + ((MiniFuture)f).primary().isLocal() +
", done=" + f.isDone() + "]";
}
},
@@ -645,7 +647,7 @@ public class GridNearOptimisticSerializableTxPrepareFuture extends GridNearOptim
/**
* Constructor.
*/
- public ClientRemapFuture() {
+ ClientRemapFuture() {
super(new ClientRemapFutureReducer());
}
}
@@ -720,10 +722,10 @@ public class GridNearOptimisticSerializableTxPrepareFuture extends GridNearOptim
}
/**
- * @return Node ID.
+ * @return Primary node.
*/
- public ClusterNode node() {
- return m.node();
+ public ClusterNode primary() {
+ return m.primary();
}
/**
@@ -788,7 +790,7 @@ public class GridNearOptimisticSerializableTxPrepareFuture extends GridNearOptim
assert parent.cctx.kernalContext().clientNode();
assert m.clientFirst();
- parent.tx.removeMapping(m.node().id());
+ parent.tx.removeMapping(m.primary().id());
ClientRemapFuture remapFut0 = null;
http://git-wip-us.apache.org/repos/asf/ignite/blob/e9d8820c/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearOptimisticTxPrepareFuture.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearOptimisticTxPrepareFuture.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearOptimisticTxPrepareFuture.java
index 3428bd1..9ef6f22 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearOptimisticTxPrepareFuture.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearOptimisticTxPrepareFuture.java
@@ -355,7 +355,7 @@ public class GridNearOptimisticTxPrepareFuture extends GridNearOptimisticTxPrepa
GridDistributedTxMapping mapping = map(write, topVer, null, topLocked, remap);
- if (mapping.node().isLocal()) {
+ if (mapping.primary().isLocal()) {
if (write.context().isNear())
tx.nearLocallyMapped(true);
else if (write.context().isColocated())
@@ -417,12 +417,12 @@ public class GridNearOptimisticTxPrepareFuture extends GridNearOptimisticTxPrepa
updated.last(true);
- GridDistributedTxMapping prev = map.put(updated.node().id(), updated);
+ GridDistributedTxMapping prev = map.put(updated.primary().id(), updated);
if (prev != null)
prev.last(false);
- if (updated.node().isLocal()) {
+ if (updated.primary().isLocal()) {
if (write.context().isNear())
tx.nearLocallyMapped(true);
else if (write.context().isColocated())
@@ -483,7 +483,7 @@ public class GridNearOptimisticTxPrepareFuture extends GridNearOptimisticTxPrepa
try {
assert !m.empty();
- final ClusterNode n = m.node();
+ final ClusterNode n = m.primary();
long timeout = tx.remainingTime();
@@ -643,7 +643,7 @@ public class GridNearOptimisticTxPrepareFuture extends GridNearOptimisticTxPrepa
}
}
- if (cur == null || !cur.node().id().equals(primary.id()) || cur.near() != cacheCtx.isNear()) {
+ if (cur == null || !cur.primary().id().equals(primary.id()) || cur.near() != cacheCtx.isNear()) {
boolean clientFirst = cur == null && !topLocked && cctx.kernalContext().clientNode();
cur = new GridDistributedTxMapping(primary);
@@ -815,7 +815,7 @@ public class GridNearOptimisticTxPrepareFuture extends GridNearOptimisticTxPrepa
* @return Node ID.
*/
public ClusterNode node() {
- return m.node();
+ return m.primary();
}
/**
@@ -848,7 +848,7 @@ public class GridNearOptimisticTxPrepareFuture extends GridNearOptimisticTxPrepa
void onNodeLeft(ClusterTopologyCheckedException e, boolean discoThread) {
if (msgLog.isDebugEnabled()) {
msgLog.debug("Near optimistic prepare fut, mini future node left [txId=" + parent.tx.nearXidVersion() +
- ", node=" + m.node().id() + ']');
+ ", node=" + m.primary().id() + ']');
}
if (isDone())
http://git-wip-us.apache.org/repos/asf/ignite/blob/e9d8820c/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearPessimisticTxPrepareFuture.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearPessimisticTxPrepareFuture.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearPessimisticTxPrepareFuture.java
index 05f3931..caac48c 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearPessimisticTxPrepareFuture.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearPessimisticTxPrepareFuture.java
@@ -237,6 +237,9 @@ public class GridNearPessimisticTxPrepareFuture extends GridNearTxPrepareFutureA
checkOnePhase();
+ if (mappingKnown && tx.onePhaseCommit())
+ mappingKnown = false;
+
long timeout = tx.remainingTime();
if (timeout == -1) {
@@ -248,7 +251,7 @@ public class GridNearPessimisticTxPrepareFuture extends GridNearTxPrepareFutureA
int miniId = 0;
for (final GridDistributedTxMapping m : mappings.values()) {
- final ClusterNode node = m.node();
+ final ClusterNode primary = m.primary();
GridNearTxPrepareRequest req = new GridNearTxPrepareRequest(
futId,
@@ -281,8 +284,8 @@ public class GridNearPessimisticTxPrepareFuture extends GridNearTxPrepareFutureA
add(fut);
- if (node.isLocal()) {
- IgniteInternalFuture<GridNearTxPrepareResponse> prepFut = cctx.tm().txHandler().prepareTx(node.id(),
+ if (primary.isLocal()) {
+ IgniteInternalFuture<GridNearTxPrepareResponse> prepFut = cctx.tm().txHandler().prepareTx(primary.id(),
tx,
req);
@@ -299,11 +302,11 @@ public class GridNearPessimisticTxPrepareFuture extends GridNearTxPrepareFutureA
}
else {
try {
- cctx.io().send(node, req, tx.ioPolicy());
+ cctx.io().send(primary, req, tx.ioPolicy());
if (msgLog.isDebugEnabled()) {
msgLog.debug("Near pessimistic prepare, sent request [txId=" + tx.nearXidVersion() +
- ", node=" + node.id() + ']');
+ ", node=" + primary.id() + ']');
}
}
catch (ClusterTopologyCheckedException e) {
@@ -314,7 +317,7 @@ public class GridNearPessimisticTxPrepareFuture extends GridNearTxPrepareFutureA
catch (IgniteCheckedException e) {
if (msgLog.isDebugEnabled()) {
msgLog.debug("Near pessimistic prepare, failed send request [txId=" + tx.nearXidVersion() +
- ", node=" + node.id() + ", err=" + e + ']');
+ ", node=" + primary.id() + ", err=" + e + ']');
}
fut.onError(e);
@@ -399,7 +402,7 @@ public class GridNearPessimisticTxPrepareFuture extends GridNearTxPrepareFutureA
* @return Node ID.
*/
public ClusterNode primary() {
- return m.node();
+ return m.primary();
}
/**
@@ -421,7 +424,7 @@ public class GridNearPessimisticTxPrepareFuture extends GridNearTxPrepareFutureA
void onNodeLeft(ClusterTopologyCheckedException e) {
if (msgLog.isDebugEnabled()) {
msgLog.debug("Near pessimistic prepare, mini future node left [txId=" + tx.nearXidVersion() +
- ", nodeId=" + m.node().id() + ']');
+ ", nodeId=" + m.primary().id() + ']');
}
if (tx.onePhaseCommit()) {
http://git-wip-us.apache.org/repos/asf/ignite/blob/e9d8820c/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearTxFinishFuture.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearTxFinishFuture.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearTxFinishFuture.java
index b7fdba3..c13650e 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearTxFinishFuture.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearTxFinishFuture.java
@@ -198,7 +198,7 @@ public final class GridNearTxFinishFuture<K, V> extends GridCompoundIdentityFutu
FinishMiniFuture f = (FinishMiniFuture)fut;
if (f.futureId().equals(res.miniId())) {
- assert f.node().id().equals(nodeId);
+ assert f.primary().id().equals(nodeId);
finishFut = f;
@@ -441,7 +441,7 @@ public final class GridNearTxFinishFuture<K, V> extends GridCompoundIdentityFutu
GridDistributedTxMapping mapping = mappings.singleMapping();
if (mapping != null) {
- UUID nodeId = mapping.node().id();
+ UUID nodeId = mapping.primary().id();
Collection<UUID> backups = tx.transactionNodes().get(nodeId);
@@ -471,7 +471,7 @@ public final class GridNearTxFinishFuture<K, V> extends GridCompoundIdentityFutu
GridDistributedTxMapping mapping = mappings.singleMapping();
if (mapping != null) {
- UUID nodeId = mapping.node().id();
+ UUID nodeId = mapping.primary().id();
Collection<UUID> backups = tx.transactionNodes().get(nodeId);
@@ -657,7 +657,7 @@ public final class GridNearTxFinishFuture<K, V> extends GridCompoundIdentityFutu
* @param commit Commit flag.
*/
private void finish(GridDistributedTxMapping m, boolean commit) {
- ClusterNode n = m.node();
+ ClusterNode n = m.primary();
assert !m.empty();
@@ -727,7 +727,7 @@ public final class GridNearTxFinishFuture<K, V> extends GridCompoundIdentityFutu
}
catch (ClusterTopologyCheckedException ignored) {
// Remove previous mapping.
- mappings.remove(m.node().id());
+ mappings.remove(m.primary().id());
fut.onNodeLeft(n.id(), false);
}
@@ -753,7 +753,7 @@ public final class GridNearTxFinishFuture<K, V> extends GridCompoundIdentityFutu
if (f.getClass() == FinishMiniFuture.class) {
FinishMiniFuture fut = (FinishMiniFuture)f;
- ClusterNode node = fut.node();
+ ClusterNode node = fut.primary();
if (node != null) {
return "FinishFuture[node=" + node.id() +
@@ -872,8 +872,8 @@ public final class GridNearTxFinishFuture<K, V> extends GridCompoundIdentityFutu
/**
* @return Node ID.
*/
- ClusterNode node() {
- return m.node();
+ ClusterNode primary() {
+ return m.primary();
}
/**
@@ -885,10 +885,10 @@ public final class GridNearTxFinishFuture<K, V> extends GridCompoundIdentityFutu
/** {@inheritDoc} */
boolean onNodeLeft(UUID nodeId, boolean discoThread) {
- if (nodeId.equals(m.node().id())) {
+ if (nodeId.equals(m.primary().id())) {
if (msgLog.isDebugEnabled()) {
msgLog.debug("Near finish fut, mini future node left [txId=" + tx.nearXidVersion() +
- ", node=" + m.node().id() + ']');
+ ", node=" + m.primary().id() + ']');
}
if (tx.syncMode() == FULL_SYNC) {
http://git-wip-us.apache.org/repos/asf/ignite/blob/e9d8820c/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearTxLocal.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearTxLocal.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearTxLocal.java
index 0dede22..1954c34 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearTxLocal.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearTxLocal.java
@@ -577,12 +577,12 @@ public class GridNearTxLocal extends GridDhtTxLocalAdapter {
void addEntryMapping(@Nullable Collection<GridDistributedTxMapping> maps) {
if (!F.isEmpty(maps)) {
for (GridDistributedTxMapping map : maps) {
- ClusterNode n = map.node();
+ ClusterNode primary = map.primary();
- GridDistributedTxMapping m = mappings.get(n.id());
+ GridDistributedTxMapping m = mappings.get(primary.id());
if (m == null) {
- mappings.put(m = new GridDistributedTxMapping(n));
+ mappings.put(m = new GridDistributedTxMapping(primary));
m.near(map.near());
@@ -605,7 +605,7 @@ public class GridNearTxLocal extends GridDhtTxLocalAdapter {
* @param entry Entry.
*/
void addSingleEntryMapping(GridDistributedTxMapping map, IgniteTxEntry entry) {
- ClusterNode n = map.node();
+ ClusterNode n = map.primary();
GridDistributedTxMapping m = new GridDistributedTxMapping(n);
http://git-wip-us.apache.org/repos/asf/ignite/blob/e9d8820c/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearTxPrepareFutureAdapter.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearTxPrepareFutureAdapter.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearTxPrepareFutureAdapter.java
index e25ffdd..0ae98fd 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearTxPrepareFutureAdapter.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearTxPrepareFutureAdapter.java
@@ -184,13 +184,13 @@ public abstract class GridNearTxPrepareFutureAdapter extends
* @param res Response.
*/
@SuppressWarnings("ThrowableResultOfMethodCallIgnored")
- protected final void onPrepareResponse(GridDistributedTxMapping m, GridNearTxPrepareResponse res) {
+ final void onPrepareResponse(GridDistributedTxMapping m, GridNearTxPrepareResponse res) {
if (res == null)
return;
assert res.error() == null : res;
- UUID nodeId = m.node().id();
+ UUID nodeId = m.primary().id();
for (Map.Entry<IgniteTxKey, CacheVersionedValue> entry : res.ownedValues().entrySet()) {
IgniteTxEntry txEntry = tx.entry(entry.getKey());
http://git-wip-us.apache.org/repos/asf/ignite/blob/e9d8820c/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/IgniteTxMappingsImpl.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/IgniteTxMappingsImpl.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/IgniteTxMappingsImpl.java
index 7dec7af..9373bc4 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/IgniteTxMappingsImpl.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/IgniteTxMappingsImpl.java
@@ -50,7 +50,7 @@ public class IgniteTxMappingsImpl implements IgniteTxMappings {
/** {@inheritDoc} */
@Override public void put(GridDistributedTxMapping mapping) {
- mappings.put(mapping.node().id(), mapping);
+ mappings.put(mapping.primary().id(), mapping);
}
/** {@inheritDoc} */
@@ -61,7 +61,7 @@ public class IgniteTxMappingsImpl implements IgniteTxMappings {
/** {@inheritDoc} */
@Nullable @Override public GridDistributedTxMapping localMapping() {
for (GridDistributedTxMapping m : mappings.values()) {
- if (m.node().isLocal())
+ if (m.primary().isLocal())
return m;
}
http://git-wip-us.apache.org/repos/asf/ignite/blob/e9d8820c/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/IgniteTxMappingsSingleImpl.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/IgniteTxMappingsSingleImpl.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/IgniteTxMappingsSingleImpl.java
index fc15592..b37f8d1 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/IgniteTxMappingsSingleImpl.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/IgniteTxMappingsSingleImpl.java
@@ -44,7 +44,7 @@ public class IgniteTxMappingsSingleImpl implements IgniteTxMappings {
@Override public GridDistributedTxMapping get(UUID nodeId) {
GridDistributedTxMapping mapping0 = mapping;
- return (mapping0 != null && mapping0.node().id().equals(nodeId)) ? mapping0 : null;
+ return (mapping0 != null && mapping0.primary().id().equals(nodeId)) ? mapping0 : null;
}
/** {@inheritDoc} */
@@ -58,7 +58,7 @@ public class IgniteTxMappingsSingleImpl implements IgniteTxMappings {
@Override public GridDistributedTxMapping remove(UUID nodeId) {
GridDistributedTxMapping mapping0 = mapping;
- if (mapping0 != null && mapping0.node().id().equals(nodeId)) {
+ if (mapping0 != null && mapping0.primary().id().equals(nodeId)) {
this.mapping = null;
return mapping0;
@@ -71,7 +71,7 @@ public class IgniteTxMappingsSingleImpl implements IgniteTxMappings {
@Nullable @Override public GridDistributedTxMapping localMapping() {
GridDistributedTxMapping mapping0 = mapping;
- if (mapping0 != null && mapping0.node().isLocal())
+ if (mapping0 != null && mapping0.primary().isLocal())
return mapping0;
return null;
[37/38] ignite git commit: Merge remote-tracking branch
'remotes/origin/ignite-2.0' into ignite-4768-1
Posted by sb...@apache.org.
Merge remote-tracking branch 'remotes/origin/ignite-2.0' into ignite-4768-1
# Conflicts:
# modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/GridDistributedTxFinishRequest.java
# modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/GridDistributedTxPrepareRequest.java
# modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtTxFinishFuture.java
# modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtTxFinishRequest.java
# modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtTxFinishResponse.java
# modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtTxLocal.java
# modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtTxPrepareFuture.java
# modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtTxPrepareRequest.java
# modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtTxPrepareResponse.java
# modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearOptimisticSerializableTxPrepareFuture.java
# modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearPessimisticTxPrepareFuture.java
# modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearTxFinishFuture.java
# modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearTxLocal.java
# modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearTxPrepareFutureAdapter.java
# modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearTxPrepareRequest.java
# modules/core/src/main/java/org/apache/ignite/internal/processors/cache/transactions/IgniteTxHandler.java
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/32468eaf
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/32468eaf
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/32468eaf
Branch: refs/heads/ignite-4768
Commit: 32468eaf3ec0d69fc6c31f1ef14bd09965f9ff6f
Parents: baeb203 901be4f
Author: sboikov <sb...@gridgain.com>
Authored: Mon Mar 13 19:33:11 2017 +0300
Committer: sboikov <sb...@gridgain.com>
Committed: Mon Mar 13 19:33:11 2017 +0300
----------------------------------------------------------------------
.../rest/protocols/tcp/MockNioSession.java | 5 +-
.../org/apache/ignite/internal/IgnitionEx.java | 5 +-
.../internal/binary/BinaryObjectImpl.java | 27 +-
.../connection/GridClientNioTcpConnection.java | 2 +-
.../managers/communication/GridIoManager.java | 5 +-
.../communication/GridIoMessageFactory.java | 20 +-
.../processors/cache/CacheObjectContext.java | 3 +-
.../processors/cache/GridCacheAtomicFuture.java | 5 +-
.../processors/cache/GridCacheIoManager.java | 83 +-
.../processors/cache/GridCacheMapEntry.java | 12 +-
.../processors/cache/GridCacheMessage.java | 6 +-
.../processors/cache/GridCacheMvccManager.java | 48 +-
.../processors/cache/GridCacheProcessor.java | 1 -
.../processors/cache/GridCacheReturn.java | 6 +-
.../cache/GridDeferredAckMessageSender.java | 17 +-
.../GridDistributedTxFinishRequest.java | 48 +
.../GridDistributedTxPrepareRequest.java | 2 +
.../dht/GridClientPartitionTopology.java | 8 +
.../dht/GridDhtPartitionTopology.java | 9 +
.../dht/GridDhtPartitionTopologyImpl.java | 23 +-
.../dht/GridDhtTxPrepareRequest.java | 38 +-
.../GridDhtAtomicAbstractUpdateFuture.java | 298 +++---
.../GridDhtAtomicAbstractUpdateRequest.java | 392 +++++++-
.../dht/atomic/GridDhtAtomicCache.java | 896 +++++++++--------
.../GridDhtAtomicDeferredUpdateResponse.java | 68 +-
.../dht/atomic/GridDhtAtomicNearResponse.java | 314 ++++++
.../atomic/GridDhtAtomicSingleUpdateFuture.java | 101 +-
.../GridDhtAtomicSingleUpdateRequest.java | 277 +-----
.../dht/atomic/GridDhtAtomicUpdateFuture.java | 89 +-
.../dht/atomic/GridDhtAtomicUpdateRequest.java | 325 ++-----
.../dht/atomic/GridDhtAtomicUpdateResponse.java | 124 +--
...idNearAtomicAbstractSingleUpdateRequest.java | 481 +---------
.../GridNearAtomicAbstractUpdateFuture.java | 468 +++++++--
.../GridNearAtomicAbstractUpdateRequest.java | 480 ++++++++-
.../GridNearAtomicCheckUpdateRequest.java | 175 ++++
.../atomic/GridNearAtomicFullUpdateRequest.java | 487 +---------
...GridNearAtomicSingleUpdateFilterRequest.java | 23 +-
.../GridNearAtomicSingleUpdateFuture.java | 617 ++++++------
...GridNearAtomicSingleUpdateInvokeRequest.java | 37 +-
.../GridNearAtomicSingleUpdateRequest.java | 65 +-
.../dht/atomic/GridNearAtomicUpdateFuture.java | 962 +++++++++++--------
.../atomic/GridNearAtomicUpdateResponse.java | 192 ++--
.../distributed/dht/atomic/UpdateErrors.java | 222 +++++
.../distributed/near/GridNearAtomicCache.java | 27 +-
.../continuous/CacheContinuousQueryHandler.java | 2 +-
.../cacheobject/IgniteCacheObjectProcessor.java | 5 +-
.../ignite/internal/util/StripedExecutor.java | 8 +-
.../util/future/GridCompoundFuture.java | 11 +-
.../internal/util/ipc/IpcToNioAdapter.java | 7 +-
.../nio/GridConnectionBytesVerifyFilter.java | 7 +-
.../util/nio/GridNioAsyncNotifyFilter.java | 7 +-
.../internal/util/nio/GridNioCodecFilter.java | 9 +-
.../util/nio/GridNioEmbeddedFuture.java | 7 +
.../ignite/internal/util/nio/GridNioFilter.java | 12 +-
.../internal/util/nio/GridNioFilterAdapter.java | 7 +-
.../internal/util/nio/GridNioFilterChain.java | 15 +-
.../util/nio/GridNioFinishedFuture.java | 5 -
.../ignite/internal/util/nio/GridNioFuture.java | 7 -
.../internal/util/nio/GridNioFutureImpl.java | 18 +-
.../ignite/internal/util/nio/GridNioServer.java | 83 +-
.../internal/util/nio/GridNioSession.java | 7 +-
.../internal/util/nio/GridNioSessionImpl.java | 9 +-
.../util/nio/GridNioSessionMetaKey.java | 5 +-
.../util/nio/GridShmemCommunicationClient.java | 6 +-
.../util/nio/GridTcpNioCommunicationClient.java | 13 +-
.../internal/util/nio/SessionWriteRequest.java | 7 -
.../internal/util/nio/ssl/GridNioSslFilter.java | 12 +-
.../util/nio/ssl/GridNioSslHandler.java | 29 +-
.../communication/tcp/TcpCommunicationSpi.java | 2 +-
.../org/apache/ignite/thread/IgniteThread.java | 41 +-
.../ignite/thread/IgniteThreadFactory.java | 2 +-
.../GridCommunicationSendMessageSelfTest.java | 2 +-
.../cache/CacheRebalancingSelfTest.java | 16 +-
.../GridCacheAbstractFailoverSelfTest.java | 2 -
.../GridCacheAtomicMessageCountSelfTest.java | 22 +-
.../IgniteCacheEntryListenerAbstractTest.java | 1 +
...niteCacheClientNodeChangingTopologyTest.java | 7 -
.../IgniteCacheMessageRecoveryAbstractTest.java | 2 +-
.../dht/GridCacheAtomicNearCacheSelfTest.java | 23 +-
.../IgniteCachePutRetryAbstractSelfTest.java | 37 +-
...gniteCachePutRetryTransactionalSelfTest.java | 2 +-
.../atomic/IgniteCacheAtomicProtocolTest.java | 883 +++++++++++++++++
...erNoStripedPoolMultiNodeFullApiSelfTest.java | 35 -
.../near/GridCacheNearReadersSelfTest.java | 17 +-
...edNoStripedPoolMultiNodeFullApiSelfTest.java | 35 -
...eContinuousQueryAsyncFilterListenerTest.java | 2 +-
...ContinuousQueryFailoverAbstractSelfTest.java | 31 +-
.../nio/GridNioEmbeddedFutureSelfTest.java | 2 +-
.../util/future/nio/GridNioFutureSelfTest.java | 25 +-
.../nio/impl/GridNioFilterChainSelfTest.java | 12 +-
.../IgniteCacheFullApiSelfTestSuite.java | 8 +-
.../testsuites/IgniteCacheTestSuite5.java | 3 +
.../HadoopExternalCommunication.java | 9 +-
.../communication/HadoopIpcToNioAdapter.java | 7 +-
.../communication/HadoopMarshallerFilter.java | 10 +-
.../cache/IgniteGetAndPutBenchmark.java | 2 +-
.../cache/IgniteGetAndPutTxBenchmark.java | 2 +-
97 files changed, 5443 insertions(+), 3590 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ignite/blob/32468eaf/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheIoManager.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ignite/blob/32468eaf/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheMvccManager.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ignite/blob/32468eaf/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/GridDistributedTxFinishRequest.java
----------------------------------------------------------------------
diff --cc modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/GridDistributedTxFinishRequest.java
index 03d16e5,ab9f0ff..5dcdbff
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/GridDistributedTxFinishRequest.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/GridDistributedTxFinishRequest.java
@@@ -177,62 -171,53 +177,110 @@@ public class GridDistributedTxFinishReq
this.txSize = txSize;
completedVersions(committedVers, rolledbackVers);
+
+ setFlag(dhtReplyNear, DHT_REPLY_NEAR_FLAG_MASK);
+ }
+
+ /**
+ * @return {@code True} if transaction works in mode when DHT nodes reply directly to near node.
+ */
+ public final boolean dhtReplyNear() {
+ return isFlag(DHT_REPLY_NEAR_FLAG_MASK);
+ }
+
+ /**
+ * @return Transaction write synchronization mode (can be null is message sent from old nodes).
+ */
+ public final CacheWriteSynchronizationMode syncMode() {
+ return syncMode;
+ }
+
+ /**
+ * Sets flag mask.
+ *
+ * @param flag Set or clear.
+ * @param mask Mask.
+ */
+ protected final void setFlag(boolean flag, int mask) {
+ flags = flag ? (byte)(flags | mask) : (byte)(flags & ~mask);
+ }
+
+ /**
+ * Reags flag mask.
+ *
+ * @param mask Mask to read.
+ * @return Flag value.
+ */
+ protected final boolean isFlag(int mask) {
+ return (flags & mask) != 0;
+ }
+
+ /**
+ * @return Subject ID.
+ */
+ @Nullable public final UUID subjectId() {
+ return subjId;
+ }
+
+ /**
+ * @return Task name hash.
+ */
+ public final int taskNameHash() {
+ return taskNameHash;
+ }
+
+ /**
+ * @return Topology version.
+ */
+ @Override public final AffinityTopologyVersion topologyVersion() {
++ return topVer;
+ }
+
+ /**
+ * @return Transaction write synchronization mode (can be null is message sent from old nodes).
+ */
+ public final CacheWriteSynchronizationMode syncMode() {
+ return syncMode;
+ }
+
+ /**
+ * Sets flag mask.
+ *
+ * @param flag Set or clear.
+ * @param mask Mask.
+ */
+ protected final void setFlag(boolean flag, int mask) {
+ flags = flag ? (byte)(flags | mask) : (byte)(flags & ~mask);
+ }
+
+ /**
+ * Reags flag mask.
+ *
+ * @param mask Mask to read.
+ * @return Flag value.
+ */
+ protected final boolean isFlag(int mask) {
+ return (flags & mask) != 0;
+ }
+
+ /**
+ * @return Subject ID.
+ */
+ @Nullable public final UUID subjectId() {
+ return subjId;
+ }
+
+ /**
+ * @return Task name hash.
+ */
+ public final int taskNameHash() {
+ return taskNameHash;
+ }
+
+ /**
+ * @return Topology version.
+ */
+ @Override public final AffinityTopologyVersion topologyVersion() {
return topVer;
}
http://git-wip-us.apache.org/repos/asf/ignite/blob/32468eaf/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/GridDistributedTxPrepareRequest.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ignite/blob/32468eaf/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtTxPrepareRequest.java
----------------------------------------------------------------------
[09/38] ignite git commit: ignite-4768
Posted by sb...@apache.org.
ignite-4768
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/1d1c58c3
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/1d1c58c3
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/1d1c58c3
Branch: refs/heads/ignite-4768
Commit: 1d1c58c3acafe84df1194a9324eb3aaad013f468
Parents: 7dcd6cd
Author: sboikov <sb...@gridgain.com>
Authored: Thu Mar 9 11:03:03 2017 +0300
Committer: sboikov <sb...@gridgain.com>
Committed: Thu Mar 9 11:03:03 2017 +0300
----------------------------------------------------------------------
.../cache/transactions/IgniteTxEntry.java | 30 +++++++++++---------
1 file changed, 16 insertions(+), 14 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ignite/blob/1d1c58c3/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/transactions/IgniteTxEntry.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/transactions/IgniteTxEntry.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/transactions/IgniteTxEntry.java
index 4e56e7a..14a7ed0 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/transactions/IgniteTxEntry.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/transactions/IgniteTxEntry.java
@@ -66,7 +66,7 @@ import static org.apache.ignite.internal.processors.cache.GridCacheUtils.SKIP_ST
* {@link #equals(Object)} method, as transaction entries should use referential
* equality.
*/
-@IgniteCodeGeneratingFail // Field filters, partId should not be generated by MessageCodeGenerator.
+@IgniteCodeGeneratingFail // Field filters should not be generated by MessageCodeGenerator.
public class IgniteTxEntry implements GridPeerDeployAware, Message {
/** */
private static final long serialVersionUID = 0L;
@@ -1059,34 +1059,35 @@ public class IgniteTxEntry implements GridPeerDeployAware, Message {
writer.incrementState();
case 8:
- if (!writer.writeMessage("serReadVer", serReadVer))
+ if (!writer.writeMessage("oldVal", oldVal))
return false;
writer.incrementState();
case 9:
- if (!writer.writeByteArray("transformClosBytes", transformClosBytes))
+ if (!writer.writeMessage("serReadVer", serReadVer))
return false;
writer.incrementState();
case 10:
- if (!writer.writeLong("ttl", ttl))
+ if (!writer.writeByteArray("transformClosBytes", transformClosBytes))
return false;
writer.incrementState();
case 11:
- if (!writer.writeMessage("val", val))
+ if (!writer.writeLong("ttl", ttl))
return false;
writer.incrementState();
- case 13:
- if (!writer.writeMessage("oldVal", oldVal))
+ case 12:
+ if (!writer.writeMessage("val", val))
return false;
writer.incrementState();
+
}
return true;
@@ -1165,7 +1166,7 @@ public class IgniteTxEntry implements GridPeerDeployAware, Message {
reader.incrementState();
case 8:
- serReadVer = reader.readMessage("serReadVer");
+ oldVal = reader.readMessage("oldVal");
if (!reader.isLastRead())
return false;
@@ -1173,7 +1174,7 @@ public class IgniteTxEntry implements GridPeerDeployAware, Message {
reader.incrementState();
case 9:
- transformClosBytes = reader.readByteArray("transformClosBytes");
+ serReadVer = reader.readMessage("serReadVer");
if (!reader.isLastRead())
return false;
@@ -1181,7 +1182,7 @@ public class IgniteTxEntry implements GridPeerDeployAware, Message {
reader.incrementState();
case 10:
- ttl = reader.readLong("ttl");
+ transformClosBytes = reader.readByteArray("transformClosBytes");
if (!reader.isLastRead())
return false;
@@ -1189,20 +1190,21 @@ public class IgniteTxEntry implements GridPeerDeployAware, Message {
reader.incrementState();
case 11:
- val = reader.readMessage("val");
+ ttl = reader.readLong("ttl");
if (!reader.isLastRead())
return false;
reader.incrementState();
- case 13:
- oldVal = reader.readMessage("oldVal");
+ case 12:
+ val = reader.readMessage("val");
if (!reader.isLastRead())
return false;
reader.incrementState();
+
}
return reader.afterMessageRead(IgniteTxEntry.class);
@@ -1215,7 +1217,7 @@ public class IgniteTxEntry implements GridPeerDeployAware, Message {
/** {@inheritDoc} */
@Override public byte fieldsCount() {
- return 14;
+ return 13;
}
/** {@inheritDoc} */
[03/38] ignite git commit: ignite-4768
Posted by sb...@apache.org.
ignite-4768
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/91826bbe
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/91826bbe
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/91826bbe
Branch: refs/heads/ignite-4768
Commit: 91826bbe053966a06e2c676231f9027f867b7130
Parents: 9edb0e7
Author: sboikov <sb...@gridgain.com>
Authored: Tue Mar 7 10:12:21 2017 +0300
Committer: sboikov <sb...@gridgain.com>
Committed: Tue Mar 7 10:12:21 2017 +0300
----------------------------------------------------------------------
.../distributed/dht/GridDhtTxPrepareFuture.java | 18 +------
.../dht/GridDhtTxPrepareResponse.java | 53 ++++----------------
2 files changed, 11 insertions(+), 60 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ignite/blob/91826bbe/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtTxPrepareFuture.java
----------------------------------------------------------------------
diff --git 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
index 1227ba9..84b8e7a 100644
--- 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
@@ -1479,7 +1479,7 @@ public final class GridDhtTxPrepareFuture extends GridCompoundFuture<IgniteInter
while (true) {
try {
- Collection<ClusterNode> dhtNodes = dht.topology().nodes(cached.partition(), tx.topologyVersion());
+ List<ClusterNode> dhtNodes = dht.topology().nodes(cached.partition(), tx.topologyVersion());
if (log.isDebugEnabled())
log.debug("Mapping entry to DHT nodes [nodes=" + U.toShortString(dhtNodes) +
@@ -1709,22 +1709,6 @@ public final class GridDhtTxPrepareFuture extends GridCompoundFuture<IgniteInter
}
// Process invalid partitions (no need to remap).
- // Keep this loop for backward compatibility.
- if (!F.isEmpty(res.invalidPartitions())) {
- for (Iterator<IgniteTxEntry> it = dhtMapping.entries().iterator(); it.hasNext();) {
- IgniteTxEntry entry = it.next();
-
- if (res.invalidPartitions().contains(entry.cached().partition())) {
- it.remove();
-
- if (log.isDebugEnabled())
- log.debug("Removed mapping for entry from dht mapping [key=" + entry.key() +
- ", tx=" + tx + ", dhtMapping=" + dhtMapping + ']');
- }
- }
- }
-
- // Process invalid partitions (no need to remap).
if (!F.isEmpty(res.invalidPartitionsByCacheId())) {
Map<Integer, int[]> invalidPartsMap = res.invalidPartitionsByCacheId();
http://git-wip-us.apache.org/repos/asf/ignite/blob/91826bbe/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtTxPrepareResponse.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtTxPrepareResponse.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtTxPrepareResponse.java
index 2eba9f1..fdead95 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtTxPrepareResponse.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtTxPrepareResponse.java
@@ -60,14 +60,9 @@ public class GridDhtTxPrepareResponse extends GridDistributedTxPrepareResponse {
/** Mini future ID. */
private IgniteUuid miniId;
- /** Invalid partitions. */
- @GridToStringInclude
- @GridDirectCollection(int.class)
- private Collection<Integer> invalidParts;
-
/** Invalid partitions by cache ID. */
@GridDirectMap(keyType = Integer.class, valueType = int[].class)
- private Map<Integer, int[]> invalidPartsByCacheId;
+ private Map<Integer, int[]> invalidParts;
/** Preload entries. */
@GridDirectCollection(GridCacheEntryInfo.class)
@@ -143,31 +138,17 @@ public class GridDhtTxPrepareResponse extends GridDistributedTxPrepareResponse {
}
/**
- * @return Invalid partitions.
- */
- public Collection<Integer> invalidPartitions() {
- return invalidParts;
- }
-
- /**
- * @param invalidParts Invalid partitions.
- */
- public void invalidPartitions(Collection<Integer> invalidParts) {
- this.invalidParts = invalidParts;
- }
-
- /**
* @return Map from cacheId to an array of invalid partitions.
*/
public Map<Integer, int[]> invalidPartitionsByCacheId() {
- return invalidPartsByCacheId;
+ return invalidParts;
}
/**
* @param invalidPartsByCacheId Map from cache ID to an array of invalid partitions.
*/
public void invalidPartitionsByCacheId(Map<Integer, Set<Integer>> invalidPartsByCacheId) {
- this.invalidPartsByCacheId = CU.convertInvalidPartitions(invalidPartsByCacheId);
+ this.invalidParts = CU.convertInvalidPartitions(invalidPartsByCacheId);
}
/**
@@ -263,30 +244,24 @@ public class GridDhtTxPrepareResponse extends GridDistributedTxPrepareResponse {
writer.incrementState();
case 9:
- if (!writer.writeCollection("invalidParts", invalidParts, MessageCollectionItemType.INT))
+ if (!writer.writeMap("invalidParts", invalidParts, MessageCollectionItemType.INT, MessageCollectionItemType.INT_ARR))
return false;
writer.incrementState();
case 10:
- if (!writer.writeMap("invalidPartsByCacheId", invalidPartsByCacheId, MessageCollectionItemType.INT, MessageCollectionItemType.INT_ARR))
- return false;
-
- writer.incrementState();
-
- case 11:
if (!writer.writeIgniteUuid("miniId", miniId))
return false;
writer.incrementState();
- case 12:
+ case 11:
if (!writer.writeCollection("nearEvicted", nearEvicted, MessageCollectionItemType.MSG))
return false;
writer.incrementState();
- case 13:
+ case 12:
if (!writer.writeCollection("preloadEntries", preloadEntries, MessageCollectionItemType.MSG))
return false;
@@ -317,7 +292,7 @@ public class GridDhtTxPrepareResponse extends GridDistributedTxPrepareResponse {
reader.incrementState();
case 9:
- invalidParts = reader.readCollection("invalidParts", MessageCollectionItemType.INT);
+ invalidParts = reader.readMap("invalidParts", MessageCollectionItemType.INT, MessageCollectionItemType.INT_ARR, false);
if (!reader.isLastRead())
return false;
@@ -325,14 +300,6 @@ public class GridDhtTxPrepareResponse extends GridDistributedTxPrepareResponse {
reader.incrementState();
case 10:
- invalidPartsByCacheId = reader.readMap("invalidPartsByCacheId", MessageCollectionItemType.INT, MessageCollectionItemType.INT_ARR, false);
-
- if (!reader.isLastRead())
- return false;
-
- reader.incrementState();
-
- case 11:
miniId = reader.readIgniteUuid("miniId");
if (!reader.isLastRead())
@@ -340,7 +307,7 @@ public class GridDhtTxPrepareResponse extends GridDistributedTxPrepareResponse {
reader.incrementState();
- case 12:
+ case 11:
nearEvicted = reader.readCollection("nearEvicted", MessageCollectionItemType.MSG);
if (!reader.isLastRead())
@@ -348,7 +315,7 @@ public class GridDhtTxPrepareResponse extends GridDistributedTxPrepareResponse {
reader.incrementState();
- case 13:
+ case 12:
preloadEntries = reader.readCollection("preloadEntries", MessageCollectionItemType.MSG);
if (!reader.isLastRead())
@@ -368,6 +335,6 @@ public class GridDhtTxPrepareResponse extends GridDistributedTxPrepareResponse {
/** {@inheritDoc} */
@Override public byte fieldsCount() {
- return 14;
+ return 13;
}
}
[26/38] ignite git commit: Merge remote-tracking branch
'remotes/origin/ignite-4768' into ignite-4768-1
Posted by sb...@apache.org.
Merge remote-tracking branch 'remotes/origin/ignite-4768' into ignite-4768-1
# Conflicts:
# modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtTxFinishRequest.java
# modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtTxFinishResponse.java
# modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtTxLocal.java
# modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtTxPrepareResponse.java
# modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearPessimisticTxPrepareFuture.java
# modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearTxFinishFuture.java
# modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearTxFinishRequest.java
# modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearTxFinishResponse.java
# modules/core/src/main/java/org/apache/ignite/internal/processors/cache/transactions/IgniteTxHandler.java
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/c4e0ce33
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/c4e0ce33
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/c4e0ce33
Branch: refs/heads/ignite-4768
Commit: c4e0ce33a278e5fa7a29571180c8145be6e8e6aa
Parents: 2e2d39d
Author: sboikov <sb...@gridgain.com>
Authored: Mon Mar 13 11:50:43 2017 +0300
Committer: sboikov <sb...@gridgain.com>
Committed: Mon Mar 13 11:50:43 2017 +0300
----------------------------------------------------------------------
.../GridDistributedTxFinishResponse.java | 1 -
.../distributed/dht/GridDhtTxFinishResponse.java | 19 ++++++++++++++++++-
.../distributed/near/GridNearTxFinishFuture.java | 2 +-
.../near/GridNearTxFinishResponse.java | 2 +-
4 files changed, 20 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ignite/blob/c4e0ce33/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/GridDistributedTxFinishResponse.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/GridDistributedTxFinishResponse.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/GridDistributedTxFinishResponse.java
index 1f61033..2c446c3 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/GridDistributedTxFinishResponse.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/GridDistributedTxFinishResponse.java
@@ -17,7 +17,6 @@
package org.apache.ignite.internal.processors.cache.distributed;
-import java.io.Externalizable;
import java.nio.ByteBuffer;
import org.apache.ignite.IgniteLogger;
import org.apache.ignite.internal.managers.communication.GridIoMessageFactory;
http://git-wip-us.apache.org/repos/asf/ignite/blob/c4e0ce33/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtTxFinishResponse.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtTxFinishResponse.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtTxFinishResponse.java
index 7648178..5646cb2 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtTxFinishResponse.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtTxFinishResponse.java
@@ -39,6 +39,9 @@ public class GridDhtTxFinishResponse extends GridDistributedTxFinishResponse {
/** */
private static final long serialVersionUID = 0L;
+ /** */
+ private static final int NEAR_RES_FLAG_MASK = 0x01;
+
/** Mini future ID. */
private int miniId;
@@ -68,7 +71,7 @@ public class GridDhtTxFinishResponse extends GridDistributedTxFinishResponse {
* @param miniId Mini future ID.
*/
public GridDhtTxFinishResponse(GridCacheVersion xid, IgniteUuid futId, int miniId) {
- super(xid, futId);
+ super(miniId, xid, futId);
assert miniId != 0;
@@ -76,6 +79,20 @@ public class GridDhtTxFinishResponse extends GridDistributedTxFinishResponse {
}
/**
+ * @return {@code True} if this is reply for near node.
+ */
+ public boolean nearNodeResponse() {
+ return isFlag(NEAR_RES_FLAG_MASK);
+ }
+
+ /**
+ * @param val {@code True} if this is reply for near node.
+ */
+ public void nearNodeResponse(boolean val) {
+ setFlag(val, NEAR_RES_FLAG_MASK);
+ }
+
+ /**
* @return Mini future ID.
*/
public int miniId() {
http://git-wip-us.apache.org/repos/asf/ignite/blob/c4e0ce33/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearTxFinishFuture.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearTxFinishFuture.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearTxFinishFuture.java
index fc2c3aa..c55d515 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearTxFinishFuture.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearTxFinishFuture.java
@@ -252,7 +252,7 @@ public final class GridNearTxFinishFuture<K, V> extends GridCompoundIdentityFutu
if (fut.getClass() == FinishMiniFuture.class) {
FinishMiniFuture f = (FinishMiniFuture)fut;
- if (f.futureId().equals(res.miniId())) {
+ if (f.futureId() == res.miniId()) {
foundFut = (MinFuture)fut;
break;
http://git-wip-us.apache.org/repos/asf/ignite/blob/c4e0ce33/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearTxFinishResponse.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearTxFinishResponse.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearTxFinishResponse.java
index e9043ed..96b0778 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearTxFinishResponse.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearTxFinishResponse.java
@@ -67,7 +67,7 @@ public class GridNearTxFinishResponse extends GridDistributedTxFinishResponse {
*/
public GridNearTxFinishResponse(GridCacheVersion xid, long nearThreadId, IgniteUuid futId, int miniId,
@Nullable Throwable err) {
- super(xid, futId);
+ super(miniId, xid, futId);
assert miniId != 0;
[07/38] ignite git commit: ignite-4768
Posted by sb...@apache.org.
ignite-4768
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/43429ffd
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/43429ffd
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/43429ffd
Branch: refs/heads/ignite-4768
Commit: 43429ffd9bed1aa6c6d8bd7a28e888905a7fe193
Parents: 0f069f8
Author: sboikov <sb...@gridgain.com>
Authored: Tue Mar 7 17:41:02 2017 +0300
Committer: sboikov <sb...@gridgain.com>
Committed: Tue Mar 7 17:41:02 2017 +0300
----------------------------------------------------------------------
.../GridDistributedTxPrepareRequest.java | 3 ++
.../GridNearPessimisticTxPrepareFuture.java | 23 ++++++++++---
.../cache/transactions/IgniteTxHandler.java | 35 +++++++++++++++-----
3 files changed, 49 insertions(+), 12 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ignite/blob/43429ffd/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/GridDistributedTxPrepareRequest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/GridDistributedTxPrepareRequest.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/GridDistributedTxPrepareRequest.java
index aaef258..1934a84 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/GridDistributedTxPrepareRequest.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/GridDistributedTxPrepareRequest.java
@@ -74,6 +74,9 @@ public class GridDistributedTxPrepareRequest extends GridDistributedBaseMessage
/** */
private static final int SYSTEM_TX_FLAG_MASK = 0x10;
+ /** */
+ private static final int KNOWN_MAPPING_FLAG_MASK = 0x20;
+
/** Collection to message converter. */
private static final C1<Collection<UUID>, UUIDCollectionMessage> COL_TO_MSG = new C1<Collection<UUID>, UUIDCollectionMessage>() {
@Override public UUIDCollectionMessage apply(Collection<UUID> uuids) {
http://git-wip-us.apache.org/repos/asf/ignite/blob/43429ffd/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearPessimisticTxPrepareFuture.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearPessimisticTxPrepareFuture.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearPessimisticTxPrepareFuture.java
index a4132f2..4154102 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearPessimisticTxPrepareFuture.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearPessimisticTxPrepareFuture.java
@@ -32,6 +32,7 @@ import org.apache.ignite.internal.processors.cache.GridCacheEntryEx;
import org.apache.ignite.internal.processors.cache.GridCacheMvccCandidate;
import org.apache.ignite.internal.processors.cache.GridCacheSharedContext;
import org.apache.ignite.internal.processors.cache.distributed.GridDistributedTxMapping;
+import org.apache.ignite.internal.processors.cache.distributed.dht.GridDhtPartitionTopology;
import org.apache.ignite.internal.processors.cache.distributed.dht.GridDhtTxMapping;
import org.apache.ignite.internal.processors.cache.transactions.IgniteInternalTx;
import org.apache.ignite.internal.processors.cache.transactions.IgniteTxEntry;
@@ -184,6 +185,8 @@ public class GridNearPessimisticTxPrepareFuture extends GridNearTxPrepareFutureA
*
*/
private void preparePessimistic() {
+ boolean mappingKnown = true;
+
Map<IgniteBiTuple<ClusterNode, Boolean>, GridDistributedTxMapping> mappings = new HashMap<>();
AffinityTopologyVersion topVer = tx.topologyVersion();
@@ -195,9 +198,18 @@ public class GridNearPessimisticTxPrepareFuture extends GridNearTxPrepareFutureA
GridCacheContext cacheCtx = txEntry.context();
- List<ClusterNode> nodes = cacheCtx.isLocal() ?
- cacheCtx.affinity().nodesByKey(txEntry.key(), topVer) :
- cacheCtx.topology().nodes(cacheCtx.affinity().partition(txEntry.key()), topVer);
+ List<ClusterNode> nodes;
+
+ if (!cacheCtx.isLocal()) {
+ GridDhtPartitionTopology top = cacheCtx.topology();
+
+ if (mappingKnown && (!top.rebalanceFinished(topVer) || cctx.discovery().hasNearCache(cacheCtx.cacheId(), topVer)))
+ mappingKnown = false;
+
+ nodes = cacheCtx.topology().nodes(cacheCtx.affinity().partition(txEntry.key()), topVer);
+ }
+ else
+ nodes = cacheCtx.affinity().nodesByKey(txEntry.key(), topVer);
ClusterNode primary = F.first(nodes);
@@ -228,9 +240,12 @@ public class GridNearPessimisticTxPrepareFuture extends GridNearTxPrepareFutureA
long timeout = tx.remainingTime();
- if (timeout == -1)
+ if (timeout == -1) {
onDone(new IgniteTxTimeoutCheckedException("Transaction timed out and was rolled back: " + tx));
+ return;
+ }
+
for (final GridDistributedTxMapping m : mappings.values()) {
final ClusterNode node = m.node();
http://git-wip-us.apache.org/repos/asf/ignite/blob/43429ffd/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/transactions/IgniteTxHandler.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/transactions/IgniteTxHandler.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/transactions/IgniteTxHandler.java
index 21c2649..f3f67a2 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/transactions/IgniteTxHandler.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/transactions/IgniteTxHandler.java
@@ -113,7 +113,7 @@ public class IgniteTxHandler {
* @param req Request.
* @return Prepare future.
*/
- public IgniteInternalFuture<?> processNearTxPrepareRequest(final UUID nearNodeId, GridNearTxPrepareRequest req) {
+ private IgniteInternalFuture<?> processNearTxPrepareRequest(final UUID nearNodeId, GridNearTxPrepareRequest req) {
if (txPrepareMsgLog.isDebugEnabled()) {
txPrepareMsgLog.debug("Received near prepare request [txId=" + req.version() +
", node=" + nearNodeId + ']');
@@ -286,6 +286,27 @@ public class IgniteTxHandler {
}
/**
+ * @param entries Entries.
+ * @return First entry.
+ * @throws IgniteCheckedException If failed.
+ */
+ private IgniteTxEntry unmarshal(@Nullable Collection<IgniteTxEntry> entries) throws IgniteCheckedException {
+ if (entries == null)
+ return null;
+
+ IgniteTxEntry firstEntry = null;
+
+ for (IgniteTxEntry e : entries) {
+ e.unmarshal(ctx, false, ctx.deploy().globalLoader());
+
+ if (firstEntry == null)
+ firstEntry = e;
+ }
+
+ return firstEntry;
+ }
+
+ /**
* Prepares near transaction.
*
* @param nearNodeId Near node ID that initiated transaction.
@@ -308,15 +329,13 @@ public class IgniteTxHandler {
return null;
}
- IgniteTxEntry firstEntry = null;
+ IgniteTxEntry firstEntry;
try {
- for (IgniteTxEntry e : F.concat(false, req.reads(), req.writes())) {
- e.unmarshal(ctx, false, ctx.deploy().globalLoader());
+ IgniteTxEntry firstWrite = unmarshal(req.writes());
+ IgniteTxEntry firstRead = unmarshal(req.reads());
- if (firstEntry == null)
- firstEntry = e;
- }
+ firstEntry = firstWrite != null ? firstWrite : firstRead;
}
catch (IgniteCheckedException e) {
return new GridFinishedFuture<>(e);
@@ -452,7 +471,7 @@ public class IgniteTxHandler {
tx.nearOnOriginatingNode(true);
if (req.onePhaseCommit()) {
- assert req.last();
+ assert req.last() : req;
tx.onePhaseCommit(true);
}
[02/38] ignite git commit: Merge remote-tracking branch
'remotes/origin/ignite-2.0' into ignite-4768
Posted by sb...@apache.org.
Merge remote-tracking branch 'remotes/origin/ignite-2.0' into ignite-4768
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/9edb0e79
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/9edb0e79
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/9edb0e79
Branch: refs/heads/ignite-4768
Commit: 9edb0e79bc8388c378c203f2ad0b62bf41e0e456
Parents: d39050c 93e1996
Author: sboikov <sb...@gridgain.com>
Authored: Mon Mar 6 17:15:14 2017 +0300
Committer: sboikov <sb...@gridgain.com>
Committed: Mon Mar 6 17:15:14 2017 +0300
----------------------------------------------------------------------
.../ignite/internal/GridJobSiblingImpl.java | 4 +-
.../internal/managers/GridManagerAdapter.java | 2 +-
.../checkpoint/GridCheckpointManager.java | 2 +-
.../managers/communication/GridIoManager.java | 206 +++++++------------
.../deployment/GridDeploymentCommunication.java | 6 +-
.../eventstorage/GridEventStorageManager.java | 6 +-
.../processors/cache/GridCacheIoManager.java | 8 +-
.../cache/transactions/IgniteTxManager.java | 6 +-
.../clock/GridClockSyncProcessor.java | 2 +-
.../continuous/GridContinuousProcessor.java | 2 +-
.../datastreamer/DataStreamProcessor.java | 2 +-
.../datastreamer/DataStreamerImpl.java | 2 +-
.../internal/processors/igfs/IgfsContext.java | 8 +-
.../processors/job/GridJobProcessor.java | 4 +-
.../internal/processors/job/GridJobWorker.java | 2 +-
.../marshaller/ClientRequestFuture.java | 2 +-
.../GridMarshallerMappingProcessor.java | 2 +-
.../handlers/task/GridTaskCommandHandler.java | 4 +-
.../processors/task/GridTaskProcessor.java | 2 +-
.../processors/task/GridTaskWorker.java | 4 +-
.../GridCommunicationSendMessageSelfTest.java | 2 +-
.../communication/GridIoManagerSelfTest.java | 28 +--
.../nio/IgniteExceptionInNioWorkerSelfTest.java | 2 +-
.../communication/GridIoManagerBenchmark.java | 4 +-
.../communication/GridIoManagerBenchmark0.java | 14 +-
.../communication/GridCacheMessageSelfTest.java | 2 +-
.../hadoop/shuffle/HadoopShuffle.java | 3 +-
.../processors/query/h2/IgniteH2Indexing.java | 2 +-
.../query/h2/twostep/GridMapQueryExecutor.java | 6 +-
.../h2/twostep/GridReduceQueryExecutor.java | 2 +-
30 files changed, 140 insertions(+), 201 deletions(-)
----------------------------------------------------------------------
[11/38] ignite git commit: ignite-4768
Posted by sb...@apache.org.
ignite-4768
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/35dad8fe
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/35dad8fe
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/35dad8fe
Branch: refs/heads/ignite-4768
Commit: 35dad8fe531366e604cc6210d97da4d3f60740bb
Parents: e9d8820
Author: sboikov <sb...@gridgain.com>
Authored: Thu Mar 9 11:37:24 2017 +0300
Committer: sboikov <sb...@gridgain.com>
Committed: Thu Mar 9 11:37:24 2017 +0300
----------------------------------------------------------------------
.../distributed/GridDistributedTxMapping.java | 31 +-------------------
...arOptimisticSerializableTxPrepareFuture.java | 13 ++++----
.../near/GridNearOptimisticTxPrepareFuture.java | 7 +++--
.../GridNearPessimisticTxPrepareFuture.java | 4 +--
.../near/GridNearTxPrepareFutureAdapter.java | 7 ++---
5 files changed, 18 insertions(+), 44 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ignite/blob/35dad8fe/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/GridDistributedTxMapping.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/GridDistributedTxMapping.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/GridDistributedTxMapping.java
index 2f04f58..f8cec50 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/GridDistributedTxMapping.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/GridDistributedTxMapping.java
@@ -17,10 +17,6 @@
package org.apache.ignite.internal.processors.cache.distributed;
-import java.io.Externalizable;
-import java.io.IOException;
-import java.io.ObjectInput;
-import java.io.ObjectOutput;
import java.util.Collection;
import java.util.Iterator;
import java.util.LinkedHashSet;
@@ -33,16 +29,12 @@ import org.apache.ignite.internal.util.tostring.GridToStringInclude;
import org.apache.ignite.internal.util.typedef.F;
import org.apache.ignite.internal.util.typedef.internal.CU;
import org.apache.ignite.internal.util.typedef.internal.S;
-import org.apache.ignite.internal.util.typedef.internal.U;
import org.jetbrains.annotations.Nullable;
/**
* Transaction node mapping.
*/
-public class GridDistributedTxMapping implements Externalizable {
- /** */
- private static final long serialVersionUID = 0L;
-
+public class GridDistributedTxMapping {
/** Mapped node. */
@GridToStringExclude
private ClusterNode primary;
@@ -67,13 +59,6 @@ public class GridDistributedTxMapping implements Externalizable {
private boolean clientFirst;
/**
- * Empty constructor required for {@link Externalizable}.
- */
- public GridDistributedTxMapping() {
- // No-op.
- }
-
- /**
* @param primary Primary node.
*/
public GridDistributedTxMapping(ClusterNode primary) {
@@ -235,20 +220,6 @@ public class GridDistributedTxMapping implements Externalizable {
}
/** {@inheritDoc} */
- @Override public void writeExternal(ObjectOutput out) throws IOException {
- out.writeObject(primary);
-
- U.writeCollection(out, entries);
- }
-
- /** {@inheritDoc} */
- @Override public void readExternal(ObjectInput in) throws IOException, ClassNotFoundException {
- primary = (ClusterNode)in.readObject();
-
- entries = U.readCollection(in);
- }
-
- /** {@inheritDoc} */
@Override public String toString() {
return S.toString(GridDistributedTxMapping.class, this, "node", primary.id());
}
http://git-wip-us.apache.org/repos/asf/ignite/blob/35dad8fe/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearOptimisticSerializableTxPrepareFuture.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearOptimisticSerializableTxPrepareFuture.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearOptimisticSerializableTxPrepareFuture.java
index 3176fa7..bb1609d 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearOptimisticSerializableTxPrepareFuture.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearOptimisticSerializableTxPrepareFuture.java
@@ -334,15 +334,15 @@ public class GridNearOptimisticSerializableTxPrepareFuture extends GridNearOptim
assert topVer.topologyVersion() > 0;
- txMapping = new GridDhtTxMapping();
+ GridDhtTxMapping txMapping = new GridDhtTxMapping();
Map<IgniteBiTuple<ClusterNode, Boolean>, GridDistributedTxMapping> mappings = new HashMap<>();
for (IgniteTxEntry write : writes)
- map(write, topVer, mappings, remap, topLocked);
+ map(write, topVer, mappings, txMapping, remap, topLocked);
for (IgniteTxEntry read : reads)
- map(read, topVer, mappings, remap, topLocked);
+ map(read, topVer, mappings, txMapping, remap, topLocked);
if (keyLockFut != null)
keyLockFut.onAllKeysAdded();
@@ -360,7 +360,7 @@ public class GridNearOptimisticSerializableTxPrepareFuture extends GridNearOptim
tx.transactionNodes(txMapping.transactionNodes());
- checkOnePhase();
+ checkOnePhase(txMapping);
int miniId = 0;
@@ -382,7 +382,7 @@ public class GridNearOptimisticSerializableTxPrepareFuture extends GridNearOptim
MiniFuture fut = (MiniFuture)fut0;
- IgniteCheckedException err = prepare(fut);
+ IgniteCheckedException err = prepare(fut, txMapping);
if (err != null) {
while (it.hasNext()) {
@@ -418,7 +418,7 @@ public class GridNearOptimisticSerializableTxPrepareFuture extends GridNearOptim
* @param fut Mini future.
* @return Prepare error if any.
*/
- @Nullable private IgniteCheckedException prepare(final MiniFuture fut) {
+ @Nullable private IgniteCheckedException prepare(final MiniFuture fut, GridDhtTxMapping txMapping) {
GridDistributedTxMapping m = fut.mapping();
final ClusterNode primary = m.primary();
@@ -523,6 +523,7 @@ public class GridNearOptimisticSerializableTxPrepareFuture extends GridNearOptim
IgniteTxEntry entry,
AffinityTopologyVersion topVer,
Map<IgniteBiTuple<ClusterNode, Boolean>, GridDistributedTxMapping> curMapping,
+ GridDhtTxMapping txMapping,
boolean remap,
boolean topLocked
) {
http://git-wip-us.apache.org/repos/asf/ignite/blob/35dad8fe/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearOptimisticTxPrepareFuture.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearOptimisticTxPrepareFuture.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearOptimisticTxPrepareFuture.java
index 9ef6f22..8bb79c1 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearOptimisticTxPrepareFuture.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearOptimisticTxPrepareFuture.java
@@ -78,6 +78,9 @@ public class GridNearOptimisticTxPrepareFuture extends GridNearOptimisticTxPrepa
/** */
private int miniId;
+ /** */
+ private GridDhtTxMapping txMapping;
+
/**
* @param cctx Context.
* @param tx Transaction.
@@ -380,7 +383,7 @@ public class GridNearOptimisticTxPrepareFuture extends GridNearOptimisticTxPrepa
tx.transactionNodes(txMapping.transactionNodes());
- checkOnePhase();
+ checkOnePhase(txMapping);
proceedPrepare(mapping, null);
}
@@ -449,7 +452,7 @@ public class GridNearOptimisticTxPrepareFuture extends GridNearOptimisticTxPrepa
tx.transactionNodes(txMapping.transactionNodes());
- checkOnePhase();
+ checkOnePhase(txMapping);
proceedPrepare(mappings);
}
http://git-wip-us.apache.org/repos/asf/ignite/blob/35dad8fe/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearPessimisticTxPrepareFuture.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearPessimisticTxPrepareFuture.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearPessimisticTxPrepareFuture.java
index caac48c..fb2c2fd 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearPessimisticTxPrepareFuture.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearPessimisticTxPrepareFuture.java
@@ -190,7 +190,7 @@ public class GridNearPessimisticTxPrepareFuture extends GridNearTxPrepareFutureA
AffinityTopologyVersion topVer = tx.topologyVersion();
- txMapping = new GridDhtTxMapping();
+ GridDhtTxMapping txMapping = new GridDhtTxMapping();
for (IgniteTxEntry txEntry : tx.allEntries()) {
txEntry.clearEntryReadVersion();
@@ -235,7 +235,7 @@ public class GridNearPessimisticTxPrepareFuture extends GridNearTxPrepareFutureA
tx.transactionNodes(txMapping.transactionNodes());
- checkOnePhase();
+ checkOnePhase(txMapping);
if (mappingKnown && tx.onePhaseCommit())
mappingKnown = false;
http://git-wip-us.apache.org/repos/asf/ignite/blob/35dad8fe/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearTxPrepareFutureAdapter.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearTxPrepareFutureAdapter.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearTxPrepareFutureAdapter.java
index 0ae98fd..a0f28c5 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearTxPrepareFutureAdapter.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearTxPrepareFutureAdapter.java
@@ -95,9 +95,6 @@ public abstract class GridNearTxPrepareFutureAdapter extends
/** Trackable flag. */
protected boolean trackable = true;
- /** Full information about transaction nodes mapping. */
- protected GridDhtTxMapping txMapping;
-
/**
* @param cctx Context.
* @param tx Transaction.
@@ -160,8 +157,10 @@ public abstract class GridNearTxPrepareFutureAdapter extends
/**
* Checks if mapped transaction can be committed on one phase.
* One-phase commit can be done if transaction maps to one primary node and not more than one backup.
+ *
+ * @param txMapping Transaction mapping.
*/
- protected final void checkOnePhase() {
+ protected final void checkOnePhase(GridDhtTxMapping txMapping) {
if (tx.storeUsed())
return;
[04/38] ignite git commit: ignite-4768
Posted by sb...@apache.org.
ignite-4768
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/90563792
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/90563792
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/90563792
Branch: refs/heads/ignite-4768
Commit: 90563792608a875b07e9298dc3f7942519c0852e
Parents: 91826bb
Author: sboikov <sb...@gridgain.com>
Authored: Tue Mar 7 10:24:41 2017 +0300
Committer: sboikov <sb...@gridgain.com>
Committed: Tue Mar 7 10:24:41 2017 +0300
----------------------------------------------------------------------
.../near/GridNearTxPrepareFutureAdapter.java | 8 ++--
.../near/GridNearTxPrepareResponse.java | 48 +++++---------------
2 files changed, 16 insertions(+), 40 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ignite/blob/90563792/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearTxPrepareFutureAdapter.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearTxPrepareFutureAdapter.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearTxPrepareFutureAdapter.java
index 6b95309..e25ffdd 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearTxPrepareFutureAdapter.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearTxPrepareFutureAdapter.java
@@ -189,7 +189,6 @@ public abstract class GridNearTxPrepareFutureAdapter extends
return;
assert res.error() == null : res;
- assert F.isEmpty(res.invalidPartitions()) : res;
UUID nodeId = m.node().id();
@@ -207,8 +206,11 @@ public abstract class GridNearTxPrepareFutureAdapter extends
CacheVersionedValue tup = entry.getValue();
- nearEntry.resetFromPrimary(tup.value(), tx.xidVersion(),
- tup.version(), nodeId, tx.topologyVersion());
+ nearEntry.resetFromPrimary(tup.value(),
+ tx.xidVersion(),
+ tup.version(),
+ nodeId,
+ tx.topologyVersion());
}
else if (txEntry.cached().detached()) {
GridDhtDetachedCacheEntry detachedEntry = (GridDhtDetachedCacheEntry)txEntry.cached();
http://git-wip-us.apache.org/repos/asf/ignite/blob/90563792/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearTxPrepareResponse.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearTxPrepareResponse.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearTxPrepareResponse.java
index 8812709..a374bdc 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearTxPrepareResponse.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearTxPrepareResponse.java
@@ -69,11 +69,6 @@ public class GridNearTxPrepareResponse extends GridDistributedTxPrepareResponse
/** Write version. */
private GridCacheVersion writeVer;
- /** */
- @GridToStringInclude
- @GridDirectCollection(int.class)
- private Collection<Integer> invalidParts;
-
/** Map of owned values to set on near node. */
@GridToStringInclude
@GridDirectTransient
@@ -252,13 +247,6 @@ public class GridNearTxPrepareResponse extends GridDistributedTxPrepareResponse
return ownedVals != null && ownedVals.containsKey(key);
}
- /**
- * @return Invalid partitions.
- */
- public Collection<Integer> invalidPartitions() {
- return invalidParts;
- }
-
/** {@inheritDoc}
* @param ctx*/
@Override public void prepareMarshal(GridCacheSharedContext ctx) throws IgniteCheckedException {
@@ -380,42 +368,36 @@ public class GridNearTxPrepareResponse extends GridDistributedTxPrepareResponse
writer.incrementState();
case 12:
- if (!writer.writeCollection("invalidParts", invalidParts, MessageCollectionItemType.INT))
- return false;
-
- writer.incrementState();
-
- case 13:
if (!writer.writeIgniteUuid("miniId", miniId))
return false;
writer.incrementState();
- case 14:
+ case 13:
if (!writer.writeCollection("ownedValKeys", ownedValKeys, MessageCollectionItemType.MSG))
return false;
writer.incrementState();
- case 15:
+ case 14:
if (!writer.writeCollection("ownedValVals", ownedValVals, MessageCollectionItemType.MSG))
return false;
writer.incrementState();
- case 16:
+ case 15:
if (!writer.writeCollection("pending", pending, MessageCollectionItemType.MSG))
return false;
writer.incrementState();
- case 17:
+ case 16:
if (!writer.writeMessage("retVal", retVal))
return false;
writer.incrementState();
- case 18:
+ case 17:
if (!writer.writeMessage("writeVer", writeVer))
return false;
@@ -470,14 +452,6 @@ public class GridNearTxPrepareResponse extends GridDistributedTxPrepareResponse
reader.incrementState();
case 12:
- invalidParts = reader.readCollection("invalidParts", MessageCollectionItemType.INT);
-
- if (!reader.isLastRead())
- return false;
-
- reader.incrementState();
-
- case 13:
miniId = reader.readIgniteUuid("miniId");
if (!reader.isLastRead())
@@ -485,7 +459,7 @@ public class GridNearTxPrepareResponse extends GridDistributedTxPrepareResponse
reader.incrementState();
- case 14:
+ case 13:
ownedValKeys = reader.readCollection("ownedValKeys", MessageCollectionItemType.MSG);
if (!reader.isLastRead())
@@ -493,7 +467,7 @@ public class GridNearTxPrepareResponse extends GridDistributedTxPrepareResponse
reader.incrementState();
- case 15:
+ case 14:
ownedValVals = reader.readCollection("ownedValVals", MessageCollectionItemType.MSG);
if (!reader.isLastRead())
@@ -501,7 +475,7 @@ public class GridNearTxPrepareResponse extends GridDistributedTxPrepareResponse
reader.incrementState();
- case 16:
+ case 15:
pending = reader.readCollection("pending", MessageCollectionItemType.MSG);
if (!reader.isLastRead())
@@ -509,7 +483,7 @@ public class GridNearTxPrepareResponse extends GridDistributedTxPrepareResponse
reader.incrementState();
- case 17:
+ case 16:
retVal = reader.readMessage("retVal");
if (!reader.isLastRead())
@@ -517,7 +491,7 @@ public class GridNearTxPrepareResponse extends GridDistributedTxPrepareResponse
reader.incrementState();
- case 18:
+ case 17:
writeVer = reader.readMessage("writeVer");
if (!reader.isLastRead())
@@ -537,7 +511,7 @@ public class GridNearTxPrepareResponse extends GridDistributedTxPrepareResponse
/** {@inheritDoc} */
@Override public byte fieldsCount() {
- return 19;
+ return 18;
}
/** {@inheritDoc} */
[19/38] ignite git commit: ignite-4768
Posted by sb...@apache.org.
http://git-wip-us.apache.org/repos/asf/ignite/blob/26316bb0/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearTxPrepareResponse.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearTxPrepareResponse.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearTxPrepareResponse.java
index d9b648c..66fe902 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearTxPrepareResponse.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearTxPrepareResponse.java
@@ -344,61 +344,61 @@ public class GridNearTxPrepareResponse extends GridDistributedTxPrepareResponse
}
switch (writer.state()) {
- case 8:
+ case 10:
if (!writer.writeMessage("clientRemapVer", clientRemapVer))
return false;
writer.incrementState();
- case 9:
+ case 11:
if (!writer.writeMessage("dhtVer", dhtVer))
return false;
writer.incrementState();
- case 10:
+ case 12:
if (!writer.writeCollection("filterFailedKeys", filterFailedKeys, MessageCollectionItemType.MSG))
return false;
writer.incrementState();
- case 11:
+ case 13:
if (!writer.writeIgniteUuid("futId", futId))
return false;
writer.incrementState();
- case 12:
+ case 14:
if (!writer.writeInt("miniId", miniId))
return false;
writer.incrementState();
- case 13:
+ case 15:
if (!writer.writeCollection("ownedValKeys", ownedValKeys, MessageCollectionItemType.MSG))
return false;
writer.incrementState();
- case 14:
+ case 16:
if (!writer.writeCollection("ownedValVals", ownedValVals, MessageCollectionItemType.MSG))
return false;
writer.incrementState();
- case 15:
+ case 17:
if (!writer.writeCollection("pending", pending, MessageCollectionItemType.MSG))
return false;
writer.incrementState();
- case 16:
+ case 18:
if (!writer.writeMessage("retVal", retVal))
return false;
writer.incrementState();
- case 17:
+ case 19:
if (!writer.writeMessage("writeVer", writeVer))
return false;
@@ -420,7 +420,7 @@ public class GridNearTxPrepareResponse extends GridDistributedTxPrepareResponse
return false;
switch (reader.state()) {
- case 8:
+ case 10:
clientRemapVer = reader.readMessage("clientRemapVer");
if (!reader.isLastRead())
@@ -428,7 +428,7 @@ public class GridNearTxPrepareResponse extends GridDistributedTxPrepareResponse
reader.incrementState();
- case 9:
+ case 11:
dhtVer = reader.readMessage("dhtVer");
if (!reader.isLastRead())
@@ -436,7 +436,7 @@ public class GridNearTxPrepareResponse extends GridDistributedTxPrepareResponse
reader.incrementState();
- case 10:
+ case 12:
filterFailedKeys = reader.readCollection("filterFailedKeys", MessageCollectionItemType.MSG);
if (!reader.isLastRead())
@@ -444,7 +444,7 @@ public class GridNearTxPrepareResponse extends GridDistributedTxPrepareResponse
reader.incrementState();
- case 11:
+ case 13:
futId = reader.readIgniteUuid("futId");
if (!reader.isLastRead())
@@ -452,7 +452,7 @@ public class GridNearTxPrepareResponse extends GridDistributedTxPrepareResponse
reader.incrementState();
- case 12:
+ case 14:
miniId = reader.readInt("miniId");
if (!reader.isLastRead())
@@ -460,7 +460,7 @@ public class GridNearTxPrepareResponse extends GridDistributedTxPrepareResponse
reader.incrementState();
- case 13:
+ case 15:
ownedValKeys = reader.readCollection("ownedValKeys", MessageCollectionItemType.MSG);
if (!reader.isLastRead())
@@ -468,7 +468,7 @@ public class GridNearTxPrepareResponse extends GridDistributedTxPrepareResponse
reader.incrementState();
- case 14:
+ case 16:
ownedValVals = reader.readCollection("ownedValVals", MessageCollectionItemType.MSG);
if (!reader.isLastRead())
@@ -476,7 +476,7 @@ public class GridNearTxPrepareResponse extends GridDistributedTxPrepareResponse
reader.incrementState();
- case 15:
+ case 17:
pending = reader.readCollection("pending", MessageCollectionItemType.MSG);
if (!reader.isLastRead())
@@ -484,7 +484,7 @@ public class GridNearTxPrepareResponse extends GridDistributedTxPrepareResponse
reader.incrementState();
- case 16:
+ case 18:
retVal = reader.readMessage("retVal");
if (!reader.isLastRead())
@@ -492,7 +492,7 @@ public class GridNearTxPrepareResponse extends GridDistributedTxPrepareResponse
reader.incrementState();
- case 17:
+ case 19:
writeVer = reader.readMessage("writeVer");
if (!reader.isLastRead())
@@ -512,7 +512,7 @@ public class GridNearTxPrepareResponse extends GridDistributedTxPrepareResponse
/** {@inheritDoc} */
@Override public byte fieldsCount() {
- return 18;
+ return 20;
}
/** {@inheritDoc} */
http://git-wip-us.apache.org/repos/asf/ignite/blob/26316bb0/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/transactions/IgniteTxHandler.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/transactions/IgniteTxHandler.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/transactions/IgniteTxHandler.java
index aaba610..22e6b69 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/transactions/IgniteTxHandler.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/transactions/IgniteTxHandler.java
@@ -582,7 +582,7 @@ public class IgniteTxHandler {
res.txState(tx.txState());
- fut.onResult(nodeId, res);
+ fut.onPrimaryResponse(nodeId, res);
}
/**
@@ -607,7 +607,7 @@ public class IgniteTxHandler {
return;
}
- fut.onResult(nodeId, res);
+ fut.onPrimaryResponse(nodeId, res);
}
/**
@@ -650,7 +650,7 @@ public class IgniteTxHandler {
assert nodeId != null;
assert res != null;
- if (res.checkCommitted()) {
+ if (res.nearNodeResponse() || res.checkCommitted()) {
GridNearTxFinishFuture fut = (GridNearTxFinishFuture)ctx.mvcc().<IgniteInternalTx>future(res.futureId());
if (fut == null) {
@@ -669,7 +669,7 @@ public class IgniteTxHandler {
", node=" + nodeId + ']');
}
- fut.onResult(nodeId, res);
+ fut.onDhtResponse(nodeId, res);
}
else {
GridDhtTxFinishFuture fut = (GridDhtTxFinishFuture)ctx.mvcc().<IgniteInternalTx>future(res.futureId());
@@ -803,8 +803,13 @@ public class IgniteTxHandler {
", commit=" + req.commit() + ']');
// Always send finish response.
- GridCacheMessage res = new GridNearTxFinishResponse(req.version(), req.threadId(), req.futureId(),
- req.miniId(), new IgniteCheckedException("Transaction has been already completed."));
+ GridCacheMessage res = new GridNearTxFinishResponse(
+ req.partition(),
+ req.version(),
+ req.threadId(),
+ req.futureId(),
+ req.miniId(),
+ new IgniteCheckedException("Transaction has been already completed."));
try {
ctx.io().send(nodeId, res, req.policy());
@@ -844,14 +849,9 @@ public class IgniteTxHandler {
try {
assert tx != null : "Transaction is null for near finish request [nodeId=" +
nodeId + ", req=" + req + "]";
+ assert req.syncMode() != null : req;
- if (req.syncMode() == null) {
- boolean sync = req.commit() ? req.syncCommit() : req.syncRollback();
-
- tx.syncMode(sync ? FULL_SYNC : FULL_ASYNC);
- }
- else
- tx.syncMode(req.syncMode());
+ tx.syncMode(req.syncMode());
if (req.commit()) {
tx.storeEnabled(req.storeEnabled());
@@ -1121,7 +1121,7 @@ public class IgniteTxHandler {
if (req.checkCommitted()) {
boolean committed = req.waitRemoteTransactions() || !ctx.tm().addRolledbackTx(null, req.version());
- if (!committed || !req.syncCommit())
+ if (!committed || req.syncMode() != FULL_SYNC)
sendReply(nodeId, req, committed, null);
else {
IgniteInternalFuture<?> fut = ctx.tm().remoteTxFinishFuture(req.version());
@@ -1359,7 +1359,11 @@ public class IgniteTxHandler {
*/
private void sendReply(UUID nodeId, GridDhtTxFinishRequest req, boolean committed, GridCacheVersion nearTxId) {
if (req.replyRequired() || req.checkCommitted()) {
- GridDhtTxFinishResponse res = new GridDhtTxFinishResponse(req.version(), req.futureId(), req.miniId());
+ GridDhtTxFinishResponse res = new GridDhtTxFinishResponse(
+ req.partition(),
+ req.version(),
+ req.futureId(),
+ req.miniId());
if (req.checkCommitted()) {
res.checkCommitted(true);
[20/38] ignite git commit: ignite-4768
Posted by sb...@apache.org.
ignite-4768
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/26316bb0
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/26316bb0
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/26316bb0
Branch: refs/heads/ignite-4768
Commit: 26316bb06d18569676af91c3d41671ebe3346533
Parents: 7cf4b98
Author: sboikov <sb...@gridgain.com>
Authored: Fri Mar 10 13:14:39 2017 +0300
Committer: sboikov <sb...@gridgain.com>
Committed: Fri Mar 10 15:10:12 2017 +0300
----------------------------------------------------------------------
.../GridDistributedTxFinishRequest.java | 217 +++++++++++++----
.../GridDistributedTxFinishResponse.java | 74 +++++-
.../GridDistributedTxPrepareResponse.java | 30 ++-
.../distributed/dht/GridDhtTxFinishFuture.java | 9 +-
.../distributed/dht/GridDhtTxFinishRequest.java | 241 +++++--------------
.../dht/GridDhtTxFinishResponse.java | 79 +++---
.../cache/distributed/dht/GridDhtTxLocal.java | 9 +-
.../distributed/dht/GridDhtTxPrepareFuture.java | 8 +-
.../dht/GridDhtTxPrepareResponse.java | 38 +--
...arOptimisticSerializableTxPrepareFuture.java | 7 +-
.../near/GridNearOptimisticTxPrepareFuture.java | 4 +-
.../GridNearPessimisticTxPrepareFuture.java | 5 +-
.../near/GridNearTxFinishFuture.java | 128 ++++++----
.../near/GridNearTxFinishRequest.java | 168 ++-----------
.../near/GridNearTxFinishResponse.java | 19 +-
.../near/GridNearTxPrepareFutureAdapter.java | 4 +-
.../near/GridNearTxPrepareResponse.java | 42 ++--
.../cache/transactions/IgniteTxHandler.java | 34 +--
18 files changed, 576 insertions(+), 540 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ignite/blob/26316bb0/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/GridDistributedTxFinishRequest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/GridDistributedTxFinishRequest.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/GridDistributedTxFinishRequest.java
index 3e47cc9..ab9f0ff 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/GridDistributedTxFinishRequest.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/GridDistributedTxFinishRequest.java
@@ -20,18 +20,24 @@ package org.apache.ignite.internal.processors.cache.distributed;
import java.io.Externalizable;
import java.nio.ByteBuffer;
import java.util.Collection;
+import java.util.UUID;
+import org.apache.ignite.IgniteLogger;
+import org.apache.ignite.cache.CacheWriteSynchronizationMode;
import org.apache.ignite.internal.GridDirectTransient;
+import org.apache.ignite.internal.processors.affinity.AffinityTopologyVersion;
+import org.apache.ignite.internal.processors.cache.GridCacheSharedContext;
import org.apache.ignite.internal.processors.cache.transactions.IgniteTxState;
import org.apache.ignite.internal.processors.cache.transactions.IgniteTxStateAware;
-import org.apache.ignite.IgniteLogger;
-import org.apache.ignite.internal.processors.cache.GridCacheSharedContext;
import org.apache.ignite.internal.processors.cache.version.GridCacheVersion;
import org.apache.ignite.internal.util.tostring.GridToStringBuilder;
import org.apache.ignite.lang.IgniteUuid;
import org.apache.ignite.plugin.extensions.communication.MessageReader;
import org.apache.ignite.plugin.extensions.communication.MessageWriter;
+import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable;
+import static org.apache.ignite.cache.CacheWriteSynchronizationMode.*;
+
/**
* Transaction completion message.
*/
@@ -39,6 +45,27 @@ public class GridDistributedTxFinishRequest extends GridDistributedBaseMessage i
/** */
private static final long serialVersionUID = 0L;
+ /** */
+ protected static final int WAIT_REMOTE_TX_FLAG_MASK = 0x01;
+
+ /** */
+ protected static final int CHECK_COMMITTED_FLAG_MASK = 0x02;
+
+ /** */
+ protected static final int NEED_RETURN_VALUE_FLAG_MASK = 0x04;
+
+ /** */
+ protected static final int SYS_INVALIDATE_FLAG_MASK = 0x08;
+
+ /** */
+ protected static final int EXPLICIT_LOCK_FLAG_MASK = 0x10;
+
+ /** */
+ protected static final int STORE_ENABLED_FLAG_MASK = 0x20;
+
+ /** Topology version. */
+ private AffinityTopologyVersion topVer;
+
/** Future ID. */
private IgniteUuid futId;
@@ -54,14 +81,6 @@ public class GridDistributedTxFinishRequest extends GridDistributedBaseMessage i
/** Commit flag. */
private boolean commit;
- /** Sync commit flag. */
- @Deprecated
- private boolean syncCommit;
-
- /** Sync commit flag. */
- @Deprecated
- private boolean syncRollback;
-
/** Min version used as base for completed versions. */
private GridCacheVersion baseVer;
@@ -74,6 +93,18 @@ public class GridDistributedTxFinishRequest extends GridDistributedBaseMessage i
/** IO policy. */
private byte plc;
+ /** Subject ID. */
+ private UUID subjId;
+
+ /** Task name hash. */
+ private int taskNameHash;
+
+ /** */
+ private byte flags;
+
+ /** Write synchronization mode. */
+ private CacheWriteSynchronizationMode syncMode;
+
/** Transient TX state. */
@GridDirectTransient
private IgniteTxState txState;
@@ -94,8 +125,7 @@ public class GridDistributedTxFinishRequest extends GridDistributedBaseMessage i
* @param invalidate Invalidate flag.
* @param sys System transaction flag.
* @param plc IO policy.
- * @param syncCommit Sync commit flag.
- * @param syncRollback Sync rollback flag.
+ * @param syncMode Write synchronization mode.
* @param baseVer Base version.
* @param committedVers Committed versions.
* @param rolledbackVers Rolled back versions.
@@ -105,39 +135,93 @@ public class GridDistributedTxFinishRequest extends GridDistributedBaseMessage i
public GridDistributedTxFinishRequest(
GridCacheVersion xidVer,
IgniteUuid futId,
+ @NotNull AffinityTopologyVersion topVer,
@Nullable GridCacheVersion commitVer,
long threadId,
boolean commit,
boolean invalidate,
boolean sys,
byte plc,
- boolean syncCommit,
- boolean syncRollback,
+ CacheWriteSynchronizationMode syncMode,
GridCacheVersion baseVer,
Collection<GridCacheVersion> committedVers,
Collection<GridCacheVersion> rolledbackVers,
+ @Nullable UUID subjId,
+ int taskNameHash,
int txSize,
boolean addDepInfo
) {
super(xidVer, 0, addDepInfo);
+
assert xidVer != null;
+ assert syncMode != null;
this.futId = futId;
+ this.topVer = topVer;
this.commitVer = commitVer;
this.threadId = threadId;
this.commit = commit;
this.invalidate = invalidate;
this.sys = sys;
this.plc = plc;
- this.syncCommit = syncCommit;
- this.syncRollback = syncRollback;
+ this.syncMode = syncMode;
this.baseVer = baseVer;
+ this.subjId = subjId;
+ this.taskNameHash = taskNameHash;
this.txSize = txSize;
completedVersions(committedVers, rolledbackVers);
}
/**
+ * @return Transaction write synchronization mode (can be null is message sent from old nodes).
+ */
+ public final CacheWriteSynchronizationMode syncMode() {
+ return syncMode;
+ }
+
+ /**
+ * Sets flag mask.
+ *
+ * @param flag Set or clear.
+ * @param mask Mask.
+ */
+ protected final void setFlag(boolean flag, int mask) {
+ flags = flag ? (byte)(flags | mask) : (byte)(flags & ~mask);
+ }
+
+ /**
+ * Reags flag mask.
+ *
+ * @param mask Mask to read.
+ * @return Flag value.
+ */
+ protected final boolean isFlag(int mask) {
+ return (flags & mask) != 0;
+ }
+
+ /**
+ * @return Subject ID.
+ */
+ @Nullable public final UUID subjectId() {
+ return subjId;
+ }
+
+ /**
+ * @return Task name hash.
+ */
+ public final int taskNameHash() {
+ return taskNameHash;
+ }
+
+ /**
+ * @return Topology version.
+ */
+ @Override public final AffinityTopologyVersion topologyVersion() {
+ return topVer;
+ }
+
+ /**
* @return System transaction flag.
*/
public boolean system() {
@@ -188,27 +272,6 @@ public class GridDistributedTxFinishRequest extends GridDistributedBaseMessage i
}
/**
- * @return Sync commit flag.
- */
- public boolean syncCommit() {
- return syncCommit;
- }
-
- /**
- * @param syncCommit Sync commit flag.
- */
- public void syncCommit(boolean syncCommit) {
- this.syncCommit = syncCommit;
- }
-
- /**
- * @return Sync rollback flag.
- */
- public boolean syncRollback() {
- return syncRollback;
- }
-
- /**
* @return Base version.
*/
public GridCacheVersion baseVersion() {
@@ -227,7 +290,9 @@ public class GridDistributedTxFinishRequest extends GridDistributedBaseMessage i
* @return {@code True} if reply is required.
*/
public boolean replyRequired() {
- return commit ? syncCommit : syncRollback;
+ assert syncMode != null;
+
+ return syncMode == FULL_SYNC;
}
/** {@inheritDoc} */
@@ -279,48 +344,66 @@ public class GridDistributedTxFinishRequest extends GridDistributedBaseMessage i
writer.incrementState();
case 10:
- if (!writer.writeIgniteUuid("futId", futId))
+ if (!writer.writeByte("flags", flags))
return false;
writer.incrementState();
case 11:
- if (!writer.writeBoolean("invalidate", invalidate))
+ if (!writer.writeIgniteUuid("futId", futId))
return false;
writer.incrementState();
case 12:
- if (!writer.writeByte("plc", plc))
+ if (!writer.writeBoolean("invalidate", invalidate))
return false;
writer.incrementState();
case 13:
- if (!writer.writeBoolean("syncCommit", syncCommit))
+ if (!writer.writeByte("plc", plc))
return false;
writer.incrementState();
case 14:
- if (!writer.writeBoolean("syncRollback", syncRollback))
+ if (!writer.writeUuid("subjId", subjId))
return false;
writer.incrementState();
case 15:
- if (!writer.writeBoolean("sys", sys))
+ if (!writer.writeByte("syncMode", syncMode != null ? (byte)syncMode.ordinal() : -1))
return false;
writer.incrementState();
case 16:
- if (!writer.writeLong("threadId", threadId))
+ if (!writer.writeBoolean("sys", sys))
return false;
writer.incrementState();
case 17:
+ if (!writer.writeInt("taskNameHash", taskNameHash))
+ return false;
+
+ writer.incrementState();
+
+ case 18:
+ if (!writer.writeLong("threadId", threadId))
+ return false;
+
+ writer.incrementState();
+
+ case 19:
+ if (!writer.writeMessage("topVer", topVer))
+ return false;
+
+ writer.incrementState();
+
+ case 20:
if (!writer.writeInt("txSize", txSize))
return false;
@@ -367,7 +450,7 @@ public class GridDistributedTxFinishRequest extends GridDistributedBaseMessage i
reader.incrementState();
case 10:
- futId = reader.readIgniteUuid("futId");
+ flags = reader.readByte("flags");
if (!reader.isLastRead())
return false;
@@ -375,7 +458,7 @@ public class GridDistributedTxFinishRequest extends GridDistributedBaseMessage i
reader.incrementState();
case 11:
- invalidate = reader.readBoolean("invalidate");
+ futId = reader.readIgniteUuid("futId");
if (!reader.isLastRead())
return false;
@@ -383,7 +466,7 @@ public class GridDistributedTxFinishRequest extends GridDistributedBaseMessage i
reader.incrementState();
case 12:
- plc = reader.readByte("plc");
+ invalidate = reader.readBoolean("invalidate");
if (!reader.isLastRead())
return false;
@@ -391,7 +474,7 @@ public class GridDistributedTxFinishRequest extends GridDistributedBaseMessage i
reader.incrementState();
case 13:
- syncCommit = reader.readBoolean("syncCommit");
+ plc = reader.readByte("plc");
if (!reader.isLastRead())
return false;
@@ -399,7 +482,7 @@ public class GridDistributedTxFinishRequest extends GridDistributedBaseMessage i
reader.incrementState();
case 14:
- syncRollback = reader.readBoolean("syncRollback");
+ subjId = reader.readUuid("subjId");
if (!reader.isLastRead())
return false;
@@ -407,15 +490,19 @@ public class GridDistributedTxFinishRequest extends GridDistributedBaseMessage i
reader.incrementState();
case 15:
- sys = reader.readBoolean("sys");
+ byte syncModeOrd;
+
+ syncModeOrd = reader.readByte("syncMode");
if (!reader.isLastRead())
return false;
+ syncMode = CacheWriteSynchronizationMode.fromOrdinal(syncModeOrd);
+
reader.incrementState();
case 16:
- threadId = reader.readLong("threadId");
+ sys = reader.readBoolean("sys");
if (!reader.isLastRead())
return false;
@@ -423,6 +510,30 @@ public class GridDistributedTxFinishRequest extends GridDistributedBaseMessage i
reader.incrementState();
case 17:
+ taskNameHash = reader.readInt("taskNameHash");
+
+ if (!reader.isLastRead())
+ return false;
+
+ reader.incrementState();
+
+ case 18:
+ threadId = reader.readLong("threadId");
+
+ if (!reader.isLastRead())
+ return false;
+
+ reader.incrementState();
+
+ case 19:
+ topVer = reader.readMessage("topVer");
+
+ if (!reader.isLastRead())
+ return false;
+
+ reader.incrementState();
+
+ case 20:
txSize = reader.readInt("txSize");
if (!reader.isLastRead())
@@ -442,7 +553,7 @@ public class GridDistributedTxFinishRequest extends GridDistributedBaseMessage i
/** {@inheritDoc} */
@Override public byte fieldsCount() {
- return 18;
+ return 21;
}
/** {@inheritDoc} */
http://git-wip-us.apache.org/repos/asf/ignite/blob/26316bb0/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/GridDistributedTxFinishResponse.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/GridDistributedTxFinishResponse.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/GridDistributedTxFinishResponse.java
index 109d665..1f61033 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/GridDistributedTxFinishResponse.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/GridDistributedTxFinishResponse.java
@@ -20,10 +20,12 @@ package org.apache.ignite.internal.processors.cache.distributed;
import java.io.Externalizable;
import java.nio.ByteBuffer;
import org.apache.ignite.IgniteLogger;
+import org.apache.ignite.internal.managers.communication.GridIoMessageFactory;
import org.apache.ignite.internal.processors.cache.GridCacheMessage;
import org.apache.ignite.internal.processors.cache.GridCacheSharedContext;
import org.apache.ignite.internal.processors.cache.version.GridCacheVersion;
import org.apache.ignite.internal.util.tostring.GridToStringBuilder;
+import org.apache.ignite.internal.util.tostring.GridToStringExclude;
import org.apache.ignite.lang.IgniteUuid;
import org.apache.ignite.plugin.extensions.communication.MessageReader;
import org.apache.ignite.plugin.extensions.communication.MessageWriter;
@@ -41,25 +43,59 @@ public class GridDistributedTxFinishResponse extends GridCacheMessage {
/** Future ID. */
private IgniteUuid futId;
+ /** */
+ @GridToStringExclude
+ private byte flags;
+
+ /** */
+ private int part;
+
/**
- * Empty constructor required by {@link Externalizable}.
+ * Empty constructor required by {@link GridIoMessageFactory}.
*/
public GridDistributedTxFinishResponse() {
/* No-op. */
}
/**
+ * @param part Partition.
* @param txId Transaction id.
* @param futId Future ID.
*/
- public GridDistributedTxFinishResponse(GridCacheVersion txId, IgniteUuid futId) {
+ public GridDistributedTxFinishResponse(int part, GridCacheVersion txId, IgniteUuid futId) {
assert txId != null;
assert futId != null;
+ this.part = part;
this.txId = txId;
this.futId = futId;
}
+ /** {@inheritDoc} */
+ @Override public final int partition() {
+ return part;
+ }
+
+ /**
+ * Sets flag mask.
+ *
+ * @param flag Set or clear.
+ * @param mask Mask.
+ */
+ protected final void setFlag(boolean flag, int mask) {
+ flags = flag ? (byte)(flags | mask) : (byte)(flags & ~mask);
+ }
+
+ /**
+ * Reags flag mask.
+ *
+ * @param mask Mask to read.
+ * @return Flag value.
+ */
+ protected final boolean isFlag(int mask) {
+ return (flags & mask) != 0;
+ }
+
/**
*
* @return Transaction id.
@@ -101,12 +137,24 @@ public class GridDistributedTxFinishResponse extends GridCacheMessage {
switch (writer.state()) {
case 3:
- if (!writer.writeIgniteUuid("futId", futId))
+ if (!writer.writeByte("flags", flags))
return false;
writer.incrementState();
case 4:
+ if (!writer.writeIgniteUuid("futId", futId))
+ return false;
+
+ writer.incrementState();
+
+ case 5:
+ if (!writer.writeInt("part", part))
+ return false;
+
+ writer.incrementState();
+
+ case 6:
if (!writer.writeMessage("txId", txId))
return false;
@@ -129,7 +177,7 @@ public class GridDistributedTxFinishResponse extends GridCacheMessage {
switch (reader.state()) {
case 3:
- futId = reader.readIgniteUuid("futId");
+ flags = reader.readByte("flags");
if (!reader.isLastRead())
return false;
@@ -137,6 +185,22 @@ public class GridDistributedTxFinishResponse extends GridCacheMessage {
reader.incrementState();
case 4:
+ futId = reader.readIgniteUuid("futId");
+
+ if (!reader.isLastRead())
+ return false;
+
+ reader.incrementState();
+
+ case 5:
+ part = reader.readInt("part");
+
+ if (!reader.isLastRead())
+ return false;
+
+ reader.incrementState();
+
+ case 6:
txId = reader.readMessage("txId");
if (!reader.isLastRead())
@@ -156,7 +220,7 @@ public class GridDistributedTxFinishResponse extends GridCacheMessage {
/** {@inheritDoc} */
@Override public byte fieldsCount() {
- return 5;
+ return 7;
}
/** {@inheritDoc} */
http://git-wip-us.apache.org/repos/asf/ignite/blob/26316bb0/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/GridDistributedTxPrepareResponse.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/GridDistributedTxPrepareResponse.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/GridDistributedTxPrepareResponse.java
index c19b8c1..53a1391 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/GridDistributedTxPrepareResponse.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/GridDistributedTxPrepareResponse.java
@@ -184,6 +184,18 @@ public class GridDistributedTxPrepareResponse extends GridDistributedBaseMessage
writer.incrementState();
+ case 8:
+ if (!writer.writeByte("flags", flags))
+ return false;
+
+ writer.incrementState();
+
+ case 9:
+ if (!writer.writeInt("part", part))
+ return false;
+
+ writer.incrementState();
+
}
return true;
@@ -208,6 +220,22 @@ public class GridDistributedTxPrepareResponse extends GridDistributedBaseMessage
reader.incrementState();
+ case 8:
+ flags = reader.readByte("flags");
+
+ if (!reader.isLastRead())
+ return false;
+
+ reader.incrementState();
+
+ case 9:
+ part = reader.readInt("part");
+
+ if (!reader.isLastRead())
+ return false;
+
+ reader.incrementState();
+
}
return reader.afterMessageRead(GridDistributedTxPrepareResponse.class);
@@ -220,7 +248,7 @@ public class GridDistributedTxPrepareResponse extends GridDistributedBaseMessage
/** {@inheritDoc} */
@Override public byte fieldsCount() {
- return 8;
+ return 10;
}
/** {@inheritDoc} */
http://git-wip-us.apache.org/repos/asf/ignite/blob/26316bb0/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtTxFinishFuture.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtTxFinishFuture.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtTxFinishFuture.java
index 5d4e610..7011996 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtTxFinishFuture.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtTxFinishFuture.java
@@ -325,8 +325,7 @@ public final class GridDhtTxFinishFuture<K, V> extends GridCompoundIdentityFutur
tx.system(),
tx.ioPolicy(),
tx.isSystemInvalidate(),
- sync,
- sync,
+ sync ? FULL_SYNC : tx.syncMode(),
tx.completedBase(),
tx.committedVersions(),
tx.rolledbackVersions(),
@@ -426,8 +425,7 @@ public final class GridDhtTxFinishFuture<K, V> extends GridCompoundIdentityFutur
tx.system(),
tx.ioPolicy(),
tx.isSystemInvalidate(),
- sync,
- sync,
+ sync ? FULL_SYNC : tx.syncMode(),
tx.completedBase(),
tx.committedVersions(),
tx.rolledbackVersions(),
@@ -497,8 +495,7 @@ public final class GridDhtTxFinishFuture<K, V> extends GridCompoundIdentityFutur
tx.system(),
tx.ioPolicy(),
tx.isSystemInvalidate(),
- sync,
- sync,
+ sync ? FULL_SYNC : tx.syncMode(),
tx.completedBase(),
tx.committedVersions(),
tx.rolledbackVersions(),
http://git-wip-us.apache.org/repos/asf/ignite/blob/26316bb0/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtTxFinishRequest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtTxFinishRequest.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtTxFinishRequest.java
index c618a18..7194848 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtTxFinishRequest.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtTxFinishRequest.java
@@ -21,6 +21,7 @@ import java.io.Externalizable;
import java.nio.ByteBuffer;
import java.util.Collection;
import java.util.UUID;
+import org.apache.ignite.cache.CacheWriteSynchronizationMode;
import org.apache.ignite.internal.GridDirectCollection;
import org.apache.ignite.internal.processors.affinity.AffinityTopologyVersion;
import org.apache.ignite.internal.processors.cache.distributed.GridDistributedTxFinishRequest;
@@ -43,12 +44,6 @@ public class GridDhtTxFinishRequest extends GridDistributedTxFinishRequest {
/** */
private static final long serialVersionUID = 0L;
- /** */
- public static final int WAIT_REMOTE_TX_FLAG_MASK = 0x01;
-
- /** */
- public static final int NEED_RETURN_VALUE_FLAG_MASK = 0x02;
-
/** Near node ID. */
private UUID nearNodeId;
@@ -58,20 +53,11 @@ public class GridDhtTxFinishRequest extends GridDistributedTxFinishRequest {
/** Mini future ID. */
private IgniteUuid miniId;
- /** System invalidation flag. */
- private boolean sysInvalidate;
-
- /** Topology version. */
- private AffinityTopologyVersion topVer;
-
/** Pending versions with order less than one for this message (needed for commit ordering). */
@GridToStringInclude
@GridDirectCollection(GridCacheVersion.class)
private Collection<GridCacheVersion> pendingVers;
- /** Check committed flag. */
- private boolean checkCommitted;
-
/** Partition update counter. */
@GridToStringInclude
@GridDirectCollection(Long.class)
@@ -80,15 +66,6 @@ public class GridDhtTxFinishRequest extends GridDistributedTxFinishRequest {
/** One phase commit write version. */
private GridCacheVersion writeVer;
- /** Subject ID. */
- private UUID subjId;
-
- /** Task name hash. */
- private int taskNameHash;
-
- /** */
- private byte flags;
-
/**
* Empty constructor required for {@link Externalizable}.
*/
@@ -110,8 +87,7 @@ public class GridDhtTxFinishRequest extends GridDistributedTxFinishRequest {
* @param sys System flag.
* @param plc IO policy.
* @param sysInvalidate System invalidation flag.
- * @param syncCommit Synchronous commit flag.
- * @param syncRollback Synchronous rollback flag.
+ * @param syncMode Write synchronization mode.
* @param baseVer Base version.
* @param committedVers Committed versions.
* @param rolledbackVers Rolled back versions.
@@ -135,8 +111,7 @@ public class GridDhtTxFinishRequest extends GridDistributedTxFinishRequest {
boolean sys,
byte plc,
boolean sysInvalidate,
- boolean syncCommit,
- boolean syncRollback,
+ CacheWriteSynchronizationMode syncMode,
GridCacheVersion baseVer,
Collection<GridCacheVersion> committedVers,
Collection<GridCacheVersion> rolledbackVers,
@@ -151,17 +126,19 @@ public class GridDhtTxFinishRequest extends GridDistributedTxFinishRequest {
super(
xidVer,
futId,
+ topVer,
commitVer,
threadId,
commit,
invalidate,
sys,
plc,
- syncCommit,
- syncRollback,
+ syncMode,
baseVer,
committedVers,
rolledbackVers,
+ subjId,
+ taskNameHash,
txSize,
addDepInfo);
@@ -170,16 +147,13 @@ public class GridDhtTxFinishRequest extends GridDistributedTxFinishRequest {
assert isolation != null;
this.pendingVers = pendingVers;
- this.topVer = topVer;
this.nearNodeId = nearNodeId;
this.isolation = isolation;
this.miniId = miniId;
- this.sysInvalidate = sysInvalidate;
- this.subjId = subjId;
- this.taskNameHash = taskNameHash;
needReturnValue(retVal);
waitRemoteTransactions(waitRemoteTxs);
+ systemInvalidate(sysInvalidate);
}
/**
@@ -196,8 +170,7 @@ public class GridDhtTxFinishRequest extends GridDistributedTxFinishRequest {
* @param sys System flag.
* @param plc IO policy.
* @param sysInvalidate System invalidation flag.
- * @param syncCommit Synchronous commit flag.
- * @param syncRollback Synchronous rollback flag.
+ * @param syncMode Write synchronization mode.
* @param baseVer Base version.
* @param committedVers Committed versions.
* @param rolledbackVers Rolled back versions.
@@ -222,8 +195,7 @@ public class GridDhtTxFinishRequest extends GridDistributedTxFinishRequest {
boolean sys,
byte plc,
boolean sysInvalidate,
- boolean syncCommit,
- boolean syncRollback,
+ CacheWriteSynchronizationMode syncMode,
GridCacheVersion baseVer,
Collection<GridCacheVersion> committedVers,
Collection<GridCacheVersion> rolledbackVers,
@@ -236,9 +208,30 @@ public class GridDhtTxFinishRequest extends GridDistributedTxFinishRequest {
boolean retVal,
boolean waitRemoteTxs
) {
- this(nearNodeId, futId, miniId, topVer, xidVer, commitVer, threadId, isolation, commit, invalidate, sys, plc,
- sysInvalidate, syncCommit, syncRollback, baseVer, committedVers, rolledbackVers, pendingVers, txSize,
- subjId, taskNameHash, addDepInfo, retVal, waitRemoteTxs);
+ this(nearNodeId,
+ futId,
+ miniId,
+ topVer,
+ xidVer,
+ commitVer,
+ threadId,
+ isolation,
+ commit,
+ invalidate,
+ sys,
+ plc,
+ sysInvalidate,
+ syncMode,
+ baseVer,
+ committedVers,
+ rolledbackVers,
+ pendingVers,
+ txSize,
+ subjId,
+ taskNameHash,
+ addDepInfo,
+ retVal,
+ waitRemoteTxs);
if (updateIdxs != null && !updateIdxs.isEmpty()) {
partUpdateCnt = new GridLongList(updateIdxs.size());
@@ -263,20 +256,6 @@ public class GridDhtTxFinishRequest extends GridDistributedTxFinishRequest {
}
/**
- * @return Subject ID.
- */
- @Nullable public UUID subjectId() {
- return subjId;
- }
-
- /**
- * @return Task name hash.
- */
- public int taskNameHash() {
- return taskNameHash;
- }
-
- /**
* @return Transaction isolation.
*/
public TransactionIsolation isolation() {
@@ -294,7 +273,14 @@ public class GridDhtTxFinishRequest extends GridDistributedTxFinishRequest {
* @return System invalidate flag.
*/
public boolean isSystemInvalidate() {
- return sysInvalidate;
+ return isFlag(SYS_INVALIDATE_FLAG_MASK);
+ }
+
+ /**
+ * @param sysInvalidate System invalidation flag.
+ */
+ private void systemInvalidate(boolean sysInvalidate) {
+ setFlag(sysInvalidate, SYS_INVALIDATE_FLAG_MASK);
}
/**
@@ -312,63 +298,45 @@ public class GridDhtTxFinishRequest extends GridDistributedTxFinishRequest {
}
/**
- * @return Topology version.
- */
- @Override public AffinityTopologyVersion topologyVersion() {
- return topVer;
- }
-
- /**
* @return Check committed flag.
*/
public boolean checkCommitted() {
- return checkCommitted;
+ return isFlag(CHECK_COMMITTED_FLAG_MASK);
}
/**
* @param checkCommitted Check committed flag.
*/
public void checkCommitted(boolean checkCommitted) {
- this.checkCommitted = checkCommitted;
+ setFlag(checkCommitted, CHECK_COMMITTED_FLAG_MASK);
}
/**
* @return {@code True}
*/
public boolean waitRemoteTransactions() {
- return (flags & WAIT_REMOTE_TX_FLAG_MASK) != 0;
+ return isFlag(WAIT_REMOTE_TX_FLAG_MASK);
}
/**
* @param waitRemoteTxs Wait remote transactions flag.
*/
- public void waitRemoteTransactions(boolean waitRemoteTxs) {
- if (waitRemoteTxs)
- flags = (byte)(flags | WAIT_REMOTE_TX_FLAG_MASK);
- else
- flags &= ~WAIT_REMOTE_TX_FLAG_MASK;
+ private void waitRemoteTransactions(boolean waitRemoteTxs) {
+ setFlag(waitRemoteTxs, WAIT_REMOTE_TX_FLAG_MASK);
}
/**
* @return Flag indicating whether transaction needs return value.
*/
public boolean needReturnValue() {
- return (flags & NEED_RETURN_VALUE_FLAG_MASK) != 0;
+ return isFlag(NEED_RETURN_VALUE_FLAG_MASK);
}
/**
* @param retVal Need return value.
*/
public void needReturnValue(boolean retVal) {
- if (retVal)
- flags = (byte)(flags | NEED_RETURN_VALUE_FLAG_MASK);
- else
- flags &= ~NEED_RETURN_VALUE_FLAG_MASK;
- }
-
- /** {@inheritDoc} */
- @Override public String toString() {
- return S.toString(GridDhtTxFinishRequest.class, this, super.toString());
+ setFlag(retVal, NEED_RETURN_VALUE_FLAG_MASK);
}
/** {@inheritDoc} */
@@ -386,73 +354,37 @@ public class GridDhtTxFinishRequest extends GridDistributedTxFinishRequest {
}
switch (writer.state()) {
- case 18:
- if (!writer.writeBoolean("checkCommitted", checkCommitted))
- return false;
-
- writer.incrementState();
-
- case 19:
- if (!writer.writeByte("flags", flags))
- return false;
-
- writer.incrementState();
-
- case 20:
- if (!writer.writeByte("isolation", isolation != null ? (byte)isolation.ordinal() : -1))
- return false;
-
- writer.incrementState();
-
case 21:
- if (!writer.writeIgniteUuid("miniId", miniId))
+ if (!writer.writeByte("isolation", isolation != null ? (byte)isolation.ordinal() : -1))
return false;
writer.incrementState();
case 22:
- if (!writer.writeUuid("nearNodeId", nearNodeId))
+ if (!writer.writeIgniteUuid("miniId", miniId))
return false;
writer.incrementState();
case 23:
- if (!writer.writeMessage("partUpdateCnt", partUpdateCnt))
+ if (!writer.writeUuid("nearNodeId", nearNodeId))
return false;
writer.incrementState();
case 24:
- if (!writer.writeCollection("pendingVers", pendingVers, MessageCollectionItemType.MSG))
+ if (!writer.writeMessage("partUpdateCnt", partUpdateCnt))
return false;
writer.incrementState();
case 25:
- if (!writer.writeUuid("subjId", subjId))
+ if (!writer.writeCollection("pendingVers", pendingVers, MessageCollectionItemType.MSG))
return false;
writer.incrementState();
case 26:
- if (!writer.writeBoolean("sysInvalidate", sysInvalidate))
- return false;
-
- writer.incrementState();
-
- case 27:
- if (!writer.writeInt("taskNameHash", taskNameHash))
- return false;
-
- writer.incrementState();
-
- case 28:
- if (!writer.writeMessage("topVer", topVer))
- return false;
-
- writer.incrementState();
-
- case 29:
if (!writer.writeMessage("writeVer", writeVer))
return false;
@@ -474,23 +406,7 @@ public class GridDhtTxFinishRequest extends GridDistributedTxFinishRequest {
return false;
switch (reader.state()) {
- case 18:
- checkCommitted = reader.readBoolean("checkCommitted");
-
- if (!reader.isLastRead())
- return false;
-
- reader.incrementState();
-
- case 19:
- flags = reader.readByte("flags");
-
- if (!reader.isLastRead())
- return false;
-
- reader.incrementState();
-
- case 20:
+ case 21:
byte isolationOrd;
isolationOrd = reader.readByte("isolation");
@@ -502,16 +418,8 @@ public class GridDhtTxFinishRequest extends GridDistributedTxFinishRequest {
reader.incrementState();
- case 21:
- miniId = reader.readIgniteUuid("miniId");
-
- if (!reader.isLastRead())
- return false;
-
- reader.incrementState();
-
case 22:
- nearNodeId = reader.readUuid("nearNodeId");
+ miniId = reader.readIgniteUuid("miniId");
if (!reader.isLastRead())
return false;
@@ -519,7 +427,7 @@ public class GridDhtTxFinishRequest extends GridDistributedTxFinishRequest {
reader.incrementState();
case 23:
- partUpdateCnt = reader.readMessage("partUpdateCnt");
+ nearNodeId = reader.readUuid("nearNodeId");
if (!reader.isLastRead())
return false;
@@ -527,7 +435,7 @@ public class GridDhtTxFinishRequest extends GridDistributedTxFinishRequest {
reader.incrementState();
case 24:
- pendingVers = reader.readCollection("pendingVers", MessageCollectionItemType.MSG);
+ partUpdateCnt = reader.readMessage("partUpdateCnt");
if (!reader.isLastRead())
return false;
@@ -535,7 +443,7 @@ public class GridDhtTxFinishRequest extends GridDistributedTxFinishRequest {
reader.incrementState();
case 25:
- subjId = reader.readUuid("subjId");
+ pendingVers = reader.readCollection("pendingVers", MessageCollectionItemType.MSG);
if (!reader.isLastRead())
return false;
@@ -543,30 +451,6 @@ public class GridDhtTxFinishRequest extends GridDistributedTxFinishRequest {
reader.incrementState();
case 26:
- sysInvalidate = reader.readBoolean("sysInvalidate");
-
- if (!reader.isLastRead())
- return false;
-
- reader.incrementState();
-
- case 27:
- taskNameHash = reader.readInt("taskNameHash");
-
- if (!reader.isLastRead())
- return false;
-
- reader.incrementState();
-
- case 28:
- topVer = reader.readMessage("topVer");
-
- if (!reader.isLastRead())
- return false;
-
- reader.incrementState();
-
- case 29:
writeVer = reader.readMessage("writeVer");
if (!reader.isLastRead())
@@ -586,6 +470,11 @@ public class GridDhtTxFinishRequest extends GridDistributedTxFinishRequest {
/** {@inheritDoc} */
@Override public byte fieldsCount() {
- return 30;
+ return 27;
+ }
+
+ /** {@inheritDoc} */
+ @Override public String toString() {
+ return S.toString(GridDhtTxFinishRequest.class, this, super.toString());
}
}
http://git-wip-us.apache.org/repos/asf/ignite/blob/26316bb0/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtTxFinishResponse.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtTxFinishResponse.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtTxFinishResponse.java
index 8fb1f4e..4808289 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtTxFinishResponse.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtTxFinishResponse.java
@@ -39,6 +39,12 @@ public class GridDhtTxFinishResponse extends GridDistributedTxFinishResponse {
/** */
private static final long serialVersionUID = 0L;
+ /** */
+ private static final int NEAR_RES_FLAG_MASK = 0x01;
+
+ /** Flag indicating if this is a check-committed response. */
+ private static final int CHECK_COMMITTED_FLAG_MASK = 0x02;
+
/** Mini future ID. */
private IgniteUuid miniId;
@@ -49,9 +55,6 @@ public class GridDhtTxFinishResponse extends GridDistributedTxFinishResponse {
/** Serialized error. */
private byte[] checkCommittedErrBytes;
- /** Flag indicating if this is a check-committed response. */
- private boolean checkCommitted;
-
/** Cache return value. */
private GridCacheReturn retVal;
@@ -63,12 +66,13 @@ public class GridDhtTxFinishResponse extends GridDistributedTxFinishResponse {
}
/**
+ * @param part Partition.
* @param xid Xid version.
* @param futId Future ID.
* @param miniId Mini future ID.
*/
- public GridDhtTxFinishResponse(GridCacheVersion xid, IgniteUuid futId, IgniteUuid miniId) {
- super(xid, futId);
+ public GridDhtTxFinishResponse(int part, GridCacheVersion xid, IgniteUuid futId, IgniteUuid miniId) {
+ super(part, xid, futId);
assert miniId != null;
@@ -76,6 +80,20 @@ public class GridDhtTxFinishResponse extends GridDistributedTxFinishResponse {
}
/**
+ * @return {@code True} if this is reply for near node.
+ */
+ public boolean nearNodeResponse() {
+ return isFlag(NEAR_RES_FLAG_MASK);
+ }
+
+ /**
+ * @param val {@code True} if this is reply for near node.
+ */
+ public void nearNodeResponse(boolean val) {
+ setFlag(val, NEAR_RES_FLAG_MASK);
+ }
+
+ /**
* @return Mini future ID.
*/
public IgniteUuid miniId() {
@@ -100,14 +118,14 @@ public class GridDhtTxFinishResponse extends GridDistributedTxFinishResponse {
* @return Check committed flag.
*/
public boolean checkCommitted() {
- return checkCommitted;
+ return isFlag(CHECK_COMMITTED_FLAG_MASK);
}
/**
* @param checkCommitted Check committed flag.
*/
public void checkCommitted(boolean checkCommitted) {
- this.checkCommitted = checkCommitted;
+ setFlag(checkCommitted, CHECK_COMMITTED_FLAG_MASK);
}
/** {@inheritDoc} */
@@ -158,11 +176,6 @@ public class GridDhtTxFinishResponse extends GridDistributedTxFinishResponse {
}
/** {@inheritDoc} */
- @Override public String toString() {
- return S.toString(GridDhtTxFinishResponse.class, this, super.toString());
- }
-
- /** {@inheritDoc} */
@Override public boolean writeTo(ByteBuffer buf, MessageWriter writer) {
writer.setBuffer(buf);
@@ -177,25 +190,19 @@ public class GridDhtTxFinishResponse extends GridDistributedTxFinishResponse {
}
switch (writer.state()) {
- case 5:
- if (!writer.writeBoolean("checkCommitted", checkCommitted))
- return false;
-
- writer.incrementState();
-
- case 6:
+ case 7:
if (!writer.writeByteArray("checkCommittedErrBytes", checkCommittedErrBytes))
return false;
writer.incrementState();
- case 7:
+ case 8:
if (!writer.writeIgniteUuid("miniId", miniId))
return false;
writer.incrementState();
- case 8:
+ case 9:
if (!writer.writeMessage("retVal", retVal))
return false;
@@ -217,15 +224,7 @@ public class GridDhtTxFinishResponse extends GridDistributedTxFinishResponse {
return false;
switch (reader.state()) {
- case 5:
- checkCommitted = reader.readBoolean("checkCommitted");
-
- if (!reader.isLastRead())
- return false;
-
- reader.incrementState();
-
- case 6:
+ case 7:
checkCommittedErrBytes = reader.readByteArray("checkCommittedErrBytes");
if (!reader.isLastRead())
@@ -233,7 +232,7 @@ public class GridDhtTxFinishResponse extends GridDistributedTxFinishResponse {
reader.incrementState();
- case 7:
+ case 8:
miniId = reader.readIgniteUuid("miniId");
if (!reader.isLastRead())
@@ -241,7 +240,7 @@ public class GridDhtTxFinishResponse extends GridDistributedTxFinishResponse {
reader.incrementState();
- case 8:
+ case 9:
retVal = reader.readMessage("retVal");
if (!reader.isLastRead())
@@ -261,6 +260,20 @@ public class GridDhtTxFinishResponse extends GridDistributedTxFinishResponse {
/** {@inheritDoc} */
@Override public byte fieldsCount() {
- return 9;
+ return 10;
+ }
+
+ /** {@inheritDoc} */
+ @Override public String toString() {
+ StringBuilder flags = new StringBuilder();
+
+ if (checkCommitted())
+ appendFlag(flags, "checkComm");
+ if (nearNodeResponse())
+ appendFlag(flags, "nearRes");
+
+ return S.toString(GridDhtTxFinishResponse.class, this,
+ "flags", flags.toString(),
+ "super", super.toString());
}
}
http://git-wip-us.apache.org/repos/asf/ignite/blob/26316bb0/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtTxLocal.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtTxLocal.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtTxLocal.java
index 79c371c..c2c2918 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtTxLocal.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtTxLocal.java
@@ -641,8 +641,13 @@ public class GridDhtTxLocal extends GridDhtTxLocalAdapter implements GridCacheMa
return;
}
- GridNearTxFinishResponse res = new GridNearTxFinishResponse(nearXidVer, threadId, nearFinFutId,
- nearFinMiniId, err);
+ GridNearTxFinishResponse res = new GridNearTxFinishResponse(
+ -1,
+ nearXidVer,
+ threadId,
+ nearFinFutId,
+ nearFinMiniId,
+ err);
try {
cctx.io().send(nearNodeId, res, ioPolicy());
http://git-wip-us.apache.org/repos/asf/ignite/blob/26316bb0/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtTxPrepareFuture.java
----------------------------------------------------------------------
diff --git 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
index 7645d58..ca028f8 100644
--- 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
@@ -1252,8 +1252,6 @@ public final class GridDhtTxPrepareFuture extends GridCompoundFuture<IgniteInter
if (last) {
int miniId = 0;
- assert tx.transactionNodes() != null;
-
final long timeout = timeoutObj != null ? timeoutObj.timeout : 0;
// Create mini futures.
@@ -1288,7 +1286,7 @@ public final class GridDhtTxPrepareFuture extends GridCompoundFuture<IgniteInter
GridDhtTxPrepareRequest req = new GridDhtTxPrepareRequest(
futId,
- fut != null ? fut.futureId() : null,
+ fut != null ? fut.futureId() : 0,
nearFutId,
nearMiniId,
tx.topologyVersion(),
@@ -1315,8 +1313,8 @@ public final class GridDhtTxPrepareFuture extends GridCompoundFuture<IgniteInter
GridCacheContext<?, ?> cacheCtx = cached.context();
// Do not invalidate near entry on originating transaction node.
- req.invalidateNearEntry(idx, !tx.nearNodeId().equals(n.id()) &&
- cached.readerId(n.id()) != null);
+ req.invalidateNearEntry(idx,
+ !tx.nearNodeId().equals(n.id()) && cached.readerId(n.id()) != null);
if (cached.isNewLocked()) {
List<ClusterNode> owners = cacheCtx.topology().owners(cached.partition(),
http://git-wip-us.apache.org/repos/asf/ignite/blob/26316bb0/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtTxPrepareResponse.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtTxPrepareResponse.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtTxPrepareResponse.java
index e7153da..2fd72f3 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtTxPrepareResponse.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtTxPrepareResponse.java
@@ -247,11 +247,6 @@ public class GridDhtTxPrepareResponse extends GridDistributedTxPrepareResponse {
}
/** {@inheritDoc} */
- @Override public String toString() {
- return S.toString(GridDhtTxPrepareResponse.class, this, "super", super.toString());
- }
-
- /** {@inheritDoc} */
@Override public boolean writeTo(ByteBuffer buf, MessageWriter writer) {
writer.setBuffer(buf);
@@ -266,31 +261,31 @@ public class GridDhtTxPrepareResponse extends GridDistributedTxPrepareResponse {
}
switch (writer.state()) {
- case 8:
+ case 10:
if (!writer.writeIgniteUuid("futId", futId))
return false;
writer.incrementState();
- case 9:
+ case 11:
if (!writer.writeMap("invalidParts", invalidParts, MessageCollectionItemType.INT, MessageCollectionItemType.INT_ARR))
return false;
writer.incrementState();
- case 10:
+ case 12:
if (!writer.writeInt("miniId", miniId))
return false;
writer.incrementState();
- case 11:
+ case 13:
if (!writer.writeCollection("nearEvicted", nearEvicted, MessageCollectionItemType.MSG))
return false;
writer.incrementState();
- case 12:
+ case 14:
if (!writer.writeCollection("preloadEntries", preloadEntries, MessageCollectionItemType.MSG))
return false;
@@ -312,7 +307,7 @@ public class GridDhtTxPrepareResponse extends GridDistributedTxPrepareResponse {
return false;
switch (reader.state()) {
- case 8:
+ case 10:
futId = reader.readIgniteUuid("futId");
if (!reader.isLastRead())
@@ -320,7 +315,7 @@ public class GridDhtTxPrepareResponse extends GridDistributedTxPrepareResponse {
reader.incrementState();
- case 9:
+ case 11:
invalidParts = reader.readMap("invalidParts", MessageCollectionItemType.INT, MessageCollectionItemType.INT_ARR, false);
if (!reader.isLastRead())
@@ -328,7 +323,7 @@ public class GridDhtTxPrepareResponse extends GridDistributedTxPrepareResponse {
reader.incrementState();
- case 10:
+ case 12:
miniId = reader.readInt("miniId");
if (!reader.isLastRead())
@@ -336,7 +331,7 @@ public class GridDhtTxPrepareResponse extends GridDistributedTxPrepareResponse {
reader.incrementState();
- case 11:
+ case 13:
nearEvicted = reader.readCollection("nearEvicted", MessageCollectionItemType.MSG);
if (!reader.isLastRead())
@@ -344,7 +339,7 @@ public class GridDhtTxPrepareResponse extends GridDistributedTxPrepareResponse {
reader.incrementState();
- case 12:
+ case 14:
preloadEntries = reader.readCollection("preloadEntries", MessageCollectionItemType.MSG);
if (!reader.isLastRead())
@@ -364,6 +359,17 @@ public class GridDhtTxPrepareResponse extends GridDistributedTxPrepareResponse {
/** {@inheritDoc} */
@Override public byte fieldsCount() {
- return 13;
+ return 15;
+ }
+
+ /** {@inheritDoc} */
+ @Override public String toString() {
+ StringBuilder flags = new StringBuilder();
+
+ if (nearNodeResponse())
+ appendFlag(flags, "nearRes");
+
+ return S.toString(GridDhtTxPrepareResponse.class, this,
+ "super", super.toString());
}
}
http://git-wip-us.apache.org/repos/asf/ignite/blob/26316bb0/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearOptimisticSerializableTxPrepareFuture.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearOptimisticSerializableTxPrepareFuture.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearOptimisticSerializableTxPrepareFuture.java
index 652eec2..cd0e7fd 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearOptimisticSerializableTxPrepareFuture.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearOptimisticSerializableTxPrepareFuture.java
@@ -195,7 +195,7 @@ public class GridNearOptimisticSerializableTxPrepareFuture extends GridNearOptim
}
/** {@inheritDoc} */
- @Override public void onResult(UUID nodeId, GridNearTxPrepareResponse res) {
+ @Override public void onPrimaryResponse(UUID nodeId, GridNearTxPrepareResponse res) {
if (!isDone()) {
MiniFuture mini = miniFuture(res.miniId());
@@ -885,7 +885,7 @@ public class GridNearOptimisticSerializableTxPrepareFuture extends GridNearOptim
onDone(res);
}
else {
- parent.onPrimaryPrepareResponse(m, res);
+ parent.processPrimaryPrepareResponse(m, res);
// Finish this mini future (need result only on client node).
onDone(parent.cctx.kernalContext().clientNode() ? res : null);
@@ -899,8 +899,7 @@ public class GridNearOptimisticSerializableTxPrepareFuture extends GridNearOptim
*/
private void remap(final GridNearTxPrepareResponse res) {
parent.prepareOnTopology(true, new Runnable() {
- @Override
- public void run() {
+ @Override public void run() {
onDone(res);
}
});
http://git-wip-us.apache.org/repos/asf/ignite/blob/26316bb0/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearOptimisticTxPrepareFuture.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearOptimisticTxPrepareFuture.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearOptimisticTxPrepareFuture.java
index 5cfb1a2..d321cb9 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearOptimisticTxPrepareFuture.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearOptimisticTxPrepareFuture.java
@@ -174,7 +174,7 @@ public class GridNearOptimisticTxPrepareFuture extends GridNearOptimisticTxPrepa
}
/** {@inheritDoc} */
- @Override public void onResult(UUID nodeId, GridNearTxPrepareResponse res) {
+ @Override public void onPrimaryResponse(UUID nodeId, GridNearTxPrepareResponse res) {
if (!isDone()) {
MiniFuture mini = miniFuture(res.miniId());
@@ -918,7 +918,7 @@ public class GridNearOptimisticTxPrepareFuture extends GridNearOptimisticTxPrepa
remap();
}
else {
- parent.onPrimaryPrepareResponse(m, res);
+ parent.processPrimaryPrepareResponse(m, res);
// Proceed prepare before finishing mini future.
if (mappings != null)
http://git-wip-us.apache.org/repos/asf/ignite/blob/26316bb0/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearPessimisticTxPrepareFuture.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearPessimisticTxPrepareFuture.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearPessimisticTxPrepareFuture.java
index b476336..03ee7af 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearPessimisticTxPrepareFuture.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearPessimisticTxPrepareFuture.java
@@ -95,7 +95,7 @@ public class GridNearPessimisticTxPrepareFuture extends GridNearTxPrepareFutureA
}
/** {@inheritDoc} */
- @Override public void onResult(UUID nodeId, GridNearTxPrepareResponse res) {
+ @Override public void onPrimaryResponse(UUID nodeId, GridNearTxPrepareResponse res) {
if (!isDone()) {
assert res.clientRemapVersion() == null : res;
@@ -205,7 +205,6 @@ public class GridNearPessimisticTxPrepareFuture extends GridNearTxPrepareFutureA
*/
private void preparePessimistic() {
// TODO IGNITE-4768: need detect on lock step?
-
boolean dhtReplyNear = true;
Map<IgniteBiTuple<ClusterNode, Boolean>, GridDistributedTxMapping> mappings = new HashMap<>();
@@ -473,7 +472,7 @@ public class GridNearPessimisticTxPrepareFuture extends GridNearTxPrepareFutureA
else {
assert dhtNodes == null;
- onPrimaryPrepareResponse(m, res);
+ processPrimaryPrepareResponse(m, res);
onDone();
}
http://git-wip-us.apache.org/repos/asf/ignite/blob/26316bb0/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearTxFinishFuture.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearTxFinishFuture.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearTxFinishFuture.java
index 06cf878..1d52b6d 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearTxFinishFuture.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearTxFinishFuture.java
@@ -148,7 +148,7 @@ public final class GridNearTxFinishFuture<K, V> extends GridCompoundIdentityFutu
if (isMini(fut)) {
MinFuture f = (MinFuture)fut;
- if (f.onNodeLeft(nodeId, true)) {
+ if (f.onNodeLeft(nodeId)) {
// Remove previous mapping.
mappings.remove(nodeId);
@@ -184,7 +184,7 @@ public final class GridNearTxFinishFuture<K, V> extends GridCompoundIdentityFutu
* @param res Result.
*/
@SuppressWarnings("ForLoopReplaceableByForEach")
- public void onResult(UUID nodeId, GridNearTxFinishResponse res) {
+ public void onPrimaryResponse(UUID nodeId, GridNearTxFinishResponse res) {
if (!isDone()) {
FinishMiniFuture finishFut = null;
@@ -209,7 +209,7 @@ public final class GridNearTxFinishFuture<K, V> extends GridCompoundIdentityFutu
}
if (finishFut != null)
- finishFut.onNearFinishResponse(res);
+ finishFut.onPrimaryResponse(res);
else {
if (msgLog.isDebugEnabled()) {
msgLog.debug("Near finish fut, failed to find mini future [txId=" + tx.nearXidVersion() +
@@ -233,34 +233,64 @@ public final class GridNearTxFinishFuture<K, V> extends GridCompoundIdentityFutu
* @param nodeId Sender.
* @param res Result.
*/
- public void onResult(UUID nodeId, GridDhtTxFinishResponse res) {
+ public void onDhtResponse(UUID nodeId, GridDhtTxFinishResponse res) {
+ assert res.checkCommitted() ^ res.nearNodeResponse() : res;
+
if (!isDone()) {
- boolean found = false;
+ MinFuture foundFut = null;
+
+ synchronized (sync) {
+ int size = futuresCountNoLock();
- for (IgniteInternalFuture<IgniteInternalTx> fut : futures()) {
- if (fut.getClass() == CheckBackupMiniFuture.class) {
- CheckBackupMiniFuture f = (CheckBackupMiniFuture)fut;
+ for (int i = 0; i < size; i++) {
+ IgniteInternalFuture<IgniteInternalTx> fut = future(i);
- if (f.futureId().equals(res.miniId())) {
- found = true;
+ if (res.nearNodeResponse()) {
+ assert tx.dhtReplyNear() && tx.syncMode() == FULL_SYNC;
- assert f.node().id().equals(nodeId);
+ if (fut.getClass() == FinishMiniFuture.class) {
+ FinishMiniFuture f = (FinishMiniFuture)fut;
- if (res.returnValue() != null)
- tx.implicitSingleResult(res.returnValue());
+ if (f.futureId().equals(res.miniId())) {
+ foundFut = (MinFuture)fut;
- f.onDhtFinishResponse(res);
+ break;
+ }
+ }
}
- }
- else if (fut.getClass() == CheckRemoteTxMiniFuture.class) {
- CheckRemoteTxMiniFuture f = (CheckRemoteTxMiniFuture)fut;
+ else {
+ assert res.checkCommitted();
+
+ if (fut.getClass() == CheckBackupMiniFuture.class) {
+ CheckBackupMiniFuture f = (CheckBackupMiniFuture)fut;
+
+ if (f.futureId().equals(res.miniId())) {
+ assert f.node().id().equals(nodeId);
- if (f.futureId().equals(res.miniId()))
- f.onDhtFinishResponse(nodeId);
+ foundFut = f;
+
+ if (res.returnValue() != null)
+ tx.implicitSingleResult(res.returnValue());
+
+ break;
+ }
+ }
+ else if (fut.getClass() == CheckRemoteTxMiniFuture.class) {
+ CheckRemoteTxMiniFuture f = (CheckRemoteTxMiniFuture)fut;
+
+ if (f.futureId().equals(res.miniId())) {
+ foundFut = f;
+
+ break;
+ }
+ }
+ }
}
}
- if (!found && msgLog.isDebugEnabled()) {
+ if (foundFut != null)
+ foundFut.onDhtFinishResponse(nodeId, res);
+ else if (msgLog.isDebugEnabled()) {
msgLog.debug("Near finish fut, failed to find mini future [txId=" + tx.nearXidVersion() +
", node=" + nodeId +
", res=" + res +
@@ -571,7 +601,7 @@ public final class GridNearTxFinishFuture<K, V> extends GridCompoundIdentityFutu
}
}
catch (ClusterTopologyCheckedException ignored) {
- mini.onNodeLeft(backupId, false);
+ mini.onNodeLeft(backupId);
}
catch (IgniteCheckedException e) {
if (msgLog.isDebugEnabled()) {
@@ -731,7 +761,7 @@ public final class GridNearTxFinishFuture<K, V> extends GridCompoundIdentityFutu
// Remove previous mapping.
mappings.remove(m.primary().id());
- fut.onNodeLeft(n.id(), false);
+ fut.onNodeLeft(n.id());
}
catch (IgniteCheckedException e) {
if (msgLog.isDebugEnabled()) {
@@ -813,8 +843,7 @@ public final class GridNearTxFinishFuture<K, V> extends GridCompoundIdentityFutu
tx.system(),
tx.ioPolicy(),
false,
- tx.syncMode() == FULL_SYNC,
- tx.syncMode() == FULL_SYNC,
+ tx.syncMode(),
null,
null,
null,
@@ -840,10 +869,15 @@ public final class GridNearTxFinishFuture<K, V> extends GridCompoundIdentityFutu
/**
* @param nodeId Node ID.
- * @param discoThread {@code True} if executed from discovery thread.
* @return {@code True} if future processed node failure.
*/
- abstract boolean onNodeLeft(UUID nodeId, boolean discoThread);
+ abstract boolean onNodeLeft(UUID nodeId);
+
+ /**
+ * @param nodeId Node ID.
+ * @param res Response.
+ */
+ abstract void onDhtFinishResponse(UUID nodeId, GridDhtTxFinishResponse res);
/**
* @return Future ID.
@@ -890,7 +924,7 @@ public final class GridNearTxFinishFuture<K, V> extends GridCompoundIdentityFutu
}
/** {@inheritDoc} */
- boolean onNodeLeft(UUID nodeId, boolean discoThread) {
+ boolean onNodeLeft(UUID nodeId) {
if (nodeId.equals(m.primary().id())) {
if (msgLog.isDebugEnabled()) {
msgLog.debug("Near finish fut, mini future node left [txId=" + tx.nearXidVersion() +
@@ -919,7 +953,7 @@ public final class GridNearTxFinishFuture<K, V> extends GridCompoundIdentityFutu
fut.listen(new CI1<IgniteInternalFuture<?>>() {
@Override public void apply(IgniteInternalFuture<?> fut) {
- mini.onDhtFinishResponse(cctx.localNodeId());
+ mini.onDhtFinishResponse(cctx.localNodeId(), null);
}
});
}
@@ -928,7 +962,7 @@ public final class GridNearTxFinishFuture<K, V> extends GridCompoundIdentityFutu
cctx.io().send(backup, req, tx.ioPolicy());
}
catch (ClusterTopologyCheckedException ignored) {
- mini.onNodeLeft(backupId, discoThread);
+ mini.onNodeLeft(backupId);
}
catch (IgniteCheckedException e) {
mini.onDone(e);
@@ -936,7 +970,7 @@ public final class GridNearTxFinishFuture<K, V> extends GridCompoundIdentityFutu
}
}
else
- mini.onDhtFinishResponse(backupId);
+ mini.onDhtFinishResponse(backupId, null);
}
}
}
@@ -950,10 +984,24 @@ public final class GridNearTxFinishFuture<K, V> extends GridCompoundIdentityFutu
return false;
}
+ /** {@inheritDoc} */
+ @Override void onDhtFinishResponse(UUID nodeId, GridDhtTxFinishResponse res) {
+ assert dhtNodes != null;
+
+ boolean done;
+
+ synchronized (dhtNodes) {
+ done = dhtNodes.remove(nodeId) && dhtNodes.isEmpty();
+ }
+
+ if (done)
+ onDone(tx);
+ }
+
/**
- * @param res Result callback.
+ * @param res Response.
*/
- void onNearFinishResponse(GridNearTxFinishResponse res) {
+ void onPrimaryResponse(GridNearTxFinishResponse res) {
assert dhtNodes == null || res.error() != null;
if (res.error() != null)
@@ -999,7 +1047,7 @@ public final class GridNearTxFinishFuture<K, V> extends GridCompoundIdentityFutu
}
/** {@inheritDoc} */
- @Override boolean onNodeLeft(UUID nodeId, boolean discoThread) {
+ @Override boolean onNodeLeft(UUID nodeId) {
if (nodeId.equals(backup.id())) {
readyNearMappingFromBackup(m);
@@ -1011,10 +1059,8 @@ public final class GridNearTxFinishFuture<K, V> extends GridCompoundIdentityFutu
return false;
}
- /**
- * @param res Response.
- */
- void onDhtFinishResponse(GridDhtTxFinishResponse res) {
+ /** {@inheritDoc} */
+ @Override void onDhtFinishResponse(UUID nodeId, GridDhtTxFinishResponse res) {
readyNearMappingFromBackup(m);
Throwable err = res.checkCommittedError();
@@ -1060,14 +1106,12 @@ public final class GridNearTxFinishFuture<K, V> extends GridCompoundIdentityFutu
}
/** {@inheritDoc} */
- @Override boolean onNodeLeft(UUID nodeId, boolean discoThread) {
+ @Override boolean onNodeLeft(UUID nodeId) {
return onResponse(nodeId);
}
- /**
- * @param nodeId Node ID.
- */
- void onDhtFinishResponse(UUID nodeId) {
+ /** {@inheritDoc} */
+ @Override void onDhtFinishResponse(UUID nodeId, GridDhtTxFinishResponse res) {
onResponse(nodeId);
}
http://git-wip-us.apache.org/repos/asf/ignite/blob/26316bb0/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearTxFinishRequest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearTxFinishRequest.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearTxFinishRequest.java
index dfbbe18..8be4304 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearTxFinishRequest.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearTxFinishRequest.java
@@ -42,24 +42,6 @@ public class GridNearTxFinishRequest extends GridDistributedTxFinishRequest {
/** Mini future ID. */
private IgniteUuid miniId;
- /** Explicit lock flag. */
- private boolean explicitLock;
-
- /** Store enabled flag. */
- private boolean storeEnabled;
-
- /** Topology version. */
- private AffinityTopologyVersion topVer;
-
- /** Subject ID. */
- private UUID subjId;
-
- /** Task name hash. */
- private int taskNameHash;
-
- /** Write synchronization mode. */
- private CacheWriteSynchronizationMode syncMode;
-
/**
* Empty constructor required for {@link Externalizable}.
*/
@@ -109,48 +91,53 @@ public class GridNearTxFinishRequest extends GridDistributedTxFinishRequest {
super(
xidVer,
futId,
+ topVer,
null,
threadId,
commit,
invalidate,
sys,
plc,
- syncMode == CacheWriteSynchronizationMode.FULL_SYNC,
- syncMode == CacheWriteSynchronizationMode.FULL_SYNC,
+ syncMode,
baseVer,
committedVers,
rolledbackVers,
+ subjId,
+ taskNameHash,
txSize,
addDepInfo
);
- this.syncMode = syncMode;
- this.explicitLock = explicitLock;
- this.storeEnabled = storeEnabled;
- this.topVer = topVer;
- this.subjId = subjId;
- this.taskNameHash = taskNameHash;
+ explicitLock(explicitLock);
+ storeEnabled(storeEnabled);
}
/**
- * @return Transaction write synchronization mode (can be null is message sent from old nodes).
+ * @return Explicit lock flag.
*/
- @Nullable public CacheWriteSynchronizationMode syncMode() {
- return syncMode;
+ public boolean explicitLock() {
+ return isFlag(EXPLICIT_LOCK_FLAG_MASK);
}
/**
- * @return Explicit lock flag.
+ * @param explicitLock Explicit lock flag.
*/
- public boolean explicitLock() {
- return explicitLock;
+ private void explicitLock(boolean explicitLock) {
+ setFlag(explicitLock, EXPLICIT_LOCK_FLAG_MASK);
}
/**
* @return Store enabled flag.
*/
public boolean storeEnabled() {
- return storeEnabled;
+ return isFlag(STORE_ENABLED_FLAG_MASK);
+ }
+
+ /**
+ * @param storeEnabled Store enabled flag.
+ */
+ private void storeEnabled(boolean storeEnabled) {
+ setFlag(storeEnabled, STORE_ENABLED_FLAG_MASK);
}
/**
@@ -167,27 +154,6 @@ public class GridNearTxFinishRequest extends GridDistributedTxFinishRequest {
this.miniId = miniId;
}
- /**
- * @return Subject ID.
- */
- @Nullable public UUID subjectId() {
- return subjId;
- }
-
- /**
- * @return Task name hash.
- */
- public int taskNameHash() {
- return taskNameHash;
- }
-
- /**
- * @return Topology version.
- */
- @Override public AffinityTopologyVersion topologyVersion() {
- return topVer;
- }
-
/** {@inheritDoc} */
@Override public boolean writeTo(ByteBuffer buf, MessageWriter writer) {
writer.setBuffer(buf);
@@ -203,44 +169,8 @@ public class GridNearTxFinishRequest extends GridDistributedTxFinishRequest {
}
switch (writer.state()) {
- case 18:
- if (!writer.writeBoolean("explicitLock", explicitLock))
- return false;
-
- writer.incrementState();
-
- case 19:
- if (!writer.writeIgniteUuid("miniId", miniId))
- return false;
-
- writer.incrementState();
-
- case 20:
- if (!writer.writeBoolean("storeEnabled", storeEnabled))
- return false;
-
- writer.incrementState();
-
case 21:
- if (!writer.writeUuid("subjId", subjId))
- return false;
-
- writer.incrementState();
-
- case 22:
- if (!writer.writeByte("syncMode", syncMode != null ? (byte)syncMode.ordinal() : -1))
- return false;
-
- writer.incrementState();
-
- case 23:
- if (!writer.writeInt("taskNameHash", taskNameHash))
- return false;
-
- writer.incrementState();
-
- case 24:
- if (!writer.writeMessage("topVer", topVer))
+ if (!writer.writeIgniteUuid("miniId", miniId))
return false;
writer.incrementState();
@@ -261,60 +191,8 @@ public class GridNearTxFinishRequest extends GridDistributedTxFinishRequest {
return false;
switch (reader.state()) {
- case 18:
- explicitLock = reader.readBoolean("explicitLock");
-
- if (!reader.isLastRead())
- return false;
-
- reader.incrementState();
-
- case 19:
- miniId = reader.readIgniteUuid("miniId");
-
- if (!reader.isLastRead())
- return false;
-
- reader.incrementState();
-
- case 20:
- storeEnabled = reader.readBoolean("storeEnabled");
-
- if (!reader.isLastRead())
- return false;
-
- reader.incrementState();
-
case 21:
- subjId = reader.readUuid("subjId");
-
- if (!reader.isLastRead())
- return false;
-
- reader.incrementState();
-
- case 22:
- byte syncModeOrd;
-
- syncModeOrd = reader.readByte("syncMode");
-
- if (!reader.isLastRead())
- return false;
-
- syncMode = CacheWriteSynchronizationMode.fromOrdinal(syncModeOrd);
-
- reader.incrementState();
-
- case 23:
- taskNameHash = reader.readInt("taskNameHash");
-
- if (!reader.isLastRead())
- return false;
-
- reader.incrementState();
-
- case 24:
- topVer = reader.readMessage("topVer");
+ miniId = reader.readIgniteUuid("miniId");
if (!reader.isLastRead())
return false;
@@ -333,7 +211,7 @@ public class GridNearTxFinishRequest extends GridDistributedTxFinishRequest {
/** {@inheritDoc} */
@Override public byte fieldsCount() {
- return 25;
+ return 22;
}
/** {@inheritDoc} */
http://git-wip-us.apache.org/repos/asf/ignite/blob/26316bb0/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearTxFinishResponse.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearTxFinishResponse.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearTxFinishResponse.java
index 37fbb36..cf1ba46 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearTxFinishResponse.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearTxFinishResponse.java
@@ -59,15 +59,16 @@ public class GridNearTxFinishResponse extends GridDistributedTxFinishResponse {
}
/**
+ * @param part Partition.
* @param xid Xid version.
* @param nearThreadId Near tx thread ID.
* @param futId Future ID.
* @param miniId Mini future Id.
* @param err Error.
*/
- public GridNearTxFinishResponse(GridCacheVersion xid, long nearThreadId, IgniteUuid futId, IgniteUuid miniId,
+ public GridNearTxFinishResponse(int part, GridCacheVersion xid, long nearThreadId, IgniteUuid futId, IgniteUuid miniId,
@Nullable Throwable err) {
- super(xid, futId);
+ super(part, xid, futId);
assert miniId != null;
@@ -127,19 +128,19 @@ public class GridNearTxFinishResponse extends GridDistributedTxFinishResponse {
}
switch (writer.state()) {
- case 5:
+ case 7:
if (!writer.writeByteArray("errBytes", errBytes))
return false;
writer.incrementState();
- case 6:
+ case 8:
if (!writer.writeIgniteUuid("miniId", miniId))
return false;
writer.incrementState();
- case 7:
+ case 9:
if (!writer.writeLong("nearThreadId", nearThreadId))
return false;
@@ -161,7 +162,7 @@ public class GridNearTxFinishResponse extends GridDistributedTxFinishResponse {
return false;
switch (reader.state()) {
- case 5:
+ case 7:
errBytes = reader.readByteArray("errBytes");
if (!reader.isLastRead())
@@ -169,7 +170,7 @@ public class GridNearTxFinishResponse extends GridDistributedTxFinishResponse {
reader.incrementState();
- case 6:
+ case 8:
miniId = reader.readIgniteUuid("miniId");
if (!reader.isLastRead())
@@ -177,7 +178,7 @@ public class GridNearTxFinishResponse extends GridDistributedTxFinishResponse {
reader.incrementState();
- case 7:
+ case 9:
nearThreadId = reader.readLong("nearThreadId");
if (!reader.isLastRead())
@@ -197,7 +198,7 @@ public class GridNearTxFinishResponse extends GridDistributedTxFinishResponse {
/** {@inheritDoc} */
@Override public byte fieldsCount() {
- return 8;
+ return 10;
}
/** {@inheritDoc} */
http://git-wip-us.apache.org/repos/asf/ignite/blob/26316bb0/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearTxPrepareFutureAdapter.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearTxPrepareFutureAdapter.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearTxPrepareFutureAdapter.java
index 71d2353..8a8dc7e 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearTxPrepareFutureAdapter.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearTxPrepareFutureAdapter.java
@@ -152,7 +152,7 @@ public abstract class GridNearTxPrepareFutureAdapter extends
* @param nodeId Sender.
* @param res Result.
*/
- public abstract void onResult(UUID nodeId, GridNearTxPrepareResponse res);
+ public abstract void onPrimaryResponse(UUID nodeId, GridNearTxPrepareResponse res);
/**
* @param nodeId Sender.
@@ -197,7 +197,7 @@ public abstract class GridNearTxPrepareFutureAdapter extends
* @param res Response.
*/
@SuppressWarnings("ThrowableResultOfMethodCallIgnored")
- final void onPrimaryPrepareResponse(GridDistributedTxMapping m, GridNearTxPrepareResponse res) {
+ final void processPrimaryPrepareResponse(GridDistributedTxMapping m, GridNearTxPrepareResponse res) {
if (res == null)
return;
[05/38] ignite git commit: ignite-4768
Posted by sb...@apache.org.
ignite-4768
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/ca67537f
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/ca67537f
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/ca67537f
Branch: refs/heads/ignite-4768
Commit: ca67537f3aa0042bcf00afcf81bb99012c0f9231
Parents: 9056379
Author: sboikov <sb...@gridgain.com>
Authored: Tue Mar 7 15:29:06 2017 +0300
Committer: sboikov <sb...@gridgain.com>
Committed: Tue Mar 7 15:29:06 2017 +0300
----------------------------------------------------------------------
.../internal/binary/BinaryObjectImpl.java | 16 +-
.../processors/cache/KeyCacheObjectImpl.java | 65 +++++-
.../distributed/GridDistributedLockRequest.java | 26 +--
.../GridDistributedTxPrepareRequest.java | 191 +++++++++--------
.../GridDistributedUnlockRequest.java | 18 +-
.../distributed/dht/GridDhtLockRequest.java | 16 +-
.../dht/GridDhtTxPrepareRequest.java | 118 +++--------
.../distributed/dht/GridDhtUnlockRequest.java | 15 +-
.../distributed/near/GridNearGetRequest.java | 55 ++---
.../distributed/near/GridNearLockRequest.java | 16 +-
.../near/GridNearSingleGetRequest.java | 46 ++---
.../near/GridNearTxPrepareRequest.java | 207 +++++++------------
.../distributed/near/GridNearUnlockRequest.java | 20 +-
.../cache/transactions/IgniteTxEntry.java | 22 --
.../cache/transactions/IgniteTxHandler.java | 2 +-
.../IgniteCacheObjectProcessorImpl.java | 18 +-
...eCacheContinuousQueryImmutableEntryTest.java | 2 +-
.../file/GridFileSwapSpaceSpiSelfTest.java | 2 +-
18 files changed, 309 insertions(+), 546 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ignite/blob/ca67537f/modules/core/src/main/java/org/apache/ignite/internal/binary/BinaryObjectImpl.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/binary/BinaryObjectImpl.java b/modules/core/src/main/java/org/apache/ignite/internal/binary/BinaryObjectImpl.java
index 7a81659..6b88158 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/binary/BinaryObjectImpl.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/binary/BinaryObjectImpl.java
@@ -74,7 +74,6 @@ public final class BinaryObjectImpl extends BinaryObjectExImpl implements Extern
private boolean detachAllowed;
/** */
- @GridDirectTransient
private int part = -1;
/**
@@ -561,7 +560,6 @@ public final class BinaryObjectImpl extends BinaryObjectExImpl implements Extern
start = in.readInt();
}
-
/** {@inheritDoc} */
@Override public boolean writeTo(ByteBuffer buf, MessageWriter writer) {
writer.setBuffer(buf);
@@ -584,6 +582,12 @@ public final class BinaryObjectImpl extends BinaryObjectExImpl implements Extern
writer.incrementState();
case 1:
+ if (!writer.writeInt("part", part))
+ return false;
+
+ writer.incrementState();
+
+ case 2:
if (!writer.writeInt("start", detachAllowed ? 0 : start))
return false;
@@ -611,6 +615,14 @@ public final class BinaryObjectImpl extends BinaryObjectExImpl implements Extern
reader.incrementState();
case 1:
+ part = reader.readInt("part");
+
+ if (!reader.isLastRead())
+ return false;
+
+ reader.incrementState();
+
+ case 2:
start = reader.readInt("start");
if (!reader.isLastRead())
http://git-wip-us.apache.org/repos/asf/ignite/blob/ca67537f/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/KeyCacheObjectImpl.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/KeyCacheObjectImpl.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/KeyCacheObjectImpl.java
index 146e554..4f8570c 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/KeyCacheObjectImpl.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/KeyCacheObjectImpl.java
@@ -17,8 +17,10 @@
package org.apache.ignite.internal.processors.cache;
+import java.nio.ByteBuffer;
import org.apache.ignite.IgniteCheckedException;
-import org.apache.ignite.internal.GridDirectTransient;
+import org.apache.ignite.plugin.extensions.communication.MessageReader;
+import org.apache.ignite.plugin.extensions.communication.MessageWriter;
import org.jetbrains.annotations.Nullable;
/**
@@ -29,7 +31,6 @@ public class KeyCacheObjectImpl extends CacheObjectAdapter implements KeyCacheOb
private static final long serialVersionUID = 0L;
/** */
- @GridDirectTransient
private int part = -1;
/**
@@ -42,14 +43,6 @@ public class KeyCacheObjectImpl extends CacheObjectAdapter implements KeyCacheOb
/**
* @param val Value.
* @param valBytes Value bytes.
- */
- public KeyCacheObjectImpl(Object val, byte[] valBytes) {
- this(val, valBytes, -1);
- }
-
- /**
- * @param val Value.
- * @param valBytes Value bytes.
* @param part Partition.
*/
public KeyCacheObjectImpl(Object val, byte[] valBytes, int part) {
@@ -130,7 +123,57 @@ public class KeyCacheObjectImpl extends CacheObjectAdapter implements KeyCacheOb
/** {@inheritDoc} */
@Override public byte fieldsCount() {
- return 1;
+ return 2;
+ }
+
+ /** {@inheritDoc} */
+ @Override public boolean readFrom(ByteBuffer buf, MessageReader reader) {
+ reader.setBuffer(buf);
+
+ if (!reader.beforeMessageRead())
+ return false;
+
+ if (!super.readFrom(buf, reader))
+ return false;
+
+ switch (reader.state()) {
+ case 1:
+ part = reader.readInt("part");
+
+ if (!reader.isLastRead())
+ return false;
+
+ reader.incrementState();
+
+ }
+
+ return reader.afterMessageRead(KeyCacheObjectImpl.class);
+ }
+
+ /** {@inheritDoc} */
+ @Override public boolean writeTo(ByteBuffer buf, MessageWriter writer) {
+ writer.setBuffer(buf);
+
+ if (!super.writeTo(buf, writer))
+ return false;
+
+ if (!writer.isHeaderWritten()) {
+ if (!writer.writeHeader(directType(), fieldsCount()))
+ return false;
+
+ writer.onHeaderWritten();
+ }
+
+ switch (writer.state()) {
+ case 1:
+ if (!writer.writeInt("part", part))
+ return false;
+
+ writer.incrementState();
+
+ }
+
+ return true;
}
/** {@inheritDoc} */
http://git-wip-us.apache.org/repos/asf/ignite/blob/ca67537f/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/GridDistributedLockRequest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/GridDistributedLockRequest.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/GridDistributedLockRequest.java
index a671296..48c01f0 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/GridDistributedLockRequest.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/GridDistributedLockRequest.java
@@ -79,10 +79,6 @@ public class GridDistributedLockRequest extends GridDistributedBaseMessage {
@GridDirectCollection(KeyCacheObject.class)
private List<KeyCacheObject> keys;
- /** Partition IDs of keys to lock. */
- @GridDirectCollection(int.class)
- protected List<Integer> partIds;
-
/** Array indicating whether value should be returned for a key. */
@GridToStringInclude
private boolean[] retVals;
@@ -226,13 +222,6 @@ public class GridDistributedLockRequest extends GridDistributedBaseMessage {
}
/**
- * @return Return flags.
- */
- public boolean[] returnFlags() {
- return retVals;
- }
-
- /**
* Sets skip store flag value.
*
* @param skipStore Skip store flag.
@@ -289,15 +278,11 @@ public class GridDistributedLockRequest extends GridDistributedBaseMessage {
boolean retVal,
GridCacheContext ctx
) throws IgniteCheckedException {
- if (keys == null) {
+ if (keys == null)
keys = new ArrayList<>(keysCount());
- partIds = new ArrayList<>(keysCount());
- }
keys.add(key);
- partIds.add(key.partition());
-
retVals[idx] = retVal;
idx++;
@@ -312,7 +297,7 @@ public class GridDistributedLockRequest extends GridDistributedBaseMessage {
/** {@inheritDoc} */
@Override public int partition() {
- return partIds != null && !partIds.isEmpty() ? partIds.get(0) : -1;
+ return keys != null && !keys.isEmpty() ? keys.get(0).partition() : -1;
}
/**
@@ -344,13 +329,6 @@ public class GridDistributedLockRequest extends GridDistributedBaseMessage {
GridCacheContext cctx = ctx.cacheContext(cacheId);
finishUnmarshalCacheObjects(keys, cctx, ldr);
-
- if (partIds != null && !partIds.isEmpty()) {
- assert partIds.size() == keys.size();
-
- for (int i = 0; i < keys.size(); i++)
- keys.get(i).partition(partIds.get(i));
- }
}
/** {@inheritDoc} */
http://git-wip-us.apache.org/repos/asf/ignite/blob/ca67537f/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/GridDistributedTxPrepareRequest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/GridDistributedTxPrepareRequest.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/GridDistributedTxPrepareRequest.java
index 5e1499c..aaef258 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/GridDistributedTxPrepareRequest.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/GridDistributedTxPrepareRequest.java
@@ -44,7 +44,6 @@ import org.apache.ignite.internal.util.tostring.GridToStringInclude;
import org.apache.ignite.internal.util.typedef.C1;
import org.apache.ignite.internal.util.typedef.F;
import org.apache.ignite.internal.util.typedef.internal.U;
-import org.apache.ignite.lang.IgniteProductVersion;
import org.apache.ignite.plugin.extensions.communication.MessageCollectionItemType;
import org.apache.ignite.plugin.extensions.communication.MessageReader;
import org.apache.ignite.plugin.extensions.communication.MessageWriter;
@@ -60,18 +59,30 @@ public class GridDistributedTxPrepareRequest extends GridDistributedBaseMessage
/** */
private static final long serialVersionUID = 0L;
- /** Version in which direct marshalling of tx nodes was introduced. */
- public static final IgniteProductVersion TX_NODES_DIRECT_MARSHALLABLE_SINCE = IgniteProductVersion.fromString("1.5.0");
+ /** */
+ private static final int NEED_RETURN_VALUE_FLAG_MASK = 0x01;
+
+ /** */
+ private static final int INVALIDATE_FLAG_MASK = 0x02;
+
+ /** */
+ private static final int ONE_PHASE_COMMIT_FLAG_MASK = 0x04;
+
+ /** */
+ private static final int LAST_REQ_FLAG_MASK = 0x08;
+
+ /** */
+ private static final int SYSTEM_TX_FLAG_MASK = 0x10;
/** Collection to message converter. */
- public static final C1<Collection<UUID>, UUIDCollectionMessage> COL_TO_MSG = new C1<Collection<UUID>, UUIDCollectionMessage>() {
+ private static final C1<Collection<UUID>, UUIDCollectionMessage> COL_TO_MSG = new C1<Collection<UUID>, UUIDCollectionMessage>() {
@Override public UUIDCollectionMessage apply(Collection<UUID> uuids) {
return new UUIDCollectionMessage(uuids);
}
};
/** Message to collection converter. */
- public static final C1<UUIDCollectionMessage, Collection<UUID>> MSG_TO_COL = new C1<UUIDCollectionMessage, Collection<UUID>>() {
+ private static final C1<UUIDCollectionMessage, Collection<UUID>> MSG_TO_COL = new C1<UUIDCollectionMessage, Collection<UUID>>() {
@Override public Collection<UUID> apply(UUIDCollectionMessage msg) {
return msg.uuids();
}
@@ -97,10 +108,6 @@ public class GridDistributedTxPrepareRequest extends GridDistributedBaseMessage
@GridToStringInclude
private long timeout;
- /** Invalidation flag. */
- @GridToStringInclude
- private boolean invalidate;
-
/** Transaction read set. */
@GridToStringInclude
@GridDirectCollection(IgniteTxEntry.class)
@@ -135,15 +142,6 @@ public class GridDistributedTxPrepareRequest extends GridDistributedBaseMessage
@GridDirectMap(keyType = UUID.class, valueType = UUIDCollectionMessage.class)
private Map<UUID, UUIDCollectionMessage> txNodesMsg;
- /** */
- private byte[] txNodesBytes;
-
- /** One phase commit flag. */
- private boolean onePhaseCommit;
-
- /** System flag. */
- private boolean sys;
-
/** IO policy. */
private byte plc;
@@ -151,6 +149,9 @@ public class GridDistributedTxPrepareRequest extends GridDistributedBaseMessage
@GridDirectTransient
private IgniteTxState txState;
+ /** */
+ private byte flags;
+
/**
* Required by {@link Externalizable}.
*/
@@ -173,6 +174,8 @@ public class GridDistributedTxPrepareRequest extends GridDistributedBaseMessage
@Nullable Collection<IgniteTxEntry> reads,
Collection<IgniteTxEntry> writes,
Map<UUID, Collection<UUID>> txNodes,
+ boolean retVal,
+ boolean last,
boolean onePhaseCommit,
boolean addDepInfo
) {
@@ -182,16 +185,37 @@ public class GridDistributedTxPrepareRequest extends GridDistributedBaseMessage
threadId = tx.threadId();
concurrency = tx.concurrency();
isolation = tx.isolation();
- invalidate = tx.isInvalidate();
txSize = tx.size();
- sys = tx.system();
plc = tx.ioPolicy();
this.timeout = timeout;
this.reads = reads;
this.writes = writes;
this.txNodes = txNodes;
- this.onePhaseCommit = onePhaseCommit;
+
+ setFlag(tx.system(), SYSTEM_TX_FLAG_MASK);
+
+ setFlag(retVal, NEED_RETURN_VALUE_FLAG_MASK);
+
+ setFlag(tx.isInvalidate(), INVALIDATE_FLAG_MASK);
+
+ setFlag(onePhaseCommit, ONE_PHASE_COMMIT_FLAG_MASK);
+
+ setFlag(last, LAST_REQ_FLAG_MASK);
+ }
+
+ /**
+ * @return Flag indicating whether transaction needs return value.
+ */
+ public final boolean needReturnValue() {
+ return isFlag(NEED_RETURN_VALUE_FLAG_MASK);
+ }
+
+ /**
+ * @param retVal Need return value.
+ */
+ public final void needReturnValue(boolean retVal) {
+ setFlag(retVal, NEED_RETURN_VALUE_FLAG_MASK);
}
/**
@@ -204,8 +228,8 @@ public class GridDistributedTxPrepareRequest extends GridDistributedBaseMessage
/**
* @return System flag.
*/
- public boolean system() {
- return sys;
+ public final boolean system() {
+ return isFlag(SYSTEM_TX_FLAG_MASK);
}
/**
@@ -253,7 +277,7 @@ public class GridDistributedTxPrepareRequest extends GridDistributedBaseMessage
* @return Invalidate flag.
*/
public boolean isInvalidate() {
- return invalidate;
+ return isFlag(INVALIDATE_FLAG_MASK);
}
/**
@@ -316,7 +340,14 @@ public class GridDistributedTxPrepareRequest extends GridDistributedBaseMessage
* @return One phase commit flag.
*/
public boolean onePhaseCommit() {
- return onePhaseCommit;
+ return isFlag(ONE_PHASE_COMMIT_FLAG_MASK);
+ }
+
+ /**
+ * @return {@code True} if this is last prepare request for node.
+ */
+ public boolean last() {
+ return isFlag(LAST_REQ_FLAG_MASK);
}
/** {@inheritDoc} */
@@ -351,15 +382,8 @@ public class GridDistributedTxPrepareRequest extends GridDistributedBaseMessage
dhtVerVals = dhtVers.values();
}
- // Marshal txNodes only if there is a node in topology with an older version.
- if (ctx.exchange().minimumNodeVersion(topologyVersion()).compareTo(TX_NODES_DIRECT_MARSHALLABLE_SINCE) < 0) {
- if (txNodes != null && txNodesBytes == null)
- txNodesBytes = U.marshal(ctx, txNodes);
- }
- else {
- if (txNodesMsg == null)
- txNodesMsg = F.viewReadOnly(txNodes, COL_TO_MSG);
- }
+ if (txNodesMsg == null)
+ txNodesMsg = F.viewReadOnly(txNodes, COL_TO_MSG);
}
/** {@inheritDoc} */
@@ -392,9 +416,6 @@ public class GridDistributedTxPrepareRequest extends GridDistributedBaseMessage
if (txNodesMsg != null)
txNodes = F.viewReadOnly(txNodesMsg, MSG_TO_COL);
-
- if (txNodesBytes != null && txNodes == null)
- txNodes = U.unmarshal(ctx, txNodesBytes, U.resolveClassLoader(ldr, ctx.gridConfig()));
}
/** {@inheritDoc} */
@@ -407,6 +428,26 @@ public class GridDistributedTxPrepareRequest extends GridDistributedBaseMessage
return ctx.txPrepareMessageLogger();
}
+ /**
+ * Sets flag mask.
+ *
+ * @param flag Set or clear.
+ * @param mask Mask.
+ */
+ private void setFlag(boolean flag, int mask) {
+ flags = flag ? (byte)(flags | mask) : (byte)(flags & ~mask);
+ }
+
+ /**
+ * Reags flag mask.
+ *
+ * @param mask Mask to read.
+ * @return Flag value.
+ */
+ private boolean isFlag(int mask) {
+ return (flags & mask) != 0;
+ }
+
/** {@inheritDoc} */
@Override public boolean writeTo(ByteBuffer buf, MessageWriter writer) {
writer.setBuffer(buf);
@@ -441,7 +482,7 @@ public class GridDistributedTxPrepareRequest extends GridDistributedBaseMessage
writer.incrementState();
case 10:
- if (!writer.writeBoolean("invalidate", invalidate))
+ if (!writer.writeByte("flags", flags))
return false;
writer.incrementState();
@@ -453,66 +494,48 @@ public class GridDistributedTxPrepareRequest extends GridDistributedBaseMessage
writer.incrementState();
case 12:
- if (!writer.writeBoolean("onePhaseCommit", onePhaseCommit))
- return false;
-
- writer.incrementState();
-
- case 13:
if (!writer.writeByte("plc", plc))
return false;
writer.incrementState();
- case 14:
+ case 13:
if (!writer.writeCollection("reads", reads, MessageCollectionItemType.MSG))
return false;
writer.incrementState();
- case 15:
- if (!writer.writeBoolean("sys", sys))
- return false;
-
- writer.incrementState();
-
- case 16:
+ case 14:
if (!writer.writeLong("threadId", threadId))
return false;
writer.incrementState();
- case 17:
+ case 15:
if (!writer.writeLong("timeout", timeout))
return false;
writer.incrementState();
- case 18:
- if (!writer.writeByteArray("txNodesBytes", txNodesBytes))
- return false;
-
- writer.incrementState();
-
- case 19:
+ case 16:
if (!writer.writeMap("txNodesMsg", txNodesMsg, MessageCollectionItemType.UUID, MessageCollectionItemType.MSG))
return false;
writer.incrementState();
- case 20:
+ case 17:
if (!writer.writeInt("txSize", txSize))
return false;
writer.incrementState();
- case 21:
+ case 18:
if (!writer.writeMessage("writeVer", writeVer))
return false;
writer.incrementState();
- case 22:
+ case 19:
if (!writer.writeCollection("writes", writes, MessageCollectionItemType.MSG))
return false;
@@ -563,7 +586,7 @@ public class GridDistributedTxPrepareRequest extends GridDistributedBaseMessage
reader.incrementState();
case 10:
- invalidate = reader.readBoolean("invalidate");
+ flags = reader.readByte("flags");
if (!reader.isLastRead())
return false;
@@ -583,14 +606,6 @@ public class GridDistributedTxPrepareRequest extends GridDistributedBaseMessage
reader.incrementState();
case 12:
- onePhaseCommit = reader.readBoolean("onePhaseCommit");
-
- if (!reader.isLastRead())
- return false;
-
- reader.incrementState();
-
- case 13:
plc = reader.readByte("plc");
if (!reader.isLastRead())
@@ -598,7 +613,7 @@ public class GridDistributedTxPrepareRequest extends GridDistributedBaseMessage
reader.incrementState();
- case 14:
+ case 13:
reads = reader.readCollection("reads", MessageCollectionItemType.MSG);
if (!reader.isLastRead())
@@ -606,15 +621,7 @@ public class GridDistributedTxPrepareRequest extends GridDistributedBaseMessage
reader.incrementState();
- case 15:
- sys = reader.readBoolean("sys");
-
- if (!reader.isLastRead())
- return false;
-
- reader.incrementState();
-
- case 16:
+ case 14:
threadId = reader.readLong("threadId");
if (!reader.isLastRead())
@@ -622,7 +629,7 @@ public class GridDistributedTxPrepareRequest extends GridDistributedBaseMessage
reader.incrementState();
- case 17:
+ case 15:
timeout = reader.readLong("timeout");
if (!reader.isLastRead())
@@ -630,15 +637,7 @@ public class GridDistributedTxPrepareRequest extends GridDistributedBaseMessage
reader.incrementState();
- case 18:
- txNodesBytes = reader.readByteArray("txNodesBytes");
-
- if (!reader.isLastRead())
- return false;
-
- reader.incrementState();
-
- case 19:
+ case 16:
txNodesMsg = reader.readMap("txNodesMsg", MessageCollectionItemType.UUID, MessageCollectionItemType.MSG, false);
if (!reader.isLastRead())
@@ -646,7 +645,7 @@ public class GridDistributedTxPrepareRequest extends GridDistributedBaseMessage
reader.incrementState();
- case 20:
+ case 17:
txSize = reader.readInt("txSize");
if (!reader.isLastRead())
@@ -654,7 +653,7 @@ public class GridDistributedTxPrepareRequest extends GridDistributedBaseMessage
reader.incrementState();
- case 21:
+ case 18:
writeVer = reader.readMessage("writeVer");
if (!reader.isLastRead())
@@ -662,7 +661,7 @@ public class GridDistributedTxPrepareRequest extends GridDistributedBaseMessage
reader.incrementState();
- case 22:
+ case 19:
writes = reader.readCollection("writes", MessageCollectionItemType.MSG);
if (!reader.isLastRead())
@@ -682,7 +681,7 @@ public class GridDistributedTxPrepareRequest extends GridDistributedBaseMessage
/** {@inheritDoc} */
@Override public byte fieldsCount() {
- return 23;
+ return 20;
}
/** {@inheritDoc} */
http://git-wip-us.apache.org/repos/asf/ignite/blob/ca67537f/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/GridDistributedUnlockRequest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/GridDistributedUnlockRequest.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/GridDistributedUnlockRequest.java
index 5d70ec1..be7ecf8 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/GridDistributedUnlockRequest.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/GridDistributedUnlockRequest.java
@@ -45,10 +45,6 @@ public class GridDistributedUnlockRequest extends GridDistributedBaseMessage {
@GridDirectCollection(KeyCacheObject.class)
private List<KeyCacheObject> keys;
- /** Partition IDs. */
- @GridDirectCollection(int.class)
- protected List<Integer> partIds;
-
/**
* Empty constructor required by {@link Externalizable}.
*/
@@ -80,18 +76,15 @@ public class GridDistributedUnlockRequest extends GridDistributedBaseMessage {
* @throws IgniteCheckedException If failed.
*/
public void addKey(KeyCacheObject key, GridCacheContext ctx) throws IgniteCheckedException {
- if (keys == null) {
+ if (keys == null)
keys = new ArrayList<>(keysCount());
- partIds = new ArrayList<>(keysCount());
- }
keys.add(key);
- partIds.add(key.partition());
}
/** {@inheritDoc} */
@Override public int partition() {
- return partIds != null && !partIds.isEmpty() ? partIds.get(0) : -1;
+ return keys != null && !keys.isEmpty() ? keys.get(0).partition() : -1;
}
/** {@inheritDoc}
@@ -107,13 +100,6 @@ public class GridDistributedUnlockRequest extends GridDistributedBaseMessage {
super.finishUnmarshal(ctx, ldr);
finishUnmarshalCacheObjects(keys, ctx.cacheContext(cacheId), ldr);
-
- if (partIds != null && !partIds.isEmpty()) {
- assert partIds.size() == keys.size();
-
- for (int i = 0; i < keys.size(); i++)
- keys.get(i).partition(partIds.get(i));
- }
}
/** {@inheritDoc} */
http://git-wip-us.apache.org/repos/asf/ignite/blob/ca67537f/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtLockRequest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtLockRequest.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtLockRequest.java
index 95c6dfc..50167d8 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtLockRequest.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtLockRequest.java
@@ -419,12 +419,6 @@ public class GridDhtLockRequest extends GridDistributedLockRequest {
writer.incrementState();
- case 30:
- if (!writer.writeCollection("partIds", partIds, MessageCollectionItemType.INT))
- return false;
-
- writer.incrementState();
-
}
return true;
@@ -521,14 +515,6 @@ public class GridDhtLockRequest extends GridDistributedLockRequest {
reader.incrementState();
- case 30:
- partIds = reader.readCollection("partIds", MessageCollectionItemType.INT);
-
- if (!reader.isLastRead())
- return false;
-
- reader.incrementState();
-
}
return reader.afterMessageRead(GridDhtLockRequest.class);
@@ -541,7 +527,7 @@ public class GridDhtLockRequest extends GridDistributedLockRequest {
/** {@inheritDoc} */
@Override public byte fieldsCount() {
- return 31;
+ return 30;
}
/** {@inheritDoc} */
http://git-wip-us.apache.org/repos/asf/ignite/blob/ca67537f/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtTxPrepareRequest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtTxPrepareRequest.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtTxPrepareRequest.java
index a8f2087..4c8a22d 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtTxPrepareRequest.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtTxPrepareRequest.java
@@ -52,9 +52,6 @@ public class GridDhtTxPrepareRequest extends GridDistributedTxPrepareRequest {
/** */
private static final long serialVersionUID = 0L;
- /** */
- public static final int NEED_RETURN_VALUE_FLAG_MASK = 0x01;
-
/** Max order. */
private UUID nearNodeId;
@@ -91,9 +88,6 @@ public class GridDhtTxPrepareRequest extends GridDistributedTxPrepareRequest {
/** Near transaction ID. */
private GridCacheVersion nearXidVer;
- /** {@code True} if this is last prepare request for node. */
- private boolean last;
-
/** Subject ID. */
private UUID subjId;
@@ -103,9 +97,6 @@ public class GridDhtTxPrepareRequest extends GridDistributedTxPrepareRequest {
/** Preload keys. */
private BitSet preloadKeys;
- /** */
- private byte flags;
-
/**
* Empty constructor required for {@link Externalizable}.
*/
@@ -143,7 +134,7 @@ public class GridDhtTxPrepareRequest extends GridDistributedTxPrepareRequest {
int taskNameHash,
boolean addDepInfo,
boolean retVal) {
- super(tx, timeout, null, dhtWrites, txNodes, onePhaseCommit, addDepInfo);
+ super(tx, timeout, null, dhtWrites, txNodes, retVal, last, onePhaseCommit, addDepInfo);
assert futId != null;
assert miniId != null;
@@ -153,7 +144,6 @@ public class GridDhtTxPrepareRequest extends GridDistributedTxPrepareRequest {
this.nearWrites = nearWrites;
this.miniId = miniId;
this.nearXidVer = nearXidVer;
- this.last = last;
this.subjId = subjId;
this.taskNameHash = taskNameHash;
@@ -165,30 +155,6 @@ public class GridDhtTxPrepareRequest extends GridDistributedTxPrepareRequest {
}
/**
- * @return Flag indicating whether transaction needs return value.
- */
- public boolean needReturnValue() {
- return (flags & NEED_RETURN_VALUE_FLAG_MASK) != 0;
- }
-
- /**
- * @param retVal Need return value.
- */
- public void needReturnValue(boolean retVal) {
- if (retVal)
- flags = (byte)(flags | NEED_RETURN_VALUE_FLAG_MASK);
- else
- flags &= ~NEED_RETURN_VALUE_FLAG_MASK;
- }
-
- /**
- * @return {@code True} if this is last prepare request for node.
- */
- public boolean last() {
- return last;
- }
-
- /**
* @return Near transaction ID.
*/
public GridCacheVersion nearXidVersion() {
@@ -227,7 +193,7 @@ public class GridDhtTxPrepareRequest extends GridDistributedTxPrepareRequest {
* @param idx Entry index to set invalidation flag.
* @param invalidate Invalidation flag value.
*/
- public void invalidateNearEntry(int idx, boolean invalidate) {
+ void invalidateNearEntry(int idx, boolean invalidate) {
invalidateNearEntries.set(idx, invalidate);
}
@@ -244,7 +210,7 @@ public class GridDhtTxPrepareRequest extends GridDistributedTxPrepareRequest {
*
* @param idx Key index.
*/
- public void markKeyForPreload(int idx) {
+ void markKeyForPreload(int idx) {
if (preloadKeys == null)
preloadKeys = new BitSet();
@@ -374,85 +340,73 @@ public class GridDhtTxPrepareRequest extends GridDistributedTxPrepareRequest {
}
switch (writer.state()) {
- case 23:
- if (!writer.writeByte("flags", flags))
- return false;
-
- writer.incrementState();
-
- case 24:
+ case 20:
if (!writer.writeIgniteUuid("futId", futId))
return false;
writer.incrementState();
- case 25:
+ case 21:
if (!writer.writeBitSet("invalidateNearEntries", invalidateNearEntries))
return false;
writer.incrementState();
- case 26:
- if (!writer.writeBoolean("last", last))
- return false;
-
- writer.incrementState();
-
- case 27:
+ case 22:
if (!writer.writeIgniteUuid("miniId", miniId))
return false;
writer.incrementState();
- case 28:
+ case 23:
if (!writer.writeUuid("nearNodeId", nearNodeId))
return false;
writer.incrementState();
- case 29:
+ case 24:
if (!writer.writeCollection("nearWrites", nearWrites, MessageCollectionItemType.MSG))
return false;
writer.incrementState();
- case 30:
+ case 25:
if (!writer.writeMessage("nearXidVer", nearXidVer))
return false;
writer.incrementState();
- case 31:
+ case 26:
if (!writer.writeCollection("ownedKeys", ownedKeys, MessageCollectionItemType.MSG))
return false;
writer.incrementState();
- case 32:
+ case 27:
if (!writer.writeCollection("ownedVals", ownedVals, MessageCollectionItemType.MSG))
return false;
writer.incrementState();
- case 33:
+ case 28:
if (!writer.writeBitSet("preloadKeys", preloadKeys))
return false;
writer.incrementState();
- case 34:
+ case 29:
if (!writer.writeUuid("subjId", subjId))
return false;
writer.incrementState();
- case 35:
+ case 30:
if (!writer.writeInt("taskNameHash", taskNameHash))
return false;
writer.incrementState();
- case 36:
+ case 31:
if (!writer.writeMessage("topVer", topVer))
return false;
@@ -474,15 +428,7 @@ public class GridDhtTxPrepareRequest extends GridDistributedTxPrepareRequest {
return false;
switch (reader.state()) {
- case 23:
- flags = reader.readByte("flags");
-
- if (!reader.isLastRead())
- return false;
-
- reader.incrementState();
-
- case 24:
+ case 20:
futId = reader.readIgniteUuid("futId");
if (!reader.isLastRead())
@@ -490,7 +436,7 @@ public class GridDhtTxPrepareRequest extends GridDistributedTxPrepareRequest {
reader.incrementState();
- case 25:
+ case 21:
invalidateNearEntries = reader.readBitSet("invalidateNearEntries");
if (!reader.isLastRead())
@@ -498,15 +444,7 @@ public class GridDhtTxPrepareRequest extends GridDistributedTxPrepareRequest {
reader.incrementState();
- case 26:
- last = reader.readBoolean("last");
-
- if (!reader.isLastRead())
- return false;
-
- reader.incrementState();
-
- case 27:
+ case 22:
miniId = reader.readIgniteUuid("miniId");
if (!reader.isLastRead())
@@ -514,7 +452,7 @@ public class GridDhtTxPrepareRequest extends GridDistributedTxPrepareRequest {
reader.incrementState();
- case 28:
+ case 23:
nearNodeId = reader.readUuid("nearNodeId");
if (!reader.isLastRead())
@@ -522,7 +460,7 @@ public class GridDhtTxPrepareRequest extends GridDistributedTxPrepareRequest {
reader.incrementState();
- case 29:
+ case 24:
nearWrites = reader.readCollection("nearWrites", MessageCollectionItemType.MSG);
if (!reader.isLastRead())
@@ -530,7 +468,7 @@ public class GridDhtTxPrepareRequest extends GridDistributedTxPrepareRequest {
reader.incrementState();
- case 30:
+ case 25:
nearXidVer = reader.readMessage("nearXidVer");
if (!reader.isLastRead())
@@ -538,7 +476,7 @@ public class GridDhtTxPrepareRequest extends GridDistributedTxPrepareRequest {
reader.incrementState();
- case 31:
+ case 26:
ownedKeys = reader.readCollection("ownedKeys", MessageCollectionItemType.MSG);
if (!reader.isLastRead())
@@ -546,7 +484,7 @@ public class GridDhtTxPrepareRequest extends GridDistributedTxPrepareRequest {
reader.incrementState();
- case 32:
+ case 27:
ownedVals = reader.readCollection("ownedVals", MessageCollectionItemType.MSG);
if (!reader.isLastRead())
@@ -554,7 +492,7 @@ public class GridDhtTxPrepareRequest extends GridDistributedTxPrepareRequest {
reader.incrementState();
- case 33:
+ case 28:
preloadKeys = reader.readBitSet("preloadKeys");
if (!reader.isLastRead())
@@ -562,7 +500,7 @@ public class GridDhtTxPrepareRequest extends GridDistributedTxPrepareRequest {
reader.incrementState();
- case 34:
+ case 29:
subjId = reader.readUuid("subjId");
if (!reader.isLastRead())
@@ -570,7 +508,7 @@ public class GridDhtTxPrepareRequest extends GridDistributedTxPrepareRequest {
reader.incrementState();
- case 35:
+ case 30:
taskNameHash = reader.readInt("taskNameHash");
if (!reader.isLastRead())
@@ -578,7 +516,7 @@ public class GridDhtTxPrepareRequest extends GridDistributedTxPrepareRequest {
reader.incrementState();
- case 36:
+ case 31:
topVer = reader.readMessage("topVer");
if (!reader.isLastRead())
@@ -598,6 +536,6 @@ public class GridDhtTxPrepareRequest extends GridDistributedTxPrepareRequest {
/** {@inheritDoc} */
@Override public byte fieldsCount() {
- return 37;
+ return 32;
}
}
http://git-wip-us.apache.org/repos/asf/ignite/blob/ca67537f/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtUnlockRequest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtUnlockRequest.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtUnlockRequest.java
index 3737295..752df54 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtUnlockRequest.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtUnlockRequest.java
@@ -119,11 +119,6 @@ public class GridDhtUnlockRequest extends GridDistributedUnlockRequest {
writer.incrementState();
- case 9:
- if (!writer.writeCollection("partIds", partIds, MessageCollectionItemType.INT))
- return false;
-
- writer.incrementState();
}
return true;
@@ -148,14 +143,6 @@ public class GridDhtUnlockRequest extends GridDistributedUnlockRequest {
reader.incrementState();
- case 9:
- partIds = reader.readCollection("partIds", MessageCollectionItemType.INT);
-
- if (!reader.isLastRead())
- return false;
-
- reader.incrementState();
-
}
return reader.afterMessageRead(GridDhtUnlockRequest.class);
@@ -168,6 +155,6 @@ public class GridDhtUnlockRequest extends GridDistributedUnlockRequest {
/** {@inheritDoc} */
@Override public byte fieldsCount() {
- return 10;
+ return 9;
}
}
http://git-wip-us.apache.org/repos/asf/ignite/blob/ca67537f/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearGetRequest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearGetRequest.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearGetRequest.java
index 7ca2635..79c71b3 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearGetRequest.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearGetRequest.java
@@ -73,10 +73,6 @@ public class GridNearGetRequest extends GridCacheMessage implements GridCacheDep
@GridDirectCollection(KeyCacheObject.class)
private List<KeyCacheObject> keys;
- /** Partition IDs. */
- @GridDirectCollection(int.class)
- private List<Integer> partIds;
-
/** */
@GridDirectCollection(boolean.class)
private Collection<Boolean> flags;
@@ -154,12 +150,10 @@ public class GridNearGetRequest extends GridCacheMessage implements GridCacheDep
this.keys = new ArrayList<>(keys.size());
flags = new ArrayList<>(keys.size());
- partIds = new ArrayList<>(keys.size());
for (Map.Entry<KeyCacheObject, Boolean> entry : keys.entrySet()) {
this.keys.add(entry.getKey());
flags.add(entry.getValue());
- partIds.add(entry.getKey().partition());
}
this.readThrough = readThrough;
@@ -259,7 +253,7 @@ public class GridNearGetRequest extends GridCacheMessage implements GridCacheDep
/** {@inheritDoc} */
@Override public int partition() {
- return partIds != null && !partIds.isEmpty() ? partIds.get(0) : -1;
+ return keys != null && !keys.isEmpty() ? keys.get(0).partition() : -1;
}
/**
@@ -302,13 +296,6 @@ public class GridNearGetRequest extends GridCacheMessage implements GridCacheDep
while (keysIt.hasNext())
keyMap.put(keysIt.next(), flagsIt.next());
}
-
- if (partIds != null && !partIds.isEmpty()) {
- assert partIds.size() == keys.size();
-
- for (int i = 0; i < keys.size(); i++)
- keys.get(i).partition(partIds.get(i));
- }
}
/** {@inheritDoc} */
@@ -368,48 +355,42 @@ public class GridNearGetRequest extends GridCacheMessage implements GridCacheDep
writer.incrementState();
case 9:
- if (!writer.writeCollection("partIds", partIds, MessageCollectionItemType.INT))
- return false;
-
- writer.incrementState();
-
- case 10:
if (!writer.writeBoolean("readThrough", readThrough))
return false;
writer.incrementState();
- case 11:
+ case 10:
if (!writer.writeBoolean("reload", reload))
return false;
writer.incrementState();
- case 12:
+ case 11:
if (!writer.writeBoolean("skipVals", skipVals))
return false;
writer.incrementState();
- case 13:
+ case 12:
if (!writer.writeUuid("subjId", subjId))
return false;
writer.incrementState();
- case 14:
+ case 13:
if (!writer.writeInt("taskNameHash", taskNameHash))
return false;
writer.incrementState();
- case 15:
+ case 14:
if (!writer.writeMessage("topVer", topVer))
return false;
writer.incrementState();
- case 16:
+ case 15:
if (!writer.writeMessage("ver", ver))
return false;
@@ -480,14 +461,6 @@ public class GridNearGetRequest extends GridCacheMessage implements GridCacheDep
reader.incrementState();
case 9:
- partIds = reader.readCollection("partIds", MessageCollectionItemType.INT);
-
- if (!reader.isLastRead())
- return false;
-
- reader.incrementState();
-
- case 10:
readThrough = reader.readBoolean("readThrough");
if (!reader.isLastRead())
@@ -495,7 +468,7 @@ public class GridNearGetRequest extends GridCacheMessage implements GridCacheDep
reader.incrementState();
- case 11:
+ case 10:
reload = reader.readBoolean("reload");
if (!reader.isLastRead())
@@ -503,7 +476,7 @@ public class GridNearGetRequest extends GridCacheMessage implements GridCacheDep
reader.incrementState();
- case 12:
+ case 11:
skipVals = reader.readBoolean("skipVals");
if (!reader.isLastRead())
@@ -511,7 +484,7 @@ public class GridNearGetRequest extends GridCacheMessage implements GridCacheDep
reader.incrementState();
- case 13:
+ case 12:
subjId = reader.readUuid("subjId");
if (!reader.isLastRead())
@@ -519,7 +492,7 @@ public class GridNearGetRequest extends GridCacheMessage implements GridCacheDep
reader.incrementState();
- case 14:
+ case 13:
taskNameHash = reader.readInt("taskNameHash");
if (!reader.isLastRead())
@@ -527,7 +500,7 @@ public class GridNearGetRequest extends GridCacheMessage implements GridCacheDep
reader.incrementState();
- case 15:
+ case 14:
topVer = reader.readMessage("topVer");
if (!reader.isLastRead())
@@ -535,7 +508,7 @@ public class GridNearGetRequest extends GridCacheMessage implements GridCacheDep
reader.incrementState();
- case 16:
+ case 15:
ver = reader.readMessage("ver");
if (!reader.isLastRead())
@@ -555,7 +528,7 @@ public class GridNearGetRequest extends GridCacheMessage implements GridCacheDep
/** {@inheritDoc} */
@Override public byte fieldsCount() {
- return 17;
+ return 16;
}
/** {@inheritDoc} */
http://git-wip-us.apache.org/repos/asf/ignite/blob/ca67537f/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearLockRequest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearLockRequest.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearLockRequest.java
index 9e12153..3091b45 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearLockRequest.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearLockRequest.java
@@ -464,12 +464,6 @@ public class GridNearLockRequest extends GridDistributedLockRequest {
writer.incrementState();
- case 35:
- if (!writer.writeCollection("partIds", partIds, MessageCollectionItemType.INT))
- return false;
-
- writer.incrementState();
-
}
return true;
@@ -606,14 +600,6 @@ public class GridNearLockRequest extends GridDistributedLockRequest {
reader.incrementState();
- case 35:
- partIds = reader.readCollection("partIds", MessageCollectionItemType.INT);
-
- if (!reader.isLastRead())
- return false;
-
- reader.incrementState();
-
}
return reader.afterMessageRead(GridNearLockRequest.class);
@@ -626,7 +612,7 @@ public class GridNearLockRequest extends GridDistributedLockRequest {
/** {@inheritDoc} */
@Override public byte fieldsCount() {
- return 36;
+ return 35;
}
/** {@inheritDoc} */
http://git-wip-us.apache.org/repos/asf/ignite/blob/ca67537f/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearSingleGetRequest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearSingleGetRequest.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearSingleGetRequest.java
index 1a925f3..994172b 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearSingleGetRequest.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearSingleGetRequest.java
@@ -20,7 +20,6 @@ package org.apache.ignite.internal.processors.cache.distributed.near;
import java.nio.ByteBuffer;
import java.util.UUID;
import org.apache.ignite.IgniteCheckedException;
-import org.apache.ignite.internal.IgniteCodeGeneratingFail;
import org.apache.ignite.internal.processors.affinity.AffinityTopologyVersion;
import org.apache.ignite.internal.processors.cache.GridCacheContext;
import org.apache.ignite.internal.processors.cache.GridCacheDeployable;
@@ -38,25 +37,24 @@ import static org.apache.ignite.internal.processors.cache.GridCacheUtils.SKIP_ST
/**
*
*/
-@IgniteCodeGeneratingFail // partId read should not be generated by MessageCodeGenerator.
public class GridNearSingleGetRequest extends GridCacheMessage implements GridCacheDeployable {
/** */
private static final long serialVersionUID = 0L;
/** */
- public static final int READ_THROUGH_FLAG_MASK = 0x01;
+ private static final int READ_THROUGH_FLAG_MASK = 0x01;
/** */
- public static final int SKIP_VALS_FLAG_MASK = 0x02;
+ private static final int SKIP_VALS_FLAG_MASK = 0x02;
/** */
- public static final int ADD_READER_FLAG_MASK = 0x04;
+ private static final int ADD_READER_FLAG_MASK = 0x04;
/** */
- public static final int NEED_VER_FLAG_MASK = 0x08;
+ private static final int NEED_VER_FLAG_MASK = 0x08;
/** */
- public static final int NEED_ENTRY_INFO_FLAG_MASK = 0x10;
+ private static final int NEED_ENTRY_INFO_FLAG_MASK = 0x10;
/** Future ID. */
private long futId;
@@ -64,9 +62,6 @@ public class GridNearSingleGetRequest extends GridCacheMessage implements GridCa
/** */
private KeyCacheObject key;
- /** Partition ID. */
- private int partId = -1;
-
/** Flags. */
private byte flags;
@@ -128,7 +123,6 @@ public class GridNearSingleGetRequest extends GridCacheMessage implements GridCa
this.cacheId = cacheId;
this.futId = futId;
this.key = key;
- this.partId = key.partition();
this.topVer = topVer;
this.subjId = subjId;
this.taskNameHash = taskNameHash;
@@ -202,7 +196,9 @@ public class GridNearSingleGetRequest extends GridCacheMessage implements GridCa
/** {@inheritDoc} */
@Override public int partition() {
- return partId;
+ assert key != null;
+
+ return key.partition();
}
/**
@@ -257,8 +253,6 @@ public class GridNearSingleGetRequest extends GridCacheMessage implements GridCa
assert key != null;
- key.partition(partId);
-
GridCacheContext cctx = ctx.cacheContext(cacheId);
key.finishUnmarshal(cctx.cacheObjectContext(), ldr);
@@ -316,14 +310,6 @@ public class GridNearSingleGetRequest extends GridCacheMessage implements GridCa
reader.incrementState();
case 8:
- partId = reader.readInt("partId", -1);
-
- if (!reader.isLastRead())
- return false;
-
- reader.incrementState();
-
- case 9:
subjId = reader.readUuid("subjId");
if (!reader.isLastRead())
@@ -331,7 +317,7 @@ public class GridNearSingleGetRequest extends GridCacheMessage implements GridCa
reader.incrementState();
- case 10:
+ case 9:
taskNameHash = reader.readInt("taskNameHash");
if (!reader.isLastRead())
@@ -339,7 +325,7 @@ public class GridNearSingleGetRequest extends GridCacheMessage implements GridCa
reader.incrementState();
- case 11:
+ case 10:
topVer = reader.readMessage("topVer");
if (!reader.isLastRead())
@@ -398,24 +384,18 @@ public class GridNearSingleGetRequest extends GridCacheMessage implements GridCa
writer.incrementState();
case 8:
- if (!writer.writeInt("partId", partId))
- return false;
-
- writer.incrementState();
-
- case 9:
if (!writer.writeUuid("subjId", subjId))
return false;
writer.incrementState();
- case 10:
+ case 9:
if (!writer.writeInt("taskNameHash", taskNameHash))
return false;
writer.incrementState();
- case 11:
+ case 10:
if (!writer.writeMessage("topVer", topVer))
return false;
@@ -438,7 +418,7 @@ public class GridNearSingleGetRequest extends GridCacheMessage implements GridCa
/** {@inheritDoc} */
@Override public byte fieldsCount() {
- return 12;
+ return 11;
}
/** {@inheritDoc} */
http://git-wip-us.apache.org/repos/asf/ignite/blob/ca67537f/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearTxPrepareRequest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearTxPrepareRequest.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearTxPrepareRequest.java
index e55566b..c9ab48f 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearTxPrepareRequest.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearTxPrepareRequest.java
@@ -45,43 +45,40 @@ public class GridNearTxPrepareRequest extends GridDistributedTxPrepareRequest {
/** */
private static final long serialVersionUID = 0L;
+ /** */
+ private static final int NEAR_FLAG_MASK = 0x01;
+
+ /** */
+ private static final int FIRST_CLIENT_REQ_FLAG_MASK = 0x02;
+
+ /** */
+ private static final int IMPLICIT_SINGLE_FLAG_MASK = 0x04;
+
+ /** */
+ private static final int EXPLICIT_LOCK_FLAG_MASK = 0x08;
+
/** Future ID. */
private IgniteUuid futId;
/** Mini future ID. */
private IgniteUuid miniId;
- /** Near mapping flag. */
- private boolean near;
-
/** Topology version. */
private AffinityTopologyVersion topVer;
- /** {@code True} if this last prepare request for node. */
- private boolean last;
-
/** IDs of backup nodes receiving last prepare request during this prepare. */
@GridDirectCollection(UUID.class)
@GridToStringInclude
private Collection<UUID> lastBackups;
- /** Need return value flag. */
- private boolean retVal;
-
- /** Implicit single flag. */
- private boolean implicitSingle;
-
- /** Explicit lock flag. Set to true if at least one entry was explicitly locked. */
- private boolean explicitLock;
-
/** Subject ID. */
private UUID subjId;
/** Task name hash. */
private int taskNameHash;
- /** {@code True} if first optimistic tx prepare request sent from client node. */
- private boolean firstClientReq;
+ /** */
+ private byte flags;
/**
* Empty constructor required for {@link Externalizable}.
@@ -128,43 +125,42 @@ public class GridNearTxPrepareRequest extends GridDistributedTxPrepareRequest {
boolean firstClientReq,
boolean addDepInfo
) {
- super(tx, timeout, reads, writes, txNodes, onePhaseCommit, addDepInfo);
+ super(tx,
+ timeout,
+ reads,
+ writes,
+ txNodes,
+ retVal,
+ last,
+ onePhaseCommit,
+ addDepInfo);
assert futId != null;
assert !firstClientReq || tx.optimistic() : tx;
this.futId = futId;
this.topVer = topVer;
- this.near = near;
- this.last = last;
- this.retVal = retVal;
- this.implicitSingle = implicitSingle;
- this.explicitLock = explicitLock;
this.subjId = subjId;
this.taskNameHash = taskNameHash;
- this.firstClientReq = firstClientReq;
- }
- /**
- * @return {@code True} if first optimistic tx prepare request sent from client node.
- */
- public boolean firstClientRequest() {
- return firstClientReq;
+ setFlag(near, NEAR_FLAG_MASK);
+ setFlag(implicitSingle, IMPLICIT_SINGLE_FLAG_MASK);
+ setFlag(explicitLock, EXPLICIT_LOCK_FLAG_MASK);
+ setFlag(firstClientReq, FIRST_CLIENT_REQ_FLAG_MASK);
}
-
/**
- * @return {@code True} if this last prepare request for node.
+ * @return {@code True} if first optimistic tx prepare request sent from client node.
*/
- public boolean last() {
- return last;
+ public final boolean firstClientRequest() {
+ return isFlag(FIRST_CLIENT_REQ_FLAG_MASK);
}
/**
* @return {@code True} if mapping is for near-enabled caches.
*/
- public boolean near() {
- return near;
+ public final boolean near() {
+ return isFlag(NEAR_FLAG_MASK);
}
/**
@@ -203,24 +199,17 @@ public class GridNearTxPrepareRequest extends GridDistributedTxPrepareRequest {
}
/**
- * @return Whether return value is requested.
- */
- public boolean returnValue() {
- return retVal;
- }
-
- /**
* @return Implicit single flag.
*/
- public boolean implicitSingle() {
- return implicitSingle;
+ public final boolean implicitSingle() {
+ return isFlag(IMPLICIT_SINGLE_FLAG_MASK);
}
/**
* @return Explicit lock flag.
*/
- public boolean explicitLock() {
- return explicitLock;
+ public final boolean explicitLock() {
+ return isFlag(EXPLICIT_LOCK_FLAG_MASK);
}
/**
@@ -269,6 +258,26 @@ public class GridNearTxPrepareRequest extends GridDistributedTxPrepareRequest {
return true;
}
+ /**
+ * Sets flag mask.
+ *
+ * @param flag Set or clear.
+ * @param mask Mask.
+ */
+ private void setFlag(boolean flag, int mask) {
+ flags = flag ? (byte)(flags | mask) : (byte)(flags & ~mask);
+ }
+
+ /**
+ * Reags flag mask.
+ *
+ * @param mask Mask to read.
+ * @return Flag value.
+ */
+ private boolean isFlag(int mask) {
+ return (flags & mask) != 0;
+ }
+
/** {@inheritDoc} */
@Override public boolean writeTo(ByteBuffer buf, MessageWriter writer) {
writer.setBuffer(buf);
@@ -284,73 +293,43 @@ public class GridNearTxPrepareRequest extends GridDistributedTxPrepareRequest {
}
switch (writer.state()) {
- case 23:
- if (!writer.writeBoolean("explicitLock", explicitLock))
+ case 20:
+ if (!writer.writeByte("flags", flags))
return false;
writer.incrementState();
- case 24:
- if (!writer.writeBoolean("firstClientReq", firstClientReq))
- return false;
-
- writer.incrementState();
-
- case 25:
+ case 21:
if (!writer.writeIgniteUuid("futId", futId))
return false;
writer.incrementState();
- case 26:
- if (!writer.writeBoolean("implicitSingle", implicitSingle))
- return false;
-
- writer.incrementState();
-
- case 27:
- if (!writer.writeBoolean("last", last))
- return false;
-
- writer.incrementState();
-
- case 28:
+ case 22:
if (!writer.writeCollection("lastBackups", lastBackups, MessageCollectionItemType.UUID))
return false;
writer.incrementState();
- case 29:
+ case 23:
if (!writer.writeIgniteUuid("miniId", miniId))
return false;
writer.incrementState();
- case 30:
- if (!writer.writeBoolean("near", near))
- return false;
-
- writer.incrementState();
-
- case 31:
- if (!writer.writeBoolean("retVal", retVal))
- return false;
-
- writer.incrementState();
-
- case 32:
+ case 24:
if (!writer.writeUuid("subjId", subjId))
return false;
writer.incrementState();
- case 33:
+ case 25:
if (!writer.writeInt("taskNameHash", taskNameHash))
return false;
writer.incrementState();
- case 34:
+ case 26:
if (!writer.writeMessage("topVer", topVer))
return false;
@@ -372,23 +351,15 @@ public class GridNearTxPrepareRequest extends GridDistributedTxPrepareRequest {
return false;
switch (reader.state()) {
- case 23:
- explicitLock = reader.readBoolean("explicitLock");
+ case 20:
+ flags = reader.readByte("flags");
if (!reader.isLastRead())
return false;
reader.incrementState();
- case 24:
- firstClientReq = reader.readBoolean("firstClientReq");
-
- if (!reader.isLastRead())
- return false;
-
- reader.incrementState();
-
- case 25:
+ case 21:
futId = reader.readIgniteUuid("futId");
if (!reader.isLastRead())
@@ -396,23 +367,7 @@ public class GridNearTxPrepareRequest extends GridDistributedTxPrepareRequest {
reader.incrementState();
- case 26:
- implicitSingle = reader.readBoolean("implicitSingle");
-
- if (!reader.isLastRead())
- return false;
-
- reader.incrementState();
-
- case 27:
- last = reader.readBoolean("last");
-
- if (!reader.isLastRead())
- return false;
-
- reader.incrementState();
-
- case 28:
+ case 22:
lastBackups = reader.readCollection("lastBackups", MessageCollectionItemType.UUID);
if (!reader.isLastRead())
@@ -420,7 +375,7 @@ public class GridNearTxPrepareRequest extends GridDistributedTxPrepareRequest {
reader.incrementState();
- case 29:
+ case 23:
miniId = reader.readIgniteUuid("miniId");
if (!reader.isLastRead())
@@ -428,23 +383,7 @@ public class GridNearTxPrepareRequest extends GridDistributedTxPrepareRequest {
reader.incrementState();
- case 30:
- near = reader.readBoolean("near");
-
- if (!reader.isLastRead())
- return false;
-
- reader.incrementState();
-
- case 31:
- retVal = reader.readBoolean("retVal");
-
- if (!reader.isLastRead())
- return false;
-
- reader.incrementState();
-
- case 32:
+ case 24:
subjId = reader.readUuid("subjId");
if (!reader.isLastRead())
@@ -452,7 +391,7 @@ public class GridNearTxPrepareRequest extends GridDistributedTxPrepareRequest {
reader.incrementState();
- case 33:
+ case 25:
taskNameHash = reader.readInt("taskNameHash");
if (!reader.isLastRead())
@@ -460,7 +399,7 @@ public class GridNearTxPrepareRequest extends GridDistributedTxPrepareRequest {
reader.incrementState();
- case 34:
+ case 26:
topVer = reader.readMessage("topVer");
if (!reader.isLastRead())
@@ -480,7 +419,7 @@ public class GridNearTxPrepareRequest extends GridDistributedTxPrepareRequest {
/** {@inheritDoc} */
@Override public byte fieldsCount() {
- return 35;
+ return 27;
}
/** {@inheritDoc} */
http://git-wip-us.apache.org/repos/asf/ignite/blob/ca67537f/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearUnlockRequest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearUnlockRequest.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearUnlockRequest.java
index be78868..c32a844 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearUnlockRequest.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearUnlockRequest.java
@@ -62,14 +62,6 @@ public class GridNearUnlockRequest extends GridDistributedUnlockRequest {
writer.onHeaderWritten();
}
- switch (writer.state()) {
- case 8:
- if (!writer.writeCollection("partIds", partIds, MessageCollectionItemType.INT))
- return false;
-
- writer.incrementState();
- }
-
return true;
}
@@ -83,16 +75,6 @@ public class GridNearUnlockRequest extends GridDistributedUnlockRequest {
if (!super.readFrom(buf, reader))
return false;
- switch (reader.state()) {
- case 8:
- partIds = reader.readCollection("partIds", MessageCollectionItemType.INT);
-
- if (!reader.isLastRead())
- return false;
-
- reader.incrementState();
- }
-
return reader.afterMessageRead(GridNearUnlockRequest.class);
}
@@ -103,7 +85,7 @@ public class GridNearUnlockRequest extends GridDistributedUnlockRequest {
/** {@inheritDoc} */
@Override public byte fieldsCount() {
- return 9;
+ return 8;
}
/** {@inheritDoc} */
http://git-wip-us.apache.org/repos/asf/ignite/blob/ca67537f/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/transactions/IgniteTxEntry.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/transactions/IgniteTxEntry.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/transactions/IgniteTxEntry.java
index 1691fd7..4e56e7a 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/transactions/IgniteTxEntry.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/transactions/IgniteTxEntry.java
@@ -99,9 +99,6 @@ public class IgniteTxEntry implements GridPeerDeployAware, Message {
/** Cache ID. */
private int cacheId;
- /** Partition ID. */
- private int partId = -1;
-
/** Transient tx key. */
@GridDirectTransient
private IgniteTxKey txKey;
@@ -261,7 +258,6 @@ public class IgniteTxEntry implements GridPeerDeployAware, Message {
keepBinary(keepBinary);
key = entry.key();
- partId = entry.key().partition();
cacheId = entry.context().cacheId();
}
@@ -314,7 +310,6 @@ public class IgniteTxEntry implements GridPeerDeployAware, Message {
addEntryProcessor(entryProcessor, invokeArgs);
key = entry.key();
- partId = entry.key().partition();
cacheId = entry.context().cacheId();
}
@@ -348,7 +343,6 @@ public class IgniteTxEntry implements GridPeerDeployAware, Message {
IgniteTxEntry cp = new IgniteTxEntry();
cp.key = key;
- cp.partId = partId;
cp.cacheId = cacheId;
cp.ctx = ctx;
@@ -935,8 +929,6 @@ public class IgniteTxEntry implements GridPeerDeployAware, Message {
key.finishUnmarshal(context().cacheObjectContext(), clsLdr);
- key.partition(partId);
-
val.unmarshal(this.ctx, clsLdr);
if (expiryPlcBytes != null && expiryPlc == null)
@@ -1090,12 +1082,6 @@ public class IgniteTxEntry implements GridPeerDeployAware, Message {
writer.incrementState();
- case 12:
- if (!writer.writeInt("partId", partId))
- return false;
-
- writer.incrementState();
-
case 13:
if (!writer.writeMessage("oldVal", oldVal))
return false;
@@ -1210,14 +1196,6 @@ public class IgniteTxEntry implements GridPeerDeployAware, Message {
reader.incrementState();
- case 12:
- partId = reader.readInt("partId", -1);
-
- if (!reader.isLastRead())
- return false;
-
- reader.incrementState();
-
case 13:
oldVal = reader.readMessage("oldVal");
http://git-wip-us.apache.org/repos/asf/ignite/blob/ca67537f/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/transactions/IgniteTxHandler.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/transactions/IgniteTxHandler.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/transactions/IgniteTxHandler.java
index 1b135d7..21c2649 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/transactions/IgniteTxHandler.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/transactions/IgniteTxHandler.java
@@ -457,7 +457,7 @@ public class IgniteTxHandler {
tx.onePhaseCommit(true);
}
- if (req.returnValue())
+ if (req.needReturnValue())
tx.needReturnValue(true);
IgniteInternalFuture<GridNearTxPrepareResponse> fut = tx.prepareAsync(
http://git-wip-us.apache.org/repos/asf/ignite/blob/ca67537f/modules/core/src/main/java/org/apache/ignite/internal/processors/cacheobject/IgniteCacheObjectProcessorImpl.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cacheobject/IgniteCacheObjectProcessorImpl.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cacheobject/IgniteCacheObjectProcessorImpl.java
index 9f37f6e..dbd8ea1 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cacheobject/IgniteCacheObjectProcessorImpl.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cacheobject/IgniteCacheObjectProcessorImpl.java
@@ -231,8 +231,8 @@ public class IgniteCacheObjectProcessorImpl extends GridProcessorAdapter impleme
cctx.affinity().partition(obj, false) :
ctx.kernalContext().affinity().partition0(ctx.cacheName(), obj, null);
}
- catch (IgniteCheckedException ignored) {
- U.error(log, "Failed to get partition");
+ catch (IgniteCheckedException e) {
+ U.error(log, "Failed to get partition", e);
return -1;
}
@@ -327,13 +327,7 @@ public class IgniteCacheObjectProcessorImpl extends GridProcessorAdapter impleme
/**
* @param key Key.
- */
- UserKeyCacheObjectImpl(Object key) {
- this(key, -1);
- }
-
- /**
- * @param key Key.
+ * @param part Partition.
*/
UserKeyCacheObjectImpl(Object key, int part) {
super(key, null, part);
@@ -341,6 +335,8 @@ public class IgniteCacheObjectProcessorImpl extends GridProcessorAdapter impleme
/**
* @param key Key.
+ * @param valBytes Marshalled key.
+ * @param part Partition.
*/
UserKeyCacheObjectImpl(Object key, byte[] valBytes, int part) {
super(key, valBytes, part);
@@ -366,10 +362,10 @@ public class IgniteCacheObjectProcessorImpl extends GridProcessorAdapter impleme
Object val = ctx.processor().unmarshal(ctx, valBytes, ldr);
- return new KeyCacheObjectImpl(val, valBytes);
+ return new KeyCacheObjectImpl(val, valBytes, partition());
}
- return new KeyCacheObjectImpl(val, valBytes);
+ return new KeyCacheObjectImpl(val, valBytes, partition());
}
catch (IgniteCheckedException e) {
throw new IgniteException("Failed to marshal object: " + val, e);
http://git-wip-us.apache.org/repos/asf/ignite/blob/ca67537f/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/query/continuous/IgniteCacheContinuousQueryImmutableEntryTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/query/continuous/IgniteCacheContinuousQueryImmutableEntryTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/query/continuous/IgniteCacheContinuousQueryImmutableEntryTest.java
index 66d727c..519a989 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/query/continuous/IgniteCacheContinuousQueryImmutableEntryTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/query/continuous/IgniteCacheContinuousQueryImmutableEntryTest.java
@@ -132,7 +132,7 @@ public class IgniteCacheContinuousQueryImmutableEntryTest extends GridCommonAbst
CacheContinuousQueryEntry e0 = new CacheContinuousQueryEntry(
1,
EventType.UPDATED,
- new KeyCacheObjectImpl(1, new byte[] {0, 0, 0, 1}),
+ new KeyCacheObjectImpl(1, new byte[] {0, 0, 0, 1}, 1),
new CacheObjectImpl(2, new byte[] {0, 0, 0, 2}),
new CacheObjectImpl(2, new byte[] {0, 0, 0, 3}),
true,
http://git-wip-us.apache.org/repos/asf/ignite/blob/ca67537f/modules/core/src/test/java/org/apache/ignite/spi/swapspace/file/GridFileSwapSpaceSpiSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/spi/swapspace/file/GridFileSwapSpaceSpiSelfTest.java b/modules/core/src/test/java/org/apache/ignite/spi/swapspace/file/GridFileSwapSpaceSpiSelfTest.java
index ab21165..a59b6d1 100644
--- a/modules/core/src/test/java/org/apache/ignite/spi/swapspace/file/GridFileSwapSpaceSpiSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/spi/swapspace/file/GridFileSwapSpaceSpiSelfTest.java
@@ -118,7 +118,7 @@ public class GridFileSwapSpaceSpiSelfTest extends GridSwapSpaceSpiAbstractSelfTe
* @return Swap key.
*/
private SwapKey key(int i) {
- return new SwapKey(new KeyCacheObjectImpl(i, U.intToBytes(i)), i % 11, U.intToBytes(i));
+ return new SwapKey(new KeyCacheObjectImpl(i, U.intToBytes(i), i), i % 11, U.intToBytes(i));
}
/**