Repository: ignite Updated Branches: refs/heads/ignite-5075 7c137ac05 -> ea0fef746
ignite-5075 Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/ea0fef74 Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/ea0fef74 Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/ea0fef74 Branch: refs/heads/ignite-5075 Commit: ea0fef746a3fa98595fe1a514a9cf38cde854e22 Parents: 7c137ac Author: sboikov <[email protected]> Authored: Fri May 19 14:17:35 2017 +0300 Committer: sboikov <[email protected]> Committed: Fri May 19 14:17:35 2017 +0300 ---------------------------------------------------------------------- .../cache/distributed/GridDistributedTxRemoteAdapter.java | 2 ++ .../internal/processors/cache/transactions/IgniteTxAdapter.java | 2 +- .../processors/cache/transactions/IgniteTxLocalAdapter.java | 2 ++ .../org/apache/ignite/yardstick/cache/load/model/ModelUtil.java | 3 +++ 4 files changed, 8 insertions(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ignite/blob/ea0fef74/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/GridDistributedTxRemoteAdapter.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/GridDistributedTxRemoteAdapter.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/GridDistributedTxRemoteAdapter.java index 9cb04d4..299fcf3 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/GridDistributedTxRemoteAdapter.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/GridDistributedTxRemoteAdapter.java @@ -594,6 +594,8 @@ public abstract class GridDistributedTxRemoteAdapter extends IgniteTxAdapter dhtVer, txEntry.updateCounter()); else { + assert val != null : txEntry; + cached.innerSet(this, eventNodeId(), nodeId, http://git-wip-us.apache.org/repos/asf/ignite/blob/ea0fef74/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/transactions/IgniteTxAdapter.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/transactions/IgniteTxAdapter.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/transactions/IgniteTxAdapter.java index 5cba0cf..96af425 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/transactions/IgniteTxAdapter.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/transactions/IgniteTxAdapter.java @@ -1480,7 +1480,7 @@ public abstract class IgniteTxAdapter extends GridMetadataAwareAdapter implement if (modified) cacheVal = cacheCtx.toCacheObject(cacheCtx.unwrapTemporary(val)); - GridCacheOperation op = modified ? (val == null ? DELETE : UPDATE) : NOOP; + GridCacheOperation op = modified ? (cacheVal == null ? DELETE : UPDATE) : NOOP; if (op == NOOP) { ExpiryPolicy expiry = cacheCtx.expiryForTxEntry(txEntry); http://git-wip-us.apache.org/repos/asf/ignite/blob/ea0fef74/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/transactions/IgniteTxLocalAdapter.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/transactions/IgniteTxLocalAdapter.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/transactions/IgniteTxLocalAdapter.java index 5a708d7..52a0f56 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/transactions/IgniteTxLocalAdapter.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/transactions/IgniteTxLocalAdapter.java @@ -660,6 +660,8 @@ public abstract class IgniteTxLocalAdapter extends IgniteTxAdapter implements Ig txEntry.updateCounter()))); if (op == CREATE || op == UPDATE) { + assert val != null : txEntry; + GridCacheUpdateTxResult updRes = cached.innerSet( this, eventNodeId(), http://git-wip-us.apache.org/repos/asf/ignite/blob/ea0fef74/modules/yardstick/src/main/java/org/apache/ignite/yardstick/cache/load/model/ModelUtil.java ---------------------------------------------------------------------- diff --git a/modules/yardstick/src/main/java/org/apache/ignite/yardstick/cache/load/model/ModelUtil.java b/modules/yardstick/src/main/java/org/apache/ignite/yardstick/cache/load/model/ModelUtil.java index 9268cdd..492ace7 100644 --- a/modules/yardstick/src/main/java/org/apache/ignite/yardstick/cache/load/model/ModelUtil.java +++ b/modules/yardstick/src/main/java/org/apache/ignite/yardstick/cache/load/model/ModelUtil.java @@ -150,6 +150,9 @@ public class ModelUtil { break; case "String": res = String.valueOf(id); + break; + default: + throw new IllegalArgumentException("Unsupported class: " + c.getSimpleName()); } return res;
