You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ignite.apache.org by sb...@apache.org on 2014/12/22 11:42:10 UTC
[08/50] [abbrv] incubator-ignite git commit: GG-9141 - Renaming
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/3008d2ad/modules/core/src/test/java/org/gridgain/loadtests/dsi/GridDsiPerfJob.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/gridgain/loadtests/dsi/GridDsiPerfJob.java b/modules/core/src/test/java/org/gridgain/loadtests/dsi/GridDsiPerfJob.java
index 223ebab..2485a14 100644
--- a/modules/core/src/test/java/org/gridgain/loadtests/dsi/GridDsiPerfJob.java
+++ b/modules/core/src/test/java/org/gridgain/loadtests/dsi/GridDsiPerfJob.java
@@ -250,7 +250,7 @@ public class GridDsiPerfJob extends ComputeJobAdapter {
ses = new GridDsiSession(terminalId);
try {
- try (GridCacheTx tx = cache.txStart()) {
+ try (IgniteTx tx = cache.txStart()) {
GridDsiRequest req = new GridDsiRequest(getId());
req.setMessageId(getId());
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/3008d2ad/modules/core/src/test/java/org/gridgain/loadtests/swap/GridSwapEvictAllBenchmark.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/gridgain/loadtests/swap/GridSwapEvictAllBenchmark.java b/modules/core/src/test/java/org/gridgain/loadtests/swap/GridSwapEvictAllBenchmark.java
index f87bea0..fe2bdac 100644
--- a/modules/core/src/test/java/org/gridgain/loadtests/swap/GridSwapEvictAllBenchmark.java
+++ b/modules/core/src/test/java/org/gridgain/loadtests/swap/GridSwapEvictAllBenchmark.java
@@ -55,7 +55,7 @@ public class GridSwapEvictAllBenchmark {
String outputFileName = args.length > 0 ? args[0] : null;
Ignite g = start(new GridCacheStoreAdapter<Long, String>() {
- @Nullable @Override public String load(@Nullable GridCacheTx tx, Long key) {
+ @Nullable @Override public String load(@Nullable IgniteTx tx, Long key) {
return null;
}
@@ -65,12 +65,12 @@ public class GridSwapEvictAllBenchmark {
c.apply((long)i, String.valueOf(i));
}
- @Override public void put(@Nullable GridCacheTx tx, Long key,
+ @Override public void put(@Nullable IgniteTx tx, Long key,
@Nullable String val) {
assert false;
}
- @Override public void remove(@Nullable GridCacheTx tx, Long key) {
+ @Override public void remove(@Nullable IgniteTx tx, Long key) {
assert false;
}
});
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/3008d2ad/modules/core/src/test/java/org/gridgain/testframework/junits/cache/GridAbstractCacheStoreSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/gridgain/testframework/junits/cache/GridAbstractCacheStoreSelfTest.java b/modules/core/src/test/java/org/gridgain/testframework/junits/cache/GridAbstractCacheStoreSelfTest.java
index 7b789ea..78f678c 100644
--- a/modules/core/src/test/java/org/gridgain/testframework/junits/cache/GridAbstractCacheStoreSelfTest.java
+++ b/modules/core/src/test/java/org/gridgain/testframework/junits/cache/GridAbstractCacheStoreSelfTest.java
@@ -48,7 +48,7 @@ public abstract class GridAbstractCacheStoreSelfTest<T extends GridCacheStore<Ob
*/
public void testStore() throws Exception {
// Create dummy transaction
- GridCacheTx tx = new DummyTx();
+ IgniteTx tx = new DummyTx();
store.put(tx, "k1", "v1");
store.put(tx, "k2", "v2");
@@ -72,7 +72,7 @@ public abstract class GridAbstractCacheStoreSelfTest<T extends GridCacheStore<Ob
* @throws IgniteCheckedException if failed.
*/
public void testRollback() throws IgniteCheckedException {
- GridCacheTx tx = new DummyTx();
+ IgniteTx tx = new DummyTx();
// Put.
store.put(tx, "k1", "v1");
@@ -157,7 +157,7 @@ public abstract class GridAbstractCacheStoreSelfTest<T extends GridCacheStore<Ob
* @param commit Commit.
* @throws IgniteCheckedException If failed.
*/
- private void doTestAllOps(@Nullable GridCacheTx tx, boolean commit) throws IgniteCheckedException {
+ private void doTestAllOps(@Nullable IgniteTx tx, boolean commit) throws IgniteCheckedException {
try {
store.put(tx, "key1", "val1");
@@ -251,7 +251,7 @@ public abstract class GridAbstractCacheStoreSelfTest<T extends GridCacheStore<Ob
@Override
public Object call() throws Exception {
for (int i = 0; i < 1000; i++) {
- GridCacheTx tx = rnd.nextBoolean() ? new DummyTx() : null;
+ IgniteTx tx = rnd.nextBoolean() ? new DummyTx() : null;
int op = rnd.nextInt(10);
@@ -403,7 +403,7 @@ public abstract class GridAbstractCacheStoreSelfTest<T extends GridCacheStore<Ob
/**
* Dummy transaction for test purposes.
*/
- public static class DummyTx extends GridMetadataAwareAdapter implements GridCacheTx {
+ public static class DummyTx extends GridMetadataAwareAdapter implements IgniteTx {
/** */
private final IgniteUuid xid = IgniteUuid.randomUuid();
@@ -483,7 +483,7 @@ public abstract class GridAbstractCacheStoreSelfTest<T extends GridCacheStore<Ob
}
/** {@inheritDoc} */
- @Nullable @Override public IgniteFuture<GridCacheTx> commitAsync() {
+ @Nullable @Override public IgniteFuture<IgniteTx> commitAsync() {
return null;
}
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/3008d2ad/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 83b812e..1eb6d7e 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
@@ -248,8 +248,8 @@ public class GridDataGridTestSuite extends TestSuite {
// TODO: GG-7434
// suite.addTestSuite(GridReplicatedTxPreloadTest.class);
- suite.addTestSuite(GridCacheTxReentryNearSelfTest.class);
- suite.addTestSuite(GridCacheTxReentryColocatedSelfTest.class);
+ suite.addTestSuite(IgniteTxReentryNearSelfTest.class);
+ suite.addTestSuite(IgniteTxReentryColocatedSelfTest.class);
suite.addTestSuite(GridCacheOrderedPreloadingSelfTest.class);
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/3008d2ad/modules/hibernate/src/main/java/org/gridgain/grid/cache/hibernate/GridHibernateReadWriteAccessStrategy.java
----------------------------------------------------------------------
diff --git a/modules/hibernate/src/main/java/org/gridgain/grid/cache/hibernate/GridHibernateReadWriteAccessStrategy.java b/modules/hibernate/src/main/java/org/gridgain/grid/cache/hibernate/GridHibernateReadWriteAccessStrategy.java
index 086803f..2a764d0 100644
--- a/modules/hibernate/src/main/java/org/gridgain/grid/cache/hibernate/GridHibernateReadWriteAccessStrategy.java
+++ b/modules/hibernate/src/main/java/org/gridgain/grid/cache/hibernate/GridHibernateReadWriteAccessStrategy.java
@@ -195,7 +195,7 @@ public class GridHibernateReadWriteAccessStrategy extends GridHibernateAccessStr
if (ctx.unlocked(key)) { // Finish transaction if last key is unlocked.
txCtx.remove();
- GridCacheTx tx = cache.tx();
+ IgniteTx tx = cache.tx();
assert tx != null;
@@ -220,7 +220,7 @@ public class GridHibernateReadWriteAccessStrategy extends GridHibernateAccessStr
if (ctx != null) {
txCtx.remove();
- GridCacheTx tx = cache.tx();
+ IgniteTx tx = cache.tx();
if (tx != null)
tx.rollback();
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/3008d2ad/modules/hibernate/src/main/java/org/gridgain/grid/cache/store/hibernate/GridCacheHibernateBlobStore.java
----------------------------------------------------------------------
diff --git a/modules/hibernate/src/main/java/org/gridgain/grid/cache/store/hibernate/GridCacheHibernateBlobStore.java b/modules/hibernate/src/main/java/org/gridgain/grid/cache/store/hibernate/GridCacheHibernateBlobStore.java
index 49c716a..4d3d5e2 100644
--- a/modules/hibernate/src/main/java/org/gridgain/grid/cache/store/hibernate/GridCacheHibernateBlobStore.java
+++ b/modules/hibernate/src/main/java/org/gridgain/grid/cache/store/hibernate/GridCacheHibernateBlobStore.java
@@ -184,7 +184,7 @@ public class GridCacheHibernateBlobStore<K, V> extends GridCacheStoreAdapter<K,
/** {@inheritDoc} */
@SuppressWarnings({"unchecked", "RedundantTypeArguments"})
- @Override public V load(@Nullable GridCacheTx tx, K key) throws IgniteCheckedException {
+ @Override public V load(@Nullable IgniteTx tx, K key) throws IgniteCheckedException {
init();
if (log.isDebugEnabled())
@@ -212,7 +212,7 @@ public class GridCacheHibernateBlobStore<K, V> extends GridCacheStoreAdapter<K,
}
/** {@inheritDoc} */
- @Override public void put(@Nullable GridCacheTx tx, K key, @Nullable V val)
+ @Override public void put(@Nullable IgniteTx tx, K key, @Nullable V val)
throws IgniteCheckedException {
init();
@@ -244,7 +244,7 @@ public class GridCacheHibernateBlobStore<K, V> extends GridCacheStoreAdapter<K,
/** {@inheritDoc} */
@SuppressWarnings({"JpaQueryApiInspection", "JpaQlInspection"})
- @Override public void remove(@Nullable GridCacheTx tx, K key) throws IgniteCheckedException {
+ @Override public void remove(@Nullable IgniteTx tx, K key) throws IgniteCheckedException {
init();
if (log.isDebugEnabled())
@@ -274,7 +274,7 @@ public class GridCacheHibernateBlobStore<K, V> extends GridCacheStoreAdapter<K,
* @param ses Hibernate session.
* @param tx Cache ongoing transaction.
*/
- private void rollback(SharedSessionContract ses, GridCacheTx tx) {
+ private void rollback(SharedSessionContract ses, IgniteTx tx) {
// Rollback only if there is no cache transaction,
// otherwise txEnd() will do all required work.
if (tx == null) {
@@ -291,7 +291,7 @@ public class GridCacheHibernateBlobStore<K, V> extends GridCacheStoreAdapter<K,
* @param ses Hibernate session.
* @param tx Cache ongoing transaction.
*/
- private void end(Session ses, GridCacheTx tx) {
+ private void end(Session ses, IgniteTx tx) {
// Commit only if there is no cache transaction,
// otherwise txEnd() will do all required work.
if (tx == null) {
@@ -305,7 +305,7 @@ public class GridCacheHibernateBlobStore<K, V> extends GridCacheStoreAdapter<K,
}
/** {@inheritDoc} */
- @Override public void txEnd(GridCacheTx tx, boolean commit) throws IgniteCheckedException {
+ @Override public void txEnd(IgniteTx tx, boolean commit) throws IgniteCheckedException {
init();
Session ses = tx.removeMeta(ATTR_SES);
@@ -343,7 +343,7 @@ public class GridCacheHibernateBlobStore<K, V> extends GridCacheStoreAdapter<K,
* @param tx Cache transaction.
* @return Session.
*/
- Session session(@Nullable GridCacheTx tx) {
+ Session session(@Nullable IgniteTx tx) {
Session ses;
if (tx != null) {
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/3008d2ad/modules/indexing/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheAbstractQuerySelfTest.java
----------------------------------------------------------------------
diff --git a/modules/indexing/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheAbstractQuerySelfTest.java b/modules/indexing/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheAbstractQuerySelfTest.java
index 48c1db4..8473050 100644
--- a/modules/indexing/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheAbstractQuerySelfTest.java
+++ b/modules/indexing/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheAbstractQuerySelfTest.java
@@ -2002,19 +2002,19 @@ public abstract class GridCacheAbstractQuerySelfTest extends GridCommonAbstractT
}
/** {@inheritDoc} */
- @Override public Object load(@Nullable GridCacheTx tx, Object key)
+ @Override public Object load(@Nullable IgniteTx tx, Object key)
throws IgniteCheckedException {
return map.get(key);
}
/** {@inheritDoc} */
- @Override public void put(GridCacheTx tx, Object key, @Nullable Object val)
+ @Override public void put(IgniteTx tx, Object key, @Nullable Object val)
throws IgniteCheckedException {
map.put(key, val);
}
/** {@inheritDoc} */
- @Override public void remove(GridCacheTx tx, Object key) throws IgniteCheckedException {
+ @Override public void remove(IgniteTx tx, Object key) throws IgniteCheckedException {
map.remove(key);
}
}
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/3008d2ad/modules/indexing/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheQueryLoadSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/indexing/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheQueryLoadSelfTest.java b/modules/indexing/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheQueryLoadSelfTest.java
index 5c22a0b..1287e05 100644
--- a/modules/indexing/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheQueryLoadSelfTest.java
+++ b/modules/indexing/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheQueryLoadSelfTest.java
@@ -393,7 +393,7 @@ public class GridCacheQueryLoadSelfTest extends GridCommonAbstractTest {
}
/** {@inheritDoc} */
- @Override public ValueObject load(@Nullable GridCacheTx tx,
+ @Override public ValueObject load(@Nullable IgniteTx tx,
Integer key) throws IgniteCheckedException {
assert key != null;
@@ -401,7 +401,7 @@ public class GridCacheQueryLoadSelfTest extends GridCommonAbstractTest {
}
/** {@inheritDoc} */
- @Override public void put(@Nullable GridCacheTx tx,
+ @Override public void put(@Nullable IgniteTx tx,
Integer key, ValueObject val) throws IgniteCheckedException {
assert key != null;
assert val != null;
@@ -410,7 +410,7 @@ public class GridCacheQueryLoadSelfTest extends GridCommonAbstractTest {
}
/** {@inheritDoc} */
- @Override public void remove(@Nullable GridCacheTx tx,
+ @Override public void remove(@Nullable IgniteTx tx,
Integer key) throws IgniteCheckedException {
assert key != null;
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/3008d2ad/modules/indexing/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/replicated/GridCacheReplicatedQuerySelfTest.java
----------------------------------------------------------------------
diff --git a/modules/indexing/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/replicated/GridCacheReplicatedQuerySelfTest.java b/modules/indexing/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/replicated/GridCacheReplicatedQuerySelfTest.java
index 4953e37..81374da 100644
--- a/modules/indexing/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/replicated/GridCacheReplicatedQuerySelfTest.java
+++ b/modules/indexing/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/replicated/GridCacheReplicatedQuerySelfTest.java
@@ -140,7 +140,7 @@ public class GridCacheReplicatedQuerySelfTest extends GridCacheAbstractQuerySelf
public void testLocalQuery() throws Exception {
cache1.clearAll();
- GridCacheTx tx = cache1.txStart();
+ IgniteTx tx = cache1.txStart();
try {
cache1.put(new CacheKey(1), new CacheValue("1"));
@@ -182,7 +182,7 @@ public class GridCacheReplicatedQuerySelfTest extends GridCacheAbstractQuerySelf
ignite2.events().localListen(lsnr, IgniteEventType.EVT_CACHE_OBJECT_PUT);
ignite3.events().localListen(lsnr, IgniteEventType.EVT_CACHE_OBJECT_PUT);
- GridCacheTx tx = cache1.txStart();
+ IgniteTx tx = cache1.txStart();
try {
for (int i = 1; i <= keyCnt; i++)
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/3008d2ad/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 01916e5..f944b38 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
@@ -59,7 +59,7 @@ public class GridCacheJtaManager<K, V> extends GridCacheJtaManagerAdapter<K, V>
Transaction jtaTx = jtaTm.getTransaction();
if (jtaTx != null) {
- GridCacheTx tx = cctx.tm().userTx();
+ IgniteTx tx = cctx.tm().userTx();
if (tx == null) {
TransactionsConfiguration tCfg = cctx.kernalContext().config()
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/3008d2ad/modules/jta/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheJtaSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/jta/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheJtaSelfTest.java b/modules/jta/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheJtaSelfTest.java
index 50cee54..91805b9 100644
--- a/modules/jta/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheJtaSelfTest.java
+++ b/modules/jta/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheJtaSelfTest.java
@@ -107,7 +107,7 @@ public class GridCacheJtaSelfTest extends GridCacheAbstractSelfTest {
assert cache().put("key", 1) == null;
- GridCacheTx tx = cache().tx();
+ IgniteTx tx = cache().tx();
assert tx != null;
assert tx.state() == ACTIVE;
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/3008d2ad/modules/web/src/main/java/org/gridgain/grid/cache/websession/GridWebSessionFilter.java
----------------------------------------------------------------------
diff --git a/modules/web/src/main/java/org/gridgain/grid/cache/websession/GridWebSessionFilter.java b/modules/web/src/main/java/org/gridgain/grid/cache/websession/GridWebSessionFilter.java
index 7802388..8cf66a9 100644
--- a/modules/web/src/main/java/org/gridgain/grid/cache/websession/GridWebSessionFilter.java
+++ b/modules/web/src/main/java/org/gridgain/grid/cache/websession/GridWebSessionFilter.java
@@ -271,7 +271,7 @@ public class GridWebSessionFilter implements Filter {
try {
if (txEnabled) {
- try (GridCacheTx tx = cache.txStart(PESSIMISTIC, REPEATABLE_READ)) {
+ try (IgniteTx tx = cache.txStart(PESSIMISTIC, REPEATABLE_READ)) {
sesId = doFilter0(httpReq, res, chain);
tx.commit();