Repository: incubator-ignite Updated Branches: refs/heads/ignite-26 cd4040d5b -> d89ef5bdf
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/d89ef5bd/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheTestEntryEx.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheTestEntryEx.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheTestEntryEx.java index d1b6ce6..16a22e6 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheTestEntryEx.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheTestEntryEx.java @@ -402,7 +402,7 @@ public class GridCacheTestEntryEx<K, V> extends GridMetadataAwareAdapter impleme } /** @inheritDoc */ - @Override public V innerGet(@Nullable IgniteTxEx<K, V> tx, + @Override public V innerGet(@Nullable IgniteInternalTx<K, V> tx, boolean readSwap, boolean readThrough, boolean failFast, @@ -424,7 +424,7 @@ public class GridCacheTestEntryEx<K, V> extends GridMetadataAwareAdapter impleme } /** @inheritDoc */ - @Override public GridCacheUpdateTxResult<V> innerSet(@Nullable IgniteTxEx<K, V> tx, UUID evtNodeId, UUID affNodeId, + @Override public GridCacheUpdateTxResult<V> innerSet(@Nullable IgniteInternalTx<K, V> tx, UUID evtNodeId, UUID affNodeId, @Nullable V val, @Nullable byte[] valBytes, boolean writeThrough, boolean retval, long ttl, boolean evt, boolean metrics, long topVer, IgnitePredicate<CacheEntry<K, V>>[] filter, GridDrType drType, long drExpireTime, @Nullable GridCacheVersion drVer, UUID subjId, String taskName) throws IgniteCheckedException, @@ -488,7 +488,7 @@ public class GridCacheTestEntryEx<K, V> extends GridMetadataAwareAdapter impleme } /** @inheritDoc */ - @Override public GridCacheUpdateTxResult<V> innerRemove(@Nullable IgniteTxEx<K, V> tx, UUID evtNodeId, + @Override public GridCacheUpdateTxResult<V> innerRemove(@Nullable IgniteInternalTx<K, V> tx, UUID evtNodeId, UUID affNodeId, boolean writeThrough, boolean retval, boolean evt, boolean metrics, long topVer, IgnitePredicate<CacheEntry<K, V>>[] filter, GridDrType drType, @Nullable GridCacheVersion drVer, UUID subjId, String taskName) @@ -515,12 +515,12 @@ public class GridCacheTestEntryEx<K, V> extends GridMetadataAwareAdapter impleme } /** @inheritDoc */ - @Override public boolean tmLock(IgniteTxEx<K, V> tx, long timeout) { + @Override public boolean tmLock(IgniteInternalTx<K, V> tx, long timeout) { assert false; return false; } /** @inheritDoc */ - @Override public void txUnlock(IgniteTxEx<K, V> tx) { + @Override public void txUnlock(IgniteInternalTx<K, V> tx) { assert false; } @@ -592,7 +592,7 @@ public class GridCacheTestEntryEx<K, V> extends GridMetadataAwareAdapter impleme /** @inheritDoc */ @Override public GridTuple<V> peek0(boolean failFast, GridCachePeekMode mode, - IgnitePredicate<CacheEntry<K, V>>[] filter, IgniteTxEx<K, V> tx) + IgnitePredicate<CacheEntry<K, V>>[] filter, IgniteInternalTx<K, V> tx) throws GridCacheEntryRemovedException, GridCacheFilterFailedException, IgniteCheckedException { return F.t(val); } http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/d89ef5bd/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheTestStore.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheTestStore.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheTestStore.java index c8d20e7..d6784b9 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheTestStore.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheTestStore.java @@ -329,7 +329,7 @@ public final class GridCacheTestStore extends CacheStore<Integer, String> { assertTrue("Unexpected tx class: " + tx.getClass(), tx instanceof IgniteTxProxy); - IgniteTxEx tx0 = GridTestUtils.getFieldValue(tx, "tx"); + IgniteInternalTx tx0 = GridTestUtils.getFieldValue(tx, "tx"); if (!tx0.local()) throw new IgniteException("Tx is not local: " + tx); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/d89ef5bd/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/IgniteTxOriginatingNodeFailureAbstractSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/IgniteTxOriginatingNodeFailureAbstractSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/IgniteTxOriginatingNodeFailureAbstractSelfTest.java index 14a5c5c..ca47cef 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/IgniteTxOriginatingNodeFailureAbstractSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/IgniteTxOriginatingNodeFailureAbstractSelfTest.java @@ -157,7 +157,7 @@ public abstract class IgniteTxOriginatingNodeFailureAbstractSelfTest extends Gri IgniteTxProxyImpl tx = (IgniteTxProxyImpl)cache.txStart(); - IgniteTxEx txEx = GridTestUtils.getFieldValue(tx, "tx"); + IgniteInternalTx txEx = GridTestUtils.getFieldValue(tx, "tx"); cache.putAll(map); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/d89ef5bd/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCacheNearTxMultiNodeSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCacheNearTxMultiNodeSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCacheNearTxMultiNodeSelfTest.java index fe06d27..c1d67ce 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCacheNearTxMultiNodeSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCacheNearTxMultiNodeSelfTest.java @@ -235,12 +235,12 @@ public class GridCacheNearTxMultiNodeSelfTest extends GridCommonAbstractTest { */ @SuppressWarnings( {"unchecked"}) private void checkTm(Ignite g, IgniteTxManager tm) { - Collection<IgniteTxEx> txs = tm.txs(); + Collection<IgniteInternalTx> txs = tm.txs(); info(">>> Number of transactions in the set [size=" + txs.size() + ", nodeId=" + g.cluster().localNode().id() + ']'); - for (IgniteTxEx tx : txs) + for (IgniteInternalTx tx : txs) assert tx.done() : "Transaction is not finished: " + tx; } } http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/d89ef5bd/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCachePartitionedTxSalvageSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCachePartitionedTxSalvageSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCachePartitionedTxSalvageSelfTest.java index 590568e..a5c384f 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCachePartitionedTxSalvageSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCachePartitionedTxSalvageSelfTest.java @@ -141,7 +141,7 @@ public class GridCachePartitionedTxSalvageSelfTest extends GridCommonAbstractTes * * @param mode Transaction mode (PESSIMISTIC, OPTIMISTIC). * @param prepare Whether to preapre transaction state - * (i.e. call {@link IgniteTxEx#prepare()}). + * (i.e. call {@link org.apache.ignite.internal.processors.cache.transactions.IgniteInternalTx#prepare()}). * @throws Exception If failed. */ private void checkSalvageAfterTimeout(IgniteTxConcurrency mode, boolean prepare) throws Exception { @@ -160,7 +160,7 @@ public class GridCachePartitionedTxSalvageSelfTest extends GridCommonAbstractTes * * @param mode Transaction mode (PESSIMISTIC, OPTIMISTIC). * @param prepare Whether to preapre transaction state - * (i.e. call {@link IgniteTxEx#prepare()}). + * (i.e. call {@link org.apache.ignite.internal.processors.cache.transactions.IgniteInternalTx#prepare()}). * @throws Exception If failed. */ private void checkSalvageBeforeTimeout(IgniteTxConcurrency mode, boolean prepare) throws Exception { @@ -187,7 +187,7 @@ public class GridCachePartitionedTxSalvageSelfTest extends GridCommonAbstractTes * * @param mode Transaction mode (PESSIMISTIC, OPTIMISTIC). * @param prepare Whether to preapre transaction state - * (i.e. call {@link IgniteTxEx#prepare()}). + * (i.e. call {@link org.apache.ignite.internal.processors.cache.transactions.IgniteInternalTx#prepare()}). * @throws Exception If failed. */ private void startTxAndPutKeys(final IgniteTxConcurrency mode, final boolean prepare) throws Exception { @@ -207,7 +207,7 @@ public class GridCachePartitionedTxSalvageSelfTest extends GridCommonAbstractTes // Unproxy. if (prepare) - U.<IgniteTxEx>field(tx, "tx").prepare(); + U.<IgniteInternalTx>field(tx, "tx").prepare(); } catch (IgniteCheckedException e) { info("Failed to put keys to cache: " + e.getMessage()); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/d89ef5bd/modules/core/src/test/java/org/apache/ignite/internal/processors/fs/GridGgfsDataManagerSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/fs/GridGgfsDataManagerSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/fs/GridGgfsDataManagerSelfTest.java index 92d18ab..544d2f5 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/fs/GridGgfsDataManagerSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/fs/GridGgfsDataManagerSelfTest.java @@ -191,7 +191,7 @@ public class GridGgfsDataManagerSelfTest extends GridGgfsCommonAbstractTest { for (int j = 0; j < NODES_CNT; j++) { GridCacheContext<Object, Object> ctx = GridTestUtils.getFieldValue(grid(j).cachex(DATA_CACHE_NAME), "ctx"); - Collection<IgniteTxEx<Object, Object>> txs = ctx.tm().txs(); + Collection<IgniteInternalTx<Object, Object>> txs = ctx.tm().txs(); assert txs.isEmpty() : "Incomplete transactions: " + txs; } @@ -279,7 +279,7 @@ public class GridGgfsDataManagerSelfTest extends GridGgfsCommonAbstractTest { for (int j = 0; j < NODES_CNT; j++) { GridCacheContext<Object, Object> ctx = GridTestUtils.getFieldValue(grid(j).cachex(DATA_CACHE_NAME), "ctx"); - Collection<IgniteTxEx<Object, Object>> txs = ctx.tm().txs(); + Collection<IgniteInternalTx<Object, Object>> txs = ctx.tm().txs(); assert txs.isEmpty() : "Incomplete transactions: " + txs; } @@ -359,7 +359,7 @@ public class GridGgfsDataManagerSelfTest extends GridGgfsCommonAbstractTest { for (int j = 0; j < NODES_CNT; j++) { GridCacheContext<Object, Object> ctx = GridTestUtils.getFieldValue(grid(j).cachex(DATA_CACHE_NAME), "ctx"); - Collection<IgniteTxEx<Object, Object>> txs = ctx.tm().txs(); + Collection<IgniteInternalTx<Object, Object>> txs = ctx.tm().txs(); assert txs.isEmpty() : "Incomplete transactions: " + txs; } http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/d89ef5bd/modules/core/src/test/java/org/apache/ignite/loadtests/hashmap/GridHashMapLoadTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/loadtests/hashmap/GridHashMapLoadTest.java b/modules/core/src/test/java/org/apache/ignite/loadtests/hashmap/GridHashMapLoadTest.java index 8e6efd7..5f7b826 100644 --- a/modules/core/src/test/java/org/apache/ignite/loadtests/hashmap/GridHashMapLoadTest.java +++ b/modules/core/src/test/java/org/apache/ignite/loadtests/hashmap/GridHashMapLoadTest.java @@ -81,11 +81,11 @@ public class GridHashMapLoadTest extends GridCommonAbstractTest { map.put(key, new GridCacheMapEntry<Integer, Integer>(ctx, key, key.hashCode(), val, null, 0, 1) { - @Override public boolean tmLock(IgniteTxEx<Integer, Integer> tx, long timeout) { + @Override public boolean tmLock(IgniteInternalTx<Integer, Integer> tx, long timeout) { return false; } - @Override public void txUnlock(IgniteTxEx<Integer, Integer> tx) { + @Override public void txUnlock(IgniteInternalTx<Integer, Integer> tx) { // No-op. } http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/d89ef5bd/modules/hadoop/src/test/java/org/apache/ignite/internal/processors/hadoop/GridHadoopDefaultMapReducePlannerSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/hadoop/src/test/java/org/apache/ignite/internal/processors/hadoop/GridHadoopDefaultMapReducePlannerSelfTest.java b/modules/hadoop/src/test/java/org/apache/ignite/internal/processors/hadoop/GridHadoopDefaultMapReducePlannerSelfTest.java index 98f86bd..ddc9a56 100644 --- a/modules/hadoop/src/test/java/org/apache/ignite/internal/processors/hadoop/GridHadoopDefaultMapReducePlannerSelfTest.java +++ b/modules/hadoop/src/test/java/org/apache/ignite/internal/processors/hadoop/GridHadoopDefaultMapReducePlannerSelfTest.java @@ -1188,7 +1188,7 @@ public class GridHadoopDefaultMapReducePlannerSelfTest extends GridHadoopAbstrac } /** {@inheritDoc} */ - @Override public ClusterMetrics metrics() throws IgniteCheckedException { + @Override public ClusterMetrics metrics() { return null; } http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/d89ef5bd/modules/jta/src/main/java/org/apache/ignite/internal/processors/cache/jta/CacheJtaManager.java ---------------------------------------------------------------------- diff --git a/modules/jta/src/main/java/org/apache/ignite/internal/processors/cache/jta/CacheJtaManager.java b/modules/jta/src/main/java/org/apache/ignite/internal/processors/cache/jta/CacheJtaManager.java index 52cf253..02ad658 100644 --- a/modules/jta/src/main/java/org/apache/ignite/internal/processors/cache/jta/CacheJtaManager.java +++ b/modules/jta/src/main/java/org/apache/ignite/internal/processors/cache/jta/CacheJtaManager.java @@ -21,7 +21,6 @@ import org.apache.ignite.*; import org.apache.ignite.cache.*; import org.apache.ignite.cache.jta.*; import org.apache.ignite.configuration.*; -import org.apache.ignite.transactions.*; import org.apache.ignite.internal.processors.cache.transactions.*; import org.jetbrains.annotations.*; @@ -73,7 +72,7 @@ public class CacheJtaManager<K, V> extends CacheJtaManagerAdapter<K, V> { Transaction jtaTx = jtaTm.getTransaction(); if (jtaTx != null) { - IgniteTxEx tx = cctx.tm().userTx(); + IgniteInternalTx tx = cctx.tm().userTx(); if (tx == null) { TransactionsConfiguration tCfg = cctx.kernalContext().config() @@ -94,7 +93,7 @@ public class CacheJtaManager<K, V> extends CacheJtaManagerAdapter<K, V> { ); } - rsrc = new GridCacheXAResource((IgniteTxEx)tx, cctx); + rsrc = new GridCacheXAResource((IgniteInternalTx)tx, cctx); if (!jtaTx.enlistResource(rsrc)) throw new IgniteCheckedException("Failed to enlist XA resource to JTA user transaction."); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/d89ef5bd/modules/jta/src/main/java/org/apache/ignite/internal/processors/cache/jta/GridCacheXAResource.java ---------------------------------------------------------------------- diff --git a/modules/jta/src/main/java/org/apache/ignite/internal/processors/cache/jta/GridCacheXAResource.java b/modules/jta/src/main/java/org/apache/ignite/internal/processors/cache/jta/GridCacheXAResource.java index 1c15582..f98197f 100644 --- a/modules/jta/src/main/java/org/apache/ignite/internal/processors/cache/jta/GridCacheXAResource.java +++ b/modules/jta/src/main/java/org/apache/ignite/internal/processors/cache/jta/GridCacheXAResource.java @@ -42,7 +42,7 @@ public final class GridCacheXAResource implements XAResource { private GridCacheContext cctx; /** Cache transaction. */ - private IgniteTxEx cacheTx; + private IgniteInternalTx cacheTx; /** */ private IgniteLogger log; @@ -54,7 +54,7 @@ public final class GridCacheXAResource implements XAResource { * @param cacheTx Cache jta. * @param cctx Cache context. */ - public GridCacheXAResource(IgniteTxEx cacheTx, GridCacheContext cctx) { + public GridCacheXAResource(IgniteInternalTx cacheTx, GridCacheContext cctx) { assert cacheTx != null; assert cctx != null;
