You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ignite.apache.org by ag...@apache.org on 2014/12/09 07:33:04 UTC
[1/5] incubator-ignite git commit: Ignite - Fixes for invalidate flag.
Repository: incubator-ignite
Updated Branches:
refs/heads/master 984373dc3 -> e2c4d2658
Ignite - Fixes for invalidate flag.
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/9f90d7d6
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/9f90d7d6
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/9f90d7d6
Branch: refs/heads/master
Commit: 9f90d7d6250cbaa83d0c8c09f0b44fde01eddb09
Parents: 984373d
Author: Alexey Goncharuk <ag...@gridgain.com>
Authored: Mon Dec 8 14:50:19 2014 -0800
Committer: Alexey Goncharuk <ag...@gridgain.com>
Committed: Mon Dec 8 14:50:19 2014 -0800
----------------------------------------------------------------------
.../kernal/processors/cache/GridCacheAdapter.java | 7 +++++--
.../kernal/processors/cache/GridCacheTxAdapter.java | 14 ++------------
.../kernal/processors/cache/GridCacheTxHandler.java | 2 ++
.../processors/cache/GridCacheTxLocalAdapter.java | 5 +++--
.../kernal/processors/cache/GridCacheTxManager.java | 2 ++
.../dht/GridDhtTransactionalCacheAdapter.java | 1 +
.../cache/distributed/dht/GridDhtTxLocal.java | 2 ++
.../cache/distributed/dht/GridDhtTxLocalAdapter.java | 5 +++--
.../cache/distributed/near/GridNearTxLocal.java | 4 ++--
.../kernal/processors/cache/local/GridLocalTx.java | 4 ++--
.../cache/transactions/IgniteTransactionsImpl.java | 8 ++++++++
.../testsuites/bamboo/GridDataGridTestSuite.java | 4 ++--
.../processors/cache/jta/GridCacheJtaManager.java | 1 +
13 files changed, 35 insertions(+), 24 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/9f90d7d6/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/GridCacheAdapter.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/GridCacheAdapter.java b/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/GridCacheAdapter.java
index 31cd964..f6207be 100644
--- a/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/GridCacheAdapter.java
+++ b/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/GridCacheAdapter.java
@@ -25,7 +25,6 @@ import org.gridgain.grid.cache.query.*;
import org.gridgain.grid.kernal.*;
import org.gridgain.grid.kernal.processors.cache.affinity.*;
import org.gridgain.grid.kernal.processors.cache.datastructures.*;
-import org.gridgain.grid.kernal.processors.cache.distributed.*;
import org.gridgain.grid.kernal.processors.cache.distributed.dht.*;
import org.gridgain.grid.kernal.processors.cache.dr.*;
import org.gridgain.grid.kernal.processors.cache.query.*;
@@ -52,7 +51,6 @@ import static org.gridgain.grid.cache.GridCacheFlag.*;
import static org.gridgain.grid.cache.GridCachePeekMode.*;
import static org.gridgain.grid.cache.GridCacheTxConcurrency.*;
import static org.gridgain.grid.cache.GridCacheTxIsolation.*;
-import static org.gridgain.grid.cache.GridCacheTxState.*;
import static org.apache.ignite.events.IgniteEventType.*;
import static org.gridgain.grid.kernal.GridClosureCallMode.*;
import static org.gridgain.grid.kernal.processors.dr.GridDrType.*;
@@ -61,6 +59,7 @@ import static org.gridgain.grid.kernal.processors.task.GridTaskThreadContextKey.
/**
* Adapter for different cache implementations.
*/
+@SuppressWarnings("unchecked")
public abstract class GridCacheAdapter<K, V> extends GridMetadataAwareAdapter implements GridCache<K, V>,
GridCacheProjectionEx<K, V>, Externalizable {
/** */
@@ -3166,6 +3165,7 @@ public abstract class GridCacheAdapter<K, V> extends GridMetadataAwareAdapter im
concurrency,
isolation,
timeout,
+ false,
txSize,
/** group lock keys */null,
/** partition lock */false
@@ -3221,6 +3221,7 @@ public abstract class GridCacheAdapter<K, V> extends GridMetadataAwareAdapter im
concurrency,
isolation,
timeout,
+ ctx.hasFlag(INVALIDATE),
txSize,
grpLockKey,
partLock
@@ -3696,6 +3697,7 @@ public abstract class GridCacheAdapter<K, V> extends GridMetadataAwareAdapter im
PESSIMISTIC,
READ_COMMITTED,
tCfg.getDefaultTxTimeout(),
+ ctx.hasFlag(INVALIDATE),
0,
/** group lock keys */null,
/** partition lock */false
@@ -3765,6 +3767,7 @@ public abstract class GridCacheAdapter<K, V> extends GridMetadataAwareAdapter im
PESSIMISTIC,
READ_COMMITTED,
ctx.kernalContext().config().getTransactionsConfiguration().getDefaultTxTimeout(),
+ ctx.hasFlag(INVALIDATE),
0,
null,
false);
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/9f90d7d6/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/GridCacheTxAdapter.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/GridCacheTxAdapter.java b/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/GridCacheTxAdapter.java
index 2e67628..6ed4c5a 100644
--- a/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/GridCacheTxAdapter.java
+++ b/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/GridCacheTxAdapter.java
@@ -25,7 +25,6 @@ import org.jetbrains.annotations.*;
import java.io.*;
import java.util.*;
-import java.util.concurrent.*;
import java.util.concurrent.atomic.*;
import java.util.concurrent.locks.*;
@@ -219,6 +218,7 @@ public abstract class GridCacheTxAdapter<K, V> extends GridMetadataAwareAdapter
GridCacheTxConcurrency concurrency,
GridCacheTxIsolation isolation,
long timeout,
+ boolean invalidate,
int txSize,
@Nullable GridCacheTxKey grpLockKey,
@Nullable UUID subjId,
@@ -235,6 +235,7 @@ public abstract class GridCacheTxAdapter<K, V> extends GridMetadataAwareAdapter
this.concurrency = concurrency;
this.isolation = isolation;
this.timeout = timeout;
+ this.invalidate = invalidate;
this.txSize = txSize;
this.grpLockKey = grpLockKey;
this.subjId = subjId;
@@ -327,17 +328,6 @@ public abstract class GridCacheTxAdapter<K, V> extends GridMetadataAwareAdapter
}
/**
- * Waits for signal.
- *
- * @param ms Time to wait.
- * @return {@code True} if signal occurred.
- * @throws InterruptedException If interrupted.
- */
- protected final boolean awaitSignal(long ms) throws InterruptedException {
- return cond.await(ms, TimeUnit.MILLISECONDS);
- }
-
- /**
* Checks whether near cache should be updated.
*
* @return Flag indicating whether near cache should be updated.
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/9f90d7d6/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/GridCacheTxHandler.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/GridCacheTxHandler.java b/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/GridCacheTxHandler.java
index 1c39ddd..e01f5aa 100644
--- a/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/GridCacheTxHandler.java
+++ b/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/GridCacheTxHandler.java
@@ -252,6 +252,7 @@ public class GridCacheTxHandler<K, V> {
req.concurrency(),
req.isolation(),
req.timeout(),
+ req.isInvalidate(),
false,
req.txSize(),
req.groupLockKey(),
@@ -502,6 +503,7 @@ public class GridCacheTxHandler<K, V> {
PESSIMISTIC,
READ_COMMITTED,
/*timeout */0,
+ req.isInvalidate(),
req.explicitLock(),
req.txSize(),
req.groupLockKey(),
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/9f90d7d6/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/GridCacheTxLocalAdapter.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/GridCacheTxLocalAdapter.java b/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/GridCacheTxLocalAdapter.java
index 93ed43f..eead11f 100644
--- a/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/GridCacheTxLocalAdapter.java
+++ b/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/GridCacheTxLocalAdapter.java
@@ -109,14 +109,15 @@ public abstract class GridCacheTxLocalAdapter<K, V> extends GridCacheTxAdapter<K
GridCacheTxConcurrency concurrency,
GridCacheTxIsolation isolation,
long timeout,
+ boolean invalidate,
int txSize,
@Nullable GridCacheTxKey grpLockKey,
boolean partLock,
@Nullable UUID subjId,
int taskNameHash
) {
- super(cctx, xidVer, implicit, implicitSingle, /*local*/true, concurrency, isolation, timeout, txSize,
- grpLockKey, subjId, taskNameHash);
+ super(cctx, xidVer, implicit, implicitSingle, /*local*/true, concurrency, isolation, timeout, invalidate,
+ txSize, grpLockKey, subjId, taskNameHash);
assert !partLock || grpLockKey != null;
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/9f90d7d6/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/GridCacheTxManager.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/GridCacheTxManager.java b/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/GridCacheTxManager.java
index 2bc9a48..da0deed 100644
--- a/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/GridCacheTxManager.java
+++ b/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/GridCacheTxManager.java
@@ -364,6 +364,7 @@ public class GridCacheTxManager<K, V> extends GridCacheSharedManagerAdapter<K, V
GridCacheTxConcurrency concurrency,
GridCacheTxIsolation isolation,
long timeout,
+ boolean invalidate,
int txSize,
@Nullable GridCacheTxKey grpLockKey,
boolean partLock) {
@@ -378,6 +379,7 @@ public class GridCacheTxManager<K, V> extends GridCacheSharedManagerAdapter<K, V
concurrency,
isolation,
timeout,
+ invalidate,
txSize,
grpLockKey,
partLock,
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/9f90d7d6/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/distributed/dht/GridDhtTransactionalCacheAdapter.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/distributed/dht/GridDhtTransactionalCacheAdapter.java b/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/distributed/dht/GridDhtTransactionalCacheAdapter.java
index 6b05200..7c76203 100644
--- a/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/distributed/dht/GridDhtTransactionalCacheAdapter.java
+++ b/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/distributed/dht/GridDhtTransactionalCacheAdapter.java
@@ -757,6 +757,7 @@ public abstract class GridDhtTransactionalCacheAdapter<K, V> extends GridDhtCach
PESSIMISTIC,
req.isolation(),
req.timeout(),
+ req.isInvalidate(),
false,
req.txSize(),
req.groupLockKey(),
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/9f90d7d6/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/distributed/dht/GridDhtTxLocal.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/distributed/dht/GridDhtTxLocal.java b/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/distributed/dht/GridDhtTxLocal.java
index e6e206f..f0ad4da 100644
--- a/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/distributed/dht/GridDhtTxLocal.java
+++ b/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/distributed/dht/GridDhtTxLocal.java
@@ -98,6 +98,7 @@ public class GridDhtTxLocal<K, V> extends GridDhtTxLocalAdapter<K, V> implements
GridCacheTxConcurrency concurrency,
GridCacheTxIsolation isolation,
long timeout,
+ boolean invalidate,
boolean explicitLock,
int txSize,
@Nullable GridCacheTxKey grpLockKey,
@@ -114,6 +115,7 @@ public class GridDhtTxLocal<K, V> extends GridDhtTxLocalAdapter<K, V> implements
concurrency,
isolation,
timeout,
+ invalidate,
explicitLock,
txSize,
grpLockKey,
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/9f90d7d6/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/distributed/dht/GridDhtTxLocalAdapter.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/distributed/dht/GridDhtTxLocalAdapter.java b/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/distributed/dht/GridDhtTxLocalAdapter.java
index 7f7e6a9..6966644 100644
--- a/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/distributed/dht/GridDhtTxLocalAdapter.java
+++ b/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/distributed/dht/GridDhtTxLocalAdapter.java
@@ -88,6 +88,7 @@ public abstract class GridDhtTxLocalAdapter<K, V> extends GridCacheTxLocalAdapte
GridCacheTxConcurrency concurrency,
GridCacheTxIsolation isolation,
long timeout,
+ boolean invalidate,
boolean explicitLock,
int txSize,
@Nullable GridCacheTxKey grpLockKey,
@@ -95,8 +96,8 @@ public abstract class GridDhtTxLocalAdapter<K, V> extends GridCacheTxLocalAdapte
@Nullable UUID subjId,
int taskNameHash
) {
- super(cctx, xidVer, implicit, implicitSingle, concurrency, isolation, timeout, txSize, grpLockKey, partLock,
- subjId, taskNameHash);
+ super(cctx, xidVer, implicit, implicitSingle, concurrency, isolation, timeout, invalidate, txSize, grpLockKey,
+ partLock, subjId, taskNameHash);
assert cctx != null;
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/9f90d7d6/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/distributed/near/GridNearTxLocal.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/distributed/near/GridNearTxLocal.java b/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/distributed/near/GridNearTxLocal.java
index eb006fa..dc12420 100644
--- a/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/distributed/near/GridNearTxLocal.java
+++ b/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/distributed/near/GridNearTxLocal.java
@@ -95,6 +95,7 @@ public class GridNearTxLocal<K, V> extends GridDhtTxLocalAdapter<K, V> {
GridCacheTxConcurrency concurrency,
GridCacheTxIsolation isolation,
long timeout,
+ boolean invalidate,
int txSize,
@Nullable GridCacheTxKey grpLockKey,
boolean partLock,
@@ -109,14 +110,13 @@ public class GridNearTxLocal<K, V> extends GridDhtTxLocalAdapter<K, V> {
concurrency,
isolation,
timeout,
+ invalidate,
/*TODO explicit lock???*/false,
txSize,
grpLockKey,
partLock,
subjId,
taskNameHash);
-
- assert ctx != null;
}
/** {@inheritDoc} */
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/9f90d7d6/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/local/GridLocalTx.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/local/GridLocalTx.java b/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/local/GridLocalTx.java
index 24cd2ba..caee6e7 100644
--- a/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/local/GridLocalTx.java
+++ b/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/local/GridLocalTx.java
@@ -60,8 +60,8 @@ class GridLocalTx<K, V> extends GridCacheTxLocalAdapter<K, V> {
@Nullable UUID subjId,
int taskNameHash
) {
- super(ctx, ctx.versions().next(), implicit, implicitSingle, concurrency, isolation, timeout, txSize, null,
- false, subjId, taskNameHash);
+ super(ctx, ctx.versions().next(), implicit, implicitSingle, concurrency, isolation, timeout, false, txSize,
+ null, false, subjId, taskNameHash);
}
/** {@inheritDoc} */
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/9f90d7d6/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/transactions/IgniteTransactionsImpl.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/transactions/IgniteTransactionsImpl.java b/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/transactions/IgniteTransactionsImpl.java
index 2a82631..621bc50 100644
--- a/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/transactions/IgniteTransactionsImpl.java
+++ b/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/transactions/IgniteTransactionsImpl.java
@@ -74,6 +74,13 @@ public class IgniteTransactionsImpl<K, V> implements IgniteTransactions {
);
}
+ /**
+ * @param concurrency Transaction concurrency.
+ * @param isolation Transaction isolation.
+ * @param timeout Transaction timeout.
+ * @param txSize Expected transaction size.
+ * @return Transaction.
+ */
private GridCacheTx txStart0(GridCacheTxConcurrency concurrency, GridCacheTxIsolation isolation,
long timeout, int txSize) {
GridTransactionsConfiguration cfg = cctx.gridConfig().getTransactionsConfiguration();
@@ -94,6 +101,7 @@ public class IgniteTransactionsImpl<K, V> implements IgniteTransactions {
concurrency,
isolation,
timeout,
+ false,
txSize,
/** group lock keys */null,
/** partition lock */false
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/9f90d7d6/modules/core/src/test/java/org/gridgain/testsuites/bamboo/GridDataGridTestSuite.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/gridgain/testsuites/bamboo/GridDataGridTestSuite.java b/modules/core/src/test/java/org/gridgain/testsuites/bamboo/GridDataGridTestSuite.java
index a2e9576..841f116 100644
--- a/modules/core/src/test/java/org/gridgain/testsuites/bamboo/GridDataGridTestSuite.java
+++ b/modules/core/src/test/java/org/gridgain/testsuites/bamboo/GridDataGridTestSuite.java
@@ -119,8 +119,8 @@ public class GridDataGridTestSuite extends TestSuite {
suite.addTest(new TestSuite(GridCachePartitionedBasicApiTest.class));
suite.addTest(new TestSuite(GridCacheNearMultiGetSelfTest.class));
// suite.addTest(new TestSuite(GridCacheNearJobExecutionSelfTest.class));
-// suite.addTest(new TestSuite(GridCachePartitionedProjectionSelfTest.class));
-// suite.addTest(new TestSuite(GridCachePartitionedOnlyProjectionSelfTest.class));
+ suite.addTest(new TestSuite(GridCachePartitionedProjectionSelfTest.class));
+ suite.addTest(new TestSuite(GridCachePartitionedOnlyProjectionSelfTest.class));
suite.addTest(new TestSuite(GridCacheNearOneNodeSelfTest.class));
suite.addTest(new TestSuite(GridCacheNearMultiNodeSelfTest.class));
suite.addTest(new TestSuite(GridCacheAtomicNearMultiNodeSelfTest.class));
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/9f90d7d6/modules/jta/src/main/java/org/gridgain/grid/kernal/processors/cache/jta/GridCacheJtaManager.java
----------------------------------------------------------------------
diff --git a/modules/jta/src/main/java/org/gridgain/grid/kernal/processors/cache/jta/GridCacheJtaManager.java b/modules/jta/src/main/java/org/gridgain/grid/kernal/processors/cache/jta/GridCacheJtaManager.java
index 536ae09..6d921bc 100644
--- a/modules/jta/src/main/java/org/gridgain/grid/kernal/processors/cache/jta/GridCacheJtaManager.java
+++ b/modules/jta/src/main/java/org/gridgain/grid/kernal/processors/cache/jta/GridCacheJtaManager.java
@@ -69,6 +69,7 @@ public class GridCacheJtaManager<K, V> extends GridCacheJtaManagerAdapter<K, V>
tCfg.getDefaultTxConcurrency(),
tCfg.getDefaultTxIsolation(),
tCfg.getDefaultTxTimeout(),
+ false,
0,
/** group lock keys */null,
/** partition lock */false
[3/5] incubator-ignite git commit: Ignite - Fixing cache tests.
Posted by ag...@apache.org.
Ignite - Fixing cache tests.
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/ef04ea46
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/ef04ea46
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/ef04ea46
Branch: refs/heads/master
Commit: ef04ea463f5af7620cab27ef8c4268105b2f8e2a
Parents: 3ec08ec
Author: Alexey Goncharuk <ag...@gridgain.com>
Authored: Mon Dec 8 18:56:01 2014 -0800
Committer: Alexey Goncharuk <ag...@gridgain.com>
Committed: Mon Dec 8 18:56:01 2014 -0800
----------------------------------------------------------------------
.../processors/cache/GridCacheTxHandler.java | 2 +-
.../processors/cache/GridCacheTxManager.java | 2 +-
...ansformWriteThroughSingleUpdateSelfTest.java | 98 --------------------
.../bamboo/GridDataGridTestSuite.java | 3 +-
4 files changed, 3 insertions(+), 102 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/ef04ea46/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/GridCacheTxHandler.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/GridCacheTxHandler.java b/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/GridCacheTxHandler.java
index e01f5aa..593c424 100644
--- a/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/GridCacheTxHandler.java
+++ b/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/GridCacheTxHandler.java
@@ -966,7 +966,7 @@ public class GridCacheTxHandler<K, V> {
res.invalidPartitions(tx.invalidPartitions());
- if (tx.empty()) {
+ if (tx.empty() && req.last()) {
tx.rollback();
return null;
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/ef04ea46/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/GridCacheTxManager.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/GridCacheTxManager.java b/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/GridCacheTxManager.java
index 9bd8a7a..52c43f4 100644
--- a/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/GridCacheTxManager.java
+++ b/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/GridCacheTxManager.java
@@ -995,7 +995,7 @@ public class GridCacheTxManager<K, V> extends GridCacheSharedManagerAdapter<K, V
* @return If transaction was not already present in completed set.
*/
public boolean addCommittedTx(GridCacheVersion xidVer, @Nullable GridCacheVersion nearXidVer) {
- assert !rolledbackVers.contains(xidVer);
+ assert !rolledbackVers.contains(xidVer) : "Version was rolled back: " + xidVer;
if (nearXidVer != null)
xidVer = new CommittedVersion(xidVer, nearXidVer);
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/ef04ea46/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/dht/GridCachePartitionedTransformWriteThroughSingleUpdateSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/dht/GridCachePartitionedTransformWriteThroughSingleUpdateSelfTest.java b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/dht/GridCachePartitionedTransformWriteThroughSingleUpdateSelfTest.java
deleted file mode 100644
index 0e431bf..0000000
--- a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/dht/GridCachePartitionedTransformWriteThroughSingleUpdateSelfTest.java
+++ /dev/null
@@ -1,98 +0,0 @@
-/* @java.file.header */
-
-/* _________ _____ __________________ _____
- * __ ____/___________(_)______ /__ ____/______ ____(_)_______
- * _ / __ __ ___/__ / _ __ / _ / __ _ __ `/__ / __ __ \
- * / /_/ / _ / _ / / /_/ / / /_/ / / /_/ / _ / _ / / /
- * \____/ /_/ /_/ \_,__/ \____/ \__,_/ /_/ /_/ /_/
- */
-
-package org.gridgain.grid.kernal.processors.cache.distributed.dht;
-
-import org.gridgain.grid.*;
-import org.gridgain.testframework.*;
-
-import java.util.concurrent.*;
-
-import static org.gridgain.grid.cache.GridCacheTxConcurrency.OPTIMISTIC;
-
-/**
- * Test for transform put with single update enabled.
- */
-public class GridCachePartitionedTransformWriteThroughSingleUpdateSelfTest
- extends GridCacheAbstractTransformWriteThroughSelfTest {
- /** {@inheritDoc} */
- @Override protected boolean batchUpdate() {
- return false;
- }
-
- /** {@inheritDoc} */
- @Override public void testTransformOptimisticNearUpdate() throws Exception {
- GridTestUtils.assertThrows(log, new Callable<Object>() {
- @Override public Object call() throws Exception {
- checkTransform(OPTIMISTIC, NEAR_NODE, OP_UPDATE);
-
- return null;
- }
- }, GridException.class, null);
-
- }
-
- /** {@inheritDoc} */
- @Override public void testTransformOptimisticPrimaryUpdate() throws Exception {
- GridTestUtils.assertThrows(log, new Callable<Object>() {
- @Override public Object call() throws Exception {
- checkTransform(OPTIMISTIC, PRIMARY_NODE, OP_UPDATE);
-
- return null;
- }
- }, GridException.class, null);
- }
-
- /** {@inheritDoc} */
- @Override public void testTransformOptimisticBackupUpdate() throws Exception {
- GridTestUtils.assertThrows(log, new Callable<Object>() {
- @Override public Object call() throws Exception {
- checkTransform(OPTIMISTIC, BACKUP_NODE, OP_UPDATE);
-
- return null;
- }
- }, GridException.class, null);
-
- }
-
- /** {@inheritDoc} */
- @Override public void testTransformOptimisticNearDelete() throws Exception {
- GridTestUtils.assertThrows(log, new Callable<Object>() {
- @Override public Object call() throws Exception {
- checkTransform(OPTIMISTIC, NEAR_NODE, OP_DELETE);
-
- return null;
- }
- }, GridException.class, null);
-
- }
-
- /** {@inheritDoc} */
- @Override public void testTransformOptimisticPrimaryDelete() throws Exception {
- GridTestUtils.assertThrows(log, new Callable<Object>() {
- @Override public Object call() throws Exception {
- checkTransform(OPTIMISTIC, PRIMARY_NODE, OP_DELETE);
-
- return null;
- }
- },GridException.class, null);
-
- }
-
- /** {@inheritDoc} */
- @Override public void testTransformOptimisticBackupDelete() throws Exception {
- GridTestUtils.assertThrows(log, new Callable<Object>() {
- @Override public Object call() throws Exception {
- checkTransform(OPTIMISTIC, BACKUP_NODE, OP_DELETE);
-
- return null;
- }
- }, GridException.class, null);
- }
-}
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/ef04ea46/modules/core/src/test/java/org/gridgain/testsuites/bamboo/GridDataGridTestSuite.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/gridgain/testsuites/bamboo/GridDataGridTestSuite.java b/modules/core/src/test/java/org/gridgain/testsuites/bamboo/GridDataGridTestSuite.java
index 7e231d4..90919e2 100644
--- a/modules/core/src/test/java/org/gridgain/testsuites/bamboo/GridDataGridTestSuite.java
+++ b/modules/core/src/test/java/org/gridgain/testsuites/bamboo/GridDataGridTestSuite.java
@@ -275,8 +275,7 @@ public class GridDataGridTestSuite extends TestSuite {
suite.addTest(GridCacheWriteBehindTestSuite.suite());
// Transform.
-// suite.addTestSuite(GridCachePartitionedTransformWriteThroughBatchUpdateSelfTest.class);
-// suite.addTestSuite(GridCachePartitionedTransformWriteThroughSingleUpdateSelfTest.class);
+ suite.addTestSuite(GridCachePartitionedTransformWriteThroughBatchUpdateSelfTest.class);
suite.addTestSuite(GridCacheIncrementTransformTest.class);
suite.addTestSuite(GridCacheEntryVersionSelfTest.class);
[5/5] incubator-ignite git commit: Ignite - Moved failover tests to
proper test suite.
Posted by ag...@apache.org.
Ignite - Moved failover tests to proper test suite.
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/e2c4d265
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/e2c4d265
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/e2c4d265
Branch: refs/heads/master
Commit: e2c4d2658d84c07723dc673b205ef7fbf233dcf6
Parents: c0255c0
Author: Alexey Goncharuk <ag...@gridgain.com>
Authored: Mon Dec 8 19:12:15 2014 -0800
Committer: Alexey Goncharuk <ag...@gridgain.com>
Committed: Mon Dec 8 19:12:15 2014 -0800
----------------------------------------------------------------------
.../gridgain/testsuites/bamboo/GridCacheFailoverTestSuite.java | 3 +++
.../org/gridgain/testsuites/bamboo/GridDataGridTestSuite.java | 2 --
2 files changed, 3 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/e2c4d265/modules/core/src/test/java/org/gridgain/testsuites/bamboo/GridCacheFailoverTestSuite.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/gridgain/testsuites/bamboo/GridCacheFailoverTestSuite.java b/modules/core/src/test/java/org/gridgain/testsuites/bamboo/GridCacheFailoverTestSuite.java
index 28d837c..65c6d07 100644
--- a/modules/core/src/test/java/org/gridgain/testsuites/bamboo/GridCacheFailoverTestSuite.java
+++ b/modules/core/src/test/java/org/gridgain/testsuites/bamboo/GridCacheFailoverTestSuite.java
@@ -43,6 +43,9 @@ public class GridCacheFailoverTestSuite extends TestSuite {
// suite.addTestSuite(GridCacheAtomicNearRemoveFailureTest.class); TODO GG-9150
suite.addTestSuite(GridCacheAtomicPrimaryWriteOrderNearRemoveFailureTest.class);
+ //suite.addTest(new TestSuite(GridCachePartitionedFailoverSelfTest.class)); TODO-gg-4813
+ //suite.addTest(new TestSuite(GridCacheColocatedFailoverSelfTest.class)); TODO-gg-4813
+
return suite;
}
}
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/e2c4d265/modules/core/src/test/java/org/gridgain/testsuites/bamboo/GridDataGridTestSuite.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/gridgain/testsuites/bamboo/GridDataGridTestSuite.java b/modules/core/src/test/java/org/gridgain/testsuites/bamboo/GridDataGridTestSuite.java
index 077c9d0..49f5c38 100644
--- a/modules/core/src/test/java/org/gridgain/testsuites/bamboo/GridDataGridTestSuite.java
+++ b/modules/core/src/test/java/org/gridgain/testsuites/bamboo/GridDataGridTestSuite.java
@@ -165,8 +165,6 @@ public class GridDataGridTestSuite extends TestSuite {
suite.addTest(new TestSuite(GridCachePartitionedAffinityFilterSelfTest.class));
suite.addTest(new TestSuite(GridCachePartitionedPreloadLifecycleSelfTest.class));
suite.addTest(new TestSuite(GridCacheDhtPreloadDelayedSelfTest.class));
- //suite.addTest(new TestSuite(GridCachePartitionedFailoverSelfTest.class)); TODO-gg-4813
- //suite.addTest(new TestSuite(GridCacheColocatedFailoverSelfTest.class)); TODO-gg-4813
suite.addTest(new TestSuite(GridPartitionedBackupLoadSelfTest.class));
suite.addTest(new TestSuite(GridCachePartitionedLoadCacheSelfTest.class));
suite.addTest(new TestSuite(GridCacheDhtEvictionsDisabledSelfTest.class));
[4/5] incubator-ignite git commit: Ignite - Cleanup test since store
single update is removed.
Posted by ag...@apache.org.
Ignite - Cleanup test since store single update is removed.
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/c0255c05
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/c0255c05
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/c0255c05
Branch: refs/heads/master
Commit: c0255c050367e88e95b2f8bb4a99cf7dd7f77037
Parents: ef04ea4
Author: Alexey Goncharuk <ag...@gridgain.com>
Authored: Mon Dec 8 19:10:42 2014 -0800
Committer: Alexey Goncharuk <ag...@gridgain.com>
Committed: Mon Dec 8 19:10:42 2014 -0800
----------------------------------------------------------------------
.../GridCacheBasicStoreNoBatchAbstractTest.java | 251 -------------------
...chePartitionedBasicStoreNoBatchSelfTest.java | 25 --
...acheReplicatedBasicStoreNoBatchSelfTest.java | 25 --
...cheLocalAtomicBasicStoreNoBatchSelfTest.java | 24 --
...GridCacheLocalBasicStoreNoBatchSelfTest.java | 25 --
.../bamboo/GridDataGridTestSuite.java | 6 +-
6 files changed, 1 insertion(+), 355 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/c0255c05/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheBasicStoreNoBatchAbstractTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheBasicStoreNoBatchAbstractTest.java b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheBasicStoreNoBatchAbstractTest.java
deleted file mode 100644
index 910d133..0000000
--- a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheBasicStoreNoBatchAbstractTest.java
+++ /dev/null
@@ -1,251 +0,0 @@
-/* @java.file.header */
-
-/* _________ _____ __________________ _____
- * __ ____/___________(_)______ /__ ____/______ ____(_)_______
- * _ / __ __ ___/__ / _ __ / _ / __ _ __ `/__ / __ __ \
- * / /_/ / _ / _ / / /_/ / / /_/ / / /_/ / _ / _ / / /
- * \____/ /_/ /_/ \_,__/ \____/ \__,_/ /_/ /_/ /_/
- */
-
-package org.gridgain.grid.kernal.processors.cache;
-
-import org.apache.ignite.configuration.*;
-import org.gridgain.grid.cache.*;
-import org.apache.ignite.spi.discovery.tcp.*;
-import org.apache.ignite.spi.discovery.tcp.ipfinder.vm.*;
-import org.gridgain.grid.util.typedef.*;
-import org.gridgain.testframework.junits.common.*;
-
-import java.util.*;
-
-import static org.gridgain.grid.cache.GridCacheAtomicityMode.*;
-
-/**
- * Test store without batch.
- */
-public abstract class GridCacheBasicStoreNoBatchAbstractTest extends GridCommonAbstractTest {
- /** Cache store. */
- private static final GridCacheTestStore store = new GridCacheTestStore();
-
- /** Constructs a test. */
- protected GridCacheBasicStoreNoBatchAbstractTest() {
- super(true /*start grid. */);
- }
-
- /** {@inheritDoc} */
- @Override protected void beforeTest() throws Exception {
- store.resetTimestamp();
- }
-
- /** {@inheritDoc} */
- @Override protected void afterTest() throws Exception {
- GridCache<Object, Object> cache = cache();
-
- if (cache != null)
- cache.removeAll(F.<GridCacheEntry<Object, Object>>alwaysTrue());
-
- store.reset();
- }
-
- /** @return Cache mode. */
- protected abstract GridCacheMode cacheMode();
-
- /** {@inheritDoc} */
- @Override protected final IgniteConfiguration getConfiguration() throws Exception {
- IgniteConfiguration c = super.getConfiguration();
-
- TcpDiscoverySpi disco = new TcpDiscoverySpi();
-
- disco.setIpFinder(new TcpDiscoveryVmIpFinder(true));
-
- c.setDiscoverySpi(disco);
-
- GridCacheConfiguration cc = defaultCacheConfiguration();
-
- cc.setCacheMode(cacheMode());
-
- cc.setStore(store);
-
- cc.setWriteSynchronizationMode(GridCacheWriteSynchronizationMode.FULL_SYNC);
- cc.setAtomicityMode(atomicityMode());
-
- c.setCacheConfiguration(cc);
-
- return c;
- }
-
- /**
- * @return Cache atomicity mode.
- */
- protected GridCacheAtomicityMode atomicityMode() {
- return TRANSACTIONAL;
- }
-
- /** @throws Exception If test fails. */
- public void testWriteThrough() throws Exception {
- GridCache<Integer, String> cache = cache();
-
- Map<Integer, String> map = store.getMap();
-
- assert map.isEmpty();
-
- GridCacheTx tx = atomicityMode() == TRANSACTIONAL ? cache.txStart() : null;
-
- try {
- for (int i = 1; i <= 10; i++) {
- cache.put(i, Integer.toString(i));
-
- checkLastMethod("put");
- }
-
- if (tx != null) {
- tx.commit();
-
- checkLastMethod("put");
- }
- }
- finally {
- if (tx != null)
- tx.close();
- }
-
- assert cache.size() == 10;
-
- for (int i = 1; i <= 10; i++) {
- String val = map.get(i);
-
- assert val != null;
- assert val.equals(Integer.toString(i));
- }
-
- store.resetLastMethod();
-
- tx = atomicityMode() == TRANSACTIONAL ? cache.txStart() : null;
-
- try {
- for (int i = 1; i <= 10; i++) {
- String val = cache.remove(i);
-
- checkLastMethod("remove");
-
- assert val != null;
- assert val.equals(Integer.toString(i));
- }
-
- if (tx != null) {
- tx.commit();
-
- checkLastMethod("remove");
- }
- }
- finally {
- if (tx != null)
- tx.close();
- }
-
- assert map.isEmpty();
- }
-
- /** @throws Exception If test failed. */
- public void testReadThrough() throws Exception {
- GridCache<Integer, String> cache = cache();
-
- Map<Integer, String> map = store.getMap();
-
- assert map.isEmpty();
-
- if (atomicityMode() == TRANSACTIONAL) {
- try (GridCacheTx tx = cache.txStart()) {
- for (int i = 1; i <= 10; i++) {
- cache.put(i, Integer.toString(i));
-
- checkLastMethod("put");
- }
-
- tx.commit();
-
- checkLastMethod("put");
- }
- }
- else {
- for (int i = 1; i <= 10; i++) {
- cache.put(i, Integer.toString(i));
-
- checkLastMethod("put");
- }
- }
-
- for (int i = 1; i <= 10; i++) {
- String val = map.get(i);
-
- assert val != null;
- assert val.equals(Integer.toString(i));
- }
-
- cache.clearAll();
-
- assert cache.isEmpty();
-
- assert map.size() == 10;
-
- for (int i = 1; i <= 10; i++) {
- // Read through.
- String val = cache.get(i);
-
- checkLastMethod("load");
-
- assert val != null;
- assert val.equals(Integer.toString(i));
- }
-
- assert cache.size() == 10;
-
- cache.clearAll();
-
- assert cache.isEmpty();
-
- assert map.size() == 10;
-
- Collection<Integer> keys = new ArrayList<>();
-
- for (int i = 1; i <= 10; i++)
- keys.add(i);
-
- // Read through.
- Map<Integer, String> vals = cache.getAll(keys);
-
- checkLastMethod("loadAll");
-
- assert vals != null;
- assert vals.size() == 10 : "Invalid values size: " + vals.size();
-
- for (int i = 1; i <= 10; i++) {
- String val = vals.get(i);
-
- assert val != null;
- assert val.equals(Integer.toString(i));
- }
-
- // Write through.
- cache.removeAll(keys);
-
- checkLastMethod("removeAll");
-
- assert cache.isEmpty();
- assert cache.isEmpty();
-
- assert map.isEmpty();
- }
-
- /** @param mtd Expected last method value. */
- private void checkLastMethod(String mtd) {
- String lastMtd = store.getLastMethod();
-
- if (mtd == null)
- assert lastMtd == null : "Last method must be null: " + lastMtd;
- else {
- assert lastMtd != null : "Last method must be not null";
- assert lastMtd.equals(mtd) : "Last method does not match [expected=" + mtd + ", lastMtd=" + lastMtd + ']';
- }
- }
-}
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/c0255c05/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/near/GridCachePartitionedBasicStoreNoBatchSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/near/GridCachePartitionedBasicStoreNoBatchSelfTest.java b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/near/GridCachePartitionedBasicStoreNoBatchSelfTest.java
deleted file mode 100644
index 634bdc0..0000000
--- a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/near/GridCachePartitionedBasicStoreNoBatchSelfTest.java
+++ /dev/null
@@ -1,25 +0,0 @@
-/* @java.file.header */
-
-/* _________ _____ __________________ _____
- * __ ____/___________(_)______ /__ ____/______ ____(_)_______
- * _ / __ __ ___/__ / _ __ / _ / __ _ __ `/__ / __ __ \
- * / /_/ / _ / _ / / /_/ / / /_/ / / /_/ / _ / _ / / /
- * \____/ /_/ /_/ \_,__/ \____/ \__,_/ /_/ /_/ /_/
- */
-
-package org.gridgain.grid.kernal.processors.cache.distributed.near;
-
-import org.gridgain.grid.cache.*;
-import org.gridgain.grid.kernal.processors.cache.*;
-
-import static org.gridgain.grid.cache.GridCacheMode.*;
-
-/**
- * Test store with partitioned cache.
- */
-public class GridCachePartitionedBasicStoreNoBatchSelfTest extends GridCacheBasicStoreNoBatchAbstractTest {
- /** {@inheritDoc} */
- @Override protected GridCacheMode cacheMode() {
- return PARTITIONED;
- }
-}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/c0255c05/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/replicated/GridCacheReplicatedBasicStoreNoBatchSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/replicated/GridCacheReplicatedBasicStoreNoBatchSelfTest.java b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/replicated/GridCacheReplicatedBasicStoreNoBatchSelfTest.java
deleted file mode 100644
index 5697240..0000000
--- a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/replicated/GridCacheReplicatedBasicStoreNoBatchSelfTest.java
+++ /dev/null
@@ -1,25 +0,0 @@
-/* @java.file.header */
-
-/* _________ _____ __________________ _____
- * __ ____/___________(_)______ /__ ____/______ ____(_)_______
- * _ / __ __ ___/__ / _ __ / _ / __ _ __ `/__ / __ __ \
- * / /_/ / _ / _ / / /_/ / / /_/ / / /_/ / _ / _ / / /
- * \____/ /_/ /_/ \_,__/ \____/ \__,_/ /_/ /_/ /_/
- */
-
-package org.gridgain.grid.kernal.processors.cache.distributed.replicated;
-
-import org.gridgain.grid.cache.*;
-import org.gridgain.grid.kernal.processors.cache.*;
-
-import static org.gridgain.grid.cache.GridCacheMode.*;
-
-/**
- * Test store with replicated cache.
- */
-public class GridCacheReplicatedBasicStoreNoBatchSelfTest extends GridCacheBasicStoreNoBatchAbstractTest {
- /** {@inheritDoc} */
- @Override protected GridCacheMode cacheMode() {
- return REPLICATED;
- }
-}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/c0255c05/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/local/GridCacheLocalAtomicBasicStoreNoBatchSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/local/GridCacheLocalAtomicBasicStoreNoBatchSelfTest.java b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/local/GridCacheLocalAtomicBasicStoreNoBatchSelfTest.java
deleted file mode 100644
index f64db2a..0000000
--- a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/local/GridCacheLocalAtomicBasicStoreNoBatchSelfTest.java
+++ /dev/null
@@ -1,24 +0,0 @@
-/* @java.file.header */
-
-/* _________ _____ __________________ _____
- * __ ____/___________(_)______ /__ ____/______ ____(_)_______
- * _ / __ __ ___/__ / _ __ / _ / __ _ __ `/__ / __ __ \
- * / /_/ / _ / _ / / /_/ / / /_/ / / /_/ / _ / _ / / /
- * \____/ /_/ /_/ \_,__/ \____/ \__,_/ /_/ /_/ /_/
- */
-
-package org.gridgain.grid.kernal.processors.cache.local;
-
-import org.gridgain.grid.cache.*;
-
-import static org.gridgain.grid.cache.GridCacheAtomicityMode.*;
-
-/**
- * Tests store with local cache in atomic mode.
- */
-public class GridCacheLocalAtomicBasicStoreNoBatchSelfTest extends GridCacheLocalBasicStoreNoBatchSelfTest {
- /** {@inheritDoc} */
- @Override protected GridCacheAtomicityMode atomicityMode() {
- return ATOMIC;
- }
-}
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/c0255c05/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/local/GridCacheLocalBasicStoreNoBatchSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/local/GridCacheLocalBasicStoreNoBatchSelfTest.java b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/local/GridCacheLocalBasicStoreNoBatchSelfTest.java
deleted file mode 100644
index 6ec2d65..0000000
--- a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/local/GridCacheLocalBasicStoreNoBatchSelfTest.java
+++ /dev/null
@@ -1,25 +0,0 @@
-/* @java.file.header */
-
-/* _________ _____ __________________ _____
- * __ ____/___________(_)______ /__ ____/______ ____(_)_______
- * _ / __ __ ___/__ / _ __ / _ / __ _ __ `/__ / __ __ \
- * / /_/ / _ / _ / / /_/ / / /_/ / / /_/ / _ / _ / / /
- * \____/ /_/ /_/ \_,__/ \____/ \__,_/ /_/ /_/ /_/
- */
-
-package org.gridgain.grid.kernal.processors.cache.local;
-
-import org.gridgain.grid.cache.*;
-import org.gridgain.grid.kernal.processors.cache.*;
-
-import static org.gridgain.grid.cache.GridCacheMode.*;
-
-/**
- * Test store with replicated cache.
- */
-public class GridCacheLocalBasicStoreNoBatchSelfTest extends GridCacheBasicStoreNoBatchAbstractTest {
- /** {@inheritDoc} */
- @Override protected GridCacheMode cacheMode() {
- return LOCAL;
- }
-}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/c0255c05/modules/core/src/test/java/org/gridgain/testsuites/bamboo/GridDataGridTestSuite.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/gridgain/testsuites/bamboo/GridDataGridTestSuite.java b/modules/core/src/test/java/org/gridgain/testsuites/bamboo/GridDataGridTestSuite.java
index 90919e2..077c9d0 100644
--- a/modules/core/src/test/java/org/gridgain/testsuites/bamboo/GridDataGridTestSuite.java
+++ b/modules/core/src/test/java/org/gridgain/testsuites/bamboo/GridDataGridTestSuite.java
@@ -95,8 +95,6 @@ public class GridDataGridTestSuite extends TestSuite {
// suite.addTestSuite(GridCacheLocalProjectionSelfTest.class);
suite.addTestSuite(GridCacheLocalAtomicProjectionSelfTest.class);
// suite.addTestSuite(GridCacheLocalBasicApiSelfTest.class);
-// suite.addTestSuite(GridCacheLocalBasicStoreNoBatchSelfTest.class);
- suite.addTestSuite(GridCacheLocalAtomicBasicStoreNoBatchSelfTest.class);
// suite.addTestSuite(GridCacheLocalBasicStoreSelfTest.class);
suite.addTestSuite(GridCacheLocalAtomicBasicStoreSelfTest.class);
// suite.addTestSuite(GridCacheLocalGetAndTransformStoreSelfTest.class);
@@ -118,7 +116,7 @@ public class GridDataGridTestSuite extends TestSuite {
suite.addTestSuite(GridCachePartitionedGetSelfTest.class);
suite.addTest(new TestSuite(GridCachePartitionedBasicApiTest.class));
suite.addTest(new TestSuite(GridCacheNearMultiGetSelfTest.class));
-// suite.addTest(new TestSuite(GridCacheNearJobExecutionSelfTest.class));
+ suite.addTest(new TestSuite(GridCacheNearJobExecutionSelfTest.class));
suite.addTest(new TestSuite(GridCachePartitionedProjectionSelfTest.class));
suite.addTest(new TestSuite(GridCachePartitionedOnlyProjectionSelfTest.class));
suite.addTest(new TestSuite(GridCacheNearOneNodeSelfTest.class));
@@ -132,7 +130,6 @@ public class GridDataGridTestSuite extends TestSuite {
suite.addTest(new TestSuite(GridCacheRendezvousAffinityClientSelfTest.class));
suite.addTest(new TestSuite(GridCachePartitionedProjectionAffinitySelfTest.class));
suite.addTest(new TestSuite(GridCachePartitionedBasicOpSelfTest.class));
-// suite.addTest(new TestSuite(GridCachePartitionedBasicStoreNoBatchSelfTest.class));
suite.addTest(new TestSuite(GridCachePartitionedBasicStoreSelfTest.class));
suite.addTest(new TestSuite(GridCachePartitionedGetAndTransformStoreSelfTest.class));
suite.addTest(new TestSuite(GridCachePartitionedAtomicGetAndTransformStoreSelfTest.class));
@@ -213,7 +210,6 @@ public class GridDataGridTestSuite extends TestSuite {
// Replicated cache.
suite.addTestSuite(GridCacheReplicatedBasicApiTest.class);
suite.addTestSuite(GridCacheReplicatedBasicOpSelfTest.class);
-// suite.addTestSuite(GridCacheReplicatedBasicStoreNoBatchSelfTest.class);
suite.addTestSuite(GridCacheReplicatedBasicStoreSelfTest.class);
suite.addTestSuite(GridCacheReplicatedGetAndTransformStoreSelfTest.class);
suite.addTestSuite(GridCacheReplicatedAtomicGetAndTransformStoreSelfTest.class);
[2/5] incubator-ignite git commit: Ignite - Fixing cache tests.
Posted by ag...@apache.org.
Ignite - Fixing cache tests.
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/3ec08ec1
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/3ec08ec1
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/3ec08ec1
Branch: refs/heads/master
Commit: 3ec08ec101f7ee8f0f486a686f21a42aef611bc6
Parents: 9f90d7d
Author: Alexey Goncharuk <ag...@gridgain.com>
Authored: Mon Dec 8 18:09:33 2014 -0800
Committer: Alexey Goncharuk <ag...@gridgain.com>
Committed: Mon Dec 8 18:09:33 2014 -0800
----------------------------------------------------------------------
.../processors/cache/GridCacheMvccManager.java | 31 +++++++++++++++-----
.../processors/cache/GridCacheTxManager.java | 3 ++
.../GridCacheNodeFailureAbstractTest.java | 10 +++++--
.../bamboo/GridDataGridTestSuite.java | 14 ++++-----
4 files changed, 41 insertions(+), 17 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/3ec08ec1/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/GridCacheMvccManager.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/GridCacheMvccManager.java b/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/GridCacheMvccManager.java
index bedc33f..41c1c0c 100644
--- a/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/GridCacheMvccManager.java
+++ b/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/GridCacheMvccManager.java
@@ -63,6 +63,10 @@ public class GridCacheMvccManager<K, V> extends GridCacheSharedManagerAdapter<K,
@GridToStringExclude
private final ConcurrentMap<GridCacheTxKey<K>, GridDistributedCacheEntry<K, V>> locked = newMap();
+ /** Near locked keys. Need separate map because mvcc manager is shared between caches. */
+ @GridToStringExclude
+ private final ConcurrentMap<GridCacheTxKey<K>, GridDistributedCacheEntry<K, V>> nearLocked = newMap();
+
/** Active futures mapped by version ID. */
@GridToStringExclude
private final ConcurrentMap<GridCacheVersion, Collection<GridCacheFuture<?>>> futs = newMap();
@@ -135,12 +139,18 @@ public class GridCacheMvccManager<K, V> extends GridCacheSharedManagerAdapter<K,
/** {@inheritDoc} */
@Override public void onLocked(GridDistributedCacheEntry<K, V> entry) {
- locked.put(entry.txKey(), entry);
+ if (entry.isNear())
+ nearLocked.put(entry.txKey(), entry);
+ else
+ locked.put(entry.txKey(), entry);
}
/** {@inheritDoc} */
@Override public void onFreed(GridDistributedCacheEntry<K, V> entry) {
- locked.remove(entry.txKey());
+ if (entry.isNear())
+ nearLocked.remove(entry.txKey());
+ else
+ locked.remove(entry.txKey());
}
};
@@ -155,7 +165,7 @@ public class GridCacheMvccManager<K, V> extends GridCacheSharedManagerAdapter<K,
if (log.isDebugEnabled())
log.debug("Processing node left [nodeId=" + discoEvt.eventNode().id() + "]");
- for (GridDistributedCacheEntry<K, V> entry : locked.values()) {
+ for (GridDistributedCacheEntry<K, V> entry : locked()) {
try {
entry.removeExplicitNodeLocks(discoEvt.eventNode().id());
}
@@ -508,6 +518,13 @@ public class GridCacheMvccManager<K, V> extends GridCacheSharedManagerAdapter<K,
}
/**
+ * @return Collection of all locked entries.
+ */
+ private Collection<GridDistributedCacheEntry<K, V>> locked() {
+ return F.concat(false, locked.values(), nearLocked.values());
+ }
+
+ /**
* This method has poor performance, so use with care. It is currently only used by {@code DGC}.
*
* @return Remote candidates.
@@ -515,7 +532,7 @@ public class GridCacheMvccManager<K, V> extends GridCacheSharedManagerAdapter<K,
public Collection<GridCacheMvccCandidate<K>> remoteCandidates() {
Collection<GridCacheMvccCandidate<K>> rmtCands = new LinkedList<>();
- for (GridDistributedCacheEntry<K, V> entry : locked.values()) {
+ for (GridDistributedCacheEntry<K, V> entry : locked()) {
rmtCands.addAll(entry.remoteMvccSnapshot());
}
@@ -530,7 +547,7 @@ public class GridCacheMvccManager<K, V> extends GridCacheSharedManagerAdapter<K,
public Collection<GridCacheMvccCandidate<K>> localCandidates() {
Collection<GridCacheMvccCandidate<K>> locCands = new LinkedList<>();
- for (GridDistributedCacheEntry<K, V> entry : locked.values()) {
+ for (GridDistributedCacheEntry<K, V> entry : locked()) {
try {
locCands.addAll(entry.localCandidates());
}
@@ -955,8 +972,8 @@ public class GridCacheMvccManager<K, V> extends GridCacheSharedManagerAdapter<K,
final FinishLockFuture finishFut = new FinishLockFuture(
keyFilter == null ?
- locked.values() :
- F.view(locked.values(),
+ locked() :
+ F.view(locked(),
new P1<GridDistributedCacheEntry<K, V>>() {
@Override public boolean apply(GridDistributedCacheEntry<K, V> e) {
return F.isAll(e.key(), keyFilter);
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/3ec08ec1/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/GridCacheTxManager.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/GridCacheTxManager.java b/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/GridCacheTxManager.java
index da0deed..9bd8a7a 100644
--- a/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/GridCacheTxManager.java
+++ b/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/GridCacheTxManager.java
@@ -1398,6 +1398,9 @@ public class GridCacheTxManager<K, V> extends GridCacheSharedManagerAdapter<K, V
if (owner != null) {
GridCacheTxAdapter<K, V> tx = tx(owner.version());
+ if (tx == null)
+ tx = nearTx(owner.version());
+
if (tx != null) {
if (!tx.local()) {
if (log.isDebugEnabled())
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/3ec08ec1/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/GridCacheNodeFailureAbstractTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/GridCacheNodeFailureAbstractTest.java b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/GridCacheNodeFailureAbstractTest.java
index 483e0c6..270d86d 100644
--- a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/GridCacheNodeFailureAbstractTest.java
+++ b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/GridCacheNodeFailureAbstractTest.java
@@ -226,7 +226,8 @@ public abstract class GridCacheNodeFailureAbstractTest extends GridCommonAbstrac
info("Grid will be stopped: " + idx);
- info("Primary node for key [id=" + grid(idx).mapKeyToNode(null, KEY) + ", key=" + KEY + ']');
+ info("Nodes for key [id=" + grid(idx).cache(null).affinity().mapKeyToPrimaryAndBackups(KEY) +
+ ", key=" + KEY + ']');
GridCache<Integer, String> cache = cache(idx);
@@ -267,13 +268,16 @@ public abstract class GridCacheNodeFailureAbstractTest extends GridCommonAbstrac
for (int i = 0; !locked && i < 3; i++) {
locked = checkCache.lock(KEY, -1);
- if (!locked)
+ if (!locked) {
+ info("Still not locked...");
+
U.sleep(1500);
+ }
else
break;
}
- assert locked;
+ assert locked : "Failed to lock entry: " + e;
checkCache.unlockAll(F.asList(KEY));
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/3ec08ec1/modules/core/src/test/java/org/gridgain/testsuites/bamboo/GridDataGridTestSuite.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/gridgain/testsuites/bamboo/GridDataGridTestSuite.java b/modules/core/src/test/java/org/gridgain/testsuites/bamboo/GridDataGridTestSuite.java
index 841f116..7e231d4 100644
--- a/modules/core/src/test/java/org/gridgain/testsuites/bamboo/GridDataGridTestSuite.java
+++ b/modules/core/src/test/java/org/gridgain/testsuites/bamboo/GridDataGridTestSuite.java
@@ -134,7 +134,7 @@ public class GridDataGridTestSuite extends TestSuite {
suite.addTest(new TestSuite(GridCachePartitionedBasicOpSelfTest.class));
// suite.addTest(new TestSuite(GridCachePartitionedBasicStoreNoBatchSelfTest.class));
suite.addTest(new TestSuite(GridCachePartitionedBasicStoreSelfTest.class));
-// suite.addTest(new TestSuite(GridCachePartitionedGetAndTransformStoreSelfTest.class));
+ suite.addTest(new TestSuite(GridCachePartitionedGetAndTransformStoreSelfTest.class));
suite.addTest(new TestSuite(GridCachePartitionedAtomicGetAndTransformStoreSelfTest.class));
suite.addTest(new TestSuite(GridCachePartitionedBasicStoreMultiNodeSelfTest.class));
suite.addTest(new TestSuite(GridCachePartitionedNearDisabledBasicStoreMultiNodeSelfTest.class));
@@ -143,8 +143,8 @@ public class GridDataGridTestSuite extends TestSuite {
suite.addTest(new TestSuite(GridCachePartitionedMultiNodeLockSelfTest.class));
suite.addTest(new TestSuite(GridCachePartitionedMultiNodeSelfTest.class));
suite.addTest(new TestSuite(GridCachePartitionedMultiThreadedPutGetSelfTest.class));
-// suite.addTest(new TestSuite(GridCachePartitionedNodeFailureSelfTest.class));
-// suite.addTest(new TestSuite(GridCachePartitionedExplicitLockNodeFailureSelfTest.class));
+ suite.addTest(new TestSuite(GridCachePartitionedNodeFailureSelfTest.class));
+ suite.addTest(new TestSuite(GridCachePartitionedExplicitLockNodeFailureSelfTest.class));
suite.addTest(new TestSuite(GridCachePartitionedRefreshAheadSelfTest.class));
suite.addTest(new TestSuite(GridCachePartitionedTxSingleThreadedSelfTest.class));
suite.addTest(new TestSuite(GridCacheColocatedTxSingleThreadedSelfTest.class));
@@ -207,7 +207,7 @@ public class GridDataGridTestSuite extends TestSuite {
suite.addTestSuite(GridCacheValueConsistencyAtomicNearEnabledSelfTest.class);
suite.addTestSuite(GridCacheValueConsistencyAtomicPrimaryWriteOrderNearEnabledSelfTest.class);
suite.addTestSuite(GridCacheValueConsistencyTransactionalSelfTest.class);
-// suite.addTestSuite(GridCacheValueConsistencyTransactionalNearEnabledSelfTest.class);
+ suite.addTestSuite(GridCacheValueConsistencyTransactionalNearEnabledSelfTest.class);
suite.addTestSuite(GridCacheValueBytesPreloadingSelfTest.class);
// Replicated cache.
@@ -267,9 +267,9 @@ public class GridDataGridTestSuite extends TestSuite {
suite.addTest(GridCacheNearOnlySelfTestSuite.suite());
// Test cache with daemon nodes.
-// suite.addTestSuite(GridCacheDaemonNodeLocalSelfTest.class);
-// suite.addTestSuite(GridCacheDaemonNodePartitionedSelfTest.class);
-// suite.addTestSuite(GridCacheDaemonNodeReplicatedSelfTest.class);
+ suite.addTestSuite(GridCacheDaemonNodeLocalSelfTest.class);
+ suite.addTestSuite(GridCacheDaemonNodePartitionedSelfTest.class);
+ suite.addTestSuite(GridCacheDaemonNodeReplicatedSelfTest.class);
// Write-behind.
suite.addTest(GridCacheWriteBehindTestSuite.suite());