http://git-wip-us.apache.org/repos/asf/ignite/blob/10b83fb8/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheContext.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheContext.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheContext.java index 6645d8a..c10ebf3 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheContext.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheContext.java @@ -320,7 +320,7 @@ public class GridCacheContext<K, V> implements Externalizable { this.cacheType = cacheType; this.affNode = affNode; this.updatesAllowed = updatesAllowed; - this.depEnabled = ctx.deploy().enabled() && !cacheObjects().isPortableEnabled(cacheCfg); + this.depEnabled = ctx.deploy().enabled() && !cacheObjects().isBinaryEnabled(cacheCfg); /* * Managers in starting order! @@ -1677,7 +1677,7 @@ public class GridCacheContext<K, V> implements Externalizable { } /** - * @return Portable processor. + * @return Binary processor. */ public IgniteCacheObjectProcessor cacheObjects() { return kernalContext().cacheObjects(); @@ -1691,9 +1691,9 @@ public class GridCacheContext<K, V> implements Externalizable { } /** - * @return Keep portable flag. + * @return Keep binary flag. */ - public boolean keepPortable() { + public boolean keepBinary() { CacheOperationContext opCtx = operationContextPerCall(); return opCtx != null && opCtx.isKeepBinary(); @@ -1730,34 +1730,34 @@ public class GridCacheContext<K, V> implements Externalizable { * Unwraps collection. * * @param col Collection to unwrap. - * @param keepPortable Keep portable flag. + * @param keepBinary Keep binary flag. * @return Unwrapped collection. */ - public Collection<Object> unwrapPortablesIfNeeded(Collection<Object> col, boolean keepPortable) { - return cacheObjCtx.unwrapPortablesIfNeeded(col, keepPortable); + public Collection<Object> unwrapBinariesIfNeeded(Collection<Object> col, boolean keepBinary) { + return cacheObjCtx.unwrapBinariesIfNeeded(col, keepBinary); } /** * Unwraps object for binary. * * @param o Object to unwrap. - * @param keepPortable Keep portable flag. + * @param keepBinary Keep binary flag. * @return Unwrapped object. */ - public Object unwrapPortableIfNeeded(Object o, boolean keepPortable) { - return cacheObjCtx.unwrapPortableIfNeeded(o, keepPortable); + public Object unwrapBinaryIfNeeded(Object o, boolean keepBinary) { + return cacheObjCtx.unwrapBinaryIfNeeded(o, keepBinary); } /** * Unwraps object for binary. * * @param o Object to unwrap. - * @param keepPortable Keep portable flag. + * @param keepBinary Keep binary flag. * @param cpy Copy value flag. * @return Unwrapped object. */ - public Object unwrapPortableIfNeeded(Object o, boolean keepPortable, boolean cpy) { - return cacheObjCtx.unwrapPortableIfNeeded(o, keepPortable, cpy); + public Object unwrapBinaryIfNeeded(Object o, boolean keepBinary, boolean cpy) { + return cacheObjCtx.unwrapBinaryIfNeeded(o, keepBinary, cpy); } /** @@ -1772,7 +1772,7 @@ public class GridCacheContext<K, V> implements Externalizable { CacheInvokeResult invokeRes = (CacheInvokeResult)res; if (invokeRes.result() != null) - res = CacheInvokeResult.fromResult(unwrapPortableIfNeeded(invokeRes.result(), + res = CacheInvokeResult.fromResult(unwrapBinaryIfNeeded(invokeRes.result(), keepBinary, false)); } @@ -1872,7 +1872,7 @@ public class GridCacheContext<K, V> implements Externalizable { * @param val Value. * @param skipVals Skip values flag. * @param keepCacheObjects Keep cache objects flag. - * @param deserializePortable Deserialize portable flag. + * @param deserializeBinary Deserialize binary flag. * @param cpy Copy flag. */ @SuppressWarnings("unchecked") @@ -1881,15 +1881,15 @@ public class GridCacheContext<K, V> implements Externalizable { CacheObject val, boolean skipVals, boolean keepCacheObjects, - boolean deserializePortable, + boolean deserializeBinary, boolean cpy) { assert key != null; assert val != null || skipVals; if (!keepCacheObjects) { - Object key0 = unwrapPortableIfNeeded(key, !deserializePortable); + Object key0 = unwrapBinaryIfNeeded(key, !deserializeBinary); - Object val0 = skipVals ? true : unwrapPortableIfNeeded(val, !deserializePortable); + Object val0 = skipVals ? true : unwrapBinaryIfNeeded(val, !deserializeBinary); assert key0 != null : key; assert val0 != null : val;
http://git-wip-us.apache.org/repos/asf/ignite/blob/10b83fb8/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheEntryEx.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheEntryEx.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheEntryEx.java index a0c9c3c..ccbaf38 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheEntryEx.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheEntryEx.java @@ -378,7 +378,7 @@ public interface GridCacheEntryEx { long ttl, boolean evt, boolean metrics, - boolean keepPortable, + boolean keepBinary, AffinityTopologyVersion topVer, CacheEntryPredicate[] filter, GridDrType drType, @@ -416,7 +416,7 @@ public interface GridCacheEntryEx { boolean retval, boolean evt, boolean metrics, - boolean keepPortable, + boolean keepBinary, AffinityTopologyVersion topVer, CacheEntryPredicate[] filter, GridDrType drType, @@ -472,7 +472,7 @@ public interface GridCacheEntryEx { boolean writeThrough, boolean readThrough, boolean retval, - boolean keepPortable, + boolean keepBinary, @Nullable IgniteCacheExpiryPolicy expiryPlc, boolean evt, boolean metrics, @@ -521,7 +521,7 @@ public interface GridCacheEntryEx { boolean writeThrough, boolean readThrough, boolean retval, - boolean keepPortable, + boolean keepBinary, @Nullable ExpiryPolicy expiryPlc, boolean evt, boolean metrics, http://git-wip-us.apache.org/repos/asf/ignite/blob/10b83fb8/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheEventManager.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheEventManager.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheEventManager.java index 98579c2..ec8b8cc 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheEventManager.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheEventManager.java @@ -154,7 +154,7 @@ public class GridCacheEventManager extends GridCacheManagerAdapter { UUID subjId, String cloClsName, String taskName, - boolean keepPortable) + boolean keepBinary) { addEvent(part, key, @@ -168,7 +168,7 @@ public class GridCacheEventManager extends GridCacheManagerAdapter { subjId, cloClsName, taskName, - keepPortable); + keepBinary); } /** @@ -246,7 +246,7 @@ public class GridCacheEventManager extends GridCacheManagerAdapter { UUID subjId, @Nullable String cloClsName, @Nullable String taskName, - boolean keepPortable + boolean keepBinary ) { assert key != null || type == EVT_CACHE_STARTED || type == EVT_CACHE_STOPPED; @@ -265,19 +265,19 @@ public class GridCacheEventManager extends GridCacheManagerAdapter { "(try to increase topology history size configuration property of configured " + "discovery SPI): " + evtNodeId); - keepPortable = keepPortable || forceKeepBinary; + keepBinary = keepBinary || forceKeepBinary; Object key0; Object val0; Object oldVal0; try { - key0 = cctx.cacheObjectContext().unwrapPortableIfNeeded(key, keepPortable, false); - val0 = cctx.cacheObjectContext().unwrapPortableIfNeeded(newVal, keepPortable, false); - oldVal0 = cctx.cacheObjectContext().unwrapPortableIfNeeded(oldVal, keepPortable, false); + key0 = cctx.cacheObjectContext().unwrapBinaryIfNeeded(key, keepBinary, false); + val0 = cctx.cacheObjectContext().unwrapBinaryIfNeeded(newVal, keepBinary, false); + oldVal0 = cctx.cacheObjectContext().unwrapBinaryIfNeeded(oldVal, keepBinary, false); } catch (Exception e) { - if (!cctx.cacheObjectContext().processor().isPortableEnabled(cctx.config())) + if (!cctx.cacheObjectContext().processor().isBinaryEnabled(cctx.config())) throw e; if (log.isDebugEnabled()) @@ -289,9 +289,9 @@ public class GridCacheEventManager extends GridCacheManagerAdapter { forceKeepBinary = true; - key0 = cctx.cacheObjectContext().unwrapPortableIfNeeded(key, true, false); - val0 = cctx.cacheObjectContext().unwrapPortableIfNeeded(newVal, true, false); - oldVal0 = cctx.cacheObjectContext().unwrapPortableIfNeeded(oldVal, true, false); + key0 = cctx.cacheObjectContext().unwrapBinaryIfNeeded(key, true, false); + val0 = cctx.cacheObjectContext().unwrapBinaryIfNeeded(newVal, true, false); + oldVal0 = cctx.cacheObjectContext().unwrapBinaryIfNeeded(oldVal, true, false); } cctx.gridEvents().record(new CacheEvent(cctx.name(), @@ -387,4 +387,4 @@ public class GridCacheEventManager extends GridCacheManagerAdapter { X.println(">>> Cache event manager memory stats [grid=" + cctx.gridName() + ", cache=" + cctx.name() + ", stats=" + "N/A" + ']'); } -} \ 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/GridCacheMapEntry.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheMapEntry.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheMapEntry.java index ae0b412..c896a82 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheMapEntry.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheMapEntry.java @@ -1069,7 +1069,7 @@ public abstract class GridCacheMapEntry extends GridMetadataAwareAdapter impleme long ttl, boolean evt, boolean metrics, - boolean keepPortable, + boolean keepBinary, AffinityTopologyVersion topVer, CacheEntryPredicate[] filter, GridDrType drType, @@ -1127,10 +1127,10 @@ public abstract class GridCacheMapEntry extends GridMetadataAwareAdapter impleme if (intercept) { val0 = CU.value(val, cctx, false); - CacheLazyEntry e = new CacheLazyEntry(cctx, key, old, keepPortable); + CacheLazyEntry e = new CacheLazyEntry(cctx, key, old, keepBinary); Object interceptorVal = cctx.config().getInterceptor().onBeforePut( - new CacheLazyEntry(cctx, key, old, keepPortable), + new CacheLazyEntry(cctx, key, old, keepBinary), val0); key0 = e.key(); @@ -1203,7 +1203,7 @@ public abstract class GridCacheMapEntry extends GridMetadataAwareAdapter impleme evtOld, evtOld != null || hasValueUnlocked(), subjId, null, taskName, - keepPortable); + keepBinary); } if (cctx.isLocal() || cctx.isReplicated() || @@ -1211,7 +1211,7 @@ public abstract class GridCacheMapEntry extends GridMetadataAwareAdapter impleme cctx.continuousQueries().onEntryUpdated(key, val, old, isInternal() || !context().userCache(), partition(), tx.local(), false, updateCntr0, topVer); - cctx.dataStructures().onEntryUpdated(key, false, keepPortable); + cctx.dataStructures().onEntryUpdated(key, false, keepBinary); } if (log.isDebugEnabled()) @@ -1223,7 +1223,7 @@ public abstract class GridCacheMapEntry extends GridMetadataAwareAdapter impleme cctx.store().put(tx, keyValue(false), CU.value(val, cctx, false), newVer); if (intercept) - cctx.config().getInterceptor().onAfterPut(new CacheLazyEntry(cctx, key, key0, val, val0, keepPortable)); + cctx.config().getInterceptor().onAfterPut(new CacheLazyEntry(cctx, key, key0, val, val0, keepBinary)); return valid ? new GridCacheUpdateTxResult(true, retval ? old : null, updateCntr0) : new GridCacheUpdateTxResult(false, null); @@ -1245,7 +1245,7 @@ public abstract class GridCacheMapEntry extends GridMetadataAwareAdapter impleme boolean retval, boolean evt, boolean metrics, - boolean keepPortable, + boolean keepBinary, AffinityTopologyVersion topVer, CacheEntryPredicate[] filter, GridDrType drType, @@ -1307,7 +1307,7 @@ public abstract class GridCacheMapEntry extends GridMetadataAwareAdapter impleme old = (retval || intercept) ? rawGetOrUnmarshalUnlocked(!retval) : val; if (intercept) { - entry0 = new CacheLazyEntry(cctx, key, old, keepPortable); + entry0 = new CacheLazyEntry(cctx, key, old, keepBinary); interceptRes = cctx.config().getInterceptor().onBeforeRemove(entry0); @@ -1385,7 +1385,7 @@ public abstract class GridCacheMapEntry extends GridMetadataAwareAdapter impleme subjId, null, taskName, - keepPortable); + keepBinary); } if (cctx.isLocal() || cctx.isReplicated() || @@ -1393,7 +1393,7 @@ public abstract class GridCacheMapEntry extends GridMetadataAwareAdapter impleme cctx.continuousQueries().onEntryUpdated(key, null, old, isInternal() || !context().userCache(),partition(), tx.local(), false, updateCntr0, topVer); - cctx.dataStructures().onEntryUpdated(key, true, keepPortable); + cctx.dataStructures().onEntryUpdated(key, true, keepBinary); deferred = cctx.deferredDelete() && !detached() && !isInternal(); @@ -1534,7 +1534,7 @@ public abstract class GridCacheMapEntry extends GridMetadataAwareAdapter impleme updateTtl(expiryPlc); Object val = retval ? - cctx.cacheObjectContext().unwrapPortableIfNeeded(CU.value(old, cctx, false), keepBinary, false) + cctx.cacheObjectContext().unwrapBinaryIfNeeded(CU.value(old, cctx, false), keepBinary, false) : null; return new T3<>(false, val, null); @@ -1751,7 +1751,7 @@ public abstract class GridCacheMapEntry extends GridMetadataAwareAdapter impleme return new GridTuple3<>(res, cctx.unwrapTemporary(interceptorRes != null ? interceptorRes.get2() : - cctx.cacheObjectContext().unwrapPortableIfNeeded(old, keepBinary, false)), + cctx.cacheObjectContext().unwrapBinaryIfNeeded(old, keepBinary, false)), invokeRes); } @@ -1767,7 +1767,7 @@ public abstract class GridCacheMapEntry extends GridMetadataAwareAdapter impleme boolean writeThrough, boolean readThrough, boolean retval, - boolean keepPortable, + boolean keepBinary, @Nullable IgniteCacheExpiryPolicy expiryPlc, boolean evt, boolean metrics, @@ -1839,7 +1839,7 @@ public abstract class GridCacheMapEntry extends GridMetadataAwareAdapter impleme oldVal = rawGetOrUnmarshalUnlocked(true); - CacheInvokeEntry<Object, Object> entry = new CacheInvokeEntry(cctx, key, oldVal, version(), keepPortable); + CacheInvokeEntry<Object, Object> entry = new CacheInvokeEntry(cctx, key, oldVal, version(), keepBinary); try { Object computed = entryProcessor.process(entry, invokeArgs); @@ -1977,7 +1977,7 @@ public abstract class GridCacheMapEntry extends GridMetadataAwareAdapter impleme (EntryProcessor<Object, Object, ?>)writeObj; CacheInvokeEntry<Object, Object> entry = - new CacheInvokeEntry<>(cctx, key, prevVal, version(), keepPortable); + new CacheInvokeEntry<>(cctx, key, prevVal, version(), keepBinary); try { entryProcessor.process(entry, invokeArgs); @@ -2099,7 +2099,7 @@ public abstract class GridCacheMapEntry extends GridMetadataAwareAdapter impleme EntryProcessor<Object, Object, ?> entryProcessor = (EntryProcessor<Object, Object, ?>)writeObj; - CacheInvokeEntry<Object, Object> entry = new CacheInvokeEntry(cctx, key, oldVal, version(), keepPortable); + CacheInvokeEntry<Object, Object> entry = new CacheInvokeEntry(cctx, key, oldVal, version(), keepBinary); try { Object computed = entryProcessor.process(entry, invokeArgs); @@ -2224,7 +2224,7 @@ public abstract class GridCacheMapEntry extends GridMetadataAwareAdapter impleme updated0 = value(updated0, updated, false); Object interceptorVal = cctx.config().getInterceptor() - .onBeforePut(new CacheLazyEntry(cctx, key, key0, oldVal, old0, keepPortable), updated0); + .onBeforePut(new CacheLazyEntry(cctx, key, key0, oldVal, old0, keepBinary), updated0); if (interceptorVal == null) return new GridCacheUpdateAtomicResult(false, @@ -2291,7 +2291,7 @@ public abstract class GridCacheMapEntry extends GridMetadataAwareAdapter impleme cctx.events().addEvent(partition(), key, evtNodeId, null, newVer, EVT_CACHE_OBJECT_READ, evtOld, evtOld != null || hadVal, evtOld, evtOld != null || hadVal, subjId, transformClo.getClass().getName(), taskName, - keepPortable); + keepBinary); } if (newVer != null && cctx.events().isRecordable(EVT_CACHE_OBJECT_PUT)) { @@ -2300,14 +2300,14 @@ public abstract class GridCacheMapEntry extends GridMetadataAwareAdapter impleme cctx.events().addEvent(partition(), key, evtNodeId, null, newVer, EVT_CACHE_OBJECT_PUT, updated, updated != null, evtOld, - evtOld != null || hadVal, subjId, null, taskName, keepPortable); + evtOld != null || hadVal, subjId, null, taskName, keepBinary); } } } else { if (intercept) { interceptRes = cctx.config().getInterceptor().onBeforeRemove(new CacheLazyEntry(cctx, key, key0, - oldVal, old0, keepPortable)); + oldVal, old0, keepBinary)); if (cctx.cancelRemove(interceptRes)) return new GridCacheUpdateAtomicResult(false, @@ -2387,7 +2387,7 @@ public abstract class GridCacheMapEntry extends GridMetadataAwareAdapter impleme cctx.events().addEvent(partition(), key, evtNodeId, null, newVer, EVT_CACHE_OBJECT_READ, evtOld, evtOld != null || hadVal, evtOld, evtOld != null || hadVal, subjId, transformClo.getClass().getName(), taskName, - keepPortable); + keepBinary); } if (newVer != null && cctx.events().isRecordable(EVT_CACHE_OBJECT_REMOVED)) { @@ -2396,7 +2396,7 @@ public abstract class GridCacheMapEntry extends GridMetadataAwareAdapter impleme cctx.events().addEvent(partition(), key, evtNodeId, null, newVer, EVT_CACHE_OBJECT_REMOVED, null, false, evtOld, evtOld != null || hadVal, - subjId, null, taskName, keepPortable); + subjId, null, taskName, keepBinary); } } @@ -2406,13 +2406,13 @@ public abstract class GridCacheMapEntry extends GridMetadataAwareAdapter impleme if (res) updateMetrics(op, metrics); - cctx.dataStructures().onEntryUpdated(key, op == GridCacheOperation.DELETE, keepPortable); + cctx.dataStructures().onEntryUpdated(key, op == GridCacheOperation.DELETE, keepBinary); if (intercept) { if (op == GridCacheOperation.UPDATE) - cctx.config().getInterceptor().onAfterPut(new CacheLazyEntry(cctx, key, key0, updated, updated0, keepPortable)); + cctx.config().getInterceptor().onAfterPut(new CacheLazyEntry(cctx, key, key0, updated, updated0, keepBinary)); else - cctx.config().getInterceptor().onAfterRemove(new CacheLazyEntry(cctx, key, key0, oldVal, old0, keepPortable)); + cctx.config().getInterceptor().onAfterRemove(new CacheLazyEntry(cctx, key, key0, oldVal, old0, keepBinary)); if (interceptRes != null) oldVal = cctx.toCacheObject(cctx.unwrapTemporary(interceptRes.get2())); @@ -4330,13 +4330,13 @@ public abstract class GridCacheMapEntry extends GridMetadataAwareAdapter impleme /** {@inheritDoc} */ @Override public K getKey() { - return (K)cctx.cacheObjectContext().unwrapPortableIfNeeded(key, keepBinary); + return (K)cctx.cacheObjectContext().unwrapBinaryIfNeeded(key, keepBinary); } /** {@inheritDoc} */ @SuppressWarnings("unchecked") @Override public V getValue() { - return (V)cctx.cacheObjectContext().unwrapPortableIfNeeded(peekVisibleValue(), keepBinary); + return (V)cctx.cacheObjectContext().unwrapBinaryIfNeeded(peekVisibleValue(), keepBinary); } /** {@inheritDoc} */ http://git-wip-us.apache.org/repos/asf/ignite/blob/10b83fb8/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheOffheapSwapEntry.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheOffheapSwapEntry.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheOffheapSwapEntry.java index f4ddf89..ea036af 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheOffheapSwapEntry.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheOffheapSwapEntry.java @@ -34,7 +34,7 @@ import sun.misc.Unsafe; * <li>Expire time</li> * <li>GridCacheVersion or GridCacheVersionEx</li> * <li>Value is byte array flag</li> - * <li>Value byte array (marshalled with portable or grid marshaller)</li> + * <li>Value byte array (marshalled with binary or grid marshaller)</li> * <li>Value classloader UUID</li> * <li>Key classloader UUID</li> * </ul> @@ -192,4 +192,4 @@ public class GridCacheOffheapSwapEntry implements GridCacheSwapEntry { @Override public String toString() { return S.toString(GridCacheOffheapSwapEntry.class, this); } -} \ 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/GridCacheProxyImpl.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheProxyImpl.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheProxyImpl.java index 68e70c3..d1d93d8 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheProxyImpl.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheProxyImpl.java @@ -229,7 +229,7 @@ public class GridCacheProxyImpl<K, V> implements IgniteInternalCache<K, V>, Exte /** {@inheritDoc} */ @SuppressWarnings("unchecked") - @Override public <K1, V1> GridCacheProxyImpl<K1, V1> keepPortable() { + @Override public <K1, V1> GridCacheProxyImpl<K1, V1> keepBinary() { if (opCtx != null && opCtx.isKeepBinary()) return (GridCacheProxyImpl<K1, V1>)this; http://git-wip-us.apache.org/repos/asf/ignite/blob/10b83fb8/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheReturn.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheReturn.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheReturn.java index 2d179fa..21154c9 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheReturn.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheReturn.java @@ -190,7 +190,7 @@ public class GridCacheReturn implements Externalizable, Message { */ private void initValue(GridCacheContext cctx, @Nullable CacheObject cacheObj, boolean keepBinary) { if (loc) - v = cctx.cacheObjectContext().unwrapPortableIfNeeded(cacheObj, keepBinary, true); + v = cctx.cacheObjectContext().unwrapBinaryIfNeeded(cacheObj, keepBinary, true); else { assert cacheId == 0 || cacheId == cctx.cacheId(); @@ -318,7 +318,7 @@ public class GridCacheReturn implements Externalizable, Message { if (cacheObj != null) { cacheObj.finishUnmarshal(ctx.cacheObjectContext(), ldr); - v = ctx.cacheObjectContext().unwrapPortableIfNeeded(cacheObj, true, false); + v = ctx.cacheObjectContext().unwrapBinaryIfNeeded(cacheObj, true, false); } if (invokeRes && invokeResCol != null) { @@ -329,10 +329,10 @@ public class GridCacheReturn implements Externalizable, Message { for (CacheInvokeDirectResult res : invokeResCol) { CacheInvokeResult<?> res0 = res.error() == null ? - CacheInvokeResult.fromResult(ctx.cacheObjectContext().unwrapPortableIfNeeded(res.result(), true, false)) : + CacheInvokeResult.fromResult(ctx.cacheObjectContext().unwrapBinaryIfNeeded(res.result(), true, false)) : CacheInvokeResult.fromError(res.error()); - map0.put(ctx.cacheObjectContext().unwrapPortableIfNeeded(res.key(), true, false), res0); + map0.put(ctx.cacheObjectContext().unwrapBinaryIfNeeded(res.key(), true, false), res0); } v = map0; @@ -464,4 +464,4 @@ public class GridCacheReturn implements Externalizable, Message { @Override public String toString() { return S.toString(GridCacheReturn.class, this); } -} \ 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/IgniteCacheProxy.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/IgniteCacheProxy.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/IgniteCacheProxy.java index 8fd4323..1768ecf 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/IgniteCacheProxy.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/IgniteCacheProxy.java @@ -322,7 +322,7 @@ public class IgniteCacheProxy<K, V> extends AsyncSupportAdapter<IgniteCache<K, V /** {@inheritDoc} */ @Override public <K1, V1> IgniteCache<K1, V1> withKeepBinary() { - return keepPortable(); + return keepBinary(); } /** {@inheritDoc} */ @@ -455,13 +455,13 @@ public class IgniteCacheProxy<K, V> extends AsyncSupportAdapter<IgniteCache<K, V final CacheQuery<Map.Entry<K,V>> qry; final CacheQueryFuture<Map.Entry<K,V>> fut; - boolean isKeepPortable = opCtx != null && opCtx.isKeepBinary(); + boolean isKeepBinary = opCtx != null && opCtx.isKeepBinary(); if (filter instanceof ScanQuery) { IgniteBiPredicate<K, V> p = ((ScanQuery)filter).getFilter(); qry = ctx.queries().createScanQuery(p != null ? p : ACCEPT_ALL, ((ScanQuery)filter).getPartition(), - isKeepPortable); + isKeepBinary); if (grp != null) qry.projection(grp); @@ -476,7 +476,7 @@ public class IgniteCacheProxy<K, V> extends AsyncSupportAdapter<IgniteCache<K, V else if (filter instanceof TextQuery) { TextQuery p = (TextQuery)filter; - qry = ctx.queries().createFullTextQuery(p.getType(), p.getText(), isKeepPortable); + qry = ctx.queries().createFullTextQuery(p.getType(), p.getText(), isKeepBinary); if (grp != null) qry.projection(grp); @@ -489,7 +489,7 @@ public class IgniteCacheProxy<K, V> extends AsyncSupportAdapter<IgniteCache<K, V }, false); } else if (filter instanceof SpiQuery) { - qry = ctx.queries().createSpiQuery(isKeepPortable); + qry = ctx.queries().createSpiQuery(isKeepBinary); if (grp != null) qry.projection(grp); @@ -1718,30 +1718,30 @@ public class IgniteCacheProxy<K, V> extends AsyncSupportAdapter<IgniteCache<K, V } /** - * Creates projection that will operate with portable objects. <p> Projection returned by this method will force - * cache not to deserialize portable objects, so keys and values will be returned from cache API methods without - * changes. Therefore, signature of the projection can contain only following types: <ul> <li>{@code PortableObject} - * for portable classes</li> <li>All primitives (byte, int, ...) and there boxed versions (Byte, Integer, ...)</li> + * Creates projection that will operate with binary objects. <p> Projection returned by this method will force + * cache not to deserialize binary objects, so keys and values will be returned from cache API methods without + * changes. Therefore, signature of the projection can contain only following types: <ul> <li>{@code BinaryObject} + * for binary classes</li> <li>All primitives (byte, int, ...) and there boxed versions (Byte, Integer, ...)</li> * <li>Arrays of primitives (byte[], int[], ...)</li> <li>{@link String} and array of {@link String}s</li> * <li>{@link UUID} and array of {@link UUID}s</li> <li>{@link Date} and array of {@link Date}s</li> <li>{@link * java.sql.Timestamp} and array of {@link java.sql.Timestamp}s</li> <li>Enums and array of enums</li> <li> Maps, - * collections and array of objects (but objects inside them will still be converted if they are portable) </li> + * collections and array of objects (but objects inside them will still be converted if they are binary) </li> * </ul> <p> For example, if you use {@link Integer} as a key and {@code Value} class as a value (which will be - * stored in portable format), you should acquire following projection to avoid deserialization: + * stored in binary format), you should acquire following projection to avoid deserialization: * <pre> - * IgniteInternalCache<Integer, GridPortableObject> prj = cache.keepBinary(); + * IgniteInternalCache<Integer, GridBinaryObject> prj = cache.keepBinary(); * - * // Value is not deserialized and returned in portable format. - * GridPortableObject po = prj.get(1); + * // Value is not deserialized and returned in binary format. + * GridBinaryObject po = prj.get(1); * </pre> - * <p> Note that this method makes sense only if cache is working in portable mode ({@code - * CacheConfiguration#isPortableEnabled()} returns {@code true}. If not, this method is no-op and will return + * <p> Note that this method makes sense only if cache is working in binary mode ({@code + * CacheConfiguration#isBinaryEnabled()} returns {@code true}. If not, this method is no-op and will return * current projection. * - * @return Projection for portable objects. + * @return Projection for binary objects. */ @SuppressWarnings("unchecked") - public <K1, V1> IgniteCache<K1, V1> keepPortable() { + public <K1, V1> IgniteCache<K1, V1> keepBinary() { GridCacheGateway<K, V> gate = this.gate; CacheOperationContext prev = onEnter(gate, opCtx); http://git-wip-us.apache.org/repos/asf/ignite/blob/10b83fb8/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/IgniteInternalCache.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/IgniteInternalCache.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/IgniteInternalCache.java index 3150ea9..186de68 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/IgniteInternalCache.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/IgniteInternalCache.java @@ -169,31 +169,31 @@ import org.jetbrains.annotations.Nullable; * to any participating grid nodes. However, in case of redeployment, caches will be cleared and * all entries will be removed. This behavior is useful during development, but should not be * used in production. - * <h1 class="header">Portable Objects</h1> - * If an object is defined as portable Ignite cache will automatically store it in portable (i.e. binary) - * format. User can choose to work either with the portable format or with the deserialized form (assuming + * <h1 class="header">Binary Objects</h1> + * If an object is defined as binary Ignite cache will automatically store it in binary (i.e. binary) + * format. User can choose to work either with the binary format or with the deserialized form (assuming * that class definitions are present in the classpath). By default, cache works with deserialized form - * (example shows the case when {@link Integer} is used as a key for a portable object): + * (example shows the case when {@link Integer} is used as a key for a binary object): * <pre> * IgniteInternalCache<Integer, Value> prj = Ignition.grid().cache(null); * - * // Value will be serialized and stored in cache in portable format. + * // Value will be serialized and stored in cache in binary format. * prj.put(1, new Value()); * - * // Value will be deserialized since it's stored in portable format. + * // Value will be deserialized since it's stored in binary format. * Value val = prj.get(1); * </pre> * You won't be able to work with deserialized form if class definition for the {@code Value} is not on * classpath. Even if you have the class definition, you should always avoid full deserialization if it's not - * needed for performance reasons. To work with portable format directly you should create special projection - * using {@link #keepPortable()} method: + * needed for performance reasons. To work with binary format directly you should create special projection + * using {@link #keepBinary()} method: * <pre> - * IgniteInternalCache<Integer, GridPortableObject> prj = Ignition.grid().cache(null).keepBinary(); + * IgniteInternalCache<Integer, GridBinaryObject> prj = Ignition.grid().cache(null).keepBinary(); * - * // Value is not deserialized and returned in portable format. - * GridPortableObject po = prj.get(1); + * // Value is not deserialized and returned in binary format. + * GridBinaryObject po = prj.get(1); * </pre> - * See {@link #keepPortable()} method JavaDoc for more details. + * See {@link #keepBinary()} method JavaDoc for more details. */ public interface IgniteInternalCache<K, V> extends Iterable<Cache.Entry<K, V>> { /** @@ -225,13 +225,13 @@ public interface IgniteInternalCache<K, V> extends Iterable<Cache.Entry<K, V>> { public IgniteInternalCache<K, V> setSkipStore(boolean skipStore); /** - * Creates projection that will operate with portable objects. + * Creates projection that will operate with binary objects. * <p> - * Projection returned by this method will force cache not to deserialize portable objects, + * Projection returned by this method will force cache not to deserialize binary objects, * so keys and values will be returned from cache API methods without changes. Therefore, * signature of the projection can contain only following types: * <ul> - * <li><code>org.gridgain.grid.binary.PortableObject</code> for portable classes</li> + * <li><code>org.gridgain.grid.binary.BinaryObject</code> for binary classes</li> * <li>All primitives (byte, int, ...) and there boxed versions (Byte, Integer, ...)</li> * <li>Arrays of primitives (byte[], int[], ...)</li> * <li>{@link String} and array of {@link String}s</li> @@ -241,27 +241,27 @@ public interface IgniteInternalCache<K, V> extends Iterable<Cache.Entry<K, V>> { * <li>Enums and array of enums</li> * <li> * Maps, collections and array of objects (but objects inside - * them will still be converted if they are portable) + * them will still be converted if they are binary) * </li> * </ul> * <p> * For example, if you use {@link Integer} as a key and {@code Value} class as a value - * (which will be stored in portable format), you should acquire following projection + * (which will be stored in binary format), you should acquire following projection * to avoid deserialization: * <pre> - * IgniteInternalCache<Integer, GridPortableObject> prj = cache.keepBinary(); + * IgniteInternalCache<Integer, GridBinaryObject> prj = cache.keepBinary(); * - * // Value is not deserialized and returned in portable format. - * GridPortableObject po = prj.get(1); + * // Value is not deserialized and returned in binary format. + * GridBinaryObject po = prj.get(1); * </pre> * <p> - * Note that this method makes sense only if cache is working in portable mode - * (<code>org.apache.ignite.configuration.CacheConfiguration#isPortableEnabled()</code> returns {@code true}. If not, + * Note that this method makes sense only if cache is working in binary mode + * (<code>org.apache.ignite.configuration.CacheConfiguration#isBinaryEnabled()</code> returns {@code true}. If not, * this method is no-op and will return current projection. * - * @return New internal cache instance for portable objects. + * @return New internal cache instance for binary objects. */ - public <K1, V1> IgniteInternalCache<K1, V1> keepPortable(); + public <K1, V1> IgniteInternalCache<K1, V1> keepBinary(); /** * Returns {@code true} if this map contains no key-value mappings. http://git-wip-us.apache.org/repos/asf/ignite/blob/10b83fb8/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/binary/BinaryMetadataKey.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/binary/BinaryMetadataKey.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/binary/BinaryMetadataKey.java index f6204fb..1f2678b 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/binary/BinaryMetadataKey.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/binary/BinaryMetadataKey.java @@ -25,7 +25,7 @@ import org.apache.ignite.internal.processors.cache.GridCacheUtilityKey; import org.apache.ignite.internal.util.typedef.internal.S; /** - * Key for portable meta data. + * Key for binary meta data. */ class BinaryMetadataKey extends GridCacheUtilityKey<BinaryMetadataKey> implements Externalizable { /** */ http://git-wip-us.apache.org/repos/asf/ignite/blob/10b83fb8/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/binary/CacheDefaultBinaryAffinityKeyMapper.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/binary/CacheDefaultBinaryAffinityKeyMapper.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/binary/CacheDefaultBinaryAffinityKeyMapper.java index c0a4612..0ca06e3 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/binary/CacheDefaultBinaryAffinityKeyMapper.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/binary/CacheDefaultBinaryAffinityKeyMapper.java @@ -37,10 +37,10 @@ public class CacheDefaultBinaryAffinityKeyMapper extends GridCacheDefaultAffinit CacheObjectBinaryProcessorImpl proc = (CacheObjectBinaryProcessorImpl)kernal.context().cacheObjects(); try { - key = proc.toPortable(key); + key = proc.toBinary(key); } catch (IgniteException e) { - U.error(log, "Failed to marshal key to portable: " + key, e); + U.error(log, "Failed to marshal key to binary: " + key, e); } if (key instanceof BinaryObject) http://git-wip-us.apache.org/repos/asf/ignite/blob/10b83fb8/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/binary/CacheObjectBinaryContext.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/binary/CacheObjectBinaryContext.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/binary/CacheObjectBinaryContext.java index 039f5ce..ec01f48 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/binary/CacheObjectBinaryContext.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/binary/CacheObjectBinaryContext.java @@ -27,11 +27,11 @@ import org.apache.ignite.internal.processors.cache.GridCacheDefaultAffinityKeyMa */ public class CacheObjectBinaryContext extends CacheObjectContext { /** */ - private boolean portableEnabled; + private boolean binaryEnabled; /** * @param kernalCtx Kernal context. - * @param portableEnabled Portable enabled flag. + * @param binaryEnabled Binary enabled flag. * @param cpyOnGet Copy on get flag. * @param storeVal {@code True} if should store unmarshalled value in cache. * @param depEnabled {@code true} if deployment is enabled for the given cache. @@ -39,18 +39,18 @@ public class CacheObjectBinaryContext extends CacheObjectContext { public CacheObjectBinaryContext(GridKernalContext kernalCtx, boolean cpyOnGet, boolean storeVal, - boolean portableEnabled, + boolean binaryEnabled, boolean depEnabled) { - super(kernalCtx, portableEnabled ? new CacheDefaultBinaryAffinityKeyMapper() : + super(kernalCtx, binaryEnabled ? new CacheDefaultBinaryAffinityKeyMapper() : new GridCacheDefaultAffinityKeyMapper(), cpyOnGet, storeVal, depEnabled); - this.portableEnabled = portableEnabled; + this.binaryEnabled = binaryEnabled; } /** - * @return Portable enabled flag. + * @return Binary enabled flag. */ - public boolean portableEnabled() { - return portableEnabled; + public boolean binaryEnabled() { + return binaryEnabled; } } http://git-wip-us.apache.org/repos/asf/ignite/blob/10b83fb8/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/binary/CacheObjectBinaryProcessor.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/binary/CacheObjectBinaryProcessor.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/binary/CacheObjectBinaryProcessor.java index d5638a5..3578f7a 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/binary/CacheObjectBinaryProcessor.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/binary/CacheObjectBinaryProcessor.java @@ -38,12 +38,12 @@ public interface CacheObjectBinaryProcessor extends IgniteCacheObjectProcessor { public BinaryObjectBuilder builder(String clsName); /** - * Creates builder initialized by existing portable object. + * Creates builder initialized by existing binary object. * - * @param portableObj Portable object to edit. - * @return Portable builder. + * @param binaryObj Binary object to edit. + * @return Binary builder. */ - public BinaryObjectBuilder builder(BinaryObject portableObj); + public BinaryObjectBuilder builder(BinaryObject binaryObj); /** * @param typeId Type ID. @@ -92,15 +92,15 @@ public interface CacheObjectBinaryProcessor extends IgniteCacheObjectProcessor { public BinaryObject buildEnum(String typeName, int ord) throws IgniteException; /** - * @return Portables interface. + * @return Binaries interface. * @throws IgniteException If failed. */ public IgniteBinary binary() throws IgniteException; /** * @param obj Original object. - * @return Portable object (in case portable marshaller is used). + * @return Binary object (in case binary marshaller is used). * @throws IgniteException If failed. */ - public Object marshalToPortable(Object obj) throws IgniteException; + public Object marshalToBinary(Object obj) throws IgniteException; } http://git-wip-us.apache.org/repos/asf/ignite/blob/10b83fb8/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/binary/CacheObjectBinaryProcessorImpl.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/binary/CacheObjectBinaryProcessorImpl.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/binary/CacheObjectBinaryProcessorImpl.java index a9f0d74..e77b85a 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/binary/CacheObjectBinaryProcessorImpl.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/binary/CacheObjectBinaryProcessorImpl.java @@ -98,7 +98,7 @@ import org.jsr166.ConcurrentHashMap8; import sun.misc.Unsafe; /** - * Portable processor implementation. + * Binary processor implementation. */ public class CacheObjectBinaryProcessorImpl extends IgniteCacheObjectProcessorImpl implements CacheObjectBinaryProcessor { @@ -117,7 +117,7 @@ public class CacheObjectBinaryProcessorImpl extends IgniteCacheObjectProcessorIm /** */ private final ConcurrentHashMap8<Integer, BinaryTypeImpl> clientMetaDataCache; - /** Predicate to filter portable meta data in utility cache. */ + /** Predicate to filter binary meta data in utility cache. */ private final CacheEntryPredicate metaPred = new CacheEntryPredicateAdapter() { private static final long serialVersionUID = 0L; @@ -127,17 +127,17 @@ public class CacheObjectBinaryProcessorImpl extends IgniteCacheObjectProcessorIm }; /** */ - private BinaryContext portableCtx; + private BinaryContext binaryCtx; /** */ private Marshaller marsh; /** */ - private GridBinaryMarshaller portableMarsh; + private GridBinaryMarshaller binaryMarsh; /** */ @GridToStringExclude - private IgniteBinary portables; + private IgniteBinary binaries; /** Metadata updates collected before metadata cache is initialized. */ private final Map<Integer, BinaryMetadata> metaBuf = new ConcurrentHashMap<>(); @@ -193,7 +193,7 @@ public class CacheObjectBinaryProcessorImpl extends IgniteCacheObjectProcessorIm assert metaDataCache != null; - CacheObjectBinaryProcessorImpl.this.addMeta(typeId, newMeta0.wrap(portableCtx)); + CacheObjectBinaryProcessorImpl.this.addMeta(typeId, newMeta0.wrap(binaryCtx)); } @Override public BinaryType metadata(int typeId) throws BinaryObjectException { @@ -206,14 +206,14 @@ public class CacheObjectBinaryProcessorImpl extends IgniteCacheObjectProcessorIm BinaryMarshaller pMarh0 = (BinaryMarshaller)marsh; - portableCtx = new BinaryContext(metaHnd, ctx.config()); + binaryCtx = new BinaryContext(metaHnd, ctx.config()); - IgniteUtils.invoke(BinaryMarshaller.class, pMarh0, "setPortableContext", portableCtx, + IgniteUtils.invoke(BinaryMarshaller.class, pMarh0, "setBinaryContext", binaryCtx, ctx.config()); - portableMarsh = new GridBinaryMarshaller(portableCtx); + binaryMarsh = new GridBinaryMarshaller(binaryCtx); - portables = new IgniteBinaryImpl(ctx, this); + binaries = new IgniteBinaryImpl(ctx, this); } } @@ -286,7 +286,7 @@ public class CacheObjectBinaryProcessorImpl extends IgniteCacheObjectProcessorIm } for (Map.Entry<Integer, BinaryMetadata> e : metaBuf.entrySet()) - addMeta(e.getKey(), e.getValue().wrap(portableCtx)); + addMeta(e.getKey(), e.getValue().wrap(binaryCtx)); metaBuf.clear(); @@ -321,17 +321,17 @@ public class CacheObjectBinaryProcessorImpl extends IgniteCacheObjectProcessorIm res = oldMeta0; } - return res != null ? res.wrap(portableCtx) : null; + return res != null ? res.wrap(binaryCtx) : null; } }); } /** {@inheritDoc} */ @Override public int typeId(String typeName) { - if (portableCtx == null) + if (binaryCtx == null) return super.typeId(typeName); - return portableCtx.typeId(typeName); + return binaryCtx.typeId(typeName); } /** @@ -340,7 +340,7 @@ public class CacheObjectBinaryProcessorImpl extends IgniteCacheObjectProcessorIm * @throws org.apache.ignite.binary.BinaryObjectException If failed. */ public byte[] marshal(@Nullable Object obj) throws BinaryObjectException { - byte[] arr = portableMarsh.marshal(obj); + byte[] arr = binaryMarsh.marshal(obj); assert arr.length > 0; @@ -367,7 +367,7 @@ public class CacheObjectBinaryProcessorImpl extends IgniteCacheObjectProcessorIm BinaryInputStream in = new BinaryOffheapInputStream(ptr, size, forceHeap); - return portableMarsh.unmarshal(in); + return binaryMarsh.unmarshal(in); } else return U.copyMemory(ptr, size); @@ -375,11 +375,11 @@ public class CacheObjectBinaryProcessorImpl extends IgniteCacheObjectProcessorIm /** {@inheritDoc} */ @SuppressWarnings("unchecked") - @Override public Object marshalToPortable(@Nullable Object obj) throws BinaryObjectException { + @Override public Object marshalToBinary(@Nullable Object obj) throws BinaryObjectException { if (obj == null) return null; - if (BinaryUtils.isPortableType(obj.getClass())) + if (BinaryUtils.isBinaryType(obj.getClass())) return obj; if (obj instanceof Object[]) { @@ -388,7 +388,7 @@ public class CacheObjectBinaryProcessorImpl extends IgniteCacheObjectProcessorIm Object[] pArr = new Object[arr.length]; for (int i = 0; i < arr.length; i++) - pArr[i] = marshalToPortable(arr[i]); + pArr[i] = marshalToBinary(arr[i]); return pArr; } @@ -397,9 +397,9 @@ public class CacheObjectBinaryProcessorImpl extends IgniteCacheObjectProcessorIm IgniteBiTuple tup = (IgniteBiTuple)obj; if (obj instanceof T2) - return new T2<>(marshalToPortable(tup.get1()), marshalToPortable(tup.get2())); + return new T2<>(marshalToBinary(tup.get1()), marshalToBinary(tup.get2())); - return new IgniteBiTuple<>(marshalToPortable(tup.get1()), marshalToPortable(tup.get2())); + return new IgniteBiTuple<>(marshalToBinary(tup.get1()), marshalToBinary(tup.get2())); } if (obj instanceof Collection) { @@ -413,7 +413,7 @@ public class CacheObjectBinaryProcessorImpl extends IgniteCacheObjectProcessorIm pCol = new ArrayList<>(col.size()); for (Object item : col) - pCol.add(marshalToPortable(item)); + pCol.add(marshalToBinary(item)); return pCol; } @@ -424,7 +424,7 @@ public class CacheObjectBinaryProcessorImpl extends IgniteCacheObjectProcessorIm Map<Object, Object> pMap = BinaryUtils.newMap((Map<Object, Object>)obj); for (Map.Entry<?, ?> e : map.entrySet()) - pMap.put(marshalToPortable(e.getKey()), marshalToPortable(e.getValue())); + pMap.put(marshalToBinary(e.getKey()), marshalToBinary(e.getValue())); return pMap; } @@ -432,14 +432,14 @@ public class CacheObjectBinaryProcessorImpl extends IgniteCacheObjectProcessorIm if (obj instanceof Map.Entry) { Map.Entry<?, ?> e = (Map.Entry<?, ?>)obj; - return new GridMapEntry<>(marshalToPortable(e.getKey()), marshalToPortable(e.getValue())); + return new GridMapEntry<>(marshalToBinary(e.getKey()), marshalToBinary(e.getValue())); } - byte[] arr = portableMarsh.marshal(obj); + byte[] arr = binaryMarsh.marshal(obj); assert arr.length > 0; - Object obj0 = portableMarsh.unmarshal(arr, null); + Object obj0 = binaryMarsh.unmarshal(arr, null); // Possible if a class has writeObject method. if (obj0 instanceof BinaryObject) @@ -452,17 +452,17 @@ public class CacheObjectBinaryProcessorImpl extends IgniteCacheObjectProcessorIm * @return Marshaller. */ public GridBinaryMarshaller marshaller() { - return portableMarsh; + return binaryMarsh; } /** {@inheritDoc} */ @Override public BinaryObjectBuilder builder(String clsName) { - return new BinaryObjectBuilderImpl(portableCtx, clsName); + return new BinaryObjectBuilderImpl(binaryCtx, clsName); } /** {@inheritDoc} */ - @Override public BinaryObjectBuilder builder(BinaryObject portableObj) { - return BinaryObjectBuilderImpl.wrap(portableObj); + @Override public BinaryObjectBuilder builder(BinaryObject binaryObj) { + return BinaryObjectBuilderImpl.wrap(binaryObj); } /** {@inheritDoc} */ @@ -470,7 +470,7 @@ public class CacheObjectBinaryProcessorImpl extends IgniteCacheObjectProcessorIm Map<String, Integer> fieldTypeIds, boolean isEnum) throws BinaryObjectException { BinaryMetadata meta = new BinaryMetadata(typeId, typeName, fieldTypeIds, affKeyFieldName, null, isEnum); - portableCtx.updateMetadata(typeId, meta); + binaryCtx.updateMetadata(typeId, meta); } /** {@inheritDoc} */ @@ -507,7 +507,7 @@ public class CacheObjectBinaryProcessorImpl extends IgniteCacheObjectProcessorIm BinaryMetadata meta = metaDataCache.getTopologySafe(new BinaryMetadataKey(typeId)); - return meta != null ? meta.wrap(portableCtx) : null; + return meta != null ? meta.wrap(binaryCtx) : null; } else { BinaryMetadataKey key = new BinaryMetadataKey(typeId); @@ -517,7 +517,7 @@ public class CacheObjectBinaryProcessorImpl extends IgniteCacheObjectProcessorIm if (meta == null && !metaDataCache.context().preloader().syncFuture().isDone()) meta = metaDataCache.getTopologySafe(key); - return meta != null ? meta.wrap(portableCtx) : null; + return meta != null ? meta.wrap(binaryCtx) : null; } } catch (CacheException e) { @@ -539,7 +539,7 @@ public class CacheObjectBinaryProcessorImpl extends IgniteCacheObjectProcessorIm Map<Integer, BinaryType> res = U.newHashMap(meta.size()); for (Map.Entry<BinaryMetadataKey, BinaryMetadata> e : meta.entrySet()) - res.put(e.getKey().typeId(), e.getValue().wrap(portableCtx)); + res.put(e.getKey().typeId(), e.getValue().wrap(binaryCtx)); return res; } @@ -563,7 +563,7 @@ public class CacheObjectBinaryProcessorImpl extends IgniteCacheObjectProcessorIm private static final long serialVersionUID = 0L; @Override public BinaryType apply(Cache.Entry<BinaryMetadataKey, BinaryMetadata> e) { - return e.getValue().wrap(portableCtx); + return e.getValue().wrap(binaryCtx); } }); } @@ -573,30 +573,30 @@ public class CacheObjectBinaryProcessorImpl extends IgniteCacheObjectProcessorIm @Override public BinaryObject buildEnum(String typeName, int ord) throws IgniteException { typeName = BinaryContext.typeName(typeName); - int typeId = portableCtx.typeId(typeName); + int typeId = binaryCtx.typeId(typeName); updateMetadata(typeId, typeName, null, null, true); - return new BinaryEnumObjectImpl(portableCtx, typeId, null, ord); + return new BinaryEnumObjectImpl(binaryCtx, typeId, null, ord); } /** {@inheritDoc} */ @Override public IgniteBinary binary() throws IgniteException { - return portables; + return binaries; } /** {@inheritDoc} */ - @Override public boolean isPortableObject(Object obj) { + @Override public boolean isBinaryObject(Object obj) { return obj instanceof BinaryObject; } /** {@inheritDoc} */ - @Override public boolean isPortableEnabled(CacheConfiguration<?, ?> ccfg) { + @Override public boolean isBinaryEnabled(CacheConfiguration<?, ?> ccfg) { return marsh instanceof BinaryMarshaller; } /** - * @param po Portable object. + * @param po Binary object. * @return Affinity key. */ public Object affinityKey(BinaryObject po) { @@ -612,14 +612,14 @@ public class CacheObjectBinaryProcessorImpl extends IgniteCacheObjectProcessorIm else if (po instanceof BinaryObjectEx) { int id = ((BinaryObjectEx)po).typeId(); - String affKeyFieldName = portableCtx.affinityKeyFieldName(id); + String affKeyFieldName = binaryCtx.affinityKeyFieldName(id); if (affKeyFieldName != null) return po.field(affKeyFieldName); } } catch (BinaryObjectException e) { - U.error(log, "Failed to get affinity field from portable object: " + po, e); + U.error(log, "Failed to get affinity field from binary object: " + po, e); } return po; @@ -630,7 +630,7 @@ public class CacheObjectBinaryProcessorImpl extends IgniteCacheObjectProcessorIm if (obj == null) return 0; - return isPortableObject(obj) ? ((BinaryObjectEx)obj).typeId() : typeId(obj.getClass().getSimpleName()); + return isBinaryObject(obj) ? ((BinaryObjectEx)obj).typeId() : typeId(obj.getClass().getSimpleName()); } /** {@inheritDoc} */ @@ -638,7 +638,7 @@ public class CacheObjectBinaryProcessorImpl extends IgniteCacheObjectProcessorIm if (obj == null) return null; - return isPortableObject(obj) ? ((BinaryObject)obj).field(fieldName) : super.field(obj, fieldName); + return isBinaryObject(obj) ? ((BinaryObject)obj).field(fieldName) : super.field(obj, fieldName); } /** {@inheritDoc} */ @@ -647,17 +647,17 @@ public class CacheObjectBinaryProcessorImpl extends IgniteCacheObjectProcessorIm } /** - * @return Portable context. + * @return Binary context. */ - public BinaryContext portableContext() { - return portableCtx; + public BinaryContext binaryContext() { + return binaryCtx; } /** {@inheritDoc} */ @Override public CacheObjectContext contextForCache(CacheConfiguration cfg) throws IgniteCheckedException { assert cfg != null; - boolean portableEnabled = marsh instanceof BinaryMarshaller && !GridCacheUtils.isSystemCache(cfg.getName()) && + boolean binaryEnabled = marsh instanceof BinaryMarshaller && !GridCacheUtils.isSystemCache(cfg.getName()) && !GridCacheUtils.isIgfsCache(ctx.config(), cfg.getName()); CacheObjectContext ctx0 = super.contextForCache(cfg); @@ -665,7 +665,7 @@ public class CacheObjectBinaryProcessorImpl extends IgniteCacheObjectProcessorIm CacheObjectContext res = new CacheObjectBinaryContext(ctx, ctx0.copyOnGet(), ctx0.storeValue(), - portableEnabled, + binaryEnabled, ctx0.addDeploymentInfo()); ctx.resource().injectGeneric(res.defaultAffMapper()); @@ -675,10 +675,10 @@ public class CacheObjectBinaryProcessorImpl extends IgniteCacheObjectProcessorIm /** {@inheritDoc} */ @Override public byte[] marshal(CacheObjectContext ctx, Object val) throws IgniteCheckedException { - if (!((CacheObjectBinaryContext)ctx).portableEnabled() || portableMarsh == null) + if (!((CacheObjectBinaryContext)ctx).binaryEnabled() || binaryMarsh == null) return super.marshal(ctx, val); - byte[] arr = portableMarsh.marshal(val); + byte[] arr = binaryMarsh.marshal(val); assert arr.length > 0; @@ -688,22 +688,22 @@ public class CacheObjectBinaryProcessorImpl extends IgniteCacheObjectProcessorIm /** {@inheritDoc} */ @Override public Object unmarshal(CacheObjectContext ctx, byte[] bytes, ClassLoader clsLdr) throws IgniteCheckedException { - if (!((CacheObjectBinaryContext)ctx).portableEnabled() || portableMarsh == null) + if (!((CacheObjectBinaryContext)ctx).binaryEnabled() || binaryMarsh == null) return super.unmarshal(ctx, bytes, clsLdr); - return portableMarsh.unmarshal(bytes, clsLdr); + return binaryMarsh.unmarshal(bytes, clsLdr); } /** {@inheritDoc} */ @Override public KeyCacheObject toCacheKeyObject(CacheObjectContext ctx, Object obj, boolean userObj) { - if (!((CacheObjectBinaryContext)ctx).portableEnabled()) + if (!((CacheObjectBinaryContext)ctx).binaryEnabled()) return super.toCacheKeyObject(ctx, obj, userObj); if (obj instanceof KeyCacheObject) return (KeyCacheObject)obj; - if (((CacheObjectBinaryContext)ctx).portableEnabled()) { - obj = toPortable(obj); + if (((CacheObjectBinaryContext)ctx).binaryEnabled()) { + obj = toBinary(obj); if (obj instanceof BinaryObject) return (BinaryObjectImpl)obj; @@ -715,13 +715,13 @@ public class CacheObjectBinaryProcessorImpl extends IgniteCacheObjectProcessorIm /** {@inheritDoc} */ @Nullable @Override public CacheObject toCacheObject(CacheObjectContext ctx, @Nullable Object obj, boolean userObj) { - if (!((CacheObjectBinaryContext)ctx).portableEnabled()) + if (!((CacheObjectBinaryContext)ctx).binaryEnabled()) return super.toCacheObject(ctx, obj, userObj); if (obj == null || obj instanceof CacheObject) return (CacheObject)obj; - obj = toPortable(obj); + obj = toBinary(obj); if (obj instanceof BinaryObject) return (BinaryObjectImpl)obj; @@ -732,7 +732,7 @@ public class CacheObjectBinaryProcessorImpl extends IgniteCacheObjectProcessorIm /** {@inheritDoc} */ @Override public CacheObject toCacheObject(CacheObjectContext ctx, byte type, byte[] bytes) { if (type == BinaryObjectImpl.TYPE_BINARY) - return new BinaryObjectImpl(portableContext(), bytes, 0); + return new BinaryObjectImpl(binaryContext(), bytes, 0); return super.toCacheObject(ctx, type, bytes); } @@ -740,7 +740,7 @@ public class CacheObjectBinaryProcessorImpl extends IgniteCacheObjectProcessorIm /** {@inheritDoc} */ @Override public CacheObject toCacheObject(GridCacheContext ctx, long valPtr, boolean tmp) throws IgniteCheckedException { - if (!((CacheObjectBinaryContext)ctx.cacheObjectContext()).portableEnabled()) + if (!((CacheObjectBinaryContext)ctx.cacheObjectContext()).binaryEnabled()) return super.toCacheObject(ctx, valPtr, tmp); Object val = unmarshal(valPtr, !tmp); @@ -753,7 +753,7 @@ public class CacheObjectBinaryProcessorImpl extends IgniteCacheObjectProcessorIm /** {@inheritDoc} */ @Override public Object unwrapTemporary(GridCacheContext ctx, Object obj) throws BinaryObjectException { - if (!((CacheObjectBinaryContext)ctx.cacheObjectContext()).portableEnabled()) + if (!((CacheObjectBinaryContext)ctx.cacheObjectContext()).binaryEnabled()) return obj; if (obj instanceof BinaryObjectOffheapImpl) @@ -764,17 +764,17 @@ public class CacheObjectBinaryProcessorImpl extends IgniteCacheObjectProcessorIm /** * @param obj Object. - * @return Portable object. + * @return Binary object. * @throws IgniteException In case of error. */ - @Nullable public Object toPortable(@Nullable Object obj) throws IgniteException { + @Nullable public Object toBinary(@Nullable Object obj) throws IgniteException { if (obj == null) return null; - if (isPortableObject(obj)) + if (isBinaryObject(obj)) return obj; - return marshalToPortable(obj); + return marshalToBinary(obj); } /** http://git-wip-us.apache.org/repos/asf/ignite/blob/10b83fb8/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/binary/IgniteBinaryImpl.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/binary/IgniteBinaryImpl.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/binary/IgniteBinaryImpl.java index 4a225a5..1a2d0a9 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/binary/IgniteBinaryImpl.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/binary/IgniteBinaryImpl.java @@ -64,7 +64,7 @@ public class IgniteBinaryImpl implements IgniteBinary { guard(); try { - return (T)proc.marshalToPortable(obj); + return (T)proc.marshalToBinary(obj); } finally { unguard(); @@ -84,11 +84,11 @@ public class IgniteBinaryImpl implements IgniteBinary { } /** {@inheritDoc} */ - @Override public BinaryObjectBuilder builder(BinaryObject portableObj) { + @Override public BinaryObjectBuilder builder(BinaryObject binaryObj) { guard(); try { - return proc.builder(portableObj); + return proc.builder(binaryObj); } finally { unguard(); @@ -156,7 +156,7 @@ public class IgniteBinaryImpl implements IgniteBinary { } /** - * @return Portable processor. + * @return Binary processor. */ public IgniteCacheObjectProcessor processor() { return proc; http://git-wip-us.apache.org/repos/asf/ignite/blob/10b83fb8/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/binary/package-info.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/binary/package-info.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/binary/package-info.java index b0e5c2f..4e65d9c 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/binary/package-info.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/binary/package-info.java @@ -17,6 +17,6 @@ /** * <!-- Package description. --> - * Implementation of portable processor. + * Implementation of binary processor. */ package org.apache.ignite.internal.processors.cache.binary; http://git-wip-us.apache.org/repos/asf/ignite/blob/10b83fb8/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/datastructures/CacheDataStructuresManager.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/datastructures/CacheDataStructuresManager.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/datastructures/CacheDataStructuresManager.java index 6447194..f56cbf8 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/datastructures/CacheDataStructuresManager.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/datastructures/CacheDataStructuresManager.java @@ -311,15 +311,15 @@ public class CacheDataStructuresManager extends GridCacheManagerAdapter { * * @param key Key. * @param rmv {@code True} if entry was removed. - * @param keepPortable Keep portable flag. + * @param keepBinary Keep binary flag. */ - public void onEntryUpdated(KeyCacheObject key, boolean rmv, boolean keepPortable) { + public void onEntryUpdated(KeyCacheObject key, boolean rmv, boolean keepBinary) { // No need to notify data structures manager for a user cache since all DS objects are stored // in system caches. if (cctx.userCache()) return; - Object key0 = cctx.cacheObjectContext().unwrapPortableIfNeeded(key, keepPortable, false); + Object key0 = cctx.cacheObjectContext().unwrapBinaryIfNeeded(key, keepBinary, false); if (key0 instanceof SetItemKey) onSetItemUpdated((SetItemKey)key0, rmv); http://git-wip-us.apache.org/repos/asf/ignite/blob/10b83fb8/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/GridDistributedLockRequest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/GridDistributedLockRequest.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/GridDistributedLockRequest.java index 360eb0f..5d07b6f 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/GridDistributedLockRequest.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/GridDistributedLockRequest.java @@ -251,7 +251,7 @@ public class GridDistributedLockRequest extends GridDistributedBaseMessage { } /** - * @return Keep portable. + * @return Keep binary. */ public boolean keepBinary() { return (flags & KEEP_BINARY_FLAG_MASK) != 0; http://git-wip-us.apache.org/repos/asf/ignite/blob/10b83fb8/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/CacheDistributedGetFutureAdapter.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/CacheDistributedGetFutureAdapter.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/CacheDistributedGetFutureAdapter.java index 245ffc6..320c3c2 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/CacheDistributedGetFutureAdapter.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/CacheDistributedGetFutureAdapter.java @@ -77,8 +77,8 @@ public abstract class CacheDistributedGetFutureAdapter<K, V> extends GridCompoun /** Task name. */ protected String taskName; - /** Whether to deserialize portable objects. */ - protected boolean deserializePortable; + /** Whether to deserialize binary objects. */ + protected boolean deserializeBinary; /** Skip values flag. */ protected boolean skipVals; @@ -103,7 +103,7 @@ public abstract class CacheDistributedGetFutureAdapter<K, V> extends GridCompoun * if called on backup node. * @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. @@ -117,7 +117,7 @@ public abstract class CacheDistributedGetFutureAdapter<K, V> extends GridCompoun boolean forcePrimary, @Nullable UUID subjId, String taskName, - boolean deserializePortable, + boolean deserializeBinary, @Nullable IgniteCacheExpiryPolicy expiryPlc, boolean skipVals, boolean canRemap, @@ -134,7 +134,7 @@ public abstract class CacheDistributedGetFutureAdapter<K, V> extends GridCompoun this.forcePrimary = forcePrimary; this.subjId = subjId; this.taskName = taskName; - this.deserializePortable = deserializePortable; + this.deserializeBinary = deserializeBinary; this.expiryPlc = expiryPlc; this.skipVals = skipVals; this.canRemap = 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/GridDhtCacheAdapter.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtCacheAdapter.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtCacheAdapter.java index ff8d315..9199e70 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtCacheAdapter.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtCacheAdapter.java @@ -625,7 +625,7 @@ public abstract class GridDhtCacheAdapter<K, V> extends GridDistributedCacheAdap boolean skipTx, @Nullable UUID subjId, String taskName, - boolean deserializePortable, + boolean deserializeBinary, boolean skipVals, boolean canRemap ) { @@ -636,7 +636,7 @@ public abstract class GridDhtCacheAdapter<K, V> extends GridDistributedCacheAdap /*don't check local tx. */false, subjId, taskName, - deserializePortable, + deserializeBinary, forcePrimary, null, skipVals, @@ -1164,7 +1164,7 @@ public abstract class GridDhtCacheAdapter<K, V> extends GridDistributedCacheAdap assert primary || backup; if (primary && backup) - return iterator(map.entries0().iterator(), !ctx.keepPortable()); + return iterator(map.entries0().iterator(), !ctx.keepBinary()); else { final AffinityTopologyVersion topVer = ctx.affinity().affinityTopologyVersion(); @@ -1228,7 +1228,7 @@ public abstract class GridDhtCacheAdapter<K, V> extends GridDistributedCacheAdap } }; - return iterator(it, !ctx.keepPortable()); + return iterator(it, !ctx.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/GridDhtGetFuture.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtGetFuture.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtGetFuture.java index 626713a..e410228 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtGetFuture.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtGetFuture.java @@ -380,7 +380,7 @@ public final class GridDhtGetFuture<K, V> extends GridCompoundIdentityFuture<Col else { fut = tx.getAllAsync(cctx, keys.keySet(), - /*deserialize portable*/false, + /*deserialize binary*/false, skipVals, /*keep cache objects*/true, /*skip store*/!readThrough); @@ -410,7 +410,7 @@ public final class GridDhtGetFuture<K, V> extends GridCompoundIdentityFuture<Col else { return tx.getAllAsync(cctx, keys.keySet(), - /*deserialize portable*/false, + /*deserialize binary*/false, skipVals, /*keep cache objects*/true, /*skip store*/!readThrough); http://git-wip-us.apache.org/repos/asf/ignite/blob/10b83fb8/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridPartitionedGetFuture.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridPartitionedGetFuture.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridPartitionedGetFuture.java index 90a9da8..6867e21 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridPartitionedGetFuture.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridPartitionedGetFuture.java @@ -88,7 +88,7 @@ public class GridPartitionedGetFuture<K, V> extends CacheDistributedGetFutureAda * if called on backup node. * @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. @@ -103,7 +103,7 @@ public class GridPartitionedGetFuture<K, V> extends CacheDistributedGetFutureAda boolean forcePrimary, @Nullable UUID subjId, String taskName, - boolean deserializePortable, + boolean deserializeBinary, @Nullable IgniteCacheExpiryPolicy expiryPlc, boolean skipVals, boolean canRemap, @@ -116,7 +116,7 @@ public class GridPartitionedGetFuture<K, V> extends CacheDistributedGetFutureAda forcePrimary, subjId, taskName, - deserializePortable, + deserializeBinary, expiryPlc, skipVals, canRemap, @@ -400,7 +400,7 @@ public class GridPartitionedGetFuture<K, V> extends CacheDistributedGetFutureAda null, taskName, expiryPlc, - !deserializePortable); + !deserializeBinary); if (res != null) { v = res.get1(); @@ -420,7 +420,7 @@ public class GridPartitionedGetFuture<K, V> extends CacheDistributedGetFutureAda null, taskName, expiryPlc, - !deserializePortable); + !deserializeBinary); } colocated.context().evicts().touch(entry, topVer); @@ -439,7 +439,7 @@ public class GridPartitionedGetFuture<K, V> extends CacheDistributedGetFutureAda v, skipVals, keepCacheObjects, - deserializePortable, + deserializeBinary, true); return false; @@ -524,7 +524,7 @@ public class GridPartitionedGetFuture<K, V> extends CacheDistributedGetFutureAda info.value(), skipVals, keepCacheObjects, - deserializePortable, + deserializeBinary, false); } } http://git-wip-us.apache.org/repos/asf/ignite/blob/10b83fb8/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridPartitionedSingleGetFuture.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridPartitionedSingleGetFuture.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridPartitionedSingleGetFuture.java index 99cf210..f955bb6 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridPartitionedSingleGetFuture.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridPartitionedSingleGetFuture.java @@ -101,8 +101,8 @@ public class GridPartitionedSingleGetFuture extends GridFutureAdapter<Object> im /** Task name. */ private final String taskName; - /** Whether to deserialize portable objects. */ - private boolean deserializePortable; + /** Whether to deserialize binary objects. */ + private boolean deserializeBinary; /** Skip values flag. */ private boolean skipVals; @@ -130,7 +130,7 @@ public class GridPartitionedSingleGetFuture extends GridFutureAdapter<Object> im * @param forcePrimary If {@code true} then will force network trip to primary node even if called on backup node. * @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. @@ -145,7 +145,7 @@ public class GridPartitionedSingleGetFuture extends GridFutureAdapter<Object> im boolean forcePrimary, @Nullable UUID subjId, String taskName, - boolean deserializePortable, + boolean deserializeBinary, @Nullable IgniteCacheExpiryPolicy expiryPlc, boolean skipVals, boolean canRemap, @@ -160,7 +160,7 @@ public class GridPartitionedSingleGetFuture extends GridFutureAdapter<Object> im this.forcePrimary = forcePrimary; this.subjId = subjId; this.taskName = taskName; - this.deserializePortable = deserializePortable; + this.deserializeBinary = deserializeBinary; this.expiryPlc = expiryPlc; this.skipVals = skipVals; this.canRemap = canRemap; @@ -580,7 +580,7 @@ public class GridPartitionedSingleGetFuture extends GridFutureAdapter<Object> im } else { if (!keepCacheObjects) { - Object res = cctx.unwrapPortableIfNeeded(val, !deserializePortable && !skipVals); + Object res = cctx.unwrapBinaryIfNeeded(val, !deserializeBinary && !skipVals); onDone(res); }