Repository: ignite Updated Branches: refs/heads/master cabf78732 -> 8591be103
IGNITE-10375 Fix inspection failures - Fixes #5469. Signed-off-by: Pavel Kovalenko <[email protected]> Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/8591be10 Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/8591be10 Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/8591be10 Branch: refs/heads/master Commit: 8591be10308f7f8e43bfe04356f389899d1fe3fd Parents: cabf787 Author: Dmitrii Ryabov <[email protected]> Authored: Thu Nov 22 19:28:37 2018 +0300 Committer: Pavel Kovalenko <[email protected]> Committed: Thu Nov 22 19:28:37 2018 +0300 ---------------------------------------------------------------------- .../cache/distributed/dht/GridDhtTxAbstractEnlistFuture.java | 2 +- .../cache/distributed/dht/topology/GridDhtLocalPartition.java | 1 - .../processors/cache/persistence/GridCacheOffheapManager.java | 2 +- .../ignite/internal/processors/query/GridQueryProcessor.java | 1 - 4 files changed, 2 insertions(+), 4 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ignite/blob/8591be10/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtTxAbstractEnlistFuture.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtTxAbstractEnlistFuture.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtTxAbstractEnlistFuture.java index 62084dc..ea1c58d 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtTxAbstractEnlistFuture.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtTxAbstractEnlistFuture.java @@ -914,7 +914,7 @@ public abstract class GridDhtTxAbstractEnlistFuture<T> extends GridCacheFutureAd @NotNull private List<ClusterNode> backupNodes(int part) { List<ClusterNode> nodes = cctx.topology().nodes(part, tx.topologyVersion()); - assert nodes.size() > 0 && nodes.get(0).isLocal(); + assert !nodes.isEmpty() && nodes.get(0).isLocal(); return nodes.subList(1, nodes.size()); } http://git-wip-us.apache.org/repos/asf/ignite/blob/8591be10/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/topology/GridDhtLocalPartition.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/topology/GridDhtLocalPartition.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/topology/GridDhtLocalPartition.java index d1cd1eb..c1f742e 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/topology/GridDhtLocalPartition.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/topology/GridDhtLocalPartition.java @@ -62,7 +62,6 @@ import org.apache.ignite.internal.util.tostring.GridToStringExclude; import org.apache.ignite.internal.util.typedef.internal.S; import org.apache.ignite.internal.util.typedef.internal.U; import org.apache.ignite.lang.IgniteInClosure; -import org.apache.ignite.lang.IgniteUuid; import org.apache.ignite.util.deque.FastSizeDeque; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; http://git-wip-us.apache.org/repos/asf/ignite/blob/8591be10/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/persistence/GridCacheOffheapManager.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/persistence/GridCacheOffheapManager.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/persistence/GridCacheOffheapManager.java index fb287bb..44ae6f1 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/persistence/GridCacheOffheapManager.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/persistence/GridCacheOffheapManager.java @@ -1573,7 +1573,7 @@ public class GridCacheOffheapManager extends IgniteCacheOffheapManagerImpl imple pendingTree = pendingTree0; - if (!hasPendingEntries && pendingTree0.size() > 0) + if (!hasPendingEntries && !pendingTree0.isEmpty()) hasPendingEntries = true; int grpId = grp.groupId(); http://git-wip-us.apache.org/repos/asf/ignite/blob/8591be10/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 82fd51b..d3f2930 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 @@ -70,7 +70,6 @@ import org.apache.ignite.internal.processors.cache.QueryCursorImpl; import org.apache.ignite.internal.processors.cache.mvcc.MvccSnapshot; import org.apache.ignite.internal.processors.cache.persistence.CacheDataRow; import org.apache.ignite.internal.processors.cache.query.CacheQueryFuture; -import org.apache.ignite.internal.processors.cache.query.CacheQueryType; import org.apache.ignite.internal.processors.cache.query.GridCacheQueryType; import org.apache.ignite.internal.processors.cache.query.IgniteQueryErrorCode; import org.apache.ignite.internal.processors.query.property.QueryBinaryProperty;
