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 2015/04/10 15:07:29 UTC
[50/50] incubator-ignite git commit: #ignite-gg-9998: merge sprint-3
#ignite-gg-9998: merge sprint-3
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/73b110af
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/73b110af
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/73b110af
Branch: refs/heads/ignite-gg-9998
Commit: 73b110af3bcb51f1df87f8158605eb55c3f34149
Parents: 30b8873
Author: ivasilinets <iv...@gridgain.com>
Authored: Fri Apr 10 15:59:20 2015 +0300
Committer: ivasilinets <iv...@gridgain.com>
Committed: Fri Apr 10 15:59:20 2015 +0300
----------------------------------------------------------------------
.../ignite/codegen/MessageCodeGenerator.java | 3 ++-
.../near/GridNearTxPrepareRequest.java | 26 ++++++++++++--------
.../messages/TcpDiscoveryHeartbeatMessage.java | 3 ---
3 files changed, 18 insertions(+), 14 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/73b110af/modules/codegen/src/main/java/org/apache/ignite/codegen/MessageCodeGenerator.java
----------------------------------------------------------------------
diff --git a/modules/codegen/src/main/java/org/apache/ignite/codegen/MessageCodeGenerator.java b/modules/codegen/src/main/java/org/apache/ignite/codegen/MessageCodeGenerator.java
index f75bcf4..f0a5e7f 100644
--- a/modules/codegen/src/main/java/org/apache/ignite/codegen/MessageCodeGenerator.java
+++ b/modules/codegen/src/main/java/org/apache/ignite/codegen/MessageCodeGenerator.java
@@ -18,6 +18,7 @@
package org.apache.ignite.codegen;
import org.apache.ignite.internal.*;
+import org.apache.ignite.internal.processors.cache.distributed.near.*;
import org.apache.ignite.internal.processors.datastreamer.*;
import org.apache.ignite.internal.util.typedef.internal.*;
import org.apache.ignite.lang.*;
@@ -140,7 +141,7 @@ public class MessageCodeGenerator {
MessageCodeGenerator gen = new MessageCodeGenerator(srcDir);
- gen.generateAndWrite(DataStreamerEntry.class);
+ gen.generateAndWrite(GridNearTxPrepareRequest.class);
// gen.generateAndWrite(GridDistributedLockRequest.class);
// gen.generateAndWrite(GridDistributedLockResponse.class);
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/73b110af/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 1b3c4c8..c14fd2f 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
@@ -270,61 +270,67 @@ public class GridNearTxPrepareRequest extends GridDistributedTxPrepareRequest {
}
switch (writer.state()) {
- case 25:
+ case 26:
+ if (!writer.writeBoolean("explicitLock", explicitLock))
+ return false;
+
+ writer.incrementState();
+
+ case 27:
if (!writer.writeIgniteUuid("futId", futId))
return false;
writer.incrementState();
- case 26:
+ case 28:
if (!writer.writeBoolean("implicitSingle", implicitSingle))
return false;
writer.incrementState();
- case 27:
+ case 29:
if (!writer.writeBoolean("last", last))
return false;
writer.incrementState();
- case 28:
+ case 30:
if (!writer.writeCollection("lastBackups", lastBackups, MessageCollectionItemType.UUID))
return false;
writer.incrementState();
- case 29:
+ case 31:
if (!writer.writeIgniteUuid("miniId", miniId))
return false;
writer.incrementState();
- case 30:
+ case 32:
if (!writer.writeBoolean("near", near))
return false;
writer.incrementState();
- case 31:
+ case 33:
if (!writer.writeBoolean("retVal", retVal))
return false;
writer.incrementState();
- case 32:
+ case 34:
if (!writer.writeUuid("subjId", subjId))
return false;
writer.incrementState();
- case 33:
+ case 35:
if (!writer.writeInt("taskNameHash", taskNameHash))
return false;
writer.incrementState();
- case 34:
+ case 36:
if (!writer.writeMessage("topVer", topVer))
return false;
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/73b110af/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/messages/TcpDiscoveryHeartbeatMessage.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/messages/TcpDiscoveryHeartbeatMessage.java b/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/messages/TcpDiscoveryHeartbeatMessage.java
index d603c0f..bafde9f 100644
--- a/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/messages/TcpDiscoveryHeartbeatMessage.java
+++ b/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/messages/TcpDiscoveryHeartbeatMessage.java
@@ -71,9 +71,6 @@ public class TcpDiscoveryHeartbeatMessage extends TcpDiscoveryAbstractMessage {
*/
public TcpDiscoveryHeartbeatMessage(UUID creatorNodeId) {
super(creatorNodeId);
-
- metrics = U.newHashMap(1);
- clientNodeIds = new HashSet<>();
}
/**