Repository: ignite Updated Branches: refs/heads/ignite-4932 17a8d844b -> eac29c089
ignite-4932 WIP Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/eac29c08 Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/eac29c08 Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/eac29c08 Branch: refs/heads/ignite-4932 Commit: eac29c08942b2366bae7d3909d09b59ac9a7e315 Parents: 17a8d84 Author: sboikov <[email protected]> Authored: Thu Apr 13 11:12:28 2017 +0300 Committer: sboikov <[email protected]> Committed: Thu Apr 13 11:12:28 2017 +0300 ---------------------------------------------------------------------- .../ignite/internal/processors/cache/GridCacheContext.java | 3 +++ .../internal/processors/cache/IgniteCacheExpiryPolicy.java | 2 +- .../processors/cache/transactions/IgniteTxLocalAdapter.java | 6 +++--- .../ignite/yardstick/cache/IgniteGetFromComputeBenchmark.java | 2 +- 4 files changed, 8 insertions(+), 5 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ignite/blob/eac29c08/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheContext.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheContext.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheContext.java index ae8e5a5..184f467 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheContext.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheContext.java @@ -2058,6 +2058,9 @@ public class GridCacheContext<K, V> implements Externalizable { } /** + * Checks if it is possible to directly read offheap memory without entry creation (this + * is optimization to avoid unnecessary blocking synchronization on cache entry). + * * @param expiryPlc Expiry policy for read operation. * @param readers {@code True} if need update entry readers. * @return {@code True} if it is possible directly read offheap instead of using {@link GridCacheEntryEx#innerGet}. http://git-wip-us.apache.org/repos/asf/ignite/blob/eac29c08/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/IgniteCacheExpiryPolicy.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/IgniteCacheExpiryPolicy.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/IgniteCacheExpiryPolicy.java index 1d3e056..96f1c6f 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/IgniteCacheExpiryPolicy.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/IgniteCacheExpiryPolicy.java @@ -46,7 +46,7 @@ public interface IgniteCacheExpiryPolicy { public long forAccess(); /** - * @return {@code True} + * @return {@code True} if expiry policy change ttl on entry read. */ public boolean hasAccessTtl(); http://git-wip-us.apache.org/repos/asf/ignite/blob/eac29c08/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 88fbc1d..7697915 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 @@ -2672,17 +2672,17 @@ public abstract class IgniteTxLocalAdapter extends IgniteTxAdapter implements Ig /** * @param cctx Cache context. * @param key Key. - * @param val Value. + * @param val0 Value. * @param filter Filter. * @return {@code True} if filter passed. */ private boolean isAll(GridCacheContext cctx, KeyCacheObject key, - final CacheObject val, + final CacheObject val0, CacheEntryPredicate[] filter) { GridCacheEntryEx e = new GridDhtDetachedCacheEntry(cctx, key, 0) { @Nullable @Override public CacheObject peekVisibleValue() { - return val; + return val0; } }; http://git-wip-us.apache.org/repos/asf/ignite/blob/eac29c08/modules/yardstick/src/main/java/org/apache/ignite/yardstick/cache/IgniteGetFromComputeBenchmark.java ---------------------------------------------------------------------- diff --git a/modules/yardstick/src/main/java/org/apache/ignite/yardstick/cache/IgniteGetFromComputeBenchmark.java b/modules/yardstick/src/main/java/org/apache/ignite/yardstick/cache/IgniteGetFromComputeBenchmark.java index b299f6c..580c30f 100644 --- a/modules/yardstick/src/main/java/org/apache/ignite/yardstick/cache/IgniteGetFromComputeBenchmark.java +++ b/modules/yardstick/src/main/java/org/apache/ignite/yardstick/cache/IgniteGetFromComputeBenchmark.java @@ -35,7 +35,7 @@ import org.yardstickframework.BenchmarkConfiguration; import static org.yardstickframework.BenchmarkUtils.println; /** - * + * Benchmark created to verify that slow EntryProcessor does not affect 'get' performance. */ public class IgniteGetFromComputeBenchmark extends IgniteCacheAbstractBenchmark<Integer, Object> { /** */
