You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ignite.apache.org by sb...@apache.org on 2017/03/14 08:00:34 UTC
[15/38] ignite git commit: ignite-4768
ignite-4768
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/eeb10b85
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/eeb10b85
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/eeb10b85
Branch: refs/heads/ignite-4768
Commit: eeb10b85ba41b14d0beb590a32bff06225c7de57
Parents: d3d4a36
Author: sboikov <sb...@gridgain.com>
Authored: Fri Mar 10 11:00:04 2017 +0300
Committer: sboikov <sb...@gridgain.com>
Committed: Fri Mar 10 11:04:42 2017 +0300
----------------------------------------------------------------------
.../processors/cache/GridCacheIoManager.java | 3 +++
.../processors/cache/GridCacheMessage.java | 11 +++++++++++
.../processors/cache/KeyCacheObjectImpl.java | 9 +++++++++
.../GridDistributedTxPrepareRequest.java | 16 ++++++++++++++++
...dNearOptimisticSerializableTxPrepareFuture.java | 7 ++++---
.../distributed/near/GridNearTxPrepareRequest.java | 17 ++++++++++++++++-
6 files changed, 59 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ignite/blob/eeb10b85/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 50f58cc..7cac367 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
@@ -367,6 +367,9 @@ public class GridCacheIoManager extends GridCacheSharedManagerAdapter {
unmarshall(nodeId, cacheMsg);
+// if (!cacheMsg.partitionExchangeMessage())
+// log.info("Message [from=" + nodeId + ", msg=" + cacheMsg + ']');
+
if (cacheMsg.classError() != null)
processFailedMessage(nodeId, cacheMsg, c);
else
http://git-wip-us.apache.org/repos/asf/ignite/blob/eeb10b85/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheMessage.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheMessage.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheMessage.java
index 0646d5a..023d12c 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheMessage.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheMessage.java
@@ -701,6 +701,17 @@ public abstract class GridCacheMessage implements Message {
return reader.afterMessageRead(GridCacheMessage.class);
}
+ /**
+ * @param str Bulder.
+ * @param name Flag name.
+ */
+ protected final void appendFlag(StringBuilder str, String name) {
+ if (str.length() > 0)
+ str.append('|');
+
+ str.append(name);
+ }
+
/** {@inheritDoc} */
@Override public String toString() {
return S.toString(GridCacheMessage.class, this, "cacheId", cacheId);
http://git-wip-us.apache.org/repos/asf/ignite/blob/eeb10b85/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/KeyCacheObjectImpl.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/KeyCacheObjectImpl.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/KeyCacheObjectImpl.java
index 4f8570c..48797b8 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/KeyCacheObjectImpl.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/KeyCacheObjectImpl.java
@@ -19,6 +19,7 @@ package org.apache.ignite.internal.processors.cache;
import java.nio.ByteBuffer;
import org.apache.ignite.IgniteCheckedException;
+import org.apache.ignite.internal.util.typedef.internal.S;
import org.apache.ignite.plugin.extensions.communication.MessageReader;
import org.apache.ignite.plugin.extensions.communication.MessageWriter;
import org.jetbrains.annotations.Nullable;
@@ -200,4 +201,12 @@ public class KeyCacheObjectImpl extends CacheObjectAdapter implements KeyCacheOb
return val.equals(other.val);
}
+
+ /** {@inheritDoc} */
+ @Override public String toString() {
+ return S.toString(S.INCLUDE_SENSITIVE ? getClass().getSimpleName() : "KeyCacheObject",
+ "part", part, true,
+ "val", val, true,
+ "hasValBytes", valBytes != null, false);
+ }
}
http://git-wip-us.apache.org/repos/asf/ignite/blob/eeb10b85/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/GridDistributedTxPrepareRequest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/GridDistributedTxPrepareRequest.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/GridDistributedTxPrepareRequest.java
index 329dc8b..b5848a7 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/GridDistributedTxPrepareRequest.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/GridDistributedTxPrepareRequest.java
@@ -40,6 +40,7 @@ import org.apache.ignite.internal.processors.cache.transactions.IgniteTxStateAwa
import org.apache.ignite.internal.processors.cache.version.GridCacheVersion;
import org.apache.ignite.internal.util.UUIDCollectionMessage;
import org.apache.ignite.internal.util.tostring.GridToStringBuilder;
+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.F;
@@ -150,6 +151,7 @@ public class GridDistributedTxPrepareRequest extends GridDistributedBaseMessage
private IgniteTxState txState;
/** */
+ @GridToStringExclude
private byte flags;
/**
@@ -682,7 +684,21 @@ public class GridDistributedTxPrepareRequest extends GridDistributedBaseMessage
/** {@inheritDoc} */
@Override public String toString() {
+ StringBuilder flags = new StringBuilder();
+
+ if (needReturnValue())
+ flags.append("retVal");
+ if (isInvalidate())
+ flags.append("invalidate");
+ if (onePhaseCommit())
+ flags.append("onePhase");
+ if (last())
+ flags.append("last");
+ if (system())
+ flags.append("sys");
+
return GridToStringBuilder.toString(GridDistributedTxPrepareRequest.class, this,
+ "flags", flags.toString(),
"super", super.toString());
}
}
http://git-wip-us.apache.org/repos/asf/ignite/blob/eeb10b85/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 f8e0584..80508dc 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
@@ -75,6 +75,9 @@ public class GridNearOptimisticSerializableTxPrepareFuture extends GridNearOptim
@GridToStringExclude
private ClientRemapFuture remapFut;
+ /** */
+ private int miniId;
+
/**
* @param cctx Context.
* @param tx Transaction.
@@ -222,7 +225,7 @@ public class GridNearOptimisticSerializableTxPrepareFuture extends GridNearOptim
* @return Mini future.
*/
@SuppressWarnings("ForLoopReplaceableByForEach")
- private MiniFuture miniFuture(long miniId) {
+ private MiniFuture miniFuture(int miniId) {
// We iterate directly over the futs collection here to avoid copy.
synchronized (sync) {
int size = futuresCountNoLock();
@@ -362,8 +365,6 @@ public class GridNearOptimisticSerializableTxPrepareFuture extends GridNearOptim
checkOnePhase(txMapping);
- int miniId = 0;
-
for (GridDistributedTxMapping m : mappings.values()) {
assert !m.empty();
http://git-wip-us.apache.org/repos/asf/ignite/blob/eeb10b85/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearTxPrepareRequest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearTxPrepareRequest.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearTxPrepareRequest.java
index cccc7b4..ffeeb51 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearTxPrepareRequest.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearTxPrepareRequest.java
@@ -28,6 +28,7 @@ import org.apache.ignite.internal.processors.cache.GridCacheContext;
import org.apache.ignite.internal.processors.cache.distributed.GridDistributedTxPrepareRequest;
import org.apache.ignite.internal.processors.cache.transactions.IgniteInternalTx;
import org.apache.ignite.internal.processors.cache.transactions.IgniteTxEntry;
+import org.apache.ignite.internal.util.tostring.GridToStringExclude;
import org.apache.ignite.internal.util.typedef.F;
import org.apache.ignite.internal.util.typedef.internal.S;
import org.apache.ignite.lang.IgniteUuid;
@@ -70,6 +71,7 @@ public class GridNearTxPrepareRequest extends GridDistributedTxPrepareRequest {
private int taskNameHash;
/** */
+ @GridToStringExclude
private byte flags;
/**
@@ -402,6 +404,19 @@ public class GridNearTxPrepareRequest extends GridDistributedTxPrepareRequest {
/** {@inheritDoc} */
@Override public String toString() {
- return S.toString(GridNearTxPrepareRequest.class, this, super.toString());
+ StringBuilder flags = new StringBuilder();
+
+ if (near())
+ flags.append("near");
+ if (firstClientRequest())
+ flags.append("clientReq");
+ if (implicitSingle())
+ flags.append("single");
+ if (explicitLock())
+ flags.append("explicitLock");
+
+ return S.toString(GridNearTxPrepareRequest.class, this,
+ "flags", flags.toString(),
+ "super", super.toString());
}
}