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/03/04 14:26:39 UTC
[04/22] incubator-ignite git commit: #ignite-51: IgniteTxEntry
implements Message.
#ignite-51: IgniteTxEntry implements Message.
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/5c26926c
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/5c26926c
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/5c26926c
Branch: refs/heads/ignite-51
Commit: 5c26926c7c23544f9cdb49ce0fbeb87d80131f1c
Parents: e1cf752
Author: ivasilinets <iv...@gridgain.com>
Authored: Tue Mar 3 18:37:59 2015 +0300
Committer: ivasilinets <iv...@gridgain.com>
Committed: Tue Mar 3 18:37:59 2015 +0300
----------------------------------------------------------------------
.../GridDistributedTxPrepareRequest.java | 4 ++--
.../dht/GridDhtTxPrepareRequest.java | 3 +--
.../near/GridNearTxPrepareResponse.java | 21 +++++++++-----------
3 files changed, 12 insertions(+), 16 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/5c26926c/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 7ab40ea..0b130aa 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
@@ -71,7 +71,7 @@ public class GridDistributedTxPrepareRequest extends GridDistributedBaseMessage
/** Transaction write entries. */
@GridToStringInclude
- @GridDirectTransient
+ @GridDirectCollection(IgniteTxEntry.class)
private Collection<IgniteTxEntry> writes;
/** DHT versions to verify. */
@@ -84,7 +84,7 @@ public class GridDistributedTxPrepareRequest extends GridDistributedBaseMessage
private Collection<IgniteTxKey> dhtVerKeys;
/** */
- @GridDirectCollection(IgniteTxKey.class)
+ @GridDirectCollection(GridCacheVersion.class)
private Collection<GridCacheVersion> dhtVerVals;
/** Group lock key, if any. */
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/5c26926c/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtTxPrepareRequest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtTxPrepareRequest.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtTxPrepareRequest.java
index 19533eb..34a59c7 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtTxPrepareRequest.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtTxPrepareRequest.java
@@ -295,7 +295,7 @@ public class GridDhtTxPrepareRequest extends GridDistributedTxPrepareRequest {
@Override public void finishUnmarshal(GridCacheSharedContext ctx, ClassLoader ldr) throws IgniteCheckedException {
super.finishUnmarshal(ctx, ldr);
- if (ownedKeys != null && owned == null) {
+ if (ownedKeys != null) {
assert ownedKeys.size() == ownedVals.size();
owned = U.newHashMap(ownedKeys.size());
@@ -311,7 +311,6 @@ public class GridDhtTxPrepareRequest extends GridDistributedTxPrepareRequest {
owned.put(key, valIter.next());
}
-
}
unmarshalTx(nearWrites, true, ctx, ldr);
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/5c26926c/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearTxPrepareResponse.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearTxPrepareResponse.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearTxPrepareResponse.java
index 22efce4..beb2015 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearTxPrepareResponse.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearTxPrepareResponse.java
@@ -65,12 +65,12 @@ public class GridNearTxPrepareResponse extends GridDistributedTxPrepareResponse
/** OwnedVals' keys for marshalling. */
@GridToStringExclude
- @GridDirectTransient
+ @GridDirectCollection(IgniteTxKey.class)
private Collection<IgniteTxKey> ownedValKeys;
/** OwnedVals' values for marshalling. */
@GridToStringExclude
- @GridDirectTransient
+ @GridDirectCollection(OwnedValue.class)
private Collection<OwnedValue> ownedValVals;
/** Cache return value. */
@@ -234,14 +234,12 @@ public class GridNearTxPrepareResponse extends GridDistributedTxPrepareResponse
ownedValVals = ownedVals.values();
- for (IgniteTxKey key : ownedVals.keySet()) {
- GridCacheContext cacheCtx = ctx.cacheContext(key.cacheId());
+ for (Map.Entry<IgniteTxKey, OwnedValue> entry : ownedVals.entrySet()) {
+ GridCacheContext cacheCtx = ctx.cacheContext(entry.getKey().cacheId());
- OwnedValue value = ownedVals.get(key);
+ entry.getKey().prepareMarshal(cacheCtx);
- key.prepareMarshal(cacheCtx);
-
- value.prepareMarshal(cacheCtx.cacheObjectContext());
+ entry.getValue().prepareMarshal(cacheCtx.cacheObjectContext());
}
}
@@ -262,7 +260,7 @@ public class GridNearTxPrepareResponse extends GridDistributedTxPrepareResponse
super.finishUnmarshal(ctx, ldr);
if (ownedValKeys != null && ownedVals == null) {
- ownedVals = new HashMap<>();
+ ownedVals = U.newHashMap(ownedValKeys.size());
assert ownedValKeys.size() == ownedValVals.size();
@@ -484,14 +482,13 @@ public class GridNearTxPrepareResponse extends GridDistributedTxPrepareResponse
/** Cache object. */
private CacheObject obj;
+ /** */
public OwnedValue() {
// No-op.
}
/**
- * Initialize OwnedValues.
- *
- * @param vers Cache version.
+ * @param vers Cache version.
* @param obj Cache object.
*/
OwnedValue(GridCacheVersion vers, CacheObject obj) {