ignite-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From sboi...@apache.org
Subject ignite git commit: ignite-1537
Date Fri, 27 Nov 2015 04:47:52 GMT
Repository: ignite
Updated Branches:
  refs/heads/ignite-1537 cbbb17d3d -> 2e988f40b


ignite-1537


Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/2e988f40
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/2e988f40
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/2e988f40

Branch: refs/heads/ignite-1537
Commit: 2e988f40bcad4c8725c5ae35785409184337a52b
Parents: cbbb17d
Author: sboikov <sboikov@gridgain.com>
Authored: Fri Nov 27 07:47:31 2015 +0300
Committer: sboikov <sboikov@gridgain.com>
Committed: Fri Nov 27 07:47:31 2015 +0300

----------------------------------------------------------------------
 .../near/GridNearOptimisticSerializableTxPrepareFuture.java   | 4 ++++
 .../distributed/near/GridNearOptimisticTxPrepareFuture.java   | 6 ++++++
 .../near/GridNearOptimisticTxPrepareFutureAdapter.java        | 7 +------
 .../ignite/internal/util/future/GridCompoundFuture.java       | 2 +-
 4 files changed, 12 insertions(+), 7 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/ignite/blob/2e988f40/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 02225c0..916c7ab 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
@@ -74,6 +74,10 @@ public class GridNearOptimisticSerializableTxPrepareFuture extends GridNearOptim
 
     /** */
     @GridToStringExclude
+    private KeyLockFuture keyLockFut;
+
+    /** */
+    @GridToStringExclude
     private ClientRemapFuture remapFut;
 
     /**

http://git-wip-us.apache.org/repos/asf/ignite/blob/2e988f40/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 5f509ae..28ff27c 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
@@ -43,6 +43,7 @@ import org.apache.ignite.internal.processors.cache.transactions.IgniteTxEntry;
 import org.apache.ignite.internal.transactions.IgniteTxRollbackCheckedException;
 import org.apache.ignite.internal.transactions.IgniteTxTimeoutCheckedException;
 import org.apache.ignite.internal.util.future.GridFutureAdapter;
+import org.apache.ignite.internal.util.tostring.GridToStringExclude;
 import org.apache.ignite.internal.util.tostring.GridToStringInclude;
 import org.apache.ignite.internal.util.typedef.C1;
 import org.apache.ignite.internal.util.typedef.CI1;
@@ -63,6 +64,10 @@ import static org.apache.ignite.transactions.TransactionState.PREPARING;
  *
  */
 public class GridNearOptimisticTxPrepareFuture extends GridNearOptimisticTxPrepareFutureAdapter
{
+    /** */
+    @GridToStringExclude
+    private KeyLockFuture keyLockFut;
+
     /**
      * @param cctx Context.
      * @param tx Transaction.
@@ -589,6 +594,7 @@ public class GridNearOptimisticTxPrepareFuture extends GridNearOptimisticTxPrepa
 
         return S.toString(GridNearOptimisticTxPrepareFuture.class, this,
             "innerFuts", futs,
+            "keyLockFut", keyLockFut,
             "tx", tx,
             "super", super.toString());
     }

http://git-wip-us.apache.org/repos/asf/ignite/blob/2e988f40/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearOptimisticTxPrepareFutureAdapter.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearOptimisticTxPrepareFutureAdapter.java
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearOptimisticTxPrepareFutureAdapter.java
index fd13f75..5c7553f 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearOptimisticTxPrepareFutureAdapter.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearOptimisticTxPrepareFutureAdapter.java
@@ -28,7 +28,6 @@ import org.apache.ignite.internal.processors.cache.transactions.IgniteTxKey;
 import org.apache.ignite.internal.util.GridConcurrentHashSet;
 import org.apache.ignite.internal.util.future.GridFutureAdapter;
 import org.apache.ignite.internal.util.lang.GridPlainRunnable;
-import org.apache.ignite.internal.util.tostring.GridToStringExclude;
 import org.apache.ignite.internal.util.tostring.GridToStringInclude;
 import org.apache.ignite.internal.util.typedef.CI1;
 import org.apache.ignite.internal.util.typedef.internal.S;
@@ -38,10 +37,6 @@ import org.jetbrains.annotations.Nullable;
  *
  */
 public abstract class GridNearOptimisticTxPrepareFutureAdapter extends GridNearTxPrepareFutureAdapter
{
-    /** */
-    @GridToStringExclude
-    protected KeyLockFuture keyLockFut;
-
     /**
      * @param cctx Context.
      * @param tx Transaction.
@@ -172,7 +167,7 @@ public abstract class GridNearOptimisticTxPrepareFutureAdapter extends
GridNearT
     /**
      * Keys lock future.
      */
-    protected class KeyLockFuture extends GridFutureAdapter<GridNearTxPrepareResponse>
{
+    protected static class KeyLockFuture extends GridFutureAdapter<GridNearTxPrepareResponse>
{
         /** */
         @GridToStringInclude
         private Collection<IgniteTxKey> lockKeys = new GridConcurrentHashSet<>();

http://git-wip-us.apache.org/repos/asf/ignite/blob/2e988f40/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 cc296e6..4b2461e 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
@@ -423,7 +423,7 @@ public class GridCompoundFuture<T, R> extends GridFutureAdapter<R>
{
 
         /** {@inheritDoc} */
         @Override public String toString() {
-            return "Compound future listener: " + GridCompoundFuture.this;
+            return "Compound future listener []";
         }
     }
 }


Mime
View raw message