Repository: incubator-ignite Updated Branches: refs/heads/ignite-26 32cff0bc4 -> ca829a164
# ignite-26 Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/ca829a16 Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/ca829a16 Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/ca829a16 Branch: refs/heads/ignite-26 Commit: ca829a164736b3fa4b302a918940d882b1b8bf58 Parents: 32cff0b Author: sboikov <sboi...@gridgain.com> Authored: Tue Feb 3 10:09:47 2015 +0300 Committer: sboikov <sboi...@gridgain.com> Committed: Tue Feb 3 10:50:15 2015 +0300 ---------------------------------------------------------------------- .../ignite/client/ClientPutPortableTask.java | 1 - .../ignite/client/ClientStartNodeTask.java | 3 +-- .../ignite/client/ClientStringLengthTask.java | 3 +-- .../org/apache/ignite/client/ClientTcpTask.java | 3 +-- .../ClientAbstractMultiNodeSelfTest.java | 3 +-- .../integration/ClientAbstractSelfTest.java | 3 +-- .../integration/ClientPreferDirectSelfTest.java | 3 +-- .../compute/ComputeJobFailoverException.java | 2 +- .../org/apache/ignite/compute/ComputeTask.java | 4 ++-- .../ignite/compute/ComputeTaskAdapter.java | 3 +-- .../compute/ComputeTaskTimeoutException.java | 2 +- .../apache/ignite/internal/GridKillTask.java | 4 ++-- .../processors/cache/GridCacheIoManager.java | 7 +++++-- .../processors/cache/GridCacheStoreManager.java | 3 +-- .../cache/GridCacheWriteBehindStore.java | 2 +- .../preloader/GridDhtPartitionDemandPool.java | 4 ++-- .../GridDhtPartitionsExchangeFuture.java | 2 +- .../query/GridCacheQueryFutureAdapter.java | 2 +- .../cache/transactions/IgniteInternalTx.java | 2 +- .../cache/transactions/IgniteTxAdapter.java | 18 +++++++++--------- .../clock/GridClockDeltaSnapshot.java | 2 +- .../dataload/IgniteDataLoaderImpl.java | 11 +++++------ .../processors/fs/GridGgfsDataManager.java | 2 +- .../internal/processors/fs/GridGgfsImpl.java | 6 +++--- .../processors/fs/GridGgfsMetaManager.java | 4 ++-- .../processors/query/GridQueryProcessor.java | 2 +- .../cache/GridCacheQueryCommandHandler.java | 2 -- .../handlers/task/GridTaskCommandHandler.java | 2 +- .../processors/streamer/IgniteStreamerImpl.java | 2 +- .../internal/util/GridAtomicInitializer.java | 2 +- .../ignite/internal/util/IgniteUtils.java | 20 ++++++++++---------- .../internal/util/future/GridFutureAdapter.java | 2 +- .../ignite/internal/util/nio/GridNioFuture.java | 16 ++++++++-------- .../ignite/internal/util/worker/GridWorker.java | 2 +- .../internal/visor/VisorMultiNodeTask.java | 2 +- .../ignite/internal/visor/VisorOneNodeTask.java | 1 - .../visor/misc/VisorLatestVersionTask.java | 1 - .../internal/visor/node/VisorNodePingTask.java | 2 -- 38 files changed, 71 insertions(+), 84 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/ca829a16/modules/clients/src/test/java/org/apache/ignite/client/ClientPutPortableTask.java ---------------------------------------------------------------------- diff --git a/modules/clients/src/test/java/org/apache/ignite/client/ClientPutPortableTask.java b/modules/clients/src/test/java/org/apache/ignite/client/ClientPutPortableTask.java index 8d383ac..a1452cd 100644 --- a/modules/clients/src/test/java/org/apache/ignite/client/ClientPutPortableTask.java +++ b/modules/clients/src/test/java/org/apache/ignite/client/ClientPutPortableTask.java @@ -18,7 +18,6 @@ package org.apache.ignite.client; import org.apache.ignite.*; -import org.apache.ignite.cache.*; import org.apache.ignite.resources.*; /** http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/ca829a16/modules/clients/src/test/java/org/apache/ignite/client/ClientStartNodeTask.java ---------------------------------------------------------------------- diff --git a/modules/clients/src/test/java/org/apache/ignite/client/ClientStartNodeTask.java b/modules/clients/src/test/java/org/apache/ignite/client/ClientStartNodeTask.java index 2a1cfde..1eba38f 100644 --- a/modules/clients/src/test/java/org/apache/ignite/client/ClientStartNodeTask.java +++ b/modules/clients/src/test/java/org/apache/ignite/client/ClientStartNodeTask.java @@ -83,8 +83,7 @@ public class ClientStartNodeTask extends TaskSingleJobSplitAdapter<String, Integ } /** {@inheritDoc} */ - @Override public ComputeJobResultPolicy result(ComputeJobResult res, List<ComputeJobResult> rcvd) - { + @Override public ComputeJobResultPolicy result(ComputeJobResult res, List<ComputeJobResult> rcvd) { if (res.getException() != null) return FAILOVER; http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/ca829a16/modules/clients/src/test/java/org/apache/ignite/client/ClientStringLengthTask.java ---------------------------------------------------------------------- diff --git a/modules/clients/src/test/java/org/apache/ignite/client/ClientStringLengthTask.java b/modules/clients/src/test/java/org/apache/ignite/client/ClientStringLengthTask.java index 2bbd49c..a1c140b 100644 --- a/modules/clients/src/test/java/org/apache/ignite/client/ClientStringLengthTask.java +++ b/modules/clients/src/test/java/org/apache/ignite/client/ClientStringLengthTask.java @@ -63,8 +63,7 @@ public class ClientStringLengthTask extends ComputeTaskSplitAdapter<String, Inte } /** {@inheritDoc} */ - @Override public ComputeJobResultPolicy result(ComputeJobResult res, List<ComputeJobResult> rcvd) - { + @Override public ComputeJobResultPolicy result(ComputeJobResult res, List<ComputeJobResult> rcvd) { if (res.getException() != null) return FAILOVER; http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/ca829a16/modules/clients/src/test/java/org/apache/ignite/client/ClientTcpTask.java ---------------------------------------------------------------------- diff --git a/modules/clients/src/test/java/org/apache/ignite/client/ClientTcpTask.java b/modules/clients/src/test/java/org/apache/ignite/client/ClientTcpTask.java index 1eae9db..9177d91 100644 --- a/modules/clients/src/test/java/org/apache/ignite/client/ClientTcpTask.java +++ b/modules/clients/src/test/java/org/apache/ignite/client/ClientTcpTask.java @@ -31,8 +31,7 @@ import static org.apache.ignite.compute.ComputeJobResultPolicy.*; */ public class ClientTcpTask extends ComputeTaskSplitAdapter<List<Object>, Integer> { /** {@inheritDoc} */ - @Override protected Collection<? extends ComputeJob> split(int gridSize, List<Object> list) - { + @Override protected Collection<? extends ComputeJob> split(int gridSize, List<Object> list) { Collection<ComputeJobAdapter> jobs = new ArrayList<>(); if (list != null) http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/ca829a16/modules/clients/src/test/java/org/apache/ignite/client/integration/ClientAbstractMultiNodeSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/clients/src/test/java/org/apache/ignite/client/integration/ClientAbstractMultiNodeSelfTest.java b/modules/clients/src/test/java/org/apache/ignite/client/integration/ClientAbstractMultiNodeSelfTest.java index 2a3ef69..547e9b7 100644 --- a/modules/clients/src/test/java/org/apache/ignite/client/integration/ClientAbstractMultiNodeSelfTest.java +++ b/modules/clients/src/test/java/org/apache/ignite/client/integration/ClientAbstractMultiNodeSelfTest.java @@ -705,8 +705,7 @@ public abstract class ClientAbstractMultiNodeSelfTest extends GridCommonAbstract private int gridSize; /** {@inheritDoc} */ - @Override protected Collection<? extends ComputeJob> split(int gridSize, Object arg) - { + @Override protected Collection<? extends ComputeJob> split(int gridSize, Object arg) { Collection<ComputeJobAdapter> jobs = new ArrayList<>(gridSize); this.gridSize = gridSize; http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/ca829a16/modules/clients/src/test/java/org/apache/ignite/client/integration/ClientAbstractSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/clients/src/test/java/org/apache/ignite/client/integration/ClientAbstractSelfTest.java b/modules/clients/src/test/java/org/apache/ignite/client/integration/ClientAbstractSelfTest.java index 1a84358..d7e4d29 100644 --- a/modules/clients/src/test/java/org/apache/ignite/client/integration/ClientAbstractSelfTest.java +++ b/modules/clients/src/test/java/org/apache/ignite/client/integration/ClientAbstractSelfTest.java @@ -1454,8 +1454,7 @@ public abstract class ClientAbstractSelfTest extends GridCommonAbstractTest { */ private static class TestTask extends ComputeTaskSplitAdapter<List<Object>, Integer> { /** {@inheritDoc} */ - @Override protected Collection<? extends ComputeJob> split(int gridSize, List<Object> list) - { + @Override protected Collection<? extends ComputeJob> split(int gridSize, List<Object> list) { Collection<ComputeJobAdapter> jobs = new ArrayList<>(); if (list != null) http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/ca829a16/modules/clients/src/test/java/org/apache/ignite/client/integration/ClientPreferDirectSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/clients/src/test/java/org/apache/ignite/client/integration/ClientPreferDirectSelfTest.java b/modules/clients/src/test/java/org/apache/ignite/client/integration/ClientPreferDirectSelfTest.java index 99cea25..c559a8a 100644 --- a/modules/clients/src/test/java/org/apache/ignite/client/integration/ClientPreferDirectSelfTest.java +++ b/modules/clients/src/test/java/org/apache/ignite/client/integration/ClientPreferDirectSelfTest.java @@ -151,8 +151,7 @@ public class ClientPreferDirectSelfTest extends GridCommonAbstractTest { private int gridSize; /** {@inheritDoc} */ - @Override protected Collection<? extends ComputeJob> split(int gridSize, Object arg) - { + @Override protected Collection<? extends ComputeJob> split(int gridSize, Object arg) { Collection<ComputeJobAdapter> jobs = new ArrayList<>(gridSize); this.gridSize = gridSize; http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/ca829a16/modules/core/src/main/java/org/apache/ignite/compute/ComputeJobFailoverException.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/compute/ComputeJobFailoverException.java b/modules/core/src/main/java/org/apache/ignite/compute/ComputeJobFailoverException.java index 77701fd..70dfc13 100644 --- a/modules/core/src/main/java/org/apache/ignite/compute/ComputeJobFailoverException.java +++ b/modules/core/src/main/java/org/apache/ignite/compute/ComputeJobFailoverException.java @@ -18,7 +18,7 @@ package org.apache.ignite.compute; import org.apache.ignite.*; -import org.apache.ignite.lang.IgniteClosure; +import org.apache.ignite.lang.*; import org.jetbrains.annotations.*; import java.util.concurrent.*; http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/ca829a16/modules/core/src/main/java/org/apache/ignite/compute/ComputeTask.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/compute/ComputeTask.java b/modules/core/src/main/java/org/apache/ignite/compute/ComputeTask.java index 88effbd..b2c59fe 100644 --- a/modules/core/src/main/java/org/apache/ignite/compute/ComputeTask.java +++ b/modules/core/src/main/java/org/apache/ignite/compute/ComputeTask.java @@ -87,7 +87,7 @@ import java.util.*; * <ul> * <li> * Job has failed due to node crash. In this case {@link ComputeJobResult#getException()} - * method will return an instance of {@link org.apache.ignite.internal.cluster.ClusterTopologyCheckedException} exception. + * method will return an instance of {@link org.apache.ignite.cluster.ClusterTopologyException} exception. * </li> * <li> * Job execution was rejected, i.e. remote node has cancelled job before it got @@ -146,7 +146,7 @@ import java.util.*; * <li> * {@link ComputeTaskAdapter} provides default implementation for {@link ComputeTask#result(ComputeJobResult, List)} * method which provides automatic fail-over to another node if remote job has failed - * due to node crash (detected by {@link org.apache.ignite.internal.cluster.ClusterTopologyCheckedException} exception) or due to job + * due to node crash (detected by {@link org.apache.ignite.cluster.ClusterTopologyException} exception) or due to job * execution rejection (detected by {@link ComputeExecutionRejectedException} exception). * Here is an example of how a you would implement your task using {@link ComputeTaskAdapter}: * <pre name="code" class="java"> http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/ca829a16/modules/core/src/main/java/org/apache/ignite/compute/ComputeTaskAdapter.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/compute/ComputeTaskAdapter.java b/modules/core/src/main/java/org/apache/ignite/compute/ComputeTaskAdapter.java index 3649ca9..a45a1b2 100644 --- a/modules/core/src/main/java/org/apache/ignite/compute/ComputeTaskAdapter.java +++ b/modules/core/src/main/java/org/apache/ignite/compute/ComputeTaskAdapter.java @@ -19,7 +19,6 @@ package org.apache.ignite.compute; import org.apache.ignite.*; import org.apache.ignite.cluster.*; -import org.apache.ignite.internal.cluster.*; import java.util.*; @@ -77,7 +76,7 @@ public abstract class ComputeTaskAdapter<T, R> implements ComputeTask<T, R> { * <p> * If remote job resulted in exception ({@link ComputeJobResult#getException()} is not {@code null}), * then {@link ComputeJobResultPolicy#FAILOVER} policy will be returned if the exception is instance - * of {@link org.apache.ignite.internal.cluster.ClusterTopologyCheckedException} or {@link ComputeExecutionRejectedException}, which means that + * of {@link org.apache.ignite.cluster.ClusterTopologyException} or {@link ComputeExecutionRejectedException}, which means that * remote node either failed or job execution was rejected before it got a chance to start. In all * other cases the exception will be rethrown which will ultimately cause task to fail. * http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/ca829a16/modules/core/src/main/java/org/apache/ignite/compute/ComputeTaskTimeoutException.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/compute/ComputeTaskTimeoutException.java b/modules/core/src/main/java/org/apache/ignite/compute/ComputeTaskTimeoutException.java index 805b44e..b09f09f 100644 --- a/modules/core/src/main/java/org/apache/ignite/compute/ComputeTaskTimeoutException.java +++ b/modules/core/src/main/java/org/apache/ignite/compute/ComputeTaskTimeoutException.java @@ -22,7 +22,7 @@ import org.jetbrains.annotations.*; /** * This exception indicates that task execution timed out. It is thrown from - * {@link org.apache.ignite.compute.ComputeTaskFuture#get()} method. + * {@link ComputeTaskFuture#get()} method. */ public class ComputeTaskTimeoutException extends IgniteException { /** */ http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/ca829a16/modules/core/src/main/java/org/apache/ignite/internal/GridKillTask.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/GridKillTask.java b/modules/core/src/main/java/org/apache/ignite/internal/GridKillTask.java index 95f159c..ed99f11 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/GridKillTask.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/GridKillTask.java @@ -89,14 +89,14 @@ class GridKillTask extends ComputeTaskAdapter<Boolean, Void> { G.restart(true); } }, - "grid-restarter").start(); + "ignite-restarter").start(); else new Thread(new Runnable() { @Override public void run() { G.kill(true); } }, - "grid-stopper").start(); + "ignite-stopper").start(); return null; } http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/ca829a16/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheIoManager.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheIoManager.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheIoManager.java index d0afd80..e66ec7e 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheIoManager.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheIoManager.java @@ -335,7 +335,7 @@ public class GridCacheIoManager<K, V> extends GridCacheSharedManagerAdapter<K, V * @param node Node to send the message to. * @param msg Message to send. * @throws IgniteCheckedException If sending failed. - * @throws org.apache.ignite.internal.cluster.ClusterTopologyCheckedException If receiver left. + * @throws ClusterTopologyCheckedException If receiver left. */ public void send(ClusterNode node, GridCacheMessage<K, V> msg) throws IgniteCheckedException { send(node, msg, SYSTEM_POOL); @@ -347,7 +347,7 @@ public class GridCacheIoManager<K, V> extends GridCacheSharedManagerAdapter<K, V * @param node Node to send the message to. * @param msg Message to send. * @throws IgniteCheckedException If sending failed. - * @throws org.apache.ignite.internal.cluster.ClusterTopologyCheckedException If receiver left. + * @throws ClusterTopologyCheckedException If receiver left. */ public void send(ClusterNode node, GridCacheMessage<K, V> msg, GridIoPolicy plc) throws IgniteCheckedException { assert !node.isLocal(); @@ -808,6 +808,9 @@ public class GridCacheIoManager<K, V> extends GridCacheSharedManagerAdapter<K, V } } + /** + * + */ private static class ListenerKey { /** Cache ID. */ private int cacheId; http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/ca829a16/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheStoreManager.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheStoreManager.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheStoreManager.java index 3f15fe5..705f7ed 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheStoreManager.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheStoreManager.java @@ -184,9 +184,8 @@ public class GridCacheStoreManager<K, V> extends GridCacheManagerAdapter<K, V> { boolean convertPortable = !cctx.config().isKeepPortableInStore(); - if (cctx.config().isPortableEnabled()) { + if (cctx.config().isPortableEnabled()) this.convertPortable = convertPortable; - } else if (convertPortable) U.warn(log, "CacheConfiguration.isKeepPortableInStore() configuration property will " + "be ignored because portable mode is not enabled for cache: " + cctx.namex()); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/ca829a16/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheWriteBehindStore.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheWriteBehindStore.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheWriteBehindStore.java index c52ea5a..8bbd6ff 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheWriteBehindStore.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheWriteBehindStore.java @@ -958,7 +958,7 @@ public class GridCacheWriteBehindStore<K, V> extends CacheStore<K, V> implements /** * Awaits a signal on flush condition * - * @throws org.apache.ignite.internal.IgniteInterruptedCheckedException If thread was interrupted. + * @throws IgniteInterruptedCheckedException If thread was interrupted. */ private void waitForFlush() throws IgniteInterruptedCheckedException { U.await(flushCond); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/ca829a16/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/GridDhtPartitionDemandPool.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/GridDhtPartitionDemandPool.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/GridDhtPartitionDemandPool.java index edc7f0a..9c0b0db 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/GridDhtPartitionDemandPool.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/GridDhtPartitionDemandPool.java @@ -479,7 +479,7 @@ public class GridDhtPartitionDemandPool<K, V> { * @param entry Preloaded entry. * @param topVer Topology version. * @return {@code False} if partition has become invalid during preloading. - * @throws org.apache.ignite.internal.IgniteInterruptedCheckedException If interrupted. + * @throws IgniteInterruptedCheckedException If interrupted. */ private boolean preloadEntry(ClusterNode pick, int p, GridCacheEntryInfo<K, V> entry, long topVer) throws IgniteCheckedException { @@ -566,7 +566,7 @@ public class GridDhtPartitionDemandPool<K, V> { * @param exchFut Exchange future. * @return Missed partitions. * @throws InterruptedException If interrupted. - * @throws org.apache.ignite.internal.cluster.ClusterTopologyCheckedException If node left. + * @throws ClusterTopologyCheckedException If node left. * @throws IgniteCheckedException If failed to send message. */ private Set<Integer> demandFromNode(ClusterNode node, final long topVer, GridDhtPartitionDemandMessage<K, V> d, http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/ca829a16/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/GridDhtPartitionsExchangeFuture.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/GridDhtPartitionsExchangeFuture.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/GridDhtPartitionsExchangeFuture.java index b592b4b..80304c9 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/GridDhtPartitionsExchangeFuture.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/GridDhtPartitionsExchangeFuture.java @@ -405,7 +405,7 @@ public class GridDhtPartitionsExchangeFuture<K, V> extends GridFutureAdapter<Lon /** * Starts activity. * - * @throws org.apache.ignite.internal.IgniteInterruptedCheckedException If interrupted. + * @throws IgniteInterruptedCheckedException If interrupted. */ public void init() throws IgniteInterruptedCheckedException { assert oldestNode.get() != null; http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/ca829a16/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/query/GridCacheQueryFutureAdapter.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/query/GridCacheQueryFutureAdapter.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/query/GridCacheQueryFutureAdapter.java index ef45148..ab79653 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/query/GridCacheQueryFutureAdapter.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/query/GridCacheQueryFutureAdapter.java @@ -497,7 +497,7 @@ public abstract class GridCacheQueryFutureAdapter<K, V, R> extends GridFutureAda /** * Loads all left pages. * - * @throws org.apache.ignite.internal.IgniteInterruptedCheckedException If thread is interrupted. + * @throws IgniteInterruptedCheckedException If thread is interrupted. */ protected abstract void loadAllPages() throws IgniteInterruptedCheckedException; http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/ca829a16/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/transactions/IgniteInternalTx.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/transactions/IgniteInternalTx.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/transactions/IgniteInternalTx.java index be83e25..f610e4b 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/transactions/IgniteInternalTx.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/transactions/IgniteInternalTx.java @@ -661,7 +661,7 @@ public interface IgniteInternalTx<K, V> extends AutoCloseable, GridTimeoutObject * Gets allowed remaining time for this transaction. * * @return Remaining time. - * @throws org.apache.ignite.internal.transactions.IgniteTxTimeoutCheckedException If transaction timed out. + * @throws IgniteTxTimeoutCheckedException If transaction timed out. */ public long remainingTime() throws IgniteTxTimeoutCheckedException; http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/ca829a16/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/transactions/IgniteTxAdapter.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/transactions/IgniteTxAdapter.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/transactions/IgniteTxAdapter.java index 4de5441..0bcccf0 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/transactions/IgniteTxAdapter.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/transactions/IgniteTxAdapter.java @@ -1885,7 +1885,7 @@ public abstract class IgniteTxAdapter<K, V> extends GridMetadataAwareAdapter /** {@inheritDoc} */ @Override public void writeVersion(GridCacheVersion ver) { - + // No-op. } /** {@inheritDoc} */ @@ -1898,14 +1898,14 @@ public abstract class IgniteTxAdapter<K, V> extends GridMetadataAwareAdapter return false; } - @Override - public void invalidate(boolean invalidate) { - + /** {@inheritDoc} */ + @Override public void invalidate(boolean invalidate) { + // No-op. } /** {@inheritDoc} */ @Override public void systemInvalidate(boolean sysInvalidate) { - + // No-op. } /** {@inheritDoc} */ @@ -1933,8 +1933,8 @@ public abstract class IgniteTxAdapter<K, V> extends GridMetadataAwareAdapter return false; } - @Override - public boolean done() { + /** {@inheritDoc} */ + @Override public boolean done() { return false; } @@ -1985,7 +1985,7 @@ public abstract class IgniteTxAdapter<K, V> extends GridMetadataAwareAdapter /** {@inheritDoc} */ @Override public void completedVersions(GridCacheVersion base, Collection committed, Collection rolledback) { - + // No-op. } /** {@inheritDoc} */ @@ -2020,7 +2020,7 @@ public abstract class IgniteTxAdapter<K, V> extends GridMetadataAwareAdapter /** {@inheritDoc} */ @Override public void onTimeout() { - + // No-op. } /** {@inheritDoc} */ http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/ca829a16/modules/core/src/main/java/org/apache/ignite/internal/processors/clock/GridClockDeltaSnapshot.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/clock/GridClockDeltaSnapshot.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/clock/GridClockDeltaSnapshot.java index e8c9586..7ef4b79 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/clock/GridClockDeltaSnapshot.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/clock/GridClockDeltaSnapshot.java @@ -94,7 +94,7 @@ public class GridClockDeltaSnapshot { * Awaits either until snapshot is ready or timeout elapses. * * @param timeout Timeout to wait. - * @throws org.apache.ignite.internal.IgniteInterruptedCheckedException If wait was interrupted. + * @throws IgniteInterruptedCheckedException If wait was interrupted. */ public synchronized void awaitReady(long timeout) throws IgniteInterruptedCheckedException { long start = System.currentTimeMillis(); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/ca829a16/modules/core/src/main/java/org/apache/ignite/internal/processors/dataload/IgniteDataLoaderImpl.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/dataload/IgniteDataLoaderImpl.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/dataload/IgniteDataLoaderImpl.java index 1c03066..04d1b03 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/dataload/IgniteDataLoaderImpl.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/dataload/IgniteDataLoaderImpl.java @@ -837,7 +837,7 @@ public class IgniteDataLoaderImpl<K, V> implements IgniteDataLoader<K, V>, Delay /** * @param newEntries Infos. * @param lsnr Listener for the operation future. - * @throws org.apache.ignite.internal.IgniteInterruptedCheckedException If failed. + * @throws IgniteInterruptedCheckedException If failed. * @return Future for operation. */ @Nullable GridFutureAdapter<?> update(Iterable<Map.Entry<K, V>> newEntries, @@ -882,10 +882,9 @@ public class IgniteDataLoaderImpl<K, V> implements IgniteDataLoader<K, V>, Delay /** * @return Future if any submitted. * - * @throws org.apache.ignite.internal.IgniteInterruptedCheckedException If thread has been interrupted. + * @throws IgniteInterruptedCheckedException If thread has been interrupted. */ - @Nullable - IgniteInternalFuture<?> flush() throws IgniteInterruptedCheckedException { + @Nullable IgniteInternalFuture<?> flush() throws IgniteInterruptedCheckedException { List<Map.Entry<K, V>> entries0 = null; GridFutureAdapter<Object> curFut0 = null; @@ -929,7 +928,7 @@ public class IgniteDataLoaderImpl<K, V> implements IgniteDataLoader<K, V>, Delay /** * Increments active tasks count. * - * @throws org.apache.ignite.internal.IgniteInterruptedCheckedException If thread has been interrupted. + * @throws IgniteInterruptedCheckedException If thread has been interrupted. */ private void incrementActiveTasks() throws IgniteInterruptedCheckedException { U.acquire(sem); @@ -947,7 +946,7 @@ public class IgniteDataLoaderImpl<K, V> implements IgniteDataLoader<K, V>, Delay /** * @param entries Entries to submit. * @param curFut Current future. - * @throws org.apache.ignite.internal.IgniteInterruptedCheckedException If interrupted. + * @throws IgniteInterruptedCheckedException If interrupted. */ private void submit(final Collection<Map.Entry<K, V>> entries, final GridFutureAdapter<Object> curFut) throws IgniteInterruptedCheckedException { http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/ca829a16/modules/core/src/main/java/org/apache/ignite/internal/processors/fs/GridGgfsDataManager.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/fs/GridGgfsDataManager.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/fs/GridGgfsDataManager.java index bd9802a..57ae45c 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/fs/GridGgfsDataManager.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/fs/GridGgfsDataManager.java @@ -1846,7 +1846,7 @@ public class GridGgfsDataManager extends GridGgfsManager { // If waiting for ack from this node. if (reqIds != null && !reqIds.isEmpty()) { - if (e.getCause() instanceof IgniteFsOutOfSpaceException) + if (e.hasCause(IgniteFsOutOfSpaceException.class)) onDone(new IgniteCheckedException("Failed to write data (not enough space on node): " + nodeId, e)); else onDone(new IgniteCheckedException( http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/ca829a16/modules/core/src/main/java/org/apache/ignite/internal/processors/fs/GridGgfsImpl.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/fs/GridGgfsImpl.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/fs/GridGgfsImpl.java index 63f3e86..c5eb00f 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/fs/GridGgfsImpl.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/fs/GridGgfsImpl.java @@ -520,7 +520,7 @@ public final class GridGgfsImpl implements GridGgfsEx { IgniteFsMode mode = modeRslvr.resolveMode(path); if (mode == PROXY) - throw new IgniteCheckedException("PROXY mode cannot be used in GGFS directly: " + path); + throw new IgniteException("PROXY mode cannot be used in GGFS directly: " + path); GridGgfsFileInfo info = resolveFileInfo(path, mode); @@ -644,7 +644,7 @@ public final class GridGgfsImpl implements GridGgfsEx { Set<IgniteFsMode> childrenModes = modeRslvr.resolveChildrenModes(src); if (mode == PROXY) - throw new IgniteCheckedException("PROXY mode cannot be used in GGFS directly: " + src); + throw new IgniteException("PROXY mode cannot be used in GGFS directly: " + src); if (src.equals(dest)) return; // Rename to itself is a no-op. @@ -1097,7 +1097,7 @@ public final class GridGgfsImpl implements GridGgfsEx { IgniteFsMode mode = modeRslvr.resolveMode(path); if (mode == PROXY) - throw new IgniteCheckedException("PROXY mode cannot be used in GGFS directly: " + path); + throw new IgniteException("PROXY mode cannot be used in GGFS directly: " + path); else if (mode != PRIMARY) { assert mode == DUAL_SYNC || mode == DUAL_ASYNC; http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/ca829a16/modules/core/src/main/java/org/apache/ignite/internal/processors/fs/GridGgfsMetaManager.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/fs/GridGgfsMetaManager.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/fs/GridGgfsMetaManager.java index ce33c60..5c1e619 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/fs/GridGgfsMetaManager.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/fs/GridGgfsMetaManager.java @@ -1768,7 +1768,7 @@ public class GridGgfsMetaManager extends GridGgfsManager { GridGgfsFileInfo info = infos.get(path); if (info.isDirectory()) - throw new IgniteCheckedException("Failed to open output stream to the file in the " + + throw fsException("Failed to open output stream to the file in the " + "secondary file system because the path points to a directory: " + path); out = fs.append(path, bufSize, false, null); @@ -2067,7 +2067,7 @@ public class GridGgfsMetaManager extends GridGgfsManager { else { // Move. if (destInfo.isFile()) - throw new IgniteCheckedException("Failed to rename the path in the local file system " + + throw fsException("Failed to rename the path in the local file system " + "because destination path already exists and it is a file: " + dest); else moveNonTx(srcInfo.id(), src.name(), srcParentInfo.id(), src.name(), destInfo.id()); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/ca829a16/modules/core/src/main/java/org/apache/ignite/internal/processors/query/GridQueryProcessor.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/query/GridQueryProcessor.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/query/GridQueryProcessor.java index 57f0e46..07d5c71 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/query/GridQueryProcessor.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/query/GridQueryProcessor.java @@ -1339,7 +1339,7 @@ public class GridQueryProcessor extends GridProcessorAdapter { /** * @return Waits for initialization. - * @throws org.apache.ignite.internal.IgniteInterruptedCheckedException If thread is interrupted. + * @throws IgniteInterruptedCheckedException If thread is interrupted. */ boolean await() throws IgniteInterruptedCheckedException { return initializer.await(); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/ca829a16/modules/core/src/main/java/org/apache/ignite/internal/processors/rest/handlers/cache/GridCacheQueryCommandHandler.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/rest/handlers/cache/GridCacheQueryCommandHandler.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/rest/handlers/cache/GridCacheQueryCommandHandler.java index cb546ce..9616ed7 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/rest/handlers/cache/GridCacheQueryCommandHandler.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/rest/handlers/cache/GridCacheQueryCommandHandler.java @@ -131,8 +131,6 @@ public class GridCacheQueryCommandHandler extends GridRestCommandHandlerAdapter ctx.task().setThreadContext(TC_NO_FAILOVER, true); - ctx.closure().callAsync(BALANCE, c, ctx.grid().forNodeId(destId).nodes()); - return ctx.closure().callAsync(BALANCE, c, ctx.grid().forNodeId(destId).nodes()); } } http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/ca829a16/modules/core/src/main/java/org/apache/ignite/internal/processors/rest/handlers/task/GridTaskCommandHandler.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/rest/handlers/task/GridTaskCommandHandler.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/rest/handlers/task/GridTaskCommandHandler.java index 5555fba..b601f10 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/rest/handlers/task/GridTaskCommandHandler.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/rest/handlers/task/GridTaskCommandHandler.java @@ -48,7 +48,7 @@ import java.util.concurrent.locks.*; import static java.util.concurrent.TimeUnit.*; import static org.apache.ignite.IgniteSystemProperties.*; import static org.apache.ignite.events.IgniteEventType.*; -import static org.apache.ignite.internal.GridClosureCallMode.BALANCE; +import static org.apache.ignite.internal.GridClosureCallMode.*; import static org.apache.ignite.internal.GridTopic.*; import static org.apache.ignite.internal.managers.communication.GridIoPolicy.*; import static org.apache.ignite.internal.processors.rest.GridRestCommand.*; http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/ca829a16/modules/core/src/main/java/org/apache/ignite/internal/processors/streamer/IgniteStreamerImpl.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/streamer/IgniteStreamerImpl.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/streamer/IgniteStreamerImpl.java index bb8d362..99162a1 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/streamer/IgniteStreamerImpl.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/streamer/IgniteStreamerImpl.java @@ -572,7 +572,7 @@ public class IgniteStreamerImpl implements IgniteStreamerEx, Externalizable { * @param stageName Stage name. * @param evts Events. * @return Future. - * @throws org.apache.ignite.internal.IgniteInterruptedCheckedException If failed. + * @throws IgniteInterruptedCheckedException If failed. */ private GridStreamerStageExecutionFuture addEvents0( @Nullable IgniteUuid execId, http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/ca829a16/modules/core/src/main/java/org/apache/ignite/internal/util/GridAtomicInitializer.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/util/GridAtomicInitializer.java b/modules/core/src/main/java/org/apache/ignite/internal/util/GridAtomicInitializer.java index b2dd61e..3c42009 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/util/GridAtomicInitializer.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/util/GridAtomicInitializer.java @@ -93,7 +93,7 @@ public class GridAtomicInitializer<T> { * Await for completion. * * @return {@code true} If initialization was completed successfully. - * @throws org.apache.ignite.internal.IgniteInterruptedCheckedException If thread was interrupted. + * @throws IgniteInterruptedCheckedException If thread was interrupted. */ public boolean await() throws IgniteInterruptedCheckedException { if (!finished) { http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/ca829a16/modules/core/src/main/java/org/apache/ignite/internal/util/IgniteUtils.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/util/IgniteUtils.java b/modules/core/src/main/java/org/apache/ignite/internal/util/IgniteUtils.java index 7f14ca4..3f00b98 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/util/IgniteUtils.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/util/IgniteUtils.java @@ -5773,7 +5773,7 @@ public abstract class IgniteUtils { * Converts {@link InterruptedException} to {@link IgniteCheckedException}. * * @param mux Mux to wait on. - * @throws org.apache.ignite.internal.IgniteInterruptedCheckedException If interrupted. + * @throws IgniteInterruptedCheckedException If interrupted. */ @SuppressWarnings({"WaitNotInLoop", "WaitWhileNotSynced"}) public static void wait(Object mux) throws IgniteInterruptedCheckedException { @@ -7002,7 +7002,7 @@ public abstract class IgniteUtils { * Awaits for condition. * * @param cond Condition to await for. - * @throws org.apache.ignite.internal.IgniteInterruptedCheckedException Wrapped {@link InterruptedException} + * @throws IgniteInterruptedCheckedException Wrapped {@link InterruptedException} */ public static void await(Condition cond) throws IgniteInterruptedCheckedException { try { @@ -7022,7 +7022,7 @@ public abstract class IgniteUtils { * @param time The maximum time to wait, * @param unit The unit of the {@code time} argument. * @return {@code false} if the waiting time detectably elapsed before return from the method, else {@code true} - * @throws org.apache.ignite.internal.IgniteInterruptedCheckedException Wrapped {@link InterruptedException} + * @throws IgniteInterruptedCheckedException Wrapped {@link InterruptedException} */ public static boolean await(Condition cond, long time, TimeUnit unit) throws IgniteInterruptedCheckedException { try { @@ -7039,7 +7039,7 @@ public abstract class IgniteUtils { * Awaits for the latch. * * @param latch Latch to wait for. - * @throws org.apache.ignite.internal.IgniteInterruptedCheckedException Wrapped {@link InterruptedException}. + * @throws IgniteInterruptedCheckedException Wrapped {@link InterruptedException}. */ public static void await(CountDownLatch latch) throws IgniteInterruptedCheckedException { try { @@ -7061,7 +7061,7 @@ public abstract class IgniteUtils { * @param unit Time unit for timeout. * @return {@code True} if the count reached zero and {@code false} * if the waiting time elapsed before the count reached zero. - * @throws org.apache.ignite.internal.IgniteInterruptedCheckedException Wrapped {@link InterruptedException}. + * @throws IgniteInterruptedCheckedException Wrapped {@link InterruptedException}. */ public static boolean await(CountDownLatch latch, long timeout, TimeUnit unit) throws IgniteInterruptedCheckedException { @@ -7135,7 +7135,7 @@ public abstract class IgniteUtils { * Sleeps for given number of milliseconds. * * @param ms Time to sleep. - * @throws org.apache.ignite.internal.IgniteInterruptedCheckedException Wrapped {@link InterruptedException}. + * @throws IgniteInterruptedCheckedException Wrapped {@link InterruptedException}. */ public static void sleep(long ms) throws IgniteInterruptedCheckedException { try { @@ -7152,7 +7152,7 @@ public abstract class IgniteUtils { * Joins worker. * * @param w Worker. - * @throws org.apache.ignite.internal.IgniteInterruptedCheckedException Wrapped {@link InterruptedException}. + * @throws IgniteInterruptedCheckedException Wrapped {@link InterruptedException}. */ public static void join(GridWorker w) throws IgniteInterruptedCheckedException { try { @@ -8344,10 +8344,10 @@ public abstract class IgniteUtils { /** * For each object provided by the given {@link Iterable} checks if it implements - * {@link org.apache.ignite.lifecycle.LifecycleAware} interface and executes {@link org.apache.ignite.lifecycle.LifecycleAware#start} method. + * {@link LifecycleAware} interface and executes {@link LifecycleAware#start} method. * * @param objs Objects. - * @throws IgniteCheckedException If {@link org.apache.ignite.lifecycle.LifecycleAware#start} fails. + * @throws IgniteCheckedException If {@link LifecycleAware#start} fails. */ public static void startLifecycleAware(Iterable<?> objs) throws IgniteCheckedException { try { @@ -8357,7 +8357,7 @@ public abstract class IgniteUtils { } } catch (Exception e) { - throw new IgniteCheckedException(e); + throw new IgniteCheckedException("Failed to start component: " + e, e); } } http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/ca829a16/modules/core/src/main/java/org/apache/ignite/internal/util/future/GridFutureAdapter.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/util/future/GridFutureAdapter.java b/modules/core/src/main/java/org/apache/ignite/internal/util/future/GridFutureAdapter.java index 99e96a4..6bde5f7 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/util/future/GridFutureAdapter.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/util/future/GridFutureAdapter.java @@ -242,7 +242,7 @@ public class GridFutureAdapter<R> extends AbstractQueuedSynchronizer implements * @param nanosTimeout Timeout (nanoseconds). * @return Result. * @throws InterruptedException If interrupted. - * @throws org.apache.ignite.internal.IgniteFutureTimeoutCheckedException If timeout reached before computation completed. + * @throws IgniteFutureTimeoutCheckedException If timeout reached before computation completed. * @throws IgniteCheckedException If error occurred. */ @Nullable protected R get0(long nanosTimeout) throws InterruptedException, IgniteCheckedException { http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/ca829a16/modules/core/src/main/java/org/apache/ignite/internal/util/nio/GridNioFuture.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/util/nio/GridNioFuture.java b/modules/core/src/main/java/org/apache/ignite/internal/util/nio/GridNioFuture.java index 7baf2e3..33ddb00 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/util/nio/GridNioFuture.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/util/nio/GridNioFuture.java @@ -35,8 +35,8 @@ public interface GridNioFuture<R> { * returns operation result. * * @return Operation result. - * @throws org.apache.ignite.internal.IgniteInterruptedCheckedException Subclass of {@link GridException} thrown if the wait was interrupted. - * @throws org.apache.ignite.internal.IgniteFutureCancelledCheckedException Subclass of {@link GridException} throws if operation was cancelled. + * @throws org.apache.ignite.internal.IgniteInterruptedCheckedException Subclass of {@link IgniteCheckedException} thrown if the wait was interrupted. + * @throws org.apache.ignite.internal.IgniteFutureCancelledCheckedException Subclass of {@link IgniteCheckedException} throws if operation was cancelled. * @throws IgniteCheckedException If operation failed. * @throws IOException If IOException occurred while performing operation. */ @@ -49,9 +49,9 @@ public interface GridNioFuture<R> { * * @param timeout The maximum time to wait in milliseconds. * @return Operation result. - * @throws org.apache.ignite.internal.IgniteInterruptedCheckedException Subclass of {@link GridException} thrown if the wait was interrupted. - * @throws org.apache.ignite.internal.IgniteFutureTimeoutCheckedException Subclass of {@link GridException} thrown if the wait was timed out. - * @throws org.apache.ignite.internal.IgniteFutureCancelledCheckedException Subclass of {@link GridException} throws if operation was cancelled. + * @throws org.apache.ignite.internal.IgniteInterruptedCheckedException Subclass of {@link IgniteCheckedException} thrown if the wait was interrupted. + * @throws org.apache.ignite.internal.IgniteFutureTimeoutCheckedException Subclass of {@link IgniteCheckedException} thrown if the wait was timed out. + * @throws org.apache.ignite.internal.IgniteFutureCancelledCheckedException Subclass of {@link IgniteCheckedException} throws if operation was cancelled. * @throws IgniteCheckedException If operation failed. * @throws IOException If IOException occurred while performing operation. */ @@ -64,9 +64,9 @@ public interface GridNioFuture<R> { * @param timeout The maximum time to wait. * @param unit The time unit of the {@code timeout} argument. * @return Operation result. - * @throws org.apache.ignite.internal.IgniteInterruptedCheckedException Subclass of {@link GridException} thrown if the wait was interrupted. - * @throws org.apache.ignite.internal.IgniteFutureTimeoutCheckedException Subclass of {@link GridException} thrown if the wait was timed out. - * @throws org.apache.ignite.internal.IgniteFutureCancelledCheckedException Subclass of {@link GridException} throws if operation was cancelled. + * @throws org.apache.ignite.internal.IgniteInterruptedCheckedException Subclass of {@link IgniteCheckedException} thrown if the wait was interrupted. + * @throws org.apache.ignite.internal.IgniteFutureTimeoutCheckedException Subclass of {@link IgniteCheckedException} thrown if the wait was timed out. + * @throws org.apache.ignite.internal.IgniteFutureCancelledCheckedException Subclass of {@link IgniteCheckedException} throws if operation was cancelled. * @throws IgniteCheckedException If operation failed. * @throws IOException If IOException occurred while performing operation. */ http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/ca829a16/modules/core/src/main/java/org/apache/ignite/internal/util/worker/GridWorker.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/util/worker/GridWorker.java b/modules/core/src/main/java/org/apache/ignite/internal/util/worker/GridWorker.java index 526e30a..12c5234 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/util/worker/GridWorker.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/util/worker/GridWorker.java @@ -193,7 +193,7 @@ public abstract class GridWorker implements Runnable { * The implementation should provide the execution body for this runnable. * * @throws InterruptedException Thrown in case of interruption. - * @throws org.apache.ignite.internal.IgniteInterruptedCheckedException If interrupted. + * @throws IgniteInterruptedCheckedException If interrupted. */ protected abstract void body() throws InterruptedException, IgniteInterruptedCheckedException; http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/ca829a16/modules/core/src/main/java/org/apache/ignite/internal/visor/VisorMultiNodeTask.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/visor/VisorMultiNodeTask.java b/modules/core/src/main/java/org/apache/ignite/internal/visor/VisorMultiNodeTask.java index 4154972..f3d9df1 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/visor/VisorMultiNodeTask.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/visor/VisorMultiNodeTask.java @@ -76,7 +76,7 @@ public abstract class VisorMultiNodeTask<A, R, J> implements ComputeTask<VisorTa * @param arg Task execution argument. * @param subgrid Nodes available for this task execution. * @return Map of grid jobs assigned to subgrid node. - * @throws IgniteCheckedException If mapping could not complete successfully. + * @throws IgniteException If mapping could not complete successfully. */ protected Map<? extends ComputeJob, ClusterNode> map0(List<ClusterNode> subgrid, VisorTaskArgument<A> arg) { Collection<UUID> nodeIds = arg.nodes(); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/ca829a16/modules/core/src/main/java/org/apache/ignite/internal/visor/VisorOneNodeTask.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/visor/VisorOneNodeTask.java b/modules/core/src/main/java/org/apache/ignite/internal/visor/VisorOneNodeTask.java index ad5ca19..351ebc5 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/visor/VisorOneNodeTask.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/visor/VisorOneNodeTask.java @@ -17,7 +17,6 @@ package org.apache.ignite.internal.visor; -import org.apache.ignite.*; import org.apache.ignite.compute.*; import org.apache.ignite.internal.util.typedef.*; import org.jetbrains.annotations.*; http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/ca829a16/modules/core/src/main/java/org/apache/ignite/internal/visor/misc/VisorLatestVersionTask.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/visor/misc/VisorLatestVersionTask.java b/modules/core/src/main/java/org/apache/ignite/internal/visor/misc/VisorLatestVersionTask.java index 1d6b4b1..a5d13e4 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/visor/misc/VisorLatestVersionTask.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/visor/misc/VisorLatestVersionTask.java @@ -17,7 +17,6 @@ package org.apache.ignite.internal.visor.misc; -import org.apache.ignite.*; import org.apache.ignite.internal.processors.task.*; import org.apache.ignite.internal.visor.*; import org.apache.ignite.internal.util.typedef.internal.*; http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/ca829a16/modules/core/src/main/java/org/apache/ignite/internal/visor/node/VisorNodePingTask.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/visor/node/VisorNodePingTask.java b/modules/core/src/main/java/org/apache/ignite/internal/visor/node/VisorNodePingTask.java index 6bf2386..821673e 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/visor/node/VisorNodePingTask.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/visor/node/VisorNodePingTask.java @@ -17,10 +17,8 @@ package org.apache.ignite.internal.visor.node; -import org.apache.ignite.*; import org.apache.ignite.cluster.*; import org.apache.ignite.compute.*; -import org.apache.ignite.internal.cluster.*; import org.apache.ignite.internal.processors.task.*; import org.apache.ignite.internal.visor.*; import org.apache.ignite.internal.util.lang.*;
