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/14 20:51:10 UTC
[01/10] incubator-ignite git commit: GG-9141 - Fixing tests for
clients suite.
Repository: incubator-ignite
Updated Branches:
refs/heads/ignite-1 ee2df1d8d -> 2ad4e6d1a
GG-9141 - Fixing tests for clients 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/0cb0c334
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/0cb0c334
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/0cb0c334
Branch: refs/heads/ignite-1
Commit: 0cb0c334f10e512ca546611609052aee012c5b59
Parents: ee2df1d
Author: Alexey Goncharuk <ag...@gridgain.com>
Authored: Sun Dec 14 10:42:59 2014 -0800
Committer: Alexey Goncharuk <ag...@gridgain.com>
Committed: Sun Dec 14 10:42:59 2014 -0800
----------------------------------------------------------------------
.../GridClientAbstractMultiNodeSelfTest.java | 9 +++--
.../client/suite/GridClientTestSuite.java | 4 ---
.../processors/cache/GridCacheAdapter.java | 13 +++++--
.../processors/cache/GridCacheTxAdapter.java | 36 ++++++++++++++++++--
.../kernal/processors/cache/GridCacheTxEx.java | 8 ++++-
.../processors/cache/GridCacheTxHandler.java | 4 ++-
.../cache/GridCacheTxLocalAdapter.java | 29 ++++------------
.../processors/cache/GridCacheTxManager.java | 2 ++
.../dht/GridDhtTransactionalCacheAdapter.java | 2 ++
.../distributed/dht/GridDhtTxLocalAdapter.java | 19 ++---------
.../colocated/GridDhtColocatedLockFuture.java | 2 +-
.../distributed/near/GridNearLockFuture.java | 2 +-
.../distributed/near/GridNearLockRequest.java | 25 ++++++++++++++
.../cache/distributed/near/GridNearTxLocal.java | 15 +++++---
.../processors/cache/local/GridLocalTx.java | 2 +-
.../transactions/IgniteTransactionsImpl.java | 7 +++-
.../handlers/cache/GridCacheCommandHandler.java | 1 -
.../cache/jta/GridCacheJtaManager.java | 1 +
18 files changed, 118 insertions(+), 63 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/0cb0c334/modules/clients/src/test/java/org/gridgain/client/integration/GridClientAbstractMultiNodeSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/clients/src/test/java/org/gridgain/client/integration/GridClientAbstractMultiNodeSelfTest.java b/modules/clients/src/test/java/org/gridgain/client/integration/GridClientAbstractMultiNodeSelfTest.java
index 96fb9d6..60ab835 100644
--- a/modules/clients/src/test/java/org/gridgain/client/integration/GridClientAbstractMultiNodeSelfTest.java
+++ b/modules/clients/src/test/java/org/gridgain/client/integration/GridClientAbstractMultiNodeSelfTest.java
@@ -23,7 +23,6 @@ import org.apache.ignite.spi.discovery.tcp.ipfinder.vm.*;
import org.gridgain.client.*;
import org.gridgain.client.balancer.*;
import org.gridgain.client.ssl.*;
-import org.gridgain.grid.*;
import org.gridgain.grid.cache.*;
import org.gridgain.grid.kernal.*;
import org.gridgain.grid.kernal.managers.communication.*;
@@ -789,13 +788,13 @@ public abstract class GridClientAbstractMultiNodeSelfTest extends GridCommonAbst
GridCacheTxEx t = tm.tx(v);
if (t.hasWriteKey(cacheCtx.txKey("x1")))
- assertFalse(t.syncCommit());
+ assertFalse("Invalid tx flags: " + t, t.syncCommit());
else if (t.hasWriteKey(cacheCtx.txKey("x2")))
- assertTrue(t.syncCommit());
+ assertTrue("Invalid tx flags: " + t, t.syncCommit());
else if (t.hasWriteKey(cacheCtx.txKey("x3")))
- assertFalse(t.syncCommit());
+ assertFalse("Invalid tx flags: " + t, t.syncCommit());
else if (t.hasWriteKey(cacheCtx.txKey("x4")))
- assertTrue(t.syncCommit());
+ assertTrue("Invalid tx flags: " + t, t.syncCommit());
}
}
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/0cb0c334/modules/clients/src/test/java/org/gridgain/client/suite/GridClientTestSuite.java
----------------------------------------------------------------------
diff --git a/modules/clients/src/test/java/org/gridgain/client/suite/GridClientTestSuite.java b/modules/clients/src/test/java/org/gridgain/client/suite/GridClientTestSuite.java
index ba503e1..db670e1 100644
--- a/modules/clients/src/test/java/org/gridgain/client/suite/GridClientTestSuite.java
+++ b/modules/clients/src/test/java/org/gridgain/client/suite/GridClientTestSuite.java
@@ -28,10 +28,6 @@ public class GridClientTestSuite extends TestSuite {
public static TestSuite suite() {
TestSuite suite = new TestSuite("Gridgain Clients Test Suite");
- // TODO GG-9141
- if (true)
- return suite;
-
suite.addTest(new TestSuite(GridRouterFactorySelfTest.class));
// Parser standalone test.
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/0cb0c334/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 4d136a1..720ff36 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
@@ -3210,7 +3210,7 @@ public abstract class GridCacheAdapter<K, V> extends GridMetadataAwareAdapter im
val = (V)ctx.marshalToPortable(val);
}
- GridRawVersionedEntry<K, V> e = new GridRawVersionedEntry<>(key, null, val, null, ttl, 0, ver);
+ GridVersionedEntry<K,V> e = new GridRawVersionedEntry<>(key, null, val, null, ttl, 0, ver);
e.marshal(ctx.marshaller());
@@ -3607,11 +3607,15 @@ public abstract class GridCacheAdapter<K, V> extends GridMetadataAwareAdapter im
READ_COMMITTED,
tCfg.getDefaultTxTimeout(),
ctx.hasFlag(INVALIDATE),
+ !ctx.hasFlag(SKIP_STORE),
0,
/** group lock keys */null,
/** partition lock */false
);
+ if (ctx.hasFlag(SYNC_COMMIT))
+ tx.syncCommit(true);
+
assert tx != null;
try {
@@ -3669,7 +3673,7 @@ public abstract class GridCacheAdapter<K, V> extends GridMetadataAwareAdapter im
GridCacheTxLocalAdapter<K, V> tx = ctx.tm().threadLocalTx();
- if (tx == null || tx.implicit())
+ if (tx == null || tx.implicit()) {
tx = ctx.tm().newTx(
true,
op.single(),
@@ -3677,10 +3681,15 @@ public abstract class GridCacheAdapter<K, V> extends GridMetadataAwareAdapter im
READ_COMMITTED,
ctx.kernalContext().config().getTransactionsConfiguration().getDefaultTxTimeout(),
ctx.hasFlag(INVALIDATE),
+ !ctx.hasFlag(SKIP_STORE),
0,
null,
false);
+ if (ctx.hasFlag(SYNC_COMMIT))
+ tx.syncCommit(true);
+ }
+
return asyncOp(tx, op);
}
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/0cb0c334/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 84045a2..7a32afa 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
@@ -12,7 +12,6 @@ package org.gridgain.grid.kernal.processors.cache;
import org.apache.ignite.*;
import org.apache.ignite.cluster.*;
import org.apache.ignite.lang.*;
-import org.gridgain.grid.*;
import org.gridgain.grid.cache.*;
import org.gridgain.grid.kernal.processors.cache.distributed.near.*;
import org.gridgain.grid.util.*;
@@ -188,7 +187,7 @@ public abstract class GridCacheTxAdapter<K, V> extends GridMetadataAwareAdapter
protected String taskName;
/** Store used flag. */
- protected boolean storeUsed;
+ protected boolean storeEnabled = true;
/**
* Empty constructor required for {@link Externalizable}.
@@ -219,6 +218,7 @@ public abstract class GridCacheTxAdapter<K, V> extends GridMetadataAwareAdapter
GridCacheTxIsolation isolation,
long timeout,
boolean invalidate,
+ boolean storeEnabled,
int txSize,
@Nullable GridCacheTxKey grpLockKey,
@Nullable UUID subjId,
@@ -236,6 +236,7 @@ public abstract class GridCacheTxAdapter<K, V> extends GridMetadataAwareAdapter
this.isolation = isolation;
this.timeout = timeout;
this.invalidate = invalidate;
+ this.storeEnabled = storeEnabled;
this.txSize = txSize;
this.grpLockKey = grpLockKey;
this.subjId = subjId;
@@ -381,8 +382,37 @@ public abstract class GridCacheTxAdapter<K, V> extends GridMetadataAwareAdapter
}
/** {@inheritDoc} */
+ @Override public boolean storeEnabled() {
+ return storeEnabled;
+ }
+
+ /**
+ * @param storeEnabled Store enabled flag.
+ */
+ public void storeEnabled(boolean storeEnabled) {
+ this.storeEnabled = storeEnabled;
+ }
+
+ /** {@inheritDoc} */
@Override public boolean storeUsed() {
- return storeUsed;
+ return storeEnabled() && store() != null;
+ }
+
+ /**
+ * Store manager for current transaction.
+ *
+ * @return Store manager.
+ */
+ protected GridCacheStoreManager<K, V> store() {
+ if (!activeCacheIds().isEmpty()) {
+ int cacheId = F.first(activeCacheIds());
+
+ GridCacheStoreManager<K, V> store = cctx.cacheContext(cacheId).store();
+
+ return store.configured() ? store : null;
+ }
+
+ return null;
}
/**
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/0cb0c334/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/GridCacheTxEx.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/GridCacheTxEx.java b/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/GridCacheTxEx.java
index f1c22ea..877c0f1 100644
--- a/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/GridCacheTxEx.java
+++ b/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/GridCacheTxEx.java
@@ -43,7 +43,13 @@ public interface GridCacheTxEx<K, V> extends GridCacheTx, GridTimeoutObject {
public int size();
/**
- * @return {@code True} if transaction involves caches with cache store configured.
+ * @return {@code True} if transaction is allowed to use store.
+ */
+ public boolean storeEnabled();
+
+ /**
+ * @return {@code True} if transaction is allowed to use store and transactions spans one or more caches with
+ * store enabled.
*/
public boolean storeUsed();
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/0cb0c334/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 e629d3f..fa85566 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
@@ -524,7 +524,9 @@ public class GridCacheTxHandler<K, V> {
return null;
}
- tx.syncCommit(req.syncCommit());
+ if (!tx.syncCommit())
+ tx.syncCommit(req.syncCommit());
+
tx.nearFinishFutureId(req.futureId());
tx.nearFinishMiniId(req.miniId());
tx.recoveryWrites(req.recoveryWrites());
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/0cb0c334/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 2c52e0a..b7fa4b2 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
@@ -110,6 +110,7 @@ public abstract class GridCacheTxLocalAdapter<K, V> extends GridCacheTxAdapter<K
GridCacheTxIsolation isolation,
long timeout,
boolean invalidate,
+ boolean storeEnabled,
int txSize,
@Nullable GridCacheTxKey grpLockKey,
boolean partLock,
@@ -117,7 +118,7 @@ public abstract class GridCacheTxLocalAdapter<K, V> extends GridCacheTxAdapter<K
int taskNameHash
) {
super(cctx, xidVer, implicit, implicitSingle, /*local*/true, concurrency, isolation, timeout, invalidate,
- txSize, grpLockKey, subjId, taskNameHash);
+ storeEnabled, txSize, grpLockKey, subjId, taskNameHash);
assert !partLock || grpLockKey != null;
@@ -423,23 +424,6 @@ public abstract class GridCacheTxLocalAdapter<K, V> extends GridCacheTxAdapter<K
}
/**
- * Store manager for current transaction.
- *
- * @return Store manager.
- */
- protected GridCacheStoreManager<K, V> store() {
- if (!activeCacheIds.isEmpty()) {
- int cacheId = F.first(activeCacheIds);
-
- GridCacheStoreManager<K, V> store = cctx.cacheContext(cacheId).store();
-
- return store.configured() ? store : null;
- }
-
- return null;
- }
-
- /**
* Performs batch database operations. This commit must be called
* before {@link #userCommit()}. This way if there is a DB failure,
* cache transaction can still be rolled back.
@@ -451,7 +435,7 @@ public abstract class GridCacheTxLocalAdapter<K, V> extends GridCacheTxAdapter<K
protected void batchStoreCommit(Iterable<GridCacheTxEntry<K, V>> writeEntries) throws IgniteCheckedException {
GridCacheStoreManager<K, V> store = store();
- if (store != null && (!internal() || groupLock())) {
+ if (store != null && storeEnabled() && (!internal() || groupLock())) {
try {
// Implicit transactions are always updated at the end.
if (isBatchUpdate()) {
@@ -985,7 +969,7 @@ public abstract class GridCacheTxLocalAdapter<K, V> extends GridCacheTxAdapter<K
/**
* Checks if there is a cached or swapped value for
- * {@link #getAllAsync(GridCacheContext, Collection, GridCacheEntryEx, boolean, org.apache.ignite.lang.IgnitePredicate[])} method.
+ * {@link #getAllAsync(GridCacheContext, Collection, GridCacheEntryEx, boolean, IgnitePredicate[])} method.
*
*
* @param keys Key to enlist.
@@ -1232,7 +1216,7 @@ public abstract class GridCacheTxLocalAdapter<K, V> extends GridCacheTxAdapter<K
/**
* Loads all missed keys for
- * {@link #getAllAsync(GridCacheContext, Collection, GridCacheEntryEx, boolean, org.apache.ignite.lang.IgnitePredicate[])} method.
+ * {@link #getAllAsync(GridCacheContext, Collection, GridCacheEntryEx, boolean, IgnitePredicate[])} method.
*
* @param map Return map.
* @param missedMap Missed keys.
@@ -2541,7 +2525,8 @@ public abstract class GridCacheTxLocalAdapter<K, V> extends GridCacheTxAdapter<K
", part=" + part + ", groupLockKey=" + grpLockKey + ']');
}
else {
- GridCacheTxKey affinityKey = cacheCtx.txKey((K)cacheCtx.config().getAffinityMapper().affinityKey(key));
+ GridCacheTxKey affinityKey = cacheCtx.txKey(
+ (K)cacheCtx.config().getAffinityMapper().affinityKey(key));
if (!grpLockKey.equals(affinityKey))
throw new IgniteCheckedException("Failed to enlist key into group-lock transaction (affinity key was " +
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/0cb0c334/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 7179f8e..935ae1d 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
@@ -365,6 +365,7 @@ public class GridCacheTxManager<K, V> extends GridCacheSharedManagerAdapter<K, V
GridCacheTxIsolation isolation,
long timeout,
boolean invalidate,
+ boolean storeEnabled,
int txSize,
@Nullable GridCacheTxKey grpLockKey,
boolean partLock) {
@@ -380,6 +381,7 @@ public class GridCacheTxManager<K, V> extends GridCacheSharedManagerAdapter<K, V
isolation,
timeout,
invalidate,
+ storeEnabled,
txSize,
grpLockKey,
partLock,
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/0cb0c334/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 69500dd..3f30801 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
@@ -768,6 +768,8 @@ public abstract class GridDhtTransactionalCacheAdapter<K, V> extends GridDhtCach
req.subjectId(),
req.taskNameHash());
+ tx.syncCommit(req.syncCommit());
+
tx = ctx.tm().onCreated(tx);
if (tx == null || !tx.init()) {
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/0cb0c334/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 95cd4ad..461ea04 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
@@ -52,9 +52,6 @@ public abstract class GridDhtTxLocalAdapter<K, V> extends GridCacheTxLocalAdapte
private long dhtThreadId;
/** */
- private boolean explicitLock;
-
- /** */
private boolean needsCompletedVers;
/** Versions of pending locks for entries of this tx. */
@@ -75,7 +72,6 @@ public abstract class GridDhtTxLocalAdapter<K, V> extends GridCacheTxLocalAdapte
* @param concurrency Concurrency.
* @param isolation Isolation.
* @param timeout Timeout.
- * @param explicitLock Explicit lock flag.
* @param txSize Expected transaction size.
* @param grpLockKey Group lock key if this is a group-lock transaction.
* @param partLock If this is a group-lock transaction and the whole partition should be locked.
@@ -89,20 +85,18 @@ public abstract class GridDhtTxLocalAdapter<K, V> extends GridCacheTxLocalAdapte
GridCacheTxIsolation isolation,
long timeout,
boolean invalidate,
- boolean explicitLock,
+ boolean storeEnabled,
int txSize,
@Nullable GridCacheTxKey grpLockKey,
boolean partLock,
@Nullable UUID subjId,
int taskNameHash
) {
- super(cctx, xidVer, implicit, implicitSingle, concurrency, isolation, timeout, invalidate, txSize, grpLockKey,
- partLock, subjId, taskNameHash);
+ super(cctx, xidVer, implicit, implicitSingle, concurrency, isolation, timeout, invalidate, storeEnabled, txSize,
+ grpLockKey, partLock, subjId, taskNameHash);
assert cctx != null;
- this.explicitLock = explicitLock;
-
threadId = Thread.currentThread().getId();
dhtThreadId = threadId;
}
@@ -166,13 +160,6 @@ public abstract class GridDhtTxLocalAdapter<K, V> extends GridCacheTxLocalAdapte
}
/**
- * @return Explicit lock flag.
- */
- boolean explicitLock() {
- return explicitLock;
- }
-
- /**
* @return DHT thread ID.
*/
long dhtThreadId() {
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/0cb0c334/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/distributed/dht/colocated/GridDhtColocatedLockFuture.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/distributed/dht/colocated/GridDhtColocatedLockFuture.java b/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/distributed/dht/colocated/GridDhtColocatedLockFuture.java
index d27ee3d..535f46e 100644
--- a/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/distributed/dht/colocated/GridDhtColocatedLockFuture.java
+++ b/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/distributed/dht/colocated/GridDhtColocatedLockFuture.java
@@ -12,7 +12,6 @@ package org.gridgain.grid.kernal.processors.cache.distributed.dht.colocated;
import org.apache.ignite.*;
import org.apache.ignite.cluster.*;
import org.apache.ignite.lang.*;
-import org.gridgain.grid.*;
import org.gridgain.grid.cache.*;
import org.gridgain.grid.kernal.managers.discovery.*;
import org.gridgain.grid.kernal.processors.cache.*;
@@ -704,6 +703,7 @@ public final class GridDhtColocatedLockFuture<K, V> extends GridCompoundIdentity
timeout,
mappedKeys.size(),
inTx() ? tx.size() : mappedKeys.size(),
+ inTx() && tx.syncCommit(),
inTx() ? tx.groupLockKey() : null,
inTx() && tx.partitionLock(),
inTx() ? tx.subjectId() : null,
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/0cb0c334/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/distributed/near/GridNearLockFuture.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/distributed/near/GridNearLockFuture.java b/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/distributed/near/GridNearLockFuture.java
index 15f9a85..b67229d 100644
--- a/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/distributed/near/GridNearLockFuture.java
+++ b/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/distributed/near/GridNearLockFuture.java
@@ -12,7 +12,6 @@ package org.gridgain.grid.kernal.processors.cache.distributed.near;
import org.apache.ignite.*;
import org.apache.ignite.cluster.*;
import org.apache.ignite.lang.*;
-import org.gridgain.grid.*;
import org.gridgain.grid.cache.*;
import org.gridgain.grid.kernal.managers.discovery.*;
import org.gridgain.grid.kernal.processors.cache.*;
@@ -846,6 +845,7 @@ public final class GridNearLockFuture<K, V> extends GridCompoundIdentityFuture<B
timeout,
mappedKeys.size(),
inTx() ? tx.size() : mappedKeys.size(),
+ inTx() && tx.syncCommit(),
inTx() ? tx.groupLockKey() : null,
inTx() && tx.partitionLock(),
inTx() ? tx.subjectId() : null,
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/0cb0c334/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/distributed/near/GridNearLockRequest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/distributed/near/GridNearLockRequest.java b/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/distributed/near/GridNearLockRequest.java
index d9217d5..abcc189 100644
--- a/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/distributed/near/GridNearLockRequest.java
+++ b/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/distributed/near/GridNearLockRequest.java
@@ -69,6 +69,9 @@ public class GridNearLockRequest<K, V> extends GridDistributedLockRequest<K, V>
@GridDirectVersion(3)
private boolean hasTransforms;
+ /** Sync commit flag. */
+ private boolean syncCommit;
+
/**
* Empty constructor required for {@link Externalizable}.
*/
@@ -110,6 +113,7 @@ public class GridNearLockRequest<K, V> extends GridDistributedLockRequest<K, V>
long timeout,
int keyCnt,
int txSize,
+ boolean syncCommit,
@Nullable GridCacheTxKey grpLockKey,
boolean partLock,
@Nullable UUID subjId,
@@ -137,6 +141,7 @@ public class GridNearLockRequest<K, V> extends GridDistributedLockRequest<K, V>
this.topVer = topVer;
this.implicitTx = implicitTx;
this.implicitSingleTx = implicitSingleTx;
+ this.syncCommit = syncCommit;
this.subjId = subjId;
this.taskNameHash = taskNameHash;
@@ -193,6 +198,13 @@ public class GridNearLockRequest<K, V> extends GridDistributedLockRequest<K, V>
}
/**
+ * @return Sync commit flag.
+ */
+ public boolean syncCommit() {
+ return syncCommit;
+ }
+
+ /**
* @return Filter.
*/
public IgnitePredicate<GridCacheEntry<K, V>>[] filter() {
@@ -316,6 +328,7 @@ public class GridNearLockRequest<K, V> extends GridDistributedLockRequest<K, V>
_clone.subjId = subjId;
_clone.taskNameHash = taskNameHash;
_clone.hasTransforms = hasTransforms;
+ _clone.syncCommit = syncCommit;
}
/** {@inheritDoc} */
@@ -436,6 +449,11 @@ public class GridNearLockRequest<K, V> extends GridDistributedLockRequest<K, V>
commState.idx++;
+ case 34:
+ if (!commState.putBoolean(syncCommit))
+ return false;
+
+ commState.idx++;
}
return true;
@@ -576,6 +594,13 @@ public class GridNearLockRequest<K, V> extends GridDistributedLockRequest<K, V>
commState.idx++;
+ case 34:
+ if (buf.remaining() < 1)
+ return false;
+
+ syncCommit = commState.getBoolean();
+
+ commState.idx++;
}
return true;
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/0cb0c334/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 5ff258f..2b974e9 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
@@ -96,6 +96,7 @@ public class GridNearTxLocal<K, V> extends GridDhtTxLocalAdapter<K, V> {
GridCacheTxIsolation isolation,
long timeout,
boolean invalidate,
+ boolean storeEnabled,
int txSize,
@Nullable GridCacheTxKey grpLockKey,
boolean partLock,
@@ -111,7 +112,7 @@ public class GridNearTxLocal<K, V> extends GridDhtTxLocalAdapter<K, V> {
isolation,
timeout,
invalidate,
- /*TODO explicit lock???*/false,
+ storeEnabled,
txSize,
grpLockKey,
partLock,
@@ -191,6 +192,9 @@ public class GridNearTxLocal<K, V> extends GridDhtTxLocalAdapter<K, V> {
* @return {@code True} if transaction is fully synchronous.
*/
private boolean sync() {
+ if (super.syncCommit())
+ return true;
+
for (int cacheId : activeCacheIds()) {
if (cctx.cacheContext(cacheId).config().getWriteSynchronizationMode() == FULL_SYNC)
return true;
@@ -280,9 +284,7 @@ public class GridNearTxLocal<K, V> extends GridDhtTxLocalAdapter<K, V> {
}
});
}
- else {
- assert cacheCtx.isColocated();
-
+ else if (cacheCtx.isColocated()) {
return cacheCtx.colocated().loadAsync(keys, /*reload*/false, /*force primary*/false, topologyVersion(),
CU.subjectId(this, cctx), resolveTaskName(), deserializePortable, null)
.chain(new C1<IgniteFuture<Map<K, V>>, Boolean>() {
@@ -305,6 +307,11 @@ public class GridNearTxLocal<K, V> extends GridDhtTxLocalAdapter<K, V> {
}
});
}
+ else {
+ assert cacheCtx.isLocal();
+
+ return super.loadMissing(cacheCtx, async, keys, deserializePortable, c);
+ }
}
/** {@inheritDoc} */
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/0cb0c334/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 e769893..cebd888 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,7 +60,7 @@ class GridLocalTx<K, V> extends GridCacheTxLocalAdapter<K, V> {
@Nullable UUID subjId,
int taskNameHash
) {
- super(ctx, ctx.versions().next(), implicit, implicitSingle, concurrency, isolation, timeout, false, txSize,
+ super(ctx, ctx.versions().next(), implicit, implicitSingle, concurrency, isolation, timeout, false, true, txSize,
null, false, subjId, taskNameHash);
}
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/0cb0c334/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 a8e1344..98a87e3 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
@@ -106,6 +106,7 @@ public class IgniteTransactionsImpl<K, V> implements IgniteTransactions {
isolation,
timeout,
false,
+ true,
txSize,
/** group lock keys */null,
/** partition lock */false
@@ -168,13 +169,14 @@ public class IgniteTransactionsImpl<K, V> implements IgniteTransactions {
throw new IllegalStateException("Failed to start new transaction " +
"(current thread already has a transaction): " + tx);
- GridCacheTxLocalEx<K, V> tx0 = cctx.tm().newTx(
+ GridCacheTxLocalAdapter<K, V> tx0 = cctx.tm().newTx(
false,
false,
concurrency,
isolation,
timeout,
ctx.hasFlag(INVALIDATE),
+ !ctx.hasFlag(SKIP_STORE),
txSize,
ctx.txKey(grpLockKey),
partLock
@@ -182,6 +184,9 @@ public class IgniteTransactionsImpl<K, V> implements IgniteTransactions {
assert tx0 != null;
+ if (ctx.hasFlag(SYNC_COMMIT))
+ tx0.syncCommit(true);
+
IgniteFuture<?> lockFut = tx0.groupLockAsync(ctx, (Collection)F.asList(grpLockKey));
try {
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/0cb0c334/modules/core/src/main/java/org/gridgain/grid/kernal/processors/rest/handlers/cache/GridCacheCommandHandler.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/gridgain/grid/kernal/processors/rest/handlers/cache/GridCacheCommandHandler.java b/modules/core/src/main/java/org/gridgain/grid/kernal/processors/rest/handlers/cache/GridCacheCommandHandler.java
index 1bab28a..1a68cc7 100644
--- a/modules/core/src/main/java/org/gridgain/grid/kernal/processors/rest/handlers/cache/GridCacheCommandHandler.java
+++ b/modules/core/src/main/java/org/gridgain/grid/kernal/processors/rest/handlers/cache/GridCacheCommandHandler.java
@@ -13,7 +13,6 @@ import org.apache.ignite.*;
import org.apache.ignite.cluster.*;
import org.apache.ignite.lang.*;
import org.apache.ignite.resources.*;
-import org.gridgain.grid.*;
import org.gridgain.grid.cache.*;
import org.gridgain.grid.cache.datastructures.*;
import org.gridgain.grid.kernal.*;
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/0cb0c334/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 79f439a..6044900 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
@@ -70,6 +70,7 @@ public class GridCacheJtaManager<K, V> extends GridCacheJtaManagerAdapter<K, V>
tCfg.getDefaultTxIsolation(),
tCfg.getDefaultTxTimeout(),
false,
+ true,
0,
/** group lock keys */null,
/** partition lock */false
[04/10] incubator-ignite git commit: GG-9141 - Enabled test.
Posted by ag...@apache.org.
GG-9141 - Enabled test.
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/1c5984f1
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/1c5984f1
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/1c5984f1
Branch: refs/heads/ignite-1
Commit: 1c5984f1c5bad7b966ef22e6714f7f96232ab47d
Parents: 7964632
Author: Alexey Goncharuk <ag...@gridgain.com>
Authored: Sun Dec 14 11:33:53 2014 -0800
Committer: Alexey Goncharuk <ag...@gridgain.com>
Committed: Sun Dec 14 11:33:53 2014 -0800
----------------------------------------------------------------------
.../processors/cache/GridCacheTxSingleThreadedAbstractTest.java | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/1c5984f1/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheTxSingleThreadedAbstractTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheTxSingleThreadedAbstractTest.java b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheTxSingleThreadedAbstractTest.java
index 98f30a6..1dc7b44 100644
--- a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheTxSingleThreadedAbstractTest.java
+++ b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheTxSingleThreadedAbstractTest.java
@@ -9,7 +9,7 @@
package org.gridgain.grid.kernal.processors.cache;
-import org.gridgain.grid.*;
+import org.apache.ignite.*;
import static org.gridgain.grid.cache.GridCacheTxConcurrency.*;
import static org.gridgain.grid.cache.GridCacheTxIsolation.*;
@@ -49,7 +49,7 @@ public abstract class GridCacheTxSingleThreadedAbstractTest extends GridCacheTxA
/**
* @throws IgniteCheckedException If test failed.
*/
- public void _testOptimisticReadCommittedCommit() throws Exception { // TODO GG-9141
+ public void testOptimisticReadCommittedCommit() throws Exception {
checkCommit(OPTIMISTIC, READ_COMMITTED);
finalChecks();
[03/10] incubator-ignite git commit: GG-9141 - Fixed and enabled
metrics tests.
Posted by ag...@apache.org.
GG-9141 - Fixed and enabled metrics 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/7964632f
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/7964632f
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/7964632f
Branch: refs/heads/ignite-1
Commit: 7964632f295e55809259195469286853083dd761
Parents: 8963d29
Author: Alexey Goncharuk <ag...@gridgain.com>
Authored: Sun Dec 14 11:29:24 2014 -0800
Committer: Alexey Goncharuk <ag...@gridgain.com>
Committed: Sun Dec 14 11:29:24 2014 -0800
----------------------------------------------------------------------
.../org/apache/ignite/IgniteTransactions.java | 10 ++
.../gridgain/grid/cache/GridCacheTxMetrics.java | 45 --------
.../grid/cache/GridCacheTxMetricsAdapter.java | 108 -------------------
.../gridgain/grid/cache/IgniteTxMetrics.java | 45 ++++++++
.../grid/cache/IgniteTxMetricsAdapter.java | 107 ++++++++++++++++++
.../cache/GridCacheSharedContext.java | 13 ++-
.../processors/cache/GridCacheTxManager.java | 18 +++-
.../near/GridNearTxPrepareFuture.java | 38 +++++--
.../transactions/IgniteTransactionsImpl.java | 10 ++
.../cache/GridCacheAbstractMetricsSelfTest.java | 9 +-
.../GridCacheReferenceCleanupSelfTest.java | 2 +-
...cheTransactionalAbstractMetricsSelfTest.java | 32 ++++--
.../GridCacheMetricsSelfTestSuite.java | 4 +-
13 files changed, 258 insertions(+), 183 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/7964632f/modules/core/src/main/java/org/apache/ignite/IgniteTransactions.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/IgniteTransactions.java b/modules/core/src/main/java/org/apache/ignite/IgniteTransactions.java
index d28954c..783dab4 100644
--- a/modules/core/src/main/java/org/apache/ignite/IgniteTransactions.java
+++ b/modules/core/src/main/java/org/apache/ignite/IgniteTransactions.java
@@ -133,4 +133,14 @@ public interface IgniteTransactions {
* does not have a transaction.
*/
@Nullable public GridCacheTx tx();
+
+ /**
+ * @return Transaction metrics.
+ */
+ public IgniteTxMetrics metrics();
+
+ /**
+ * Resets transaction metrics.
+ */
+ public void resetMetrics();
}
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/7964632f/modules/core/src/main/java/org/gridgain/grid/cache/GridCacheTxMetrics.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/gridgain/grid/cache/GridCacheTxMetrics.java b/modules/core/src/main/java/org/gridgain/grid/cache/GridCacheTxMetrics.java
deleted file mode 100644
index c9c8bd3..0000000
--- a/modules/core/src/main/java/org/gridgain/grid/cache/GridCacheTxMetrics.java
+++ /dev/null
@@ -1,45 +0,0 @@
-/* @java.file.header */
-
-/* _________ _____ __________________ _____
- * __ ____/___________(_)______ /__ ____/______ ____(_)_______
- * _ / __ __ ___/__ / _ __ / _ / __ _ __ `/__ / __ __ \
- * / /_/ / _ / _ / / /_/ / / /_/ / / /_/ / _ / _ / / /
- * \____/ /_/ /_/ \_,__/ \____/ \__,_/ /_/ /_/ /_/
- */
-
-package org.gridgain.grid.cache;
-
-import java.io.*;
-
-/**
- * Transaction metrics, shared across all caches.
- */
-public interface GridCacheTxMetrics extends Serializable {
- /**
- * Gets last time transaction was committed.
- *
- * @return Last commit time.
- */
- public long commitTime();
-
- /**
- * Gets last time transaction was rollback.
- *
- * @return Last rollback time.
- */
- public long rollbackTime();
-
- /**
- * Gets total number of transaction commits.
- *
- * @return Number of transaction commits.
- */
- public int txCommits();
-
- /**
- * Gets total number of transaction rollbacks.
- *
- * @return Number of transaction rollbacks.
- */
- public int txRollbacks();
-}
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/7964632f/modules/core/src/main/java/org/gridgain/grid/cache/GridCacheTxMetricsAdapter.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/gridgain/grid/cache/GridCacheTxMetricsAdapter.java b/modules/core/src/main/java/org/gridgain/grid/cache/GridCacheTxMetricsAdapter.java
deleted file mode 100644
index 4fe5896..0000000
--- a/modules/core/src/main/java/org/gridgain/grid/cache/GridCacheTxMetricsAdapter.java
+++ /dev/null
@@ -1,108 +0,0 @@
-/* @java.file.header */
-
-/* _________ _____ __________________ _____
- * __ ____/___________(_)______ /__ ____/______ ____(_)_______
- * _ / __ __ ___/__ / _ __ / _ / __ _ __ `/__ / __ __ \
- * / /_/ / _ / _ / / /_/ / / /_/ / / /_/ / _ / _ / / /
- * \____/ /_/ /_/ \_,__/ \____/ \__,_/ /_/ /_/ /_/
- */
-
-package org.gridgain.grid.cache;
-
-import org.gridgain.grid.util.tostring.*;
-import org.gridgain.grid.util.typedef.internal.*;
-
-import java.io.*;
-
-/**
- * TODO: Add class description.
- */
-public class GridCacheTxMetricsAdapter implements GridCacheTxMetrics, Externalizable {
- /** Number of transaction commits. */
- private volatile int txCommits;
-
- /** Number of transaction rollbacks. */
- private volatile int txRollbacks;
-
- /** Last commit time. */
- private volatile long commitTime;
-
- /** Last rollback time. */
- private volatile long rollbackTime;
-
- /**
- *
- */
- public GridCacheTxMetricsAdapter() {
-
- }
-
- /**
- * @param m Transaction metrics to copy.
- */
- public GridCacheTxMetricsAdapter(GridCacheTxMetrics m) {
- commitTime = m.commitTime();
- rollbackTime = m.rollbackTime();
- txCommits = m.txCommits();
- txRollbacks = m.txRollbacks();
- }
-
- /** {@inheritDoc} */
- @Override public long commitTime() {
- return commitTime;
- }
-
- /** {@inheritDoc} */
- @Override public long rollbackTime() {
- return rollbackTime;
- }
-
- /** {@inheritDoc} */
- @Override public int txCommits() {
- return txCommits;
- }
-
- /** {@inheritDoc} */
- @Override public int txRollbacks() {
- return txRollbacks;
- }
-
- /**
- * Transaction commit callback.
- */
- public void onTxCommit() {
- commitTime = U.currentTimeMillis();
-
- txCommits++;
- }
-
- /**
- * Transaction rollback callback.
- */
- public void onTxRollback() {
- rollbackTime = U.currentTimeMillis();
-
- txRollbacks++;
- }
-
- /** {@inheritDoc} */
- @Override public void writeExternal(ObjectOutput out) throws IOException {
- out.writeLong(commitTime);
- out.writeLong(rollbackTime);
- out.writeInt(txCommits);
- out.writeInt(txRollbacks);
- }
-
- /** {@inheritDoc} */
- @Override public void readExternal(ObjectInput in) throws IOException, ClassNotFoundException {
- commitTime = in.readLong();
- rollbackTime = in.readLong();
- txCommits = in.readInt();
- txRollbacks = in.readInt();
- }
-
- /** {@inheritDoc} */
- @Override public String toString() {
- return S.toString(GridCacheTxMetricsAdapter.class, this);
- }
-}
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/7964632f/modules/core/src/main/java/org/gridgain/grid/cache/IgniteTxMetrics.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/gridgain/grid/cache/IgniteTxMetrics.java b/modules/core/src/main/java/org/gridgain/grid/cache/IgniteTxMetrics.java
new file mode 100644
index 0000000..1c36cfd
--- /dev/null
+++ b/modules/core/src/main/java/org/gridgain/grid/cache/IgniteTxMetrics.java
@@ -0,0 +1,45 @@
+/* @java.file.header */
+
+/* _________ _____ __________________ _____
+ * __ ____/___________(_)______ /__ ____/______ ____(_)_______
+ * _ / __ __ ___/__ / _ __ / _ / __ _ __ `/__ / __ __ \
+ * / /_/ / _ / _ / / /_/ / / /_/ / / /_/ / _ / _ / / /
+ * \____/ /_/ /_/ \_,__/ \____/ \__,_/ /_/ /_/ /_/
+ */
+
+package org.gridgain.grid.cache;
+
+import java.io.*;
+
+/**
+ * Transaction metrics, shared across all caches.
+ */
+public interface IgniteTxMetrics extends Serializable {
+ /**
+ * Gets last time transaction was committed.
+ *
+ * @return Last commit time.
+ */
+ public long commitTime();
+
+ /**
+ * Gets last time transaction was rollback.
+ *
+ * @return Last rollback time.
+ */
+ public long rollbackTime();
+
+ /**
+ * Gets total number of transaction commits.
+ *
+ * @return Number of transaction commits.
+ */
+ public int txCommits();
+
+ /**
+ * Gets total number of transaction rollbacks.
+ *
+ * @return Number of transaction rollbacks.
+ */
+ public int txRollbacks();
+}
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/7964632f/modules/core/src/main/java/org/gridgain/grid/cache/IgniteTxMetricsAdapter.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/gridgain/grid/cache/IgniteTxMetricsAdapter.java b/modules/core/src/main/java/org/gridgain/grid/cache/IgniteTxMetricsAdapter.java
new file mode 100644
index 0000000..f9214d4
--- /dev/null
+++ b/modules/core/src/main/java/org/gridgain/grid/cache/IgniteTxMetricsAdapter.java
@@ -0,0 +1,107 @@
+/* @java.file.header */
+
+/* _________ _____ __________________ _____
+ * __ ____/___________(_)______ /__ ____/______ ____(_)_______
+ * _ / __ __ ___/__ / _ __ / _ / __ _ __ `/__ / __ __ \
+ * / /_/ / _ / _ / / /_/ / / /_/ / / /_/ / _ / _ / / /
+ * \____/ /_/ /_/ \_,__/ \____/ \__,_/ /_/ /_/ /_/
+ */
+
+package org.gridgain.grid.cache;
+
+import org.gridgain.grid.util.typedef.internal.*;
+
+import java.io.*;
+
+/**
+ * Tx metrics adapter.
+ */
+public class IgniteTxMetricsAdapter implements IgniteTxMetrics, Externalizable {
+ /** Number of transaction commits. */
+ private volatile int txCommits;
+
+ /** Number of transaction rollbacks. */
+ private volatile int txRollbacks;
+
+ /** Last commit time. */
+ private volatile long commitTime;
+
+ /** Last rollback time. */
+ private volatile long rollbackTime;
+
+ /**
+ *
+ */
+ public IgniteTxMetricsAdapter() {
+
+ }
+
+ /**
+ * @param m Transaction metrics to copy.
+ */
+ public IgniteTxMetricsAdapter(IgniteTxMetrics m) {
+ commitTime = m.commitTime();
+ rollbackTime = m.rollbackTime();
+ txCommits = m.txCommits();
+ txRollbacks = m.txRollbacks();
+ }
+
+ /** {@inheritDoc} */
+ @Override public long commitTime() {
+ return commitTime;
+ }
+
+ /** {@inheritDoc} */
+ @Override public long rollbackTime() {
+ return rollbackTime;
+ }
+
+ /** {@inheritDoc} */
+ @Override public int txCommits() {
+ return txCommits;
+ }
+
+ /** {@inheritDoc} */
+ @Override public int txRollbacks() {
+ return txRollbacks;
+ }
+
+ /**
+ * Transaction commit callback.
+ */
+ public void onTxCommit() {
+ commitTime = U.currentTimeMillis();
+
+ txCommits++;
+ }
+
+ /**
+ * Transaction rollback callback.
+ */
+ public void onTxRollback() {
+ rollbackTime = U.currentTimeMillis();
+
+ txRollbacks++;
+ }
+
+ /** {@inheritDoc} */
+ @Override public void writeExternal(ObjectOutput out) throws IOException {
+ out.writeLong(commitTime);
+ out.writeLong(rollbackTime);
+ out.writeInt(txCommits);
+ out.writeInt(txRollbacks);
+ }
+
+ /** {@inheritDoc} */
+ @Override public void readExternal(ObjectInput in) throws IOException, ClassNotFoundException {
+ commitTime = in.readLong();
+ rollbackTime = in.readLong();
+ txCommits = in.readInt();
+ txRollbacks = in.readInt();
+ }
+
+ /** {@inheritDoc} */
+ @Override public String toString() {
+ return S.toString(IgniteTxMetricsAdapter.class, this);
+ }
+}
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/7964632f/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/GridCacheSharedContext.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/GridCacheSharedContext.java b/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/GridCacheSharedContext.java
index e67519b..ab23680 100644
--- a/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/GridCacheSharedContext.java
+++ b/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/GridCacheSharedContext.java
@@ -61,7 +61,7 @@ public class GridCacheSharedContext<K, V> {
private Map<Integer, GridCacheContext<K, V>> ctxMap;
/** Tx metrics. */
- private GridCacheTxMetricsAdapter txMetrics;
+ private volatile IgniteTxMetricsAdapter txMetrics;
/** Preloaders start future. */
private IgniteFuture<Object> preloadersStartFut;
@@ -88,7 +88,7 @@ public class GridCacheSharedContext<K, V> {
this.exchMgr = add(exchMgr);
this.ioMgr = add(ioMgr);
- txMetrics = new GridCacheTxMetricsAdapter();
+ txMetrics = new IgniteTxMetricsAdapter();
ctxMap = new HashMap<>();
}
@@ -206,11 +206,18 @@ public class GridCacheSharedContext<K, V> {
/**
* @return Transactional metrics adapter.
*/
- public GridCacheTxMetricsAdapter txMetrics() {
+ public IgniteTxMetricsAdapter txMetrics() {
return txMetrics;
}
/**
+ * Resets tx metrics.
+ */
+ public void resetTxMetrics() {
+ txMetrics = new IgniteTxMetricsAdapter();
+ }
+
+ /**
* @return Cache transaction manager.
*/
public GridCacheTxManager<K, V> tm() {
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/7964632f/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 935ae1d..cc37438 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
@@ -1239,9 +1239,16 @@ public class GridCacheTxManager<K, V> extends GridCacheSharedManagerAdapter<K, V
txContextReset();
// 15. Update metrics.
- if (!tx.dht() && tx.local())
+ if (!tx.dht() && tx.local()) {
cctx.txMetrics().onTxCommit();
+ for (int cacheId : tx.activeCacheIds()) {
+ GridCacheContext<K, V> cacheCtx = cctx.cacheContext(cacheId);
+
+ cacheCtx.cache().metrics0().onTxCommit();
+ }
+ }
+
if (slowTxWarnTimeout > 0 && tx.local() &&
U.currentTimeMillis() - tx.startTime() > slowTxWarnTimeout)
U.warn(log, "Slow transaction detected [tx=" + tx +
@@ -1305,9 +1312,16 @@ public class GridCacheTxManager<K, V> extends GridCacheSharedManagerAdapter<K, V
txContextReset();
// 11. Update metrics.
- if (!tx.dht() && tx.local())
+ if (!tx.dht() && tx.local()) {
cctx.txMetrics().onTxRollback();
+ for (int cacheId : tx.activeCacheIds()) {
+ GridCacheContext<K, V> cacheCtx = cctx.cacheContext(cacheId);
+
+ cacheCtx.cache().metrics0().onTxRollback();
+ }
+ }
+
if (log.isDebugEnabled())
log.debug("Rolled back from TM: " + tx);
}
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/7964632f/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/distributed/near/GridNearTxPrepareFuture.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/distributed/near/GridNearTxPrepareFuture.java b/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/distributed/near/GridNearTxPrepareFuture.java
index a9bcd3b..5bc5a3e 100644
--- a/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/distributed/near/GridNearTxPrepareFuture.java
+++ b/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/distributed/near/GridNearTxPrepareFuture.java
@@ -12,7 +12,6 @@ package org.gridgain.grid.kernal.processors.cache.distributed.near;
import org.apache.ignite.*;
import org.apache.ignite.cluster.*;
import org.apache.ignite.lang.*;
-import org.gridgain.grid.*;
import org.gridgain.grid.cache.*;
import org.gridgain.grid.kernal.managers.discovery.*;
import org.gridgain.grid.kernal.processors.cache.*;
@@ -384,19 +383,46 @@ public final class GridNearTxPrepareFuture<K, V> extends GridCompoundIdentityFut
if (tx.activeCacheIds().isEmpty())
return cctx.exchange().lastTopologyFuture();
- GridCacheContext<K, V> cacheCtx = cctx.cacheContext(F.first(tx.activeCacheIds()));
+ GridCacheContext<K, V> nonLocalCtx = null;
- cacheCtx.topology().readLock();
+ for (int cacheId : tx.activeCacheIds()) {
+ GridCacheContext<K, V> cacheCtx = cctx.cacheContext(cacheId);
+
+ if (!cacheCtx.isLocal()) {
+ nonLocalCtx = cacheCtx;
+
+ break;
+ }
+ }
+
+ if (nonLocalCtx == null)
+ return cctx.exchange().lastTopologyFuture();
+
+ nonLocalCtx.topology().readLock();
- return cacheCtx.topology().topologyVersionFuture();
+ return nonLocalCtx.topology().topologyVersionFuture();
}
/**
* Releases topology read lock.
*/
private void topologyReadUnlock() {
- if (!tx.activeCacheIds().isEmpty())
- cctx.cacheContext(F.first(tx.activeCacheIds())).topology().readUnlock();
+ if (!tx.activeCacheIds().isEmpty()) {
+ GridCacheContext<K, V> nonLocalCtx = null;
+
+ for (int cacheId : tx.activeCacheIds()) {
+ GridCacheContext<K, V> cacheCtx = cctx.cacheContext(cacheId);
+
+ if (!cacheCtx.isLocal()) {
+ nonLocalCtx = cacheCtx;
+
+ break;
+ }
+ }
+
+ if (nonLocalCtx != null)
+ nonLocalCtx.topology().readUnlock();
+ }
}
/**
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/7964632f/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 98a87e3..60eec9e 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
@@ -206,4 +206,14 @@ public class IgniteTransactionsImpl<K, V> implements IgniteTransactions {
@Nullable @Override public GridCacheTx tx() {
return cctx.tm().userTx();
}
+
+ /** {@inheritDoc} */
+ @Override public IgniteTxMetrics metrics() {
+ return cctx.txMetrics();
+ }
+
+ /** {@inheritDoc} */
+ @Override public void resetMetrics() {
+ cctx.resetTxMetrics();
+ }
}
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/7964632f/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheAbstractMetricsSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheAbstractMetricsSelfTest.java b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheAbstractMetricsSelfTest.java
index 605b278..87248ef 100644
--- a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheAbstractMetricsSelfTest.java
+++ b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheAbstractMetricsSelfTest.java
@@ -12,8 +12,6 @@ package org.gridgain.grid.kernal.processors.cache;
import org.apache.ignite.*;
import org.gridgain.grid.cache.*;
-import static org.gridgain.grid.cache.GridCacheWriteSynchronizationMode.*;
-
/**
* Cache metrics test.
*/
@@ -22,11 +20,6 @@ public abstract class GridCacheAbstractMetricsSelfTest extends GridCacheAbstract
private static final int KEY_CNT = 50;
/** {@inheritDoc} */
- @Override protected GridCacheWriteSynchronizationMode writeSynchronization() {
- return FULL_SYNC;
- }
-
- /** {@inheritDoc} */
@Override protected boolean swapEnabled() {
return false;
}
@@ -70,6 +63,8 @@ public abstract class GridCacheAbstractMetricsSelfTest extends GridCacheAbstract
assert g.cache(null).isEmpty();
g.cache(null).resetMetrics();
+
+ g.transactions().resetMetrics();
}
}
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/7964632f/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheReferenceCleanupSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheReferenceCleanupSelfTest.java b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheReferenceCleanupSelfTest.java
index 80c4747..4602445 100644
--- a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheReferenceCleanupSelfTest.java
+++ b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheReferenceCleanupSelfTest.java
@@ -96,7 +96,7 @@ public class GridCacheReferenceCleanupSelfTest extends GridCommonAbstractTest {
}
/** @throws Exception If failed. */
- public void _testAtomicLongLocal() throws Exception { // TODO GG-9141
+ public void testAtomicLongLocal() throws Exception {
mode = GridCacheMode.LOCAL;
try {
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/7964632f/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheTransactionalAbstractMetricsSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheTransactionalAbstractMetricsSelfTest.java b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheTransactionalAbstractMetricsSelfTest.java
index 2ef09ea..5d3399c 100644
--- a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheTransactionalAbstractMetricsSelfTest.java
+++ b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheTransactionalAbstractMetricsSelfTest.java
@@ -210,15 +210,22 @@ public abstract class GridCacheTransactionalAbstractMetricsSelfTest extends Grid
}
for (int i = 0; i < gridCount(); i++) {
- // TODO GG-9141
- GridCacheTxMetrics metrics = null; //grid(i).cache(null).metrics();
+ IgniteTxMetrics metrics = grid(i).transactions().metrics();
+ GridCacheMetrics cacheMetrics = grid(i).cache(null).metrics();
- if (i == 0)
+ if (i == 0) {
assertEquals(TX_CNT, metrics.txCommits());
- else
+
+ if (put)
+ assertEquals(TX_CNT, cacheMetrics.txCommits());
+ }
+ else {
assertEquals(0, metrics.txCommits());
+ assertEquals(0, cacheMetrics.txCommits());
+ }
assertEquals(0, metrics.txRollbacks());
+ assertEquals(0, cacheMetrics.txRollbacks());
}
}
@@ -233,7 +240,7 @@ public abstract class GridCacheTransactionalAbstractMetricsSelfTest extends Grid
GridCache<Integer, Integer> cache = grid(0).cache(null);
for (int i = 0; i < TX_CNT; i++) {
- GridCacheTx tx = cache.txStart(concurrency ,isolation);
+ GridCacheTx tx = cache.txStart(concurrency, isolation);
if (put)
for (int j = 0; j < keyCount(); j++)
@@ -243,15 +250,22 @@ public abstract class GridCacheTransactionalAbstractMetricsSelfTest extends Grid
}
for (int i = 0; i < gridCount(); i++) {
- // TODO GG-9141
- GridCacheTxMetrics metrics = null;//grid(i).cache(null).metrics();
+ IgniteTxMetrics metrics = grid(i).transactions().metrics();
+ GridCacheMetrics cacheMetrics = grid(i).cache(null).metrics();
assertEquals(0, metrics.txCommits());
+ assertEquals(0, cacheMetrics.txCommits());
- if (i == 0)
+ if (i == 0) {
assertEquals(TX_CNT, metrics.txRollbacks());
- else
+
+ if (put)
+ assertEquals(TX_CNT, cacheMetrics.txRollbacks());
+ }
+ else {
assertEquals(0, metrics.txRollbacks());
+ assertEquals(0, cacheMetrics.txRollbacks());
+ }
}
}
}
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/7964632f/modules/core/src/test/java/org/gridgain/testsuites/GridCacheMetricsSelfTestSuite.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/gridgain/testsuites/GridCacheMetricsSelfTestSuite.java b/modules/core/src/test/java/org/gridgain/testsuites/GridCacheMetricsSelfTestSuite.java
index 178465a..6a21e85 100644
--- a/modules/core/src/test/java/org/gridgain/testsuites/GridCacheMetricsSelfTestSuite.java
+++ b/modules/core/src/test/java/org/gridgain/testsuites/GridCacheMetricsSelfTestSuite.java
@@ -27,8 +27,8 @@ public class GridCacheMetricsSelfTestSuite extends TestSuite {
// suite.addTest(new TestSuite(GridCacheLocalMetricsSelfTest.class));
suite.addTest(new TestSuite(GridCacheNearMetricsSelfTest.class));
-// suite.addTest(new TestSuite(GridCacheReplicatedMetricsSelfTest.class));
-// suite.addTest(new TestSuite(GridCachePartitionedMetricsSelfTest.class));
+ suite.addTest(new TestSuite(GridCacheReplicatedMetricsSelfTest.class));
+ suite.addTest(new TestSuite(GridCachePartitionedMetricsSelfTest.class));
// Atomic cache.
suite.addTest(new TestSuite(GridCacheAtomicLocalMetricsSelfTest.class));
[02/10] incubator-ignite git commit: GG-9141 - Enabling passing tests.
Posted by ag...@apache.org.
GG-9141 - Enabling passing 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/8963d290
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/8963d290
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/8963d290
Branch: refs/heads/ignite-1
Commit: 8963d2902965b13d42d7b271b8d2e8afc0d6ea29
Parents: 0cb0c33
Author: Alexey Goncharuk <ag...@gridgain.com>
Authored: Sun Dec 14 10:45:25 2014 -0800
Committer: Alexey Goncharuk <ag...@gridgain.com>
Committed: Sun Dec 14 10:45:25 2014 -0800
----------------------------------------------------------------------
.../processors/cache/GridCacheAbstractProjectionSelfTest.java | 4 ++--
.../org/gridgain/testsuites/bamboo/GridDataGridTestSuite.java | 2 +-
2 files changed, 3 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/8963d290/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheAbstractProjectionSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheAbstractProjectionSelfTest.java b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheAbstractProjectionSelfTest.java
index 890d8f7..9c0437f 100644
--- a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheAbstractProjectionSelfTest.java
+++ b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheAbstractProjectionSelfTest.java
@@ -588,7 +588,7 @@ public abstract class GridCacheAbstractProjectionSelfTest extends GridCacheAbstr
/**
* @throws Exception if failed.
*/
- public void _testSkipStoreFlag() throws Exception { // TODO GG-9141
+ public void testSkipStoreFlag() throws Exception {
assertNull(cache().put("kk1", 100500));
assertEquals(100500, map.get("kk1"));
@@ -616,7 +616,7 @@ public abstract class GridCacheAbstractProjectionSelfTest extends GridCacheAbstr
startGrid(i);
try {
- _testSkipStoreFlag();
+ testSkipStoreFlag();
}
finally {
for (int i = 1; i < nGrids; i++)
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/8963d290/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 c2fe016..3059c4e 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,7 +95,7 @@ public class GridDataGridTestSuite extends TestSuite {
suite.addTestSuite(GridCacheOffHeapTieredSelfTest.class);
// Local cache.
-// suite.addTestSuite(GridCacheLocalProjectionSelfTest.class);
+ suite.addTestSuite(GridCacheLocalProjectionSelfTest.class);
suite.addTestSuite(GridCacheLocalAtomicProjectionSelfTest.class);
// suite.addTestSuite(GridCacheLocalBasicApiSelfTest.class);
// suite.addTestSuite(GridCacheLocalBasicStoreSelfTest.class);
[09/10] incubator-ignite git commit: GG-9141 - Enabling passing tests.
Posted by ag...@apache.org.
GG-9141 - Enabling passing 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/a94ce931
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/a94ce931
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/a94ce931
Branch: refs/heads/ignite-1
Commit: a94ce9311c678ae3e35e5d7d9ddb908ae76144d6
Parents: 806a44d
Author: Alexey Goncharuk <ag...@gridgain.com>
Authored: Sun Dec 14 11:48:16 2014 -0800
Committer: Alexey Goncharuk <ag...@gridgain.com>
Committed: Sun Dec 14 11:48:16 2014 -0800
----------------------------------------------------------------------
.../org/gridgain/testsuites/GridCacheQuerySelfTestSuite.java | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/a94ce931/modules/indexing/src/test/java/org/gridgain/testsuites/GridCacheQuerySelfTestSuite.java
----------------------------------------------------------------------
diff --git a/modules/indexing/src/test/java/org/gridgain/testsuites/GridCacheQuerySelfTestSuite.java b/modules/indexing/src/test/java/org/gridgain/testsuites/GridCacheQuerySelfTestSuite.java
index a939fdf..7a2ec15 100644
--- a/modules/indexing/src/test/java/org/gridgain/testsuites/GridCacheQuerySelfTestSuite.java
+++ b/modules/indexing/src/test/java/org/gridgain/testsuites/GridCacheQuerySelfTestSuite.java
@@ -54,7 +54,7 @@ public class GridCacheQuerySelfTestSuite extends TestSuite {
suite.addTestSuite(GridCacheSqlQueryMultiThreadedSelfTest.class);
// Fields queries.
-// suite.addTestSuite(GridCacheLocalFieldsQuerySelfTest.class); // TODO GG-9141
+ suite.addTestSuite(GridCacheLocalFieldsQuerySelfTest.class);
suite.addTestSuite(GridCacheReplicatedFieldsQuerySelfTest.class);
suite.addTestSuite(GridCacheReplicatedFieldsQueryP2PDisabledSelfTest.class);
suite.addTestSuite(GridCachePartitionedFieldsQuerySelfTest.class);
@@ -64,7 +64,7 @@ public class GridCacheQuerySelfTestSuite extends TestSuite {
suite.addTestSuite(GridCacheFieldsQueryNoDataSelfTest.class);
// Continuous queries.
-// suite.addTestSuite(GridCacheContinuousQueryLocalSelfTest.class); // TODO GG-9141
+ suite.addTestSuite(GridCacheContinuousQueryLocalSelfTest.class);
suite.addTestSuite(GridCacheContinuousQueryLocalAtomicSelfTest.class);
suite.addTestSuite(GridCacheContinuousQueryReplicatedSelfTest.class);
suite.addTestSuite(GridCacheContinuousQueryReplicatedAtomicSelfTest.class);
[08/10] incubator-ignite git commit: GG-9141 - Enabling passing tests.
Posted by ag...@apache.org.
GG-9141 - Enabling passing 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/806a44d1
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/806a44d1
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/806a44d1
Branch: refs/heads/ignite-1
Commit: 806a44d1ab2dae571f7817741fead3e858b48f67
Parents: ec62ccc
Author: Alexey Goncharuk <ag...@gridgain.com>
Authored: Sun Dec 14 11:47:17 2014 -0800
Committer: Alexey Goncharuk <ag...@gridgain.com>
Committed: Sun Dec 14 11:47:17 2014 -0800
----------------------------------------------------------------------
.../rest/handlers/cache/GridCacheCommandHandlerSelfTest.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/806a44d1/modules/core/src/test/java/org/gridgain/grid/kernal/processors/rest/handlers/cache/GridCacheCommandHandlerSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/rest/handlers/cache/GridCacheCommandHandlerSelfTest.java b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/rest/handlers/cache/GridCacheCommandHandlerSelfTest.java
index cafff4e..c0dde12 100644
--- a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/rest/handlers/cache/GridCacheCommandHandlerSelfTest.java
+++ b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/rest/handlers/cache/GridCacheCommandHandlerSelfTest.java
@@ -118,7 +118,7 @@ public class GridCacheCommandHandlerSelfTest extends GridCommonAbstractTest {
* @throws Exception In case of any exception.
*/
@SuppressWarnings("NullableProblems")
- public void _testAppendPrepend() throws Exception { // TODO GG-9141
+ public void testAppendPrepend() throws Exception {
assertEquals("as" + "df", testAppend("as", "df", true));
assertEquals("df" + "as", testAppend("as", "df", false));
[06/10] incubator-ignite git commit: GG-9141 - Fixed and enabled test.
Posted by ag...@apache.org.
GG-9141 - Fixed and enabled test.
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/766e45cf
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/766e45cf
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/766e45cf
Branch: refs/heads/ignite-1
Commit: 766e45cf279ce270a59b835efa5433b837bb4336
Parents: 62b9617
Author: Alexey Goncharuk <ag...@gridgain.com>
Authored: Sun Dec 14 11:43:25 2014 -0800
Committer: Alexey Goncharuk <ag...@gridgain.com>
Committed: Sun Dec 14 11:43:25 2014 -0800
----------------------------------------------------------------------
.../near/GridCacheNearOneNodeSelfTest.java | 23 +++++++++++---------
1 file changed, 13 insertions(+), 10 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/766e45cf/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/near/GridCacheNearOneNodeSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/near/GridCacheNearOneNodeSelfTest.java b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/near/GridCacheNearOneNodeSelfTest.java
index 10d438d..728336d 100644
--- a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/near/GridCacheNearOneNodeSelfTest.java
+++ b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/near/GridCacheNearOneNodeSelfTest.java
@@ -15,6 +15,7 @@ import org.apache.ignite.spi.discovery.tcp.*;
import org.apache.ignite.spi.discovery.tcp.ipfinder.vm.*;
import org.gridgain.grid.cache.*;
import org.gridgain.grid.cache.store.*;
+import org.gridgain.grid.kernal.processors.cache.*;
import org.gridgain.testframework.junits.common.*;
import org.jetbrains.annotations.*;
@@ -135,22 +136,24 @@ public class GridCacheNearOneNodeSelfTest extends GridCommonAbstractTest {
* @throws Exception If failed.
*/
@SuppressWarnings({"ConstantConditions"})
- public void _testOptimisticTxWriteThrough() throws Exception { // TODO GG-9141
+ public void testOptimisticTxWriteThrough() throws Exception {
GridCache<Integer, String> near = cache();
- GridCache<Integer, String> dht = dht();
+ GridCacheAdapter<Integer, String> dht = dht();
- GridCacheTx tx = cache().txStart(OPTIMISTIC, REPEATABLE_READ);
+ try (GridCacheTx tx = cache().txStart(OPTIMISTIC, REPEATABLE_READ) ) {
+ near.putx(2, "2");
+ near.put(3, "3");
- near.putx(2, "2");
- near.put(3, "3");
+ assert "2".equals(near.get(2));
+ assert "3".equals(near.get(3));
- assert "2".equals(near.get(2));
- assert "3".equals(near.get(3));
+ GridCacheEntryEx<Integer, String> entry = dht.peekEx(2);
- assert dht.peek(2) == null;
- assert dht.peek(3) != null;
+ assert entry == null || entry.rawGetOrUnmarshal(false) == null : "Invalid entry: " + entry;
+ assert dht.peek(3) != null;
- tx.commit();
+ tx.commit();
+ }
assert "2".equals(near.get(2));
assert "3".equals(near.get(3));
[10/10] incubator-ignite git commit: GG-9141 - Enabling passing tests.
Posted by ag...@apache.org.
GG-9141 - Enabling passing 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/2ad4e6d1
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/2ad4e6d1
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/2ad4e6d1
Branch: refs/heads/ignite-1
Commit: 2ad4e6d1a405b68221e096d315fc98244e459fcf
Parents: a94ce93
Author: Alexey Goncharuk <ag...@gridgain.com>
Authored: Sun Dec 14 11:50:51 2014 -0800
Committer: Alexey Goncharuk <ag...@gridgain.com>
Committed: Sun Dec 14 11:50:51 2014 -0800
----------------------------------------------------------------------
.../testsuites/GridCacheDataStructuresSelfTestSuite.java | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/2ad4e6d1/modules/core/src/test/java/org/gridgain/testsuites/GridCacheDataStructuresSelfTestSuite.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/gridgain/testsuites/GridCacheDataStructuresSelfTestSuite.java b/modules/core/src/test/java/org/gridgain/testsuites/GridCacheDataStructuresSelfTestSuite.java
index c7f43b9..9c1ce37 100644
--- a/modules/core/src/test/java/org/gridgain/testsuites/GridCacheDataStructuresSelfTestSuite.java
+++ b/modules/core/src/test/java/org/gridgain/testsuites/GridCacheDataStructuresSelfTestSuite.java
@@ -35,7 +35,7 @@ public class GridCacheDataStructuresSelfTestSuite extends TestSuite {
// suite.addTest(new TestSuite(GridCachePartitionedQueueFailoverDataConsistencySelfTest.class)); // TODO GG-9141
suite.addTest(new TestSuite(GridCachePartitionedAtomicQueueFailoverDataConsistencySelfTest.class));
-// suite.addTest(new TestSuite(GridCacheLocalSequenceApiSelfTest.class)); // TODO GG-9141
+ suite.addTest(new TestSuite(GridCacheLocalSequenceApiSelfTest.class));
suite.addTest(new TestSuite(GridCacheLocalSetSelfTest.class));
suite.addTest(new TestSuite(GridCacheLocalAtomicSetSelfTest.class));
suite.addTest(new TestSuite(GridCacheLocalQueueApiSelfTest.class));
@@ -76,8 +76,8 @@ public class GridCacheDataStructuresSelfTestSuite extends TestSuite {
// TODO: GG-4807 Uncomment when fix
// suite.addTest(new TestSuite(GridCacheQueueMultiNodeConsistencySelfTest.class));
-// suite.addTest(new TestSuite(GridCacheCountDownLatchSelfTest.class)); // TODO GG-9141
-// suite.addTest(new TestSuite(GridCacheAtomicLongApiSelfTest.class)); // TODO GG-9141
+ suite.addTest(new TestSuite(GridCacheCountDownLatchSelfTest.class));
+ suite.addTest(new TestSuite(GridCacheAtomicLongApiSelfTest.class));
suite.addTest(new TestSuite(GridCachePartitionedAtomicSequenceMultiThreadedTest.class));
[05/10] incubator-ignite git commit: GG-9141 - Fixed and enabled test.
Posted by ag...@apache.org.
GG-9141 - Fixed and enabled test.
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/62b9617e
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/62b9617e
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/62b9617e
Branch: refs/heads/ignite-1
Commit: 62b9617e78e420dce512cd126f2c0851d29ae518
Parents: 1c5984f
Author: Alexey Goncharuk <ag...@gridgain.com>
Authored: Sun Dec 14 11:41:03 2014 -0800
Committer: Alexey Goncharuk <ag...@gridgain.com>
Committed: Sun Dec 14 11:41:03 2014 -0800
----------------------------------------------------------------------
.../distributed/near/GridCacheNearMultiNodeSelfTest.java | 9 ++++++---
1 file changed, 6 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/62b9617e/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/near/GridCacheNearMultiNodeSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/near/GridCacheNearMultiNodeSelfTest.java b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/near/GridCacheNearMultiNodeSelfTest.java
index 4a53985..e6d1dff 100644
--- a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/near/GridCacheNearMultiNodeSelfTest.java
+++ b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/near/GridCacheNearMultiNodeSelfTest.java
@@ -12,7 +12,6 @@ package org.gridgain.grid.kernal.processors.cache.distributed.near;
import org.apache.ignite.*;
import org.apache.ignite.cluster.*;
import org.apache.ignite.configuration.*;
-import org.gridgain.grid.*;
import org.gridgain.grid.cache.*;
import org.gridgain.grid.cache.affinity.*;
import org.gridgain.grid.cache.store.*;
@@ -362,7 +361,7 @@ public class GridCacheNearMultiNodeSelfTest extends GridCommonAbstractTest {
* @throws Exception If failed.
*/
@SuppressWarnings({"ConstantConditions"})
- public void _testOptimisticWriteThrough() throws Exception { // TODO GG-9141
+ public void testOptimisticWriteThrough() throws Exception {
GridCache<Integer, String> near = cache(0);
if (transactional()) {
@@ -377,7 +376,11 @@ public class GridCacheNearMultiNodeSelfTest extends GridCommonAbstractTest {
assertEquals("2", near.get(2));
assertEquals("3", near.get(3));
- assertNull(dht(primaryGrid(2)).peek(2));
+ GridDhtCacheEntry<Integer, String> entry = dht(primaryGrid(2)).peekExx(2);
+
+ if (entry != null)
+ assertNull("Unexpected entry: " + entry, entry.rawGetOrUnmarshal(false));
+
assertNotNull(dht(primaryGrid(3)).peek(3));
tx.commit();
[07/10] incubator-ignite git commit: GG-9141 - Enabling passing tests.
Posted by ag...@apache.org.
GG-9141 - Enabling passing 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/ec62ccc3
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/ec62ccc3
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/ec62ccc3
Branch: refs/heads/ignite-1
Commit: ec62ccc38141046544fd8cccfefed1bdd35f4561
Parents: 766e45c
Author: Alexey Goncharuk <ag...@gridgain.com>
Authored: Sun Dec 14 11:46:33 2014 -0800
Committer: Alexey Goncharuk <ag...@gridgain.com>
Committed: Sun Dec 14 11:46:33 2014 -0800
----------------------------------------------------------------------
.../replicated/preloader/GridCacheReplicatedPreloadSelfTest.java | 3 +--
.../processors/cache/eviction/GridCacheEvictionAbstractTest.java | 2 +-
.../cache/eviction/GridCacheEvictionFilterSelfTest.java | 2 +-
.../eviction/random/GridCacheRandomEvictionPolicySelfTest.java | 2 +-
4 files changed, 4 insertions(+), 5 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/ec62ccc3/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/replicated/preloader/GridCacheReplicatedPreloadSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/replicated/preloader/GridCacheReplicatedPreloadSelfTest.java b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/replicated/preloader/GridCacheReplicatedPreloadSelfTest.java
index 29e0044..82a56a3 100644
--- a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/replicated/preloader/GridCacheReplicatedPreloadSelfTest.java
+++ b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/replicated/preloader/GridCacheReplicatedPreloadSelfTest.java
@@ -13,7 +13,6 @@ import org.apache.ignite.*;
import org.apache.ignite.cluster.*;
import org.apache.ignite.configuration.*;
import org.apache.ignite.events.*;
-import org.gridgain.grid.*;
import org.gridgain.grid.cache.*;
import org.gridgain.grid.cache.affinity.*;
import org.apache.ignite.spi.discovery.tcp.*;
@@ -164,7 +163,7 @@ public class GridCacheReplicatedPreloadSelfTest extends GridCommonAbstractTest {
EVT_CACHE_PRELOAD_STARTED, EVT_CACHE_PRELOAD_STOPPED);
if (evts.size() != 2) {
- info("Wrong events collection size (will retry in 1000 ms).");
+ info("Wrong events collection size (will retry in 1000 ms): " + evts.size());
Thread.sleep(1000);
}
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/ec62ccc3/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/eviction/GridCacheEvictionAbstractTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/eviction/GridCacheEvictionAbstractTest.java b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/eviction/GridCacheEvictionAbstractTest.java
index c307bd9..5aa3cc7 100644
--- a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/eviction/GridCacheEvictionAbstractTest.java
+++ b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/eviction/GridCacheEvictionAbstractTest.java
@@ -211,7 +211,7 @@ public abstract class GridCacheEvictionAbstractTest<T extends GridCacheEvictionP
}
/** @throws Exception If failed. */
- public void _testPartitionedNearEnabled() throws Exception { // TODO GG-9141
+ public void testPartitionedNearEnabled() throws Exception {
mode = PARTITIONED;
nearEnabled = true;
nearMax = 3;
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/ec62ccc3/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/eviction/GridCacheEvictionFilterSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/eviction/GridCacheEvictionFilterSelfTest.java b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/eviction/GridCacheEvictionFilterSelfTest.java
index d292d55..b088ecc 100644
--- a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/eviction/GridCacheEvictionFilterSelfTest.java
+++ b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/eviction/GridCacheEvictionFilterSelfTest.java
@@ -98,7 +98,7 @@ public class GridCacheEvictionFilterSelfTest extends GridCommonAbstractTest {
}
/** @throws Exception If failed. */
- public void _testPartitioned() throws Exception { // TODO GG-9141
+ public void testPartitioned() throws Exception {
mode = PARTITIONED;
nearEnabled = true;
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/ec62ccc3/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/eviction/random/GridCacheRandomEvictionPolicySelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/eviction/random/GridCacheRandomEvictionPolicySelfTest.java b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/eviction/random/GridCacheRandomEvictionPolicySelfTest.java
index a90fb8e..b7a2eec 100644
--- a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/eviction/random/GridCacheRandomEvictionPolicySelfTest.java
+++ b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/eviction/random/GridCacheRandomEvictionPolicySelfTest.java
@@ -212,7 +212,7 @@ public class GridCacheRandomEvictionPolicySelfTest extends
}
/** {@inheritDoc} */
- @Override public void _testPartitionedNearEnabled() throws Exception {
+ @Override public void testPartitionedNearEnabled() throws Exception {
// No-op.
}