Merge remote-tracking branch 'remotes/origin/sprint-2' into ignite-51
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/20b90195 Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/20b90195 Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/20b90195 Branch: refs/heads/ignite-368 Commit: 20b9019580d0366dade90091f56e1cc52f153f7f Parents: 3a4ede2 9b0ba86 Author: sboikov <sboi...@gridgain.com> Authored: Fri Mar 6 18:43:15 2015 +0300 Committer: sboikov <sboi...@gridgain.com> Committed: Fri Mar 6 18:43:15 2015 +0300 ---------------------------------------------------------------------- bin/igniterouter.sh | 7 +- bin/setup-hadoop.sh | 7 +- .../processors/cache/GridCacheProcessor.java | 10 ++- .../processors/cache/GridCacheUtils.java | 2 +- .../cache/GridCacheWriteBehindStore.java | 4 +- .../dht/atomic/GridDhtAtomicCache.java | 3 +- .../ignite/internal/util/IgniteUtils.java | 67 ++++++++++++++++++-- .../cache/GridCacheAbstractFullApiSelfTest.java | 26 ++++---- ...cheTransactionalAbstractMetricsSelfTest.java | 7 ++ .../IgniteTxStoreExceptionAbstractSelfTest.java | 8 +-- .../distributed/GridCacheLockAbstractTest.java | 2 + .../ignite/testframework/GridTestUtils.java | 2 +- .../internal/processors/hadoop/HadoopSetup.java | 6 +- ...gniteProjectionStartStopRestartSelfTest.java | 42 +++++++----- 14 files changed, 135 insertions(+), 58 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/20b90195/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheProcessor.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/20b90195/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheUtils.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/20b90195/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridDhtAtomicCache.java ---------------------------------------------------------------------- diff --cc modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridDhtAtomicCache.java index a53638e,00861fb..a502a87 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridDhtAtomicCache.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridDhtAtomicCache.java @@@ -1982,15 -1982,12 +1982,16 @@@ public class GridDhtAtomicCache<K, V> e req.subjectId(), taskName); - assert updRes.newTtl() == CU.TTL_NOT_CHANGED || expiry != null; + assert !updRes.success() || updRes.newTtl() == CU.TTL_NOT_CHANGED || expiry != null : + "success=" + updRes.success() + ", newTtl=" + updRes.newTtl() + ", expiry=" + expiry; if (intercept) { - if (op == UPDATE) - ctx.config().getInterceptor().onAfterPut(entry.key(), updRes.newValue()); + if (op == UPDATE) { + ctx.config().getInterceptor().onAfterPut(new CacheLazyEntry( + ctx, + entry.key(), + updRes.newValue())); + } else { assert op == DELETE : op; http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/20b90195/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheAbstractFullApiSelfTest.java ----------------------------------------------------------------------
