You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ignite.apache.org by sb...@apache.org on 2015/12/14 07:00:42 UTC
[23/29] ignite git commit: ignite-2065: portable -> binary renaming
(methods, javadoc and etc.)
http://git-wip-us.apache.org/repos/asf/ignite/blob/10b83fb8/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/transactions/IgniteTxLocalAdapter.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/transactions/IgniteTxLocalAdapter.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/transactions/IgniteTxLocalAdapter.java
index 33c0fa9..a3aed34 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/transactions/IgniteTxLocalAdapter.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/transactions/IgniteTxLocalAdapter.java
@@ -714,7 +714,7 @@ public abstract class IgniteTxLocalAdapter extends IgniteTxAdapter
key,
e.cached().rawGetOrUnmarshal(true),
e.keepBinary()),
- cacheCtx.cacheObjectContext().unwrapPortableIfNeeded(val, e.keepBinary(), false));
+ cacheCtx.cacheObjectContext().unwrapBinaryIfNeeded(val, e.keepBinary(), false));
if (interceptorVal == null)
continue;
@@ -1342,7 +1342,7 @@ public abstract class IgniteTxLocalAdapter extends IgniteTxAdapter
* @param map Return map.
* @param missed Map of missed keys.
* @param keysCnt Keys count (to avoid call to {@code Collection.size()}).
- * @param deserializePortable Deserialize portable flag.
+ * @param deserializeBinary Deserialize binary flag.
* @param skipVals Skip values flag.
* @param keepCacheObjects Keep cache objects flag.
* @param skipStore Skip store flag.
@@ -1357,7 +1357,7 @@ public abstract class IgniteTxLocalAdapter extends IgniteTxAdapter
Map<K, V> map,
Map<KeyCacheObject, GridCacheVersion> missed,
int keysCnt,
- boolean deserializePortable,
+ boolean deserializeBinary,
boolean skipVals,
boolean keepCacheObjects,
boolean skipStore
@@ -1396,7 +1396,7 @@ public abstract class IgniteTxLocalAdapter extends IgniteTxAdapter
val = txEntry.applyEntryProcessors(val);
if (val != null)
- cacheCtx.addResult(map, key, val, skipVals, keepCacheObjects, deserializePortable, false);
+ cacheCtx.addResult(map, key, val, skipVals, keepCacheObjects, deserializeBinary, false);
}
else {
assert txEntry.op() == TRANSFORM;
@@ -1433,7 +1433,7 @@ public abstract class IgniteTxLocalAdapter extends IgniteTxAdapter
val,
skipVals,
keepCacheObjects,
- deserializePortable,
+ deserializeBinary,
false);
}
else
@@ -1479,7 +1479,7 @@ public abstract class IgniteTxLocalAdapter extends IgniteTxAdapter
null,
resolveTaskName(),
accessPlc,
- !deserializePortable) : null;
+ !deserializeBinary) : null;
if (res != null) {
val = res.get1();
@@ -1499,7 +1499,7 @@ public abstract class IgniteTxLocalAdapter extends IgniteTxAdapter
null,
resolveTaskName(),
accessPlc,
- !deserializePortable);
+ !deserializeBinary);
}
if (val != null) {
@@ -1508,7 +1508,7 @@ public abstract class IgniteTxLocalAdapter extends IgniteTxAdapter
val,
skipVals,
keepCacheObjects,
- deserializePortable,
+ deserializeBinary,
false);
}
else
@@ -1531,7 +1531,7 @@ public abstract class IgniteTxLocalAdapter extends IgniteTxAdapter
-1L,
null,
skipStore,
- !deserializePortable);
+ !deserializeBinary);
// As optimization, mark as checked immediately
// for non-pessimistic if value is not null.
@@ -1597,7 +1597,7 @@ public abstract class IgniteTxLocalAdapter extends IgniteTxAdapter
* @param cacheCtx Cache context.
* @param map Return map.
* @param missedMap Missed keys.
- * @param deserializePortable Deserialize portable flag.
+ * @param deserializeBinary Deserialize binary flag.
* @param skipVals Skip values flag.
* @param keepCacheObjects Keep cache objects flag.
* @param skipStore Skip store flag.
@@ -1607,7 +1607,7 @@ public abstract class IgniteTxLocalAdapter extends IgniteTxAdapter
final GridCacheContext cacheCtx,
final Map<K, V> map,
final Map<KeyCacheObject, GridCacheVersion> missedMap,
- final boolean deserializePortable,
+ final boolean deserializeBinary,
final boolean skipVals,
final boolean keepCacheObjects,
final boolean skipStore
@@ -1636,7 +1636,7 @@ public abstract class IgniteTxLocalAdapter extends IgniteTxAdapter
missedMap.keySet(),
skipVals,
needReadVer,
- !deserializePortable,
+ !deserializeBinary,
new GridInClosure3<KeyCacheObject, Object, GridCacheVersion>() {
@Override public void apply(KeyCacheObject key, Object val, GridCacheVersion loadVer) {
if (isRollbackOnly()) {
@@ -1676,7 +1676,7 @@ public abstract class IgniteTxLocalAdapter extends IgniteTxAdapter
visibleVal,
skipVals,
keepCacheObjects,
- deserializePortable,
+ deserializeBinary,
false);
}
}
@@ -1697,7 +1697,7 @@ public abstract class IgniteTxLocalAdapter extends IgniteTxAdapter
visibleVal,
skipVals,
keepCacheObjects,
- deserializePortable,
+ deserializeBinary,
false);
}
}
@@ -1710,7 +1710,7 @@ public abstract class IgniteTxLocalAdapter extends IgniteTxAdapter
@Override public <K, V> IgniteInternalFuture<Map<K, V>> getAllAsync(
final GridCacheContext cacheCtx,
Collection<KeyCacheObject> keys,
- final boolean deserializePortable,
+ final boolean deserializeBinary,
final boolean skipVals,
final boolean keepCacheObjects,
final boolean skipStore) {
@@ -1740,7 +1740,7 @@ public abstract class IgniteTxLocalAdapter extends IgniteTxAdapter
retMap,
missed,
keysCnt,
- deserializePortable,
+ deserializeBinary,
skipVals,
keepCacheObjects,
skipStore);
@@ -1773,7 +1773,7 @@ public abstract class IgniteTxLocalAdapter extends IgniteTxAdapter
for (KeyCacheObject cacheKey : lockKeys) {
K keyVal = (K)
(keepCacheObjects ? cacheKey :
- cacheCtx.cacheObjectContext().unwrapPortableIfNeeded(cacheKey, !deserializePortable));
+ cacheCtx.cacheObjectContext().unwrapBinaryIfNeeded(cacheKey, !deserializeBinary));
if (retMap.containsKey(keyVal))
// We already have a return value.
@@ -1823,7 +1823,7 @@ public abstract class IgniteTxLocalAdapter extends IgniteTxAdapter
val,
skipVals,
keepCacheObjects,
- deserializePortable,
+ deserializeBinary,
false);
}
@@ -1847,7 +1847,7 @@ public abstract class IgniteTxLocalAdapter extends IgniteTxAdapter
return checkMissed(cacheCtx,
retMap,
missed,
- deserializePortable,
+ deserializeBinary,
skipVals,
keepCacheObjects,
skipStore);
@@ -1913,7 +1913,7 @@ public abstract class IgniteTxLocalAdapter extends IgniteTxAdapter
return checkMissed(cacheCtx,
retMap,
missed,
- deserializePortable,
+ deserializeBinary,
skipVals,
keepCacheObjects,
skipStore);
@@ -3488,12 +3488,12 @@ public abstract class IgniteTxLocalAdapter extends IgniteTxAdapter
}
/**
- * Checks if portable values should be deserialized.
+ * Checks if binary values should be deserialized.
*
* @param cacheCtx Cache context.
* @return {@code True} if binary should be deserialized, {@code false} otherwise.
*/
- private boolean deserializePortables(GridCacheContext cacheCtx) {
+ private boolean deserializeBinaries(GridCacheContext cacheCtx) {
CacheOperationContext opCtx = cacheCtx.operationContextPerCall();
return opCtx == null || !opCtx.isKeepBinary();
http://git-wip-us.apache.org/repos/asf/ignite/blob/10b83fb8/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/transactions/IgniteTxLocalEx.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/transactions/IgniteTxLocalEx.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/transactions/IgniteTxLocalEx.java
index 24d880b..a5d3373 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/transactions/IgniteTxLocalEx.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/transactions/IgniteTxLocalEx.java
@@ -64,7 +64,7 @@ public interface IgniteTxLocalEx extends IgniteInternalTx {
/**
* @param cacheCtx Cache context.
* @param keys Keys to get.
- * @param deserializePortable Deserialize portable flag.
+ * @param deserializeBinary Deserialize binary flag.
* @param skipVals Skip values flag.
* @param keepCacheObjects Keep cache objects
* @param skipStore Skip store flag.
@@ -73,7 +73,7 @@ public interface IgniteTxLocalEx extends IgniteInternalTx {
public <K, V> IgniteInternalFuture<Map<K, V>> getAllAsync(
GridCacheContext cacheCtx,
Collection<KeyCacheObject> keys,
- boolean deserializePortable,
+ boolean deserializeBinary,
boolean skipVals,
boolean keepCacheObjects,
boolean skipStore);
@@ -196,4 +196,4 @@ public interface IgniteTxLocalEx extends IgniteInternalTx {
boolean needVer,
boolean keepBinary,
GridInClosure3<KeyCacheObject, Object, GridCacheVersion> c);
-}
\ 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/cacheobject/IgniteCacheObjectProcessor.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cacheobject/IgniteCacheObjectProcessor.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cacheobject/IgniteCacheObjectProcessor.java
index 239b1b9..cadf1a9 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cacheobject/IgniteCacheObjectProcessor.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cacheobject/IgniteCacheObjectProcessor.java
@@ -71,22 +71,22 @@ public interface IgniteCacheObjectProcessor extends GridProcessor {
@Nullable public CacheObject prepareForCache(@Nullable CacheObject obj, GridCacheContext cctx);
/**
- * Checks whether object is portable object.
+ * Checks whether object is binary object.
*
* @param obj Object to check.
- * @return {@code True} if object is already a portable object, {@code false} otherwise.
+ * @return {@code True} if object is already a binary object, {@code false} otherwise.
*/
- public boolean isPortableObject(Object obj);
+ public boolean isBinaryObject(Object obj);
/**
- * Checks whether given class is portable.
+ * Checks whether given class is binary.
*
- * @return {@code true} If portable objects are enabled.
+ * @return {@code true} If binary objects are enabled.
*/
- public boolean isPortableEnabled(CacheConfiguration<?, ?> ccfg);
+ public boolean isBinaryEnabled(CacheConfiguration<?, ?> ccfg);
/**
- * @param obj Portable object to get field from.
+ * @param obj Binary object to get field from.
* @param fieldName Field name.
* @return Field value.
*/
@@ -170,4 +170,4 @@ public interface IgniteCacheObjectProcessor extends GridProcessor {
* @return Ignite binary interface.
*/
public IgniteBinary binary();
-}
\ 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/cacheobject/IgniteCacheObjectProcessorImpl.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cacheobject/IgniteCacheObjectProcessorImpl.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cacheobject/IgniteCacheObjectProcessorImpl.java
index 0d36e0e..5b764b6 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cacheobject/IgniteCacheObjectProcessorImpl.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cacheobject/IgniteCacheObjectProcessorImpl.java
@@ -219,7 +219,7 @@ public class IgniteCacheObjectProcessorImpl extends GridProcessorAdapter impleme
ccfg.getAffinityMapper() != null ? ccfg.getAffinityMapper() : new GridCacheDefaultAffinityKeyMapper(),
ccfg.isCopyOnRead() && memMode != OFFHEAP_VALUES,
storeVal,
- ctx.config().isPeerClassLoadingEnabled() && !isPortableEnabled(ccfg));
+ ctx.config().isPeerClassLoadingEnabled() && !isBinaryEnabled(ccfg));
ctx.resource().injectGeneric(res.defaultAffMapper());
@@ -250,12 +250,12 @@ public class IgniteCacheObjectProcessorImpl extends GridProcessorAdapter impleme
}
/** {@inheritDoc} */
- @Override public boolean isPortableObject(Object obj) {
+ @Override public boolean isBinaryObject(Object obj) {
return false;
}
/** {@inheritDoc} */
- @Override public boolean isPortableEnabled(CacheConfiguration<?, ?> ccfg) {
+ @Override public boolean isBinaryEnabled(CacheConfiguration<?, ?> ccfg) {
return false;
}
http://git-wip-us.apache.org/repos/asf/ignite/blob/10b83fb8/modules/core/src/main/java/org/apache/ignite/internal/processors/cacheobject/NoOpBinary.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cacheobject/NoOpBinary.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cacheobject/NoOpBinary.java
index 80e7b39..c1c8fed 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cacheobject/NoOpBinary.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cacheobject/NoOpBinary.java
@@ -44,7 +44,7 @@ public class NoOpBinary implements IgniteBinary {
}
/** {@inheritDoc} */
- @Override public BinaryObjectBuilder builder(BinaryObject portableObj) throws BinaryObjectException {
+ @Override public BinaryObjectBuilder builder(BinaryObject binaryObj) throws BinaryObjectException {
throw unsupported();
}
http://git-wip-us.apache.org/repos/asf/ignite/blob/10b83fb8/modules/core/src/main/java/org/apache/ignite/internal/processors/datastreamer/DataStreamerEntry.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/datastreamer/DataStreamerEntry.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/datastreamer/DataStreamerEntry.java
index 874d2e2..d1c0cc3 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/datastreamer/DataStreamerEntry.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/datastreamer/DataStreamerEntry.java
@@ -85,7 +85,7 @@ public class DataStreamerEntry implements Map.Entry<KeyCacheObject, CacheObject>
public <K, V> Map.Entry<K, V> toEntry(final GridCacheContext ctx, final boolean keepBinary) {
return new Map.Entry<K, V>() {
@Override public K getKey() {
- return (K)ctx.cacheObjectContext().unwrapPortableIfNeeded(key, keepBinary, false);
+ return (K)ctx.cacheObjectContext().unwrapBinaryIfNeeded(key, keepBinary, false);
}
@Override public V setValue(V val) {
@@ -93,7 +93,7 @@ public class DataStreamerEntry implements Map.Entry<KeyCacheObject, CacheObject>
}
@Override public V getValue() {
- return (V)ctx.cacheObjectContext().unwrapPortableIfNeeded(val, keepBinary, false);
+ return (V)ctx.cacheObjectContext().unwrapBinaryIfNeeded(val, keepBinary, false);
}
};
}
@@ -170,4 +170,4 @@ public class DataStreamerEntry implements Map.Entry<KeyCacheObject, CacheObject>
@Override public String toString() {
return S.toString(DataStreamerEntry.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/platform/PlatformAbstractPredicate.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/platform/PlatformAbstractPredicate.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/platform/PlatformAbstractPredicate.java
index bcfe19e..fa792f9 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/platform/PlatformAbstractPredicate.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/platform/PlatformAbstractPredicate.java
@@ -26,7 +26,7 @@ import java.io.ObjectOutput;
* Base interop predicate. Delegates apply to native platform.
*/
public abstract class PlatformAbstractPredicate implements Externalizable {
- /** .Net portable predicate */
+ /** .Net binary predicate */
protected Object pred;
/** Pointer to deployed predicate. */
@@ -45,7 +45,7 @@ public abstract class PlatformAbstractPredicate implements Externalizable {
/**
* Constructor.
*
- * @param pred .Net portable predicate.
+ * @param pred .Net binary predicate.
* @param ptr Pointer to predicate in the native platform.
* @param ctx Kernal context.
*/
@@ -64,4 +64,4 @@ public abstract class PlatformAbstractPredicate implements Externalizable {
@Override public void readExternal(ObjectInput in) throws IOException, ClassNotFoundException {
pred = in.readObject();
}
-}
\ 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/platform/PlatformAbstractTarget.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/platform/PlatformAbstractTarget.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/platform/PlatformAbstractTarget.java
index 9c783aa..34a2cca 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/platform/PlatformAbstractTarget.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/platform/PlatformAbstractTarget.java
@@ -229,7 +229,7 @@ public abstract class PlatformAbstractTarget implements PlatformTarget {
* Process IN operation.
*
* @param type Type.
- * @param reader Portable reader.
+ * @param reader Binary reader.
* @return Result.
* @throws IgniteCheckedException In case of exception.
*/
@@ -241,8 +241,8 @@ public abstract class PlatformAbstractTarget implements PlatformTarget {
* Process IN-OUT operation.
*
* @param type Type.
- * @param reader Portable reader.
- * @param writer Portable writer.
+ * @param reader Binary reader.
+ * @param writer Binary writer.
* @throws IgniteCheckedException In case of exception.
*/
protected void processInStreamOutStream(int type, BinaryRawReaderEx reader, BinaryRawWriterEx writer)
@@ -254,7 +254,7 @@ public abstract class PlatformAbstractTarget implements PlatformTarget {
* Process IN operation with managed object as result.
*
* @param type Type.
- * @param reader Portable reader.
+ * @param reader Binary reader.
* @return Result.
* @throws IgniteCheckedException In case of exception.
*/
@@ -267,8 +267,8 @@ public abstract class PlatformAbstractTarget implements PlatformTarget {
*
* @param type Type.
* @param arg Argument.
- * @param reader Portable reader.
- * @param writer Portable writer.
+ * @param reader Binary reader.
+ * @param writer Binary writer.
* @throws IgniteCheckedException In case of exception.
*/
protected void processInObjectStreamOutStream(int type, @Nullable Object arg, BinaryRawReaderEx reader,
@@ -290,7 +290,7 @@ public abstract class PlatformAbstractTarget implements PlatformTarget {
* Process OUT operation.
*
* @param type Type.
- * @param writer Portable writer.
+ * @param writer Binary writer.
* @throws IgniteCheckedException In case of exception.
*/
protected void processOutStream(int type, BinaryRawWriterEx writer) throws IgniteCheckedException {
http://git-wip-us.apache.org/repos/asf/ignite/blob/10b83fb8/modules/core/src/main/java/org/apache/ignite/internal/processors/platform/PlatformContext.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/platform/PlatformContext.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/platform/PlatformContext.java
index b8f5912..b05d331 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/platform/PlatformContext.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/platform/PlatformContext.java
@@ -260,10 +260,10 @@ public interface PlatformContext {
*
* @param rcv Native receiver.
* @param ptr Pointer.
- * @param keepPortable Keep portable flag.
+ * @param keepBinary Keep binary flag.
* @return Stream receiver.
*/
- public PlatformStreamReceiver createStreamReceiver(Object rcv, long ptr, boolean keepPortable);
+ public PlatformStreamReceiver createStreamReceiver(Object rcv, long ptr, boolean keepBinary);
/**
* Create cluster node filter.
http://git-wip-us.apache.org/repos/asf/ignite/blob/10b83fb8/modules/core/src/main/java/org/apache/ignite/internal/processors/platform/PlatformContextImpl.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/platform/PlatformContextImpl.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/platform/PlatformContextImpl.java
index f69ea3e..c531718 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/platform/PlatformContextImpl.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/platform/PlatformContextImpl.java
@@ -384,7 +384,7 @@ public class PlatformContextImpl implements PlatformContext {
}
/**
- * Write portable metadata.
+ * Write binary metadata.
*
* @param writer Writer.
* @param typeId Type id.
@@ -612,8 +612,8 @@ public class PlatformContextImpl implements PlatformContext {
}
/** {@inheritDoc} */
- @Override public PlatformStreamReceiver createStreamReceiver(Object rcv, long ptr, boolean keepPortable) {
- return new PlatformStreamReceiverImpl(rcv, ptr, keepPortable, this);
+ @Override public PlatformStreamReceiver createStreamReceiver(Object rcv, long ptr, boolean keepBinary) {
+ return new PlatformStreamReceiverImpl(rcv, ptr, keepBinary, this);
}
/** {@inheritDoc} */
http://git-wip-us.apache.org/repos/asf/ignite/blob/10b83fb8/modules/core/src/main/java/org/apache/ignite/internal/processors/platform/PlatformNoopProcessor.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/platform/PlatformNoopProcessor.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/platform/PlatformNoopProcessor.java
index d49d3e2..9142543 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/platform/PlatformNoopProcessor.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/platform/PlatformNoopProcessor.java
@@ -79,7 +79,7 @@ public class PlatformNoopProcessor extends GridProcessorAdapter implements Platf
}
/** {@inheritDoc} */
- @Override public PlatformTarget dataStreamer(@Nullable String cacheName, boolean keepPortable) throws IgniteCheckedException {
+ @Override public PlatformTarget dataStreamer(@Nullable String cacheName, boolean keepBinary) throws IgniteCheckedException {
return null;
}
@@ -119,7 +119,7 @@ public class PlatformNoopProcessor extends GridProcessorAdapter implements Platf
}
/** {@inheritDoc} */
- @Override public void registerStore(PlatformCacheStore store, boolean convertPortable)
+ @Override public void registerStore(PlatformCacheStore store, boolean convertBinary)
throws IgniteCheckedException {
// No-op.
}
http://git-wip-us.apache.org/repos/asf/ignite/blob/10b83fb8/modules/core/src/main/java/org/apache/ignite/internal/processors/platform/PlatformProcessor.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/platform/PlatformProcessor.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/platform/PlatformProcessor.java
index 5c6490f..fa22953 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/platform/PlatformProcessor.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/platform/PlatformProcessor.java
@@ -102,11 +102,11 @@ public interface PlatformProcessor extends GridProcessor {
* Get data streamer.
*
* @param cacheName Cache name.
- * @param keepPortable Portable flag.
+ * @param keepBinary Binary flag.
* @return Data streamer.
* @throws IgniteCheckedException If failed.
*/
- public PlatformTarget dataStreamer(@Nullable String cacheName, boolean keepPortable) throws IgniteCheckedException;
+ public PlatformTarget dataStreamer(@Nullable String cacheName, boolean keepBinary) throws IgniteCheckedException;
/**
* Get transactions.
@@ -166,10 +166,10 @@ public interface PlatformProcessor extends GridProcessor {
* Register cache store.
*
* @param store Store.
- * @param convertPortable Convert portable flag.
+ * @param convertBinary Convert binary flag.
* @throws IgniteCheckedException If failed.
*/
- public void registerStore(PlatformCacheStore store, boolean convertPortable) throws IgniteCheckedException;
+ public void registerStore(PlatformCacheStore store, boolean convertBinary) throws IgniteCheckedException;
/**
* Get or create AtomicLong.
http://git-wip-us.apache.org/repos/asf/ignite/blob/10b83fb8/modules/core/src/main/java/org/apache/ignite/internal/processors/platform/PlatformProcessorImpl.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/platform/PlatformProcessorImpl.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/platform/PlatformProcessorImpl.java
index a788775..b0870bb 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/platform/PlatformProcessorImpl.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/platform/PlatformProcessorImpl.java
@@ -136,7 +136,7 @@ public class PlatformProcessorImpl extends GridProcessorAdapter implements Platf
try {
for (StoreInfo store : pendingStores)
- registerStore0(store.store, store.convertPortable);
+ registerStore0(store.store, store.convertBinary);
pendingStores.clear();
@@ -222,7 +222,7 @@ public class PlatformProcessorImpl extends GridProcessorAdapter implements Platf
if (cache == null)
throw new IllegalArgumentException("Cache doesn't exist: " + name);
- return new PlatformCache(platformCtx, cache.keepPortable(), false);
+ return new PlatformCache(platformCtx, cache.keepBinary(), false);
}
/** {@inheritDoc} */
@@ -231,7 +231,7 @@ public class PlatformProcessorImpl extends GridProcessorAdapter implements Platf
assert cache != null;
- return new PlatformCache(platformCtx, cache.keepPortable(), false);
+ return new PlatformCache(platformCtx, cache.keepBinary(), false);
}
/** {@inheritDoc} */
@@ -240,7 +240,7 @@ public class PlatformProcessorImpl extends GridProcessorAdapter implements Platf
assert cache != null;
- return new PlatformCache(platformCtx, cache.keepPortable(), false);
+ return new PlatformCache(platformCtx, cache.keepBinary(), false);
}
/** {@inheritDoc} */
@@ -249,13 +249,13 @@ public class PlatformProcessorImpl extends GridProcessorAdapter implements Platf
}
/** {@inheritDoc} */
- @Override public PlatformTarget dataStreamer(@Nullable String cacheName, boolean keepPortable)
+ @Override public PlatformTarget dataStreamer(@Nullable String cacheName, boolean keepBinary)
throws IgniteCheckedException {
IgniteDataStreamer ldr = ctx.dataStream().dataStreamer(cacheName);
ldr.keepBinary(true);
- return new PlatformDataStreamer(platformCtx, cacheName, (DataStreamerImpl)ldr, keepPortable);
+ return new PlatformDataStreamer(platformCtx, cacheName, (DataStreamerImpl)ldr, keepBinary);
}
/** {@inheritDoc} */
@@ -304,7 +304,7 @@ public class PlatformProcessorImpl extends GridProcessorAdapter implements Platf
}
/** {@inheritDoc} */
- @Override public void registerStore(PlatformCacheStore store, boolean convertPortable)
+ @Override public void registerStore(PlatformCacheStore store, boolean convertBinary)
throws IgniteCheckedException {
storeLock.readLock().lock();
@@ -314,9 +314,9 @@ public class PlatformProcessorImpl extends GridProcessorAdapter implements Platf
store);
if (started)
- registerStore0(store, convertPortable);
+ registerStore0(store, convertBinary);
else
- pendingStores.add(new StoreInfo(store, convertPortable));
+ pendingStores.add(new StoreInfo(store, convertBinary));
}
finally {
storeLock.readLock().unlock();
@@ -337,14 +337,14 @@ public class PlatformProcessorImpl extends GridProcessorAdapter implements Platf
* Internal store initialization routine.
*
* @param store Store.
- * @param convertPortable Convert portable flag.
+ * @param convertBinary Convert binary flag.
* @throws IgniteCheckedException If failed.
*/
- private void registerStore0(PlatformCacheStore store, boolean convertPortable) throws IgniteCheckedException {
+ private void registerStore0(PlatformCacheStore store, boolean convertBinary) throws IgniteCheckedException {
if (store instanceof PlatformDotNetCacheStore) {
PlatformDotNetCacheStore store0 = (PlatformDotNetCacheStore)store;
- store0.initialize(ctx, convertPortable);
+ store0.initialize(ctx, convertBinary);
}
else
throw new IgniteCheckedException("Unsupported interop store: " + store);
@@ -357,18 +357,18 @@ public class PlatformProcessorImpl extends GridProcessorAdapter implements Platf
/** Store. */
private final PlatformCacheStore store;
- /** Convert portable flag. */
- private final boolean convertPortable;
+ /** Convert binary flag. */
+ private final boolean convertBinary;
/**
* Constructor.
*
* @param store Store.
- * @param convertPortable Convert portable flag.
+ * @param convertBinary Convert binary flag.
*/
- private StoreInfo(PlatformCacheStore store, boolean convertPortable) {
+ private StoreInfo(PlatformCacheStore store, boolean convertBinary) {
this.store = store;
- this.convertPortable = convertPortable;
+ this.convertBinary = convertBinary;
}
}
}
http://git-wip-us.apache.org/repos/asf/ignite/blob/10b83fb8/modules/core/src/main/java/org/apache/ignite/internal/processors/platform/cache/PlatformCache.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/platform/cache/PlatformCache.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/platform/cache/PlatformCache.java
index da7a15d..2f7cab2 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/platform/cache/PlatformCache.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/platform/cache/PlatformCache.java
@@ -180,7 +180,7 @@ public class PlatformCache extends PlatformAbstractTarget {
private final IgniteCacheProxy cache;
/** Whether this cache is created with "keepBinary" flag on the other side. */
- private final boolean keepPortable;
+ private final boolean keepBinary;
/** */
private static final GetAllWriter WRITER_GET_ALL = new GetAllWriter();
@@ -202,13 +202,13 @@ public class PlatformCache extends PlatformAbstractTarget {
*
* @param platformCtx Context.
* @param cache Underlying cache.
- * @param keepPortable Keep portable flag.
+ * @param keepBinary Keep binary flag.
*/
- public PlatformCache(PlatformContext platformCtx, IgniteCache cache, boolean keepPortable) {
+ public PlatformCache(PlatformContext platformCtx, IgniteCache cache, boolean keepBinary) {
super(platformCtx);
this.cache = (IgniteCacheProxy)cache;
- this.keepPortable = keepPortable;
+ this.keepBinary = keepBinary;
}
/**
@@ -220,16 +220,16 @@ public class PlatformCache extends PlatformAbstractTarget {
if (cache.delegate().skipStore())
return this;
- return new PlatformCache(platformCtx, cache.withSkipStore(), keepPortable);
+ return new PlatformCache(platformCtx, cache.withSkipStore(), keepBinary);
}
/**
- * Gets cache with "keep portable" flag.
+ * Gets cache with "keep binary" flag.
*
- * @return Cache with "keep portable" flag set.
+ * @return Cache with "keep binary" flag set.
*/
- public PlatformCache withKeepPortable() {
- if (keepPortable)
+ public PlatformCache withKeepBinary() {
+ if (keepBinary)
return this;
return new PlatformCache(platformCtx, cache.withKeepBinary(), true);
@@ -246,7 +246,7 @@ public class PlatformCache extends PlatformAbstractTarget {
public PlatformCache withExpiryPolicy(final long create, final long update, final long access) {
IgniteCache cache0 = cache.withExpiryPolicy(new InteropExpiryPolicy(create, update, access));
- return new PlatformCache(platformCtx, cache0, keepPortable);
+ return new PlatformCache(platformCtx, cache0, keepBinary);
}
/**
@@ -258,7 +258,7 @@ public class PlatformCache extends PlatformAbstractTarget {
if (cache.isAsync())
return this;
- return new PlatformCache(platformCtx, (IgniteCache)cache.withAsync(), keepPortable);
+ return new PlatformCache(platformCtx, (IgniteCache)cache.withAsync(), keepBinary);
}
/**
@@ -272,7 +272,7 @@ public class PlatformCache extends PlatformAbstractTarget {
if (opCtx != null && opCtx.noRetries())
return this;
- return new PlatformCache(platformCtx, cache.withNoRetries(), keepPortable);
+ return new PlatformCache(platformCtx, cache.withNoRetries(), keepBinary);
}
/** {@inheritDoc} */
@@ -623,10 +623,10 @@ public class PlatformCache extends PlatformAbstractTarget {
@Override public Exception convertException(Exception e) {
if (e instanceof CachePartialUpdateException)
return new PlatformCachePartialUpdateException((CachePartialUpdateCheckedException)e.getCause(),
- platformCtx, keepPortable);
+ platformCtx, keepBinary);
if (e instanceof CachePartialUpdateCheckedException)
- return new PlatformCachePartialUpdateException((CachePartialUpdateCheckedException)e, platformCtx, keepPortable);
+ return new PlatformCachePartialUpdateException((CachePartialUpdateCheckedException)e, platformCtx, keepBinary);
if (e.getCause() instanceof EntryProcessorException)
return (EntryProcessorException) e.getCause();
http://git-wip-us.apache.org/repos/asf/ignite/blob/10b83fb8/modules/core/src/main/java/org/apache/ignite/internal/processors/platform/cache/PlatformCacheEntryFilterImpl.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/platform/cache/PlatformCacheEntryFilterImpl.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/platform/cache/PlatformCacheEntryFilterImpl.java
index d027a9a..4c86d6d 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/platform/cache/PlatformCacheEntryFilterImpl.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/platform/cache/PlatformCacheEntryFilterImpl.java
@@ -43,7 +43,7 @@ public class PlatformCacheEntryFilterImpl extends PlatformAbstractPredicate impl
/**
* Constructor.
*
- * @param pred .Net portable predicate.
+ * @param pred .Net binary predicate.
* @param ptr Pointer to predicate in the native platform.
* @param ctx Kernal context.
*/
http://git-wip-us.apache.org/repos/asf/ignite/blob/10b83fb8/modules/core/src/main/java/org/apache/ignite/internal/processors/platform/cache/PlatformCacheEntryProcessorImpl.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/platform/cache/PlatformCacheEntryProcessorImpl.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/platform/cache/PlatformCacheEntryProcessorImpl.java
index 3986a13..3e8ad61 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/platform/cache/PlatformCacheEntryProcessorImpl.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/platform/cache/PlatformCacheEntryProcessorImpl.java
@@ -52,13 +52,13 @@ public class PlatformCacheEntryProcessorImpl implements PlatformCacheEntryProces
/** Indicates that remove has been called on an entry */
private static final byte ENTRY_STATE_REMOVED = 2;
- /** Indicates error in processor that is written as portable. */
- private static final byte ENTRY_STATE_ERR_PORTABLE = 3;
+ /** Indicates error in processor that is written as binary. */
+ private static final byte ENTRY_STATE_ERR_BINARY = 3;
/** Indicates error in processor that is written as string. */
private static final byte ENTRY_STATE_ERR_STRING = 4;
- /** Native portable processor */
+ /** Native binary processor */
private Object proc;
/** Pointer to processor in the native platform. */
@@ -74,7 +74,7 @@ public class PlatformCacheEntryProcessorImpl implements PlatformCacheEntryProces
/**
* Constructor.
*
- * @param proc Native portable processor
+ * @param proc Native binary processor
* @param ptr Pointer to processor in the native platform.
*/
public PlatformCacheEntryProcessorImpl(Object proc, long ptr) {
@@ -184,7 +184,7 @@ public class PlatformCacheEntryProcessorImpl implements PlatformCacheEntryProces
break;
- case ENTRY_STATE_ERR_PORTABLE:
+ case ENTRY_STATE_ERR_BINARY:
// Full exception
Object nativeErr = reader.readObjectDetached();
http://git-wip-us.apache.org/repos/asf/ignite/blob/10b83fb8/modules/core/src/main/java/org/apache/ignite/internal/processors/platform/cache/PlatformCachePartialUpdateException.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/platform/cache/PlatformCachePartialUpdateException.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/platform/cache/PlatformCachePartialUpdateException.java
index 8cb1490..c3cc434 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/platform/cache/PlatformCachePartialUpdateException.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/platform/cache/PlatformCachePartialUpdateException.java
@@ -32,27 +32,27 @@ public class PlatformCachePartialUpdateException extends PlatformExtendedExcepti
/** */
private static final long serialVersionUID = 0L;
- /** Keep portable flag. */
- private final boolean keepPortable;
+ /** Keep binary flag. */
+ private final boolean keepBinary;
/**
* Constructor.
*
* @param cause Root cause.
* @param ctx Context.
- * @param keepPortable Keep portable flag.
+ * @param keepBinary Keep binary flag.
*/
public PlatformCachePartialUpdateException(CachePartialUpdateCheckedException cause, PlatformContext ctx,
- boolean keepPortable) {
+ boolean keepBinary) {
super(cause, ctx);
- this.keepPortable = keepPortable;
+ this.keepBinary = keepBinary;
}
/** {@inheritDoc} */
@Override public void writeData(BinaryRawWriterEx writer) {
Collection keys = ((CachePartialUpdateCheckedException)getCause()).failedKeys();
- writer.writeBoolean(keepPortable);
+ writer.writeBoolean(keepBinary);
PlatformUtils.writeNullableCollection(writer, keys);
}
http://git-wip-us.apache.org/repos/asf/ignite/blob/10b83fb8/modules/core/src/main/java/org/apache/ignite/internal/processors/platform/callback/PlatformCallbackGateway.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/platform/callback/PlatformCallbackGateway.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/platform/callback/PlatformCallbackGateway.java
index 5d5cdb8..47862a2 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/platform/callback/PlatformCallbackGateway.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/platform/callback/PlatformCallbackGateway.java
@@ -426,13 +426,13 @@ public class PlatformCallbackGateway {
* @param ptr Receiver native pointer.
* @param cache Cache object.
* @param memPtr Stream pointer.
- * @param keepPortable Portable flag.
+ * @param keepBinary Binary flag.
*/
- public void dataStreamerStreamReceiverInvoke(long ptr, Object cache, long memPtr, boolean keepPortable) {
+ public void dataStreamerStreamReceiverInvoke(long ptr, Object cache, long memPtr, boolean keepBinary) {
enter();
try {
- PlatformCallbackUtils.dataStreamerStreamReceiverInvoke(envPtr, ptr, cache, memPtr, keepPortable);
+ PlatformCallbackUtils.dataStreamerStreamReceiverInvoke(envPtr, ptr, cache, memPtr, keepBinary);
}
finally {
leave();
@@ -940,4 +940,4 @@ public class PlatformCallbackGateway {
protected void block() {
lock.block();
}
-}
\ 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/platform/callback/PlatformCallbackUtils.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/platform/callback/PlatformCallbackUtils.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/platform/callback/PlatformCallbackUtils.java
index 64749ea..7f3ba6f 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/platform/callback/PlatformCallbackUtils.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/platform/callback/PlatformCallbackUtils.java
@@ -223,10 +223,10 @@ public class PlatformCallbackUtils {
* @param ptr Receiver native pointer.
* @param cache Cache object.
* @param memPtr Stream pointer.
- * @param keepPortable Portable flag.
+ * @param keepBinary Binary flag.
*/
static native void dataStreamerStreamReceiverInvoke(long envPtr, long ptr, Object cache, long memPtr,
- boolean keepPortable);
+ boolean keepBinary);
/**
* Notify future with byte result.
@@ -487,4 +487,4 @@ public class PlatformCallbackUtils {
private PlatformCallbackUtils() {
// No-op.
}
-}
\ 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/platform/cluster/PlatformClusterNodeFilterImpl.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/platform/cluster/PlatformClusterNodeFilterImpl.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/platform/cluster/PlatformClusterNodeFilterImpl.java
index 72e4a71..bebff8e 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/platform/cluster/PlatformClusterNodeFilterImpl.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/platform/cluster/PlatformClusterNodeFilterImpl.java
@@ -44,7 +44,7 @@ public class PlatformClusterNodeFilterImpl extends PlatformAbstractPredicate imp
/**
* Constructor.
*
- * @param pred .Net portable predicate.
+ * @param pred .Net binary predicate.
* @param ctx Kernal context.
*/
public PlatformClusterNodeFilterImpl(Object pred, PlatformContext ctx) {
http://git-wip-us.apache.org/repos/asf/ignite/blob/10b83fb8/modules/core/src/main/java/org/apache/ignite/internal/processors/platform/compute/PlatformCompute.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/platform/compute/PlatformCompute.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/platform/compute/PlatformCompute.java
index 3cb65b9..9ef6b5e 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/platform/compute/PlatformCompute.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/platform/compute/PlatformCompute.java
@@ -258,7 +258,7 @@ public class PlatformCompute extends PlatformAbstractTarget {
*/
protected Object executeJavaTask(BinaryRawReaderEx reader, boolean async) {
String taskName = reader.readString();
- boolean keepPortable = reader.readBoolean();
+ boolean keepBinary = reader.readBoolean();
Object arg = reader.readObjectDetached();
Collection<UUID> nodeIds = readNodeIds(reader);
@@ -268,7 +268,7 @@ public class PlatformCompute extends PlatformAbstractTarget {
if (async)
compute0 = compute0.withAsync();
- if (!keepPortable && arg instanceof BinaryObjectImpl)
+ if (!keepBinary && arg instanceof BinaryObjectImpl)
arg = ((BinaryObject)arg).deserialize();
Object res = compute0.execute(taskName, arg);
@@ -278,23 +278,23 @@ public class PlatformCompute extends PlatformAbstractTarget {
private static final long serialVersionUID = 0L;
@Override public Object apply(IgniteFuture fut) {
- return toPortable(fut.get());
+ return toBinary(fut.get());
}
}));
return null;
}
else
- return toPortable(res);
+ return toBinary(res);
}
/**
- * Convert object to portable form.
+ * Convert object to binary form.
*
* @param src Source object.
* @return Result.
*/
- private Object toPortable(Object src) {
+ private Object toBinary(Object src) {
return platformCtx.kernalContext().grid().binary().toBinary(src);
}
http://git-wip-us.apache.org/repos/asf/ignite/blob/10b83fb8/modules/core/src/main/java/org/apache/ignite/internal/processors/platform/datastreamer/PlatformDataStreamer.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/platform/datastreamer/PlatformDataStreamer.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/platform/datastreamer/PlatformDataStreamer.java
index 82c3e59..07ef4f2 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/platform/datastreamer/PlatformDataStreamer.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/platform/datastreamer/PlatformDataStreamer.java
@@ -65,8 +65,8 @@ public class PlatformDataStreamer extends PlatformAbstractTarget {
/** Data streamer. */
private final DataStreamerImpl ldr;
- /** Portable flag. */
- private final boolean keepPortable;
+ /** Binary flag. */
+ private final boolean keepBinary;
/** Topology update event listener. */
private volatile GridLocalEventListener lsnr;
@@ -78,12 +78,12 @@ public class PlatformDataStreamer extends PlatformAbstractTarget {
* @param ldr Data streamer.
*/
public PlatformDataStreamer(PlatformContext platformCtx, String cacheName, DataStreamerImpl ldr,
- boolean keepPortable) {
+ boolean keepBinary) {
super(platformCtx);
this.cacheName = cacheName;
this.ldr = ldr;
- this.keepPortable = keepPortable;
+ this.keepBinary = keepBinary;
}
/** {@inheritDoc} */
@@ -131,7 +131,7 @@ public class PlatformDataStreamer extends PlatformAbstractTarget {
Object rec = reader.readObjectDetached();
- ldr.receiver(platformCtx.createStreamReceiver(rec, ptr, keepPortable));
+ ldr.receiver(platformCtx.createStreamReceiver(rec, ptr, keepBinary));
return TRUE;
http://git-wip-us.apache.org/repos/asf/ignite/blob/10b83fb8/modules/core/src/main/java/org/apache/ignite/internal/processors/platform/datastreamer/PlatformStreamReceiverImpl.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/platform/datastreamer/PlatformStreamReceiverImpl.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/platform/datastreamer/PlatformStreamReceiverImpl.java
index 2a3848a..add11ed 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/platform/datastreamer/PlatformStreamReceiverImpl.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/platform/datastreamer/PlatformStreamReceiverImpl.java
@@ -43,7 +43,7 @@ public class PlatformStreamReceiverImpl extends PlatformAbstractPredicate implem
private static final long serialVersionUID = 0L;
/** */
- private boolean keepPortable;
+ private boolean keepBinary;
/**
* Constructor.
@@ -56,16 +56,16 @@ public class PlatformStreamReceiverImpl extends PlatformAbstractPredicate implem
/**
* Constructor.
*
- * @param pred .Net portable receiver.
+ * @param pred .Net binary receiver.
* @param ptr Pointer to receiver in the native platform.
* @param ctx Kernal context.
*/
- public PlatformStreamReceiverImpl(Object pred, long ptr, boolean keepPortable, PlatformContext ctx) {
+ public PlatformStreamReceiverImpl(Object pred, long ptr, boolean keepBinary, PlatformContext ctx) {
super(pred, ptr, ctx);
assert pred != null;
- this.keepPortable = keepPortable;
+ this.keepBinary = keepBinary;
}
/** {@inheritDoc} */
@@ -89,8 +89,8 @@ public class PlatformStreamReceiverImpl extends PlatformAbstractPredicate implem
out.synchronize();
- ctx.gateway().dataStreamerStreamReceiverInvoke(ptr, new PlatformCache(ctx, cache, keepPortable),
- mem.pointer(), keepPortable);
+ ctx.gateway().dataStreamerStreamReceiverInvoke(ptr, new PlatformCache(ctx, cache, keepBinary),
+ mem.pointer(), keepBinary);
}
}
@@ -107,13 +107,13 @@ public class PlatformStreamReceiverImpl extends PlatformAbstractPredicate implem
@Override public void writeExternal(ObjectOutput out) throws IOException {
super.writeExternal(out);
- out.writeBoolean(keepPortable);
+ out.writeBoolean(keepBinary);
}
/** {@inheritDoc} */
@Override public void readExternal(ObjectInput in) throws IOException, ClassNotFoundException {
super.readExternal(in);
- keepPortable = in.readBoolean();
+ keepBinary = in.readBoolean();
}
}
http://git-wip-us.apache.org/repos/asf/ignite/blob/10b83fb8/modules/core/src/main/java/org/apache/ignite/internal/processors/platform/dotnet/PlatformDotNetCacheStore.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/platform/dotnet/PlatformDotNetCacheStore.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/platform/dotnet/PlatformDotNetCacheStore.java
index c41ca6e..7e65c22 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/platform/dotnet/PlatformDotNetCacheStore.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/platform/dotnet/PlatformDotNetCacheStore.java
@@ -318,10 +318,10 @@ public class PlatformDotNetCacheStore<K, V> implements CacheStore<K, V>, Platfor
* Initialize the store.
*
* @param ctx Context.
- * @param convertPortable Convert portable flag.
+ * @param convertBinary Convert binary flag.
* @throws org.apache.ignite.IgniteCheckedException
*/
- public void initialize(GridKernalContext ctx, boolean convertPortable) throws IgniteCheckedException {
+ public void initialize(GridKernalContext ctx, boolean convertBinary) throws IgniteCheckedException {
A.notNull(typName, "typName");
platformCtx = PlatformUtils.platformContext(ctx.grid());
@@ -331,7 +331,7 @@ public class PlatformDotNetCacheStore<K, V> implements CacheStore<K, V>, Platfor
BinaryRawWriterEx writer = platformCtx.writer(out);
- write(writer, convertPortable);
+ write(writer, convertBinary);
out.synchronize();
@@ -343,11 +343,11 @@ public class PlatformDotNetCacheStore<K, V> implements CacheStore<K, V>, Platfor
* Write store data to a stream.
*
* @param writer Writer.
- * @param convertPortable Convert portable flag.
+ * @param convertBinary Convert binary flag.
*/
- protected void write(BinaryRawWriterEx writer, boolean convertPortable) {
+ protected void write(BinaryRawWriterEx writer, boolean convertBinary) {
writer.writeString(typName);
- writer.writeBoolean(convertPortable);
+ writer.writeBoolean(convertBinary);
writer.writeMap(props);
}
http://git-wip-us.apache.org/repos/asf/ignite/blob/10b83fb8/modules/core/src/main/java/org/apache/ignite/internal/processors/platform/dotnet/PlatformDotNetConfigurationClosure.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/platform/dotnet/PlatformDotNetConfigurationClosure.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/platform/dotnet/PlatformDotNetConfigurationClosure.java
index b2bd5d4..4ac3536 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/platform/dotnet/PlatformDotNetConfigurationClosure.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/platform/dotnet/PlatformDotNetConfigurationClosure.java
@@ -234,7 +234,7 @@ public class PlatformDotNetConfigurationClosure extends PlatformAbstractConfigur
}
/**
- * Create portable marshaller.
+ * Create binary marshaller.
*
* @return Marshaller.
*/
http://git-wip-us.apache.org/repos/asf/ignite/blob/10b83fb8/modules/core/src/main/java/org/apache/ignite/internal/processors/platform/dotnet/PlatformDotNetServiceImpl.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/platform/dotnet/PlatformDotNetServiceImpl.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/platform/dotnet/PlatformDotNetServiceImpl.java
index ec241ee..1eb9a2c 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/platform/dotnet/PlatformDotNetServiceImpl.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/platform/dotnet/PlatformDotNetServiceImpl.java
@@ -39,9 +39,9 @@ public class PlatformDotNetServiceImpl extends PlatformAbstractService implement
*
* @param svc Service.
* @param ctx Context.
- * @param srvKeepPortable Whether to keep objects portable on server if possible.
+ * @param srvKeepBinary Whether to keep objects binary on server if possible.
*/
- public PlatformDotNetServiceImpl(Object svc, PlatformContext ctx, boolean srvKeepPortable) {
- super(svc, ctx, srvKeepPortable);
+ public PlatformDotNetServiceImpl(Object svc, PlatformContext ctx, boolean srvKeepBinary) {
+ super(svc, ctx, srvKeepBinary);
}
-}
\ 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/platform/events/PlatformEventFilterListenerImpl.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/platform/events/PlatformEventFilterListenerImpl.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/platform/events/PlatformEventFilterListenerImpl.java
index 624870a..fffa772 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/platform/events/PlatformEventFilterListenerImpl.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/platform/events/PlatformEventFilterListenerImpl.java
@@ -79,7 +79,7 @@ public class PlatformEventFilterListenerImpl implements PlatformEventFilterListe
/**
* Constructor.
*
- * @param pred .Net portable predicate.
+ * @param pred .Net binary predicate.
*/
public PlatformEventFilterListenerImpl(Object pred, final int... types) {
assert pred != null;
http://git-wip-us.apache.org/repos/asf/ignite/blob/10b83fb8/modules/core/src/main/java/org/apache/ignite/internal/processors/platform/messaging/PlatformMessageFilterImpl.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/platform/messaging/PlatformMessageFilterImpl.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/platform/messaging/PlatformMessageFilterImpl.java
index a737442..b8451ee 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/platform/messaging/PlatformMessageFilterImpl.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/platform/messaging/PlatformMessageFilterImpl.java
@@ -46,7 +46,7 @@ public class PlatformMessageFilterImpl extends PlatformAbstractPredicate impleme
/**
* Constructor.
*
- * @param pred .Net portable predicate.
+ * @param pred .Net binary predicate.
* @param ptr Pointer to predicate in the native platform.
* @param ctx Kernal context.
*/
http://git-wip-us.apache.org/repos/asf/ignite/blob/10b83fb8/modules/core/src/main/java/org/apache/ignite/internal/processors/platform/services/PlatformAbstractService.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/platform/services/PlatformAbstractService.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/platform/services/PlatformAbstractService.java
index 6d143aa..0840275 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/platform/services/PlatformAbstractService.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/platform/services/PlatformAbstractService.java
@@ -41,11 +41,11 @@ public abstract class PlatformAbstractService implements PlatformService, Extern
/** */
private static final long serialVersionUID = 0L;
- /** .Net portable service. */
+ /** .Net binary service. */
protected Object svc;
- /** Whether to keep objects portable on server if possible. */
- protected boolean srvKeepPortable;
+ /** Whether to keep objects binary on server if possible. */
+ protected boolean srvKeepBinary;
/** Pointer to deployed service. */
protected transient long ptr;
@@ -65,15 +65,15 @@ public abstract class PlatformAbstractService implements PlatformService, Extern
*
* @param svc Service.
* @param ctx Context.
- * @param srvKeepPortable Whether to keep objects portable on server if possible.
+ * @param srvKeepBinary Whether to keep objects binary on server if possible.
*/
- public PlatformAbstractService(Object svc, PlatformContext ctx, boolean srvKeepPortable) {
+ public PlatformAbstractService(Object svc, PlatformContext ctx, boolean srvKeepBinary) {
assert svc != null;
assert ctx != null;
this.svc = svc;
this.platformCtx = ctx;
- this.srvKeepPortable = srvKeepPortable;
+ this.srvKeepBinary = srvKeepBinary;
}
/** {@inheritDoc} */
@@ -86,7 +86,7 @@ public abstract class PlatformAbstractService implements PlatformService, Extern
BinaryRawWriterEx writer = platformCtx.writer(out);
- writer.writeBoolean(srvKeepPortable);
+ writer.writeBoolean(srvKeepBinary);
writer.writeObject(svc);
writeServiceContext(ctx, writer);
@@ -110,7 +110,7 @@ public abstract class PlatformAbstractService implements PlatformService, Extern
BinaryRawWriterEx writer = platformCtx.writer(out);
- writer.writeBoolean(srvKeepPortable);
+ writer.writeBoolean(srvKeepBinary);
writeServiceContext(ctx, writer);
@@ -133,7 +133,7 @@ public abstract class PlatformAbstractService implements PlatformService, Extern
BinaryRawWriterEx writer = platformCtx.writer(out);
- writer.writeBoolean(srvKeepPortable);
+ writer.writeBoolean(srvKeepBinary);
writeServiceContext(ctx, writer);
@@ -168,7 +168,7 @@ public abstract class PlatformAbstractService implements PlatformService, Extern
}
/** {@inheritDoc} */
- @Override public Object invokeMethod(String mthdName, boolean srvKeepPortable, Object[] args)
+ @Override public Object invokeMethod(String mthdName, boolean srvKeepBinary, Object[] args)
throws IgniteCheckedException {
assert ptr != 0;
assert platformCtx != null;
@@ -177,7 +177,7 @@ public abstract class PlatformAbstractService implements PlatformService, Extern
PlatformOutputStream out = outMem.output();
BinaryRawWriterEx writer = platformCtx.writer(out);
- writer.writeBoolean(srvKeepPortable);
+ writer.writeBoolean(srvKeepBinary);
writer.writeString(mthdName);
if (args == null)
@@ -219,12 +219,12 @@ public abstract class PlatformAbstractService implements PlatformService, Extern
/** {@inheritDoc} */
@Override public void readExternal(ObjectInput in) throws IOException, ClassNotFoundException {
svc = in.readObject();
- srvKeepPortable = in.readBoolean();
+ srvKeepBinary = in.readBoolean();
}
/** {@inheritDoc} */
@Override public void writeExternal(ObjectOutput out) throws IOException {
out.writeObject(svc);
- out.writeBoolean(srvKeepPortable);
+ out.writeBoolean(srvKeepBinary);
}
}
http://git-wip-us.apache.org/repos/asf/ignite/blob/10b83fb8/modules/core/src/main/java/org/apache/ignite/internal/processors/platform/services/PlatformService.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/platform/services/PlatformService.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/platform/services/PlatformService.java
index a6d9216..2d6e1cc 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/platform/services/PlatformService.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/platform/services/PlatformService.java
@@ -28,12 +28,12 @@ public interface PlatformService extends Service {
* Invokes native service method.
*
* @param mthdName Method name.
- * @param srvKeepPortable Server keep portable flag.
+ * @param srvKeepBinary Server keep binary flag.
* @param args Arguments.
* @return Resulting data.
* @throws org.apache.ignite.IgniteCheckedException If failed.
*/
- public Object invokeMethod(String mthdName, boolean srvKeepPortable, Object[] args) throws IgniteCheckedException;
+ public Object invokeMethod(String mthdName, boolean srvKeepBinary, Object[] args) throws IgniteCheckedException;
/**
* Gets native pointer.
@@ -41,4 +41,4 @@ public interface PlatformService extends Service {
* @return Native pointer.
*/
public long pointer();
-}
\ 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/platform/services/PlatformServices.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/platform/services/PlatformServices.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/platform/services/PlatformServices.java
index ff09357..9676b6f 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/platform/services/PlatformServices.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/platform/services/PlatformServices.java
@@ -60,23 +60,23 @@ public class PlatformServices extends PlatformAbstractTarget {
/** */
private final IgniteServices services;
- /** Server keep portable flag. */
- private final boolean srvKeepPortable;
+ /** Server keep binary flag. */
+ private final boolean srvKeepBinary;
/**
* Ctor.
*
* @param platformCtx Context.
* @param services Services facade.
- * @param srvKeepPortable Server keep portable flag.
+ * @param srvKeepBinary Server keep binary flag.
*/
- public PlatformServices(PlatformContext platformCtx, IgniteServices services, boolean srvKeepPortable) {
+ public PlatformServices(PlatformContext platformCtx, IgniteServices services, boolean srvKeepBinary) {
super(platformCtx);
assert services != null;
this.services = services;
- this.srvKeepPortable = srvKeepPortable;
+ this.srvKeepBinary = srvKeepBinary;
}
/**
@@ -88,16 +88,16 @@ public class PlatformServices extends PlatformAbstractTarget {
if (services.isAsync())
return this;
- return new PlatformServices(platformCtx, services.withAsync(), srvKeepPortable);
+ return new PlatformServices(platformCtx, services.withAsync(), srvKeepBinary);
}
/**
- * Gets services with server "keep portable" mode enabled.
+ * Gets services with server "keep binary" mode enabled.
*
- * @return Services with server "keep portable" mode enabled.
+ * @return Services with server "keep binary" mode enabled.
*/
- public PlatformServices withServerKeepPortable() {
- return srvKeepPortable ? this : new PlatformServices(platformCtx, services, true);
+ public PlatformServices withServerKeepBinary() {
+ return srvKeepBinary ? this : new PlatformServices(platformCtx, services, true);
}
/**
@@ -135,7 +135,7 @@ public class PlatformServices extends PlatformAbstractTarget {
ServiceConfiguration cfg = new ServiceConfiguration();
cfg.setName(reader.readString());
- cfg.setService(new PlatformDotNetServiceImpl(reader.readObjectDetached(), platformCtx, srvKeepPortable));
+ cfg.setService(new PlatformDotNetServiceImpl(reader.readObjectDetached(), platformCtx, srvKeepBinary));
cfg.setTotalCount(reader.readInt());
cfg.setMaxPerNodeCount(reader.readInt());
cfg.setCacheName(reader.readString());
@@ -157,7 +157,7 @@ public class PlatformServices extends PlatformAbstractTarget {
int totalCnt = reader.readInt();
int maxPerNodeCnt = reader.readInt();
- services.deployMultiple(name, new PlatformDotNetServiceImpl(svc, platformCtx, srvKeepPortable),
+ services.deployMultiple(name, new PlatformDotNetServiceImpl(svc, platformCtx, srvKeepBinary),
totalCnt, maxPerNodeCnt);
return TRUE;
@@ -218,7 +218,7 @@ public class PlatformServices extends PlatformAbstractTarget {
args = null;
try {
- Object result = ((PlatformDotNetService)arg).invokeMethod(mthdName, srvKeepPortable, args);
+ Object result = ((PlatformDotNetService)arg).invokeMethod(mthdName, srvKeepBinary, args);
PlatformUtils.writeInvocationResult(writer, result, null);
}
http://git-wip-us.apache.org/repos/asf/ignite/blob/10b83fb8/modules/core/src/main/java/org/apache/ignite/internal/processors/query/GridQueryCacheObjectsIterator.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/query/GridQueryCacheObjectsIterator.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/query/GridQueryCacheObjectsIterator.java
index b25538b..b006c75 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/query/GridQueryCacheObjectsIterator.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/query/GridQueryCacheObjectsIterator.java
@@ -24,7 +24,7 @@ import org.apache.ignite.internal.processors.cache.GridCacheContext;
import org.apache.ignite.internal.util.typedef.internal.U;
/**
- * Deserializes portable objects if needed.
+ * Deserializes binary objects if needed.
*/
public class GridQueryCacheObjectsIterator implements Iterator<List<?>>, AutoCloseable {
/** */
@@ -34,17 +34,17 @@ public class GridQueryCacheObjectsIterator implements Iterator<List<?>>, AutoClo
private final GridCacheContext<?,?> cctx;
/** */
- private final boolean keepPortable;
+ private final boolean keepBinary;
/**
* @param iter Iterator.
* @param cctx Cache context.
- * @param keepPortable Keep portable.
+ * @param keepBinary Keep binary.
*/
- public GridQueryCacheObjectsIterator(Iterator<List<?>> iter, GridCacheContext<?,?> cctx, boolean keepPortable) {
+ public GridQueryCacheObjectsIterator(Iterator<List<?>> iter, GridCacheContext<?,?> cctx, boolean keepBinary) {
this.iter = iter;
this.cctx = cctx;
- this.keepPortable = keepPortable;
+ this.keepBinary = keepBinary;
}
/** {@inheritDoc} */
@@ -61,11 +61,11 @@ public class GridQueryCacheObjectsIterator implements Iterator<List<?>>, AutoClo
/** {@inheritDoc} */
@SuppressWarnings("unchecked")
@Override public List<?> next() {
- return (List<?>)cctx.unwrapPortablesIfNeeded((Collection<Object>)iter.next(), keepPortable);
+ return (List<?>)cctx.unwrapBinariesIfNeeded((Collection<Object>)iter.next(), keepBinary);
}
/** {@inheritDoc} */
@Override public void remove() {
iter.remove();
}
-}
\ 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/query/GridQueryProcessor.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/query/GridQueryProcessor.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/query/GridQueryProcessor.java
index 005f617..0412b4c 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/query/GridQueryProcessor.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/query/GridQueryProcessor.java
@@ -209,7 +209,7 @@ public class GridQueryProcessor extends GridProcessorAdapter {
desc.name(simpleValType);
- if (ctx.cacheObjects().isPortableEnabled(ccfg)) {
+ if (ctx.cacheObjects().isBinaryEnabled(ccfg)) {
// Safe to check null.
if (SQL_TYPES.contains(valCls))
desc.valueClass(valCls);
@@ -237,8 +237,8 @@ public class GridQueryProcessor extends GridProcessorAdapter {
TypeId typeId;
TypeId altTypeId = null;
- if (valCls == null || ctx.cacheObjects().isPortableEnabled(ccfg)) {
- processPortableMeta(qryEntity, desc);
+ if (valCls == null || ctx.cacheObjects().isBinaryEnabled(ccfg)) {
+ processBinaryMeta(qryEntity, desc);
typeId = new TypeId(ccfg.getName(), ctx.cacheObjects().typeId(qryEntity.getValueType()));
@@ -281,7 +281,7 @@ public class GridQueryProcessor extends GridProcessorAdapter {
desc.name(meta.getSimpleValueType());
- if (ctx.cacheObjects().isPortableEnabled(ccfg)) {
+ if (ctx.cacheObjects().isBinaryEnabled(ccfg)) {
// Safe to check null.
if (SQL_TYPES.contains(valCls))
desc.valueClass(valCls);
@@ -301,8 +301,8 @@ public class GridQueryProcessor extends GridProcessorAdapter {
TypeId typeId;
TypeId altTypeId = null;
- if (valCls == null || ctx.cacheObjects().isPortableEnabled(ccfg)) {
- processPortableMeta(meta, desc);
+ if (valCls == null || ctx.cacheObjects().isBinaryEnabled(ccfg)) {
+ processBinaryMeta(meta, desc);
typeId = new TypeId(ccfg.getName(), ctx.cacheObjects().typeId(meta.getValueType()));
@@ -586,9 +586,9 @@ public class GridQueryProcessor extends GridProcessorAdapter {
TypeId id;
- boolean portableVal = ctx.cacheObjects().isPortableObject(val);
+ boolean binaryVal = ctx.cacheObjects().isBinaryObject(val);
- if (portableVal) {
+ if (binaryVal) {
int typeId = ctx.cacheObjects().typeId(val);
id = new TypeId(space, typeId);
@@ -604,12 +604,12 @@ public class GridQueryProcessor extends GridProcessorAdapter {
if (desc == null || !desc.registered())
return;
- if (!portableVal && !desc.valueClass().isAssignableFrom(valCls))
+ if (!binaryVal && !desc.valueClass().isAssignableFrom(valCls))
throw new IgniteCheckedException("Failed to update index due to class name conflict" +
"(multiple classes with same simple name are stored in the same cache) " +
"[expCls=" + desc.valueClass().getName() + ", actualCls=" + valCls.getName() + ']');
- if (!ctx.cacheObjects().isPortableObject(key)) {
+ if (!ctx.cacheObjects().isBinaryObject(key)) {
Class<?> keyCls = key.value(coctx, false).getClass();
if (!desc.keyClass().isAssignableFrom(keyCls))
@@ -697,7 +697,7 @@ public class GridQueryProcessor extends GridProcessorAdapter {
return idx.queryTwoStep(
cctx,
qry,
- cctx.keepPortable());
+ cctx.keepBinary());
}
}, false);
}
@@ -870,7 +870,7 @@ public class GridQueryProcessor extends GridProcessorAdapter {
throw new IllegalStateException("Failed to execute query (grid is stopping).");
try {
- final boolean keepPortable = cctx.keepPortable();
+ final boolean keepBinary = cctx.keepBinary();
return executeQuery(cctx, new IgniteOutClosureX<QueryCursor<List<?>>>() {
@Override public QueryCursor<List<?>> applyx() throws IgniteCheckedException {
@@ -885,7 +885,7 @@ public class GridQueryProcessor extends GridProcessorAdapter {
QueryCursorImpl<List<?>> cursor = new QueryCursorImpl<>(new Iterable<List<?>>() {
@Override public Iterator<List<?>> iterator() {
- return new GridQueryCacheObjectsIterator(res.iterator(), cctx, keepPortable);
+ return new GridQueryCacheObjectsIterator(res.iterator(), cctx, keepBinary);
}
});
@@ -1304,13 +1304,13 @@ public class GridQueryProcessor extends GridProcessorAdapter {
}
/**
- * Processes declarative metadata for portable object.
+ * Processes declarative metadata for binary object.
*
* @param meta Declared metadata.
* @param d Type descriptor.
* @throws IgniteCheckedException If failed.
*/
- private void processPortableMeta(CacheTypeMetadata meta, TypeDescriptor d)
+ private void processBinaryMeta(CacheTypeMetadata meta, TypeDescriptor d)
throws IgniteCheckedException {
Map<String,String> aliases = meta.getAliases();
@@ -1318,7 +1318,7 @@ public class GridQueryProcessor extends GridProcessorAdapter {
aliases = Collections.emptyMap();
for (Map.Entry<String, Class<?>> entry : meta.getAscendingFields().entrySet()) {
- PortableProperty prop = buildPortableProperty(entry.getKey(), entry.getValue(), aliases);
+ BinaryProperty prop = buildBinaryProperty(entry.getKey(), entry.getValue(), aliases);
d.addProperty(prop, false);
@@ -1330,7 +1330,7 @@ public class GridQueryProcessor extends GridProcessorAdapter {
}
for (Map.Entry<String, Class<?>> entry : meta.getDescendingFields().entrySet()) {
- PortableProperty prop = buildPortableProperty(entry.getKey(), entry.getValue(), aliases);
+ BinaryProperty prop = buildBinaryProperty(entry.getKey(), entry.getValue(), aliases);
d.addProperty(prop, false);
@@ -1342,7 +1342,7 @@ public class GridQueryProcessor extends GridProcessorAdapter {
}
for (String txtIdx : meta.getTextFields()) {
- PortableProperty prop = buildPortableProperty(txtIdx, String.class, aliases);
+ BinaryProperty prop = buildBinaryProperty(txtIdx, String.class, aliases);
d.addProperty(prop, false);
@@ -1360,7 +1360,7 @@ public class GridQueryProcessor extends GridProcessorAdapter {
int order = 0;
for (Map.Entry<String, IgniteBiTuple<Class<?>, Boolean>> idxField : idxFields.entrySet()) {
- PortableProperty prop = buildPortableProperty(idxField.getKey(), idxField.getValue().get1(), aliases);
+ BinaryProperty prop = buildBinaryProperty(idxField.getKey(), idxField.getValue().get1(), aliases);
d.addProperty(prop, false);
@@ -1374,7 +1374,7 @@ public class GridQueryProcessor extends GridProcessorAdapter {
}
for (Map.Entry<String, Class<?>> entry : meta.getQueryFields().entrySet()) {
- PortableProperty prop = buildPortableProperty(entry.getKey(), entry.getValue(), aliases);
+ BinaryProperty prop = buildBinaryProperty(entry.getKey(), entry.getValue(), aliases);
if (!d.props.containsKey(prop.name()))
d.addProperty(prop, false);
@@ -1382,20 +1382,20 @@ public class GridQueryProcessor extends GridProcessorAdapter {
}
/**
- * Processes declarative metadata for portable object.
+ * Processes declarative metadata for binary object.
*
* @param qryEntity Declared metadata.
* @param d Type descriptor.
* @throws IgniteCheckedException If failed.
*/
- private void processPortableMeta(QueryEntity qryEntity, TypeDescriptor d) throws IgniteCheckedException {
+ private void processBinaryMeta(QueryEntity qryEntity, TypeDescriptor d) throws IgniteCheckedException {
Map<String,String> aliases = qryEntity.getAliases();
if (aliases == null)
aliases = Collections.emptyMap();
for (Map.Entry<String, String> entry : qryEntity.getFields().entrySet()) {
- PortableProperty prop = buildPortableProperty(entry.getKey(), U.classForName(entry.getValue(), Object.class), aliases);
+ BinaryProperty prop = buildBinaryProperty(entry.getKey(), U.classForName(entry.getValue(), Object.class), aliases);
d.addProperty(prop, false);
}
@@ -1404,7 +1404,7 @@ public class GridQueryProcessor extends GridProcessorAdapter {
}
/**
- * Processes declarative metadata for portable object.
+ * Processes declarative metadata for binary object.
*
* @param qryEntity Declared metadata.
* @param d Type descriptor.
@@ -1485,18 +1485,18 @@ public class GridQueryProcessor extends GridProcessorAdapter {
}
/**
- * Builds portable object property.
+ * Builds binary object property.
*
* @param pathStr String representing path to the property. May contains dots '.' to identify
* nested fields.
* @param resType Result type.
* @param aliases Aliases.
- * @return Portable property.
+ * @return Binary property.
*/
- private PortableProperty buildPortableProperty(String pathStr, Class<?> resType, Map<String,String> aliases) {
+ private BinaryProperty buildBinaryProperty(String pathStr, Class<?> resType, Map<String,String> aliases) {
String[] path = pathStr.split("\\.");
- PortableProperty res = null;
+ BinaryProperty res = null;
StringBuilder fullName = new StringBuilder();
@@ -1508,7 +1508,7 @@ public class GridQueryProcessor extends GridProcessorAdapter {
String alias = aliases.get(fullName.toString());
- res = new PortableProperty(prop, res, resType, alias);
+ res = new BinaryProperty(prop, res, resType, alias);
}
return res;
@@ -1532,7 +1532,7 @@ public class GridQueryProcessor extends GridProcessorAdapter {
resType,
aliases);
- if (res == null) // We check key before value consistently with PortableProperty.
+ if (res == null) // We check key before value consistently with BinaryProperty.
res = buildClassProperty(false, valCls, pathStr, resType, aliases);
if (res == null)
@@ -1812,7 +1812,7 @@ public class GridQueryProcessor extends GridProcessorAdapter {
/**
*
*/
- private class PortableProperty extends GridQueryProperty {
+ private class BinaryProperty extends GridQueryProperty {
/** Property name. */
private String propName;
@@ -1820,7 +1820,7 @@ public class GridQueryProcessor extends GridProcessorAdapter {
private String alias;
/** Parent property. */
- private PortableProperty parent;
+ private BinaryProperty parent;
/** Result class. */
private Class<?> type;
@@ -1841,7 +1841,7 @@ public class GridQueryProcessor extends GridProcessorAdapter {
* @param parent Parent property.
* @param type Result type.
*/
- private PortableProperty(String propName, PortableProperty parent, Class<?> type, String alias) {
+ private BinaryProperty(String propName, BinaryProperty parent, Class<?> type, String alias) {
this.propName = propName;
this.alias = F.isEmpty(alias) ? propName : alias;
this.parent = parent;
@@ -1858,15 +1858,15 @@ public class GridQueryProcessor extends GridProcessorAdapter {
if (obj == null)
return null;
- if (!ctx.cacheObjects().isPortableObject(obj))
- throw new IgniteCheckedException("Non-portable object received as a result of property extraction " +
+ if (!ctx.cacheObjects().isBinaryObject(obj))
+ throw new IgniteCheckedException("Non-binary object received as a result of property extraction " +
"[parent=" + parent + ", propName=" + propName + ", obj=" + obj + ']');
}
else {
int isKeyProp0 = isKeyProp;
if (isKeyProp0 == 0) {
- // Key is allowed to be a non-portable object here.
+ // Key is allowed to be a non-binary object here.
// We check key before value consistently with ClassProperty.
if (key instanceof BinaryObject && ((BinaryObject)key).hasField(propName))
isKeyProp = isKeyProp0 = 1;