http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/ddc9178a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/query/CacheQueriesProxy.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/query/CacheQueriesProxy.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/query/CacheQueriesProxy.java index a04f9e1..68b7643 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/query/CacheQueriesProxy.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/query/CacheQueriesProxy.java @@ -37,7 +37,7 @@ public class CacheQueriesProxy<K, V> implements CacheQueries<K, V>, Externalizab private GridCacheGateway<K, V> gate; /** */ - private GridCacheProjectionImpl<K, V> prj; + private CacheProjectionContext<K, V> prj; /** */ private CacheQueries<K, V> delegate; @@ -56,7 +56,7 @@ public class CacheQueriesProxy<K, V> implements CacheQueries<K, V>, Externalizab * @param prj Optional cache projection. * @param delegate Delegate object. */ - public CacheQueriesProxy(GridCacheContext<K, V> cctx, @Nullable GridCacheProjectionImpl<K, V> prj, + public CacheQueriesProxy(GridCacheContext<K, V> cctx, @Nullable CacheProjectionContext<K, V> prj, CacheQueries<K, V> delegate) { assert cctx != null; assert delegate != null; @@ -78,7 +78,7 @@ public class CacheQueriesProxy<K, V> implements CacheQueries<K, V>, Externalizab /** {@inheritDoc} */ @Override public CacheQuery<List<?>> createSqlFieldsQuery(String qry) { - GridCacheProjectionImpl<K, V> prev = gate.enter(prj); + CacheProjectionContext<K, V> prev = gate.enter(prj); try { return delegate.createSqlFieldsQuery(qry); @@ -90,7 +90,7 @@ public class CacheQueriesProxy<K, V> implements CacheQueries<K, V>, Externalizab /** {@inheritDoc} */ @Override public CacheQuery<Map.Entry<K, V>> createFullTextQuery(String clsName, String search) { - GridCacheProjectionImpl<K, V> prev = gate.enter(prj); + CacheProjectionContext<K, V> prev = gate.enter(prj); try { return delegate.createFullTextQuery(clsName, search); @@ -102,7 +102,7 @@ public class CacheQueriesProxy<K, V> implements CacheQueries<K, V>, Externalizab /** {@inheritDoc} */ @Override public CacheQuery<Map.Entry<K, V>> createScanQuery(@Nullable IgniteBiPredicate<K, V> filter) { - GridCacheProjectionImpl<K, V> prev = gate.enter(prj); + CacheProjectionContext<K, V> prev = gate.enter(prj); try { return delegate.createScanQuery(filter); @@ -114,7 +114,7 @@ public class CacheQueriesProxy<K, V> implements CacheQueries<K, V>, Externalizab /** {@inheritDoc} */ @Override public <R> CacheQuery<R> createSpiQuery() { - GridCacheProjectionImpl<K, V> prev = gate.enter(prj); + CacheProjectionContext<K, V> prev = gate.enter(prj); try { return delegate.createSpiQuery(); @@ -126,7 +126,7 @@ public class CacheQueriesProxy<K, V> implements CacheQueries<K, V>, Externalizab /** {@inheritDoc} */ @Override public QueryCursor<List<?>> execute(String space, GridCacheTwoStepQuery qry) { - GridCacheProjectionImpl<K, V> prev = gate.enter(prj); + CacheProjectionContext<K, V> prev = gate.enter(prj); try { return delegate.execute(space, qry); @@ -138,7 +138,7 @@ public class CacheQueriesProxy<K, V> implements CacheQueries<K, V>, Externalizab /** {@inheritDoc} */ @Override public QueryCursor<List<?>> executeTwoStepQuery(String space, String sqlQry, Object[] params) { - GridCacheProjectionImpl<K, V> prev = gate.enter(prj); + CacheProjectionContext<K, V> prev = gate.enter(prj); try { return delegate.executeTwoStepQuery(space, sqlQry, params); @@ -150,7 +150,7 @@ public class CacheQueriesProxy<K, V> implements CacheQueries<K, V>, Externalizab /** {@inheritDoc} */ @Override public QueryMetrics metrics() { - GridCacheProjectionImpl<K, V> prev = gate.enter(prj); + CacheProjectionContext<K, V> prev = gate.enter(prj); try { return delegate.metrics(); @@ -162,7 +162,7 @@ public class CacheQueriesProxy<K, V> implements CacheQueries<K, V>, Externalizab /** {@inheritDoc} */ @Override public Collection<GridCacheSqlMetadata> sqlMetadata() throws IgniteCheckedException { - GridCacheProjectionImpl<K, V> prev = gate.enter(prj); + CacheProjectionContext<K, V> prev = gate.enter(prj); try { return delegate.sqlMetadata(); @@ -174,7 +174,7 @@ public class CacheQueriesProxy<K, V> implements CacheQueries<K, V>, Externalizab /** {@inheritDoc} */ @Override public CacheQuery<List<?>> createSqlFieldsQuery(String qry, boolean incMeta) { - GridCacheProjectionImpl<K, V> prev = gate.enter(prj); + CacheProjectionContext<K, V> prev = gate.enter(prj); try { return delegate.createSqlFieldsQuery(qry, incMeta); @@ -192,7 +192,7 @@ public class CacheQueriesProxy<K, V> implements CacheQueries<K, V>, Externalizab /** {@inheritDoc} */ @Override public void readExternal(ObjectInput in) throws IOException, ClassNotFoundException { - prj = (GridCacheProjectionImpl<K, V>)in.readObject(); + prj = (CacheProjectionContext<K, V>)in.readObject(); delegate = (CacheQueries<K, V>)in.readObject(); gate = prj.context().gate();
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/ddc9178a/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 3d7f004..8f2a19f 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 @@ -1614,7 +1614,7 @@ public abstract class IgniteTxLocalAdapter extends IgniteTxAdapter final Map<KeyCacheObject, GridCacheVersion> missed = new GridLeanMap<>(pessimistic() ? keysCnt : 0); - GridCacheProjectionImpl prj = cacheCtx.projectionPerCall(); + CacheProjectionContext prj = cacheCtx.projectionPerCall(); ExpiryPolicy expiryPlc = prj != null ? prj.expiry() : null; @@ -2583,7 +2583,7 @@ public abstract class IgniteTxLocalAdapter extends IgniteTxAdapter Collection<KeyCacheObject> enlisted = new ArrayList<>(); - GridCacheProjectionImpl<K, V> prj = cacheCtx.projectionPerCall(); + CacheProjectionContext<K, V> prj = cacheCtx.projectionPerCall(); final IgniteInternalFuture<Set<KeyCacheObject>> loadFut = enlistWrite( cacheCtx, @@ -2794,7 +2794,7 @@ public abstract class IgniteTxLocalAdapter extends IgniteTxAdapter ExpiryPolicy plc; if (!F.isEmpty(filter)) { - GridCacheProjectionImpl<K, V> prj = cacheCtx.projectionPerCall(); + CacheProjectionContext<K, V> prj = cacheCtx.projectionPerCall(); plc = prj != null ? prj.expiry() : null; } @@ -2939,7 +2939,7 @@ public abstract class IgniteTxLocalAdapter extends IgniteTxAdapter * @return {@code True} if portables should be deserialized, {@code false} otherwise. */ private boolean deserializePortables(GridCacheContext cacheCtx) { - GridCacheProjectionImpl prj = cacheCtx.projectionPerCall(); + CacheProjectionContext prj = cacheCtx.projectionPerCall(); return prj == null || prj.deserializePortables(); }
