http://git-wip-us.apache.org/repos/asf/ignite/blob/10b83fb8/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridDhtAtomicCache.java ---------------------------------------------------------------------- diff --git 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 index d5e849e..481317a 100644 --- 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 @@ -321,7 +321,7 @@ public class GridDhtAtomicCache<K, V> extends GridDhtCacheAdapter<K, V> { final boolean skipTx, @Nullable UUID subjId, final String taskName, - final boolean deserializePortable, + final boolean deserializeBinary, final boolean skipVals, final boolean canRemap) { ctx.checkSecurity(SecurityPermission.CACHE_READ); @@ -345,7 +345,7 @@ public class GridDhtAtomicCache<K, V> extends GridDhtCacheAdapter<K, V> { forcePrimary, subjId0, taskName, - deserializePortable, + deserializeBinary, expiryPlc, skipVals, skipStore, @@ -361,7 +361,7 @@ public class GridDhtAtomicCache<K, V> extends GridDhtCacheAdapter<K, V> { boolean skipTx, @Nullable UUID subjId, final String taskName, - final boolean deserializePortable, + final boolean deserializeBinary, final boolean skipVals, final boolean canRemap ) { @@ -389,7 +389,7 @@ public class GridDhtAtomicCache<K, V> extends GridDhtCacheAdapter<K, V> { forcePrimary, subjId0, taskName, - deserializePortable, + deserializeBinary, expiryPlc, skipVals, skipStore, @@ -779,7 +779,7 @@ public class GridDhtAtomicCache<K, V> extends GridDhtCacheAdapter<K, V> { CacheInvokeResult invokeRes = (CacheInvokeResult)res; if (invokeRes.result() != null) - res = CacheInvokeResult.fromResult((T)ctx.unwrapPortableIfNeeded(invokeRes.result(), + res = CacheInvokeResult.fromResult((T)ctx.unwrapBinaryIfNeeded(invokeRes.result(), keepBinary, false)); } @@ -1004,7 +1004,7 @@ public class GridDhtAtomicCache<K, V> extends GridDhtCacheAdapter<K, V> { * @param forcePrimary Force primary flag. * @param subjId Subject ID. * @param taskName Task name. - * @param deserializePortable Deserialize portable flag. + * @param deserializeBinary Deserialize binary flag. * @param expiryPlc Expiry policy. * @param skipVals Skip values flag. * @param skipStore Skip store flag. @@ -1015,7 +1015,7 @@ public class GridDhtAtomicCache<K, V> extends GridDhtCacheAdapter<K, V> { boolean forcePrimary, UUID subjId, String taskName, - boolean deserializePortable, + boolean deserializeBinary, @Nullable ExpiryPolicy expiryPlc, boolean skipVals, boolean skipStore, @@ -1033,7 +1033,7 @@ public class GridDhtAtomicCache<K, V> extends GridDhtCacheAdapter<K, V> { forcePrimary, subjId, taskName, - deserializePortable, + deserializeBinary, expiry, skipVals, canRemap, @@ -1052,7 +1052,7 @@ public class GridDhtAtomicCache<K, V> extends GridDhtCacheAdapter<K, V> { * @param forcePrimary Force primary flag. * @param subjId Subject ID. * @param taskName Task name. - * @param deserializePortable Deserialize portable flag. + * @param deserializeBinary Deserialize binary flag. * @param expiryPlc Expiry policy. * @param skipVals Skip values flag. * @param skipStore Skip store flag. @@ -1062,7 +1062,7 @@ public class GridDhtAtomicCache<K, V> extends GridDhtCacheAdapter<K, V> { boolean forcePrimary, UUID subjId, String taskName, - boolean deserializePortable, + boolean deserializeBinary, @Nullable ExpiryPolicy expiryPlc, boolean skipVals, boolean skipStore, @@ -1103,7 +1103,7 @@ public class GridDhtAtomicCache<K, V> extends GridDhtCacheAdapter<K, V> { null, taskName, expiry, - !deserializePortable); + !deserializeBinary); // Entry was not in memory or in swap, so we remove it from cache. if (v == null) { @@ -1115,7 +1115,7 @@ public class GridDhtAtomicCache<K, V> extends GridDhtCacheAdapter<K, V> { success = false; } else - ctx.addResult(locVals, key, v, skipVals, false, deserializePortable, true); + ctx.addResult(locVals, key, v, skipVals, false, deserializeBinary, true); } else success = false; @@ -1163,7 +1163,7 @@ public class GridDhtAtomicCache<K, V> extends GridDhtCacheAdapter<K, V> { forcePrimary, subjId, taskName, - deserializePortable, + deserializeBinary, expiry, skipVals, canRemap,
http://git-wip-us.apache.org/repos/asf/ignite/blob/10b83fb8/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridDhtAtomicUpdateRequest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridDhtAtomicUpdateRequest.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridDhtAtomicUpdateRequest.java index 4f15fa1..1f4cb6a 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridDhtAtomicUpdateRequest.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridDhtAtomicUpdateRequest.java @@ -157,7 +157,7 @@ public class GridDhtAtomicUpdateRequest extends GridCacheMessage implements Grid @GridDirectTransient private List<CacheObject> localPrevVals; - /** Keep portable flag. */ + /** Keep binary flag. */ private boolean keepBinary; /** @@ -486,7 +486,7 @@ public class GridDhtAtomicUpdateRequest extends GridCacheMessage implements Grid } /** - * @return Keep portable flag. + * @return Keep binary flag. */ public boolean keepBinary() { return keepBinary; http://git-wip-us.apache.org/repos/asf/ignite/blob/10b83fb8/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridNearAtomicUpdateFuture.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridNearAtomicUpdateFuture.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridNearAtomicUpdateFuture.java index 513e6e8..ba3d546 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridNearAtomicUpdateFuture.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridNearAtomicUpdateFuture.java @@ -325,7 +325,7 @@ public class GridNearAtomicUpdateFuture extends GridFutureAdapter<Object> Object retval = res == null ? null : rawRetval ? ret : (this.retval || op == TRANSFORM) ? - cctx.unwrapPortableIfNeeded(ret.value(), keepBinary) : ret.success(); + cctx.unwrapBinaryIfNeeded(ret.value(), keepBinary) : ret.success(); if (op == TRANSFORM && retval == null) retval = Collections.emptyMap(); @@ -1191,7 +1191,7 @@ public class GridNearAtomicUpdateFuture extends GridFutureAdapter<Object> Collection<Object> keys = new ArrayList<>(failedKeys.size()); for (KeyCacheObject key : failedKeys) - keys.add(cctx.cacheObjectContext().unwrapPortableIfNeeded(key, keepBinary, false)); + keys.add(cctx.cacheObjectContext().unwrapBinaryIfNeeded(key, keepBinary, false)); err0.add(keys, err, topVer); } http://git-wip-us.apache.org/repos/asf/ignite/blob/10b83fb8/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridNearAtomicUpdateRequest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridNearAtomicUpdateRequest.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridNearAtomicUpdateRequest.java index b7100dd..c24ad34 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridNearAtomicUpdateRequest.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridNearAtomicUpdateRequest.java @@ -151,7 +151,7 @@ public class GridNearAtomicUpdateRequest extends GridCacheMessage implements Gri /** */ private boolean clientReq; - /** Keep portable flag. */ + /** Keep binary flag. */ private boolean keepBinary; /** @@ -341,7 +341,7 @@ public class GridNearAtomicUpdateRequest extends GridCacheMessage implements Gri } /** - * @return Keep portable flag. + * @return Keep binary flag. */ public boolean keepBinary() { return keepBinary; http://git-wip-us.apache.org/repos/asf/ignite/blob/10b83fb8/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/colocated/GridDhtColocatedCache.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/colocated/GridDhtColocatedCache.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/colocated/GridDhtColocatedCache.java index 19fefdb..073043d 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/colocated/GridDhtColocatedCache.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/colocated/GridDhtColocatedCache.java @@ -198,7 +198,7 @@ public class GridDhtColocatedCache<K, V> extends GridDhtTransactionalCacheAdapte boolean skipTx, @Nullable UUID subjId, String taskName, - final boolean deserializePortable, + final boolean deserializeBinary, final boolean skipVals, boolean canRemap) { ctx.checkSecurity(SecurityPermission.CACHE_READ); @@ -215,7 +215,7 @@ public class GridDhtColocatedCache<K, V> extends GridDhtTransactionalCacheAdapte @Override public IgniteInternalFuture<V> op(IgniteTxLocalAdapter tx) { IgniteInternalFuture<Map<Object, Object>> fut = tx.getAllAsync(ctx, Collections.singleton(ctx.toCacheKeyObject(key)), - deserializePortable, + deserializeBinary, skipVals, false, opCtx != null && opCtx.skipStore()); @@ -254,7 +254,7 @@ public class GridDhtColocatedCache<K, V> extends GridDhtTransactionalCacheAdapte forcePrimary, subjId, taskName, - deserializePortable, + deserializeBinary, skipVals ? null : expiryPolicy(opCtx != null ? opCtx.expiry() : null), skipVals, canRemap, @@ -273,7 +273,7 @@ public class GridDhtColocatedCache<K, V> extends GridDhtTransactionalCacheAdapte boolean skipTx, @Nullable UUID subjId, String taskName, - final boolean deserializePortable, + final boolean deserializeBinary, final boolean skipVals, boolean canRemap ) { @@ -294,7 +294,7 @@ public class GridDhtColocatedCache<K, V> extends GridDhtTransactionalCacheAdapte @Override public IgniteInternalFuture<Map<K, V>> op(IgniteTxLocalAdapter tx) { return tx.getAllAsync(ctx, ctx.cacheKeysView(keys), - deserializePortable, + deserializeBinary, skipVals, false, opCtx != null && opCtx.skipStore()); @@ -315,7 +315,7 @@ public class GridDhtColocatedCache<K, V> extends GridDhtTransactionalCacheAdapte topVer, subjId, taskName, - deserializePortable, + deserializeBinary, skipVals ? null : expiryPolicy(opCtx != null ? opCtx.expiry() : null), skipVals, canRemap); @@ -341,7 +341,7 @@ public class GridDhtColocatedCache<K, V> extends GridDhtTransactionalCacheAdapte * @param topVer Topology version. * @param subjId Subject ID. * @param taskName Task name. - * @param deserializePortable Deserialize portable flag. + * @param deserializeBinary Deserialize binary flag. * @param expiryPlc Expiry policy. * @param skipVals Skip values flag. * @param canRemap Can remap flag. @@ -354,7 +354,7 @@ public class GridDhtColocatedCache<K, V> extends GridDhtTransactionalCacheAdapte AffinityTopologyVersion topVer, @Nullable UUID subjId, String taskName, - boolean deserializePortable, + boolean deserializeBinary, @Nullable IgniteCacheExpiryPolicy expiryPlc, boolean skipVals, boolean canRemap) { @@ -363,7 +363,7 @@ public class GridDhtColocatedCache<K, V> extends GridDhtTransactionalCacheAdapte forcePrimary, topVer, subjId, taskName, - deserializePortable, + deserializeBinary, expiryPlc, skipVals, canRemap, @@ -378,7 +378,7 @@ public class GridDhtColocatedCache<K, V> extends GridDhtTransactionalCacheAdapte * @param topVer Topology version. * @param subjId Subject ID. * @param taskName Task name. - * @param deserializePortable Deserialize portable flag. + * @param deserializeBinary Deserialize binary flag. * @param expiryPlc Expiry policy. * @param skipVals Skip values flag. * @param canRemap Flag indicating whether future can be remapped on a newer topology version. @@ -393,7 +393,7 @@ public class GridDhtColocatedCache<K, V> extends GridDhtTransactionalCacheAdapte AffinityTopologyVersion topVer, @Nullable UUID subjId, String taskName, - boolean deserializePortable, + boolean deserializeBinary, @Nullable IgniteCacheExpiryPolicy expiryPlc, boolean skipVals, boolean canRemap, @@ -407,7 +407,7 @@ public class GridDhtColocatedCache<K, V> extends GridDhtTransactionalCacheAdapte forcePrimary, subjId, taskName, - deserializePortable, + deserializeBinary, expiryPlc, skipVals, canRemap, @@ -426,7 +426,7 @@ public class GridDhtColocatedCache<K, V> extends GridDhtTransactionalCacheAdapte * @param topVer Topology version. * @param subjId Subject ID. * @param taskName Task name. - * @param deserializePortable Deserialize portable flag. + * @param deserializeBinary Deserialize binary flag. * @param expiryPlc Expiry policy. * @param skipVals Skip values flag. * @param canRemap Flag indicating whether future can be remapped on a newer topology version. @@ -441,7 +441,7 @@ public class GridDhtColocatedCache<K, V> extends GridDhtTransactionalCacheAdapte AffinityTopologyVersion topVer, @Nullable UUID subjId, String taskName, - boolean deserializePortable, + boolean deserializeBinary, @Nullable IgniteCacheExpiryPolicy expiryPlc, boolean skipVals, boolean canRemap, @@ -486,7 +486,7 @@ public class GridDhtColocatedCache<K, V> extends GridDhtTransactionalCacheAdapte null, taskName, expiryPlc, - !deserializePortable); + !deserializeBinary); if (res != null) { v = res.get1(); @@ -506,7 +506,7 @@ public class GridDhtColocatedCache<K, V> extends GridDhtTransactionalCacheAdapte null, taskName, expiryPlc, - !deserializePortable); + !deserializeBinary); } // Entry was not in memory or in swap, so we remove it from cache. @@ -530,7 +530,7 @@ public class GridDhtColocatedCache<K, V> extends GridDhtTransactionalCacheAdapte v, skipVals, keepCacheObj, - deserializePortable, + deserializeBinary, true); } } @@ -582,7 +582,7 @@ public class GridDhtColocatedCache<K, V> extends GridDhtTransactionalCacheAdapte forcePrimary, subjId, taskName, - deserializePortable, + deserializeBinary, expiryPlc, skipVals, canRemap, http://git-wip-us.apache.org/repos/asf/ignite/blob/10b83fb8/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearAtomicCache.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearAtomicCache.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearAtomicCache.java index 49a267a..06898cd 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearAtomicCache.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearAtomicCache.java @@ -225,7 +225,7 @@ public class GridNearAtomicCache<K, V> extends GridNearCacheAdapter<K, V> { @Nullable byte[] valBytes, long ttl, long expireTime, - boolean keepPortable, + boolean keepBinary, UUID nodeId, UUID subjId, String taskName @@ -251,7 +251,7 @@ public class GridNearAtomicCache<K, V> extends GridNearCacheAdapter<K, V> { /*write-through*/false, /*read-through*/false, /*retval*/false, - keepPortable, + keepBinary, /*expiry policy*/null, /*event*/true, /*metrics*/true, @@ -395,7 +395,7 @@ public class GridNearAtomicCache<K, V> extends GridNearCacheAdapter<K, V> { boolean skipTx, @Nullable UUID subjId, String taskName, - boolean deserializePortable, + boolean deserializeBinary, boolean skipVals, boolean canRemap ) { @@ -416,7 +416,7 @@ public class GridNearAtomicCache<K, V> extends GridNearCacheAdapter<K, V> { forcePrimary, subjId, taskName, - deserializePortable, + deserializeBinary, skipVals ? null : opCtx != null ? opCtx.expiry() : null, skipVals, opCtx != null && opCtx.skipStore(), @@ -690,4 +690,4 @@ public class GridNearAtomicCache<K, V> extends GridNearCacheAdapter<K, V> { Thread.currentThread().interrupt(); } } -} \ No newline at end of file +} http://git-wip-us.apache.org/repos/asf/ignite/blob/10b83fb8/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearCacheAdapter.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearCacheAdapter.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearCacheAdapter.java index 27ef996..5bf18d9 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearCacheAdapter.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearCacheAdapter.java @@ -225,7 +225,7 @@ public abstract class GridNearCacheAdapter<K, V> extends GridDistributedCacheAda * @param forcePrimary Force primary flag. * @param subjId Subject ID. * @param taskName Task name. - * @param deserializePortable Deserialize portable flag. + * @param deserializeBinary Deserialize binary flag. * @param expiryPlc Expiry policy. * @param skipVal Skip value flag. * @param skipStore Skip store flag. @@ -237,7 +237,7 @@ public abstract class GridNearCacheAdapter<K, V> extends GridDistributedCacheAda boolean forcePrimary, @Nullable UUID subjId, String taskName, - boolean deserializePortable, + boolean deserializeBinary, @Nullable ExpiryPolicy expiryPlc, boolean skipVal, boolean skipStore, @@ -257,7 +257,7 @@ public abstract class GridNearCacheAdapter<K, V> extends GridDistributedCacheAda txx, subjId, taskName, - deserializePortable, + deserializeBinary, expiry, skipVal, canRemap, @@ -445,9 +445,9 @@ public abstract class GridNearCacheAdapter<K, V> extends GridDistributedCacheAda } /** {@inheritDoc} */ - @Override public V promote(K key, boolean deserializePortable) throws IgniteCheckedException { + @Override public V promote(K key, boolean deserializeBinary) throws IgniteCheckedException { // Unswap only from dht(). Near cache does not have swap storage. - return dht().promote(key, deserializePortable); + return dht().promote(key, deserializeBinary); } /** {@inheritDoc} */ http://git-wip-us.apache.org/repos/asf/ignite/blob/10b83fb8/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearGetFuture.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearGetFuture.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearGetFuture.java index 9705569..cb866e3 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearGetFuture.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearGetFuture.java @@ -91,7 +91,7 @@ public final class GridNearGetFuture<K, V> extends CacheDistributedGetFutureAdap * @param tx Transaction. * @param subjId Subject ID. * @param taskName Task name. - * @param deserializePortable Deserialize portable flag. + * @param deserializeBinary Deserialize binary flag. * @param expiryPlc Expiry policy. * @param skipVals Skip values flag. * @param canRemap Flag indicating whether future can be remapped on a newer topology version. @@ -106,7 +106,7 @@ public final class GridNearGetFuture<K, V> extends CacheDistributedGetFutureAdap @Nullable IgniteTxLocalEx tx, @Nullable UUID subjId, String taskName, - boolean deserializePortable, + boolean deserializeBinary, @Nullable IgniteCacheExpiryPolicy expiryPlc, boolean skipVals, boolean canRemap, @@ -119,7 +119,7 @@ public final class GridNearGetFuture<K, V> extends CacheDistributedGetFutureAdap forcePrimary, subjId, taskName, - deserializePortable, + deserializeBinary, expiryPlc, skipVals, canRemap, @@ -423,7 +423,7 @@ public final class GridNearGetFuture<K, V> extends CacheDistributedGetFutureAdap null, taskName, expiryPlc, - !deserializePortable); + !deserializeBinary); if (res != null) { v = res.get1(); @@ -443,7 +443,7 @@ public final class GridNearGetFuture<K, V> extends CacheDistributedGetFutureAdap null, taskName, expiryPlc, - !deserializePortable); + !deserializeBinary); } } @@ -472,7 +472,7 @@ public final class GridNearGetFuture<K, V> extends CacheDistributedGetFutureAdap null, taskName, expiryPlc, - !deserializePortable); + !deserializeBinary); if (res != null) { v = res.get1(); @@ -492,7 +492,7 @@ public final class GridNearGetFuture<K, V> extends CacheDistributedGetFutureAdap null, taskName, expiryPlc, - !deserializePortable); + !deserializeBinary); } // Entry was not in memory or in swap, so we remove it from cache. @@ -544,9 +544,9 @@ public final class GridNearGetFuture<K, V> extends CacheDistributedGetFutureAdap add(new GridFinishedFuture<>(Collections.singletonMap(key0, val0))); } else { - K key0 = (K)cctx.unwrapPortableIfNeeded(key, !deserializePortable, false); + K key0 = (K)cctx.unwrapBinaryIfNeeded(key, !deserializeBinary, false); V val0 = !skipVals ? - (V)cctx.unwrapPortableIfNeeded(v, !deserializePortable, false) : + (V)cctx.unwrapBinaryIfNeeded(v, !deserializeBinary, false) : (V)Boolean.TRUE; add(new GridFinishedFuture<>(Collections.singletonMap(key0, val0))); @@ -681,7 +681,7 @@ public final class GridNearGetFuture<K, V> extends CacheDistributedGetFutureAdap info.ttl(), info.expireTime(), true, - !deserializePortable, + !deserializeBinary, topVer, subjId); } @@ -699,7 +699,7 @@ public final class GridNearGetFuture<K, V> extends CacheDistributedGetFutureAdap val, skipVals, keepCacheObjects, - deserializePortable, + deserializeBinary, false); } catch (GridCacheEntryRemovedException ignore) { http://git-wip-us.apache.org/repos/asf/ignite/blob/10b83fb8/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearTransactionalCache.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearTransactionalCache.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearTransactionalCache.java index 3441eee..a09dec0 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearTransactionalCache.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearTransactionalCache.java @@ -120,7 +120,7 @@ public class GridNearTransactionalCache<K, V> extends GridNearCacheAdapter<K, V> boolean skipTx, @Nullable UUID subjId, String taskName, - final boolean deserializePortable, + final boolean deserializeBinary, final boolean skipVals, boolean canRemap ) { @@ -143,7 +143,7 @@ public class GridNearTransactionalCache<K, V> extends GridNearCacheAdapter<K, V> @Override public IgniteInternalFuture<Map<K, V>> op(IgniteTxLocalAdapter tx) { return tx.getAllAsync(ctx, ctx.cacheKeysView(keys), - deserializePortable, + deserializeBinary, skipVals, false, skipStore); @@ -158,7 +158,7 @@ public class GridNearTransactionalCache<K, V> extends GridNearCacheAdapter<K, V> forcePrimary, subjId, taskName, - deserializePortable, + deserializeBinary, skipVals ? null : opCtx != null ? opCtx.expiry() : null, skipVals, skipStore, @@ -169,7 +169,7 @@ public class GridNearTransactionalCache<K, V> extends GridNearCacheAdapter<K, V> * @param tx Transaction. * @param keys Keys to load. * @param readThrough Read through flag. - * @param deserializePortable Deserialize portable flag. + * @param deserializeBinary Deserialize binary flag. * @param expiryPlc Expiry policy. * @param skipVals Skip values flag. * @param needVer If {@code true} returns values as tuples containing value and version. @@ -178,7 +178,7 @@ public class GridNearTransactionalCache<K, V> extends GridNearCacheAdapter<K, V> IgniteInternalFuture<Map<K, V>> txLoadAsync(GridNearTxLocal tx, @Nullable Collection<KeyCacheObject> keys, boolean readThrough, - boolean deserializePortable, + boolean deserializeBinary, @Nullable IgniteCacheExpiryPolicy expiryPlc, boolean skipVals, boolean needVer) { @@ -191,7 +191,7 @@ public class GridNearTransactionalCache<K, V> extends GridNearCacheAdapter<K, V> tx, CU.subjectId(tx, ctx.shared()), tx.resolveTaskName(), - deserializePortable, + deserializeBinary, expiryPlc, skipVals, /*can remap*/true, http://git-wip-us.apache.org/repos/asf/ignite/blob/10b83fb8/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearTxLocal.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearTxLocal.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearTxLocal.java index 2eb4c68..ae4972e 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearTxLocal.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearTxLocal.java @@ -341,7 +341,7 @@ public class GridNearTxLocal extends GridDhtTxLocalAdapter { return cacheCtx.nearTx().txLoadAsync(this, keys, readThrough, - /*deserializePortable*/false, + /*deserializeBinary*/false, accessPolicy(cacheCtx, keys), skipVals, needVer).chain(new C1<IgniteInternalFuture<Map<Object, Object>>, Void>() { @@ -372,7 +372,7 @@ public class GridNearTxLocal extends GridDhtTxLocalAdapter { topologyVersion(), CU.subjectId(this, cctx), resolveTaskName(), - /*deserializePortable*/false, + /*deserializeBinary*/false, accessPolicy(cacheCtx, keys), skipVals, /*can remap*/true, @@ -403,7 +403,7 @@ public class GridNearTxLocal extends GridDhtTxLocalAdapter { topologyVersion(), CU.subjectId(this, cctx), resolveTaskName(), - /*deserializePortable*/false, + /*deserializeBinary*/false, accessPolicy(cacheCtx, keys), skipVals, /*can remap*/true, http://git-wip-us.apache.org/repos/asf/ignite/blob/10b83fb8/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/local/atomic/GridLocalAtomicCache.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/local/atomic/GridLocalAtomicCache.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/local/atomic/GridLocalAtomicCache.java index dda5ed2..6130ead 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/local/atomic/GridLocalAtomicCache.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/local/atomic/GridLocalAtomicCache.java @@ -477,14 +477,14 @@ public class GridLocalAtomicCache<K, V> extends GridCacheAdapter<K, V> { /** {@inheritDoc} */ @SuppressWarnings("unchecked") - @Override @Nullable public V get(K key, boolean deserializePortable) throws IgniteCheckedException { + @Override @Nullable public V get(K key, boolean deserializeBinary) throws IgniteCheckedException { String taskName = ctx.kernalContext().job().currentTaskName(); Map<K, V> m = getAllInternal(Collections.singleton(key), ctx.isSwapOrOffheapEnabled(), ctx.readThrough(), taskName, - deserializePortable, + deserializeBinary, false); assert m.isEmpty() || m.size() == 1 : m.size(); @@ -494,7 +494,7 @@ public class GridLocalAtomicCache<K, V> extends GridCacheAdapter<K, V> { /** {@inheritDoc} */ @SuppressWarnings("unchecked") - @Override public final Map<K, V> getAll(Collection<? extends K> keys, boolean deserializePortable) + @Override public final Map<K, V> getAll(Collection<? extends K> keys, boolean deserializeBinary) throws IgniteCheckedException { A.notNull(keys, "keys"); @@ -504,7 +504,7 @@ public class GridLocalAtomicCache<K, V> extends GridCacheAdapter<K, V> { ctx.isSwapOrOffheapEnabled(), ctx.readThrough(), taskName, - deserializePortable, + deserializeBinary, false); } @@ -517,7 +517,7 @@ public class GridLocalAtomicCache<K, V> extends GridCacheAdapter<K, V> { boolean skipTx, @Nullable UUID subjId, final String taskName, - final boolean deserializePortable, + final boolean deserializeBinary, final boolean skipVals, boolean canRemap ) { @@ -528,7 +528,7 @@ public class GridLocalAtomicCache<K, V> extends GridCacheAdapter<K, V> { return asyncOp(new Callable<Map<K, V>>() { @Override public Map<K, V> call() throws Exception { - return getAllInternal(keys, swapOrOffheap, storeEnabled, taskName, deserializePortable, skipVals); + return getAllInternal(keys, swapOrOffheap, storeEnabled, taskName, deserializeBinary, skipVals); } }); } @@ -540,7 +540,7 @@ public class GridLocalAtomicCache<K, V> extends GridCacheAdapter<K, V> { * @param swapOrOffheap {@code True} if swap of off-heap storage are enabled. * @param storeEnabled Store enabled flag. * @param taskName Task name. - * @param deserializePortable Deserialize portable . + * @param deserializeBinary Deserialize binary . * @param skipVals Skip value flag. * @return Key-value map. * @throws IgniteCheckedException If failed. @@ -550,7 +550,7 @@ public class GridLocalAtomicCache<K, V> extends GridCacheAdapter<K, V> { boolean swapOrOffheap, boolean storeEnabled, String taskName, - boolean deserializePortable, + boolean deserializeBinary, boolean skipVals ) throws IgniteCheckedException { ctx.checkSecurity(SecurityPermission.CACHE_READ); @@ -596,10 +596,10 @@ public class GridLocalAtomicCache<K, V> extends GridCacheAdapter<K, V> { null, taskName, expiry, - !deserializePortable); + !deserializeBinary); if (v != null) - ctx.addResult(vals, cacheKey, v, skipVals, false, deserializePortable, true); + ctx.addResult(vals, cacheKey, v, skipVals, false, deserializeBinary, true); else success = false; } @@ -634,7 +634,7 @@ public class GridLocalAtomicCache<K, V> extends GridCacheAdapter<K, V> { false, subjId, taskName, - deserializePortable, + deserializeBinary, /*force primary*/false, expiry, skipVals, @@ -667,7 +667,7 @@ public class GridLocalAtomicCache<K, V> extends GridCacheAdapter<K, V> { CacheOperationContext opCtx = ctx.operationContextPerCall(); - final boolean keepPortable = opCtx != null && opCtx.isKeepBinary(); + final boolean keepBinary = opCtx != null && opCtx.isKeepBinary(); return (Map<K, EntryProcessorResult<T>>)updateAllInternal(TRANSFORM, invokeMap.keySet(), @@ -679,7 +679,7 @@ public class GridLocalAtomicCache<K, V> extends GridCacheAdapter<K, V> { null, ctx.writeThrough(), ctx.readThrough(), - keepPortable); + keepBinary); } /** {@inheritDoc} */ @@ -820,7 +820,7 @@ public class GridLocalAtomicCache<K, V> extends GridCacheAdapter<K, V> { final ExpiryPolicy expiry = expiryPerCall(); - final boolean keepPortable = opCtx != null && opCtx.isKeepBinary(); + final boolean keepBinary = opCtx != null && opCtx.isKeepBinary(); IgniteInternalFuture fut = asyncOp(new Callable<Object>() { @Override public Object call() throws Exception { @@ -834,7 +834,7 @@ public class GridLocalAtomicCache<K, V> extends GridCacheAdapter<K, V> { filter, writeThrough, readThrough, - keepPortable); + keepBinary); } }); @@ -871,7 +871,7 @@ public class GridLocalAtomicCache<K, V> extends GridCacheAdapter<K, V> { CacheOperationContext opCtx = ctx.operationContextPerCall(); - final boolean keepPortable = opCtx != null && opCtx.isKeepBinary(); + final boolean keepBinary = opCtx != null && opCtx.isKeepBinary(); IgniteInternalFuture fut = asyncOp(new Callable<Object>() { @Override public Object call() throws Exception { @@ -885,7 +885,7 @@ public class GridLocalAtomicCache<K, V> extends GridCacheAdapter<K, V> { filter, writeThrough, readThrough, - keepPortable); + keepBinary); } }); @@ -922,7 +922,7 @@ public class GridLocalAtomicCache<K, V> extends GridCacheAdapter<K, V> { CacheEntryPredicate[] filter, boolean writeThrough, boolean readThrough, - boolean keepPortable + boolean keepBinary ) throws IgniteCheckedException { if (keyCheck) validateCacheKeys(keys); @@ -946,7 +946,7 @@ public class GridLocalAtomicCache<K, V> extends GridCacheAdapter<K, V> { expiryPlc, ver, filter, - keepPortable, + keepBinary, subjId, taskName); } @@ -987,7 +987,7 @@ public class GridLocalAtomicCache<K, V> extends GridCacheAdapter<K, V> { writeThrough, readThrough, retval, - keepPortable, + keepBinary, expiryPlc, true, true, @@ -1042,7 +1042,7 @@ public class GridLocalAtomicCache<K, V> extends GridCacheAdapter<K, V> { if (err != null) throw err; - Object ret = res == null ? null : rawRetval ? new GridCacheReturn(ctx, true, keepPortable, res.get2(), res.get1()) : + Object ret = res == null ? null : rawRetval ? new GridCacheReturn(ctx, true, keepBinary, res.get2(), res.get1()) : (retval || op == TRANSFORM) ? res.get2() : res.get1(); if (op == TRANSFORM && ret == null) @@ -1075,7 +1075,7 @@ public class GridLocalAtomicCache<K, V> extends GridCacheAdapter<K, V> { @Nullable ExpiryPolicy expiryPlc, GridCacheVersion ver, @Nullable CacheEntryPredicate[] filter, - boolean keepPortable, + boolean keepBinary, UUID subjId, String taskName ) throws IgniteCheckedException { @@ -1144,12 +1144,12 @@ public class GridLocalAtomicCache<K, V> extends GridCacheAdapter<K, V> { entryProcessor, taskName, null, - keepPortable); + keepBinary); Object oldVal = null; CacheInvokeEntry<Object, Object> invokeEntry = new CacheInvokeEntry<>(ctx, entry.key(), old, - entry.version(), keepPortable); + entry.version(), keepBinary); CacheObject updated; Object updatedVal = null; @@ -1178,7 +1178,7 @@ public class GridLocalAtomicCache<K, V> extends GridCacheAdapter<K, V> { if (intercept) { IgniteBiTuple<Boolean, ?> interceptorRes = ctx.config().getInterceptor() .onBeforeRemove(new CacheLazyEntry(ctx, entry.key(), invokeEntry.key(), - old, oldVal, keepPortable)); + old, oldVal, keepBinary)); if (ctx.cancelRemove(interceptorRes)) continue; @@ -1193,7 +1193,7 @@ public class GridLocalAtomicCache<K, V> extends GridCacheAdapter<K, V> { putMap, null, expiryPlc, - keepPortable, + keepBinary, err, subjId, taskName); @@ -1214,7 +1214,7 @@ public class GridLocalAtomicCache<K, V> extends GridCacheAdapter<K, V> { if (intercept) { Object interceptorVal = ctx.config().getInterceptor() .onBeforePut(new CacheLazyEntry(ctx, entry.key(), invokeEntry.getKey(), - old, oldVal, keepPortable), updatedVal); + old, oldVal, keepBinary), updatedVal); if (interceptorVal == null) continue; @@ -1231,7 +1231,7 @@ public class GridLocalAtomicCache<K, V> extends GridCacheAdapter<K, V> { null, rmvKeys, expiryPlc, - keepPortable, + keepBinary, err, subjId, taskName); @@ -1266,10 +1266,10 @@ public class GridLocalAtomicCache<K, V> extends GridCacheAdapter<K, V> { null, taskName, null, - keepPortable); + keepBinary); Object interceptorVal = ctx.config().getInterceptor().onBeforePut(new CacheLazyEntry( - ctx, entry.key(), old, keepPortable), val); + ctx, entry.key(), old, keepBinary), val); if (interceptorVal == null) continue; @@ -1301,10 +1301,10 @@ public class GridLocalAtomicCache<K, V> extends GridCacheAdapter<K, V> { null, taskName, null, - keepPortable); + keepBinary); IgniteBiTuple<Boolean, ?> interceptorRes = ctx.config().getInterceptor() - .onBeforeRemove(new CacheLazyEntry(ctx, entry.key(), old, keepPortable)); + .onBeforeRemove(new CacheLazyEntry(ctx, entry.key(), old, keepBinary)); if (ctx.cancelRemove(interceptorRes)) continue; @@ -1338,7 +1338,7 @@ public class GridLocalAtomicCache<K, V> extends GridCacheAdapter<K, V> { putMap, rmvKeys, expiryPlc, - keepPortable, + keepBinary, err, subjId, taskName); @@ -1376,7 +1376,7 @@ public class GridLocalAtomicCache<K, V> extends GridCacheAdapter<K, V> { @Nullable Map<Object, Object> putMap, @Nullable Collection<Object> rmvKeys, @Nullable ExpiryPolicy expiryPlc, - boolean keepPortable, + boolean keepBinary, @Nullable CachePartialUpdateCheckedException err, UUID subjId, String taskName @@ -1446,7 +1446,7 @@ public class GridLocalAtomicCache<K, V> extends GridCacheAdapter<K, V> { false, false, false, - keepPortable, + keepBinary, expiryPlc, true, true, @@ -1457,9 +1457,9 @@ public class GridLocalAtomicCache<K, V> extends GridCacheAdapter<K, V> { if (intercept) { if (op == UPDATE) - ctx.config().getInterceptor().onAfterPut(new CacheLazyEntry(ctx, entry.key(), writeVal, keepPortable)); + ctx.config().getInterceptor().onAfterPut(new CacheLazyEntry(ctx, entry.key(), writeVal, keepBinary)); else - ctx.config().getInterceptor().onAfterRemove(new CacheLazyEntry(ctx, entry.key(), t.get2(), keepPortable)); + ctx.config().getInterceptor().onAfterRemove(new CacheLazyEntry(ctx, entry.key(), t.get2(), keepBinary)); } } catch (GridCacheEntryRemovedException ignore) { http://git-wip-us.apache.org/repos/asf/ignite/blob/10b83fb8/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/query/GridCacheDistributedQueryManager.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/query/GridCacheDistributedQueryManager.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/query/GridCacheDistributedQueryManager.java index 578f6de..7f63b4c 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/query/GridCacheDistributedQueryManager.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/query/GridCacheDistributedQueryManager.java @@ -273,7 +273,7 @@ public class GridCacheDistributedQueryManager<K, V> extends GridCacheQueryManage req.className(), req.clause(), req.includeMetaData(), - req.keepPortable(), + req.keepBinary(), req.subjectId(), req.taskHash() ); @@ -566,7 +566,7 @@ public class GridCacheDistributedQueryManager<K, V> extends GridCacheQueryManage qry.query().includeBackups(), qry.arguments(), false, - qry.query().keepPortable(), + qry.query().keepBinary(), qry.query().subjectId(), qry.query().taskHash(), queryTopologyVersion(), @@ -612,7 +612,7 @@ public class GridCacheDistributedQueryManager<K, V> extends GridCacheQueryManage qry.includeBackups(), fut.fields(), all, - qry.keepPortable(), + qry.keepBinary(), qry.subjectId(), qry.taskHash(), queryTopologyVersion(), @@ -679,7 +679,7 @@ public class GridCacheDistributedQueryManager<K, V> extends GridCacheQueryManage qry.query().includeBackups(), qry.arguments(), qry.query().includeMetadata(), - qry.query().keepPortable(), + qry.query().keepBinary(), qry.query().subjectId(), qry.query().taskHash(), queryTopologyVersion(), http://git-wip-us.apache.org/repos/asf/ignite/blob/10b83fb8/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 855e239..b948dc5 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 @@ -73,7 +73,7 @@ public class GridCacheQueryAdapter<T> implements CacheQuery<T> { /** */ private final IgniteLogger log; - /** Class name in case of portable query. */ + /** Class name in case of binary query. */ private final String clsName; /** */ @@ -110,7 +110,7 @@ public class GridCacheQueryAdapter<T> implements CacheQuery<T> { private volatile ClusterGroup prj; /** */ - private boolean keepPortable; + private boolean keepBinary; /** */ private UUID subjId; @@ -126,7 +126,7 @@ public class GridCacheQueryAdapter<T> implements CacheQuery<T> { * @param filter Scan filter. * @param part Partition. * @param incMeta Include metadata flag. - * @param keepPortable Keep portable flag. + * @param keepBinary Keep binary flag. */ public GridCacheQueryAdapter(GridCacheContext<?, ?> cctx, GridCacheQueryType type, @@ -135,7 +135,7 @@ public class GridCacheQueryAdapter<T> implements CacheQuery<T> { @Nullable IgniteBiPredicate<Object, Object> filter, @Nullable Integer part, boolean incMeta, - boolean keepPortable) { + boolean keepBinary) { assert cctx != null; assert type != null; assert part == null || part >= 0; @@ -147,7 +147,7 @@ public class GridCacheQueryAdapter<T> implements CacheQuery<T> { this.filter = filter; this.part = part; this.incMeta = incMeta; - this.keepPortable = keepPortable; + this.keepBinary = keepBinary; log = cctx.logger(getClass()); @@ -169,7 +169,7 @@ public class GridCacheQueryAdapter<T> implements CacheQuery<T> { * @param clsName Class name. * @param clause Clause. * @param incMeta Include metadata flag. - * @param keepPortable Keep portable flag. + * @param keepBinary Keep binary flag. * @param subjId Security subject ID. * @param taskHash Task hash. */ @@ -187,7 +187,7 @@ public class GridCacheQueryAdapter<T> implements CacheQuery<T> { @Nullable String clsName, String clause, boolean incMeta, - boolean keepPortable, + boolean keepBinary, UUID subjId, int taskHash) { this.cctx = cctx; @@ -204,7 +204,7 @@ public class GridCacheQueryAdapter<T> implements CacheQuery<T> { this.clsName = clsName; this.clause = clause; this.incMeta = incMeta; - this.keepPortable = keepPortable; + this.keepBinary = keepBinary; this.subjId = subjId; this.taskHash = taskHash; } @@ -238,19 +238,19 @@ public class GridCacheQueryAdapter<T> implements CacheQuery<T> { } /** - * @return {@code True} if portable should not be deserialized. + * @return {@code True} if binary should not be deserialized. */ - public boolean keepPortable() { - return keepPortable; + public boolean keepBinary() { + return keepBinary; } /** - * Forces query to keep portable object representation even if query was created on plain projection. + * Forces query to keep binary object representation even if query was created on plain projection. * - * @param keepPortable Keep portable flag. + * @param keepBinary Keep binary flag. */ - public void keepPortable(boolean keepPortable) { - this.keepPortable = keepPortable; + public void keepBinary(boolean keepBinary) { + this.keepBinary = keepBinary; } /** @@ -721,4 +721,4 @@ public class GridCacheQueryAdapter<T> implements CacheQuery<T> { } } } -} \ No newline at end of file +} http://git-wip-us.apache.org/repos/asf/ignite/blob/10b83fb8/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 2a4fbda..e3e5d98 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 @@ -402,7 +402,7 @@ public abstract class GridCacheQueryFutureAdapter<K, V, R> extends GridFutureAda data = dedupIfRequired((Collection<Object>)data); - data = cctx.unwrapPortablesIfNeeded((Collection<Object>)data, qry.query().keepPortable()); + data = cctx.unwrapBinariesIfNeeded((Collection<Object>)data, qry.query().keepBinary()); synchronized (mux) { enqueue(data); @@ -583,4 +583,4 @@ public abstract class GridCacheQueryFutureAdapter<K, V, R> extends GridFutureAda X.println(">>> keysSize: " + keys.size()); X.println(">>> cnt: " + cnt); } -} \ No newline at end of file +} http://git-wip-us.apache.org/repos/asf/ignite/blob/10b83fb8/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 4681e47..15502a0 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 @@ -807,8 +807,8 @@ public abstract class GridCacheQueryManager<K, V> extends GridCacheManagerAdapte throws IgniteCheckedException { IgniteInternalCache<K, V> prj0 = cctx.cache(); - if (qry.keepPortable()) - prj0 = prj0.keepPortable(); + if (qry.keepBinary()) + prj0 = prj0.keepBinary(); final IgniteInternalCache<K, V> prj = prj0; @@ -907,7 +907,7 @@ public abstract class GridCacheQueryManager<K, V> extends GridCacheManagerAdapte entry != null ? entry.peek(true, false, false, topVer, expiryPlc) : null; // TODO 950 nocopy - val = (V)cctx.cacheObjectContext().unwrapPortableIfNeeded(cacheVal, qry.keepPortable()); + val = (V)cctx.cacheObjectContext().unwrapBinaryIfNeeded(cacheVal, qry.keepBinary()); } catch (GridCacheEntryRemovedException e) { val = null; @@ -960,7 +960,7 @@ public abstract class GridCacheQueryManager<K, V> extends GridCacheManagerAdapte private boolean checkPredicate(Map.Entry<K, V> e) { if (keyValFilter != null) { - Map.Entry<K, V> e0 = (Map.Entry<K, V>)cctx.unwrapPortableIfNeeded(e, qry.keepPortable()); + Map.Entry<K, V> e0 = (Map.Entry<K, V>)cctx.unwrapBinaryIfNeeded(e, qry.keepBinary()); return keyValFilter.apply(e0.getKey(), e0.getValue()); } @@ -1043,7 +1043,7 @@ public abstract class GridCacheQueryManager<K, V> extends GridCacheManagerAdapte Iterator<Map.Entry<byte[], byte[]>> it = part == null ? cctx.swap().rawSwapIterator(true, backups) : cctx.swap().rawSwapIterator(part); - return scanIterator(it, filter, qry.keepPortable()); + return scanIterator(it, filter, qry.keepBinary()); } /** @@ -1055,27 +1055,27 @@ public abstract class GridCacheQueryManager<K, V> extends GridCacheManagerAdapte IgniteBiPredicate<K, V> filter = qry.scanFilter(); if (cctx.offheapTiered() && filter != null) { - OffheapIteratorClosure c = new OffheapIteratorClosure(filter, qry.keepPortable()); + OffheapIteratorClosure c = new OffheapIteratorClosure(filter, qry.keepBinary()); return cctx.swap().rawOffHeapIterator(c, qry.partition(), true, backups); } else { Iterator<Map.Entry<byte[], byte[]>> it = cctx.swap().rawOffHeapIterator(qry.partition(), true, backups); - return scanIterator(it, filter, qry.keepPortable()); + return scanIterator(it, filter, qry.keepBinary()); } } /** * @param it Lazy swap or offheap iterator. * @param filter Scan filter. - * @param keepPortable Keep portable flag. + * @param keepBinary Keep binary flag. * @return Iterator. */ private GridIteratorAdapter<IgniteBiTuple<K, V>> scanIterator( @Nullable final Iterator<Map.Entry<byte[], byte[]>> it, @Nullable final IgniteBiPredicate<K, V> filter, - final boolean keepPortable) { + final boolean keepBinary) { if (it == null) return new GridEmptyCloseableIterator<>(); @@ -1109,11 +1109,11 @@ public abstract class GridCacheQueryManager<K, V> extends GridCacheManagerAdapte next = null; while (it.hasNext()) { - final LazySwapEntry e = new LazySwapEntry(it.next(), keepPortable); + final LazySwapEntry e = new LazySwapEntry(it.next(), keepBinary); if (filter != null) { - K key = (K)cctx.unwrapPortableIfNeeded(e.key(), keepPortable); - V val = (V)cctx.unwrapPortableIfNeeded(e.value(), keepPortable); + K key = (K)cctx.unwrapBinaryIfNeeded(e.key(), keepBinary); + V val = (V)cctx.unwrapBinaryIfNeeded(e.value(), keepBinary); if (!filter.apply(key, val)) continue; @@ -1536,7 +1536,7 @@ public abstract class GridCacheQueryManager<K, V> extends GridCacheManagerAdapte // Unwrap entry for reducer or transformer only. if (rdc != null || trans != null) - entry = (Map.Entry<K, V>)cctx.unwrapPortableIfNeeded(entry, qry.keepPortable()); + entry = (Map.Entry<K, V>)cctx.unwrapBinaryIfNeeded(entry, qry.keepBinary()); // Reduce. if (rdc != null) { @@ -2549,7 +2549,7 @@ public abstract class GridCacheQueryManager<K, V> extends GridCacheManagerAdapte CacheObject obj = cctx.cacheObjects().toCacheObject(cctx.cacheObjectContext(), t.get2(), t.get1()); - return (V)cctx.cacheObjectContext().unwrapPortableIfNeeded(obj, keepBinary); + return (V)cctx.cacheObjectContext().unwrapBinaryIfNeeded(obj, keepBinary); } /** {@inheritDoc} */ @@ -2636,19 +2636,19 @@ public abstract class GridCacheQueryManager<K, V> extends GridCacheManagerAdapte private IgniteBiPredicate<K, V> filter; /** */ - private boolean keepPortable; + private boolean keepBinary; /** * @param filter Filter. - * @param keepPortable Keep portable flag. + * @param keepBinary Keep binary flag. */ private OffheapIteratorClosure( @Nullable IgniteBiPredicate<K, V> filter, - boolean keepPortable) { + boolean keepBinary) { assert filter != null; this.filter = filter; - this.keepPortable = keepPortable; + this.keepBinary = keepBinary; } /** {@inheritDoc} */ @@ -2657,8 +2657,8 @@ public abstract class GridCacheQueryManager<K, V> extends GridCacheManagerAdapte throws IgniteCheckedException { LazyOffheapEntry e = new LazyOffheapEntry(keyPtr, valPtr); - K key = (K)cctx.unwrapPortableIfNeeded(e.key(), keepPortable); - V val = (V)cctx.unwrapPortableIfNeeded(e.value(), keepPortable); + K key = (K)cctx.unwrapBinaryIfNeeded(e.key(), keepBinary); + V val = (V)cctx.unwrapBinaryIfNeeded(e.value(), keepBinary); if (!filter.apply(key, val)) return null; @@ -3042,10 +3042,10 @@ public abstract class GridCacheQueryManager<K, V> extends GridCacheManagerAdapte /** * Query for {@link IndexingSpi}. * - * @param keepPortable Keep portable flag. + * @param keepBinary Keep binary flag. * @return Query. */ - public <R> CacheQuery<R> createSpiQuery(boolean keepPortable) { + public <R> CacheQuery<R> createSpiQuery(boolean keepBinary) { return new GridCacheQueryAdapter<>(cctx, SPI, null, @@ -3053,7 +3053,7 @@ public abstract class GridCacheQueryManager<K, V> extends GridCacheManagerAdapte null, null, false, - keepPortable); + keepBinary); } /** @@ -3061,11 +3061,11 @@ public abstract class GridCacheQueryManager<K, V> extends GridCacheManagerAdapte * * @param filter Scan filter. * @param part Partition. - * @param keepPortable Keep portable flag. + * @param keepBinary Keep binary flag. * @return Created query. */ public CacheQuery<Map.Entry<K, V>> createScanQuery(@Nullable IgniteBiPredicate<K, V> filter, - @Nullable Integer part, boolean keepPortable) { + @Nullable Integer part, boolean keepBinary) { return new GridCacheQueryAdapter<>(cctx, SCAN, @@ -3074,7 +3074,7 @@ public abstract class GridCacheQueryManager<K, V> extends GridCacheManagerAdapte (IgniteBiPredicate<Object, Object>)filter, part, false, - keepPortable); + keepBinary); } /** @@ -3083,11 +3083,11 @@ public abstract class GridCacheQueryManager<K, V> extends GridCacheManagerAdapte * * @param clsName Query class name. * @param search Search clause. - * @param keepPortable Keep portable flag. + * @param keepBinary Keep binary flag. * @return Created query. */ public CacheQuery<Map.Entry<K, V>> createFullTextQuery(String clsName, - String search, boolean keepPortable) { + String search, boolean keepBinary) { A.notNull("clsName", clsName); A.notNull("search", search); @@ -3098,7 +3098,7 @@ public abstract class GridCacheQueryManager<K, V> extends GridCacheManagerAdapte null, null, false, - keepPortable); + keepBinary); } /** @@ -3106,10 +3106,10 @@ public abstract class GridCacheQueryManager<K, V> extends GridCacheManagerAdapte * documentation. * * @param qry Query. - * @param keepPortable Keep portable flag. + * @param keepBinary Keep binary flag. * @return Created query. */ - public CacheQuery<List<?>> createSqlFieldsQuery(String qry, boolean keepPortable) { + public CacheQuery<List<?>> createSqlFieldsQuery(String qry, boolean keepBinary) { A.notNull(qry, "qry"); return new GridCacheQueryAdapter<>(cctx, @@ -3119,6 +3119,6 @@ public abstract class GridCacheQueryManager<K, V> extends GridCacheManagerAdapte null, null, false, - keepPortable); + keepBinary); } } http://git-wip-us.apache.org/repos/asf/ignite/blob/10b83fb8/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 fa2d6b1..9fae5e1 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 @@ -111,7 +111,7 @@ public class GridCacheQueryRequest extends GridCacheMessage implements GridCache private boolean all; /** */ - private boolean keepPortable; + private boolean keepBinary; /** */ private UUID subjId; @@ -165,7 +165,7 @@ public class GridCacheQueryRequest extends GridCacheMessage implements GridCache * @param incBackups {@code true} if need to include backups. * @param fields Fields query flag. * @param all Whether to load all pages. - * @param keepPortable Whether to keep binary. + * @param keepBinary Whether to keep binary. * @param subjId Subject ID. * @param taskHash Task name hash code. * @param topVer Topology version. @@ -179,7 +179,7 @@ public class GridCacheQueryRequest extends GridCacheMessage implements GridCache boolean incBackups, boolean fields, boolean all, - boolean keepPortable, + boolean keepBinary, UUID subjId, int taskHash, AffinityTopologyVersion topVer, @@ -192,7 +192,7 @@ public class GridCacheQueryRequest extends GridCacheMessage implements GridCache this.incBackups = incBackups; this.fields = fields; this.all = all; - this.keepPortable = keepPortable; + this.keepBinary = keepBinary; this.subjId = subjId; this.taskHash = taskHash; this.topVer = topVer; @@ -215,7 +215,7 @@ public class GridCacheQueryRequest extends GridCacheMessage implements GridCache * @param incBackups {@code true} if need to include backups. * @param args Query arguments. * @param incMeta Include meta data or not. - * @param keepPortable Keep portable flag. + * @param keepBinary Keep binary flag. * @param subjId Subject ID. * @param taskHash Task name hash code. * @param topVer Topology version. @@ -237,7 +237,7 @@ public class GridCacheQueryRequest extends GridCacheMessage implements GridCache boolean incBackups, Object[] args, boolean incMeta, - boolean keepPortable, + boolean keepBinary, UUID subjId, int taskHash, AffinityTopologyVersion topVer, @@ -262,7 +262,7 @@ public class GridCacheQueryRequest extends GridCacheMessage implements GridCache this.incBackups = incBackups; this.args = args; this.incMeta = incMeta; - this.keepPortable = keepPortable; + this.keepBinary = keepBinary; this.subjId = subjId; this.taskHash = taskHash; this.topVer = topVer; @@ -454,8 +454,8 @@ public class GridCacheQueryRequest extends GridCacheMessage implements GridCache /** * @return Whether to keep binary. */ - public boolean keepPortable() { - return keepPortable; + public boolean keepBinary() { + return keepBinary; } /** @@ -555,7 +555,7 @@ public class GridCacheQueryRequest extends GridCacheMessage implements GridCache writer.incrementState(); case 13: - if (!writer.writeBoolean("keepPortable", keepPortable)) + if (!writer.writeBoolean("keepBinary", keepBinary)) return false; writer.incrementState(); @@ -711,7 +711,7 @@ public class GridCacheQueryRequest extends GridCacheMessage implements GridCache reader.incrementState(); case 13: - keepPortable = reader.readBoolean("keepPortable"); + keepBinary = reader.readBoolean("keepBinary"); if (!reader.isLastRead()) return false; http://git-wip-us.apache.org/repos/asf/ignite/blob/10b83fb8/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/query/continuous/CacheContinuousQueryEvent.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/query/continuous/CacheContinuousQueryEvent.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/query/continuous/CacheContinuousQueryEvent.java index f665339..d26e666 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/query/continuous/CacheContinuousQueryEvent.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/query/continuous/CacheContinuousQueryEvent.java @@ -59,18 +59,18 @@ class CacheContinuousQueryEvent<K, V> extends CacheEntryEvent<K, V> { /** {@inheritDoc} */ @Override public K getKey() { - return (K)cctx.cacheObjectContext().unwrapPortableIfNeeded(e.key(), e.isKeepBinary(), false); + return (K)cctx.cacheObjectContext().unwrapBinaryIfNeeded(e.key(), e.isKeepBinary(), false); } /** {@inheritDoc} */ @Override public V getValue() { - return (V)cctx.cacheObjectContext().unwrapPortableIfNeeded(e.value(), e.isKeepBinary(), false); + return (V)cctx.cacheObjectContext().unwrapBinaryIfNeeded(e.value(), e.isKeepBinary(), false); } /** {@inheritDoc} */ @Override public V getOldValue() { - return (V)cctx.cacheObjectContext().unwrapPortableIfNeeded(e.oldValue(), e.isKeepBinary(), false); + return (V)cctx.cacheObjectContext().unwrapBinaryIfNeeded(e.oldValue(), e.isKeepBinary(), false); } /** {@inheritDoc} */ @@ -94,4 +94,4 @@ class CacheContinuousQueryEvent<K, V> extends CacheEntryEvent<K, V> { "newVal", getValue(), "oldVal", getOldValue()); } -} \ No newline at end of file +} http://git-wip-us.apache.org/repos/asf/ignite/blob/10b83fb8/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/store/CacheOsStoreManager.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/store/CacheOsStoreManager.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/store/CacheOsStoreManager.java index d001c76..e89483a 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/store/CacheOsStoreManager.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/store/CacheOsStoreManager.java @@ -57,7 +57,7 @@ public class CacheOsStoreManager extends GridCacheStoreManagerAdapter { if (store instanceof PlatformCacheStore) { PlatformProcessor proc = ctx.platform(); - proc.registerStore((PlatformCacheStore)store, configuredConvertPortable()); + proc.registerStore((PlatformCacheStore)store, configuredConvertBinary()); } } @@ -76,12 +76,12 @@ public class CacheOsStoreManager extends GridCacheStoreManagerAdapter { } /** {@inheritDoc} */ - @Override public boolean convertPortable() { - return configuredConvertPortable() && !(cfgStore instanceof PlatformCacheStore); + @Override public boolean convertBinary() { + return configuredConvertBinary() && !(cfgStore instanceof PlatformCacheStore); } /** {@inheritDoc} */ - @Override public boolean configuredConvertPortable() { + @Override public boolean configuredConvertBinary() { return !(ctx.config().getMarshaller() instanceof BinaryMarshaller && cfg.isKeepBinaryInStore()); } } http://git-wip-us.apache.org/repos/asf/ignite/blob/10b83fb8/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/store/CacheStoreManager.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/store/CacheStoreManager.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/store/CacheStoreManager.java index 509c806..67c9334 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/store/CacheStoreManager.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/store/CacheStoreManager.java @@ -188,12 +188,12 @@ public interface CacheStoreManager<K, V> extends GridCacheManager<K, V> { public void forceFlush() throws IgniteCheckedException; /** - * @return Convert-portable flag. + * @return Convert-binary flag. */ - public boolean convertPortable(); + public boolean convertBinary(); /** - * @return Configured convert portable flag. + * @return Configured convert binary flag. */ - public boolean configuredConvertPortable(); -} \ No newline at end of file + public boolean configuredConvertBinary(); +} http://git-wip-us.apache.org/repos/asf/ignite/blob/10b83fb8/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/store/GridCacheStoreManagerAdapter.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/store/GridCacheStoreManagerAdapter.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/store/GridCacheStoreManagerAdapter.java index af3a77b..7ffebbd 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/store/GridCacheStoreManagerAdapter.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/store/GridCacheStoreManagerAdapter.java @@ -283,7 +283,7 @@ public abstract class GridCacheStoreManagerAdapter extends GridCacheManagerAdapt // Never load internal keys from store as they are never persisted. return null; - Object storeKey = cctx.unwrapPortableIfNeeded(key, !convertPortable()); + Object storeKey = cctx.unwrapBinaryIfNeeded(key, !convertBinary()); if (log.isDebugEnabled()) log.debug("Loading value from store for key: " + storeKey); @@ -410,7 +410,7 @@ public abstract class GridCacheStoreManagerAdapter extends GridCacheManagerAdapt Collection<Object> keys0 = F.viewReadOnly(keys, new C1<KeyCacheObject, Object>() { @Override public Object apply(KeyCacheObject key) { - return cctx.unwrapPortableIfNeeded(key, !convertPortable()); + return cctx.unwrapBinaryIfNeeded(key, !convertBinary()); } }); @@ -533,8 +533,8 @@ public abstract class GridCacheStoreManagerAdapter extends GridCacheManagerAdapt if (key instanceof GridCacheInternal) return true; - key = cctx.unwrapPortableIfNeeded(key, !convertPortable()); - val = cctx.unwrapPortableIfNeeded(val, !convertPortable()); + key = cctx.unwrapBinaryIfNeeded(key, !convertBinary()); + val = cctx.unwrapBinaryIfNeeded(val, !convertBinary()); if (log.isDebugEnabled()) log.debug("Storing value in cache store [key=" + key + ", val=" + val + ']'); @@ -636,7 +636,7 @@ public abstract class GridCacheStoreManagerAdapter extends GridCacheManagerAdapt if (key instanceof GridCacheInternal) return false; - key = cctx.unwrapPortableIfNeeded(key, !convertPortable()); + key = cctx.unwrapBinaryIfNeeded(key, !convertBinary()); if (log.isDebugEnabled()) log.debug("Removing value from cache store [key=" + key + ']'); @@ -684,7 +684,7 @@ public abstract class GridCacheStoreManagerAdapter extends GridCacheManagerAdapt } if (store != null) { - Collection<Object> keys0 = cctx.unwrapPortablesIfNeeded(keys, !convertPortable()); + Collection<Object> keys0 = cctx.unwrapBinariesIfNeeded(keys, !convertBinary()); if (log.isDebugEnabled()) log.debug("Removing values from cache store [keys=" + keys0 + ']'); @@ -771,7 +771,7 @@ public abstract class GridCacheStoreManagerAdapter extends GridCacheManagerAdapt assert e != null; if (e.getMessage() != null) { - throw new IgniteCheckedException("Cache store must work with portable objects if binary are " + + throw new IgniteCheckedException("Cache store must work with binary objects if binary are " + "enabled for cache [cacheName=" + cctx.namex() + ']', e); } else @@ -1093,8 +1093,8 @@ public abstract class GridCacheStoreManagerAdapter extends GridCacheManagerAdapt Object v = locStore ? e.getValue() : e.getValue().get1(); - k = cctx.unwrapPortableIfNeeded(k, !convertPortable()); - v = cctx.unwrapPortableIfNeeded(v, !convertPortable()); + k = cctx.unwrapBinaryIfNeeded(k, !convertBinary()); + v = cctx.unwrapBinaryIfNeeded(v, !convertBinary()); if (rmvd != null && rmvd.contains(k)) continue;
