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:19 UTC
[17/50] [abbrv] incubator-ignite git commit: GG-9141 - Renaming
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/3008d2ad/modules/core/src/main/java/org/gridgain/grid/cache/GridCacheProjection.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/gridgain/grid/cache/GridCacheProjection.java b/modules/core/src/main/java/org/gridgain/grid/cache/GridCacheProjection.java
index ada5eea..fb93ad9 100644
--- a/modules/core/src/main/java/org/gridgain/grid/cache/GridCacheProjection.java
+++ b/modules/core/src/main/java/org/gridgain/grid/cache/GridCacheProjection.java
@@ -86,7 +86,7 @@ import java.util.concurrent.*;
* </li>
* <li>
* Various {@code 'txStart(..)'} methods to perform various cache
- * operations within a transaction (see {@link GridCacheTx} for more information).
+ * operations within a transaction (see {@link IgniteTx} for more information).
* </li>
* <li>
* {@link #queries()} method to get an instance of {@link GridCacheQueries} service for working
@@ -115,7 +115,7 @@ import java.util.concurrent.*;
* and {@code 'remove(..)'} operations are transactional and will participate in an ongoing transaction,
* if any. Other methods like {@code 'peek(..)'} or various {@code 'contains(..)'} methods may
* be transaction-aware, i.e. check in-transaction entries first, but will not affect the current
- * state of transaction. See {@link GridCacheTx} documentation for more information
+ * state of transaction. See {@link IgniteTx} documentation for more information
* about transactions.
* <h1 class="header">Group Locking</h1>
* <i>Group Locking</i> is a feature where instead of acquiring individual locks, GridGain will lock
@@ -370,7 +370,7 @@ public interface GridCacheProjection<K, V> extends Iterable<GridCacheEntry<K, V>
/**
* Reloads a single key from persistent storage. This method
- * delegates to {@link GridCacheStore#load(GridCacheTx, Object)}
+ * delegates to {@link GridCacheStore#load(IgniteTx, Object)}
* method.
* <h2 class="header">Transactions</h2>
* This method does not participate in transactions, however it does not violate
@@ -384,7 +384,7 @@ public interface GridCacheProjection<K, V> extends Iterable<GridCacheEntry<K, V>
/**
* Asynchronously reloads a single key from persistent storage. This method
- * delegates to {@link GridCacheStore#load(GridCacheTx, Object)}
+ * delegates to {@link GridCacheStore#load(IgniteTx, Object)}
* method.
* <h2 class="header">Transactions</h2>
* This method does not participate in transactions, however it does not violate
@@ -485,7 +485,7 @@ public interface GridCacheProjection<K, V> extends Iterable<GridCacheEntry<K, V>
* If the value is not present in cache, then it will be looked up from swap storage. If
* it's not present in swap, or if swap is disable, and if read-through is allowed, value
* will be loaded from {@link GridCacheStore} persistent storage via
- * {@link GridCacheStore#load(GridCacheTx, Object)} method.
+ * {@link GridCacheStore#load(IgniteTx, Object)} method.
* <h2 class="header">Transactions</h2>
* This method is transactional and will enlist the entry into ongoing transaction
* if there is one.
@@ -510,7 +510,7 @@ public interface GridCacheProjection<K, V> extends Iterable<GridCacheEntry<K, V>
* If the value is not present in cache, then it will be looked up from swap storage. If
* it's not present in swap, or if swap is disabled, and if read-through is allowed, value
* will be loaded from {@link GridCacheStore} persistent storage via
- * {@link GridCacheStore#load(GridCacheTx, Object)} method.
+ * {@link GridCacheStore#load(IgniteTx, Object)} method.
* <h2 class="header">Transactions</h2>
* This method is transactional and will enlist the entry into ongoing transaction
* if there is one.
@@ -534,7 +534,7 @@ public interface GridCacheProjection<K, V> extends Iterable<GridCacheEntry<K, V>
* If some value is not present in cache, then it will be looked up from swap storage. If
* it's not present in swap, or if swap is disabled, and if read-through is allowed, value
* will be loaded from {@link GridCacheStore} persistent storage via
- * {@link GridCacheStore#loadAll(GridCacheTx, Collection, org.apache.ignite.lang.IgniteBiInClosure)} method.
+ * {@link GridCacheStore#loadAll(IgniteTx, Collection, org.apache.ignite.lang.IgniteBiInClosure)} method.
* <h2 class="header">Transactions</h2>
* This method is transactional and will enlist the entry into ongoing transaction
* if there is one.
@@ -558,7 +558,7 @@ public interface GridCacheProjection<K, V> extends Iterable<GridCacheEntry<K, V>
* If some value is not present in cache, then it will be looked up from swap storage. If
* it's not present in swap, or if swap is disabled, and if read-through is allowed, value
* will be loaded from {@link GridCacheStore} persistent storage via
- * {@link GridCacheStore#loadAll(GridCacheTx, Collection, org.apache.ignite.lang.IgniteBiInClosure)} method.
+ * {@link GridCacheStore#loadAll(IgniteTx, Collection, org.apache.ignite.lang.IgniteBiInClosure)} method.
* <h2 class="header">Transactions</h2>
* This method is transactional and will enlist the entry into ongoing transaction
* if there is one.
@@ -580,13 +580,13 @@ public interface GridCacheProjection<K, V> extends Iterable<GridCacheEntry<K, V>
* the value will be loaded from the primary node, which in its turn may load the value
* from the swap storage, and consecutively, if it's not in swap,
* from the underlying persistent storage. If value has to be loaded from persistent
- * storage, {@link GridCacheStore#load(GridCacheTx, Object)} method will be used.
+ * storage, {@link GridCacheStore#load(IgniteTx, Object)} method will be used.
* <p>
* If the returned value is not needed, method {@link #putx(Object, Object, org.apache.ignite.lang.IgnitePredicate[])} should
* always be used instead of this one to avoid the overhead associated with returning of the previous value.
* <p>
* If write-through is enabled, the stored value will be persisted to {@link GridCacheStore}
- * via {@link GridCacheStore#put(GridCacheTx, Object, Object)} method.
+ * via {@link GridCacheStore#put(IgniteTx, Object, Object)} method.
* <h2 class="header">Transactions</h2>
* This method is transactional and will enlist the entry into ongoing transaction
* if there is one.
@@ -619,13 +619,13 @@ public interface GridCacheProjection<K, V> extends Iterable<GridCacheEntry<K, V>
* the value will be loaded from the primary node, which in its turn may load the value
* from the swap storage, and consecutively, if it's not in swap and read-through is allowed,
* from the underlying persistent storage. If value has to be loaded from persistent
- * storage, {@link GridCacheStore#load(GridCacheTx, Object)} method will be used.
+ * storage, {@link GridCacheStore#load(IgniteTx, Object)} method will be used.
* <p>
* If the returned value is not needed, method {@link #putx(Object, Object, org.apache.ignite.lang.IgnitePredicate[])} should
* always be used instead of this one to avoid the overhead associated with returning of the previous value.
* <p>
* If write-through is enabled, the stored value will be persisted to {@link GridCacheStore}
- * via {@link GridCacheStore#put(GridCacheTx, Object, Object)} method.
+ * via {@link GridCacheStore#put(IgniteTx, Object, Object)} method.
* <h2 class="header">Transactions</h2>
* This method is transactional and will enlist the entry into ongoing transaction
* if there is one.
@@ -654,7 +654,7 @@ public interface GridCacheProjection<K, V> extends Iterable<GridCacheEntry<K, V>
* should be used whenever return value is not required.
* <p>
* If write-through is enabled, the stored value will be persisted to {@link GridCacheStore}
- * via {@link GridCacheStore#put(GridCacheTx, Object, Object)} method.
+ * via {@link GridCacheStore#put(IgniteTx, Object, Object)} method.
* <h2 class="header">Transactions</h2>
* This method is transactional and will enlist the entry into ongoing transaction
* if there is one.
@@ -687,7 +687,7 @@ public interface GridCacheProjection<K, V> extends Iterable<GridCacheEntry<K, V>
* should always be used whenever return value is not required.
* <p>
* If write-through is enabled, the stored value will be persisted to {@link GridCacheStore}
- * via {@link GridCacheStore#put(GridCacheTx, Object, Object)} method.
+ * via {@link GridCacheStore#put(IgniteTx, Object, Object)} method.
* <h2 class="header">Transactions</h2>
* This method is transactional and will enlist the entry into ongoing transaction
* if there is one.
@@ -720,7 +720,7 @@ public interface GridCacheProjection<K, V> extends Iterable<GridCacheEntry<K, V>
* transfer the transforming closure that will be applied on each remote node involved in transaction.
* It may add significant performance gain when dealing with large values as the value is much larger
* than the closure itself. If write-through is enabled, the stored value will be persisted to
- * {@link GridCacheStore} via {@link GridCacheStore#put(GridCacheTx, Object, Object)} method.
+ * {@link GridCacheStore} via {@link GridCacheStore#put(IgniteTx, Object, Object)} method.
* <h2 class="header">Transactions</h2>
* This method is transactional and will enlist the entry into ongoing transaction
* if there is one.
@@ -767,7 +767,7 @@ public interface GridCacheProjection<K, V> extends Iterable<GridCacheEntry<K, V>
* that will be applied on each remote node involved in transaction. It may add significant performance
* gain when dealing with large values as the value is much larger than the closure itself.
* If write-through is enabled, the stored value will be persisted to {@link GridCacheStore}
- * via {@link GridCacheStore#put(GridCacheTx, Object, Object)} method.
+ * via {@link GridCacheStore#put(IgniteTx, Object, Object)} method.
* <h2 class="header">Transactions</h2>
* This method is transactional and will enlist the entry into ongoing transaction
* if there is one.
@@ -790,14 +790,14 @@ public interface GridCacheProjection<K, V> extends Iterable<GridCacheEntry<K, V>
* the value will be loaded from the primary node, which in its turn may load the value
* from the swap storage, and consecutively, if it's not in swap,
* from the underlying persistent storage. If value has to be loaded from persistent
- * storage, {@link GridCacheStore#load(GridCacheTx, Object)} method will be used.
+ * storage, {@link GridCacheStore#load(IgniteTx, Object)} method will be used.
* <p>
* If the returned value is not needed, method {@link #putxIfAbsent(Object, Object)} should
* always be used instead of this one to avoid the overhead associated with returning of the
* previous value.
* <p>
* If write-through is enabled, the stored value will be persisted to {@link GridCacheStore}
- * via {@link GridCacheStore#put(GridCacheTx, Object, Object)} method.
+ * via {@link GridCacheStore#put(IgniteTx, Object, Object)} method.
* <h2 class="header">Transactions</h2>
* This method is transactional and will enlist the entry into ongoing transaction
* if there is one.
@@ -821,14 +821,14 @@ public interface GridCacheProjection<K, V> extends Iterable<GridCacheEntry<K, V>
* the value will be loaded from the primary node, which in its turn may load the value
* from the swap storage, and consecutively, if it's not in swap,
* from the underlying persistent storage. If value has to be loaded from persistent
- * storage, {@link GridCacheStore#load(GridCacheTx, Object)} method will be used.
+ * storage, {@link GridCacheStore#load(IgniteTx, Object)} method will be used.
* <p>
* If the returned value is not needed, method {@link #putxIfAbsentAsync(Object, Object)} should
* always be used instead of this one to avoid the overhead associated with returning of the
* previous value.
* <p>
* If write-through is enabled, the stored value will be persisted to {@link GridCacheStore}
- * via {@link GridCacheStore#put(GridCacheTx, Object, Object)} method.
+ * via {@link GridCacheStore#put(IgniteTx, Object, Object)} method.
* <h2 class="header">Transactions</h2>
* This method is transactional and will enlist the entry into ongoing transaction
* if there is one.
@@ -854,7 +854,7 @@ public interface GridCacheProjection<K, V> extends Iterable<GridCacheEntry<K, V>
* should always be used whenever return value is not required.
* <p>
* If write-through is enabled, the stored value will be persisted to {@link GridCacheStore}
- * via {@link GridCacheStore#put(GridCacheTx, Object, Object)} method.
+ * via {@link GridCacheStore#put(IgniteTx, Object, Object)} method.
* <h2 class="header">Transactions</h2>
* This method is transactional and will enlist the entry into ongoing transaction
* if there is one.
@@ -880,7 +880,7 @@ public interface GridCacheProjection<K, V> extends Iterable<GridCacheEntry<K, V>
* should always be used whenever return value is not required.
* <p>
* If write-through is enabled, the stored value will be persisted to {@link GridCacheStore}
- * via {@link GridCacheStore#put(GridCacheTx, Object, Object)} method.
+ * via {@link GridCacheStore#put(IgniteTx, Object, Object)} method.
* <h2 class="header">Transactions</h2>
* This method is transactional and will enlist the entry into ongoing transaction
* if there is one.
@@ -902,14 +902,14 @@ public interface GridCacheProjection<K, V> extends Iterable<GridCacheEntry<K, V>
* the value will be loaded from the primary node, which in its turn may load the value
* from the swap storage, and consecutively, if it's not in swap,
* from the underlying persistent storage. If value has to be loaded from persistent
- * storage, {@link GridCacheStore#load(GridCacheTx, Object)} method will be used.
+ * storage, {@link GridCacheStore#load(IgniteTx, Object)} method will be used.
* <p>
* If the returned value is not needed, method {@link #replacex(Object, Object)} should
* always be used instead of this one to avoid the overhead associated with returning of the
* previous value.
* <p>
* If write-through is enabled, the stored value will be persisted to {@link GridCacheStore}
- * via {@link GridCacheStore#put(GridCacheTx, Object, Object)} method.
+ * via {@link GridCacheStore#put(IgniteTx, Object, Object)} method.
* <h2 class="header">Transactions</h2>
* This method is transactional and will enlist the entry into ongoing transaction
* if there is one.
@@ -932,14 +932,14 @@ public interface GridCacheProjection<K, V> extends Iterable<GridCacheEntry<K, V>
* {@link GridCacheMode#PARTITIONED} caches, the value will be loaded from the primary node,
* which in its turn may load the value from the swap storage, and consecutively, if it's not in swap,
* from the underlying persistent storage. If value has to be loaded from persistent
- * storage, {@link GridCacheStore#load(GridCacheTx, Object)} method will be used.
+ * storage, {@link GridCacheStore#load(IgniteTx, Object)} method will be used.
* <p>
* If the returned value is not needed, method {@link #replacex(Object, Object)} should
* always be used instead of this one to avoid the overhead associated with returning of the
* previous value.
* <p>
* If write-through is enabled, the stored value will be persisted to {@link GridCacheStore}
- * via {@link GridCacheStore#put(GridCacheTx, Object, Object)} method.
+ * via {@link GridCacheStore#put(IgniteTx, Object, Object)} method.
* <h2 class="header">Transactions</h2>
* This method is transactional and will enlist the entry into ongoing transaction
* if there is one.
@@ -964,7 +964,7 @@ public interface GridCacheProjection<K, V> extends Iterable<GridCacheEntry<K, V>
* should always be used whenever return value is not required.
* <p>
* If write-through is enabled, the stored value will be persisted to {@link GridCacheStore}
- * via {@link GridCacheStore#put(GridCacheTx, Object, Object)} method.
+ * via {@link GridCacheStore#put(IgniteTx, Object, Object)} method.
* <h2 class="header">Transactions</h2>
* This method is transactional and will enlist the entry into ongoing transaction
* if there is one.
@@ -990,7 +990,7 @@ public interface GridCacheProjection<K, V> extends Iterable<GridCacheEntry<K, V>
* should always be used whenever return value is not required.
* <p>
* If write-through is enabled, the stored value will be persisted to {@link GridCacheStore}
- * via {@link GridCacheStore#put(GridCacheTx, Object, Object)} method.
+ * via {@link GridCacheStore#put(IgniteTx, Object, Object)} method.
* <h2 class="header">Transactions</h2>
* This method is transactional and will enlist the entry into ongoing transaction
* if there is one.
@@ -1013,7 +1013,7 @@ public interface GridCacheProjection<K, V> extends Iterable<GridCacheEntry<K, V>
* This method will return {@code true} if value is stored in cache and {@code false} otherwise.
* <p>
* If write-through is enabled, the stored value will be persisted to {@link GridCacheStore}
- * via {@link GridCacheStore#put(GridCacheTx, Object, Object)} method.
+ * via {@link GridCacheStore#put(IgniteTx, Object, Object)} method.
* <h2 class="header">Transactions</h2>
* This method is transactional and will enlist the entry into ongoing transaction
* if there is one.
@@ -1038,7 +1038,7 @@ public interface GridCacheProjection<K, V> extends Iterable<GridCacheEntry<K, V>
* This method will return {@code true} if value is stored in cache and {@code false} otherwise.
* <p>
* If write-through is enabled, the stored value will be persisted to {@link GridCacheStore}
- * via {@link GridCacheStore#put(GridCacheTx, Object, Object)} method.
+ * via {@link GridCacheStore#put(IgniteTx, Object, Object)} method.
* <h2 class="header">Transactions</h2>
* This method is transactional and will enlist the entry into ongoing transaction
* if there is one.
@@ -1061,7 +1061,7 @@ public interface GridCacheProjection<K, V> extends Iterable<GridCacheEntry<K, V>
* so value stored in cache is guaranteed to be consistent with the filters.
* <p>
* If write-through is enabled, the stored values will be persisted to {@link GridCacheStore}
- * via {@link GridCacheStore#putAll(GridCacheTx, Map)} method.
+ * via {@link GridCacheStore#putAll(IgniteTx, Map)} method.
* <h2 class="header">Transactions</h2>
* This method is transactional and will enlist the entry into ongoing transaction
* if there is one.
@@ -1091,7 +1091,7 @@ public interface GridCacheProjection<K, V> extends Iterable<GridCacheEntry<K, V>
* that will be applied on each remote node involved in transaction. It may add significant
* performance gain when dealing with large values as the value is much larger than the closure itself.
* If write-through is enabled, the stored value will be persisted to {@link GridCacheStore}
- * via {@link GridCacheStore#put(GridCacheTx, Object, Object)} method.
+ * via {@link GridCacheStore#put(IgniteTx, Object, Object)} method.
* <h2 class="header">Transactions</h2>
* This method is transactional and will enlist the entry into ongoing transaction
* if there is one.
@@ -1117,7 +1117,7 @@ public interface GridCacheProjection<K, V> extends Iterable<GridCacheEntry<K, V>
* that will be applied on each remote node involved in transaction. It may add significant
* performance gain when dealing with large values as the value is much larger than the closure itself.
* If write-through is enabled, the stored value will be persisted to {@link GridCacheStore}
- * via {@link GridCacheStore#put(GridCacheTx, Object, Object)} method.
+ * via {@link GridCacheStore#put(IgniteTx, Object, Object)} method.
* <h2 class="header">Transactions</h2>
* This method is transactional and will enlist the entry into ongoing transaction
* if there is one.
@@ -1138,7 +1138,7 @@ public interface GridCacheProjection<K, V> extends Iterable<GridCacheEntry<K, V>
* so value stored in cache is guaranteed to be consistent with the filters.
* <p>
* If write-through is enabled, the stored values will be persisted to {@link GridCacheStore}
- * via {@link GridCacheStore#putAll(GridCacheTx, Map)} method.
+ * via {@link GridCacheStore#putAll(IgniteTx, Map)} method.
* <h2 class="header">Transactions</h2>
* This method is transactional and will enlist the entry into ongoing transaction
* if there is one.
@@ -1168,7 +1168,7 @@ public interface GridCacheProjection<K, V> extends Iterable<GridCacheEntry<K, V>
* that will be applied on each remote node involved in transaction. It may add significant performance
* gain when dealing with large values as the value is much larger than the closure itself.
* If write-through is enabled, the stored value will be persisted to {@link GridCacheStore}
- * via {@link GridCacheStore#put(GridCacheTx, Object, Object)} method.
+ * via {@link GridCacheStore#put(IgniteTx, Object, Object)} method.
* <h2 class="header">Transactions</h2>
* This method is transactional and will enlist the entry into ongoing transaction
* if there is one.
@@ -1194,7 +1194,7 @@ public interface GridCacheProjection<K, V> extends Iterable<GridCacheEntry<K, V>
* that will be applied on each remote node involved in transaction. It may add significant
* performance gain when dealing with large values as the value is much larger than the closure itself.
* If write-through is enabled, the stored value will be persisted to {@link GridCacheStore}
- * via {@link GridCacheStore#put(GridCacheTx, Object, Object)} method.
+ * via {@link GridCacheStore#put(IgniteTx, Object, Object)} method.
* <h2 class="header">Transactions</h2>
* This method is transactional and will enlist the entry into ongoing transaction
* if there is one.
@@ -1323,7 +1323,7 @@ public interface GridCacheProjection<K, V> extends Iterable<GridCacheEntry<K, V>
* @throws IllegalStateException If transaction is already started by this thread.
* @throws UnsupportedOperationException If cache is {@link GridCacheAtomicityMode#ATOMIC}.
*/
- public GridCacheTx txStart() throws IllegalStateException;
+ public IgniteTx txStart() throws IllegalStateException;
/**
* Starts new transaction with the specified concurrency and isolation.
@@ -1334,7 +1334,7 @@ public interface GridCacheProjection<K, V> extends Iterable<GridCacheEntry<K, V>
* @throws IllegalStateException If transaction is already started by this thread.
* @throws UnsupportedOperationException If cache is {@link GridCacheAtomicityMode#ATOMIC}.
*/
- public GridCacheTx txStart(GridCacheTxConcurrency concurrency, GridCacheTxIsolation isolation);
+ public IgniteTx txStart(GridCacheTxConcurrency concurrency, GridCacheTxIsolation isolation);
/**
* Starts transaction with specified isolation, concurrency, timeout, invalidation flag,
@@ -1348,7 +1348,7 @@ public interface GridCacheProjection<K, V> extends Iterable<GridCacheEntry<K, V>
* @throws IllegalStateException If transaction is already started by this thread.
* @throws UnsupportedOperationException If cache is {@link GridCacheAtomicityMode#ATOMIC}.
*/
- public GridCacheTx txStart(GridCacheTxConcurrency concurrency, GridCacheTxIsolation isolation, long timeout,
+ public IgniteTx txStart(GridCacheTxConcurrency concurrency, GridCacheTxIsolation isolation, long timeout,
int txSize);
/**
@@ -1384,7 +1384,7 @@ public interface GridCacheProjection<K, V> extends Iterable<GridCacheEntry<K, V>
* @throws IgniteCheckedException If local node is not primary for any of provided keys.
* @throws UnsupportedOperationException If cache is {@link GridCacheAtomicityMode#ATOMIC}.
*/
- public GridCacheTx txStartAffinity(Object affinityKey, GridCacheTxConcurrency concurrency,
+ public IgniteTx txStartAffinity(Object affinityKey, GridCacheTxConcurrency concurrency,
GridCacheTxIsolation isolation, long timeout, int txSize) throws IllegalStateException, IgniteCheckedException;
/**
@@ -1420,7 +1420,7 @@ public interface GridCacheProjection<K, V> extends Iterable<GridCacheEntry<K, V>
* @throws IgniteCheckedException If local node is not primary for any of provided keys.
* @throws UnsupportedOperationException If cache is {@link GridCacheAtomicityMode#ATOMIC}.
*/
- public GridCacheTx txStartPartition(int partId, GridCacheTxConcurrency concurrency,
+ public IgniteTx txStartPartition(int partId, GridCacheTxConcurrency concurrency,
GridCacheTxIsolation isolation, long timeout, int txSize) throws IllegalStateException, IgniteCheckedException;
/**
@@ -1430,7 +1430,7 @@ public interface GridCacheProjection<K, V> extends Iterable<GridCacheEntry<K, V>
* @return Transaction started by this thread or {@code null} if this thread
* does not have a transaction.
*/
- @Nullable public GridCacheTx tx();
+ @Nullable public IgniteTx tx();
/**
* Gets entry from cache with the specified key. The returned entry can
@@ -1582,14 +1582,14 @@ public interface GridCacheProjection<K, V> extends Iterable<GridCacheEntry<K, V>
* caches, the value will be loaded from the primary node, which in its turn may load the value
* from the disk-based swap storage, and consecutively, if it's not in swap,
* from the underlying persistent storage. If value has to be loaded from persistent
- * storage, {@link GridCacheStore#load(GridCacheTx, Object)} method will be used.
+ * storage, {@link GridCacheStore#load(IgniteTx, Object)} method will be used.
* <p>
* If the returned value is not needed, method {@link #removex(Object, org.apache.ignite.lang.IgnitePredicate[])} should
* always be used instead of this one to avoid the overhead associated with returning of the
* previous value.
* <p>
* If write-through is enabled, the value will be removed from {@link GridCacheStore}
- * via {@link GridCacheStore#remove(GridCacheTx, Object)} method.
+ * via {@link GridCacheStore#remove(IgniteTx, Object)} method.
* <h2 class="header">Transactions</h2>
* This method is transactional and will enlist the entry into ongoing transaction
* if there is one.
@@ -1615,14 +1615,14 @@ public interface GridCacheProjection<K, V> extends Iterable<GridCacheEntry<K, V>
* caches, the value will be loaded from the primary node, which in its turn may load the value
* from the swap storage, and consecutively, if it's not in swap,
* from the underlying persistent storage. If value has to be loaded from persistent
- * storage, {@link GridCacheStore#load(GridCacheTx, Object)} method will be used.
+ * storage, {@link GridCacheStore#load(IgniteTx, Object)} method will be used.
* <p>
* If the returned value is not needed, method {@link #removex(Object, org.apache.ignite.lang.IgnitePredicate[])} should
* always be used instead of this one to avoid the overhead associated with returning of the
* previous value.
* <p>
* If write-through is enabled, the value will be removed from {@link GridCacheStore}
- * via {@link GridCacheStore#remove(GridCacheTx, Object)} method.
+ * via {@link GridCacheStore#remove(IgniteTx, Object)} method.
* <h2 class="header">Transactions</h2>
* This method is transactional and will enlist the entry into ongoing transaction
* if there is one.
@@ -1646,7 +1646,7 @@ public interface GridCacheProjection<K, V> extends Iterable<GridCacheEntry<K, V>
* provided filters have passed and there was something to remove, {@code false} otherwise.
* <p>
* If write-through is enabled, the value will be removed from {@link GridCacheStore}
- * via {@link GridCacheStore#remove(GridCacheTx, Object)} method.
+ * via {@link GridCacheStore#remove(IgniteTx, Object)} method.
* <h2 class="header">Transactions</h2>
* This method is transactional and will enlist the entry into ongoing transaction
* if there is one.
@@ -1673,7 +1673,7 @@ public interface GridCacheProjection<K, V> extends Iterable<GridCacheEntry<K, V>
* provided filters have passed and there was something to remove, {@code false} otherwise.
* <p>
* If write-through is enabled, the value will be removed from {@link GridCacheStore}
- * via {@link GridCacheStore#remove(GridCacheTx, Object)} method.
+ * via {@link GridCacheStore#remove(IgniteTx, Object)} method.
* <h2 class="header">Transactions</h2>
* This method is transactional and will enlist the entry into ongoing transaction
* if there is one.
@@ -1697,7 +1697,7 @@ public interface GridCacheProjection<K, V> extends Iterable<GridCacheEntry<K, V>
* Removes given key mapping from cache if one exists and value is equal to the passed in value.
* <p>
* If write-through is enabled, the value will be removed from {@link GridCacheStore}
- * via {@link GridCacheStore#remove(GridCacheTx, Object)} method.
+ * via {@link GridCacheStore#remove(IgniteTx, Object)} method.
* <h2 class="header">Transactions</h2>
* This method is transactional and will enlist the entry into ongoing transaction
* if there is one.
@@ -1722,7 +1722,7 @@ public interface GridCacheProjection<K, V> extends Iterable<GridCacheEntry<K, V>
* provided filters have passed and there was something to remove, {@code false} otherwise.
* <p>
* If write-through is enabled, the value will be removed from {@link GridCacheStore}
- * via {@link GridCacheStore#remove(GridCacheTx, Object)} method.
+ * via {@link GridCacheStore#remove(IgniteTx, Object)} method.
* <h2 class="header">Transactions</h2>
* This method is transactional and will enlist the entry into ongoing transaction
* if there is one.
@@ -1744,7 +1744,7 @@ public interface GridCacheProjection<K, V> extends Iterable<GridCacheEntry<K, V>
* pass.
* <p>
* If write-through is enabled, the values will be removed from {@link GridCacheStore}
- * via {@link GridCacheStore#removeAll(GridCacheTx, Collection)} method.
+ * via {@link GridCacheStore#removeAll(IgniteTx, Collection)} method.
* <h2 class="header">Transactions</h2>
* This method is transactional and will enlist the entry into ongoing transaction
* if there is one.
@@ -1766,7 +1766,7 @@ public interface GridCacheProjection<K, V> extends Iterable<GridCacheEntry<K, V>
* passed in filters do pass.
* <p>
* If write-through is enabled, the values will be removed from {@link GridCacheStore}
- * via {@link GridCacheStore#removeAll(GridCacheTx, Collection)} method.
+ * via {@link GridCacheStore#removeAll(IgniteTx, Collection)} method.
* <h2 class="header">Transactions</h2>
* This method is transactional and will enlist the entry into ongoing transaction
* if there is one.
@@ -1795,7 +1795,7 @@ public interface GridCacheProjection<K, V> extends Iterable<GridCacheEntry<K, V>
* other concurrent transactional updates.
* <p>
* If write-through is enabled, the values will be removed from {@link GridCacheStore}
- * via {@link GridCacheStore#removeAll(GridCacheTx, Collection)} method.
+ * via {@link GridCacheStore#removeAll(IgniteTx, Collection)} method.
* <h2 class="header">Transactions</h2>
* This method is transactional and will enlist the entry into ongoing transaction
* if there is one.
@@ -1820,7 +1820,7 @@ public interface GridCacheProjection<K, V> extends Iterable<GridCacheEntry<K, V>
* is empty, then transaction will quickly become very heavy and slow.
* <p>
* If write-through is enabled, the values will be removed from {@link GridCacheStore}
- * via {@link GridCacheStore#removeAll(GridCacheTx, Collection)} method.
+ * via {@link GridCacheStore#removeAll(IgniteTx, Collection)} method.
* <h2 class="header">Transactions</h2>
* This method is transactional and will enlist the entry into ongoing transaction
* if there is one.
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/3008d2ad/modules/core/src/main/java/org/gridgain/grid/cache/GridCacheWriteSynchronizationMode.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/gridgain/grid/cache/GridCacheWriteSynchronizationMode.java b/modules/core/src/main/java/org/gridgain/grid/cache/GridCacheWriteSynchronizationMode.java
index 8ba72f6..840a3e9 100644
--- a/modules/core/src/main/java/org/gridgain/grid/cache/GridCacheWriteSynchronizationMode.java
+++ b/modules/core/src/main/java/org/gridgain/grid/cache/GridCacheWriteSynchronizationMode.java
@@ -16,7 +16,7 @@ import org.jetbrains.annotations.*;
* Mode indicating how GridGain should wait for write replies from other nodes. Default
* value is {@link #FULL_ASYNC}}, which means that GridGain will not wait for responses from
* participating nodes. This means that by default remote nodes may get their state updated slightly after
- * any of the cache write methods complete, or after {@link GridCacheTx#commit()} method completes.
+ * any of the cache write methods complete, or after {@link IgniteTx#commit()} method completes.
* <p>
* Note that regardless of write synchronization mode, cache data will always remain fully
* consistent across all participating nodes.
@@ -35,7 +35,7 @@ public enum GridCacheWriteSynchronizationMode {
/**
* Flag indicating that GridGain will not wait for write or commit responses from participating nodes,
* which means that remote nodes may get their state updated a bit after any of the cache write methods
- * complete, or after {@link GridCacheTx#commit()} method completes.
+ * complete, or after {@link IgniteTx#commit()} method completes.
*/
FULL_ASYNC,
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/3008d2ad/modules/core/src/main/java/org/gridgain/grid/cache/store/GridCacheLoadOnlyStoreAdapter.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/gridgain/grid/cache/store/GridCacheLoadOnlyStoreAdapter.java b/modules/core/src/main/java/org/gridgain/grid/cache/store/GridCacheLoadOnlyStoreAdapter.java
index c3eceb6..f9ae802 100644
--- a/modules/core/src/main/java/org/gridgain/grid/cache/store/GridCacheLoadOnlyStoreAdapter.java
+++ b/modules/core/src/main/java/org/gridgain/grid/cache/store/GridCacheLoadOnlyStoreAdapter.java
@@ -218,41 +218,41 @@ public abstract class GridCacheLoadOnlyStoreAdapter<K, V, I> implements GridCach
}
/** {@inheritDoc} */
- @Override public V load(@Nullable GridCacheTx tx, K key)
+ @Override public V load(@Nullable IgniteTx tx, K key)
throws IgniteCheckedException {
return null;
}
/** {@inheritDoc} */
- @Override public void loadAll(@Nullable GridCacheTx tx,
+ @Override public void loadAll(@Nullable IgniteTx tx,
@Nullable Collection<? extends K> keys, IgniteBiInClosure<K, V> c) throws IgniteCheckedException {
// No-op.
}
/** {@inheritDoc} */
- @Override public void put(@Nullable GridCacheTx tx, K key, @Nullable V val) throws IgniteCheckedException {
+ @Override public void put(@Nullable IgniteTx tx, K key, @Nullable V val) throws IgniteCheckedException {
// No-op.
}
/** {@inheritDoc} */
- @Override public void putAll(@Nullable GridCacheTx tx, @Nullable Map<? extends K, ? extends V> map)
+ @Override public void putAll(@Nullable IgniteTx tx, @Nullable Map<? extends K, ? extends V> map)
throws IgniteCheckedException {
// No-op.
}
/** {@inheritDoc} */
- @Override public void remove(@Nullable GridCacheTx tx, K key) throws IgniteCheckedException {
+ @Override public void remove(@Nullable IgniteTx tx, K key) throws IgniteCheckedException {
// No-op.
}
/** {@inheritDoc} */
- @Override public void removeAll(@Nullable GridCacheTx tx, @Nullable Collection<? extends K> keys)
+ @Override public void removeAll(@Nullable IgniteTx tx, @Nullable Collection<? extends K> keys)
throws IgniteCheckedException {
// No-op.
}
/** {@inheritDoc} */
- @Override public void txEnd(GridCacheTx tx, boolean commit) throws IgniteCheckedException {
+ @Override public void txEnd(IgniteTx tx, boolean commit) throws IgniteCheckedException {
// No-op.
}
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/3008d2ad/modules/core/src/main/java/org/gridgain/grid/cache/store/GridCacheStore.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/gridgain/grid/cache/store/GridCacheStore.java b/modules/core/src/main/java/org/gridgain/grid/cache/store/GridCacheStore.java
index 51ce99a..b265303 100644
--- a/modules/core/src/main/java/org/gridgain/grid/cache/store/GridCacheStore.java
+++ b/modules/core/src/main/java/org/gridgain/grid/cache/store/GridCacheStore.java
@@ -29,10 +29,10 @@ import java.util.Date;
* or swap storage without ever being persisted to a persistent storage.
* <p>
* {@link GridCacheStoreAdapter} provides default implementation for bulk operations,
- * such as {@link #loadAll(GridCacheTx, Collection, org.apache.ignite.lang.IgniteBiInClosure)},
- * {@link #putAll(GridCacheTx, Map)}, and {@link #removeAll(GridCacheTx, Collection)}
- * by sequentially calling corresponding {@link #load(GridCacheTx, Object)},
- * {@link #put(GridCacheTx, Object, Object)}, and {@link #remove(GridCacheTx, Object)}
+ * such as {@link #loadAll(IgniteTx, Collection, org.apache.ignite.lang.IgniteBiInClosure)},
+ * {@link #putAll(IgniteTx, Map)}, and {@link #removeAll(IgniteTx, Collection)}
+ * by sequentially calling corresponding {@link #load(IgniteTx, Object)},
+ * {@link #put(IgniteTx, Object, Object)}, and {@link #remove(IgniteTx, Object)}
* operations. Use this adapter whenever such behaviour is acceptable. However
* in many cases it maybe more preferable to take advantage of database batch update
* functionality, and therefore default adapter implementation may not be the best option.
@@ -43,7 +43,7 @@ import java.util.Date;
* <li>{@link GridCacheJdbcBlobStore}</li>
* </ul>
* <p>
- * All transactional operations of this API are provided with ongoing {@link GridCacheTx},
+ * All transactional operations of this API are provided with ongoing {@link IgniteTx},
* if any. As transaction is {@link GridMetadataAware}, you can attach any metadata to
* it, e.g. to recognize if several operations belong to the same transaction or not.
* Here is an example of how attach a JDBC connection as transaction metadata:
@@ -117,7 +117,7 @@ public interface GridCacheStore<K, V> {
* @return Loaded value or {@code null} if value was not found.
* @throws IgniteCheckedException If load failed.
*/
- @Nullable public V load(@Nullable GridCacheTx tx, K key) throws IgniteCheckedException;
+ @Nullable public V load(@Nullable IgniteTx tx, K key) throws IgniteCheckedException;
/**
* Loads all values from underlying persistent storage. Note that keys are not
@@ -152,7 +152,7 @@ public interface GridCacheStore<K, V> {
* @param c Closure to call for every loaded element.
* @throws IgniteCheckedException If load failed.
*/
- public void loadAll(@Nullable GridCacheTx tx, Collection<? extends K> keys, IgniteBiInClosure<K, V> c)
+ public void loadAll(@Nullable IgniteTx tx, Collection<? extends K> keys, IgniteBiInClosure<K, V> c)
throws IgniteCheckedException;
/**
@@ -164,7 +164,7 @@ public interface GridCacheStore<K, V> {
* @param val Value to put.
* @throws IgniteCheckedException If put failed.
*/
- public void put(@Nullable GridCacheTx tx, K key, V val) throws IgniteCheckedException;
+ public void put(@Nullable IgniteTx tx, K key, V val) throws IgniteCheckedException;
/**
* Stores given key value pairs in persistent storage. Note that if write-behind is configured
@@ -174,7 +174,7 @@ public interface GridCacheStore<K, V> {
* @param map Values to store.
* @throws IgniteCheckedException If store failed.
*/
- public void putAll(@Nullable GridCacheTx tx, Map<? extends K, ? extends V> map) throws IgniteCheckedException;
+ public void putAll(@Nullable IgniteTx tx, Map<? extends K, ? extends V> map) throws IgniteCheckedException;
/**
* Removes the value identified by given key from persistent storage. Note that if write-behind is
@@ -185,7 +185,7 @@ public interface GridCacheStore<K, V> {
* @param key Key to remove.
* @throws IgniteCheckedException If remove failed.
*/
- public void remove(@Nullable GridCacheTx tx, K key) throws IgniteCheckedException;
+ public void remove(@Nullable IgniteTx tx, K key) throws IgniteCheckedException;
/**
* Removes all vales identified by given keys from persistent storage. Note that if write-behind
@@ -196,7 +196,7 @@ public interface GridCacheStore<K, V> {
* @param keys Keys to remove.
* @throws IgniteCheckedException If remove failed.
*/
- public void removeAll(@Nullable GridCacheTx tx, Collection<? extends K> keys) throws IgniteCheckedException;
+ public void removeAll(@Nullable IgniteTx tx, Collection<? extends K> keys) throws IgniteCheckedException;
/**
* Tells store to commit or rollback a transaction depending on the value of the {@code 'commit'}
@@ -208,5 +208,5 @@ public interface GridCacheStore<K, V> {
* may bring cache transaction into {@link GridCacheTxState#UNKNOWN} which will
* consequently cause all transacted entries to be invalidated.
*/
- public void txEnd(GridCacheTx tx, boolean commit) throws IgniteCheckedException;
+ public void txEnd(IgniteTx tx, boolean commit) throws IgniteCheckedException;
}
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/3008d2ad/modules/core/src/main/java/org/gridgain/grid/cache/store/GridCacheStoreAdapter.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/gridgain/grid/cache/store/GridCacheStoreAdapter.java b/modules/core/src/main/java/org/gridgain/grid/cache/store/GridCacheStoreAdapter.java
index c12b3e7..e07a1f1 100644
--- a/modules/core/src/main/java/org/gridgain/grid/cache/store/GridCacheStoreAdapter.java
+++ b/modules/core/src/main/java/org/gridgain/grid/cache/store/GridCacheStoreAdapter.java
@@ -19,10 +19,10 @@ import java.util.*;
/**
* Cache storage convenience adapter. It provides default implementation for bulk operations, such
- * as {@link #loadAll(GridCacheTx, Collection, org.apache.ignite.lang.IgniteBiInClosure)},
- * {@link #putAll(GridCacheTx, Map)}, and {@link #removeAll(GridCacheTx, Collection)}
- * by sequentially calling corresponding {@link #load(GridCacheTx, Object)},
- * {@link #put(GridCacheTx, Object, Object)}, and {@link #remove(GridCacheTx, Object)}
+ * as {@link #loadAll(IgniteTx, Collection, org.apache.ignite.lang.IgniteBiInClosure)},
+ * {@link #putAll(IgniteTx, Map)}, and {@link #removeAll(IgniteTx, Collection)}
+ * by sequentially calling corresponding {@link #load(IgniteTx, Object)},
+ * {@link #put(IgniteTx, Object, Object)}, and {@link #remove(IgniteTx, Object)}
* operations. Use this adapter whenever such behaviour is acceptable. However in many cases
* it maybe more preferable to take advantage of database batch update functionality, and therefore
* default adapter implementation may not be the best option.
@@ -47,7 +47,7 @@ public abstract class GridCacheStoreAdapter<K, V> implements GridCacheStore<K, V
}
/** {@inheritDoc} */
- @Override public void loadAll(@Nullable GridCacheTx tx, Collection<? extends K> keys,
+ @Override public void loadAll(@Nullable IgniteTx tx, Collection<? extends K> keys,
IgniteBiInClosure<K, V> c) throws IgniteCheckedException {
assert keys != null;
@@ -60,7 +60,7 @@ public abstract class GridCacheStoreAdapter<K, V> implements GridCacheStore<K, V
}
/** {@inheritDoc} */
- @Override public void putAll(GridCacheTx tx, Map<? extends K, ? extends V> map)
+ @Override public void putAll(IgniteTx tx, Map<? extends K, ? extends V> map)
throws IgniteCheckedException {
assert map != null;
@@ -69,7 +69,7 @@ public abstract class GridCacheStoreAdapter<K, V> implements GridCacheStore<K, V
}
/** {@inheritDoc} */
- @Override public void removeAll(GridCacheTx tx, Collection<? extends K> keys)
+ @Override public void removeAll(IgniteTx tx, Collection<? extends K> keys)
throws IgniteCheckedException {
assert keys != null;
@@ -86,7 +86,7 @@ public abstract class GridCacheStoreAdapter<K, V> implements GridCacheStore<K, V
* @param commit {@inheritDoc}
* @throws IgniteCheckedException {@inheritDoc}
*/
- @Override public void txEnd(GridCacheTx tx, boolean commit) throws IgniteCheckedException {
+ @Override public void txEnd(IgniteTx tx, boolean commit) throws IgniteCheckedException {
// No-op.
}
}
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/3008d2ad/modules/core/src/main/java/org/gridgain/grid/cache/store/GridCacheStoreBalancingWrapper.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/gridgain/grid/cache/store/GridCacheStoreBalancingWrapper.java b/modules/core/src/main/java/org/gridgain/grid/cache/store/GridCacheStoreBalancingWrapper.java
index aeba9c8..34d82ce 100644
--- a/modules/core/src/main/java/org/gridgain/grid/cache/store/GridCacheStoreBalancingWrapper.java
+++ b/modules/core/src/main/java/org/gridgain/grid/cache/store/GridCacheStoreBalancingWrapper.java
@@ -53,7 +53,7 @@ public class GridCacheStoreBalancingWrapper<K, V> implements GridCacheStore<K, V
}
/** {@inheritDoc} */
- @Nullable @Override public V load(@Nullable GridCacheTx tx, K key) throws IgniteCheckedException {
+ @Nullable @Override public V load(@Nullable IgniteTx tx, K key) throws IgniteCheckedException {
LoadFuture fut = pendingLoads.get(key);
if (fut != null)
@@ -86,7 +86,7 @@ public class GridCacheStoreBalancingWrapper<K, V> implements GridCacheStore<K, V
}
/** {@inheritDoc} */
- @Override public void loadAll(@Nullable GridCacheTx tx, Collection<? extends K> keys, final IgniteBiInClosure<K, V> c)
+ @Override public void loadAll(@Nullable IgniteTx tx, Collection<? extends K> keys, final IgniteBiInClosure<K, V> c)
throws IgniteCheckedException {
if (keys.size() > loadAllThreshold) {
delegate.loadAll(tx, keys, c);
@@ -165,27 +165,27 @@ public class GridCacheStoreBalancingWrapper<K, V> implements GridCacheStore<K, V
}
/** {@inheritDoc} */
- @Override public void put(@Nullable GridCacheTx tx, K key, V val) throws IgniteCheckedException {
+ @Override public void put(@Nullable IgniteTx tx, K key, V val) throws IgniteCheckedException {
delegate.put(tx, key, val);
}
/** {@inheritDoc} */
- @Override public void putAll(@Nullable GridCacheTx tx, Map<? extends K, ? extends V> map) throws IgniteCheckedException {
+ @Override public void putAll(@Nullable IgniteTx tx, Map<? extends K, ? extends V> map) throws IgniteCheckedException {
delegate.putAll(tx, map);
}
/** {@inheritDoc} */
- @Override public void remove(@Nullable GridCacheTx tx, K key) throws IgniteCheckedException {
+ @Override public void remove(@Nullable IgniteTx tx, K key) throws IgniteCheckedException {
delegate.remove(tx, key);
}
/** {@inheritDoc} */
- @Override public void removeAll(@Nullable GridCacheTx tx, Collection<? extends K> keys) throws IgniteCheckedException {
+ @Override public void removeAll(@Nullable IgniteTx tx, Collection<? extends K> keys) throws IgniteCheckedException {
delegate.removeAll(tx, keys);
}
/** {@inheritDoc} */
- @Override public void txEnd(GridCacheTx tx, boolean commit) throws IgniteCheckedException {
+ @Override public void txEnd(IgniteTx tx, boolean commit) throws IgniteCheckedException {
delegate.txEnd(tx, commit);
}
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/3008d2ad/modules/core/src/main/java/org/gridgain/grid/cache/store/jdbc/GridCacheJdbcBlobStore.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/gridgain/grid/cache/store/jdbc/GridCacheJdbcBlobStore.java b/modules/core/src/main/java/org/gridgain/grid/cache/store/jdbc/GridCacheJdbcBlobStore.java
index 2624cb3..09e4ca3 100644
--- a/modules/core/src/main/java/org/gridgain/grid/cache/store/jdbc/GridCacheJdbcBlobStore.java
+++ b/modules/core/src/main/java/org/gridgain/grid/cache/store/jdbc/GridCacheJdbcBlobStore.java
@@ -163,7 +163,7 @@ public class GridCacheJdbcBlobStore<K, V> extends GridCacheStoreAdapter<K, V> {
private boolean initOk;
/** {@inheritDoc} */
- @Override public void txEnd(GridCacheTx tx, boolean commit) throws IgniteCheckedException {
+ @Override public void txEnd(IgniteTx tx, boolean commit) throws IgniteCheckedException {
init();
Connection conn = tx.removeMeta(ATTR_CONN);
@@ -189,7 +189,7 @@ public class GridCacheJdbcBlobStore<K, V> extends GridCacheStoreAdapter<K, V> {
/** {@inheritDoc} */
@SuppressWarnings({"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())
@@ -222,7 +222,7 @@ public class GridCacheJdbcBlobStore<K, V> extends GridCacheStoreAdapter<K, V> {
}
/** {@inheritDoc} */
- @Override public void put(@Nullable GridCacheTx tx, K key, V val) throws IgniteCheckedException {
+ @Override public void put(@Nullable IgniteTx tx, K key, V val) throws IgniteCheckedException {
init();
if (log.isDebugEnabled())
@@ -260,7 +260,7 @@ public class GridCacheJdbcBlobStore<K, V> extends GridCacheStoreAdapter<K, V> {
}
/** {@inheritDoc} */
- @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())
@@ -292,7 +292,7 @@ public class GridCacheJdbcBlobStore<K, V> extends GridCacheStoreAdapter<K, V> {
* @return Connection.
* @throws SQLException In case of error.
*/
- private Connection connection(@Nullable GridCacheTx tx) throws SQLException {
+ private Connection connection(@Nullable IgniteTx tx) throws SQLException {
if (tx != null) {
Connection conn = tx.meta(ATTR_CONN);
@@ -318,7 +318,7 @@ public class GridCacheJdbcBlobStore<K, V> extends GridCacheStoreAdapter<K, V> {
* @param conn Allocated connection.
* @param st Created statement,
*/
- private void end(@Nullable GridCacheTx tx, Connection conn, Statement st) {
+ private void end(@Nullable IgniteTx tx, Connection conn, Statement st) {
U.closeQuiet(st);
if (tx == null)
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/3008d2ad/modules/core/src/main/java/org/gridgain/grid/kernal/IgniteTransactionsEx.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/gridgain/grid/kernal/IgniteTransactionsEx.java b/modules/core/src/main/java/org/gridgain/grid/kernal/IgniteTransactionsEx.java
index 286acd5..464cb1c 100644
--- a/modules/core/src/main/java/org/gridgain/grid/kernal/IgniteTransactionsEx.java
+++ b/modules/core/src/main/java/org/gridgain/grid/kernal/IgniteTransactionsEx.java
@@ -29,6 +29,6 @@ public interface IgniteTransactionsEx extends IgniteTransactions {
* @throws IllegalStateException If transaction is already started by this thread.
* @throws UnsupportedOperationException If cache is {@link GridCacheAtomicityMode#ATOMIC}.
*/
- public GridCacheTx txStartSystem(GridCacheTxConcurrency concurrency, GridCacheTxIsolation isolation, long timeout,
+ public IgniteTx txStartSystem(GridCacheTxConcurrency concurrency, GridCacheTxIsolation isolation, long timeout,
int txSize);
}
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/3008d2ad/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 c3a871a..949482a 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
@@ -3033,10 +3033,10 @@ public abstract class GridCacheAdapter<K, V> extends GridMetadataAwareAdapter im
}
/** {@inheritDoc} */
- @Nullable @Override public GridCacheTx tx() {
+ @Nullable @Override public IgniteTx tx() {
GridCacheTxAdapter<K, V> tx = ctx.tm().threadLocalTx();
- return tx == null ? null : new GridCacheTxProxyImpl<>(tx, ctx.shared());
+ return tx == null ? null : new IgniteTxProxyImpl<>(tx, ctx.shared());
}
/** {@inheritDoc} */
@@ -3113,14 +3113,14 @@ public abstract class GridCacheAdapter<K, V> extends GridMetadataAwareAdapter im
}
/** {@inheritDoc} */
- @Override public GridCacheTx txStart() throws IllegalStateException {
+ @Override public IgniteTx txStart() throws IllegalStateException {
TransactionsConfiguration cfg = ctx.gridConfig().getTransactionsConfiguration();
return txStart(cfg.getDefaultTxConcurrency(), cfg.getDefaultTxIsolation());
}
/** {@inheritDoc} */
- @Override public GridCacheTx txStart(GridCacheTxConcurrency concurrency, GridCacheTxIsolation isolation) {
+ @Override public IgniteTx txStart(GridCacheTxConcurrency concurrency, GridCacheTxIsolation isolation) {
A.notNull(concurrency, "concurrency");
A.notNull(isolation, "isolation");
@@ -3135,7 +3135,7 @@ public abstract class GridCacheAdapter<K, V> extends GridMetadataAwareAdapter im
}
/** {@inheritDoc} */
- @Override public GridCacheTx txStart(GridCacheTxConcurrency concurrency,
+ @Override public IgniteTx txStart(GridCacheTxConcurrency concurrency,
GridCacheTxIsolation isolation, long timeout, int txSize) throws IllegalStateException {
IgniteTransactionsEx txs = ctx.kernalContext().cache().transactions();
@@ -3145,14 +3145,14 @@ public abstract class GridCacheAdapter<K, V> extends GridMetadataAwareAdapter im
}
/** {@inheritDoc} */
- @Override public GridCacheTx txStartAffinity(Object affinityKey, GridCacheTxConcurrency concurrency,
+ @Override public IgniteTx txStartAffinity(Object affinityKey, GridCacheTxConcurrency concurrency,
GridCacheTxIsolation isolation, long timeout, int txSize) throws IllegalStateException, IgniteCheckedException {
return ctx.kernalContext().cache().transactions().txStartAffinity(name(), affinityKey, concurrency, isolation,
timeout, txSize);
}
/** {@inheritDoc} */
- @Override public GridCacheTx txStartPartition(int partId, GridCacheTxConcurrency concurrency,
+ @Override public IgniteTx txStartPartition(int partId, GridCacheTxConcurrency concurrency,
GridCacheTxIsolation isolation, long timeout, int txSize) throws IllegalStateException, IgniteCheckedException {
return ctx.kernalContext().cache().transactions().txStartPartition(name(), partId, concurrency, isolation,
timeout, txSize);
@@ -3454,7 +3454,7 @@ public abstract class GridCacheAdapter<K, V> extends GridMetadataAwareAdapter im
* @return Transaction commit future.
*/
@SuppressWarnings("unchecked")
- public IgniteFuture<GridCacheTx> commitTxAsync(final GridCacheTx tx) {
+ public IgniteFuture<IgniteTx> commitTxAsync(final IgniteTx tx) {
FutureHolder holder = lastFut.get();
holder.lock();
@@ -3463,9 +3463,9 @@ public abstract class GridCacheAdapter<K, V> extends GridMetadataAwareAdapter im
IgniteFuture fut = holder.future();
if (fut != null && !fut.isDone()) {
- IgniteFuture<GridCacheTx> f = new GridEmbeddedFuture<>(fut,
- new C2<Object, Exception, IgniteFuture<GridCacheTx>>() {
- @Override public IgniteFuture<GridCacheTx> apply(Object o, Exception e) {
+ IgniteFuture<IgniteTx> f = new GridEmbeddedFuture<>(fut,
+ new C2<Object, Exception, IgniteFuture<IgniteTx>>() {
+ @Override public IgniteFuture<IgniteTx> apply(Object o, Exception e) {
return tx.commitAsync();
}
}, ctx.kernalContext());
@@ -3475,7 +3475,7 @@ public abstract class GridCacheAdapter<K, V> extends GridMetadataAwareAdapter im
return f;
}
- IgniteFuture<GridCacheTx> f = tx.commitAsync();
+ IgniteFuture<IgniteTx> f = tx.commitAsync();
saveFuture(holder, f);
@@ -3494,7 +3494,7 @@ public abstract class GridCacheAdapter<K, V> extends GridMetadataAwareAdapter im
* @param tx Transaction to commit.
* @throws IgniteCheckedException If commit failed.
*/
- void commitTx(GridCacheTx tx) throws IgniteCheckedException {
+ void commitTx(IgniteTx tx) throws IgniteCheckedException {
awaitLastFut();
tx.commit();
@@ -3506,7 +3506,7 @@ public abstract class GridCacheAdapter<K, V> extends GridMetadataAwareAdapter im
* @param tx Transaction to commit.
* @throws IgniteCheckedException If commit failed.
*/
- void rollbackTx(GridCacheTx tx) throws IgniteCheckedException {
+ void rollbackTx(IgniteTx tx) throws IgniteCheckedException {
awaitLastFut();
tx.rollback();
@@ -3518,7 +3518,7 @@ public abstract class GridCacheAdapter<K, V> extends GridMetadataAwareAdapter im
* @param tx Transaction to commit.
* @throws IgniteCheckedException If commit failed.
*/
- void endTx(GridCacheTx tx) throws IgniteCheckedException {
+ void endTx(IgniteTx tx) throws IgniteCheckedException {
awaitLastFut();
tx.close();
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/3008d2ad/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/GridCacheEventManager.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/GridCacheEventManager.java b/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/GridCacheEventManager.java
index 9218c8c..479a97d 100644
--- a/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/GridCacheEventManager.java
+++ b/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/GridCacheEventManager.java
@@ -67,7 +67,7 @@ public class GridCacheEventManager<K, V> extends GridCacheManagerAdapter<K, V> {
* @param cloClsName Closure class name.
* @param taskName Task name.
*/
- public void addEvent(int part, K key, GridCacheTx tx, @Nullable GridCacheMvccCandidate<K> owner,
+ public void addEvent(int part, K key, IgniteTx tx, @Nullable GridCacheMvccCandidate<K> owner,
int type, @Nullable V newVal, boolean hasNewVal, @Nullable V oldVal, boolean hasOldVal, UUID subjId,
String cloClsName, String taskName) {
addEvent(part, key, locNodeId, tx, owner, type, newVal, hasNewVal, oldVal, hasOldVal, subjId, cloClsName,
@@ -89,7 +89,7 @@ public class GridCacheEventManager<K, V> extends GridCacheManagerAdapter<K, V> {
* @param cloClsName Closure class name.
* @param taskName Task name.
*/
- public void addEvent(int part, K key, UUID nodeId, GridCacheTx tx, GridCacheMvccCandidate<K> owner,
+ public void addEvent(int part, K key, UUID nodeId, IgniteTx tx, GridCacheMvccCandidate<K> owner,
int type, V newVal, boolean hasNewVal, V oldVal, boolean hasOldVal, UUID subjId, String cloClsName,
String taskName) {
addEvent(part, key, nodeId, tx == null ? null : tx.xid(), owner == null ? null : owner.version(), type,
@@ -113,7 +113,7 @@ public class GridCacheEventManager<K, V> extends GridCacheManagerAdapter<K, V> {
public void addEvent(int part, K key, UUID evtNodeId, @Nullable GridCacheMvccCandidate<K> owner,
int type, @Nullable V newVal, boolean hasNewVal, V oldVal, boolean hasOldVal, UUID subjId, String cloClsName,
String taskName) {
- GridCacheTx tx = owner == null ? null : cctx.tm().tx(owner.version());
+ IgniteTx tx = owner == null ? null : cctx.tm().tx(owner.version());
addEvent(part, key, evtNodeId, tx == null ? null : tx.xid(), owner == null ? null : owner.version(), type,
newVal, hasNewVal, oldVal, hasOldVal, subjId, cloClsName, taskName);
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/3008d2ad/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/GridCacheMultiTxFuture.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/GridCacheMultiTxFuture.java b/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/GridCacheMultiTxFuture.java
index 36ee08b..9975b27 100644
--- a/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/GridCacheMultiTxFuture.java
+++ b/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/GridCacheMultiTxFuture.java
@@ -94,8 +94,8 @@ public final class GridCacheMultiTxFuture<K, V> extends GridFutureAdapter<Boolea
for (final GridCacheTxEx<K, V> tx : txs) {
if (!tx.done()) {
- tx.finishFuture().listenAsync(new CI1<IgniteFuture<GridCacheTx>>() {
- @Override public void apply(IgniteFuture<GridCacheTx> t) {
+ tx.finishFuture().listenAsync(new CI1<IgniteFuture<IgniteTx>>() {
+ @Override public void apply(IgniteFuture<IgniteTx> t) {
remainingTxs.remove(tx);
checkRemaining();
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/3008d2ad/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/GridCacheProjectionEx.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/GridCacheProjectionEx.java b/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/GridCacheProjectionEx.java
index eb4cc44..ea9d2bc 100644
--- a/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/GridCacheProjectionEx.java
+++ b/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/GridCacheProjectionEx.java
@@ -196,7 +196,7 @@ public interface GridCacheProjectionEx<K, V> extends GridCacheProjection<K, V> {
* This method will return {@code true} if value is stored in cache and {@code false} otherwise.
* <p>
* If write-through is enabled, the stored value will be persisted to {@link GridCacheStore}
- * via {@link GridCacheStore#put(GridCacheTx, Object, Object)} method.
+ * via {@link GridCacheStore#put(IgniteTx, Object, Object)} method.
* <h2 class="header">Transactions</h2>
* This method is transactional and will enlist the entry into ongoing transaction
* if there is one.
@@ -221,7 +221,7 @@ public interface GridCacheProjectionEx<K, V> extends GridCacheProjection<K, V> {
* This method will return {@code true} if value is stored in cache and {@code false} otherwise.
* <p>
* If write-through is enabled, the stored value will be persisted to {@link GridCacheStore}
- * via {@link GridCacheStore#put(GridCacheTx, Object, Object)} method.
+ * via {@link GridCacheStore#put(IgniteTx, Object, Object)} method.
* <h2 class="header">Transactions</h2>
* This method is transactional and will enlist the entry into ongoing transaction
* if there is one.
@@ -243,7 +243,7 @@ public interface GridCacheProjectionEx<K, V> extends GridCacheProjection<K, V> {
* Removes given key mapping from cache if one exists and value is equal to the passed in value.
* <p>
* If write-through is enabled, the value will be removed from {@link GridCacheStore}
- * via {@link GridCacheStore#remove(GridCacheTx, Object)} method.
+ * via {@link GridCacheStore#remove(IgniteTx, Object)} method.
* <h2 class="header">Transactions</h2>
* This method is transactional and will enlist the entry into ongoing transaction
* if there is one.
@@ -267,7 +267,7 @@ public interface GridCacheProjectionEx<K, V> extends GridCacheProjection<K, V> {
* provided filters have passed and there was something to remove, {@code false} otherwise.
* <p>
* If write-through is enabled, the value will be removed from {@link GridCacheStore}
- * via {@link GridCacheStore#remove(GridCacheTx, Object)} method.
+ * via {@link GridCacheStore#remove(IgniteTx, Object)} method.
* <h2 class="header">Transactions</h2>
* This method is transactional and will enlist the entry into ongoing transaction
* if there is one.
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/3008d2ad/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/GridCacheProjectionImpl.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/GridCacheProjectionImpl.java b/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/GridCacheProjectionImpl.java
index a835382..e31f33c 100644
--- a/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/GridCacheProjectionImpl.java
+++ b/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/GridCacheProjectionImpl.java
@@ -1200,35 +1200,35 @@ public class GridCacheProjectionImpl<K, V> implements GridCacheProjectionEx<K, V
}
/** {@inheritDoc} */
- @Override public GridCacheTx txStart() throws IllegalStateException {
+ @Override public IgniteTx txStart() throws IllegalStateException {
return cache.txStart();
}
/** {@inheritDoc} */
- @Override public GridCacheTx txStart(GridCacheTxConcurrency concurrency, GridCacheTxIsolation isolation) {
+ @Override public IgniteTx txStart(GridCacheTxConcurrency concurrency, GridCacheTxIsolation isolation) {
return cache.txStart(concurrency, isolation);
}
/** {@inheritDoc} */
- @Override public GridCacheTx txStart(GridCacheTxConcurrency concurrency, GridCacheTxIsolation isolation,
+ @Override public IgniteTx txStart(GridCacheTxConcurrency concurrency, GridCacheTxIsolation isolation,
long timeout, int txSize) {
return cache.txStart(concurrency, isolation, timeout, txSize);
}
/** {@inheritDoc} */
- @Override public GridCacheTx txStartAffinity(Object affinityKey, GridCacheTxConcurrency concurrency,
+ @Override public IgniteTx txStartAffinity(Object affinityKey, GridCacheTxConcurrency concurrency,
GridCacheTxIsolation isolation, long timeout, int txSize) throws IllegalStateException, IgniteCheckedException {
return cache.txStartAffinity(affinityKey, concurrency, isolation, timeout, txSize);
}
/** {@inheritDoc} */
- @Override public GridCacheTx txStartPartition(int partId, GridCacheTxConcurrency concurrency,
+ @Override public IgniteTx txStartPartition(int partId, GridCacheTxConcurrency concurrency,
GridCacheTxIsolation isolation, long timeout, int txSize) throws IllegalStateException, IgniteCheckedException {
return cache.txStartPartition(partId, concurrency, isolation, timeout, txSize);
}
/** {@inheritDoc} */
- @Override public GridCacheTx tx() {
+ @Override public IgniteTx tx() {
return cache.tx();
}
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/3008d2ad/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/GridCacheProxyImpl.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/GridCacheProxyImpl.java b/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/GridCacheProxyImpl.java
index 3c1e1d3..b0ba93e 100644
--- a/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/GridCacheProxyImpl.java
+++ b/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/GridCacheProxyImpl.java
@@ -1091,7 +1091,7 @@ public class GridCacheProxyImpl<K, V> implements GridCacheProxy<K, V>, Externali
}
/** {@inheritDoc} */
- @Override public GridCacheTx txStart() throws IllegalStateException {
+ @Override public IgniteTx txStart() throws IllegalStateException {
GridCacheProjectionImpl<K, V> prev = gate.enter(prj);
try {
@@ -1103,7 +1103,7 @@ public class GridCacheProxyImpl<K, V> implements GridCacheProxy<K, V>, Externali
}
/** {@inheritDoc} */
- @Override public GridCacheTx txStart(GridCacheTxConcurrency concurrency, GridCacheTxIsolation isolation) {
+ @Override public IgniteTx txStart(GridCacheTxConcurrency concurrency, GridCacheTxIsolation isolation) {
GridCacheProjectionImpl<K, V> prev = gate.enter(prj);
try {
@@ -1116,7 +1116,7 @@ public class GridCacheProxyImpl<K, V> implements GridCacheProxy<K, V>, Externali
}
/** {@inheritDoc} */
- @Override public GridCacheTx txStart(GridCacheTxConcurrency concurrency, GridCacheTxIsolation isolation,
+ @Override public IgniteTx txStart(GridCacheTxConcurrency concurrency, GridCacheTxIsolation isolation,
long timeout, int txSize) {
GridCacheProjectionImpl<K, V> prev = gate.enter(prj);
@@ -1129,7 +1129,7 @@ public class GridCacheProxyImpl<K, V> implements GridCacheProxy<K, V>, Externali
}
/** {@inheritDoc} */
- @Override public GridCacheTx txStartAffinity(Object affinityKey, GridCacheTxConcurrency concurrency,
+ @Override public IgniteTx txStartAffinity(Object affinityKey, GridCacheTxConcurrency concurrency,
GridCacheTxIsolation isolation, long timeout, int txSize) throws IllegalStateException, IgniteCheckedException {
GridCacheProjectionImpl<K, V> prev = gate.enter(prj);
@@ -1142,7 +1142,7 @@ public class GridCacheProxyImpl<K, V> implements GridCacheProxy<K, V>, Externali
}
/** {@inheritDoc} */
- @Override public GridCacheTx txStartPartition(int partId, GridCacheTxConcurrency concurrency,
+ @Override public IgniteTx txStartPartition(int partId, GridCacheTxConcurrency concurrency,
GridCacheTxIsolation isolation, long timeout, int txSize) throws IllegalStateException, IgniteCheckedException {
GridCacheProjectionImpl<K, V> prev = gate.enter(prj);
@@ -1155,7 +1155,7 @@ public class GridCacheProxyImpl<K, V> implements GridCacheProxy<K, V>, Externali
}
/** {@inheritDoc} */
- @Override public GridCacheTx tx() {
+ @Override public IgniteTx tx() {
GridCacheProjectionImpl<K, V> prev = gate.enter(prj);
try {
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/3008d2ad/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 40a094a..0effe1b 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
@@ -453,7 +453,7 @@ public class GridCacheSharedContext<K, V> {
* @param tx Transaction to commit.
* @return Commit future.
*/
- public IgniteFuture<GridCacheTx> commitTxAsync(GridCacheTxEx<K, V> tx) {
+ public IgniteFuture<IgniteTx> commitTxAsync(GridCacheTxEx<K, V> tx) {
Collection<Integer> cacheIds = tx.activeCacheIds();
if (cacheIds.isEmpty())
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/3008d2ad/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/GridCacheStoreManager.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/GridCacheStoreManager.java b/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/GridCacheStoreManager.java
index 5438cd2..a7e47b0 100644
--- a/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/GridCacheStoreManager.java
+++ b/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/GridCacheStoreManager.java
@@ -122,7 +122,7 @@ public class GridCacheStoreManager<K, V> extends GridCacheManagerAdapter<K, V> {
* @return Loaded value, possibly <tt>null</tt>.
* @throws IgniteCheckedException If data loading failed.
*/
- @Nullable public V loadFromStore(@Nullable GridCacheTx tx, K key) throws IgniteCheckedException {
+ @Nullable public V loadFromStore(@Nullable IgniteTx tx, K key) throws IgniteCheckedException {
if (store != null) {
if (key instanceof GridCacheInternal)
// Never load internal keys from store as they are never persisted.
@@ -180,7 +180,7 @@ public class GridCacheStoreManager<K, V> extends GridCacheManagerAdapter<K, V> {
* @throws IgniteCheckedException If data loading failed.
*/
@SuppressWarnings({"unchecked"})
- public boolean loadAllFromStore(@Nullable GridCacheTx tx, Collection<? extends K> keys,
+ public boolean loadAllFromStore(@Nullable IgniteTx tx, Collection<? extends K> keys,
final IgniteBiInClosure<K, V> vis) throws IgniteCheckedException {
if (store != null) {
if (!keys.isEmpty()) {
@@ -296,7 +296,7 @@ public class GridCacheStoreManager<K, V> extends GridCacheManagerAdapter<K, V> {
* @return {@code true} If there is a persistent storage.
* @throws IgniteCheckedException If storage failed.
*/
- public boolean putToStore(@Nullable GridCacheTx tx, K key, V val, GridCacheVersion ver)
+ public boolean putToStore(@Nullable IgniteTx tx, K key, V val, GridCacheVersion ver)
throws IgniteCheckedException {
if (store != null) {
// Never persist internal keys.
@@ -335,7 +335,7 @@ public class GridCacheStoreManager<K, V> extends GridCacheManagerAdapter<K, V> {
* @return {@code True} if there is a persistent storage.
* @throws IgniteCheckedException If storage failed.
*/
- public boolean putAllToStore(@Nullable GridCacheTx tx, Map<K, IgniteBiTuple<V, GridCacheVersion>> map)
+ public boolean putAllToStore(@Nullable IgniteTx tx, Map<K, IgniteBiTuple<V, GridCacheVersion>> map)
throws IgniteCheckedException {
if (F.isEmpty(map))
return true;
@@ -393,7 +393,7 @@ public class GridCacheStoreManager<K, V> extends GridCacheManagerAdapter<K, V> {
* @return {@code True} if there is a persistent storage.
* @throws IgniteCheckedException If storage failed.
*/
- public boolean removeFromStore(@Nullable GridCacheTx tx, K key) throws IgniteCheckedException {
+ public boolean removeFromStore(@Nullable IgniteTx tx, K key) throws IgniteCheckedException {
if (store != null) {
// Never remove internal key from store as it is never persisted.
if (key instanceof GridCacheInternal)
@@ -429,7 +429,7 @@ public class GridCacheStoreManager<K, V> extends GridCacheManagerAdapter<K, V> {
* @return {@code True} if there is a persistent storage.
* @throws IgniteCheckedException If storage failed.
*/
- public boolean removeAllFromStore(@Nullable GridCacheTx tx, Collection<? extends K> keys) throws IgniteCheckedException {
+ public boolean removeAllFromStore(@Nullable IgniteTx tx, Collection<? extends K> keys) throws IgniteCheckedException {
if (F.isEmpty(keys))
return true;
@@ -487,7 +487,7 @@ public class GridCacheStoreManager<K, V> extends GridCacheManagerAdapter<K, V> {
* @param commit Commit.
* @throws IgniteCheckedException If failed.
*/
- public void txEnd(GridCacheTx tx, boolean commit) throws IgniteCheckedException {
+ public void txEnd(IgniteTx tx, boolean commit) throws IgniteCheckedException {
store.txEnd(tx, commit);
}
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/3008d2ad/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 df77427..09a0bc6 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
@@ -169,7 +169,7 @@ public abstract class GridCacheTxAdapter<K, V> extends GridMetadataAwareAdapter
/** */
@GridToStringExclude
- private AtomicReference<GridFutureAdapter<GridCacheTx>> finFut = new AtomicReference<>();
+ private AtomicReference<GridFutureAdapter<IgniteTx>> finFut = new AtomicReference<>();
/** Topology version. */
private AtomicLong topVer = new AtomicLong(-1);
@@ -924,11 +924,11 @@ public abstract class GridCacheTxAdapter<K, V> extends GridMetadataAwareAdapter
/** {@inheritDoc} */
@SuppressWarnings("ExternalizableWithoutPublicNoArgConstructor")
- @Override public IgniteFuture<GridCacheTx> finishFuture() {
- GridFutureAdapter<GridCacheTx> fut = finFut.get();
+ @Override public IgniteFuture<IgniteTx> finishFuture() {
+ GridFutureAdapter<IgniteTx> fut = finFut.get();
if (fut == null) {
- fut = new GridFutureAdapter<GridCacheTx>(cctx.kernalContext()) {
+ fut = new GridFutureAdapter<IgniteTx>(cctx.kernalContext()) {
@Override public String toString() {
return S.toString(GridFutureAdapter.class, this, "tx", GridCacheTxAdapter.this);
}
@@ -1050,7 +1050,7 @@ public abstract class GridCacheTxAdapter<K, V> extends GridMetadataAwareAdapter
}
if (notify) {
- GridFutureAdapter<GridCacheTx> fut = finFut.get();
+ GridFutureAdapter<IgniteTx> fut = finFut.get();
if (fut != null)
fut.onDone(this);
@@ -1354,7 +1354,7 @@ public abstract class GridCacheTxAdapter<K, V> extends GridMetadataAwareAdapter
/**
* Transaction shadow class to be used for deserialization.
*/
- private static class TxShadow extends GridMetadataAwareAdapter implements GridCacheTx {
+ private static class TxShadow extends GridMetadataAwareAdapter implements IgniteTx {
/** */
private static final long serialVersionUID = 0L;
@@ -1496,7 +1496,7 @@ public abstract class GridCacheTxAdapter<K, V> extends GridMetadataAwareAdapter
}
/** {@inheritDoc} */
- @Override public IgniteFuture<GridCacheTx> commitAsync() {
+ @Override public IgniteFuture<IgniteTx> commitAsync() {
throw new IllegalStateException("Deserialized transaction can only be used as read-only.");
}
@@ -1507,7 +1507,7 @@ public abstract class GridCacheTxAdapter<K, V> extends GridMetadataAwareAdapter
/** {@inheritDoc} */
@Override public boolean equals(Object o) {
- return this == o || o instanceof GridCacheTx && xid.equals(((GridCacheTx)o).xid());
+ return this == o || o instanceof IgniteTx && xid.equals(((IgniteTx)o).xid());
}
/** {@inheritDoc} */
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/3008d2ad/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 636f4e0..a6bfa58 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
@@ -22,7 +22,7 @@ import java.util.*;
/**
* Transaction managed by cache ({@code 'Ex'} stands for external).
*/
-public interface GridCacheTxEx<K, V> extends GridCacheTx, GridTimeoutObject {
+public interface GridCacheTxEx<K, V> extends IgniteTx, GridTimeoutObject {
@SuppressWarnings("PublicInnerClass")
public enum FinalizationStatus {
/** Transaction was not finalized yet. */
@@ -391,7 +391,7 @@ public interface GridCacheTxEx<K, V> extends GridCacheTx, GridTimeoutObject {
/**
* @return Future for transaction completion.
*/
- public IgniteFuture<GridCacheTx> finishFuture();
+ public IgniteFuture<IgniteTx> finishFuture();
/**
* @param state Transaction state.
@@ -420,7 +420,7 @@ public interface GridCacheTxEx<K, V> extends GridCacheTx, GridTimeoutObject {
*
* @return Rollback future.
*/
- public IgniteFuture<GridCacheTx> rollbackAsync();
+ public IgniteFuture<IgniteTx> rollbackAsync();
/**
* Callback invoked whenever there is a lock that has been acquired
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/3008d2ad/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 c16b103..86d6cbd 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
@@ -333,7 +333,7 @@ public class GridCacheTxHandler<K, V> {
private void processNearTxFinishResponse(UUID nodeId, GridNearTxFinishResponse<K, V> res) {
ctx.tm().onFinishedRemote(nodeId, res.threadId());
- GridNearTxFinishFuture<K, V> fut = (GridNearTxFinishFuture<K, V>)ctx.mvcc().<GridCacheTx>future(
+ GridNearTxFinishFuture<K, V> fut = (GridNearTxFinishFuture<K, V>)ctx.mvcc().<IgniteTx>future(
res.xid(), res.futureId());
if (fut == null) {
@@ -372,7 +372,7 @@ public class GridCacheTxHandler<K, V> {
assert nodeId != null;
assert res != null;
- GridDhtTxFinishFuture<K, V> fut = (GridDhtTxFinishFuture<K, V>)ctx.mvcc().<GridCacheTx>future(res.xid(),
+ GridDhtTxFinishFuture<K, V> fut = (GridDhtTxFinishFuture<K, V>)ctx.mvcc().<IgniteTx>future(res.xid(),
res.futureId());
if (fut == null) {
@@ -390,7 +390,7 @@ public class GridCacheTxHandler<K, V> {
* @param req Request.
* @return Future.
*/
- @Nullable public IgniteFuture<GridCacheTx> processNearTxFinishRequest(UUID nodeId, GridNearTxFinishRequest<K, V> req) {
+ @Nullable public IgniteFuture<IgniteTx> processNearTxFinishRequest(UUID nodeId, GridNearTxFinishRequest<K, V> req) {
return finish(nodeId, null, req);
}
@@ -399,24 +399,24 @@ public class GridCacheTxHandler<K, V> {
* @param req Request.
* @return Future.
*/
- @Nullable public IgniteFuture<GridCacheTx> finish(UUID nodeId, @Nullable GridNearTxLocal<K, V> locTx,
+ @Nullable public IgniteFuture<IgniteTx> finish(UUID nodeId, @Nullable GridNearTxLocal<K, V> locTx,
GridNearTxFinishRequest<K, V> req) {
assert nodeId != null;
assert req != null;
// Transaction on local cache only.
if (locTx != null && !locTx.nearLocallyMapped() && !locTx.colocatedLocallyMapped())
- return new GridFinishedFutureEx<GridCacheTx>(locTx);
+ return new GridFinishedFutureEx<IgniteTx>(locTx);
if (log.isDebugEnabled())
log.debug("Processing near tx finish request [nodeId=" + nodeId + ", req=" + req + "]");
- IgniteFuture<GridCacheTx> colocatedFinishFut = null;
+ IgniteFuture<IgniteTx> colocatedFinishFut = null;
if (locTx != null && locTx.colocatedLocallyMapped())
colocatedFinishFut = finishColocatedLocal(req.commit(), locTx);
- IgniteFuture<GridCacheTx> nearFinishFut = null;
+ IgniteFuture<IgniteTx> nearFinishFut = null;
if (locTx == null || locTx.nearLocallyMapped()) {
if (locTx != null)
@@ -426,7 +426,7 @@ public class GridCacheTxHandler<K, V> {
}
if (colocatedFinishFut != null && nearFinishFut != null) {
- GridCompoundFuture<GridCacheTx, GridCacheTx> res = new GridCompoundFuture<>(ctx.kernalContext());
+ GridCompoundFuture<IgniteTx, IgniteTx> res = new GridCompoundFuture<>(ctx.kernalContext());
res.add(colocatedFinishFut);
res.add(nearFinishFut);
@@ -448,7 +448,7 @@ public class GridCacheTxHandler<K, V> {
* @param req Finish request.
* @return Finish future.
*/
- private IgniteFuture<GridCacheTx> finishDhtLocal(UUID nodeId, @Nullable GridNearTxLocal<K, V> locTx,
+ private IgniteFuture<IgniteTx> finishDhtLocal(UUID nodeId, @Nullable GridNearTxLocal<K, V> locTx,
GridNearTxFinishRequest<K, V> req) {
GridCacheVersion dhtVer = ctx.tm().mappedVersion(req.version());
@@ -552,7 +552,7 @@ public class GridCacheTxHandler<K, V> {
if (tx.pessimistic())
tx.prepare();
- IgniteFuture<GridCacheTx> commitFut = tx.commitAsync();
+ IgniteFuture<IgniteTx> commitFut = tx.commitAsync();
// Only for error logging.
commitFut.listenAsync(CU.errorLogger(log));
@@ -568,7 +568,7 @@ public class GridCacheTxHandler<K, V> {
tx.nearFinishFutureId(req.futureId());
tx.nearFinishMiniId(req.miniId());
- IgniteFuture<GridCacheTx> rollbackFut = tx.rollbackAsync();
+ IgniteFuture<IgniteTx> rollbackFut = tx.rollbackAsync();
// Only for error logging.
rollbackFut.listenAsync(CU.errorLogger(log));
@@ -580,7 +580,7 @@ public class GridCacheTxHandler<K, V> {
U.error(log, "Failed completing transaction [commit=" + req.commit() + ", tx=" + tx + ']', e);
if (tx != null) {
- IgniteFuture<GridCacheTx> rollbackFut = tx.rollbackAsync();
+ IgniteFuture<IgniteTx> rollbackFut = tx.rollbackAsync();
// Only for error logging.
rollbackFut.listenAsync(CU.errorLogger(log));
@@ -597,7 +597,7 @@ public class GridCacheTxHandler<K, V> {
* @param tx Transaction to commit.
* @return Future.
*/
- public IgniteFuture<GridCacheTx> finishColocatedLocal(boolean commit, GridNearTxLocal<K, V> tx) {
+ public IgniteFuture<IgniteTx> finishColocatedLocal(boolean commit, GridNearTxLocal<K, V> tx) {
try {
if (commit) {
if (!tx.markFinalizing(USER_FINISH)) {