http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/cafee25f/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/query/GridCacheQueryAdapter.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/query/GridCacheQueryAdapter.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/query/GridCacheQueryAdapter.java index 9342c5d..f65017a 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/query/GridCacheQueryAdapter.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/query/GridCacheQueryAdapter.java @@ -30,18 +30,18 @@ import org.jetbrains.annotations.*; import java.util.*; -import static org.apache.ignite.cache.GridCacheDistributionMode.*; +import static org.apache.ignite.cache.CacheDistributionMode.*; import static org.apache.ignite.internal.processors.cache.query.GridCacheQueryType.*; /** * Query adapter. */ -public class GridCacheQueryAdapter<T> implements GridCacheQuery<T> { +public class GridCacheQueryAdapter<T> implements CacheQuery<T> { /** */ private final GridCacheContext<?, ?> cctx; /** */ - private final IgnitePredicate<GridCacheEntry<Object, Object>> prjPred; + private final IgnitePredicate<CacheEntry<Object, Object>> prjPred; /** */ private final GridCacheQueryType type; @@ -103,7 +103,7 @@ public class GridCacheQueryAdapter<T> implements GridCacheQuery<T> { */ public GridCacheQueryAdapter(GridCacheContext<?, ?> cctx, GridCacheQueryType type, - @Nullable IgnitePredicate<GridCacheEntry<Object, Object>> prjPred, + @Nullable IgnitePredicate<CacheEntry<Object, Object>> prjPred, @Nullable String clsName, @Nullable String clause, @Nullable IgniteBiPredicate<Object, Object> filter, @@ -153,7 +153,7 @@ public class GridCacheQueryAdapter<T> implements GridCacheQuery<T> { * @param taskHash Task hash. */ public GridCacheQueryAdapter(GridCacheContext<?, ?> cctx, - IgnitePredicate<GridCacheEntry<Object, Object>> prjPred, + IgnitePredicate<CacheEntry<Object, Object>> prjPred, GridCacheQueryType type, IgniteLogger log, int pageSize, @@ -191,7 +191,7 @@ public class GridCacheQueryAdapter<T> implements GridCacheQuery<T> { /** * @return cache projection filter. */ - @Nullable public IgnitePredicate<GridCacheEntry<Object, Object>> projectionFilter() { + @Nullable public IgnitePredicate<CacheEntry<Object, Object>> projectionFilter() { return prjPred; } @@ -261,7 +261,7 @@ public class GridCacheQueryAdapter<T> implements GridCacheQuery<T> { } /** {@inheritDoc} */ - @Override public GridCacheQuery<T> pageSize(int pageSize) { + @Override public CacheQuery<T> pageSize(int pageSize) { A.ensure(pageSize > 0, "pageSize > 0"); this.pageSize = pageSize; @@ -277,7 +277,7 @@ public class GridCacheQueryAdapter<T> implements GridCacheQuery<T> { } /** {@inheritDoc} */ - @Override public GridCacheQuery<T> timeout(long timeout) { + @Override public CacheQuery<T> timeout(long timeout) { A.ensure(timeout >= 0, "timeout >= 0"); this.timeout = timeout; @@ -293,7 +293,7 @@ public class GridCacheQueryAdapter<T> implements GridCacheQuery<T> { } /** {@inheritDoc} */ - @Override public GridCacheQuery<T> keepAll(boolean keepAll) { + @Override public CacheQuery<T> keepAll(boolean keepAll) { this.keepAll = keepAll; return this; @@ -307,7 +307,7 @@ public class GridCacheQueryAdapter<T> implements GridCacheQuery<T> { } /** {@inheritDoc} */ - @Override public GridCacheQuery<T> includeBackups(boolean incBackups) { + @Override public CacheQuery<T> includeBackups(boolean incBackups) { this.incBackups = incBackups; return this; @@ -321,7 +321,7 @@ public class GridCacheQueryAdapter<T> implements GridCacheQuery<T> { } /** {@inheritDoc} */ - @Override public GridCacheQuery<T> enableDedup(boolean dedup) { + @Override public CacheQuery<T> enableDedup(boolean dedup) { this.dedup = dedup; return this; @@ -335,7 +335,7 @@ public class GridCacheQueryAdapter<T> implements GridCacheQuery<T> { } /** {@inheritDoc} */ - @Override public GridCacheQuery<T> projection(ClusterGroup prj) { + @Override public CacheQuery<T> projection(ClusterGroup prj) { this.prj = prj; return this; @@ -384,21 +384,21 @@ public class GridCacheQueryAdapter<T> implements GridCacheQuery<T> { } /** {@inheritDoc} */ - @Override public GridCacheQueryFuture<T> execute(@Nullable Object... args) { + @Override public CacheQueryFuture<T> execute(@Nullable Object... args) { return execute(null, null, args); } /** {@inheritDoc} */ - @Override public <R> GridCacheQueryFuture<R> execute(IgniteReducer<T, R> rmtReducer, @Nullable Object... args) { + @Override public <R> CacheQueryFuture<R> execute(IgniteReducer<T, R> rmtReducer, @Nullable Object... args) { return execute(rmtReducer, null, args); } /** {@inheritDoc} */ - @Override public <R> GridCacheQueryFuture<R> execute(IgniteClosure<T, R> rmtTransform, @Nullable Object... args) { + @Override public <R> CacheQueryFuture<R> execute(IgniteClosure<T, R> rmtTransform, @Nullable Object... args) { return execute(null, rmtTransform, args); } - @Override public GridCacheQueryMetrics metrics() { + @Override public CacheQueryMetrics metrics() { return metrics.copy(); } @@ -413,7 +413,7 @@ public class GridCacheQueryAdapter<T> implements GridCacheQuery<T> { * @return Future. */ @SuppressWarnings("IfMayBeConditional") - private <R> GridCacheQueryFuture<R> execute(@Nullable IgniteReducer<T, R> rmtReducer, + private <R> CacheQueryFuture<R> execute(@Nullable IgniteReducer<T, R> rmtReducer, @Nullable IgniteClosure<T, R> rmtTransform, @Nullable Object... args) { Collection<ClusterNode> nodes = nodes(); @@ -445,10 +445,10 @@ public class GridCacheQueryAdapter<T> implements GridCacheQuery<T> { boolean loc = nodes.size() == 1 && F.first(nodes).id().equals(cctx.localNodeId()); if (type == SQL_FIELDS || type == SPI) - return (GridCacheQueryFuture<R>)(loc ? qryMgr.queryFieldsLocal(bean) : + return (CacheQueryFuture<R>)(loc ? qryMgr.queryFieldsLocal(bean) : qryMgr.queryFieldsDistributed(bean, nodes)); else - return (GridCacheQueryFuture<R>)(loc ? qryMgr.queryLocal(bean) : qryMgr.queryDistributed(bean, nodes)); + return (CacheQueryFuture<R>)(loc ? qryMgr.queryLocal(bean) : qryMgr.queryDistributed(bean, nodes)); } /** @@ -469,7 +469,7 @@ public class GridCacheQueryAdapter<T> implements GridCacheQuery<T> { if (prj != null) return nodes(cctx, prj); - GridCacheDistributionMode mode = cctx.config().getDistributionMode(); + CacheDistributionMode mode = cctx.config().getDistributionMode(); return mode == PARTITIONED_ONLY || mode == NEAR_PARTITIONED ? Collections.singletonList(cctx.localNode()) : @@ -493,7 +493,7 @@ public class GridCacheQueryAdapter<T> implements GridCacheQuery<T> { return F.view(CU.allNodes(cctx), new P1<ClusterNode>() { @Override public boolean apply(ClusterNode n) { - GridCacheDistributionMode mode = U.distributionMode(n, cctx.name()); + CacheDistributionMode mode = U.distributionMode(n, cctx.name()); return (mode == PARTITIONED_ONLY || mode == NEAR_PARTITIONED) && (prj == null || prj.node(n.id()) != null);
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/cafee25f/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/query/GridCacheQueryErrorFuture.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/query/GridCacheQueryErrorFuture.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/query/GridCacheQueryErrorFuture.java index 945c8ad..dd385d1 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/query/GridCacheQueryErrorFuture.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/query/GridCacheQueryErrorFuture.java @@ -28,7 +28,7 @@ import java.util.*; /** * Error future. */ -public class GridCacheQueryErrorFuture<T> extends GridFinishedFuture<Collection<T>> implements GridCacheQueryFuture<T> { +public class GridCacheQueryErrorFuture<T> extends GridFinishedFuture<Collection<T>> implements CacheQueryFuture<T> { /** */ private static final long serialVersionUID = 0L; http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/cafee25f/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/query/GridCacheQueryFutureAdapter.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/query/GridCacheQueryFutureAdapter.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/query/GridCacheQueryFutureAdapter.java index 37ade58..94c85b4 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/query/GridCacheQueryFutureAdapter.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/query/GridCacheQueryFutureAdapter.java @@ -38,7 +38,7 @@ import java.util.concurrent.atomic.*; * */ public abstract class GridCacheQueryFutureAdapter<K, V, R> extends GridFutureAdapter<Collection<R>> - implements GridCacheQueryFuture<R>, GridTimeoutObject { + implements CacheQueryFuture<R>, GridTimeoutObject { /** */ private static final long serialVersionUID = 0L; http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/cafee25f/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/query/GridCacheQueryInfo.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/query/GridCacheQueryInfo.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/query/GridCacheQueryInfo.java index 2040b5b..0721028 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/query/GridCacheQueryInfo.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/query/GridCacheQueryInfo.java @@ -32,7 +32,7 @@ class GridCacheQueryInfo { private boolean loc; /** */ - private IgnitePredicate<GridCacheEntry<Object, Object>> prjPred; + private IgnitePredicate<CacheEntry<Object, Object>> prjPred; /** */ private IgniteClosure<Object, Object> trans; @@ -76,7 +76,7 @@ class GridCacheQueryInfo { */ GridCacheQueryInfo( boolean loc, - IgnitePredicate<GridCacheEntry<Object, Object>> prjPred, + IgnitePredicate<CacheEntry<Object, Object>> prjPred, IgniteClosure<Object, Object> trans, IgniteReducer<Object, Object> rdc, GridCacheQueryAdapter<?> qry, @@ -124,7 +124,7 @@ class GridCacheQueryInfo { /** * @return Projection predicate. */ - IgnitePredicate<GridCacheEntry<Object, Object>> projectionPredicate() { + IgnitePredicate<CacheEntry<Object, Object>> projectionPredicate() { return prjPred; } http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/cafee25f/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/query/GridCacheQueryManager.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/query/GridCacheQueryManager.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/query/GridCacheQueryManager.java index 0be08eb..dd94a4e 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/query/GridCacheQueryManager.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/query/GridCacheQueryManager.java @@ -393,7 +393,7 @@ public abstract class GridCacheQueryManager<K, V> extends GridCacheManagerAdapte * @param qry Query. * @return Query future. */ - public abstract GridCacheQueryFuture<?> queryLocal(GridCacheQueryBean qry); + public abstract CacheQueryFuture<?> queryLocal(GridCacheQueryBean qry); /** * Executes distributed query. @@ -402,7 +402,7 @@ public abstract class GridCacheQueryManager<K, V> extends GridCacheManagerAdapte * @param nodes Nodes. * @return Query future. */ - public abstract GridCacheQueryFuture<?> queryDistributed(GridCacheQueryBean qry, Collection<ClusterNode> nodes); + public abstract CacheQueryFuture<?> queryDistributed(GridCacheQueryBean qry, Collection<ClusterNode> nodes); /** * Loads page. @@ -420,7 +420,7 @@ public abstract class GridCacheQueryManager<K, V> extends GridCacheManagerAdapte * @param qry Query. * @return Query future. */ - public abstract GridCacheQueryFuture<?> queryFieldsLocal(GridCacheQueryBean qry); + public abstract CacheQueryFuture<?> queryFieldsLocal(GridCacheQueryBean qry); /** * Executes distributed fields query. @@ -429,7 +429,7 @@ public abstract class GridCacheQueryManager<K, V> extends GridCacheManagerAdapte * @param nodes Nodes. * @return Query future. */ - public abstract GridCacheQueryFuture<?> queryFieldsDistributed(GridCacheQueryBean qry, Collection<ClusterNode> nodes); + public abstract CacheQueryFuture<?> queryFieldsDistributed(GridCacheQueryBean qry, Collection<ClusterNode> nodes); /** * Performs query. @@ -484,7 +484,7 @@ public abstract class GridCacheQueryManager<K, V> extends GridCacheManagerAdapte cctx.localNode(), "SQL query executed.", EVT_CACHE_QUERY_EXECUTED, - org.apache.ignite.cache.query.GridCacheQueryType.SQL, + CacheQueryType.SQL, cctx.namex(), qry.queryClassName(), qry.clause(), @@ -506,7 +506,7 @@ public abstract class GridCacheQueryManager<K, V> extends GridCacheManagerAdapte cctx.localNode(), "Scan query executed.", EVT_CACHE_QUERY_EXECUTED, - org.apache.ignite.cache.query.GridCacheQueryType.SCAN, + CacheQueryType.SCAN, cctx.namex(), null, null, @@ -527,7 +527,7 @@ public abstract class GridCacheQueryManager<K, V> extends GridCacheManagerAdapte cctx.localNode(), "Full text query executed.", EVT_CACHE_QUERY_EXECUTED, - org.apache.ignite.cache.query.GridCacheQueryType.FULL_TEXT, + CacheQueryType.FULL_TEXT, cctx.namex(), qry.queryClassName(), qry.clause(), @@ -601,7 +601,7 @@ public abstract class GridCacheQueryManager<K, V> extends GridCacheManagerAdapte cctx.localNode(), "SQL fields query executed.", EVT_CACHE_QUERY_EXECUTED, - org.apache.ignite.cache.query.GridCacheQueryType.SQL_FIELDS, + CacheQueryType.SQL_FIELDS, cctx.namex(), null, qry.clause(), @@ -633,7 +633,7 @@ public abstract class GridCacheQueryManager<K, V> extends GridCacheManagerAdapte cctx.localNode(), "SPI query executed.", EVT_CACHE_QUERY_EXECUTED, - org.apache.ignite.cache.query.GridCacheQueryType.SPI, + CacheQueryType.SPI, cctx.namex(), null, null, @@ -732,22 +732,22 @@ public abstract class GridCacheQueryManager<K, V> extends GridCacheManagerAdapte @SuppressWarnings({"unchecked"}) private GridCloseableIterator<IgniteBiTuple<K, V>> scanIterator(final GridCacheQueryAdapter<?> qry) throws IgniteCheckedException { - IgnitePredicate<GridCacheEntry<K, V>> filter = null; + IgnitePredicate<CacheEntry<K, V>> filter = null; if (qry.projectionFilter() != null) { - filter = new P1<GridCacheEntry<K, V>>() { - @Override public boolean apply(GridCacheEntry<K, V> e) { - return qry.projectionFilter().apply((GridCacheEntry<Object, Object>)e); + filter = new P1<CacheEntry<K, V>>() { + @Override public boolean apply(CacheEntry<K, V> e) { + return qry.projectionFilter().apply((CacheEntry<Object, Object>)e); } }; } - GridCacheProjection<K, V> prj0 = filter != null ? cctx.cache().projection(filter) : cctx.cache(); + CacheProjection<K, V> prj0 = filter != null ? cctx.cache().projection(filter) : cctx.cache(); if (qry.keepPortable()) prj0 = prj0.keepPortable(); - final GridCacheProjection<K, V> prj = prj0; + final CacheProjection<K, V> prj = prj0; final IgniteBiPredicate<K, V> keyValFilter = qry.scanFilter(); @@ -857,7 +857,7 @@ public abstract class GridCacheQueryManager<K, V> extends GridCacheManagerAdapte */ private GridIterator<IgniteBiTuple<K, V>> swapIterator(GridCacheQueryAdapter<?> qry) throws IgniteCheckedException { - IgnitePredicate<GridCacheEntry<Object, Object>> prjPred = qry.projectionFilter(); + IgnitePredicate<CacheEntry<Object, Object>> prjPred = qry.projectionFilter(); IgniteBiPredicate<K, V> filter = qry.scanFilter(); @@ -871,7 +871,7 @@ public abstract class GridCacheQueryManager<K, V> extends GridCacheManagerAdapte * @return Offheap iterator. */ private GridIterator<IgniteBiTuple<K, V>> offheapIterator(GridCacheQueryAdapter<?> qry) { - IgnitePredicate<GridCacheEntry<Object, Object>> prjPred = qry.projectionFilter(); + IgnitePredicate<CacheEntry<Object, Object>> prjPred = qry.projectionFilter(); IgniteBiPredicate<K, V> filter = qry.scanFilter(); @@ -896,7 +896,7 @@ public abstract class GridCacheQueryManager<K, V> extends GridCacheManagerAdapte */ private GridIteratorAdapter<IgniteBiTuple<K, V>> scanIterator( @Nullable final Iterator<Map.Entry<byte[], byte[]>> it, - @Nullable final IgnitePredicate<GridCacheEntry<Object, Object>> prjPred, + @Nullable final IgnitePredicate<CacheEntry<Object, Object>> prjPred, @Nullable final IgniteBiPredicate<K, V> filter, final boolean keepPortable) { if (it == null) @@ -935,9 +935,9 @@ public abstract class GridCacheQueryManager<K, V> extends GridCacheManagerAdapte final LazySwapEntry e = new LazySwapEntry(it.next()); if (prjPred != null) { - GridCacheEntry<K, V> cacheEntry = new GridCacheScanSwapEntry(e); + CacheEntry<K, V> cacheEntry = new GridCacheScanSwapEntry(e); - if (!prjPred.apply((GridCacheEntry<Object, Object>)cacheEntry)) + if (!prjPred.apply((CacheEntry<Object, Object>)cacheEntry)) continue; } @@ -997,7 +997,7 @@ public abstract class GridCacheQueryManager<K, V> extends GridCacheManagerAdapte try { // Preparing query closures. - IgnitePredicate<GridCacheEntry<Object, Object>> prjFilter = qryInfo.projectionPredicate(); + IgnitePredicate<CacheEntry<Object, Object>> prjFilter = qryInfo.projectionPredicate(); IgniteClosure<Object, Object> trans = (IgniteClosure<Object, Object>)qryInfo.transformer(); IgniteReducer<Object, Object> rdc = (IgniteReducer<Object, Object>)qryInfo.reducer(); @@ -1065,7 +1065,7 @@ public abstract class GridCacheQueryManager<K, V> extends GridCacheManagerAdapte cctx.localNode(), "SQL fields query result set row read.", EVT_CACHE_QUERY_OBJECT_READ, - org.apache.ignite.cache.query.GridCacheQueryType.SQL_FIELDS, + CacheQueryType.SQL_FIELDS, cctx.namex(), null, qry.clause(), @@ -1164,7 +1164,7 @@ public abstract class GridCacheQueryManager<K, V> extends GridCacheManagerAdapte try { // Preparing query closures. - IgnitePredicate<GridCacheEntry<Object, Object>> prjFilter = qryInfo.projectionPredicate(); + IgnitePredicate<CacheEntry<Object, Object>> prjFilter = qryInfo.projectionPredicate(); IgniteClosure<Map.Entry<K, V>, Object> trans = (IgniteClosure<Map.Entry<K, V>, Object>)qryInfo.transformer(); IgniteReducer<Map.Entry<K, V>, Object> rdc = (IgniteReducer<Map.Entry<K, V>, Object>)qryInfo.reducer(); @@ -1252,7 +1252,7 @@ public abstract class GridCacheQueryManager<K, V> extends GridCacheManagerAdapte cctx.localNode(), "SQL query entry read.", EVT_CACHE_QUERY_OBJECT_READ, - org.apache.ignite.cache.query.GridCacheQueryType.SQL, + CacheQueryType.SQL, cctx.namex(), qry.queryClassName(), qry.clause(), @@ -1275,7 +1275,7 @@ public abstract class GridCacheQueryManager<K, V> extends GridCacheManagerAdapte cctx.localNode(), "Full text query entry read.", EVT_CACHE_QUERY_OBJECT_READ, - org.apache.ignite.cache.query.GridCacheQueryType.FULL_TEXT, + CacheQueryType.FULL_TEXT, cctx.namex(), qry.queryClassName(), qry.clause(), @@ -1298,7 +1298,7 @@ public abstract class GridCacheQueryManager<K, V> extends GridCacheManagerAdapte cctx.localNode(), "Scan query entry read.", EVT_CACHE_QUERY_OBJECT_READ, - org.apache.ignite.cache.query.GridCacheQueryType.SCAN, + CacheQueryType.SCAN, cctx.namex(), null, null, @@ -1658,7 +1658,7 @@ public abstract class GridCacheQueryManager<K, V> extends GridCacheManagerAdapte * * @return Cache queries metrics. */ - public GridCacheQueryMetrics metrics() { + public CacheQueryMetrics metrics() { return metrics.copy(); } @@ -1753,7 +1753,7 @@ public abstract class GridCacheQueryManager<K, V> extends GridCacheManagerAdapte @Nullable private GridIndexingQueryFilter projectionFilter(GridCacheQueryAdapter<?> qry) { assert qry != null; - final IgnitePredicate<GridCacheEntry<Object, Object>> prjFilter = qry.projectionFilter(); + final IgnitePredicate<CacheEntry<Object, Object>> prjFilter = qry.projectionFilter(); if (prjFilter == null || F.isAlwaysTrue(prjFilter)) return null; @@ -1766,9 +1766,9 @@ public abstract class GridCacheQueryManager<K, V> extends GridCacheManagerAdapte return new IgniteBiPredicate<K, V>() { @Override public boolean apply(K k, V v) { try { - GridCacheEntry<K, V> entry = context().cache().entry(k); + CacheEntry<K, V> entry = context().cache().entry(k); - return entry != null && prjFilter.apply((GridCacheEntry<Object, Object>)entry); + return entry != null && prjFilter.apply((CacheEntry<Object, Object>)entry); } catch (GridDhtInvalidPartitionException ignore) { return false; @@ -1883,13 +1883,13 @@ public abstract class GridCacheQueryManager<K, V> extends GridCacheManagerAdapte final GridKernalContext ctx = ((GridKernal) ignite).context(); Collection<String> cacheNames = F.viewReadOnly(ctx.cache().caches(), - new C1<GridCache<?, ?>, String>() { - @Override public String apply(GridCache<?, ?> c) { + new C1<Cache<?, ?>, String>() { + @Override public String apply(Cache<?, ?> c) { return c.name(); } }, - new P1<GridCache<?, ?>>() { - @Override public boolean apply(GridCache<?, ?> c) { + new P1<Cache<?, ?>>() { + @Override public boolean apply(Cache<?, ?> c) { return !CU.UTILITY_CACHE_NAME.equals(c.name()); } } @@ -1907,7 +1907,7 @@ public abstract class GridCacheQueryManager<K, V> extends GridCacheManagerAdapte for (GridQueryTypeDescriptor type : types) { // Filter internal types (e.g., data structures). - if (type.name().startsWith("GridCache")) + if (type.name().startsWith("Cache")) continue; names.add(type.name()); @@ -2435,7 +2435,7 @@ public abstract class GridCacheQueryManager<K, V> extends GridCacheManagerAdapte private static final long serialVersionUID = 7410163202728985912L; /** */ - private IgnitePredicate<GridCacheEntry<Object, Object>> prjPred; + private IgnitePredicate<CacheEntry<Object, Object>> prjPred; /** */ private IgniteBiPredicate<K, V> filter; @@ -2449,7 +2449,7 @@ public abstract class GridCacheQueryManager<K, V> extends GridCacheManagerAdapte * @param keepPortable Keep portable flag. */ private OffheapIteratorClosure( - @Nullable IgnitePredicate<GridCacheEntry<Object, Object>> prjPred, + @Nullable IgnitePredicate<CacheEntry<Object, Object>> prjPred, @Nullable IgniteBiPredicate<K, V> filter, boolean keepPortable) { assert prjPred != null || filter != null; @@ -2466,9 +2466,9 @@ public abstract class GridCacheQueryManager<K, V> extends GridCacheManagerAdapte LazyOffheapEntry e = new LazyOffheapEntry(keyPtr, valPtr); if (prjPred != null) { - GridCacheEntry<K, V> cacheEntry = new GridCacheScanSwapEntry(e); + CacheEntry<K, V> cacheEntry = new GridCacheScanSwapEntry(e); - if (!prjPred.apply((GridCacheEntry<Object, Object>)cacheEntry)) + if (!prjPred.apply((CacheEntry<Object, Object>)cacheEntry)) return null; } @@ -2548,7 +2548,7 @@ public abstract class GridCacheQueryManager<K, V> extends GridCacheManagerAdapte /** * */ - private class GridCacheScanSwapEntry implements GridCacheEntry<K, V> { + private class GridCacheScanSwapEntry implements CacheEntry<K, V> { /** */ private static final long serialVersionUID = 1262515168518736214L; @@ -2593,7 +2593,7 @@ public abstract class GridCacheQueryManager<K, V> extends GridCacheManagerAdapte } /** {@inheritDoc} */ - @Override public GridCacheProjection<K, V> projection() { + @Override public CacheProjection<K, V> projection() { return null; } @@ -2660,12 +2660,12 @@ public abstract class GridCacheQueryManager<K, V> extends GridCacheManagerAdapte } /** {@inheritDoc} */ - @Nullable @Override public V set(V val, IgnitePredicate<GridCacheEntry<K, V>>... filter) { + @Nullable @Override public V set(V val, IgnitePredicate<CacheEntry<K, V>>... filter) { throw new UnsupportedOperationException(); } /** {@inheritDoc} */ - @Override public IgniteFuture<V> setAsync(V val, IgnitePredicate<GridCacheEntry<K, V>>... filter) { + @Override public IgniteFuture<V> setAsync(V val, IgnitePredicate<CacheEntry<K, V>>... filter) { throw new UnsupportedOperationException(); } @@ -2680,12 +2680,12 @@ public abstract class GridCacheQueryManager<K, V> extends GridCacheManagerAdapte } /** {@inheritDoc} */ - @Override public boolean setx(V val, @Nullable IgnitePredicate<GridCacheEntry<K, V>>... filter) { + @Override public boolean setx(V val, @Nullable IgnitePredicate<CacheEntry<K, V>>... filter) { throw new UnsupportedOperationException(); } /** {@inheritDoc} */ - @Override public IgniteFuture<Boolean> setxAsync(V val, @Nullable IgnitePredicate<GridCacheEntry<K, V>>... filter) { + @Override public IgniteFuture<Boolean> setxAsync(V val, @Nullable IgnitePredicate<CacheEntry<K, V>>... filter) { throw new UnsupportedOperationException(); } @@ -2730,22 +2730,22 @@ public abstract class GridCacheQueryManager<K, V> extends GridCacheManagerAdapte } /** {@inheritDoc} */ - @Nullable @Override public V remove(@Nullable IgnitePredicate<GridCacheEntry<K, V>>... filter) { + @Nullable @Override public V remove(@Nullable IgnitePredicate<CacheEntry<K, V>>... filter) { throw new UnsupportedOperationException(); } /** {@inheritDoc} */ - @Override public IgniteFuture<V> removeAsync(IgnitePredicate<GridCacheEntry<K, V>>... filter) { + @Override public IgniteFuture<V> removeAsync(IgnitePredicate<CacheEntry<K, V>>... filter) { throw new UnsupportedOperationException(); } /** {@inheritDoc} */ - @Override public boolean removex(IgnitePredicate<GridCacheEntry<K, V>>... filter) { + @Override public boolean removex(IgnitePredicate<CacheEntry<K, V>>... filter) { throw new UnsupportedOperationException(); } /** {@inheritDoc} */ - @Override public IgniteFuture<Boolean> removexAsync(@Nullable IgnitePredicate<GridCacheEntry<K, V>>... filter) { + @Override public IgniteFuture<Boolean> removexAsync(@Nullable IgnitePredicate<CacheEntry<K, V>>... filter) { throw new UnsupportedOperationException(); } @@ -2775,18 +2775,18 @@ public abstract class GridCacheQueryManager<K, V> extends GridCacheManagerAdapte } /** {@inheritDoc} */ - @Override public boolean lock(long timeout, @Nullable IgnitePredicate<GridCacheEntry<K, V>>... filter) { + @Override public boolean lock(long timeout, @Nullable IgnitePredicate<CacheEntry<K, V>>... filter) { throw new UnsupportedOperationException(); } /** {@inheritDoc} */ @Override public IgniteFuture<Boolean> lockAsync(long timeout, - @Nullable IgnitePredicate<GridCacheEntry<K, V>>... filter) { + @Nullable IgnitePredicate<CacheEntry<K, V>>... filter) { throw new UnsupportedOperationException(); } /** {@inheritDoc} */ - @Override public void unlock(IgnitePredicate<GridCacheEntry<K, V>>... filter) { + @Override public void unlock(IgnitePredicate<CacheEntry<K, V>>... filter) { throw new UnsupportedOperationException(); } http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/cafee25f/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/query/GridCacheQueryMetricsAdapter.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/query/GridCacheQueryMetricsAdapter.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/query/GridCacheQueryMetricsAdapter.java index ca42474..ddff0cc 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/query/GridCacheQueryMetricsAdapter.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/query/GridCacheQueryMetricsAdapter.java @@ -23,9 +23,9 @@ import org.apache.ignite.internal.util.typedef.internal.*; import java.io.*; /** - * Adapter for {@link org.apache.ignite.cache.query.GridCacheQueryMetrics}. + * Adapter for {@link org.apache.ignite.cache.query.CacheQueryMetrics}. */ -public class GridCacheQueryMetricsAdapter implements GridCacheQueryMetrics, Externalizable { +public class GridCacheQueryMetricsAdapter implements CacheQueryMetrics, Externalizable { /** */ private static final long serialVersionUID = 0L; http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/cafee25f/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/query/GridCacheQueryRequest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/query/GridCacheQueryRequest.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/query/GridCacheQueryRequest.java index 193c530..e3f2c94 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/query/GridCacheQueryRequest.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/query/GridCacheQueryRequest.java @@ -67,7 +67,7 @@ public class GridCacheQueryRequest<K, V> extends GridCacheMessage<K, V> implemen /** */ @GridDirectTransient - private IgnitePredicate<GridCacheEntry<Object, Object>> prjFilter; + private IgnitePredicate<CacheEntry<Object, Object>> prjFilter; /** */ private byte[] prjFilterBytes; @@ -201,7 +201,7 @@ public class GridCacheQueryRequest<K, V> extends GridCacheMessage<K, V> implemen String clause, String clsName, IgniteBiPredicate<Object, Object> keyValFilter, - IgnitePredicate<GridCacheEntry<Object, Object>> prjFilter, + IgnitePredicate<CacheEntry<Object, Object>> prjFilter, IgniteReducer<Object, Object> rdc, IgniteClosure<Object, Object> trans, int pageSize, @@ -376,7 +376,7 @@ public class GridCacheQueryRequest<K, V> extends GridCacheMessage<K, V> implemen } /** {@inheritDoc} */ - public IgnitePredicate<GridCacheEntry<Object, Object>> projectionFilter() { + public IgnitePredicate<CacheEntry<Object, Object>> projectionFilter() { return prjFilter; } http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/cafee25f/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/query/GridCacheQueryType.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/query/GridCacheQueryType.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/query/GridCacheQueryType.java index e26a632..f7d45a5 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/query/GridCacheQueryType.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/query/GridCacheQueryType.java @@ -21,8 +21,8 @@ import org.jetbrains.annotations.*; /** * Defines different cache query types. For more information on cache query types - * and their usage see {@link org.apache.ignite.cache.query.GridCacheQuery} documentation. - * @see org.apache.ignite.cache.query.GridCacheQuery + * and their usage see {@link org.apache.ignite.cache.query.CacheQuery} documentation. + * @see org.apache.ignite.cache.query.CacheQuery */ public enum GridCacheQueryType { /** http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/cafee25f/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/query/continuous/GridCacheContinuousQueryAdapter.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/query/continuous/GridCacheContinuousQueryAdapter.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/query/continuous/GridCacheContinuousQueryAdapter.java index 66ecf63..13ab56f 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/query/continuous/GridCacheContinuousQueryAdapter.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/query/continuous/GridCacheContinuousQueryAdapter.java @@ -39,7 +39,7 @@ import static org.apache.ignite.cache.CacheMode.*; /** * Continuous query implementation. */ -public class GridCacheContinuousQueryAdapter<K, V> implements GridCacheContinuousQuery<K, V> { +public class GridCacheContinuousQueryAdapter<K, V> implements CacheContinuousQuery<K, V> { /** Guard. */ private final GridBusyLock guard = new GridBusyLock(); @@ -53,7 +53,7 @@ public class GridCacheContinuousQueryAdapter<K, V> implements GridCacheContinuou private final Object topic; /** Projection predicate */ - private final IgnitePredicate<GridCacheEntry<K, V>> prjPred; + private final IgnitePredicate<CacheEntry<K, V>> prjPred; /** Keep portable flag. */ private final boolean keepPortable; @@ -65,13 +65,13 @@ public class GridCacheContinuousQueryAdapter<K, V> implements GridCacheContinuou private volatile IgniteBiPredicate<UUID, Collection<Map.Entry<K, V>>> cb; /** Local callback. */ - private volatile IgniteBiPredicate<UUID, Collection<org.apache.ignite.cache.query.GridCacheContinuousQueryEntry<K, V>>> locCb; + private volatile IgniteBiPredicate<UUID, Collection<CacheContinuousQueryEntry<K, V>>> locCb; /** Filter. */ private volatile IgniteBiPredicate<K, V> filter; /** Remote filter. */ - private volatile IgnitePredicate<org.apache.ignite.cache.query.GridCacheContinuousQueryEntry<K, V>> rmtFilter; + private volatile IgnitePredicate<CacheContinuousQueryEntry<K, V>> rmtFilter; /** Buffer size. */ private volatile int bufSize = DFLT_BUF_SIZE; @@ -92,7 +92,7 @@ public class GridCacheContinuousQueryAdapter<K, V> implements GridCacheContinuou * @param prjPred Projection predicate. */ GridCacheContinuousQueryAdapter(GridCacheContext<K, V> ctx, Object topic, - @Nullable IgnitePredicate<GridCacheEntry<K, V>> prjPred) { + @Nullable IgnitePredicate<CacheEntry<K, V>> prjPred) { assert ctx != null; assert topic != null; @@ -138,7 +138,7 @@ public class GridCacheContinuousQueryAdapter<K, V> implements GridCacheContinuou } /** {@inheritDoc} */ - @Override public void localCallback(IgniteBiPredicate<UUID, Collection<org.apache.ignite.cache.query.GridCacheContinuousQueryEntry<K, V>>> locCb) { + @Override public void localCallback(IgniteBiPredicate<UUID, Collection<CacheContinuousQueryEntry<K, V>>> locCb) { if (!guard.enterBusy()) throw new IllegalStateException("Continuous query can't be changed after it was executed."); @@ -151,12 +151,12 @@ public class GridCacheContinuousQueryAdapter<K, V> implements GridCacheContinuou } /** {@inheritDoc} */ - @Nullable @Override public IgniteBiPredicate<UUID, Collection<org.apache.ignite.cache.query.GridCacheContinuousQueryEntry<K, V>>> localCallback() { + @Nullable @Override public IgniteBiPredicate<UUID, Collection<CacheContinuousQueryEntry<K, V>>> localCallback() { return locCb; } /** {@inheritDoc} */ - @Override public void remoteFilter(@Nullable IgnitePredicate<org.apache.ignite.cache.query.GridCacheContinuousQueryEntry<K, V>> rmtFilter) { + @Override public void remoteFilter(@Nullable IgnitePredicate<CacheContinuousQueryEntry<K, V>> rmtFilter) { if (!guard.enterBusy()) throw new IllegalStateException("Continuous query can't be changed after it was executed."); @@ -169,7 +169,7 @@ public class GridCacheContinuousQueryAdapter<K, V> implements GridCacheContinuou } /** {@inheritDoc} */ - @Nullable @Override public IgnitePredicate<org.apache.ignite.cache.query.GridCacheContinuousQueryEntry<K, V>> remoteFilter() { + @Nullable @Override public IgnitePredicate<CacheContinuousQueryEntry<K, V>> remoteFilter() { return rmtFilter; } @@ -337,7 +337,7 @@ public class GridCacheContinuousQueryAdapter<K, V> implements GridCacheContinuou /** * Deprecated callback wrapper. */ - static class CallbackWrapper<K, V> implements IgniteBiPredicate<UUID, Collection<org.apache.ignite.cache.query.GridCacheContinuousQueryEntry<K, V>>> { + static class CallbackWrapper<K, V> implements IgniteBiPredicate<UUID, Collection<CacheContinuousQueryEntry<K, V>>> { /** Serialization ID. */ private static final long serialVersionUID = 0L; @@ -353,7 +353,7 @@ public class GridCacheContinuousQueryAdapter<K, V> implements GridCacheContinuou /** {@inheritDoc} */ @SuppressWarnings("unchecked") - @Override public boolean apply(UUID nodeId, Collection<org.apache.ignite.cache.query.GridCacheContinuousQueryEntry<K, V>> entries) { + @Override public boolean apply(UUID nodeId, Collection<CacheContinuousQueryEntry<K, V>> entries) { return cb.apply(nodeId, (Collection<Map.Entry<K,V>>)(Collection)entries); } } @@ -361,7 +361,7 @@ public class GridCacheContinuousQueryAdapter<K, V> implements GridCacheContinuou /** * Deprecated filter wrapper. */ - static class FilterWrapper<K, V> implements IgnitePredicate<org.apache.ignite.cache.query.GridCacheContinuousQueryEntry<K, V>> { + static class FilterWrapper<K, V> implements IgnitePredicate<CacheContinuousQueryEntry<K, V>> { /** Serialization ID. */ private static final long serialVersionUID = 0L; @@ -377,7 +377,7 @@ public class GridCacheContinuousQueryAdapter<K, V> implements GridCacheContinuou /** {@inheritDoc} */ @SuppressWarnings("unchecked") - @Override public boolean apply(org.apache.ignite.cache.query.GridCacheContinuousQueryEntry<K, V> entry) { + @Override public boolean apply(CacheContinuousQueryEntry<K, V> entry) { return filter.apply(entry.getKey(), entry.getValue()); } } http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/cafee25f/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/query/continuous/GridCacheContinuousQueryEntry.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/query/continuous/GridCacheContinuousQueryEntry.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/query/continuous/GridCacheContinuousQueryEntry.java index cd71af8..601591f 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/query/continuous/GridCacheContinuousQueryEntry.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/query/continuous/GridCacheContinuousQueryEntry.java @@ -19,6 +19,7 @@ package org.apache.ignite.internal.processors.cache.query.continuous; import org.apache.ignite.*; import org.apache.ignite.cache.*; +import org.apache.ignite.cache.query.*; import org.apache.ignite.internal.processors.cache.*; import org.apache.ignite.lang.*; import org.apache.ignite.marshaller.*; @@ -33,15 +34,15 @@ import java.io.*; import java.util.*; import java.util.concurrent.*; -import static org.apache.ignite.cache.GridCacheFlag.*; +import static org.apache.ignite.cache.CacheFlag.*; import static org.apache.ignite.internal.processors.cache.GridCacheValueBytes.*; /** * Entry implementation. */ @SuppressWarnings("TypeParameterHidesVisibleType") -public class GridCacheContinuousQueryEntry<K, V> implements GridCacheEntry<K, V>, GridCacheDeployable, Externalizable, - org.apache.ignite.cache.query.GridCacheContinuousQueryEntry<K, V> { +public class GridCacheContinuousQueryEntry<K, V> implements CacheEntry<K, V>, GridCacheDeployable, Externalizable, + CacheContinuousQueryEntry<K, V> { /** */ private static final long serialVersionUID = 0L; @@ -56,7 +57,7 @@ public class GridCacheContinuousQueryEntry<K, V> implements GridCacheEntry<K, V> /** Cache entry. */ @SuppressWarnings("TransientFieldNotInitialized") @GridToStringExclude - private final transient GridCacheEntry<K, V> impl; + private final transient CacheEntry<K, V> impl; /** Key. */ @GridToStringInclude @@ -110,7 +111,7 @@ public class GridCacheContinuousQueryEntry<K, V> implements GridCacheEntry<K, V> * @param evtType Event type. */ GridCacheContinuousQueryEntry(GridCacheContext<K, V> ctx, - GridCacheEntry<K, V> impl, + CacheEntry<K, V> impl, K key, @Nullable V newVal, @Nullable GridCacheValueBytes newValBytes, @@ -135,7 +136,7 @@ public class GridCacheContinuousQueryEntry<K, V> implements GridCacheEntry<K, V> /** * @return Cache entry. */ - GridCacheEntry<K, V> entry() { + CacheEntry<K, V> entry() { return impl; } @@ -238,7 +239,7 @@ public class GridCacheContinuousQueryEntry<K, V> implements GridCacheEntry<K, V> } /** {@inheritDoc} */ - @Override public GridCacheProjection<K, V> projection() { + @Override public CacheProjection<K, V> projection() { return impl.projection(); } @@ -379,7 +380,7 @@ public class GridCacheContinuousQueryEntry<K, V> implements GridCacheEntry<K, V> } /** {@inheritDoc} */ - @Nullable @Override public V set(V val, @Nullable IgnitePredicate<GridCacheEntry<K, V>>... filter) + @Nullable @Override public V set(V val, @Nullable IgnitePredicate<CacheEntry<K, V>>... filter) throws IgniteCheckedException { assert impl != null; @@ -389,7 +390,7 @@ public class GridCacheContinuousQueryEntry<K, V> implements GridCacheEntry<K, V> } /** {@inheritDoc} */ - @Override public IgniteFuture<V> setAsync(V val, @Nullable IgnitePredicate<GridCacheEntry<K, V>>... filter) { + @Override public IgniteFuture<V> setAsync(V val, @Nullable IgnitePredicate<CacheEntry<K, V>>... filter) { assert impl != null; ctx.denyOnFlag(READ); @@ -416,7 +417,7 @@ public class GridCacheContinuousQueryEntry<K, V> implements GridCacheEntry<K, V> } /** {@inheritDoc} */ - @Override public boolean setx(V val, @Nullable IgnitePredicate<GridCacheEntry<K, V>>... filter) + @Override public boolean setx(V val, @Nullable IgnitePredicate<CacheEntry<K, V>>... filter) throws IgniteCheckedException { assert impl != null; @@ -427,7 +428,7 @@ public class GridCacheContinuousQueryEntry<K, V> implements GridCacheEntry<K, V> /** {@inheritDoc} */ @Override public IgniteFuture<Boolean> setxAsync(V val, - @Nullable IgnitePredicate<GridCacheEntry<K, V>>... filter) { + @Nullable IgnitePredicate<CacheEntry<K, V>>... filter) { assert impl != null; ctx.denyOnFlag(READ); @@ -508,7 +509,7 @@ public class GridCacheContinuousQueryEntry<K, V> implements GridCacheEntry<K, V> } /** {@inheritDoc} */ - @Nullable @Override public V remove(@Nullable IgnitePredicate<GridCacheEntry<K, V>>... filter) + @Nullable @Override public V remove(@Nullable IgnitePredicate<CacheEntry<K, V>>... filter) throws IgniteCheckedException { assert impl != null; @@ -518,7 +519,7 @@ public class GridCacheContinuousQueryEntry<K, V> implements GridCacheEntry<K, V> } /** {@inheritDoc} */ - @Override public IgniteFuture<V> removeAsync(@Nullable IgnitePredicate<GridCacheEntry<K, V>>... filter) { + @Override public IgniteFuture<V> removeAsync(@Nullable IgnitePredicate<CacheEntry<K, V>>... filter) { assert impl != null; ctx.denyOnFlag(READ); @@ -527,7 +528,7 @@ public class GridCacheContinuousQueryEntry<K, V> implements GridCacheEntry<K, V> } /** {@inheritDoc} */ - @Override public boolean removex(@Nullable IgnitePredicate<GridCacheEntry<K, V>>... filter) throws IgniteCheckedException { + @Override public boolean removex(@Nullable IgnitePredicate<CacheEntry<K, V>>... filter) throws IgniteCheckedException { assert impl != null; ctx.denyOnFlag(READ); @@ -536,7 +537,7 @@ public class GridCacheContinuousQueryEntry<K, V> implements GridCacheEntry<K, V> } /** {@inheritDoc} */ - @Override public IgniteFuture<Boolean> removexAsync(@Nullable IgnitePredicate<GridCacheEntry<K, V>>... filter) { + @Override public IgniteFuture<Boolean> removexAsync(@Nullable IgnitePredicate<CacheEntry<K, V>>... filter) { assert impl != null; ctx.denyOnFlag(READ); @@ -591,7 +592,7 @@ public class GridCacheContinuousQueryEntry<K, V> implements GridCacheEntry<K, V> } /** {@inheritDoc} */ - @Override public boolean lock(long timeout, @Nullable IgnitePredicate<GridCacheEntry<K, V>>... filter) + @Override public boolean lock(long timeout, @Nullable IgnitePredicate<CacheEntry<K, V>>... filter) throws IgniteCheckedException { assert impl != null; @@ -600,14 +601,14 @@ public class GridCacheContinuousQueryEntry<K, V> implements GridCacheEntry<K, V> /** {@inheritDoc} */ @Override public IgniteFuture<Boolean> lockAsync(long timeout, - @Nullable IgnitePredicate<GridCacheEntry<K, V>>... filter) { + @Nullable IgnitePredicate<CacheEntry<K, V>>... filter) { assert impl != null; return impl.lockAsync(timeout, filter); } /** {@inheritDoc} */ - @Override public void unlock(IgnitePredicate<GridCacheEntry<K, V>>... filter) throws IgniteCheckedException { + @Override public void unlock(IgnitePredicate<CacheEntry<K, V>>... filter) throws IgniteCheckedException { assert impl != null; impl.unlock(filter); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/cafee25f/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/query/continuous/GridCacheContinuousQueryFilterEx.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/query/continuous/GridCacheContinuousQueryFilterEx.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/query/continuous/GridCacheContinuousQueryFilterEx.java index e6dce65..7b0615d 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/query/continuous/GridCacheContinuousQueryFilterEx.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/query/continuous/GridCacheContinuousQueryFilterEx.java @@ -18,13 +18,14 @@ package org.apache.ignite.internal.processors.cache.query.continuous; +import org.apache.ignite.cache.query.*; import org.apache.ignite.lang.*; /** * Extended continuous query filter. */ public interface GridCacheContinuousQueryFilterEx<K, V> extends - IgnitePredicate<org.apache.ignite.cache.query.GridCacheContinuousQueryEntry<K, V>> { + IgnitePredicate<CacheContinuousQueryEntry<K, V>> { /** * Callback for query unregister event. */ http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/cafee25f/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/query/continuous/GridCacheContinuousQueryHandler.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/query/continuous/GridCacheContinuousQueryHandler.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/query/continuous/GridCacheContinuousQueryHandler.java index 5f16ab8..a6d0c60 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/query/continuous/GridCacheContinuousQueryHandler.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/query/continuous/GridCacheContinuousQueryHandler.java @@ -52,13 +52,13 @@ class GridCacheContinuousQueryHandler<K, V> implements GridContinuousHandler { /** Local callback. */ @SuppressWarnings("FieldAccessedSynchronizedAndUnsynchronized") - private IgniteBiPredicate<UUID, Collection<org.apache.ignite.cache.query.GridCacheContinuousQueryEntry<K, V>>> cb; + private IgniteBiPredicate<UUID, Collection<CacheContinuousQueryEntry<K, V>>> cb; /** Filter. */ - private IgnitePredicate<org.apache.ignite.cache.query.GridCacheContinuousQueryEntry<K, V>> filter; + private IgnitePredicate<CacheContinuousQueryEntry<K, V>> filter; /** Projection predicate */ - private IgnitePredicate<GridCacheEntry<K, V>> prjPred; + private IgnitePredicate<CacheEntry<K, V>> prjPred; /** Deployable object for filter. */ private DeployableObject filterDep; @@ -107,9 +107,9 @@ class GridCacheContinuousQueryHandler<K, V> implements GridContinuousHandler { */ GridCacheContinuousQueryHandler(@Nullable String cacheName, Object topic, - IgniteBiPredicate<UUID, Collection<org.apache.ignite.cache.query.GridCacheContinuousQueryEntry<K, V>>> cb, - @Nullable IgnitePredicate<org.apache.ignite.cache.query.GridCacheContinuousQueryEntry<K, V>> filter, - @Nullable IgnitePredicate<GridCacheEntry<K, V>> prjPred, + IgniteBiPredicate<UUID, Collection<CacheContinuousQueryEntry<K, V>>> cb, + @Nullable IgnitePredicate<CacheContinuousQueryEntry<K, V>> filter, + @Nullable IgnitePredicate<CacheEntry<K, V>> prjPred, boolean internal, boolean entryLsnr, boolean sync, @@ -170,7 +170,7 @@ class GridCacheContinuousQueryHandler<K, V> implements GridContinuousHandler { ctx.discovery().localNode(), "Continuous query executed.", EVT_CACHE_QUERY_EXECUTED, - GridCacheQueryType.CONTINUOUS, + CacheQueryType.CONTINUOUS, cacheName, null, null, @@ -186,7 +186,7 @@ class GridCacheContinuousQueryHandler<K, V> implements GridContinuousHandler { @Override public void onEntryUpdate(GridCacheContinuousQueryEntry<K, V> e, boolean recordEvt) { boolean notify; - GridCacheFlag[] f = cacheContext(ctx).forceLocalRead(); + CacheFlag[] f = cacheContext(ctx).forceLocalRead(); try { notify = (prjPred == null || checkProjection(e)) && @@ -210,7 +210,7 @@ class GridCacheContinuousQueryHandler<K, V> implements GridContinuousHandler { if (loc) { if (!cb.apply(nodeId, - F.<org.apache.ignite.cache.query.GridCacheContinuousQueryEntry<K, V>>asList(e))) + F.<CacheContinuousQueryEntry<K, V>>asList(e))) ctx.continuous().stopRoutine(routineId); } else { @@ -241,7 +241,7 @@ class GridCacheContinuousQueryHandler<K, V> implements GridContinuousHandler { ctx.discovery().localNode(), "Continuous query executed.", EVT_CACHE_QUERY_OBJECT_READ, - GridCacheQueryType.CONTINUOUS, + CacheQueryType.CONTINUOUS, cacheName, null, null, @@ -269,7 +269,7 @@ class GridCacheContinuousQueryHandler<K, V> implements GridContinuousHandler { GridCacheProjectionImpl.FullFilter<K, V> filter = (GridCacheProjectionImpl.FullFilter<K, V>)prjPred; GridCacheProjectionImpl.KeyValueFilter<K, V> kvFilter = filter.keyValueFilter(); - IgnitePredicate<? super GridCacheEntry<K, V>> entryFilter = filter.entryFilter(); + IgnitePredicate<? super CacheEntry<K, V>> entryFilter = filter.entryFilter(); boolean ret = true; @@ -323,8 +323,8 @@ class GridCacheContinuousQueryHandler<K, V> implements GridContinuousHandler { assert objs != null; assert ctx != null; - Collection<org.apache.ignite.cache.query.GridCacheContinuousQueryEntry<K, V>> entries = - (Collection<org.apache.ignite.cache.query.GridCacheContinuousQueryEntry<K, V>>)objs; + Collection<CacheContinuousQueryEntry<K, V>> entries = + (Collection<CacheContinuousQueryEntry<K, V>>)objs; if (ctx.config().isPeerClassLoadingEnabled()) { for (Map.Entry<K, V> e : entries) { @@ -444,14 +444,14 @@ class GridCacheContinuousQueryHandler<K, V> implements GridContinuousHandler { if (b) filterDep = (DeployableObject)in.readObject(); else - filter = (IgnitePredicate<org.apache.ignite.cache.query.GridCacheContinuousQueryEntry<K,V>>)in.readObject(); + filter = (IgnitePredicate<CacheContinuousQueryEntry<K,V>>)in.readObject(); b = in.readBoolean(); if (b) prjPredDep = (DeployableObject)in.readObject(); else - prjPred = (IgnitePredicate<GridCacheEntry<K, V>>)in.readObject(); + prjPred = (IgnitePredicate<CacheEntry<K, V>>)in.readObject(); internal = in.readBoolean(); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/cafee25f/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/query/continuous/GridCacheContinuousQueryManager.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/query/continuous/GridCacheContinuousQueryManager.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/query/continuous/GridCacheContinuousQueryManager.java index df6fdeb..0c2d9eb 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/query/continuous/GridCacheContinuousQueryManager.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/query/continuous/GridCacheContinuousQueryManager.java @@ -63,7 +63,7 @@ public class GridCacheContinuousQueryManager<K, V> extends GridCacheManagerAdapt private final AtomicLong seq = new AtomicLong(); /** Continues queries created for cache event listeners. */ - private final ConcurrentMap<CacheEntryListenerConfiguration, GridCacheContinuousQuery<K, V>> lsnrQrys = + private final ConcurrentMap<CacheEntryListenerConfiguration, CacheContinuousQuery<K, V>> lsnrQrys = new ConcurrentHashMap8<>(); /** {@inheritDoc} */ @@ -112,7 +112,7 @@ public class GridCacheContinuousQueryManager<K, V> extends GridCacheManagerAdapt * @param prjPred Projection predicate. * @return New continuous query. */ - public GridCacheContinuousQuery<K, V> createQuery(@Nullable IgnitePredicate<GridCacheEntry<K, V>> prjPred) { + public CacheContinuousQuery<K, V> createQuery(@Nullable IgnitePredicate<CacheEntry<K, V>> prjPred) { Object topic = TOPIC_CACHE.topic(topicPrefix, cctx.localNodeId(), seq.getAndIncrement()); return new GridCacheContinuousQueryAdapter<>(cctx, topic, prjPred); @@ -243,7 +243,7 @@ public class GridCacheContinuousQueryManager<K, V> extends GridCacheManagerAdapt qry = (GridCacheContinuousQueryAdapter<K, V>)cctx.cache().queries().createContinuousQuery(); - GridCacheContinuousQuery<K, V> old = lsnrQrys.putIfAbsent(lsnrCfg, qry); + CacheContinuousQuery<K, V> old = lsnrQrys.putIfAbsent(lsnrCfg, qry); if (old != null) throw new IllegalArgumentException("Listener is already registered for configuration: " + lsnrCfg); @@ -284,7 +284,7 @@ public class GridCacheContinuousQueryManager<K, V> extends GridCacheManagerAdapt public void deregisterCacheEntryListener(CacheEntryListenerConfiguration lsnrCfg) throws IgniteCheckedException { A.notNull(lsnrCfg, "lsnrCfg"); - GridCacheContinuousQuery<K, V> qry = lsnrQrys.remove(lsnrCfg); + CacheContinuousQuery<K, V> qry = lsnrQrys.remove(lsnrCfg); if (qry != null) { cctx.config().removeCacheEntryListenerConfiguration(lsnrCfg); @@ -373,7 +373,7 @@ public class GridCacheContinuousQueryManager<K, V> extends GridCacheManagerAdapt cctx.projectionPerCall(cctx.cache().<K, V>keepPortable0()); } - Set<GridCacheEntry<K, V>> entries; + Set<CacheEntry<K, V>> entries; if (cctx.isReplicated()) entries = internal ? cctx.cache().entrySetx() : @@ -384,7 +384,7 @@ public class GridCacheContinuousQueryManager<K, V> extends GridCacheManagerAdapt boolean evt = !internal && cctx.gridEvents().isRecordable(EVT_CACHE_QUERY_OBJECT_READ); - for (GridCacheEntry<K, V> e : entries) { + for (CacheEntry<K, V> e : entries) { GridCacheContinuousQueryEntry<K, V> qryEntry = new GridCacheContinuousQueryEntry<>(cctx, e, e.getKey(), @@ -505,7 +505,7 @@ public class GridCacheContinuousQueryManager<K, V> extends GridCacheManagerAdapt * */ static class EntryListenerFilter<K1, V1> implements - IgnitePredicate<org.apache.ignite.cache.query.GridCacheContinuousQueryEntry<K1, V1>>, Externalizable { + IgnitePredicate<CacheContinuousQueryEntry<K1, V1>>, Externalizable { /** */ private static final long serialVersionUID = 0L; @@ -579,7 +579,7 @@ public class GridCacheContinuousQueryManager<K, V> extends GridCacheManagerAdapt /** {@inheritDoc} */ @SuppressWarnings("unchecked") - @Override public boolean apply(org.apache.ignite.cache.query.GridCacheContinuousQueryEntry<K1, V1> entry) { + @Override public boolean apply(CacheContinuousQueryEntry<K1, V1> entry) { try { EventType evtType = (((GridCacheContinuousQueryEntry)entry).eventType()); @@ -669,7 +669,7 @@ public class GridCacheContinuousQueryManager<K, V> extends GridCacheManagerAdapt * */ private class EntryListenerCallback implements - IgniteBiPredicate<UUID, Collection<org.apache.ignite.cache.query.GridCacheContinuousQueryEntry<K, V>>> { + IgniteBiPredicate<UUID, Collection<CacheContinuousQueryEntry<K, V>>> { /** */ private final IgniteCacheProxy<K, V> cache; @@ -729,8 +729,8 @@ public class GridCacheContinuousQueryManager<K, V> extends GridCacheManagerAdapt /** {@inheritDoc} */ @SuppressWarnings("unchecked") @Override public boolean apply(UUID uuid, - Collection<org.apache.ignite.cache.query.GridCacheContinuousQueryEntry<K, V>> entries) { - for (org.apache.ignite.cache.query.GridCacheContinuousQueryEntry entry : entries) { + Collection<CacheContinuousQueryEntry<K, V>> entries) { + for (CacheContinuousQueryEntry entry : entries) { try { EventType evtType = (((GridCacheContinuousQueryEntry)entry).eventType()); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/cafee25f/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/query/jdbc/GridCacheQueryJdbcMetadataTask.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/query/jdbc/GridCacheQueryJdbcMetadataTask.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/query/jdbc/GridCacheQueryJdbcMetadataTask.java index 64fc88e..38df988 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/query/jdbc/GridCacheQueryJdbcMetadataTask.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/query/jdbc/GridCacheQueryJdbcMetadataTask.java @@ -104,7 +104,7 @@ public class GridCacheQueryJdbcMetadataTask extends ComputeTaskAdapter<String, b byte[] data; try { - GridCache<?, ?> cache = ((GridEx) ignite).cachex(cacheName); + Cache<?, ?> cache = ((GridEx) ignite).cachex(cacheName); assert cache != null; http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/cafee25f/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/query/jdbc/GridCacheQueryJdbcTask.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/query/jdbc/GridCacheQueryJdbcTask.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/query/jdbc/GridCacheQueryJdbcTask.java index 97b4d63..40cd03e 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/query/jdbc/GridCacheQueryJdbcTask.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/query/jdbc/GridCacheQueryJdbcTask.java @@ -180,7 +180,7 @@ public class GridCacheQueryJdbcTask extends ComputeTaskAdapter<byte[], byte[]> { assert pageSize != null; assert maxRows != null; - GridTuple4<GridCacheQueryFuture<List<?>>, Integer, Boolean, Collection<String>> t = null; + GridTuple4<CacheQueryFuture<List<?>>, Integer, Boolean, Collection<String>> t = null; Collection<String> tbls = null; Collection<String> cols; @@ -192,9 +192,9 @@ public class GridCacheQueryJdbcTask extends ComputeTaskAdapter<byte[], byte[]> { assert args != null; assert futId == null; - GridCache<?, ?> cache = ((GridEx) ignite).cachex(cacheName); + Cache<?, ?> cache = ((GridEx) ignite).cachex(cacheName); - GridCacheQuery<List<?>> qry = + CacheQuery<List<?>> qry = ((GridCacheQueriesEx<?, ?>)cache.queries()).createSqlFieldsQuery(sql, true); qry.pageSize(pageSize); @@ -204,7 +204,7 @@ public class GridCacheQueryJdbcTask extends ComputeTaskAdapter<byte[], byte[]> { if (cache.configuration().getCacheMode() != PARTITIONED) qry = qry.projection(ignite.cluster().forLocal()); - GridCacheQueryFuture<List<?>> fut = qry.execute(args.toArray()); + CacheQueryFuture<List<?>> fut = qry.execute(args.toArray()); Collection<GridQueryFieldMetadata> meta = ((GridCacheQueryMetadataAware)fut).metadata().get(); @@ -243,7 +243,7 @@ public class GridCacheQueryJdbcTask extends ComputeTaskAdapter<byte[], byte[]> { assert futId != null; if (t == null) - t = ignite.cluster().<UUID, GridTuple4<GridCacheQueryFuture<List<?>>, Integer, Boolean, + t = ignite.cluster().<UUID, GridTuple4<CacheQueryFuture<List<?>>, Integer, Boolean, Collection<String>>>nodeLocalMap().get(futId); assert t != null; @@ -252,7 +252,7 @@ public class GridCacheQueryJdbcTask extends ComputeTaskAdapter<byte[], byte[]> { Collection<List<Object>> fields = new LinkedList<>(); - GridCacheQueryFuture<List<?>> fut = t.get1(); + CacheQueryFuture<List<?>> fut = t.get1(); int pageCnt = 0; int totalCnt = t.get2(); @@ -289,8 +289,8 @@ public class GridCacheQueryJdbcTask extends ComputeTaskAdapter<byte[], byte[]> { private void scheduleRemoval(final UUID id) { SCHEDULER.schedule(new CAX() { @Override public void applyx() { - GridTuple3<GridCacheQueryFuture<List<?>>, Integer, Boolean> t = - ignite.cluster().<UUID, GridTuple3<GridCacheQueryFuture<List<?>>, Integer, Boolean>>nodeLocalMap().get(id); + GridTuple3<CacheQueryFuture<List<?>>, Integer, Boolean> t = + ignite.cluster().<UUID, GridTuple3<CacheQueryFuture<List<?>>, Integer, Boolean>>nodeLocalMap().get(id); if (t != null) { // If future was accessed since last scheduling, http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/cafee25f/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/transactions/IgniteTransactionsImpl.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/transactions/IgniteTransactionsImpl.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/transactions/IgniteTransactionsImpl.java index c756115..31008ca 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/transactions/IgniteTransactionsImpl.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/transactions/IgniteTransactionsImpl.java @@ -29,7 +29,7 @@ import org.jetbrains.annotations.*; import java.util.*; -import static org.apache.ignite.cache.GridCacheFlag.*; +import static org.apache.ignite.cache.CacheFlag.*; import static org.apache.ignite.transactions.IgniteTxIsolation.*; /** http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/cafee25f/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/transactions/IgniteTxEntry.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/transactions/IgniteTxEntry.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/transactions/IgniteTxEntry.java index 9a36b0a..541e214 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/transactions/IgniteTxEntry.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/transactions/IgniteTxEntry.java @@ -101,7 +101,7 @@ public class IgniteTxEntry<K, V> implements GridPeerDeployAware, Externalizable, /** Put filters. */ @GridToStringInclude - private IgnitePredicate<GridCacheEntry<K, V>>[] filters; + private IgnitePredicate<CacheEntry<K, V>>[] filters; /** Flag indicating whether filters passed. Used for fast-commit transactions. */ private boolean filtersPassed; @@ -216,7 +216,7 @@ public class IgniteTxEntry<K, V> implements GridPeerDeployAware, Externalizable, Object[] invokeArgs, long ttl, GridCacheEntryEx<K, V> entry, - IgnitePredicate<GridCacheEntry<K, V>>[] filters, + IgnitePredicate<CacheEntry<K, V>>[] filters, GridCacheVersion drVer) { assert ctx != null; assert tx != null; @@ -724,14 +724,14 @@ public class IgniteTxEntry<K, V> implements GridPeerDeployAware, Externalizable, /** * @return Put filters. */ - public IgnitePredicate<GridCacheEntry<K, V>>[] filters() { + public IgnitePredicate<CacheEntry<K, V>>[] filters() { return filters; } /** * @param filters Put filters. */ - public void filters(IgnitePredicate<GridCacheEntry<K, V>>[] filters) { + public void filters(IgnitePredicate<CacheEntry<K, V>>[] filters) { filterBytes = null; this.filters = filters; http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/cafee25f/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/transactions/IgniteTxEx.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/transactions/IgniteTxEx.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/transactions/IgniteTxEx.java index 4250d0c..321cd44 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/transactions/IgniteTxEx.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/transactions/IgniteTxEx.java @@ -340,7 +340,7 @@ public interface IgniteTxEx<K, V> extends IgniteTx, GridTimeoutObject { GridCacheContext<K, V> ctx, boolean failFast, K key, - @Nullable IgnitePredicate<GridCacheEntry<K, V>>[] filter) throws GridCacheFilterFailedException; + @Nullable IgnitePredicate<CacheEntry<K, V>>[] filter) throws GridCacheFilterFailedException; /** * @return Start version. http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/cafee25f/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 f0dc22f..0ff9627 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 @@ -285,7 +285,7 @@ public abstract class IgniteTxLocalAdapter<K, V> extends IgniteTxAdapter<K, V> GridCacheContext<K, V> cacheCtx, boolean failFast, K key, - IgnitePredicate<GridCacheEntry<K, V>>[] filter + IgnitePredicate<CacheEntry<K, V>>[] filter ) throws GridCacheFilterFailedException { IgniteTxEntry<K, V> e = txMap == null ? null : txMap.get(cacheCtx.txKey(key)); @@ -1049,7 +1049,7 @@ public abstract class IgniteTxLocalAdapter<K, V> extends IgniteTxAdapter<K, V> Map<K, GridCacheVersion> missed, int keysCnt, boolean deserializePortable, - IgnitePredicate<GridCacheEntry<K, V>>[] filter) throws IgniteCheckedException { + IgnitePredicate<CacheEntry<K, V>>[] filter) throws IgniteCheckedException { assert !F.isEmpty(keys); assert keysCnt == keys.size(); assert cached == null || F.first(keys).equals(cached.key()); @@ -1323,7 +1323,7 @@ public abstract class IgniteTxLocalAdapter<K, V> extends IgniteTxAdapter<K, V> final Map<K, GridCacheVersion> missedMap, @Nullable final Collection<K> redos, final boolean deserializePortable, - final IgnitePredicate<GridCacheEntry<K, V>>[] filter + final IgnitePredicate<CacheEntry<K, V>>[] filter ) { assert redos != null || pessimistic(); @@ -1507,7 +1507,7 @@ public abstract class IgniteTxLocalAdapter<K, V> extends IgniteTxAdapter<K, V> Collection<? extends K> keys, @Nullable GridCacheEntryEx<K, V> cached, final boolean deserializePortable, - final IgnitePredicate<GridCacheEntry<K, V>>[] filter) { + final IgnitePredicate<CacheEntry<K, V>>[] filter) { if (F.isEmpty(keys)) return new GridFinishedFuture<>(cctx.kernalContext(), Collections.<K, V>emptyMap()); @@ -1760,7 +1760,7 @@ public abstract class IgniteTxLocalAdapter<K, V> extends IgniteTxAdapter<K, V> boolean retval, @Nullable GridCacheEntryEx<K, V> cached, long ttl, - IgnitePredicate<GridCacheEntry<K, V>>[] filter + IgnitePredicate<CacheEntry<K, V>>[] filter ) { return (IgniteFuture<GridCacheReturn<V>>)putAllAsync0(cacheCtx, map, @@ -1821,7 +1821,7 @@ public abstract class IgniteTxLocalAdapter<K, V> extends IgniteTxAdapter<K, V> * @throws IgniteCheckedException If failed. */ private boolean filter(GridCacheEntryEx<K, V> cached, - IgnitePredicate<GridCacheEntry<K, V>>[] filter) throws IgniteCheckedException { + IgnitePredicate<CacheEntry<K, V>>[] filter) throws IgniteCheckedException { return pessimistic() || cached.context().isAll(cached, filter); } @@ -1856,7 +1856,7 @@ public abstract class IgniteTxLocalAdapter<K, V> extends IgniteTxAdapter<K, V> @Nullable Object[] invokeArgs, boolean retval, boolean lockOnly, - IgnitePredicate<GridCacheEntry<K, V>>[] filter, + IgnitePredicate<CacheEntry<K, V>>[] filter, final GridCacheReturn<V> ret, Collection<K> enlisted, @Nullable Map<? extends K, GridCacheDrInfo<V>> drPutMap, @@ -2254,7 +2254,7 @@ public abstract class IgniteTxLocalAdapter<K, V> extends IgniteTxAdapter<K, V> boolean retval, boolean read, long accessTtl, - IgnitePredicate<GridCacheEntry<K, V>>[] filter, + IgnitePredicate<CacheEntry<K, V>>[] filter, boolean computeInvoke ) throws IgniteCheckedException { for (K k : keys) { @@ -2429,7 +2429,7 @@ public abstract class IgniteTxLocalAdapter<K, V> extends IgniteTxAdapter<K, V> @Nullable final Map<? extends K, GridCacheDrInfo<V>> drMap, final boolean retval, @Nullable GridCacheEntryEx<K, V> cached, - @Nullable final IgnitePredicate<GridCacheEntry<K, V>>[] filter) { + @Nullable final IgnitePredicate<CacheEntry<K, V>>[] filter) { assert filter == null || invokeMap == null; cacheCtx.checkSecurity(GridSecurityPermission.CACHE_PUT); @@ -2639,7 +2639,7 @@ public abstract class IgniteTxLocalAdapter<K, V> extends IgniteTxAdapter<K, V> Collection<? extends K> keys, @Nullable GridCacheEntryEx<K, V> cached, boolean retval, - IgnitePredicate<GridCacheEntry<K, V>>[] filter + IgnitePredicate<CacheEntry<K, V>>[] filter ) { return removeAllAsync0(cacheCtx, keys, null, cached, retval, filter); } @@ -2659,7 +2659,7 @@ public abstract class IgniteTxLocalAdapter<K, V> extends IgniteTxAdapter<K, V> @Nullable Map<? extends K, GridCacheVersion> drMap, @Nullable GridCacheEntryEx<K, V> cached, final boolean retval, - @Nullable final IgnitePredicate<GridCacheEntry<K, V>>[] filter) { + @Nullable final IgnitePredicate<CacheEntry<K, V>>[] filter) { cacheCtx.checkSecurity(GridSecurityPermission.CACHE_REMOVE); final Collection<? extends K> keys0; @@ -3047,7 +3047,7 @@ public abstract class IgniteTxLocalAdapter<K, V> extends IgniteTxAdapter<K, V> Object[] invokeArgs, GridCacheEntryEx<K, V> entry, @Nullable ExpiryPolicy expiryPlc, - IgnitePredicate<GridCacheEntry<K, V>>[] filter, + IgnitePredicate<CacheEntry<K, V>>[] filter, boolean filtersSet, long drTtl, long drExpireTime, http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/cafee25f/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/transactions/IgniteTxLocalEx.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/transactions/IgniteTxLocalEx.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/transactions/IgniteTxLocalEx.java index bcb85cc..22bf372 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/transactions/IgniteTxLocalEx.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/transactions/IgniteTxLocalEx.java @@ -75,7 +75,7 @@ public interface IgniteTxLocalEx<K, V> extends IgniteTxEx<K, V> { Collection<? extends K> keys, @Nullable GridCacheEntryEx<K, V> cached, boolean deserializePortable, - IgnitePredicate<GridCacheEntry<K, V>>[] filter); + IgnitePredicate<CacheEntry<K, V>>[] filter); /** * @param cacheCtx Cache context. @@ -92,7 +92,7 @@ public interface IgniteTxLocalEx<K, V> extends IgniteTxEx<K, V> { boolean retval, @Nullable GridCacheEntryEx<K, V> cached, long ttl, - IgnitePredicate<GridCacheEntry<K, V>>[] filter); + IgnitePredicate<CacheEntry<K, V>>[] filter); /** * @param cacheCtx Cache context. @@ -118,7 +118,7 @@ public interface IgniteTxLocalEx<K, V> extends IgniteTxEx<K, V> { Collection<? extends K> keys, @Nullable GridCacheEntryEx<K, V> cached, boolean retval, - IgnitePredicate<GridCacheEntry<K, V>>[] filter); + IgnitePredicate<CacheEntry<K, V>>[] filter); /** * @param cacheCtx Cache context. http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/cafee25f/modules/core/src/main/java/org/apache/ignite/internal/processors/closure/GridClosureProcessor.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/closure/GridClosureProcessor.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/closure/GridClosureProcessor.java index 308316d..a5324b8 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/closure/GridClosureProcessor.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/closure/GridClosureProcessor.java @@ -1046,11 +1046,11 @@ public class GridClosureProcessor extends GridProcessorAdapter { if (c instanceof ComputeJobMasterLeaveAware) { return new GridMasterLeaveAwareComputeJobAdapter() { /** */ - @GridCacheName + @CacheName private final String cn = cacheName; /** */ - @GridCacheAffinityKeyMapped + @CacheAffinityKeyMapped private final Object ak = affKey; @Override public Object execute() { @@ -1070,11 +1070,11 @@ public class GridClosureProcessor extends GridProcessorAdapter { else { return new ComputeJobAdapter() { /** */ - @GridCacheName + @CacheName private final String cn = cacheName; /** */ - @GridCacheAffinityKeyMapped + @CacheAffinityKeyMapped private final Object ak = affKey; @Override public Object execute() { @@ -1138,11 +1138,11 @@ public class GridClosureProcessor extends GridProcessorAdapter { if (r instanceof ComputeJobMasterLeaveAware) { return new GridMasterLeaveAwareComputeJobAdapter() { /** */ - @GridCacheName + @CacheName private final String cn = cacheName; /** */ - @GridCacheAffinityKeyMapped + @CacheAffinityKeyMapped private final Object ak = affKey; @Nullable @Override public Object execute() { @@ -1159,11 +1159,11 @@ public class GridClosureProcessor extends GridProcessorAdapter { else { return new ComputeJobAdapter() { /** */ - @GridCacheName + @CacheName private final String cn = cacheName; /** */ - @GridCacheAffinityKeyMapped + @CacheAffinityKeyMapped private final Object ak = affKey; @Nullable @Override public Object execute() { http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/cafee25f/modules/core/src/main/java/org/apache/ignite/internal/processors/dataload/GridDataLoadCacheUpdaters.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/dataload/GridDataLoadCacheUpdaters.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/dataload/GridDataLoadCacheUpdaters.java index 6130f2c..8217e8d 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/dataload/GridDataLoadCacheUpdaters.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/dataload/GridDataLoadCacheUpdaters.java @@ -49,8 +49,8 @@ public class GridDataLoadCacheUpdaters { private static final IgniteDataLoadCacheUpdater GROUP_LOCKED = new GroupLocked(); /** - * Updates cache using independent {@link org.apache.ignite.cache.GridCache#put(Object, Object, org.apache.ignite.lang.IgnitePredicate[])} and - * {@link org.apache.ignite.cache.GridCache#remove(Object, org.apache.ignite.lang.IgnitePredicate[])} operations. Thus it is safe from deadlocks but performance + * Updates cache using independent {@link org.apache.ignite.cache.Cache#put(Object, Object, org.apache.ignite.lang.IgnitePredicate[])} and + * {@link org.apache.ignite.cache.Cache#remove(Object, org.apache.ignite.lang.IgnitePredicate[])} operations. Thus it is safe from deadlocks but performance * is not the best. * * @return Single updater. @@ -60,8 +60,8 @@ public class GridDataLoadCacheUpdaters { } /** - * Updates cache using batched methods {@link org.apache.ignite.cache.GridCache#putAll(Map, org.apache.ignite.lang.IgnitePredicate[])} and - * {@link org.apache.ignite.cache.GridCache#removeAll(Collection, org.apache.ignite.lang.IgnitePredicate[])}. Can cause deadlocks if the same keys are getting + * Updates cache using batched methods {@link org.apache.ignite.cache.Cache#putAll(Map, org.apache.ignite.lang.IgnitePredicate[])} and + * {@link org.apache.ignite.cache.Cache#removeAll(Collection, org.apache.ignite.lang.IgnitePredicate[])}. Can cause deadlocks if the same keys are getting * updated concurrently. Performance is generally better than in {@link #individual()}. * * @return Batched updater. @@ -71,8 +71,8 @@ public class GridDataLoadCacheUpdaters { } /** - * Updates cache using batched methods {@link org.apache.ignite.cache.GridCache#putAll(Map, org.apache.ignite.lang.IgnitePredicate[])} and - * {@link org.apache.ignite.cache.GridCache#removeAll(Collection, org.apache.ignite.lang.IgnitePredicate[])}. Keys are sorted in natural order and if all updates + * Updates cache using batched methods {@link org.apache.ignite.cache.Cache#putAll(Map, org.apache.ignite.lang.IgnitePredicate[])} and + * {@link org.apache.ignite.cache.Cache#removeAll(Collection, org.apache.ignite.lang.IgnitePredicate[])}. Keys are sorted in natural order and if all updates * use the same rule deadlock can not happen. Performance is generally better than in {@link #individual()}. * * @return Batched sorted updater. @@ -82,8 +82,8 @@ public class GridDataLoadCacheUpdaters { } /** - * Updates cache using batched methods {@link org.apache.ignite.cache.GridCache#putAll(Map, org.apache.ignite.lang.IgnitePredicate[])} and - * {@link org.apache.ignite.cache.GridCache#removeAll(Collection, org.apache.ignite.lang.IgnitePredicate[])} in group lock transaction. Requires that there are no + * Updates cache using batched methods {@link org.apache.ignite.cache.Cache#putAll(Map, org.apache.ignite.lang.IgnitePredicate[])} and + * {@link org.apache.ignite.cache.Cache#removeAll(Collection, org.apache.ignite.lang.IgnitePredicate[])} in group lock transaction. Requires that there are no * concurrent updates other than in group lock. * * @return Updater with group lock. @@ -245,7 +245,7 @@ public class GridDataLoadCacheUpdaters { Ignite ignite = cache.unwrap(Ignite.class); - GridCacheAffinity<K> aff = ignite.<K, V>cache(cache.getName()).affinity(); + CacheAffinity<K> aff = ignite.<K, V>cache(cache.getName()).affinity(); for (Map.Entry<K, V> entry : entries) { K key = entry.getKey();
