You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ignite.apache.org by vo...@apache.org on 2016/08/09 07:45:45 UTC
[3/6] ignite git commit: Minors.
Minors.
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/65d1b9d7
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/65d1b9d7
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/65d1b9d7
Branch: refs/heads/ignite-2545
Commit: 65d1b9d772db23209a0d23d29da451a3436b55a2
Parents: ebe52af
Author: vozerov-gridgain <vo...@gridgain.com>
Authored: Tue Aug 9 10:37:53 2016 +0300
Committer: vozerov-gridgain <vo...@gridgain.com>
Committed: Tue Aug 9 10:37:53 2016 +0300
----------------------------------------------------------------------
.../cache/distributed/GridCacheTxRecoveryFuture.java | 4 ++--
.../cache/distributed/dht/GridDhtGetFuture.java | 4 +---
.../cache/distributed/dht/GridDhtLockFuture.java | 4 ++--
.../cache/distributed/dht/GridDhtTxPrepareFuture.java | 4 ++--
.../dht/colocated/GridDhtColocatedLockFuture.java | 4 ++--
.../cache/distributed/near/GridNearLockFuture.java | 4 ++--
.../GridNearOptimisticSerializableTxPrepareFuture.java | 4 ++--
.../near/GridNearOptimisticTxPrepareFuture.java | 4 ++--
.../near/GridNearPessimisticTxPrepareFuture.java | 4 ++--
.../cache/distributed/near/GridNearTxFinishFuture.java | 4 ++--
.../ignite/internal/util/future/GridCompoundFuture.java | 12 ++++++------
11 files changed, 25 insertions(+), 27 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ignite/blob/65d1b9d7/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/GridCacheTxRecoveryFuture.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/GridCacheTxRecoveryFuture.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/GridCacheTxRecoveryFuture.java
index 2065233..c07a817 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/GridCacheTxRecoveryFuture.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/GridCacheTxRecoveryFuture.java
@@ -428,8 +428,8 @@ public class GridCacheTxRecoveryFuture extends GridCompoundIdentityFuture<Boolea
// We iterate directly over the futs collection here to avoid copy.
synchronized (sync) {
// Avoid iterator creation.
- for (int i = 0; i < futuresSize(); i++) {
- IgniteInternalFuture<Boolean> fut = futureGet(i);
+ for (int i = 0; i < futuresCount(); i++) {
+ IgniteInternalFuture<Boolean> fut = future(i);
if (!isMini(fut))
continue;
http://git-wip-us.apache.org/repos/asf/ignite/blob/65d1b9d7/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtGetFuture.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtGetFuture.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtGetFuture.java
index 913580f..d2a3b3c 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtGetFuture.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtGetFuture.java
@@ -29,7 +29,6 @@ import org.apache.ignite.IgniteCheckedException;
import org.apache.ignite.IgniteLogger;
import org.apache.ignite.cluster.ClusterNode;
import org.apache.ignite.internal.IgniteInternalFuture;
-import org.apache.ignite.internal.NodeStoppingException;
import org.apache.ignite.internal.processors.affinity.AffinityTopologyVersion;
import org.apache.ignite.internal.processors.cache.CacheObject;
import org.apache.ignite.internal.processors.cache.GridCacheContext;
@@ -50,7 +49,6 @@ import org.apache.ignite.internal.util.typedef.F;
import org.apache.ignite.internal.util.typedef.T2;
import org.apache.ignite.internal.util.typedef.internal.CU;
import org.apache.ignite.internal.util.typedef.internal.U;
-import org.apache.ignite.lang.IgniteBiClosure;
import org.apache.ignite.lang.IgniteUuid;
import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable;
@@ -277,7 +275,7 @@ public final class GridDhtGetFuture<K, V> extends GridCompoundIdentityFuture<Col
// Optimization to avoid going through compound future,
// if getAsync() has been completed and no other futures added to this
// compound future.
- if (fut.isDone() && futuresSize() == 0) {
+ if (fut.isDone() && futuresCount() == 0) {
if (fut.error() != null)
onDone(fut.error());
else
http://git-wip-us.apache.org/repos/asf/ignite/blob/65d1b9d7/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtLockFuture.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtLockFuture.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtLockFuture.java
index 185d530..187c8a4 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtLockFuture.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtLockFuture.java
@@ -548,8 +548,8 @@ public final class GridDhtLockFuture extends GridCompoundIdentityFuture<Boolean>
// We iterate directly over the futs collection here to avoid copy.
synchronized (sync) {
// Avoid iterator creation.
- for (int i = 0; i < futuresSize(); i++) {
- MiniFuture mini = (MiniFuture)futureGet(i);
+ for (int i = 0; i < futuresCount(); i++) {
+ MiniFuture mini = (MiniFuture) future(i);
if (mini.futureId().equals(miniId)) {
if (!mini.isDone())
http://git-wip-us.apache.org/repos/asf/ignite/blob/65d1b9d7/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtTxPrepareFuture.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtTxPrepareFuture.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtTxPrepareFuture.java
index 87357cc..2800897 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtTxPrepareFuture.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtTxPrepareFuture.java
@@ -528,8 +528,8 @@ public final class GridDhtTxPrepareFuture extends GridCompoundFuture<IgniteInter
// We iterate directly over the futs collection here to avoid copy.
synchronized (sync) {
// Avoid iterator creation.
- for (int i = 0; i < futuresSize(); i++) {
- IgniteInternalFuture<IgniteInternalTx> fut = futureGet(i);
+ for (int i = 0; i < futuresCount(); i++) {
+ IgniteInternalFuture<IgniteInternalTx> fut = future(i);
if (!isMini(fut))
continue;
http://git-wip-us.apache.org/repos/asf/ignite/blob/65d1b9d7/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/colocated/GridDhtColocatedLockFuture.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/colocated/GridDhtColocatedLockFuture.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/colocated/GridDhtColocatedLockFuture.java
index 79389fd..05b4a2b 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/colocated/GridDhtColocatedLockFuture.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/colocated/GridDhtColocatedLockFuture.java
@@ -473,8 +473,8 @@ public final class GridDhtColocatedLockFuture extends GridCompoundIdentityFuture
// We iterate directly over the futs collection here to avoid copy.
synchronized (sync) {
// Avoid iterator creation.
- for (int i = 0; i < futuresSize(); i++) {
- IgniteInternalFuture<Boolean> fut = futureGet(i);
+ for (int i = 0; i < futuresCount(); i++) {
+ IgniteInternalFuture<Boolean> fut = future(i);
if (!isMini(fut))
continue;
http://git-wip-us.apache.org/repos/asf/ignite/blob/65d1b9d7/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearLockFuture.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearLockFuture.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearLockFuture.java
index 9c53ffb..3b53c5e 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearLockFuture.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearLockFuture.java
@@ -491,8 +491,8 @@ public final class GridNearLockFuture extends GridCompoundIdentityFuture<Boolean
// We iterate directly over the futs collection here to avoid copy.
synchronized (sync) {
// Avoid iterator creation.
- for (int i = 0; i < futuresSize(); i++) {
- IgniteInternalFuture<Boolean> fut = futureGet(i);
+ for (int i = 0; i < futuresCount(); i++) {
+ IgniteInternalFuture<Boolean> fut = future(i);
if (!isMini(fut))
continue;
http://git-wip-us.apache.org/repos/asf/ignite/blob/65d1b9d7/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearOptimisticSerializableTxPrepareFuture.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearOptimisticSerializableTxPrepareFuture.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearOptimisticSerializableTxPrepareFuture.java
index 3e36e1a..cd0ce44 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearOptimisticSerializableTxPrepareFuture.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearOptimisticSerializableTxPrepareFuture.java
@@ -231,8 +231,8 @@ public class GridNearOptimisticSerializableTxPrepareFuture extends GridNearOptim
// We iterate directly over the futs collection here to avoid copy.
synchronized (sync) {
// Avoid iterator creation.
- for (int i = 0; i < futuresSize(); i++) {
- IgniteInternalFuture<GridNearTxPrepareResponse> fut = futureGet(i);
+ for (int i = 0; i < futuresCount(); i++) {
+ IgniteInternalFuture<GridNearTxPrepareResponse> fut = future(i);
if (!isMini(fut))
continue;
http://git-wip-us.apache.org/repos/asf/ignite/blob/65d1b9d7/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearOptimisticTxPrepareFuture.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearOptimisticTxPrepareFuture.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearOptimisticTxPrepareFuture.java
index cfe9542..7a49422 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearOptimisticTxPrepareFuture.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearOptimisticTxPrepareFuture.java
@@ -192,8 +192,8 @@ public class GridNearOptimisticTxPrepareFuture extends GridNearOptimisticTxPrepa
// We iterate directly over the futs collection here to avoid copy.
synchronized (sync) {
// Avoid iterator creation.
- for (int i = 0; i < futuresSize(); i++) {
- IgniteInternalFuture<GridNearTxPrepareResponse> fut = futureGet(i);
+ for (int i = 0; i < futuresCount(); i++) {
+ IgniteInternalFuture<GridNearTxPrepareResponse> fut = future(i);
if (!isMini(fut))
continue;
http://git-wip-us.apache.org/repos/asf/ignite/blob/65d1b9d7/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearPessimisticTxPrepareFuture.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearPessimisticTxPrepareFuture.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearPessimisticTxPrepareFuture.java
index 711bec2..a353ed5 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearPessimisticTxPrepareFuture.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearPessimisticTxPrepareFuture.java
@@ -134,8 +134,8 @@ public class GridNearPessimisticTxPrepareFuture extends GridNearTxPrepareFutureA
// We iterate directly over the futs collection here to avoid copy.
synchronized (sync) {
// Avoid iterator creation.
- for (int i = 0; i < futuresSize(); i++) {
- MiniFuture mini = (MiniFuture)futureGet(i);
+ for (int i = 0; i < futuresCount(); i++) {
+ MiniFuture mini = (MiniFuture) future(i);
if (mini.futureId().equals(miniId)) {
if (!mini.isDone())
http://git-wip-us.apache.org/repos/asf/ignite/blob/65d1b9d7/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearTxFinishFuture.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearTxFinishFuture.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearTxFinishFuture.java
index 0a8a7ce..c96651c 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearTxFinishFuture.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearTxFinishFuture.java
@@ -196,8 +196,8 @@ public final class GridNearTxFinishFuture<K, V> extends GridCompoundIdentityFutu
FinishMiniFuture finishFut = null;
synchronized (sync) {
- for (int i = 0; i < futuresSize(); i++) {
- IgniteInternalFuture<IgniteInternalTx> fut = futureGet(i);
+ for (int i = 0; i < futuresCount(); i++) {
+ IgniteInternalFuture<IgniteInternalTx> fut = future(i);
if (fut.getClass() == FinishMiniFuture.class) {
FinishMiniFuture f = (FinishMiniFuture)fut;
http://git-wip-us.apache.org/repos/asf/ignite/blob/65d1b9d7/modules/core/src/main/java/org/apache/ignite/internal/util/future/GridCompoundFuture.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/util/future/GridCompoundFuture.java b/modules/core/src/main/java/org/apache/ignite/internal/util/future/GridCompoundFuture.java
index b50fd55..a78e5a8 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/util/future/GridCompoundFuture.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/util/future/GridCompoundFuture.java
@@ -192,8 +192,8 @@ public class GridCompoundFuture<T, R> extends GridFutureAdapter<R> implements Ig
public boolean hasPending() {
synchronized (sync) {
// Avoid iterator creation and collection copy.
- for (int i = 0; i < futuresSize(); i++) {
- IgniteInternalFuture<T> fut = futureGet(i);
+ for (int i = 0; i < futuresCount(); i++) {
+ IgniteInternalFuture<T> fut = future(i);
if (!fut.isDone())
return true;
@@ -258,7 +258,7 @@ public class GridCompoundFuture<T, R> extends GridFutureAdapter<R> implements Ig
* Check completeness of the future.
*/
private void checkComplete() {
- if (initialized() && !isDone() && lsnrCalls == futuresSize()) {
+ if (initialized() && !isDone() && lsnrCalls == futuresCount()) {
try {
onDone(rdc != null ? rdc.reduce() : null);
}
@@ -283,7 +283,7 @@ public class GridCompoundFuture<T, R> extends GridFutureAdapter<R> implements Ig
* @param idx - index index of the element to return
* @return Future.
*/
- protected IgniteInternalFuture<T> futureGet(int idx) {
+ protected IgniteInternalFuture<T> future(int idx) {
assert idx >= 0;
Object futs0 = futs;
@@ -304,9 +304,9 @@ public class GridCompoundFuture<T, R> extends GridFutureAdapter<R> implements Ig
/**
* @return Futures size.
*/
- protected int futuresSize() {
+ protected int futuresCount() {
synchronized (sync) {
- if(futs==null)
+ if (futs==null)
return 0;
if (futs instanceof IgniteInternalFuture)