http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/06931b4b/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/distributed/near/GridNearAtomicCache.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/distributed/near/GridNearAtomicCache.java b/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/distributed/near/GridNearAtomicCache.java index 7abba50..ce5e19c 100644 --- a/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/distributed/near/GridNearAtomicCache.java +++ b/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/distributed/near/GridNearAtomicCache.java @@ -9,14 +9,14 @@ package org.gridgain.grid.kernal.processors.cache.distributed.near; +import org.apache.ignite.*; import org.apache.ignite.lang.*; -import org.gridgain.grid.*; +import org.apache.ignite.plugin.security.*; import org.gridgain.grid.cache.*; import org.gridgain.grid.kernal.processors.cache.*; import org.gridgain.grid.kernal.processors.cache.distributed.dht.*; import org.gridgain.grid.kernal.processors.cache.distributed.dht.atomic.*; import org.gridgain.grid.kernal.processors.cache.dr.*; -import org.apache.ignite.plugin.security.*; import org.gridgain.grid.util.*; import org.gridgain.grid.util.future.*; import org.gridgain.grid.util.typedef.*; @@ -63,7 +63,7 @@ public class GridNearAtomicCache<K, V> extends GridNearCacheAdapter<K, V> { } /** {@inheritDoc} */ - @Override public void start() throws GridException { + @Override public void start() throws IgniteCheckedException { ctx.io().addHandler(ctx.cacheId(), GridNearGetResponse.class, new CI2<UUID, GridNearGetResponse<K, V>>() { @Override public void apply(UUID nodeId, GridNearGetResponse<K, V> res) { processGetResponse(nodeId, res); @@ -151,8 +151,8 @@ public class GridNearAtomicCache<K, V> extends GridNearCacheAdapter<K, V> { processNearAtomicUpdateResponse(ver, key, val, valBytes, res.nearTtl(), req.nodeId(), req.subjectId(), taskName); } - catch (GridException e) { - res.addFailedKey(key, new GridException("Failed to update key in near cache: " + key, e)); + catch (IgniteCheckedException e) { + res.addFailedKey(key, new IgniteCheckedException("Failed to update key in near cache: " + key, e)); } } } @@ -164,7 +164,7 @@ public class GridNearAtomicCache<K, V> extends GridNearCacheAdapter<K, V> { * @param valBytes Value bytes. * @param ttl Time to live. * @param nodeId Node ID. - * @throws GridException If failed. + * @throws IgniteCheckedException If failed. */ private void processNearAtomicUpdateResponse( GridCacheVersion ver, @@ -175,7 +175,7 @@ public class GridNearAtomicCache<K, V> extends GridNearCacheAdapter<K, V> { UUID nodeId, UUID subjId, String taskName - ) throws GridException { + ) throws IgniteCheckedException { try { while (true) { GridCacheEntryEx<K, V> entry = null; @@ -318,8 +318,8 @@ public class GridNearAtomicCache<K, V> extends GridNearCacheAdapter<K, V> { } } } - catch (GridException e) { - res.addFailedKey(key, new GridException("Failed to update near cache key: " + key, e)); + catch (IgniteCheckedException e) { + res.addFailedKey(key, new IgniteCheckedException("Failed to update near cache key: " + key, e)); } } } @@ -353,7 +353,7 @@ public class GridNearAtomicCache<K, V> extends GridNearCacheAdapter<K, V> { @Nullable GridCacheEntryEx<K, V> cached, long ttl, @Nullable IgnitePredicate<GridCacheEntry<K, V>>[] filter - ) throws GridException { + ) throws IgniteCheckedException { return dht.put(key, val, cached, ttl, filter); } @@ -362,14 +362,14 @@ public class GridNearAtomicCache<K, V> extends GridNearCacheAdapter<K, V> { V val, @Nullable GridCacheEntryEx<K, V> cached, long ttl, - @Nullable IgnitePredicate<GridCacheEntry<K, V>>... filter) throws GridException { + @Nullable IgnitePredicate<GridCacheEntry<K, V>>... filter) throws IgniteCheckedException { return dht.putx(key, val, cached, ttl, filter); } /** {@inheritDoc} */ @Override public boolean putx(K key, V val, - IgnitePredicate<GridCacheEntry<K, V>>[] filter) throws GridException { + IgnitePredicate<GridCacheEntry<K, V>>[] filter) throws IgniteCheckedException { return dht.putx(key, val, filter); } @@ -394,7 +394,7 @@ public class GridNearAtomicCache<K, V> extends GridNearCacheAdapter<K, V> { } /** {@inheritDoc} */ - @Override public V putIfAbsent(K key, V val) throws GridException { + @Override public V putIfAbsent(K key, V val) throws IgniteCheckedException { return dht.putIfAbsent(key, val); } @@ -404,7 +404,7 @@ public class GridNearAtomicCache<K, V> extends GridNearCacheAdapter<K, V> { } /** {@inheritDoc} */ - @Override public boolean putxIfAbsent(K key, V val) throws GridException { + @Override public boolean putxIfAbsent(K key, V val) throws IgniteCheckedException { return dht.putxIfAbsent(key, val); } @@ -414,7 +414,7 @@ public class GridNearAtomicCache<K, V> extends GridNearCacheAdapter<K, V> { } /** {@inheritDoc} */ - @Override public V replace(K key, V val) throws GridException { + @Override public V replace(K key, V val) throws IgniteCheckedException { return dht.replace(key, val); } @@ -424,7 +424,7 @@ public class GridNearAtomicCache<K, V> extends GridNearCacheAdapter<K, V> { } /** {@inheritDoc} */ - @Override public boolean replacex(K key, V val) throws GridException { + @Override public boolean replacex(K key, V val) throws IgniteCheckedException { return dht.replacex(key, val); } @@ -434,7 +434,7 @@ public class GridNearAtomicCache<K, V> extends GridNearCacheAdapter<K, V> { } /** {@inheritDoc} */ - @Override public boolean replace(K key, V oldVal, V newVal) throws GridException { + @Override public boolean replace(K key, V oldVal, V newVal) throws IgniteCheckedException { return dht.replace(key, oldVal, newVal); } @@ -444,12 +444,12 @@ public class GridNearAtomicCache<K, V> extends GridNearCacheAdapter<K, V> { } /** {@inheritDoc} */ - @Override public GridCacheReturn<V> removex(K key, V val) throws GridException { + @Override public GridCacheReturn<V> removex(K key, V val) throws IgniteCheckedException { return dht.removex(key, val); } /** {@inheritDoc} */ - @Override public GridCacheReturn<V> replacex(K key, V oldVal, V newVal) throws GridException { + @Override public GridCacheReturn<V> replacex(K key, V oldVal, V newVal) throws IgniteCheckedException { return dht.replacex(key, oldVal, newVal); } @@ -467,7 +467,7 @@ public class GridNearAtomicCache<K, V> extends GridNearCacheAdapter<K, V> { /** {@inheritDoc} */ @Override public void putAll(Map<? extends K, ? extends V> m, IgnitePredicate<GridCacheEntry<K, V>>[] filter) - throws GridException { + throws IgniteCheckedException { dht.putAll(m, filter); } @@ -478,23 +478,23 @@ public class GridNearAtomicCache<K, V> extends GridNearCacheAdapter<K, V> { } /** {@inheritDoc} */ - @Override public void putAllDr(Map<? extends K, GridCacheDrInfo<V>> drMap) throws GridException { + @Override public void putAllDr(Map<? extends K, GridCacheDrInfo<V>> drMap) throws IgniteCheckedException { dht.putAllDr(drMap); } /** {@inheritDoc} */ - @Override public IgniteFuture<?> putAllDrAsync(Map<? extends K, GridCacheDrInfo<V>> drMap) throws GridException { + @Override public IgniteFuture<?> putAllDrAsync(Map<? extends K, GridCacheDrInfo<V>> drMap) throws IgniteCheckedException { return dht.putAllDrAsync(drMap); } /** {@inheritDoc} */ - @Override public void transform(K key, IgniteClosure<V, V> transformer) throws GridException { + @Override public void transform(K key, IgniteClosure<V, V> transformer) throws IgniteCheckedException { dht.transform(key, transformer); } /** {@inheritDoc} */ @Override public <R> R transformAndCompute(K key, IgniteClosure<V, IgniteBiTuple<V, R>> transformer) - throws GridException { + throws IgniteCheckedException { return dht.transformAndCompute(key, transformer); } @@ -507,7 +507,7 @@ public class GridNearAtomicCache<K, V> extends GridNearCacheAdapter<K, V> { } /** {@inheritDoc} */ - @Override public void transformAll(@Nullable Map<? extends K, ? extends IgniteClosure<V, V>> m) throws GridException { + @Override public void transformAll(@Nullable Map<? extends K, ? extends IgniteClosure<V, V>> m) throws IgniteCheckedException { dht.transformAll(m); } @@ -519,7 +519,7 @@ public class GridNearAtomicCache<K, V> extends GridNearCacheAdapter<K, V> { /** {@inheritDoc} */ @Override public V remove(K key, @Nullable GridCacheEntryEx<K, V> entry, - @Nullable IgnitePredicate<GridCacheEntry<K, V>>... filter) throws GridException { + @Nullable IgnitePredicate<GridCacheEntry<K, V>>... filter) throws IgniteCheckedException { return dht.remove(key, entry, filter); } @@ -533,7 +533,7 @@ public class GridNearAtomicCache<K, V> extends GridNearCacheAdapter<K, V> { /** {@inheritDoc} */ @Override public void removeAll(Collection<? extends K> keys, IgnitePredicate<GridCacheEntry<K, V>>... filter) - throws GridException { + throws IgniteCheckedException { dht.removeAll(keys, filter); } @@ -546,7 +546,7 @@ public class GridNearAtomicCache<K, V> extends GridNearCacheAdapter<K, V> { /** {@inheritDoc} */ @Override public boolean removex(K key, @Nullable GridCacheEntryEx<K, V> entry, - @Nullable IgnitePredicate<GridCacheEntry<K, V>>... filter) throws GridException { + @Nullable IgnitePredicate<GridCacheEntry<K, V>>... filter) throws IgniteCheckedException { return dht.removex(key, entry, filter); } @@ -559,7 +559,7 @@ public class GridNearAtomicCache<K, V> extends GridNearCacheAdapter<K, V> { } /** {@inheritDoc} */ - @Override public boolean remove(K key, V val) throws GridException { + @Override public boolean remove(K key, V val) throws IgniteCheckedException { return dht.remove(key, val); } @@ -569,7 +569,7 @@ public class GridNearAtomicCache<K, V> extends GridNearCacheAdapter<K, V> { } /** {@inheritDoc} */ - @Override public void removeAll(IgnitePredicate<GridCacheEntry<K, V>>[] filter) throws GridException { + @Override public void removeAll(IgnitePredicate<GridCacheEntry<K, V>>[] filter) throws IgniteCheckedException { dht.removeAll(keySet(filter)); } @@ -579,12 +579,12 @@ public class GridNearAtomicCache<K, V> extends GridNearCacheAdapter<K, V> { } /** {@inheritDoc} */ - @Override public void removeAllDr(Map<? extends K, GridCacheVersion> drMap) throws GridException { + @Override public void removeAllDr(Map<? extends K, GridCacheVersion> drMap) throws IgniteCheckedException { dht.removeAllDr(drMap); } /** {@inheritDoc} */ - @Override public IgniteFuture<?> removeAllDrAsync(Map<? extends K, GridCacheVersion> drMap) throws GridException { + @Override public IgniteFuture<?> removeAllDrAsync(Map<? extends K, GridCacheVersion> drMap) throws IgniteCheckedException { return dht.removeAllDrAsync(drMap); } @@ -602,7 +602,7 @@ public class GridNearAtomicCache<K, V> extends GridNearCacheAdapter<K, V> { /** {@inheritDoc} */ @Override public void unlockAll(@Nullable Collection<? extends K> keys, - @Nullable IgnitePredicate<GridCacheEntry<K, V>>... filter) throws GridException { + @Nullable IgnitePredicate<GridCacheEntry<K, V>>... filter) throws IgniteCheckedException { dht.unlockAll(keys, filter); }
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/06931b4b/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/distributed/near/GridNearCacheAdapter.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/distributed/near/GridNearCacheAdapter.java b/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/distributed/near/GridNearCacheAdapter.java index 42b50a8..b785103 100644 --- a/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/distributed/near/GridNearCacheAdapter.java +++ b/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/distributed/near/GridNearCacheAdapter.java @@ -9,8 +9,8 @@ package org.gridgain.grid.kernal.processors.cache.distributed.near; +import org.apache.ignite.*; import org.apache.ignite.lang.*; -import org.gridgain.grid.*; import org.gridgain.grid.cache.*; import org.gridgain.grid.kernal.processors.cache.*; import org.gridgain.grid.kernal.processors.cache.distributed.*; @@ -169,7 +169,7 @@ public abstract class GridNearCacheAdapter<K, V> extends GridDistributedCacheAda /** {@inheritDoc} */ @Override public void reloadAll(@Nullable Collection<? extends K> keys, - @Nullable IgnitePredicate<GridCacheEntry<K, V>>... filter) throws GridException { + @Nullable IgnitePredicate<GridCacheEntry<K, V>>... filter) throws IgniteCheckedException { dht().reloadAll(keys, filter); super.reloadAll(keys, filter); @@ -192,7 +192,7 @@ public abstract class GridNearCacheAdapter<K, V> extends GridDistributedCacheAda /** {@inheritDoc} */ @Override public V reload(K key, @Nullable IgnitePredicate<GridCacheEntry<K, V>>... filter) - throws GridException { + throws IgniteCheckedException { V val; try { @@ -208,7 +208,7 @@ public abstract class GridNearCacheAdapter<K, V> extends GridDistributedCacheAda } /** {@inheritDoc} */ - @Override public void reloadAll() throws GridException { + @Override public void reloadAll() throws IgniteCheckedException { super.reloadAll(); dht().reloadAll(); @@ -269,7 +269,7 @@ public abstract class GridNearCacheAdapter<K, V> extends GridDistributedCacheAda } /** {@inheritDoc} */ - @Override public void loadCache(IgniteBiPredicate<K, V> p, long ttl, Object[] args) throws GridException { + @Override public void loadCache(IgniteBiPredicate<K, V> p, long ttl, Object[] args) throws IgniteCheckedException { dht().loadCache(p, ttl, args); } @@ -428,7 +428,7 @@ public abstract class GridNearCacheAdapter<K, V> extends GridDistributedCacheAda /** {@inheritDoc} */ @Override public boolean compact(K key, - @Nullable IgnitePredicate<GridCacheEntry<K, V>>[] filter) throws GridException { + @Nullable IgnitePredicate<GridCacheEntry<K, V>>[] filter) throws IgniteCheckedException { return super.compact(key, filter) | dht().compact(key, filter); } @@ -477,7 +477,7 @@ public abstract class GridNearCacheAdapter<K, V> extends GridDistributedCacheAda } /** {@inheritDoc} */ - @Override public V peek(K key, @Nullable Collection<GridCachePeekMode> modes) throws GridException { + @Override public V peek(K key, @Nullable Collection<GridCachePeekMode> modes) throws IgniteCheckedException { GridTuple<V> val = null; if (!modes.contains(PARTITIONED_ONLY)) { @@ -527,7 +527,7 @@ public abstract class GridNearCacheAdapter<K, V> extends GridDistributedCacheAda } /** {@inheritDoc} */ - @Override public V promote(K key, boolean deserializePortable) throws GridException { + @Override public V promote(K key, boolean deserializePortable) throws IgniteCheckedException { ctx.denyOnFlags(F.asList(READ, SKIP_SWAP)); // Unswap only from dht(). Near cache does not have swap storage. @@ -535,7 +535,7 @@ public abstract class GridNearCacheAdapter<K, V> extends GridDistributedCacheAda } /** {@inheritDoc} */ - @Override public V promote(K key) throws GridException { + @Override public V promote(K key) throws IgniteCheckedException { ctx.denyOnFlags(F.asList(READ, SKIP_SWAP)); // Unswap only from dht(). Near cache does not have swap storage. @@ -543,7 +543,7 @@ public abstract class GridNearCacheAdapter<K, V> extends GridDistributedCacheAda } /** {@inheritDoc} */ - @Override public void promoteAll(@Nullable Collection<? extends K> keys) throws GridException { + @Override public void promoteAll(@Nullable Collection<? extends K> keys) throws IgniteCheckedException { ctx.denyOnFlags(F.asList(READ, SKIP_SWAP)); // Unswap only from dht(). Near cache does not have swap storage. @@ -553,14 +553,14 @@ public abstract class GridNearCacheAdapter<K, V> extends GridDistributedCacheAda } /** {@inheritDoc} */ - @Override public Iterator<Map.Entry<K, V>> swapIterator() throws GridException { + @Override public Iterator<Map.Entry<K, V>> swapIterator() throws IgniteCheckedException { ctx.denyOnFlags(F.asList(SKIP_SWAP)); return dht().swapIterator(); } /** {@inheritDoc} */ - @Override public Iterator<Map.Entry<K, V>> offHeapIterator() throws GridException { + @Override public Iterator<Map.Entry<K, V>> offHeapIterator() throws IgniteCheckedException { return dht().offHeapIterator(); } @@ -575,12 +575,12 @@ public abstract class GridNearCacheAdapter<K, V> extends GridDistributedCacheAda } /** {@inheritDoc} */ - @Override public long swapSize() throws GridException { + @Override public long swapSize() throws IgniteCheckedException { return dht().swapSize(); } /** {@inheritDoc} */ - @Override public long swapKeys() throws GridException { + @Override public long swapKeys() throws IgniteCheckedException { return dht().swapKeys(); } @@ -735,8 +735,8 @@ public abstract class GridNearCacheAdapter<K, V> extends GridDistributedCacheAda try { GridNearCacheAdapter.this.remove(currEntry.getKey(), CU.<K, V>empty()); } - catch (GridException e) { - throw new GridRuntimeException(e); + catch (IgniteCheckedException e) { + throw new IgniteException(e); } } } http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/06931b4b/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/distributed/near/GridNearCacheEntry.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/distributed/near/GridNearCacheEntry.java b/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/distributed/near/GridNearCacheEntry.java index 9a3d2d7..7759f49 100644 --- a/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/distributed/near/GridNearCacheEntry.java +++ b/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/distributed/near/GridNearCacheEntry.java @@ -9,16 +9,16 @@ package org.gridgain.grid.kernal.processors.cache.distributed.near; +import org.apache.ignite.*; import org.apache.ignite.cluster.*; import org.apache.ignite.lang.*; -import org.gridgain.grid.*; import org.gridgain.grid.cache.*; import org.gridgain.grid.kernal.processors.cache.*; import org.gridgain.grid.kernal.processors.cache.distributed.*; import org.gridgain.grid.kernal.processors.cache.distributed.dht.*; +import org.gridgain.grid.util.lang.*; import org.gridgain.grid.util.typedef.*; import org.gridgain.grid.util.typedef.internal.*; -import org.gridgain.grid.util.lang.*; import org.jetbrains.annotations.*; import java.util.*; @@ -63,7 +63,7 @@ public class GridNearCacheEntry<K, V> extends GridDistributedCacheEntry<K, V> { } /** {@inheritDoc} */ - @Override public int memorySize() throws GridException { + @Override public int memorySize() throws IgniteCheckedException { return super.memorySize() + NEAR_SIZE_OVERHEAD; } @@ -169,11 +169,11 @@ public class GridNearCacheEntry<K, V> extends GridDistributedCacheEntry<K, V> { * @param primaryNodeId Primary node ID. * @return {@code True} if reset was done. * @throws GridCacheEntryRemovedException If obsolete. - * @throws GridException If failed. + * @throws IgniteCheckedException If failed. */ @SuppressWarnings( {"RedundantTypeArguments"}) public boolean resetFromPrimary(V val, byte[] valBytes, GridCacheVersion ver, GridCacheVersion dhtVer, - UUID primaryNodeId) throws GridCacheEntryRemovedException, GridException { + UUID primaryNodeId) throws GridCacheEntryRemovedException, IgniteCheckedException { assert dhtVer != null; cctx.versions().onReceived(primaryNodeId, dhtVer); @@ -311,7 +311,7 @@ public class GridNearCacheEntry<K, V> extends GridDistributedCacheEntry<K, V> { /** {@inheritDoc} */ @Override protected V readThrough(GridCacheTxEx<K, V> tx, K key, boolean reload, - IgnitePredicate<GridCacheEntry<K, V>>[] filter, UUID subjId, String taskName) throws GridException { + IgnitePredicate<GridCacheEntry<K, V>>[] filter, UUID subjId, String taskName) throws IgniteCheckedException { return cctx.near().loadAsync(tx, F.asList(key), reload, /*force primary*/false, filter, subjId, taskName, true). get().get(key); } @@ -329,14 +329,14 @@ public class GridNearCacheEntry<K, V> extends GridDistributedCacheEntry<K, V> { * @param evt Event flag. * @param topVer Topology version. * @return {@code True} if initial value was set. - * @throws GridException In case of error. + * @throws IgniteCheckedException In case of error. * @throws GridCacheEntryRemovedException If entry was removed. */ @SuppressWarnings({"RedundantTypeArguments"}) public boolean loadedValue(@Nullable GridCacheTxEx tx, UUID primaryNodeId, V val, byte[] valBytes, GridCacheVersion ver, GridCacheVersion dhtVer, @Nullable GridCacheVersion expVer, long ttl, long expireTime, boolean evt, long topVer, UUID subjId) - throws GridException, GridCacheEntryRemovedException { + throws IgniteCheckedException, GridCacheEntryRemovedException { boolean valid = valid(tx != null ? tx.topologyVersion() : cctx.affinity().affinityTopologyVersion()); if (valBytes != null && val == null && (isNewLocked() || !valid)) @@ -396,7 +396,7 @@ public class GridNearCacheEntry<K, V> extends GridDistributedCacheEntry<K, V> { /** {@inheritDoc} */ @Override protected void updateIndex(V val, byte[] valBytes, long expireTime, - GridCacheVersion ver, V old) throws GridException { + GridCacheVersion ver, V old) throws IgniteCheckedException { // No-op: queries are disabled for near cache. } http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/06931b4b/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/distributed/near/GridNearGetFuture.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/distributed/near/GridNearGetFuture.java b/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/distributed/near/GridNearGetFuture.java index 2050742..b979d13 100644 --- a/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/distributed/near/GridNearGetFuture.java +++ b/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/distributed/near/GridNearGetFuture.java @@ -356,7 +356,7 @@ public final class GridNearGetFuture<K, V> extends GridCompoundIdentityFuture<Ma try { cctx.io().send(n, req); } - catch (GridException e) { + catch (IgniteCheckedException e) { // Fail the whole thing. if (e instanceof ClusterTopologyException) fut.onResult((ClusterTopologyException)e); @@ -503,7 +503,7 @@ public final class GridNearGetFuture<K, V> extends GridCompoundIdentityFuture<Ma break; } - catch (GridException e) { + catch (IgniteCheckedException e) { onDone(e); break; @@ -596,7 +596,7 @@ public final class GridNearGetFuture<K, V> extends GridCompoundIdentityFuture<Ma if (log.isDebugEnabled()) log.debug("Got removed entry while processing get response (will not retry)."); } - catch (GridException e) { + catch (IgniteCheckedException e) { // Fail. onDone(e); @@ -742,7 +742,7 @@ public final class GridNearGetFuture<K, V> extends GridCompoundIdentityFuture<Ma if (rmtTopVer <= topVer) { // Fail the whole get future. - onDone(new GridException("Failed to process invalid partitions response (remote node reported " + + onDone(new IgniteCheckedException("Failed to process invalid partitions response (remote node reported " + "invalid partitions but remote topology version does not differ from local) " + "[topVer=" + topVer + ", rmtTopVer=" + rmtTopVer + ", invalidParts=" + invalidParts + ", nodeId=" + node.id() + ']')); @@ -757,7 +757,7 @@ public final class GridNearGetFuture<K, V> extends GridCompoundIdentityFuture<Ma IgniteFuture<Long> topFut = ctx.discovery().topologyFuture(rmtTopVer); topFut.listenAsync(new CIX1<IgniteFuture<Long>>() { - @Override public void applyx(IgniteFuture<Long> fut) throws GridException { + @Override public void applyx(IgniteFuture<Long> fut) throws IgniteCheckedException { long readyTopVer = fut.get(); // This will append new futures to compound list. @@ -792,13 +792,13 @@ public final class GridNearGetFuture<K, V> extends GridCompoundIdentityFuture<Ma private long topVer; /** Exception cause. */ - private GridException e; + private IgniteCheckedException e; /** * @param timeout Timeout. * @param topVer Topology version timeout was created on. */ - private RemapTimeoutObject(long timeout, long topVer, GridException e) { + private RemapTimeoutObject(long timeout, long topVer, IgniteCheckedException e) { super(timeout); this.topVer = topVer; @@ -809,7 +809,7 @@ public final class GridNearGetFuture<K, V> extends GridCompoundIdentityFuture<Ma @Override public void onTimeout() { if (finish()) // Fail the whole get future. - onDone(new GridException("Failed to wait for topology version to change: " + (topVer + 1), e)); + onDone(new IgniteCheckedException("Failed to wait for topology version to change: " + (topVer + 1), e)); // else remap happened concurrently. } http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/06931b4b/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/distributed/near/GridNearGetRequest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/distributed/near/GridNearGetRequest.java b/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/distributed/near/GridNearGetRequest.java index fa68955..12aacb7 100644 --- a/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/distributed/near/GridNearGetRequest.java +++ b/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/distributed/near/GridNearGetRequest.java @@ -9,15 +9,15 @@ package org.gridgain.grid.kernal.processors.cache.distributed.near; +import org.apache.ignite.*; import org.apache.ignite.lang.*; -import org.gridgain.grid.*; import org.gridgain.grid.cache.*; import org.gridgain.grid.kernal.*; import org.gridgain.grid.kernal.processors.cache.*; import org.gridgain.grid.util.direct.*; +import org.gridgain.grid.util.tostring.*; import org.gridgain.grid.util.typedef.*; import org.gridgain.grid.util.typedef.internal.*; -import org.gridgain.grid.util.tostring.*; import java.io.*; import java.nio.*; @@ -182,9 +182,9 @@ public class GridNearGetRequest<K, V> extends GridCacheMessage<K, V> implements /** * @param ctx Cache context. - * @throws GridException If failed. + * @throws IgniteCheckedException If failed. */ - @Override public void prepareMarshal(GridCacheSharedContext<K, V> ctx) throws GridException { + @Override public void prepareMarshal(GridCacheSharedContext<K, V> ctx) throws IgniteCheckedException { super.prepareMarshal(ctx); assert ctx != null; @@ -200,9 +200,9 @@ public class GridNearGetRequest<K, V> extends GridCacheMessage<K, V> implements /** * @param ctx Context. * @param ldr Loader. - * @throws GridException If failed. + * @throws IgniteCheckedException If failed. */ - @Override public void finishUnmarshal(GridCacheSharedContext<K, V> ctx, ClassLoader ldr) throws GridException { + @Override public void finishUnmarshal(GridCacheSharedContext<K, V> ctx, ClassLoader ldr) throws IgniteCheckedException { super.finishUnmarshal(ctx, ldr); if (keys == null) http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/06931b4b/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/distributed/near/GridNearGetResponse.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/distributed/near/GridNearGetResponse.java b/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/distributed/near/GridNearGetResponse.java index e3718c9..5d171bc 100644 --- a/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/distributed/near/GridNearGetResponse.java +++ b/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/distributed/near/GridNearGetResponse.java @@ -9,14 +9,14 @@ package org.gridgain.grid.kernal.processors.cache.distributed.near; +import org.apache.ignite.*; import org.apache.ignite.lang.*; -import org.gridgain.grid.*; import org.gridgain.grid.kernal.*; import org.gridgain.grid.kernal.processors.cache.*; -import org.gridgain.grid.util.direct.*; import org.gridgain.grid.util.*; -import org.gridgain.grid.util.typedef.internal.*; +import org.gridgain.grid.util.direct.*; import org.gridgain.grid.util.tostring.*; +import org.gridgain.grid.util.typedef.internal.*; import java.io.*; import java.nio.*; @@ -163,7 +163,7 @@ public class GridNearGetResponse<K, V> extends GridCacheMessage<K, V> implements /** {@inheritDoc} * @param ctx*/ - @Override public void prepareMarshal(GridCacheSharedContext<K, V> ctx) throws GridException { + @Override public void prepareMarshal(GridCacheSharedContext<K, V> ctx) throws IgniteCheckedException { super.prepareMarshal(ctx); if (entries != null) { @@ -177,7 +177,7 @@ public class GridNearGetResponse<K, V> extends GridCacheMessage<K, V> implements } /** {@inheritDoc} */ - @Override public void finishUnmarshal(GridCacheSharedContext<K, V> ctx, ClassLoader ldr) throws GridException { + @Override public void finishUnmarshal(GridCacheSharedContext<K, V> ctx, ClassLoader ldr) throws IgniteCheckedException { super.finishUnmarshal(ctx, ldr); if (entriesBytes != null) { http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/06931b4b/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/distributed/near/GridNearLockFuture.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/distributed/near/GridNearLockFuture.java b/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/distributed/near/GridNearLockFuture.java index a63ff2c..15f9a85 100644 --- a/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/distributed/near/GridNearLockFuture.java +++ b/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/distributed/near/GridNearLockFuture.java @@ -485,7 +485,7 @@ public final class GridNearLockFuture<K, V> extends GridCompoundIdentityFuture<B return true; } - catch (GridException e) { + catch (IgniteCheckedException e) { onError(e); return false; @@ -694,7 +694,7 @@ public final class GridNearLockFuture<K, V> extends GridCompoundIdentityFuture<B cctx.topology().readUnlock(); } } - catch (GridException e) { + catch (IgniteCheckedException e) { onDone(e); } } @@ -916,7 +916,7 @@ public final class GridNearLockFuture<K, V> extends GridCompoundIdentityFuture<B proceedMapping(mappings); } - catch (GridException ex) { + catch (IgniteCheckedException ex) { onError(ex); } } @@ -926,10 +926,10 @@ public final class GridNearLockFuture<K, V> extends GridCompoundIdentityFuture<B * remote primary node. * * @param mappings Queue of mappings. - * @throws GridException If mapping can not be completed. + * @throws IgniteCheckedException If mapping can not be completed. */ private void proceedMapping(final ConcurrentLinkedDeque8<GridNearLockMapping<K, V>> mappings) - throws GridException { + throws IgniteCheckedException { GridNearLockMapping<K, V> map = mappings.poll(); // If there are no more mappings to process, complete the future. @@ -968,7 +968,7 @@ public final class GridNearLockFuture<K, V> extends GridCompoundIdentityFuture<B } if (res == null) { - onError(new GridException("Lock response is null for future: " + this)); + onError(new IgniteCheckedException("Lock response is null for future: " + this)); return false; } @@ -1071,7 +1071,7 @@ public final class GridNearLockFuture<K, V> extends GridCompoundIdentityFuture<B // Proceed and add new future (if any) before completing embedded future. proceedMapping(mappings); } - catch (GridException ex) { + catch (IgniteCheckedException ex) { onError(ex); return false; @@ -1121,7 +1121,7 @@ public final class GridNearLockFuture<K, V> extends GridCompoundIdentityFuture<B fut.onResult(ex); } - catch (GridException e) { + catch (IgniteCheckedException e) { onError(e); } } @@ -1135,10 +1135,10 @@ public final class GridNearLockFuture<K, V> extends GridCompoundIdentityFuture<B * @param key Key to map. * @param topVer Topology version. * @return Near lock mapping. - * @throws GridException If mapping for key failed. + * @throws IgniteCheckedException If mapping for key failed. */ private GridNearLockMapping<K, V> map(K key, @Nullable GridNearLockMapping<K, V> mapping, - long topVer) throws GridException { + long topVer) throws IgniteCheckedException { assert mapping == null || mapping.node() != null; ClusterNode primary = cctx.affinity().primary(key, topVer); @@ -1148,7 +1148,7 @@ public final class GridNearLockFuture<K, V> extends GridCompoundIdentityFuture<B throw newTopologyException(null, primary.id()); if (inTx() && tx.groupLock() && !primary.isLocal()) - throw new GridException("Failed to start group lock transaction (local node is not primary for " + + throw new IgniteCheckedException("Failed to start group lock transaction (local node is not primary for " + " key) [key=" + key + ", primaryNodeId=" + primary.id() + ']'); if (mapping == null || !primary.id().equals(mapping.node().id())) @@ -1340,7 +1340,7 @@ public final class GridNearLockFuture<K, V> extends GridCompoundIdentityFuture<B try { if (res.dhtVersion(i) == null) { - onDone(new GridException("Failed to receive DHT version from remote node " + + onDone(new IgniteCheckedException("Failed to receive DHT version from remote node " + "(will fail the lock): " + res)); return; @@ -1421,7 +1421,7 @@ public final class GridNearLockFuture<K, V> extends GridCompoundIdentityFuture<B // Replace old entry with new one. entries.set(i, (GridDistributedCacheEntry<K, V>)cctx.cache().entryEx(entry.key())); } - catch (GridException e) { + catch (IgniteCheckedException e) { onDone(e); return; @@ -1434,7 +1434,7 @@ public final class GridNearLockFuture<K, V> extends GridCompoundIdentityFuture<B try { proceedMapping(mappings); } - catch (GridException e) { + catch (IgniteCheckedException e) { onDone(e); } http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/06931b4b/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/distributed/near/GridNearLockRequest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/distributed/near/GridNearLockRequest.java b/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/distributed/near/GridNearLockRequest.java index ff8d05d..d9217d5 100644 --- a/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/distributed/near/GridNearLockRequest.java +++ b/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/distributed/near/GridNearLockRequest.java @@ -9,15 +9,15 @@ package org.gridgain.grid.kernal.processors.cache.distributed.near; +import org.apache.ignite.*; import org.apache.ignite.lang.*; -import org.gridgain.grid.*; import org.gridgain.grid.cache.*; import org.gridgain.grid.kernal.*; import org.gridgain.grid.kernal.processors.cache.*; import org.gridgain.grid.kernal.processors.cache.distributed.*; import org.gridgain.grid.util.direct.*; -import org.gridgain.grid.util.typedef.internal.*; import org.gridgain.grid.util.tostring.*; +import org.gridgain.grid.util.typedef.internal.*; import org.jetbrains.annotations.*; import java.io.*; @@ -202,10 +202,10 @@ public class GridNearLockRequest<K, V> extends GridDistributedLockRequest<K, V> /** * @param filter Filter. * @param ctx Context. - * @throws GridException If failed. + * @throws IgniteCheckedException If failed. */ public void filter(IgnitePredicate<GridCacheEntry<K, V>>[] filter, GridCacheContext<K, V> ctx) - throws GridException { + throws IgniteCheckedException { this.filter = filter; } @@ -247,7 +247,7 @@ public class GridNearLockRequest<K, V> extends GridDistributedLockRequest<K, V> * @param writeEntry Write entry if implicit transaction mapped on one node. * @param drVer DR version. * @param ctx Context. - * @throws GridException If failed. + * @throws IgniteCheckedException If failed. */ public void addKeyBytes( K key, @@ -257,7 +257,7 @@ public class GridNearLockRequest<K, V> extends GridDistributedLockRequest<K, V> @Nullable GridCacheTxEntry<K, V> writeEntry, @Nullable GridCacheVersion drVer, GridCacheContext<K, V> ctx - ) throws GridException { + ) throws IgniteCheckedException { dhtVers[idx] = dhtVer; // Delegate to super. @@ -274,7 +274,7 @@ public class GridNearLockRequest<K, V> extends GridDistributedLockRequest<K, V> /** {@inheritDoc} * @param ctx*/ - @Override public void prepareMarshal(GridCacheSharedContext<K, V> ctx) throws GridException { + @Override public void prepareMarshal(GridCacheSharedContext<K, V> ctx) throws IgniteCheckedException { super.prepareMarshal(ctx); if (filterBytes == null) @@ -282,7 +282,7 @@ public class GridNearLockRequest<K, V> extends GridDistributedLockRequest<K, V> } /** {@inheritDoc} */ - @Override public void finishUnmarshal(GridCacheSharedContext<K, V> ctx, ClassLoader ldr) throws GridException { + @Override public void finishUnmarshal(GridCacheSharedContext<K, V> ctx, ClassLoader ldr) throws IgniteCheckedException { super.finishUnmarshal(ctx, ldr); if (filter == null && filterBytes != null) http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/06931b4b/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/distributed/near/GridNearLockResponse.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/distributed/near/GridNearLockResponse.java b/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/distributed/near/GridNearLockResponse.java index a1350dd..7a0c2fd 100644 --- a/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/distributed/near/GridNearLockResponse.java +++ b/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/distributed/near/GridNearLockResponse.java @@ -9,14 +9,14 @@ package org.gridgain.grid.kernal.processors.cache.distributed.near; +import org.apache.ignite.*; import org.apache.ignite.lang.*; -import org.gridgain.grid.*; import org.gridgain.grid.kernal.*; import org.gridgain.grid.kernal.processors.cache.*; import org.gridgain.grid.kernal.processors.cache.distributed.*; import org.gridgain.grid.util.direct.*; -import org.gridgain.grid.util.typedef.internal.*; import org.gridgain.grid.util.tostring.*; +import org.gridgain.grid.util.typedef.internal.*; import org.jetbrains.annotations.*; import java.io.*; @@ -148,7 +148,7 @@ public class GridNearLockResponse<K, V> extends GridDistributedLockResponse<K, V * @param dhtVer DHT version. * @param mappedVer Mapped version. * @param ctx Context. - * @throws GridException If failed. + * @throws IgniteCheckedException If failed. */ public void addValueBytes( @Nullable V val, @@ -157,7 +157,7 @@ public class GridNearLockResponse<K, V> extends GridDistributedLockResponse<K, V @Nullable GridCacheVersion dhtVer, @Nullable GridCacheVersion mappedVer, GridCacheContext<K, V> ctx - ) throws GridException { + ) throws IgniteCheckedException { int idx = valuesSize(); dhtVers[idx] = dhtVer; http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/06931b4b/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/distributed/near/GridNearTransactionalCache.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/distributed/near/GridNearTransactionalCache.java b/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/distributed/near/GridNearTransactionalCache.java index 918eec1..9b4d117 100644 --- a/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/distributed/near/GridNearTransactionalCache.java +++ b/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/distributed/near/GridNearTransactionalCache.java @@ -9,17 +9,17 @@ package org.gridgain.grid.kernal.processors.cache.distributed.near; +import org.apache.ignite.*; import org.apache.ignite.cluster.*; import org.apache.ignite.lang.*; -import org.gridgain.grid.*; +import org.apache.ignite.plugin.security.*; import org.gridgain.grid.cache.*; import org.gridgain.grid.kernal.processors.cache.*; import org.gridgain.grid.kernal.processors.cache.distributed.*; import org.gridgain.grid.kernal.processors.cache.distributed.dht.*; -import org.apache.ignite.plugin.security.*; +import org.gridgain.grid.util.future.*; import org.gridgain.grid.util.typedef.*; import org.gridgain.grid.util.typedef.internal.*; -import org.gridgain.grid.util.future.*; import org.jetbrains.annotations.*; import java.io.*; @@ -53,7 +53,7 @@ public class GridNearTransactionalCache<K, V> extends GridNearCacheAdapter<K, V> } /** {@inheritDoc} */ - @Override public void start() throws GridException { + @Override public void start() throws IgniteCheckedException { super.start(); ctx.io().addHandler(ctx.cacheId(), GridNearGetResponse.class, new CI2<UUID, GridNearGetResponse<K, V>>() { @@ -198,12 +198,12 @@ public class GridNearTransactionalCache<K, V> extends GridNearCacheAdapter<K, V> * @param nodeId Primary node ID. * @param req Request. * @return Remote transaction. - * @throws GridException If failed. + * @throws IgniteCheckedException If failed. * @throws GridDistributedLockCancelledException If lock has been cancelled. */ @SuppressWarnings({"RedundantTypeArguments"}) @Nullable public GridNearTxRemote<K, V> startRemoteTx(UUID nodeId, GridDhtLockRequest<K, V> req) - throws GridException, GridDistributedLockCancelledException { + throws IgniteCheckedException, GridDistributedLockCancelledException { List<K> nearKeys = req.nearKeys(); List<byte[]> keyBytes = req.nearKeyBytes(); @@ -347,7 +347,7 @@ public class GridNearTransactionalCache<K, V> extends GridNearCacheAdapter<K, V> U.warn(log, err); - throw new GridException(err); + throw new IgniteCheckedException(err); } return tx; @@ -475,7 +475,7 @@ public class GridNearTransactionalCache<K, V> extends GridNearCacheAdapter<K, V> if (rmv != null) { if (!rmv.reentry()) { if (ver != null && !ver.equals(rmv.version())) - throw new GridException("Failed to unlock (if keys were locked separately, " + + throw new IgniteCheckedException("Failed to unlock (if keys were locked separately, " + "then they need to be unlocked separately): " + keys); if (!primary.isLocal()) { @@ -529,7 +529,7 @@ public class GridNearTransactionalCache<K, V> extends GridNearCacheAdapter<K, V> ctx.io().send(n, req); } } - catch (GridException ex) { + catch (IgniteCheckedException ex) { U.error(log, "Failed to unlock the lock for keys: " + keys, ex); } } @@ -633,7 +633,7 @@ public class GridNearTransactionalCache<K, V> extends GridNearCacheAdapter<K, V> } } } - catch (GridException ex) { + catch (IgniteCheckedException ex) { U.error(log, "Failed to unlock the lock for keys: " + keys, ex); } } http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/06931b4b/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/distributed/near/GridNearTxFinishFuture.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/distributed/near/GridNearTxFinishFuture.java b/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/distributed/near/GridNearTxFinishFuture.java index be1448f..176fdd0 100644 --- a/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/distributed/near/GridNearTxFinishFuture.java +++ b/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/distributed/near/GridNearTxFinishFuture.java @@ -164,7 +164,7 @@ public final class GridNearTxFinishFuture<K, V> extends GridCompoundIdentityFutu try { tx.rollback(); } - catch (GridException ex) { + catch (IgniteCheckedException ex) { U.error(log, "Failed to automatically rollback transaction: " + tx, ex); } } @@ -173,7 +173,7 @@ public final class GridNearTxFinishFuture<K, V> extends GridCompoundIdentityFutu try { tx.close(); } - catch (GridException ex) { + catch (IgniteCheckedException ex) { U.error(log, "Failed to invalidate transaction: " + tx, ex); } } @@ -307,7 +307,7 @@ public final class GridNearTxFinishFuture<K, V> extends GridCompoundIdentityFutu try { tx.rollback(); } - catch (GridException e) { + catch (IgniteCheckedException e) { U.error(log, "Failed to rollback empty transaction: " + tx, e); } @@ -385,7 +385,7 @@ public final class GridNearTxFinishFuture<K, V> extends GridCompoundIdentityFutu fut.onResult(e); } - catch (GridException e) { + catch (IgniteCheckedException e) { // Fail the whole thing. fut.onResult(e); } http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/06931b4b/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/distributed/near/GridNearTxFinishResponse.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/distributed/near/GridNearTxFinishResponse.java b/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/distributed/near/GridNearTxFinishResponse.java index 94b0366..52825bc 100644 --- a/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/distributed/near/GridNearTxFinishResponse.java +++ b/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/distributed/near/GridNearTxFinishResponse.java @@ -9,8 +9,8 @@ package org.gridgain.grid.kernal.processors.cache.distributed.near; +import org.apache.ignite.*; import org.apache.ignite.lang.*; -import org.gridgain.grid.*; import org.gridgain.grid.kernal.*; import org.gridgain.grid.kernal.processors.cache.*; import org.gridgain.grid.kernal.processors.cache.distributed.*; @@ -89,7 +89,7 @@ public class GridNearTxFinishResponse<K, V> extends GridDistributedTxFinishRespo /** {@inheritDoc} * @param ctx*/ - @Override public void prepareMarshal(GridCacheSharedContext<K, V> ctx) throws GridException { + @Override public void prepareMarshal(GridCacheSharedContext<K, V> ctx) throws IgniteCheckedException { super.prepareMarshal(ctx); if (err != null) @@ -97,7 +97,7 @@ public class GridNearTxFinishResponse<K, V> extends GridDistributedTxFinishRespo } /** {@inheritDoc} */ - @Override public void finishUnmarshal(GridCacheSharedContext<K, V> ctx, ClassLoader ldr) throws GridException { + @Override public void finishUnmarshal(GridCacheSharedContext<K, V> ctx, ClassLoader ldr) throws IgniteCheckedException { super.finishUnmarshal(ctx, ldr); if (errBytes != null) http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/06931b4b/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/distributed/near/GridNearTxLocal.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/distributed/near/GridNearTxLocal.java b/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/distributed/near/GridNearTxLocal.java index dc12420..5ff258f 100644 --- a/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/distributed/near/GridNearTxLocal.java +++ b/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/distributed/near/GridNearTxLocal.java @@ -9,20 +9,20 @@ package org.gridgain.grid.kernal.processors.cache.distributed.near; +import org.apache.ignite.*; import org.apache.ignite.cluster.*; import org.apache.ignite.lang.*; -import org.gridgain.grid.*; import org.gridgain.grid.cache.*; import org.gridgain.grid.kernal.*; import org.gridgain.grid.kernal.managers.discovery.*; import org.gridgain.grid.kernal.processors.cache.*; import org.gridgain.grid.kernal.processors.cache.distributed.*; import org.gridgain.grid.kernal.processors.cache.distributed.dht.*; +import org.gridgain.grid.util.future.*; +import org.gridgain.grid.util.lang.*; import org.gridgain.grid.util.tostring.*; import org.gridgain.grid.util.typedef.*; import org.gridgain.grid.util.typedef.internal.*; -import org.gridgain.grid.util.future.*; -import org.gridgain.grid.util.lang.*; import org.jdk8.backport.*; import org.jetbrains.annotations.*; @@ -574,7 +574,7 @@ public class GridNearTxLocal<K, V> extends GridDhtTxLocalAdapter<K, V> { /** {@inheritDoc} */ @SuppressWarnings({"CatchGenericClass", "ThrowableInstanceNeverThrown"}) - @Override public boolean finish(boolean commit) throws GridException { + @Override public boolean finish(boolean commit) throws IgniteCheckedException { if (log.isDebugEnabled()) log.debug("Finishing near local tx [tx=" + this + ", commit=" + commit + "]"); @@ -583,7 +583,7 @@ public class GridNearTxLocal<K, V> extends GridDhtTxLocalAdapter<K, V> { GridCacheTxState state = state(); if (state != COMMITTING && state != COMMITTED) - throw new GridException("Invalid transaction state for commit [state=" + state() + + throw new IgniteCheckedException("Invalid transaction state for commit [state=" + state() + ", tx=" + this + ']'); else { if (log.isDebugEnabled()) @@ -602,7 +602,7 @@ public class GridNearTxLocal<K, V> extends GridDhtTxLocalAdapter<K, V> { } } - GridException err = null; + IgniteCheckedException err = null; // Commit to DB first. This way if there is a failure, transaction // won't be committed. @@ -612,7 +612,7 @@ public class GridNearTxLocal<K, V> extends GridDhtTxLocalAdapter<K, V> { else userRollback(); } - catch (GridException e) { + catch (IgniteCheckedException e) { err = e; commit = false; @@ -639,7 +639,7 @@ public class GridNearTxLocal<K, V> extends GridDhtTxLocalAdapter<K, V> { if (!state(COMMITTED)) { state(UNKNOWN); - throw new GridException("Invalid transaction state for commit: " + this); + throw new IgniteCheckedException("Invalid transaction state for commit: " + this); } } } @@ -647,7 +647,7 @@ public class GridNearTxLocal<K, V> extends GridDhtTxLocalAdapter<K, V> { if (!state(ROLLED_BACK)) { state(UNKNOWN); - throw new GridException("Invalid transaction state for rollback: " + this); + throw new IgniteCheckedException("Invalid transaction state for rollback: " + this); } } } @@ -684,7 +684,7 @@ public class GridNearTxLocal<K, V> extends GridDhtTxLocalAdapter<K, V> { pessimisticFut.onError(new GridCacheTxTimeoutException("Transaction timed out and was " + "rolled back: " + this)); else - pessimisticFut.onError(new GridException("Invalid transaction state for prepare [state=" + + pessimisticFut.onError(new IgniteCheckedException("Invalid transaction state for prepare [state=" + state() + ", tx=" + this + ']')); } else @@ -700,7 +700,7 @@ public class GridNearTxLocal<K, V> extends GridDhtTxLocalAdapter<K, V> { if (!state(PREPARED)) { setRollbackOnly(); - pessimisticFut.onError(new GridException("Invalid transaction state for commit [state=" + + pessimisticFut.onError(new IgniteCheckedException("Invalid transaction state for commit [state=" + state() + ", tx=" + this + ']')); return fut; @@ -708,7 +708,7 @@ public class GridNearTxLocal<K, V> extends GridDhtTxLocalAdapter<K, V> { pessimisticFut.complete(); } - catch (GridException e) { + catch (IgniteCheckedException e) { pessimisticFut.onError(e); } } @@ -750,7 +750,7 @@ public class GridNearTxLocal<K, V> extends GridDhtTxLocalAdapter<K, V> { if (finish(true)) fut0.finish(); else - fut0.onError(new GridException("Failed to commit transaction: " + + fut0.onError(new IgniteCheckedException("Failed to commit transaction: " + CU.txString(GridNearTxLocal.this))); } catch (Error | RuntimeException e) { @@ -758,7 +758,7 @@ public class GridNearTxLocal<K, V> extends GridDhtTxLocalAdapter<K, V> { throw e; } - catch (GridException e) { + catch (IgniteCheckedException e) { commitErr.compareAndSet(null, e); fut0.onError(e); @@ -792,7 +792,7 @@ public class GridNearTxLocal<K, V> extends GridDhtTxLocalAdapter<K, V> { if (prepFut != null) prepFut.get(); } - catch (GridException e) { + catch (IgniteCheckedException e) { if (log.isDebugEnabled()) log.debug("Got optimistic tx failure [tx=" + this + ", err=" + e + ']'); } @@ -801,9 +801,9 @@ public class GridNearTxLocal<K, V> extends GridDhtTxLocalAdapter<K, V> { if (finish(false) || state() == UNKNOWN) fut.finish(); else - fut.onError(new GridException("Failed to gracefully rollback transaction: " + CU.txString(this))); + fut.onError(new IgniteCheckedException("Failed to gracefully rollback transaction: " + CU.txString(this))); } - catch (GridException e) { + catch (IgniteCheckedException e) { fut.onError(e); } } @@ -814,7 +814,7 @@ public class GridNearTxLocal<K, V> extends GridDhtTxLocalAdapter<K, V> { // Check for errors in prepare future. f.get(); } - catch (GridException e) { + catch (IgniteCheckedException e) { if (log.isDebugEnabled()) log.debug("Got optimistic tx failure [tx=" + this + ", err=" + e + ']'); } @@ -825,10 +825,10 @@ public class GridNearTxLocal<K, V> extends GridDhtTxLocalAdapter<K, V> { if (finish(false) || state() == UNKNOWN) fut0.finish(); else - fut0.onError(new GridException("Failed to gracefully rollback transaction: " + + fut0.onError(new IgniteCheckedException("Failed to gracefully rollback transaction: " + CU.txString(GridNearTxLocal.this))); } - catch (GridException e) { + catch (IgniteCheckedException e) { U.error(log, "Failed to gracefully rollback transaction: " + CU.txString(GridNearTxLocal.this), e); @@ -865,7 +865,7 @@ public class GridNearTxLocal<K, V> extends GridDhtTxLocalAdapter<K, V> { setRollbackOnly(); return new GridFinishedFuture<>(cctx.kernalContext(), - new GridException("Invalid transaction state for prepare [state=" + state() + ", tx=" + this + ']')); + new IgniteCheckedException("Invalid transaction state for prepare [state=" + state() + ", tx=" + this + ']')); } init(); @@ -891,7 +891,7 @@ public class GridNearTxLocal<K, V> extends GridDhtTxLocalAdapter<K, V> { catch (GridCacheTxTimeoutException | GridCacheTxOptimisticException e) { fut.onError(e); } - catch (GridException e) { + catch (IgniteCheckedException e) { setRollbackOnly(); fut.onError(new GridCacheTxRollbackException("Failed to prepare transaction: " + this, e)); @@ -905,7 +905,7 @@ public class GridNearTxLocal<K, V> extends GridDhtTxLocalAdapter<K, V> { fut.onError(e); } - catch (GridException e1) { + catch (IgniteCheckedException e1) { U.error(log, "Failed to rollback transaction: " + this, e1); } } @@ -955,7 +955,7 @@ public class GridNearTxLocal<K, V> extends GridDhtTxLocalAdapter<K, V> { fut.onError(e); } - catch (GridException e) { + catch (IgniteCheckedException e) { U.error(log, "Failed to prepare transaction: " + this, e); fut.onError(e); @@ -975,7 +975,7 @@ public class GridNearTxLocal<K, V> extends GridDhtTxLocalAdapter<K, V> { fut.onError(e); } - catch (GridException e) { + catch (IgniteCheckedException e) { U.error(log, "Failed to prepare transaction: " + this, e); fut.onError(e); @@ -1006,7 +1006,7 @@ public class GridNearTxLocal<K, V> extends GridDhtTxLocalAdapter<K, V> { if (prep != null) prep.get(); } - catch (GridException e) { + catch (IgniteCheckedException e) { if (log.isDebugEnabled()) log.debug("Failed to prepare transaction during rollback (will ignore) [tx=" + this + ", msg=" + e.getMessage() + ']'); @@ -1020,7 +1020,7 @@ public class GridNearTxLocal<K, V> extends GridDhtTxLocalAdapter<K, V> { try { f.get(); // Check for errors of a parent future. } - catch (GridException e) { + catch (IgniteCheckedException e) { log.debug("Failed to prepare transaction during rollback (will ignore) [tx=" + this + ", msg=" + e.getMessage() + ']'); } @@ -1040,7 +1040,7 @@ public class GridNearTxLocal<K, V> extends GridDhtTxLocalAdapter<K, V> { try { checkValid(); } - catch (GridException e) { + catch (IgniteCheckedException e) { return new GridFinishedFuture<>(cctx.kernalContext(), e); } @@ -1167,7 +1167,7 @@ public class GridNearTxLocal<K, V> extends GridDhtTxLocalAdapter<K, V> { try { tx.rollback(); } - catch (GridException ex) { + catch (IgniteCheckedException ex) { U.error(log, "Failed to automatically rollback transaction: " + tx, ex); } } http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/06931b4b/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/distributed/near/GridNearTxPrepareFuture.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/distributed/near/GridNearTxPrepareFuture.java b/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/distributed/near/GridNearTxPrepareFuture.java index 607a08e..a9bcd3b 100644 --- a/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/distributed/near/GridNearTxPrepareFuture.java +++ b/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/distributed/near/GridNearTxPrepareFuture.java @@ -188,7 +188,7 @@ public final class GridNearTxPrepareFuture<K, V> extends GridCompoundIdentityFut try { tx.rollback(); } - catch (GridException ex) { + catch (IgniteCheckedException ex) { U.error(log, "Failed to automatically rollback transaction: " + tx, ex); } } @@ -325,7 +325,7 @@ public final class GridNearTxPrepareFuture<K, V> extends GridCompoundIdentityFut onError(null, null, new GridCacheTxTimeoutException("Transaction timed out and " + "was rolled back: " + this)); else - onError(null, null, new GridException("Invalid transaction state for prepare " + + onError(null, null, new IgniteCheckedException("Invalid transaction state for prepare " + "[state=" + tx.state() + ", tx=" + this + ']')); } else @@ -348,7 +348,7 @@ public final class GridNearTxPrepareFuture<K, V> extends GridCompoundIdentityFut catch (GridCacheTxTimeoutException | GridCacheTxOptimisticException e) { onError(cctx.localNodeId(), null, e); } - catch (GridException e) { + catch (IgniteCheckedException e) { tx.setRollbackOnly(); String msg = "Failed to prepare transaction (will attempt rollback): " + this; @@ -412,7 +412,7 @@ public final class GridNearTxPrepareFuture<K, V> extends GridCompoundIdentityFut markInitialized(); } - catch (GridException e) { + catch (IgniteCheckedException e) { onDone(e); } } @@ -420,12 +420,12 @@ public final class GridNearTxPrepareFuture<K, V> extends GridCompoundIdentityFut /** * @param reads Read entries. * @param writes Write entries. - * @throws GridException If transaction is group-lock and some key was mapped to to the local node. + * @throws IgniteCheckedException If transaction is group-lock and some key was mapped to to the local node. */ private void prepare( Iterable<GridCacheTxEntry<K, V>> reads, Iterable<GridCacheTxEntry<K, V>> writes - ) throws GridException { + ) throws IgniteCheckedException { assert tx.optimistic(); GridDiscoveryTopologySnapshot snapshot = tx.topologySnapshot(); @@ -550,7 +550,7 @@ public final class GridNearTxPrepareFuture<K, V> extends GridCompoundIdentityFut tx.userPrepare(); } - catch (GridException e) { + catch (IgniteCheckedException e) { onError(null, null, e); } } @@ -616,7 +616,7 @@ public final class GridNearTxPrepareFuture<K, V> extends GridCompoundIdentityFut try { cctx.io().send(n, req); } - catch (GridException e) { + catch (IgniteCheckedException e) { // Fail the whole thing. fut.onResult(e); } @@ -627,11 +627,11 @@ public final class GridNearTxPrepareFuture<K, V> extends GridCompoundIdentityFut * @param entry Transaction entry. * @param topVer Topology version. * @param cur Current mapping. - * @throws GridException If transaction is group-lock and local node is not primary for key. + * @throws IgniteCheckedException If transaction is group-lock and local node is not primary for key. * @return Mapping. */ private GridDistributedTxMapping<K, V> map(GridCacheTxEntry<K, V> entry, long topVer, - GridDistributedTxMapping<K, V> cur) throws GridException { + GridDistributedTxMapping<K, V> cur) throws IgniteCheckedException { GridCacheContext<K, V> cacheCtx = entry.context(); List<ClusterNode> nodes = cacheCtx.affinity().nodes(entry.key(), topVer); @@ -649,7 +649,7 @@ public final class GridNearTxPrepareFuture<K, V> extends GridCompoundIdentityFut } if (tx.groupLock() && !primary.isLocal()) - throw new GridException("Failed to prepare group lock transaction (local node is not primary for " + + throw new IgniteCheckedException("Failed to prepare group lock transaction (local node is not primary for " + " key)[key=" + entry.key() + ", primaryNodeId=" + primary.id() + ']'); // Must re-initialize cached entry while holding topology lock. @@ -825,7 +825,7 @@ public final class GridNearTxPrepareFuture<K, V> extends GridCompoundIdentityFut catch (GridCacheEntryRemovedException ignored) { // Retry. } - catch (GridException e) { + catch (IgniteCheckedException e) { // Fail the whole compound future. onError(nodeId, mappings, e); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/06931b4b/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/distributed/near/GridNearTxPrepareResponse.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/distributed/near/GridNearTxPrepareResponse.java b/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/distributed/near/GridNearTxPrepareResponse.java index e2f1f6e..08d7967 100644 --- a/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/distributed/near/GridNearTxPrepareResponse.java +++ b/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/distributed/near/GridNearTxPrepareResponse.java @@ -9,16 +9,16 @@ package org.gridgain.grid.kernal.processors.cache.distributed.near; +import org.apache.ignite.*; import org.apache.ignite.lang.*; -import org.gridgain.grid.*; import org.gridgain.grid.kernal.*; import org.gridgain.grid.kernal.processors.cache.*; import org.gridgain.grid.kernal.processors.cache.distributed.*; import org.gridgain.grid.util.direct.*; -import org.gridgain.grid.util.typedef.*; -import org.gridgain.grid.util.typedef.internal.*; import org.gridgain.grid.util.lang.*; import org.gridgain.grid.util.tostring.*; +import org.gridgain.grid.util.typedef.*; +import org.gridgain.grid.util.typedef.internal.*; import java.io.*; import java.nio.*; @@ -168,7 +168,7 @@ public class GridNearTxPrepareResponse<K, V> extends GridDistributedTxPrepareRes /** {@inheritDoc} * @param ctx*/ - @Override public void prepareMarshal(GridCacheSharedContext<K, V> ctx) throws GridException { + @Override public void prepareMarshal(GridCacheSharedContext<K, V> ctx) throws IgniteCheckedException { super.prepareMarshal(ctx); if (ownedVals != null && ownedValsBytes == null) { @@ -197,7 +197,7 @@ public class GridNearTxPrepareResponse<K, V> extends GridDistributedTxPrepareRes } /** {@inheritDoc} */ - @Override public void finishUnmarshal(GridCacheSharedContext<K, V> ctx, ClassLoader ldr) throws GridException { + @Override public void finishUnmarshal(GridCacheSharedContext<K, V> ctx, ClassLoader ldr) throws IgniteCheckedException { super.finishUnmarshal(ctx, ldr); if (ownedValsBytes != null && ownedVals == null) { http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/06931b4b/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/distributed/near/GridNearTxRemote.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/distributed/near/GridNearTxRemote.java b/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/distributed/near/GridNearTxRemote.java index 8e6d6ca..aa3546b 100644 --- a/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/distributed/near/GridNearTxRemote.java +++ b/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/distributed/near/GridNearTxRemote.java @@ -9,14 +9,14 @@ package org.gridgain.grid.kernal.processors.cache.distributed.near; -import org.gridgain.grid.*; +import org.apache.ignite.*; import org.gridgain.grid.cache.*; import org.gridgain.grid.kernal.processors.cache.*; import org.gridgain.grid.kernal.processors.cache.distributed.*; import org.gridgain.grid.util.*; +import org.gridgain.grid.util.tostring.*; import org.gridgain.grid.util.typedef.*; import org.gridgain.grid.util.typedef.internal.*; -import org.gridgain.grid.util.tostring.*; import org.jetbrains.annotations.*; import java.io.*; @@ -70,7 +70,7 @@ public class GridNearTxRemote<K, V> extends GridDistributedTxRemoteAdapter<K, V> * @param ctx Cache registry. * @param txSize Expected transaction size. * @param grpLockKey Group lock key if this is a group-lock transaction. - * @throws GridException If unmarshalling failed. + * @throws IgniteCheckedException If unmarshalling failed. */ public GridNearTxRemote( ClassLoader ldr, @@ -89,7 +89,7 @@ public class GridNearTxRemote<K, V> extends GridDistributedTxRemoteAdapter<K, V> @Nullable GridCacheTxKey grpLockKey, @Nullable UUID subjId, int taskNameHash - ) throws GridException { + ) throws IgniteCheckedException { super(ctx, nodeId, rmtThreadId, xidVer, commitVer, concurrency, isolation, invalidate, timeout, txSize, grpLockKey, subjId, taskNameHash); @@ -244,9 +244,9 @@ public class GridNearTxRemote<K, V> extends GridDistributedTxRemoteAdapter<K, V> * * @param ldr Class loader. * @param entries Entries to add. - * @throws GridException If failed. + * @throws IgniteCheckedException If failed. */ - public void addEntries(ClassLoader ldr, Iterable<GridCacheTxEntry<K, V>> entries) throws GridException { + public void addEntries(ClassLoader ldr, Iterable<GridCacheTxEntry<K, V>> entries) throws IgniteCheckedException { for (GridCacheTxEntry<K, V> entry : entries) { entry.unmarshal(cctx, true, ldr); @@ -256,10 +256,10 @@ public class GridNearTxRemote<K, V> extends GridDistributedTxRemoteAdapter<K, V> /** * @param entry Entry to enlist. - * @throws GridException If failed. + * @throws IgniteCheckedException If failed. * @return {@code True} if entry was enlisted. */ - private boolean addEntry(GridCacheTxEntry<K, V> entry) throws GridException { + private boolean addEntry(GridCacheTxEntry<K, V> entry) throws IgniteCheckedException { checkInternal(entry.txKey()); GridCacheContext<K, V> cacheCtx = entry.context(); @@ -311,7 +311,7 @@ public class GridNearTxRemote<K, V> extends GridDistributedTxRemoteAdapter<K, V> * @param val Value. * @param valBytes Value bytes. * @param drVer Data center replication version. - * @throws GridException If failed. + * @throws IgniteCheckedException If failed. * @return {@code True} if entry has been enlisted. */ public boolean addEntry( @@ -322,7 +322,7 @@ public class GridNearTxRemote<K, V> extends GridDistributedTxRemoteAdapter<K, V> V val, byte[] valBytes, @Nullable GridCacheVersion drVer - ) throws GridException { + ) throws IgniteCheckedException { checkInternal(key); GridNearCacheEntry<K, V> cached = cacheCtx.near().peekExx(key.key()); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/06931b4b/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/dr/GridCacheDrManager.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/dr/GridCacheDrManager.java b/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/dr/GridCacheDrManager.java index 3070a96..439a575 100644 --- a/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/dr/GridCacheDrManager.java +++ b/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/dr/GridCacheDrManager.java @@ -9,13 +9,11 @@ package org.gridgain.grid.kernal.processors.cache.dr; -import org.gridgain.grid.*; +import org.apache.ignite.*; import org.gridgain.grid.kernal.processors.cache.*; import org.gridgain.grid.kernal.processors.dr.*; import org.jetbrains.annotations.*; -import java.util.*; - /** * Replication manager class which processes all replication events. */ @@ -37,7 +35,7 @@ public interface GridCacheDrManager<K, V> extends GridCacheManager<K, V> { * @param drExpireTime DR expire time * @param drVer DR version. * @return DR result. - * @throws GridException If update failed. + * @throws IgniteCheckedException If update failed. * @throws GridCacheEntryRemovedException If entry is obsolete. */ public GridDrResolveResult<V> resolveAtomic(GridCacheEntryEx<K, V> e, @@ -47,7 +45,7 @@ public interface GridCacheDrManager<K, V> extends GridCacheManager<K, V> { long ttl, long drTtl, long drExpireTime, - @Nullable GridCacheVersion drVer) throws GridException, GridCacheEntryRemovedException; + @Nullable GridCacheVersion drVer) throws IgniteCheckedException, GridCacheEntryRemovedException; /** * Handles DR for transactional cache. @@ -61,7 +59,7 @@ public interface GridCacheDrManager<K, V> extends GridCacheManager<K, V> { * @param newTtl TTL. * @param newDrExpireTime DR expire time * @return DR result. - * @throws GridException If update failed. + * @throws IgniteCheckedException If update failed. * @throws GridCacheEntryRemovedException If entry is obsolete. */ public GridDrResolveResult<V> resolveTx( @@ -72,7 +70,7 @@ public interface GridCacheDrManager<K, V> extends GridCacheManager<K, V> { V newVal, byte[] newValBytes, long newTtl, - long newDrExpireTime) throws GridException, GridCacheEntryRemovedException; + long newDrExpireTime) throws IgniteCheckedException, GridCacheEntryRemovedException; /** * Performs replication. @@ -85,7 +83,7 @@ public interface GridCacheDrManager<K, V> extends GridCacheManager<K, V> { * @param expireTime Expire time. * @param ver Version. * @param drType Replication type. - * @throws GridException If failed. + * @throws IgniteCheckedException If failed. */ public void replicate(K key, @Nullable byte[] keyBytes, @@ -94,16 +92,16 @@ public interface GridCacheDrManager<K, V> extends GridCacheManager<K, V> { long ttl, long expireTime, GridCacheVersion ver, - GridDrType drType)throws GridException; + GridDrType drType)throws IgniteCheckedException; /** * Process partitions "before exchange" event. * * @param topVer Topology version. * @param left {@code True} if exchange has been caused by node leave. - * @throws GridException If failed. + * @throws IgniteCheckedException If failed. */ - public void beforeExchange(long topVer, boolean left) throws GridException; + public void beforeExchange(long topVer, boolean left) throws IgniteCheckedException; /** * @return {@code True} is DR is enabled. http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/06931b4b/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/dr/os/GridOsCacheDrManager.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/dr/os/GridOsCacheDrManager.java b/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/dr/os/GridOsCacheDrManager.java index c8db2eb..cb3f407 100644 --- a/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/dr/os/GridOsCacheDrManager.java +++ b/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/dr/os/GridOsCacheDrManager.java @@ -9,7 +9,7 @@ package org.gridgain.grid.kernal.processors.cache.dr.os; -import org.gridgain.grid.*; +import org.apache.ignite.*; import org.gridgain.grid.kernal.processors.cache.*; import org.gridgain.grid.kernal.processors.cache.dr.*; import org.gridgain.grid.kernal.processors.dr.*; @@ -25,7 +25,7 @@ public class GridOsCacheDrManager<K, V> implements GridCacheDrManager<K, V> { } /** {@inheritDoc} */ - @Override public void start(GridCacheContext<K, V> cctx) throws GridException { + @Override public void start(GridCacheContext<K, V> cctx) throws IgniteCheckedException { // No-op. } @@ -35,7 +35,7 @@ public class GridOsCacheDrManager<K, V> implements GridCacheDrManager<K, V> { } /** {@inheritDoc} */ - @Override public void onKernalStart() throws GridException { + @Override public void onKernalStart() throws IgniteCheckedException { // No-op. } @@ -74,7 +74,7 @@ public class GridOsCacheDrManager<K, V> implements GridCacheDrManager<K, V> { long ttl, long drTtl, long drExpireTime, - @Nullable GridCacheVersion drVer) throws GridException, GridCacheEntryRemovedException { + @Nullable GridCacheVersion drVer) throws IgniteCheckedException, GridCacheEntryRemovedException { return null; } @@ -86,12 +86,12 @@ public class GridOsCacheDrManager<K, V> implements GridCacheDrManager<K, V> { V newVal, byte[] newValBytes, long newTtl, - long newDrExpireTime) throws GridException, GridCacheEntryRemovedException { + long newDrExpireTime) throws IgniteCheckedException, GridCacheEntryRemovedException { return null; } /** {@inheritDoc} */ - @Override public void beforeExchange(long topVer, boolean left) throws GridException { + @Override public void beforeExchange(long topVer, boolean left) throws IgniteCheckedException { // No-op. } http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/06931b4b/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/jta/GridCacheJtaManagerAdapter.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/jta/GridCacheJtaManagerAdapter.java b/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/jta/GridCacheJtaManagerAdapter.java index e8ea5b2..ee47612 100644 --- a/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/jta/GridCacheJtaManagerAdapter.java +++ b/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/jta/GridCacheJtaManagerAdapter.java @@ -9,7 +9,7 @@ package org.gridgain.grid.kernal.processors.cache.jta; -import org.gridgain.grid.*; +import org.apache.ignite.*; import org.gridgain.grid.cache.*; import org.gridgain.grid.kernal.processors.cache.*; import org.jetbrains.annotations.*; @@ -22,16 +22,16 @@ public abstract class GridCacheJtaManagerAdapter<K, V> extends GridCacheManagerA * Creates transaction manager finder. * * @param ccfg Cache configuration. - * @throws GridException If failed. + * @throws IgniteCheckedException If failed. */ - public abstract void createTmLookup(GridCacheConfiguration ccfg) throws GridException; + public abstract void createTmLookup(GridCacheConfiguration ccfg) throws IgniteCheckedException; /** * Checks if cache is working in JTA transaction and enlist cache as XAResource if necessary. * - * @throws GridException In case of error. + * @throws IgniteCheckedException In case of error. */ - public abstract void checkJta() throws GridException; + public abstract void checkJta() throws IgniteCheckedException; /** * Gets transaction manager finder. Returns Object to avoid dependency on JTA library. http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/06931b4b/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/jta/GridCacheNoopJtaManager.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/jta/GridCacheNoopJtaManager.java b/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/jta/GridCacheNoopJtaManager.java index 2527304..b4d0a7d 100644 --- a/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/jta/GridCacheNoopJtaManager.java +++ b/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/jta/GridCacheNoopJtaManager.java @@ -9,7 +9,7 @@ package org.gridgain.grid.kernal.processors.cache.jta; -import org.gridgain.grid.*; +import org.apache.ignite.*; import org.gridgain.grid.cache.*; import org.jetbrains.annotations.*; @@ -18,12 +18,12 @@ import org.jetbrains.annotations.*; */ public class GridCacheNoopJtaManager<K, V> extends GridCacheJtaManagerAdapter<K, V> { /** {@inheritDoc} */ - @Override public void checkJta() throws GridException { + @Override public void checkJta() throws IgniteCheckedException { // No-op. } /** {@inheritDoc} */ - @Override public void createTmLookup(GridCacheConfiguration ccfg) throws GridException { + @Override public void createTmLookup(GridCacheConfiguration ccfg) throws IgniteCheckedException { // No-op. }
