You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ignite.apache.org by ak...@apache.org on 2015/12/14 09:38:14 UTC
[01/24] ignite git commit: Ignite-2106
Repository: ignite
Updated Branches:
refs/heads/ignite-843-rc2 ef610b289 -> c453b2d40
Ignite-2106
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/1f2af31e
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/1f2af31e
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/1f2af31e
Branch: refs/heads/ignite-843-rc2
Commit: 1f2af31e27c28c66b49a32090a648e3fb4c07a2d
Parents: 469bf6d
Author: Anton Vinogradov <av...@apache.org>
Authored: Fri Dec 11 17:03:01 2015 +0300
Committer: Anton Vinogradov <av...@apache.org>
Committed: Fri Dec 11 19:18:15 2015 +0300
----------------------------------------------------------------------
.../distributed/near/GridNearCacheEntry.java | 6 ++++++
.../cache/GridCacheDeploymentSelfTest.java | 19 ++++++++++++++-----
2 files changed, 20 insertions(+), 5 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ignite/blob/1f2af31e/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearCacheEntry.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearCacheEntry.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearCacheEntry.java
index 6520f3d..c0a1617 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearCacheEntry.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearCacheEntry.java
@@ -127,6 +127,12 @@ public class GridNearCacheEntry extends GridDistributedCacheEntry {
}
}
+ if (cctx.affinity().backup(cctx.localNode(), part, topVer)) {
+ this.topVer = -1L;
+
+ return false;
+ }
+
this.topVer = topVer.topologyVersion();
return true;
http://git-wip-us.apache.org/repos/asf/ignite/blob/1f2af31e/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheDeploymentSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheDeploymentSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheDeploymentSelfTest.java
index 22e8c36..c18554e 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheDeploymentSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheDeploymentSelfTest.java
@@ -222,14 +222,22 @@ public class GridCacheDeploymentSelfTest extends GridCommonAbstractTest {
/** @throws Exception If failed. */
@SuppressWarnings("unchecked")
public void testDeployment4() throws Exception {
+ doDeployment4(false);
+ }
+
+ /** @throws Exception If failed. */
+ @SuppressWarnings("unchecked")
+ public void testDeployment4BackupLeavesGrid() throws Exception {
+ doDeployment4(true);
+ }
+
+ /** @throws Exception If failed. */
+ @SuppressWarnings("unchecked")
+ private void doDeployment4(boolean backupLeavesGrid) throws Exception {
try {
depMode = CONTINUOUS;
Ignite g1 = startGrid(1);
-
- if (g1.configuration().getMarshaller() instanceof BinaryMarshaller)
- fail("https://issues.apache.org/jira/browse/IGNITE-2106");
-
Ignite g2 = startGrid(2);
Ignite g0 = startGrid(GRID_NAME);
@@ -248,7 +256,8 @@ public class GridCacheDeploymentSelfTest extends GridCommonAbstractTest {
for (int i = 0; i < 1000; i++) {
key = "1" + i;
- if (g1.cluster().mapKeyToNode(null, key).id().equals(g2.cluster().localNode().id()))
+ if (g1.cluster().mapKeyToNode(null, key).id().equals(g2.cluster().localNode().id()) &&
+ g1.affinity(null).isBackup((backupLeavesGrid ? g0 : g1).cluster().localNode(), key))
break;
}
[18/24] ignite git commit: ignite-1.5 Added waitForCondition in tests
with TTL.
Posted by ak...@apache.org.
ignite-1.5 Added waitForCondition in tests with TTL.
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/484a3afd
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/484a3afd
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/484a3afd
Branch: refs/heads/ignite-843-rc2
Commit: 484a3afd05b9ad5a524a28c517ddc0a6b9dffcbc
Parents: ec2a647
Author: sboikov <sb...@gridgain.com>
Authored: Mon Dec 14 10:58:57 2015 +0300
Committer: sboikov <sb...@gridgain.com>
Committed: Mon Dec 14 10:58:57 2015 +0300
----------------------------------------------------------------------
.../cache/GridCacheAbstractFullApiSelfTest.java | 23 +++++++++++++++-----
1 file changed, 17 insertions(+), 6 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ignite/blob/484a3afd/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheAbstractFullApiSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheAbstractFullApiSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheAbstractFullApiSelfTest.java
index 41e9016..cbb19fb 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheAbstractFullApiSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheAbstractFullApiSelfTest.java
@@ -107,6 +107,7 @@ import static org.apache.ignite.events.EventType.EVT_CACHE_OBJECT_SWAPPED;
import static org.apache.ignite.events.EventType.EVT_CACHE_OBJECT_UNLOCKED;
import static org.apache.ignite.events.EventType.EVT_CACHE_OBJECT_UNSWAPPED;
import static org.apache.ignite.testframework.GridTestUtils.assertThrows;
+import static org.apache.ignite.testframework.GridTestUtils.waitForCondition;
import static org.apache.ignite.transactions.TransactionConcurrency.OPTIMISTIC;
import static org.apache.ignite.transactions.TransactionConcurrency.PESSIMISTIC;
import static org.apache.ignite.transactions.TransactionIsolation.READ_COMMITTED;
@@ -3216,9 +3217,9 @@ public abstract class GridCacheAbstractFullApiSelfTest extends GridCacheAbstract
* @throws Exception In case of error.
*/
public void testEvictExpired() throws Exception {
- IgniteCache<String, Integer> cache = jcache();
+ final IgniteCache<String, Integer> cache = jcache();
- String key = primaryKeysForCache(cache, 1).get(0);
+ final String key = primaryKeysForCache(cache, 1).get(0);
cache.put(key, 1);
@@ -3230,7 +3231,13 @@ public abstract class GridCacheAbstractFullApiSelfTest extends GridCacheAbstract
grid(0).cache(null).withExpiryPolicy(expiry).put(key, 1);
- Thread.sleep(ttl + 100);
+ boolean wait = waitForCondition(new GridAbsPredicate() {
+ @Override public boolean apply() {
+ return cache.localPeek(key, ONHEAP) == null;
+ }
+ }, ttl + 1000);
+
+ assertTrue("Failed to wait for entry expiration.", wait);
// Expired entry should not be swapped.
cache.localEvict(Collections.singleton(key));
@@ -3793,9 +3800,9 @@ public abstract class GridCacheAbstractFullApiSelfTest extends GridCacheAbstract
* @throws Exception If failed.
*/
public void testCompactExpired() throws Exception {
- IgniteCache<String, Integer> cache = jcache();
+ final IgniteCache<String, Integer> cache = jcache();
- String key = F.first(primaryKeysForCache(cache, 1));
+ final String key = F.first(primaryKeysForCache(cache, 1));
cache.put(key, 1);
@@ -3805,7 +3812,11 @@ public abstract class GridCacheAbstractFullApiSelfTest extends GridCacheAbstract
grid(0).cache(null).withExpiryPolicy(expiry).put(key, 1);
- Thread.sleep(ttl + 100);
+ waitForCondition(new GridAbsPredicate() {
+ @Override public boolean apply() {
+ return cache.localPeek(key, ONHEAP) == null;
+ }
+ }, ttl + 1000);
// Peek will actually remove entry from cache.
assertNull(cache.localPeek(key, ONHEAP));
[05/24] ignite git commit: ignite-2065: portable -> binary renaming
(methods, javadoc and etc.)
Posted by ak...@apache.org.
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;
[02/24] ignite git commit: ignite-2065: portable -> binary renaming
(methods, javadoc and etc.)
Posted by ak...@apache.org.
http://git-wip-us.apache.org/repos/asf/ignite/blob/10b83fb8/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteBinaryObjectsTestSuite.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteBinaryObjectsTestSuite.java b/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteBinaryObjectsTestSuite.java
index 271ff33..2b0ad63 100644
--- a/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteBinaryObjectsTestSuite.java
+++ b/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteBinaryObjectsTestSuite.java
@@ -56,7 +56,7 @@ import org.apache.ignite.internal.processors.cache.binary.local.GridCacheBinaryO
import org.apache.ignite.internal.processors.cache.binary.local.GridCacheBinaryObjectsLocalSelfTest;
/**
- * Test for portable objects stored in cache.
+ * Test for binary objects stored in cache.
*/
public class IgniteBinaryObjectsTestSuite extends TestSuite {
/**
http://git-wip-us.apache.org/repos/asf/ignite/blob/10b83fb8/modules/core/src/test/portables/repo/org/apache/ignite/binary/test1/1.1/test1-1.1.jar
----------------------------------------------------------------------
diff --git a/modules/core/src/test/portables/repo/org/apache/ignite/binary/test1/1.1/test1-1.1.jar b/modules/core/src/test/portables/repo/org/apache/ignite/binary/test1/1.1/test1-1.1.jar
deleted file mode 100644
index 863350d..0000000
Binary files a/modules/core/src/test/portables/repo/org/apache/ignite/binary/test1/1.1/test1-1.1.jar and /dev/null differ
http://git-wip-us.apache.org/repos/asf/ignite/blob/10b83fb8/modules/core/src/test/portables/repo/org/apache/ignite/binary/test1/1.1/test1-1.1.pom
----------------------------------------------------------------------
diff --git a/modules/core/src/test/portables/repo/org/apache/ignite/binary/test1/1.1/test1-1.1.pom b/modules/core/src/test/portables/repo/org/apache/ignite/binary/test1/1.1/test1-1.1.pom
deleted file mode 100644
index 533a3c9..0000000
--- a/modules/core/src/test/portables/repo/org/apache/ignite/binary/test1/1.1/test1-1.1.pom
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
- <modelVersion>4.0.0</modelVersion>
- <groupId>org.apache.ignite.binary</groupId>
- <artifactId>test1</artifactId>
- <version>1.1</version>
- <description>POM was created from install:install-file</description>
-</project>
http://git-wip-us.apache.org/repos/asf/ignite/blob/10b83fb8/modules/core/src/test/portables/repo/org/apache/ignite/binary/test1/maven-metadata-local.xml
----------------------------------------------------------------------
diff --git a/modules/core/src/test/portables/repo/org/apache/ignite/binary/test1/maven-metadata-local.xml b/modules/core/src/test/portables/repo/org/apache/ignite/binary/test1/maven-metadata-local.xml
deleted file mode 100644
index 4ca5d44..0000000
--- a/modules/core/src/test/portables/repo/org/apache/ignite/binary/test1/maven-metadata-local.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<metadata>
- <groupId>org.apache.ignite.binary</groupId>
- <artifactId>test1</artifactId>
- <versioning>
- <release>1.1</release>
- <versions>
- <version>1.1</version>
- </versions>
- <lastUpdated>20140806090184</lastUpdated>
- </versioning>
-</metadata>
http://git-wip-us.apache.org/repos/asf/ignite/blob/10b83fb8/modules/core/src/test/portables/repo/org/apache/ignite/binary/test2/1.1/test2-1.1.jar
----------------------------------------------------------------------
diff --git a/modules/core/src/test/portables/repo/org/apache/ignite/binary/test2/1.1/test2-1.1.jar b/modules/core/src/test/portables/repo/org/apache/ignite/binary/test2/1.1/test2-1.1.jar
deleted file mode 100644
index ccf4ea2..0000000
Binary files a/modules/core/src/test/portables/repo/org/apache/ignite/binary/test2/1.1/test2-1.1.jar and /dev/null differ
http://git-wip-us.apache.org/repos/asf/ignite/blob/10b83fb8/modules/core/src/test/portables/repo/org/apache/ignite/binary/test2/1.1/test2-1.1.pom
----------------------------------------------------------------------
diff --git a/modules/core/src/test/portables/repo/org/apache/ignite/binary/test2/1.1/test2-1.1.pom b/modules/core/src/test/portables/repo/org/apache/ignite/binary/test2/1.1/test2-1.1.pom
deleted file mode 100644
index 2eaaeff..0000000
--- a/modules/core/src/test/portables/repo/org/apache/ignite/binary/test2/1.1/test2-1.1.pom
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
- <modelVersion>4.0.0</modelVersion>
- <groupId>org.apache.ignite.binary</groupId>
- <artifactId>test2</artifactId>
- <version>1.1</version>
- <description>POM was created from install:install-file</description>
-</project>
http://git-wip-us.apache.org/repos/asf/ignite/blob/10b83fb8/modules/core/src/test/portables/repo/org/apache/ignite/binary/test2/maven-metadata-local.xml
----------------------------------------------------------------------
diff --git a/modules/core/src/test/portables/repo/org/apache/ignite/binary/test2/maven-metadata-local.xml b/modules/core/src/test/portables/repo/org/apache/ignite/binary/test2/maven-metadata-local.xml
deleted file mode 100644
index c45c88f..0000000
--- a/modules/core/src/test/portables/repo/org/apache/ignite/binary/test2/maven-metadata-local.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<metadata>
- <groupId>org.apache.ignite.binary</groupId>
- <artifactId>test2</artifactId>
- <versioning>
- <release>1.1</release>
- <versions>
- <version>1.1</version>
- </versions>
- <lastUpdated>20140806090410</lastUpdated>
- </versioning>
-</metadata>
http://git-wip-us.apache.org/repos/asf/ignite/blob/10b83fb8/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/IgniteH2Indexing.java
----------------------------------------------------------------------
diff --git a/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/IgniteH2Indexing.java b/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/IgniteH2Indexing.java
index 1437a16..8625be9 100644
--- a/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/IgniteH2Indexing.java
+++ b/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/IgniteH2Indexing.java
@@ -519,13 +519,13 @@ public class IgniteH2Indexing implements GridQueryIndexing {
/**
* @param o Object.
- * @return {@code true} If it is a portable object.
+ * @return {@code true} If it is a binary object.
*/
- private boolean isPortable(CacheObject o) {
+ private boolean isBinary(CacheObject o) {
if (ctx == null)
return false;
- return ctx.cacheObjects().isPortableObject(o);
+ return ctx.cacheObjects().isBinaryObject(o);
}
/**
@@ -534,7 +534,7 @@ public class IgniteH2Indexing implements GridQueryIndexing {
* @return Object class.
*/
private Class<?> getClass(CacheObjectContext coctx, CacheObject o) {
- return isPortable(o) ?
+ return isBinary(o) ?
Object.class :
o.value(coctx, false).getClass();
}
@@ -1045,7 +1045,7 @@ public class IgniteH2Indexing implements GridQueryIndexing {
twoStepQry.pageSize(qry.getPageSize());
- QueryCursorImpl<List<?>> cursor = new QueryCursorImpl<>(queryTwoStep(cctx, twoStepQry, cctx.keepPortable()));
+ QueryCursorImpl<List<?>> cursor = new QueryCursorImpl<>(queryTwoStep(cctx, twoStepQry, cctx.keepBinary()));
cursor.fieldsMeta(meta);
http://git-wip-us.apache.org/repos/asf/ignite/blob/10b83fb8/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/twostep/GridReduceQueryExecutor.java
----------------------------------------------------------------------
diff --git a/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/twostep/GridReduceQueryExecutor.java b/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/twostep/GridReduceQueryExecutor.java
index 1d4fa30..828d9bd 100644
--- a/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/twostep/GridReduceQueryExecutor.java
+++ b/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/twostep/GridReduceQueryExecutor.java
@@ -448,10 +448,10 @@ public class GridReduceQueryExecutor {
/**
* @param cctx Cache context.
* @param qry Query.
- * @param keepPortable Keep portable.
+ * @param keepBinary Keep binary.
* @return Cursor.
*/
- public Iterator<List<?>> query(GridCacheContext<?,?> cctx, GridCacheTwoStepQuery qry, boolean keepPortable) {
+ public Iterator<List<?>> query(GridCacheContext<?,?> cctx, GridCacheTwoStepQuery qry, boolean keepBinary) {
for (int attempt = 0;; attempt++) {
if (attempt != 0) {
try {
@@ -652,7 +652,7 @@ public class GridReduceQueryExecutor {
continue;
}
- return new GridQueryCacheObjectsIterator(resIter, cctx, keepPortable);
+ return new GridQueryCacheObjectsIterator(resIter, cctx, keepBinary);
}
catch (IgniteCheckedException | RuntimeException e) {
U.closeQuiet(r.conn);
@@ -1240,4 +1240,4 @@ public class GridReduceQueryExecutor {
return res;
}
}
-}
\ No newline at end of file
+}
http://git-wip-us.apache.org/repos/asf/ignite/blob/10b83fb8/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheP2pUnmarshallingQueryErrorTest.java
----------------------------------------------------------------------
diff --git a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheP2pUnmarshallingQueryErrorTest.java b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheP2pUnmarshallingQueryErrorTest.java
index a92451f..64a1115 100644
--- a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheP2pUnmarshallingQueryErrorTest.java
+++ b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheP2pUnmarshallingQueryErrorTest.java
@@ -54,10 +54,10 @@ public class IgniteCacheP2pUnmarshallingQueryErrorTest extends IgniteCacheP2pUnm
try {
jcache(0).query(new SqlQuery<TestKey, String>(String.class, "field like '" + key + "'")).getAll();
- assertTrue("p2p marshalling failed, but error response was not sent", portableMarshaller());
+ assertTrue("p2p marshalling failed, but error response was not sent", binaryMarshaller());
}
catch (CacheException e) {
- assertFalse("Unexpected exception: " + e, portableMarshaller());
+ assertFalse("Unexpected exception: " + e, binaryMarshaller());
}
}
@@ -78,20 +78,20 @@ public class IgniteCacheP2pUnmarshallingQueryErrorTest extends IgniteCacheP2pUnm
}
})).getAll();
- assertTrue("Request unmarshalling failed, but error response was not sent.", portableMarshaller());
+ assertTrue("Request unmarshalling failed, but error response was not sent.", binaryMarshaller());
}
catch (Exception e) {
- assertFalse("Unexpected exception: " + e, portableMarshaller());
+ assertFalse("Unexpected exception: " + e, binaryMarshaller());
}
}
/**
- * @return {@code True} if portable marshaller is configured.
+ * @return {@code True} if binary marshaller is configured.
*/
- private boolean portableMarshaller() {
+ private boolean binaryMarshaller() {
IgniteEx kernal = (IgniteEx)ignite(0);
return !OptimizedMarshaller.class.getSimpleName().equals(kernal.context().config().getMarshaller().getClass()
.getSimpleName());
}
-}
\ No newline at end of file
+}
http://git-wip-us.apache.org/repos/asf/ignite/blob/10b83fb8/modules/indexing/src/test/java/org/apache/ignite/testsuites/IgniteBinaryCacheQueryTestSuite.java
----------------------------------------------------------------------
diff --git a/modules/indexing/src/test/java/org/apache/ignite/testsuites/IgniteBinaryCacheQueryTestSuite.java b/modules/indexing/src/test/java/org/apache/ignite/testsuites/IgniteBinaryCacheQueryTestSuite.java
index daf9c45..786b5b8 100644
--- a/modules/indexing/src/test/java/org/apache/ignite/testsuites/IgniteBinaryCacheQueryTestSuite.java
+++ b/modules/indexing/src/test/java/org/apache/ignite/testsuites/IgniteBinaryCacheQueryTestSuite.java
@@ -51,7 +51,7 @@ import org.apache.ignite.spi.communication.tcp.GridOrderedMessageCancelSelfTest;
import org.apache.ignite.testframework.config.GridTestProperties;
/**
- * Cache query suite with portable marshaller.
+ * Cache query suite with binary marshaller.
*/
public class IgniteBinaryCacheQueryTestSuite extends TestSuite {
/**
@@ -61,7 +61,7 @@ public class IgniteBinaryCacheQueryTestSuite extends TestSuite {
public static TestSuite suite() throws Exception {
GridTestProperties.setProperty(GridTestProperties.MARSH_CLASS_NAME, BinaryMarshaller.class.getName());
- TestSuite suite = new TestSuite("Grid Cache Query Test Suite using PortableMarshaller");
+ TestSuite suite = new TestSuite("Grid Cache Query Test Suite using BinaryMarshaller");
// Parsing
suite.addTestSuite(GridQueryParsingTest.class);
@@ -92,8 +92,8 @@ public class IgniteBinaryCacheQueryTestSuite extends TestSuite {
suite.addTestSuite(GridCacheQueryIndexingDisabledSelfTest.class);
- //Should be adjusted. Not ready to be used with PortableMarshaller.
- //suite.addTestSuite(GridCachePortableSwapScanQuerySelfTest.class);
+ //Should be adjusted. Not ready to be used with BinaryMarshaller.
+ //suite.addTestSuite(GridCacheBinarySwapScanQuerySelfTest.class);
suite.addTestSuite(GridOrderedMessageCancelSelfTest.class);
http://git-wip-us.apache.org/repos/asf/ignite/blob/10b83fb8/parent/pom.xml
----------------------------------------------------------------------
diff --git a/parent/pom.xml b/parent/pom.xml
index 0f2d363..486fc0d 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -846,10 +846,10 @@
<exclude>dev-tools/.gradle/**/*</exclude>
<exclude>dev-tools/gradle/wrapper/**/*</exclude>
<exclude>dev-tools/gradlew</exclude>
- <exclude>src/test/portables/repo/org/apache/ignite/binary/test2/1.1/test2-1.1.pom</exclude>
- <exclude>src/test/portables/repo/org/apache/ignite/binary/test2/maven-metadata-local.xml</exclude>
- <exclude>src/test/portables/repo/org/apache/ignite/binary/test1/1.1/test1-1.1.pom</exclude>
- <exclude>src/test/portables/repo/org/apache/ignite/binary/test1/maven-metadata-local.xml</exclude>
+ <exclude>src/test/binaries/repo/org/apache/ignite/binary/test2/1.1/test2-1.1.pom</exclude>
+ <exclude>src/test/binaries/repo/org/apache/ignite/binary/test2/maven-metadata-local.xml</exclude>
+ <exclude>src/test/binaries/repo/org/apache/ignite/binary/test1/1.1/test1-1.1.pom</exclude>
+ <exclude>src/test/binaries/repo/org/apache/ignite/binary/test1/maven-metadata-local.xml</exclude>
<!--shmem-->
<exclude>ipc/shmem/**/Makefile.in</exclude><!--auto generated files-->
<exclude>ipc/shmem/**/Makefile</exclude><!--auto generated files-->
@@ -875,8 +875,8 @@
<!--platforms-->
<exclude>src/main/java/META-INF/services/org.apache.ignite.internal.processors.platform.PlatformBootstrapFactory</exclude>
<exclude>src/main/resources/META-INF/services/org.apache.ignite.internal.processors.platform.PlatformBootstrapFactory</exclude>
- <exclude>src/test/portables/repo/org/apache/ignite/portable/test1/1.1/test1-1.1.jar</exclude>
- <exclude>src/test/portables/repo/org/apache/ignite/portable/test2/1.1/test2-1.1.jar</exclude>
+ <exclude>src/test/binaries/repo/org/apache/ignite/binary/test1/1.1/test1-1.1.jar</exclude>
+ <exclude>src/test/binaries/repo/org/apache/ignite/binary/test2/1.1/test2-1.1.jar</exclude>
<exclude>**/META-INF/services/*.PlatformBootstrapFactory</exclude>
<exclude>**/Makefile.am</exclude>
<exclude>**/configure.ac</exclude>
[15/24] ignite git commit: Fixed failure in
BinaryObjectBuilderSelfTest.testSetBinaryObject.
Posted by ak...@apache.org.
Fixed failure in BinaryObjectBuilderSelfTest.testSetBinaryObject.
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/3db14482
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/3db14482
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/3db14482
Branch: refs/heads/ignite-843-rc2
Commit: 3db14482091d01e96e1ae40a15cb903c3adcddbd
Parents: ed27fbd
Author: vozerov-gridgain <vo...@gridgain.com>
Authored: Mon Dec 14 10:19:24 2015 +0300
Committer: vozerov-gridgain <vo...@gridgain.com>
Committed: Mon Dec 14 10:19:24 2015 +0300
----------------------------------------------------------------------
.../internal/binary/BinaryObjectBuilderSelfTest.java | 10 +++++++++-
1 file changed, 9 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ignite/blob/3db14482/modules/core/src/test/java/org/apache/ignite/internal/binary/BinaryObjectBuilderSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/binary/BinaryObjectBuilderSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/binary/BinaryObjectBuilderSelfTest.java
index 2424fe8..3b6d0b0 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/binary/BinaryObjectBuilderSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/binary/BinaryObjectBuilderSelfTest.java
@@ -909,11 +909,19 @@ public class BinaryObjectBuilderSelfTest extends GridCommonAbstractTest {
*
*/
public void testSetBinaryObject() {
+ // Prepare marshaller context.
+ CacheObjectBinaryProcessorImpl proc = ((CacheObjectBinaryProcessorImpl)(grid(0)).context().cacheObjects());
+
+ proc.marshal(new GridBinaryTestClasses.TestObjectContainer());
+ proc.marshal(new GridBinaryTestClasses.TestObjectAllTypes());
+
+ // Actual test.
BinaryObject binaryObj = builder(GridBinaryTestClasses.TestObjectContainer.class.getName())
.setField("foo", toBinary(new GridBinaryTestClasses.TestObjectAllTypes()))
.build();
- assertTrue(binaryObj.<GridBinaryTestClasses.TestObjectContainer>deserialize().foo instanceof GridBinaryTestClasses.TestObjectAllTypes);
+ assertTrue(binaryObj.<GridBinaryTestClasses.TestObjectContainer>deserialize().foo instanceof
+ GridBinaryTestClasses.TestObjectAllTypes);
}
/**
[13/24] ignite git commit: Fixed failure in
BinaryObjectBuilderSelfTest.testCopyFromInnerObject.
Posted by ak...@apache.org.
Fixed failure in BinaryObjectBuilderSelfTest.testCopyFromInnerObject.
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/4ae6292c
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/4ae6292c
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/4ae6292c
Branch: refs/heads/ignite-843-rc2
Commit: 4ae6292cface325f21237db5d18ce77dee380072
Parents: 6d96bb6
Author: vozerov-gridgain <vo...@gridgain.com>
Authored: Mon Dec 14 10:08:29 2015 +0300
Committer: vozerov-gridgain <vo...@gridgain.com>
Committed: Mon Dec 14 10:08:29 2015 +0300
----------------------------------------------------------------------
.../ignite/internal/binary/BinaryUtils.java | 19 ++++++++++++-------
1 file changed, 12 insertions(+), 7 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ignite/blob/4ae6292c/modules/core/src/main/java/org/apache/ignite/internal/binary/BinaryUtils.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/binary/BinaryUtils.java b/modules/core/src/main/java/org/apache/ignite/internal/binary/BinaryUtils.java
index 8b5ec68..9e5260b 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/binary/BinaryUtils.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/binary/BinaryUtils.java
@@ -836,13 +836,18 @@ public class BinaryUtils {
if (oldFieldType == null)
changed = true;
- else if (!F.eq(oldFieldType, newField.getValue())) {
- throw new BinaryObjectException(
- "Binary type has different field types [" + "typeName=" + oldMeta.typeName() +
- ", fieldName=" + newField.getKey() +
- ", fieldTypeName1=" + fieldTypeName(oldFieldType) +
- ", fieldTypeName2=" + fieldTypeName(newField.getValue()) + ']'
- );
+ else {
+ String oldFieldTypeName = fieldTypeName(oldFieldType);
+ String newFieldTypeName = fieldTypeName(newField.getValue());
+
+ if (!F.eq(oldFieldTypeName, newFieldTypeName)) {
+ throw new BinaryObjectException(
+ "Binary type has different field types [" + "typeName=" + oldMeta.typeName() +
+ ", fieldName=" + newField.getKey() +
+ ", fieldTypeName1=" + oldFieldTypeName +
+ ", fieldTypeName2=" + newFieldTypeName + ']'
+ );
+ }
}
}
[16/24] ignite git commit: ignite-1.5 Fixed NPE in
IgniteKernal.dumpDebugInfo.
Posted by ak...@apache.org.
ignite-1.5 Fixed NPE in IgniteKernal.dumpDebugInfo.
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/acb57c5e
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/acb57c5e
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/acb57c5e
Branch: refs/heads/ignite-843-rc2
Commit: acb57c5eb95d11ebde5557618226d80f25ac610c
Parents: 717dab2
Author: sboikov <sb...@gridgain.com>
Authored: Mon Dec 14 10:40:57 2015 +0300
Committer: sboikov <sb...@gridgain.com>
Committed: Mon Dec 14 10:40:57 2015 +0300
----------------------------------------------------------------------
.../apache/ignite/internal/IgniteKernal.java | 26 ++++++++++++--------
1 file changed, 16 insertions(+), 10 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ignite/blob/acb57c5e/modules/core/src/main/java/org/apache/ignite/internal/IgniteKernal.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/IgniteKernal.java b/modules/core/src/main/java/org/apache/ignite/internal/IgniteKernal.java
index 4fb5d4a..0f781d6 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/IgniteKernal.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/IgniteKernal.java
@@ -3244,20 +3244,26 @@ public class IgniteKernal implements IgniteEx, IgniteMXBean, Externalizable {
/** {@inheritDoc} */
public void dumpDebugInfo() {
- boolean client = ctx.clientNode();
+ GridKernalContextImpl ctx = this.ctx;
- ClusterNode locNode = ctx.discovery().localNode();
+ if (ctx != null) {
+ boolean client = ctx.clientNode();
- UUID routerId = locNode instanceof TcpDiscoveryNode ? ((TcpDiscoveryNode)locNode).clientRouterNodeId() : null;
+ ClusterNode locNode = ctx.discovery().localNode();
- U.warn(log, "Dumping debug info for node [id=" + locNode.id() +
- ", name=" + ctx.gridName() +
- ", order=" + locNode.order() +
- ", topVer=" + ctx.discovery().topologyVersion() +
- ", client=" + client +
- (client && routerId != null ? ", routerId=" + routerId : "") + ']');
+ UUID routerId = locNode instanceof TcpDiscoveryNode ? ((TcpDiscoveryNode)locNode).clientRouterNodeId() : null;
- ctx.cache().context().exchange().dumpDebugInfo();
+ U.warn(log, "Dumping debug info for node [id=" + locNode.id() +
+ ", name=" + ctx.gridName() +
+ ", order=" + locNode.order() +
+ ", topVer=" + ctx.discovery().topologyVersion() +
+ ", client=" + client +
+ (client && routerId != null ? ", routerId=" + routerId : "") + ']');
+
+ ctx.cache().context().exchange().dumpDebugInfo();
+ }
+ else
+ U.warn(log, "Dumping debug info for node, context is not initialized [name=" + gridName + ']');
}
/** {@inheritDoc} */
[20/24] ignite git commit: ignite-1.5 Use TcpDiscoveryVmIpFinder in
test.
Posted by ak...@apache.org.
ignite-1.5 Use TcpDiscoveryVmIpFinder in test.
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/4d086734
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/4d086734
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/4d086734
Branch: refs/heads/ignite-843-rc2
Commit: 4d086734833d96b7e2403ce4f17f763a1c75caab
Parents: 47f1ced
Author: sboikov <sb...@gridgain.com>
Authored: Mon Dec 14 11:27:33 2015 +0300
Committer: sboikov <sb...@gridgain.com>
Committed: Mon Dec 14 11:27:33 2015 +0300
----------------------------------------------------------------------
.../apache/ignite/internal/GridFactorySelfTest.java | 16 ++++++++++++++++
1 file changed, 16 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ignite/blob/4d086734/modules/spring/src/test/java/org/apache/ignite/internal/GridFactorySelfTest.java
----------------------------------------------------------------------
diff --git a/modules/spring/src/test/java/org/apache/ignite/internal/GridFactorySelfTest.java b/modules/spring/src/test/java/org/apache/ignite/internal/GridFactorySelfTest.java
index bc7dc4b..d72b577 100644
--- a/modules/spring/src/test/java/org/apache/ignite/internal/GridFactorySelfTest.java
+++ b/modules/spring/src/test/java/org/apache/ignite/internal/GridFactorySelfTest.java
@@ -57,6 +57,8 @@ import org.apache.ignite.spi.collision.CollisionContext;
import org.apache.ignite.spi.collision.CollisionExternalListener;
import org.apache.ignite.spi.collision.CollisionSpi;
import org.apache.ignite.spi.discovery.tcp.TcpDiscoverySpi;
+import org.apache.ignite.spi.discovery.tcp.ipfinder.TcpDiscoveryIpFinder;
+import org.apache.ignite.spi.discovery.tcp.ipfinder.vm.TcpDiscoveryVmIpFinder;
import org.apache.ignite.testframework.GridTestUtils;
import org.apache.ignite.testframework.config.GridTestProperties;
import org.apache.ignite.testframework.http.GridEmbeddedHttpServer;
@@ -83,6 +85,9 @@ import static org.apache.ignite.IgniteSystemProperties.IGNITE_OVERRIDE_MCAST_GRP
@SuppressWarnings("UnusedDeclaration")
@GridCommonTest(group = "NonDistributed Kernal Self")
public class GridFactorySelfTest extends GridCommonAbstractTest {
+ /** IP finder. */
+ private static final TcpDiscoveryIpFinder IP_FINDER = new TcpDiscoveryVmIpFinder(true);
+
/** */
private static final AtomicInteger cnt = new AtomicInteger();
@@ -105,6 +110,15 @@ public class GridFactorySelfTest extends GridCommonAbstractTest {
cnt.set(0);
}
+ /** {@inheritDoc} */
+ @Override protected IgniteConfiguration getConfiguration(String gridName) throws Exception {
+ IgniteConfiguration cfg = super.getConfiguration(gridName);
+
+ ((TcpDiscoverySpi)cfg.getDiscoverySpi()).setIpFinder(IP_FINDER);
+
+ return cfg;
+ }
+
/**
* @throws Exception If failed.
*/
@@ -863,9 +877,11 @@ public class GridFactorySelfTest extends GridCommonAbstractTest {
public void testCurrentIgnite() throws Exception {
final String LEFT = "LEFT";
final String RIGHT = "RIGHT";
+
try {
Ignite iLEFT = startGrid(LEFT);
Ignite iRIGHT = startGrid(RIGHT);
+
waitForDiscovery(iLEFT, iRIGHT);
iLEFT.compute(iLEFT.cluster().forRemotes()).run(new IgniteRunnable() {
[14/24] ignite git commit: Merge remote-tracking branch
'origin/ignite-1.5' into ignite-1.5
Posted by ak...@apache.org.
Merge remote-tracking branch 'origin/ignite-1.5' into ignite-1.5
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/ed27fbda
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/ed27fbda
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/ed27fbda
Branch: refs/heads/ignite-843-rc2
Commit: ed27fbdab9d8307b4db427866ed1094526c117c8
Parents: 4ae6292 717dab2
Author: vozerov-gridgain <vo...@gridgain.com>
Authored: Mon Dec 14 10:08:47 2015 +0300
Committer: vozerov-gridgain <vo...@gridgain.com>
Committed: Mon Dec 14 10:08:47 2015 +0300
----------------------------------------------------------------------
.../TcpDiscoveryMulticastIpFinder.java | 106 +++++++++++++------
.../tcp/TcpClientDiscoverySpiMulticastTest.java | 91 +++++++++++++++-
.../TcpDiscoveryIpFinderAbstractSelfTest.java | 2 +-
.../TcpDiscoveryMulticastIpFinderSelfTest.java | 16 ++-
4 files changed, 174 insertions(+), 41 deletions(-)
----------------------------------------------------------------------
[07/24] ignite git commit: ignite-2065: portable -> binary renaming
(methods, javadoc and etc.)
Posted by ak...@apache.org.
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);
}
[19/24] ignite git commit: ignite-1.5 Fixed test to override correct
'getConfiguration' method.
Posted by ak...@apache.org.
ignite-1.5 Fixed test to override correct 'getConfiguration' method.
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/47f1ced2
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/47f1ced2
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/47f1ced2
Branch: refs/heads/ignite-843-rc2
Commit: 47f1ced214b4176b13293386c1e2042c9cc20b32
Parents: 484a3af
Author: sboikov <sb...@gridgain.com>
Authored: Mon Dec 14 11:09:17 2015 +0300
Committer: sboikov <sb...@gridgain.com>
Committed: Mon Dec 14 11:09:17 2015 +0300
----------------------------------------------------------------------
.../internal/processors/query/IgniteSqlSplitterSelfTest.java | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ignite/blob/47f1ced2/modules/indexing/src/test/java/org/apache/ignite/internal/processors/query/IgniteSqlSplitterSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/query/IgniteSqlSplitterSelfTest.java b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/query/IgniteSqlSplitterSelfTest.java
index 0868fe6..865a0fd 100644
--- a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/query/IgniteSqlSplitterSelfTest.java
+++ b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/query/IgniteSqlSplitterSelfTest.java
@@ -45,8 +45,8 @@ public class IgniteSqlSplitterSelfTest extends GridCommonAbstractTest {
private static final TcpDiscoveryIpFinder ipFinder = new TcpDiscoveryVmIpFinder(true);
/** {@inheritDoc} */
- @Override protected IgniteConfiguration getConfiguration() throws Exception {
- IgniteConfiguration cfg = super.getConfiguration();
+ @Override protected IgniteConfiguration getConfiguration(String gridName) throws Exception {
+ IgniteConfiguration cfg = super.getConfiguration(gridName);
cfg.setPeerClassLoadingEnabled(false);
[11/24] ignite git commit: ignite-1.5 Fixed
TcpDiscoveryMulticastIpFinder to request address on each
getRegisteredAddresses call
Posted by ak...@apache.org.
ignite-1.5 Fixed TcpDiscoveryMulticastIpFinder to request address on each getRegisteredAddresses call
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/717dab25
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/717dab25
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/717dab25
Branch: refs/heads/ignite-843-rc2
Commit: 717dab259e3f0287046ffcefa28cf9214ab65ff7
Parents: 6c61598
Author: sboikov <sb...@gridgain.com>
Authored: Mon Dec 14 10:00:57 2015 +0300
Committer: sboikov <sb...@gridgain.com>
Committed: Mon Dec 14 10:00:57 2015 +0300
----------------------------------------------------------------------
.../TcpDiscoveryMulticastIpFinder.java | 106 +++++++++++++------
.../tcp/TcpClientDiscoverySpiMulticastTest.java | 91 +++++++++++++++-
.../TcpDiscoveryIpFinderAbstractSelfTest.java | 2 +-
.../TcpDiscoveryMulticastIpFinderSelfTest.java | 16 ++-
4 files changed, 174 insertions(+), 41 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ignite/blob/717dab25/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/ipfinder/multicast/TcpDiscoveryMulticastIpFinder.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/ipfinder/multicast/TcpDiscoveryMulticastIpFinder.java b/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/ipfinder/multicast/TcpDiscoveryMulticastIpFinder.java
index d19d08b..77bb99d 100644
--- a/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/ipfinder/multicast/TcpDiscoveryMulticastIpFinder.java
+++ b/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/ipfinder/multicast/TcpDiscoveryMulticastIpFinder.java
@@ -122,6 +122,20 @@ public class TcpDiscoveryMulticastIpFinder extends TcpDiscoveryVmIpFinder {
@GridToStringExclude
private Collection<AddressSender> addrSnds;
+ /** */
+ @GridToStringExclude
+ private InetAddress mcastAddr;
+
+ /** */
+ @GridToStringExclude
+ private Set<InetAddress> reqItfs;
+
+ /** */
+ private boolean firstReq;
+
+ /** */
+ private boolean mcastErr;
+
/**
* Constructs new IP finder.
*/
@@ -300,8 +314,6 @@ public class TcpDiscoveryMulticastIpFinder extends TcpDiscoveryVmIpFinder {
boolean clientMode = discoveryClientMode();
- InetAddress mcastAddr;
-
try {
mcastAddr = InetAddress.getByName(mcastGrp);
}
@@ -325,7 +337,7 @@ public class TcpDiscoveryMulticastIpFinder extends TcpDiscoveryVmIpFinder {
addrSnds = new ArrayList<>(locAddrs.size());
- Set<InetAddress> reqItfs = new HashSet<>(locAddrs.size()); // Interfaces used to send requests.
+ reqItfs = new HashSet<>(locAddrs.size()); // Interfaces used to send requests.
for (String locAddr : locAddrs) {
InetAddress addr;
@@ -356,8 +368,6 @@ public class TcpDiscoveryMulticastIpFinder extends TcpDiscoveryVmIpFinder {
}
}
- boolean mcastErr = false;
-
if (!clientMode) {
if (addrSnds.isEmpty()) {
try {
@@ -395,11 +405,62 @@ public class TcpDiscoveryMulticastIpFinder extends TcpDiscoveryVmIpFinder {
}
else
assert addrSnds.isEmpty() : addrSnds;
+ }
+
+ /** {@inheritDoc} */
+ @Override public void onSpiContextInitialized(IgniteSpiContext spiCtx) throws IgniteSpiException {
+ super.onSpiContextInitialized(spiCtx);
+
+ spiCtx.registerPort(mcastPort, UDP);
+ }
+
+ /** {@inheritDoc} */
+ @Override public synchronized Collection<InetSocketAddress> getRegisteredAddresses() {
+ if (mcastAddr != null && reqItfs != null) {
+ Collection<InetSocketAddress> ret;
+
+ if (reqItfs.size() > 1)
+ ret = requestAddresses(reqItfs);
+ else {
+ T2<Collection<InetSocketAddress>, Boolean> res = requestAddresses(mcastAddr, F.first(reqItfs));
- Collection<InetSocketAddress> ret;
+ ret = res.get1();
+
+ mcastErr |= res.get2();
+ }
+ if (ret.isEmpty()) {
+ if (mcastErr && firstReq) {
+ if (getRegisteredAddresses().isEmpty()) {
+ InetSocketAddress addr = new InetSocketAddress("localhost", TcpDiscoverySpi.DFLT_PORT);
+
+ U.quietAndWarn(log, "TcpDiscoveryMulticastIpFinder failed to initialize multicast, " +
+ "will use default address: " + addr);
+
+ registerAddresses(Collections.singleton(addr));
+ }
+ else
+ U.quietAndWarn(log, "TcpDiscoveryMulticastIpFinder failed to initialize multicast, " +
+ "will use pre-configured addresses.");
+ }
+ }
+ else
+ registerAddresses(ret);
+
+ firstReq = false;
+ }
+
+ return super.getRegisteredAddresses();
+ }
+
+
+ /**
+ * @param reqItfs Interfaces used to send requests.
+ * @return Addresses.
+ */
+ private Collection<InetSocketAddress> requestAddresses(Set<InetAddress> reqItfs) {
if (reqItfs.size() > 1) {
- ret = new HashSet<>();
+ Collection<InetSocketAddress> ret = new HashSet<>();
Collection<AddressReceiver> rcvrs = new ArrayList<>();
@@ -425,39 +486,14 @@ public class TcpDiscoveryMulticastIpFinder extends TcpDiscoveryVmIpFinder {
break;
}
}
+
+ return ret;
}
else {
T2<Collection<InetSocketAddress>, Boolean> res = requestAddresses(mcastAddr, F.first(reqItfs));
- ret = res.get1();
-
- mcastErr |= res.get2();
+ return res.get1();
}
-
- if (ret.isEmpty()) {
- if (mcastErr) {
- if (getRegisteredAddresses().isEmpty()) {
- InetSocketAddress addr = new InetSocketAddress("localhost", TcpDiscoverySpi.DFLT_PORT);
-
- U.quietAndWarn(log, "TcpDiscoveryMulticastIpFinder failed to initialize multicast, " +
- "will use default address: " + addr);
-
- registerAddresses(Collections.singleton(addr));
- }
- else
- U.quietAndWarn(log, "TcpDiscoveryMulticastIpFinder failed to initialize multicast, " +
- "will use pre-configured addresses.");
- }
- }
- else
- registerAddresses(ret);
- }
-
- /** {@inheritDoc} */
- @Override public void onSpiContextInitialized(IgniteSpiContext spiCtx) throws IgniteSpiException {
- super.onSpiContextInitialized(spiCtx);
-
- spiCtx.registerPort(mcastPort, UDP);
}
/**
http://git-wip-us.apache.org/repos/asf/ignite/blob/717dab25/modules/core/src/test/java/org/apache/ignite/spi/discovery/tcp/TcpClientDiscoverySpiMulticastTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/spi/discovery/tcp/TcpClientDiscoverySpiMulticastTest.java b/modules/core/src/test/java/org/apache/ignite/spi/discovery/tcp/TcpClientDiscoverySpiMulticastTest.java
index 79fd954..6611e00 100644
--- a/modules/core/src/test/java/org/apache/ignite/spi/discovery/tcp/TcpClientDiscoverySpiMulticastTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/spi/discovery/tcp/TcpClientDiscoverySpiMulticastTest.java
@@ -18,13 +18,23 @@
package org.apache.ignite.spi.discovery.tcp;
import java.util.Collection;
+import java.util.concurrent.Callable;
+import java.util.concurrent.CountDownLatch;
import org.apache.ignite.Ignite;
import org.apache.ignite.configuration.IgniteConfiguration;
+import org.apache.ignite.events.Event;
+import org.apache.ignite.internal.IgniteInternalFuture;
+import org.apache.ignite.internal.util.typedef.internal.U;
+import org.apache.ignite.lang.IgnitePredicate;
import org.apache.ignite.spi.discovery.DiscoverySpi;
import org.apache.ignite.spi.discovery.tcp.ipfinder.multicast.TcpDiscoveryMulticastIpFinder;
import org.apache.ignite.testframework.GridTestUtils;
import org.apache.ignite.testframework.junits.common.GridCommonAbstractTest;
+import static java.util.concurrent.TimeUnit.SECONDS;
+import static org.apache.ignite.events.EventType.EVT_CLIENT_NODE_DISCONNECTED;
+import static org.apache.ignite.events.EventType.EVT_CLIENT_NODE_RECONNECTED;
+
/**
*
*/
@@ -32,6 +42,12 @@ public class TcpClientDiscoverySpiMulticastTest extends GridCommonAbstractTest {
/** */
private boolean forceSrv;
+ /** */
+ private ThreadLocal<Boolean> client = new ThreadLocal<>();
+
+ /** */
+ private ThreadLocal<Integer> discoPort = new ThreadLocal<>();
+
/** {@inheritDoc} */
@Override protected IgniteConfiguration getConfiguration(String gridName) throws Exception {
IgniteConfiguration cfg = super.getConfiguration(gridName);
@@ -42,11 +58,23 @@ public class TcpClientDiscoverySpiMulticastTest extends GridCommonAbstractTest {
spi.setIpFinder(new TcpDiscoveryMulticastIpFinder());
- if (getTestGridName(1).equals(gridName)) {
+ Boolean clientFlag = client.get();
+
+ client.set(null);
+
+ if (clientFlag != null && clientFlag) {
cfg.setClientMode(true);
spi.setForceServerMode(forceSrv);
}
+ else {
+ Integer port = discoPort.get();
+
+ discoPort.set(null);
+
+ if (port != null)
+ spi.setLocalPort(port);
+ }
cfg.setDiscoverySpi(spi);
@@ -59,6 +87,61 @@ public class TcpClientDiscoverySpiMulticastTest extends GridCommonAbstractTest {
stopAllGrids();
}
+
+ /**
+ * @throws Exception If failed.
+ */
+ public void testClientStartsFirst() throws Exception {
+ IgniteInternalFuture<Ignite> fut = GridTestUtils.runAsync(new Callable<Ignite>() {
+ @Override public Ignite call() throws Exception {
+ client.set(true);
+
+ return startGrid(0);
+ }
+ }, "start-client");
+
+ U.sleep(10_000);
+
+ discoPort.set(TcpDiscoverySpi.DFLT_PORT);
+
+ Ignite srv = startGrid(1);
+
+ Ignite client = fut.get();
+
+ final CountDownLatch reconnectLatch = new CountDownLatch(1);
+
+ final CountDownLatch disconnectLatch = new CountDownLatch(1);
+
+ client.events().localListen(new IgnitePredicate<Event>() {
+ @Override public boolean apply(Event evt) {
+ info("Client event: " + evt);
+
+ if (evt.type() == EVT_CLIENT_NODE_DISCONNECTED) {
+ assertEquals(1, reconnectLatch.getCount());
+
+ disconnectLatch.countDown();
+ }
+ else if (evt.type() == EVT_CLIENT_NODE_RECONNECTED) {
+ assertEquals(0, disconnectLatch.getCount());
+
+ reconnectLatch.countDown();
+ }
+
+ return true;
+ }
+ }, EVT_CLIENT_NODE_DISCONNECTED, EVT_CLIENT_NODE_RECONNECTED);
+
+ srv.close();
+
+ assertTrue(disconnectLatch.await(10, SECONDS));
+
+ discoPort.set(TcpDiscoverySpi.DFLT_PORT + 100);
+
+ startGrid(1);
+
+ assertTrue(reconnectLatch.await(10, SECONDS));
+ }
+
/**
* @throws Exception If failed.
*/
@@ -83,8 +166,12 @@ public class TcpClientDiscoverySpiMulticastTest extends GridCommonAbstractTest {
assertSpi(ignite0, false);
+ client.set(true);
+
Ignite ignite1 = startGrid(1);
+ assertTrue(ignite1.configuration().isClientMode());
+
assertSpi(ignite1, !forceSrv);
assertTrue(ignite1.configuration().isClientMode());
@@ -92,6 +179,8 @@ public class TcpClientDiscoverySpiMulticastTest extends GridCommonAbstractTest {
assertEquals(2, ignite0.cluster().nodes().size());
assertEquals(2, ignite1.cluster().nodes().size());
+ client.set(false);
+
Ignite ignite2 = startGrid(2);
assertSpi(ignite2, false);
http://git-wip-us.apache.org/repos/asf/ignite/blob/717dab25/modules/core/src/test/java/org/apache/ignite/spi/discovery/tcp/ipfinder/TcpDiscoveryIpFinderAbstractSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/spi/discovery/tcp/ipfinder/TcpDiscoveryIpFinderAbstractSelfTest.java b/modules/core/src/test/java/org/apache/ignite/spi/discovery/tcp/ipfinder/TcpDiscoveryIpFinderAbstractSelfTest.java
index 03df43c..06aadda 100644
--- a/modules/core/src/test/java/org/apache/ignite/spi/discovery/tcp/ipfinder/TcpDiscoveryIpFinderAbstractSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/spi/discovery/tcp/ipfinder/TcpDiscoveryIpFinderAbstractSelfTest.java
@@ -81,7 +81,7 @@ public abstract class TcpDiscoveryIpFinderAbstractSelfTest<T extends TcpDiscover
for (InetSocketAddress addr : initAddrs)
assert addrs.contains(addr) : "Address is missing (got inconsistent addrs collection): " + addr;
- finder.unregisterAddresses(Collections.singletonList(node1));
+ finder.unregisterAddresses(Collections.singletonList(node2));
addrs = finder.getRegisteredAddresses();
http://git-wip-us.apache.org/repos/asf/ignite/blob/717dab25/modules/core/src/test/java/org/apache/ignite/spi/discovery/tcp/ipfinder/multicast/TcpDiscoveryMulticastIpFinderSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/spi/discovery/tcp/ipfinder/multicast/TcpDiscoveryMulticastIpFinderSelfTest.java b/modules/core/src/test/java/org/apache/ignite/spi/discovery/tcp/ipfinder/multicast/TcpDiscoveryMulticastIpFinderSelfTest.java
index 1e710ee..b39be56 100644
--- a/modules/core/src/test/java/org/apache/ignite/spi/discovery/tcp/ipfinder/multicast/TcpDiscoveryMulticastIpFinderSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/spi/discovery/tcp/ipfinder/multicast/TcpDiscoveryMulticastIpFinderSelfTest.java
@@ -84,19 +84,27 @@ public class TcpDiscoveryMulticastIpFinderSelfTest
ipFinder3.setLocalAddress(locAddr);
ipFinder1.initializeLocalAddresses(Collections.singleton(new InetSocketAddress("host1", 1001)));
- ipFinder2.initializeLocalAddresses(Collections.singleton(new InetSocketAddress("host2", 1002)));
- ipFinder3.initializeLocalAddresses(Collections.singleton(new InetSocketAddress("host3", 1003)));
Collection<InetSocketAddress> addrs1 = ipFinder1.getRegisteredAddresses();
+
+ ipFinder2.initializeLocalAddresses(Collections.singleton(new InetSocketAddress("host2", 1002)));
+
Collection<InetSocketAddress> addrs2 = ipFinder2.getRegisteredAddresses();
+
+ ipFinder3.initializeLocalAddresses(Collections.singleton(new InetSocketAddress("host3", 1003)));
+
Collection<InetSocketAddress> addrs3 = ipFinder3.getRegisteredAddresses();
info("Addrs1: " + addrs1);
info("Addrs2: " + addrs2);
info("Addrs2: " + addrs3);
- assertEquals(1, ipFinder1.getRegisteredAddresses().size());
- assertEquals(2, ipFinder2.getRegisteredAddresses().size());
+ assertEquals(1, addrs1.size());
+ assertEquals(2, addrs2.size());
+ assertEquals(3, addrs3.size());
+
+ assertEquals(3, ipFinder1.getRegisteredAddresses().size());
+ assertEquals(3, ipFinder2.getRegisteredAddresses().size());
assertEquals(3, ipFinder3.getRegisteredAddresses().size());
}
finally {
[22/24] ignite git commit: ignite-1.5 Increased test timeouts.
Posted by ak...@apache.org.
ignite-1.5 Increased test timeouts.
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/beb64c34
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/beb64c34
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/beb64c34
Branch: refs/heads/ignite-843-rc2
Commit: beb64c34c271b7eac1388179b11f042b34fa0d60
Parents: 4d08673
Author: sboikov <sb...@gridgain.com>
Authored: Mon Dec 14 11:34:07 2015 +0300
Committer: sboikov <sb...@gridgain.com>
Committed: Mon Dec 14 11:34:07 2015 +0300
----------------------------------------------------------------------
.../discovery/tcp/TcpClientDiscoverySpiMulticastTest.java | 10 +++++++---
1 file changed, 7 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ignite/blob/beb64c34/modules/core/src/test/java/org/apache/ignite/spi/discovery/tcp/TcpClientDiscoverySpiMulticastTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/spi/discovery/tcp/TcpClientDiscoverySpiMulticastTest.java b/modules/core/src/test/java/org/apache/ignite/spi/discovery/tcp/TcpClientDiscoverySpiMulticastTest.java
index 6611e00..27ce883 100644
--- a/modules/core/src/test/java/org/apache/ignite/spi/discovery/tcp/TcpClientDiscoverySpiMulticastTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/spi/discovery/tcp/TcpClientDiscoverySpiMulticastTest.java
@@ -56,7 +56,11 @@ public class TcpClientDiscoverySpiMulticastTest extends GridCommonAbstractTest {
TcpDiscoverySpi spi = new TcpDiscoverySpi();
- spi.setIpFinder(new TcpDiscoveryMulticastIpFinder());
+ TcpDiscoveryMulticastIpFinder ipFinder = new TcpDiscoveryMulticastIpFinder();
+
+ ipFinder.setAddressRequestAttempts(10);
+
+ spi.setIpFinder(ipFinder);
Boolean clientFlag = client.get();
@@ -133,13 +137,13 @@ public class TcpClientDiscoverySpiMulticastTest extends GridCommonAbstractTest {
srv.close();
- assertTrue(disconnectLatch.await(10, SECONDS));
+ assertTrue(disconnectLatch.await(30, SECONDS));
discoPort.set(TcpDiscoverySpi.DFLT_PORT + 100);
startGrid(1);
- assertTrue(reconnectLatch.await(10, SECONDS));
+ assertTrue(reconnectLatch.await(30, SECONDS));
}
/**
[10/24] ignite git commit: IGNITE-2105 - Fixed nested collections in
direct marshalling
Posted by ak...@apache.org.
IGNITE-2105 - Fixed nested collections in direct marshalling
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/6c61598b
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/6c61598b
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/6c61598b
Branch: refs/heads/ignite-843-rc2
Commit: 6c61598bc66594e535af4fb10f34abe6797b72c0
Parents: 10b83fb
Author: Valentin Kulichenko <va...@gmail.com>
Authored: Fri Dec 11 17:00:25 2015 -0800
Committer: Valentin Kulichenko <va...@gmail.com>
Committed: Fri Dec 11 17:00:25 2015 -0800
----------------------------------------------------------------------
.../internal/direct/DirectMessageWriter.java | 108 ++++++++++++++-----
.../ignite/util/GridMessageCollectionTest.java | 34 ++++--
2 files changed, 111 insertions(+), 31 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ignite/blob/6c61598b/modules/core/src/main/java/org/apache/ignite/internal/direct/DirectMessageWriter.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/direct/DirectMessageWriter.java b/modules/core/src/main/java/org/apache/ignite/internal/direct/DirectMessageWriter.java
index ad122ba..085cf68 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/direct/DirectMessageWriter.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/direct/DirectMessageWriter.java
@@ -38,44 +38,29 @@ import org.jetbrains.annotations.Nullable;
* Message writer implementation.
*/
public class DirectMessageWriter implements MessageWriter {
- /** Stream. */
- private final DirectByteBufferStream stream;
-
/** State. */
- private final DirectMessageState<StateItem> state = new DirectMessageState<>(StateItem.class,
- new IgniteOutClosure<StateItem>() {
- @Override public StateItem apply() {
- return new StateItem();
- }
- });
+ private final DirectMessageState<StateItem> state;
/**
* @param protoVer Protocol version.
*/
- public DirectMessageWriter(byte protoVer) {
- switch (protoVer) {
- case 1:
- stream = new DirectByteBufferStreamImplV1(null);
-
- break;
-
- case 2:
- stream = new DirectByteBufferStreamImplV2(null);
-
- break;
-
- default:
- throw new IllegalStateException("Invalid protocol version: " + protoVer);
- }
+ public DirectMessageWriter(final byte protoVer) {
+ state = new DirectMessageState<>(StateItem.class, new IgniteOutClosure<StateItem>() {
+ @Override public StateItem apply() {
+ return new StateItem(protoVer);
+ }
+ });
}
/** {@inheritDoc} */
@Override public void setBuffer(ByteBuffer buf) {
- stream.setBuffer(buf);
+ state.item().stream.setBuffer(buf);
}
/** {@inheritDoc} */
@Override public boolean writeHeader(byte type, byte fieldCnt) {
+ DirectByteBufferStream stream = state.item().stream;
+
stream.writeByte(type);
return stream.lastFinished();
@@ -83,6 +68,8 @@ public class DirectMessageWriter implements MessageWriter {
/** {@inheritDoc} */
@Override public boolean writeByte(String name, byte val) {
+ DirectByteBufferStream stream = state.item().stream;
+
stream.writeByte(val);
return stream.lastFinished();
@@ -90,6 +77,8 @@ public class DirectMessageWriter implements MessageWriter {
/** {@inheritDoc} */
@Override public boolean writeShort(String name, short val) {
+ DirectByteBufferStream stream = state.item().stream;
+
stream.writeShort(val);
return stream.lastFinished();
@@ -97,6 +86,8 @@ public class DirectMessageWriter implements MessageWriter {
/** {@inheritDoc} */
@Override public boolean writeInt(String name, int val) {
+ DirectByteBufferStream stream = state.item().stream;
+
stream.writeInt(val);
return stream.lastFinished();
@@ -104,6 +95,8 @@ public class DirectMessageWriter implements MessageWriter {
/** {@inheritDoc} */
@Override public boolean writeLong(String name, long val) {
+ DirectByteBufferStream stream = state.item().stream;
+
stream.writeLong(val);
return stream.lastFinished();
@@ -111,6 +104,8 @@ public class DirectMessageWriter implements MessageWriter {
/** {@inheritDoc} */
@Override public boolean writeFloat(String name, float val) {
+ DirectByteBufferStream stream = state.item().stream;
+
stream.writeFloat(val);
return stream.lastFinished();
@@ -118,6 +113,8 @@ public class DirectMessageWriter implements MessageWriter {
/** {@inheritDoc} */
@Override public boolean writeDouble(String name, double val) {
+ DirectByteBufferStream stream = state.item().stream;
+
stream.writeDouble(val);
return stream.lastFinished();
@@ -125,6 +122,8 @@ public class DirectMessageWriter implements MessageWriter {
/** {@inheritDoc} */
@Override public boolean writeChar(String name, char val) {
+ DirectByteBufferStream stream = state.item().stream;
+
stream.writeChar(val);
return stream.lastFinished();
@@ -132,6 +131,8 @@ public class DirectMessageWriter implements MessageWriter {
/** {@inheritDoc} */
@Override public boolean writeBoolean(String name, boolean val) {
+ DirectByteBufferStream stream = state.item().stream;
+
stream.writeBoolean(val);
return stream.lastFinished();
@@ -139,6 +140,8 @@ public class DirectMessageWriter implements MessageWriter {
/** {@inheritDoc} */
@Override public boolean writeByteArray(String name, @Nullable byte[] val) {
+ DirectByteBufferStream stream = state.item().stream;
+
stream.writeByteArray(val);
return stream.lastFinished();
@@ -146,6 +149,8 @@ public class DirectMessageWriter implements MessageWriter {
/** {@inheritDoc} */
@Override public boolean writeByteArray(String name, byte[] val, long off, int len) {
+ DirectByteBufferStream stream = state.item().stream;
+
stream.writeByteArray(val, off, len);
return stream.lastFinished();
@@ -153,6 +158,8 @@ public class DirectMessageWriter implements MessageWriter {
/** {@inheritDoc} */
@Override public boolean writeShortArray(String name, @Nullable short[] val) {
+ DirectByteBufferStream stream = state.item().stream;
+
stream.writeShortArray(val);
return stream.lastFinished();
@@ -160,6 +167,8 @@ public class DirectMessageWriter implements MessageWriter {
/** {@inheritDoc} */
@Override public boolean writeIntArray(String name, @Nullable int[] val) {
+ DirectByteBufferStream stream = state.item().stream;
+
stream.writeIntArray(val);
return stream.lastFinished();
@@ -167,6 +176,8 @@ public class DirectMessageWriter implements MessageWriter {
/** {@inheritDoc} */
@Override public boolean writeLongArray(String name, @Nullable long[] val) {
+ DirectByteBufferStream stream = state.item().stream;
+
stream.writeLongArray(val);
return stream.lastFinished();
@@ -174,6 +185,8 @@ public class DirectMessageWriter implements MessageWriter {
/** {@inheritDoc} */
@Override public boolean writeFloatArray(String name, @Nullable float[] val) {
+ DirectByteBufferStream stream = state.item().stream;
+
stream.writeFloatArray(val);
return stream.lastFinished();
@@ -181,6 +194,8 @@ public class DirectMessageWriter implements MessageWriter {
/** {@inheritDoc} */
@Override public boolean writeDoubleArray(String name, @Nullable double[] val) {
+ DirectByteBufferStream stream = state.item().stream;
+
stream.writeDoubleArray(val);
return stream.lastFinished();
@@ -188,6 +203,8 @@ public class DirectMessageWriter implements MessageWriter {
/** {@inheritDoc} */
@Override public boolean writeCharArray(String name, @Nullable char[] val) {
+ DirectByteBufferStream stream = state.item().stream;
+
stream.writeCharArray(val);
return stream.lastFinished();
@@ -195,6 +212,8 @@ public class DirectMessageWriter implements MessageWriter {
/** {@inheritDoc} */
@Override public boolean writeBooleanArray(String name, @Nullable boolean[] val) {
+ DirectByteBufferStream stream = state.item().stream;
+
stream.writeBooleanArray(val);
return stream.lastFinished();
@@ -202,6 +221,8 @@ public class DirectMessageWriter implements MessageWriter {
/** {@inheritDoc} */
@Override public boolean writeString(String name, String val) {
+ DirectByteBufferStream stream = state.item().stream;
+
stream.writeString(val);
return stream.lastFinished();
@@ -209,6 +230,8 @@ public class DirectMessageWriter implements MessageWriter {
/** {@inheritDoc} */
@Override public boolean writeBitSet(String name, BitSet val) {
+ DirectByteBufferStream stream = state.item().stream;
+
stream.writeBitSet(val);
return stream.lastFinished();
@@ -216,6 +239,8 @@ public class DirectMessageWriter implements MessageWriter {
/** {@inheritDoc} */
@Override public boolean writeUuid(String name, UUID val) {
+ DirectByteBufferStream stream = state.item().stream;
+
stream.writeUuid(val);
return stream.lastFinished();
@@ -223,6 +248,8 @@ public class DirectMessageWriter implements MessageWriter {
/** {@inheritDoc} */
@Override public boolean writeIgniteUuid(String name, IgniteUuid val) {
+ DirectByteBufferStream stream = state.item().stream;
+
stream.writeIgniteUuid(val);
return stream.lastFinished();
@@ -230,6 +257,8 @@ public class DirectMessageWriter implements MessageWriter {
/** {@inheritDoc} */
@Override public boolean writeMessage(String name, @Nullable Message msg) {
+ DirectByteBufferStream stream = state.item().stream;
+
stream.writeMessage(msg, this);
return stream.lastFinished();
@@ -237,6 +266,8 @@ public class DirectMessageWriter implements MessageWriter {
/** {@inheritDoc} */
@Override public <T> boolean writeObjectArray(String name, T[] arr, MessageCollectionItemType itemType) {
+ DirectByteBufferStream stream = state.item().stream;
+
stream.writeObjectArray(arr, itemType, this);
return stream.lastFinished();
@@ -244,6 +275,8 @@ public class DirectMessageWriter implements MessageWriter {
/** {@inheritDoc} */
@Override public <T> boolean writeCollection(String name, Collection<T> col, MessageCollectionItemType itemType) {
+ DirectByteBufferStream stream = state.item().stream;
+
stream.writeCollection(col, itemType, this);
return stream.lastFinished();
@@ -252,6 +285,8 @@ public class DirectMessageWriter implements MessageWriter {
/** {@inheritDoc} */
@Override public <K, V> boolean writeMap(String name, Map<K, V> map, MessageCollectionItemType keyType,
MessageCollectionItemType valType) {
+ DirectByteBufferStream stream = state.item().stream;
+
stream.writeMap(map, keyType, valType, this);
return stream.lastFinished();
@@ -296,11 +331,34 @@ public class DirectMessageWriter implements MessageWriter {
*/
private static class StateItem implements DirectMessageStateItem {
/** */
+ private final DirectByteBufferStream stream;
+
+ /** */
private int state;
/** */
private boolean hdrWritten;
+ /**
+ * @param protoVer Protocol version.
+ */
+ public StateItem(byte protoVer) {
+ switch (protoVer) {
+ case 1:
+ stream = new DirectByteBufferStreamImplV1(null);
+
+ break;
+
+ case 2:
+ stream = new DirectByteBufferStreamImplV2(null);
+
+ break;
+
+ default:
+ throw new IllegalStateException("Invalid protocol version: " + protoVer);
+ }
+ }
+
/** {@inheritDoc} */
@Override public void reset() {
state = 0;
http://git-wip-us.apache.org/repos/asf/ignite/blob/6c61598b/modules/core/src/test/java/org/apache/ignite/util/GridMessageCollectionTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/util/GridMessageCollectionTest.java b/modules/core/src/test/java/org/apache/ignite/util/GridMessageCollectionTest.java
index e910a8a..44df767 100644
--- a/modules/core/src/test/java/org/apache/ignite/util/GridMessageCollectionTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/util/GridMessageCollectionTest.java
@@ -24,6 +24,9 @@ import org.apache.ignite.internal.direct.DirectMessageWriter;
import org.apache.ignite.internal.managers.communication.GridIoMessageFactory;
import org.apache.ignite.internal.util.UUIDCollectionMessage;
import org.apache.ignite.plugin.extensions.communication.Message;
+import org.apache.ignite.plugin.extensions.communication.MessageFactory;
+import org.apache.ignite.plugin.extensions.communication.MessageReader;
+import org.apache.ignite.plugin.extensions.communication.MessageWriter;
import static java.util.UUID.randomUUID;
import static org.apache.ignite.internal.util.GridMessageCollection.of;
@@ -36,6 +39,23 @@ public class GridMessageCollectionTest extends TestCase {
private byte proto;
/**
+ * @param proto Protocol version.
+ * @return Writer.
+ */
+ protected MessageWriter writer(byte proto) {
+ return new DirectMessageWriter(proto);
+ }
+
+ /**
+ * @param msgFactory Message factory.
+ * @param proto Protocol version.
+ * @return Writer.
+ */
+ protected MessageReader reader(MessageFactory msgFactory, byte proto) {
+ return new DirectMessageReader(msgFactory, proto);
+ }
+
+ /**
*
*/
public void testMarshal() {
@@ -88,17 +108,19 @@ public class GridMessageCollectionTest extends TestCase {
private void doTestMarshal(Message m) {
ByteBuffer buf = ByteBuffer.allocate(8 * 1024);
- DirectMessageWriter w = new DirectMessageWriter(proto);
-
- m.writeTo(buf, w);
+ m.writeTo(buf, writer(proto));
buf.flip();
- DirectMessageReader r = new DirectMessageReader(new GridIoMessageFactory(null), proto);
+ byte type = buf.get();
+
+ assertEquals(m.directType(), type);
+
+ GridIoMessageFactory msgFactory = new GridIoMessageFactory(null);
- r.setBuffer(buf);
+ Message mx = msgFactory.create(type);
- Message mx = r.readMessage(null);
+ mx.readFrom(buf, reader(msgFactory, proto));
assertEquals(m, mx);
}
[23/24] ignite git commit: Merge remote-tracking branch
'origin/ignite-1.5' into ignite-1.5
Posted by ak...@apache.org.
Merge remote-tracking branch 'origin/ignite-1.5' into ignite-1.5
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/72e5b9ad
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/72e5b9ad
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/72e5b9ad
Branch: refs/heads/ignite-843-rc2
Commit: 72e5b9adfdcfcad4b0002bbfc1cf20fd3a0ed149
Parents: beb64c3 de0b1ba
Author: sboikov <sb...@gridgain.com>
Authored: Mon Dec 14 11:34:32 2015 +0300
Committer: sboikov <sb...@gridgain.com>
Committed: Mon Dec 14 11:34:32 2015 +0300
----------------------------------------------------------------------
.../resources/META-INF/classnames.properties | 68 +++++++++++++-------
1 file changed, 44 insertions(+), 24 deletions(-)
----------------------------------------------------------------------
[24/24] ignite git commit: Merge branches 'ignite-1.5' and
'ignite-843-rc2'
Posted by ak...@apache.org.
Merge branches 'ignite-1.5' and 'ignite-843-rc2'
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/c453b2d4
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/c453b2d4
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/c453b2d4
Branch: refs/heads/ignite-843-rc2
Commit: c453b2d40d28352b26111d2076b6025a407432a7
Parents: ef610b2 72e5b9a
Author: Alexey Kuznetsov <ak...@apache.org>
Authored: Mon Dec 14 15:38:50 2015 +0700
Committer: Alexey Kuznetsov <ak...@apache.org>
Committed: Mon Dec 14 15:38:50 2015 +0700
----------------------------------------------------------------------
.../examples/CacheClientBinaryExampleTest.java | 6 +-
.../ComputeClientBinaryExampleTest.java | 4 +-
.../testsuites/IgniteExamplesSelfTestSuite.java | 2 +-
.../client/impl/ClientCacheFlagsCodecTest.java | 8 +-
.../src/test/resources/spring-server-node.xml | 8 +-
.../test/resources/spring-server-ssl-node.xml | 8 +-
modules/core/pom.xml | 4 +-
.../java/org/apache/ignite/IgniteBinary.java | 124 +++----
.../java/org/apache/ignite/IgniteCache.java | 8 +-
.../org/apache/ignite/binary/BinaryReader.java | 4 +-
.../affinity/AffinityNodeHashResolver.java | 6 +-
.../configuration/BinaryConfiguration.java | 4 +-
.../apache/ignite/internal/IgniteKernal.java | 26 +-
.../ignite/internal/IgniteNodeAttributes.java | 4 +-
.../internal/binary/BinaryClassDescriptor.java | 30 +-
.../ignite/internal/binary/BinaryContext.java | 14 +-
.../internal/binary/BinaryEnumObjectImpl.java | 2 +-
.../internal/binary/BinaryFieldAccessor.java | 16 +-
.../ignite/internal/binary/BinaryFieldImpl.java | 2 +-
.../internal/binary/BinaryMarshaller.java | 6 +-
.../ignite/internal/binary/BinaryMetadata.java | 4 +-
.../internal/binary/BinaryMetadataHandler.java | 2 +-
.../internal/binary/BinaryObjectExImpl.java | 4 +-
.../internal/binary/BinaryObjectImpl.java | 8 +-
.../binary/BinaryObjectOffheapImpl.java | 4 +-
.../internal/binary/BinaryReaderExImpl.java | 20 +-
.../ignite/internal/binary/BinarySchema.java | 2 +-
.../internal/binary/BinarySchemaRegistry.java | 2 +-
.../ignite/internal/binary/BinaryTypeImpl.java | 4 +-
.../ignite/internal/binary/BinaryUtils.java | 123 +++----
.../ignite/internal/binary/BinaryWriteMode.java | 8 +-
.../internal/binary/BinaryWriterExImpl.java | 20 +-
.../internal/binary/GridBinaryMarshaller.java | 10 +-
.../binary/builder/BinaryBuilderEnum.java | 6 +-
.../binary/builder/BinaryBuilderReader.java | 22 +-
.../binary/builder/BinaryBuilderSerializer.java | 10 +-
.../builder/BinaryEnumArrayLazyValue.java | 4 +-
.../binary/builder/BinaryLazyArrayList.java | 2 +-
.../internal/binary/builder/BinaryLazyMap.java | 2 +-
.../builder/BinaryObjectArrayLazyValue.java | 4 +-
.../binary/builder/BinaryObjectBuilderImpl.java | 14 +-
.../binary/builder/BinaryPlainBinaryObject.java | 14 +-
.../internal/binary/builder/package-info.java | 2 +-
.../ignite/internal/binary/package-info.java | 2 +-
.../streams/BinaryAbstractInputStream.java | 2 +-
.../streams/BinaryAbstractOutputStream.java | 2 +-
.../binary/streams/BinaryAbstractStream.java | 2 +-
.../binary/streams/BinaryHeapInputStream.java | 2 +-
.../binary/streams/BinaryHeapOutputStream.java | 2 +-
.../binary/streams/BinaryInputStream.java | 2 +-
.../streams/BinaryOffheapInputStream.java | 2 +-
.../streams/BinaryOffheapOutputStream.java | 2 +-
.../binary/streams/BinaryOutputStream.java | 2 +-
.../internal/binary/streams/BinaryStream.java | 2 +-
.../internal/binary/streams/package-info.java | 2 +-
.../internal/client/GridClientCacheFlag.java | 10 +-
.../internal/client/GridClientCompute.java | 4 +-
.../client/GridClientConfiguration.java | 4 +-
.../client/impl/GridClientComputeImpl.java | 20 +-
.../impl/connection/GridClientConnection.java | 6 +-
.../GridClientConnectionManagerAdapter.java | 6 +-
.../connection/GridClientNioTcpConnection.java | 34 +-
.../internal/direct/DirectMessageWriter.java | 108 ++++--
.../CacheDefaultBinaryAffinityKeyMapper.java | 4 +-
.../processors/cache/CacheInvokeEntry.java | 10 +-
.../processors/cache/CacheLazyEntry.java | 28 +-
.../processors/cache/CacheObjectContext.java | 68 ++--
.../processors/cache/CacheOperationContext.java | 12 +-
.../processors/cache/GridCacheAdapter.java | 100 +++---
.../cache/GridCacheConcurrentMap.java | 2 +-
.../processors/cache/GridCacheContext.java | 36 +-
.../processors/cache/GridCacheEntryEx.java | 8 +-
.../processors/cache/GridCacheEventManager.java | 24 +-
.../processors/cache/GridCacheMapEntry.java | 54 +--
.../cache/GridCacheOffheapSwapEntry.java | 4 +-
.../processors/cache/GridCacheProxyImpl.java | 2 +-
.../processors/cache/GridCacheReturn.java | 10 +-
.../processors/cache/IgniteCacheProxy.java | 36 +-
.../processors/cache/IgniteInternalCache.java | 48 +--
.../cache/binary/BinaryMetadataKey.java | 2 +-
.../CacheDefaultBinaryAffinityKeyMapper.java | 4 +-
.../cache/binary/CacheObjectBinaryContext.java | 16 +-
.../binary/CacheObjectBinaryProcessor.java | 14 +-
.../binary/CacheObjectBinaryProcessorImpl.java | 132 ++++----
.../cache/binary/IgniteBinaryImpl.java | 8 +-
.../processors/cache/binary/package-info.java | 2 +-
.../CacheDataStructuresManager.java | 6 +-
.../distributed/GridDistributedLockRequest.java | 2 +-
.../dht/CacheDistributedGetFutureAdapter.java | 10 +-
.../distributed/dht/GridDhtCacheAdapter.java | 8 +-
.../cache/distributed/dht/GridDhtGetFuture.java | 4 +-
.../dht/GridPartitionedGetFuture.java | 14 +-
.../dht/GridPartitionedSingleGetFuture.java | 12 +-
.../dht/atomic/GridDhtAtomicCache.java | 26 +-
.../dht/atomic/GridDhtAtomicUpdateRequest.java | 4 +-
.../dht/atomic/GridNearAtomicUpdateFuture.java | 4 +-
.../dht/atomic/GridNearAtomicUpdateRequest.java | 4 +-
.../dht/colocated/GridDhtColocatedCache.java | 36 +-
.../distributed/near/GridNearAtomicCache.java | 10 +-
.../distributed/near/GridNearCacheAdapter.java | 10 +-
.../distributed/near/GridNearCacheEntry.java | 6 +
.../distributed/near/GridNearGetFuture.java | 22 +-
.../near/GridNearTransactionalCache.java | 12 +-
.../cache/distributed/near/GridNearTxLocal.java | 6 +-
.../local/atomic/GridLocalAtomicCache.java | 74 ++---
.../query/GridCacheDistributedQueryManager.java | 8 +-
.../cache/query/GridCacheQueryAdapter.java | 32 +-
.../query/GridCacheQueryFutureAdapter.java | 4 +-
.../cache/query/GridCacheQueryManager.java | 64 ++--
.../cache/query/GridCacheQueryRequest.java | 22 +-
.../continuous/CacheContinuousQueryEvent.java | 8 +-
.../cache/store/CacheOsStoreManager.java | 8 +-
.../cache/store/CacheStoreManager.java | 10 +-
.../store/GridCacheStoreManagerAdapter.java | 18 +-
.../transactions/IgniteTxLocalAdapter.java | 44 +--
.../cache/transactions/IgniteTxLocalEx.java | 6 +-
.../cacheobject/IgniteCacheObjectProcessor.java | 16 +-
.../IgniteCacheObjectProcessorImpl.java | 6 +-
.../processors/cacheobject/NoOpBinary.java | 2 +-
.../datastreamer/DataStreamerEntry.java | 6 +-
.../platform/PlatformAbstractPredicate.java | 6 +-
.../platform/PlatformAbstractTarget.java | 14 +-
.../processors/platform/PlatformContext.java | 4 +-
.../platform/PlatformContextImpl.java | 6 +-
.../platform/PlatformNoopProcessor.java | 4 +-
.../processors/platform/PlatformProcessor.java | 8 +-
.../platform/PlatformProcessorImpl.java | 34 +-
.../platform/cache/PlatformCache.java | 28 +-
.../cache/PlatformCacheEntryFilterImpl.java | 2 +-
.../cache/PlatformCacheEntryProcessorImpl.java | 10 +-
.../PlatformCachePartialUpdateException.java | 12 +-
.../callback/PlatformCallbackGateway.java | 8 +-
.../callback/PlatformCallbackUtils.java | 6 +-
.../cluster/PlatformClusterNodeFilterImpl.java | 2 +-
.../platform/compute/PlatformCompute.java | 12 +-
.../datastreamer/PlatformDataStreamer.java | 10 +-
.../PlatformStreamReceiverImpl.java | 16 +-
.../dotnet/PlatformDotNetCacheStore.java | 12 +-
.../PlatformDotNetConfigurationClosure.java | 2 +-
.../dotnet/PlatformDotNetServiceImpl.java | 8 +-
.../events/PlatformEventFilterListenerImpl.java | 2 +-
.../messaging/PlatformMessageFilterImpl.java | 2 +-
.../services/PlatformAbstractService.java | 26 +-
.../platform/services/PlatformService.java | 6 +-
.../platform/services/PlatformServices.java | 26 +-
.../query/GridQueryCacheObjectsIterator.java | 14 +-
.../processors/query/GridQueryProcessor.java | 72 ++--
.../message/GridClientBinaryMetaData.java | 2 +-
.../client/message/GridClientTaskRequest.java | 14 +-
.../internal/visor/util/VisorMimeTypes.java | 10 +-
.../marshaller/portable/package-info.java | 22 --
.../PlatformDotNetBinaryConfiguration.java | 6 +-
.../dotnet/PlatformDotNetConfiguration.java | 8 +-
.../ignite/spi/discovery/tcp/ServerImpl.java | 4 +-
.../TcpDiscoveryMulticastIpFinder.java | 106 ++++--
.../java/org/jsr166/ConcurrentHashMap8.java | 2 +-
.../resources/META-INF/classnames.properties | 68 ++--
.../ignite/binary/test1/1.1/test1-1.1.jar | Bin 0 -> 2548 bytes
.../ignite/binary/test1/1.1/test1-1.1.pom | 9 +
.../binary/test1/maven-metadata-local.xml | 12 +
.../ignite/binary/test2/1.1/test2-1.1.jar | Bin 0 -> 1361 bytes
.../ignite/binary/test2/1.1/test2-1.1.pom | 9 +
.../binary/test2/maven-metadata-local.xml | 12 +
.../binary/BinaryFieldsAbstractSelfTest.java | 30 +-
.../binary/BinaryFieldsHeapSelfTest.java | 6 +-
.../binary/BinaryFieldsOffheapSelfTest.java | 6 +-
.../BinaryFooterOffsetsAbstractSelfTest.java | 14 +-
.../binary/BinaryFooterOffsetsHeapSelfTest.java | 4 +-
.../BinaryFooterOffsetsOffheapSelfTest.java | 4 +-
.../binary/BinaryMarshallerSelfTest.java | 330 +++++++++----------
.../BinaryObjectBuilderAdditionalSelfTest.java | 38 +--
.../binary/BinaryObjectBuilderSelfTest.java | 58 ++--
.../binary/GridBinaryAffinityKeySelfTest.java | 2 +-
...GridBinaryMarshallerCtxDisabledSelfTest.java | 12 +-
.../binary/GridBinaryMetaDataSelfTest.java | 30 +-
.../binary/GridBinaryWildcardsSelfTest.java | 138 ++++----
.../mutabletest/GridBinaryTestClasses.java | 12 +-
.../BinaryFieldsHeapNonCompactSelfTest.java | 2 +-
.../BinaryFieldsOffheapNonCompactSelfTest.java | 2 +-
...naryFooterOffsetsHeapNonCompactSelfTest.java | 2 +-
...yFooterOffsetsOffheapNonCompactSelfTest.java | 2 +-
.../BinaryObjectBuilderNonCompactSelfTest.java | 2 +-
.../cache/GridCacheAbstractFullApiSelfTest.java | 23 +-
.../cache/GridCacheDeploymentSelfTest.java | 19 +-
.../GridCacheOffHeapTieredAbstractSelfTest.java | 8 +-
.../GridCacheOnCopyFlagAbstractSelfTest.java | 6 +-
.../processors/cache/GridCacheTestEntryEx.java | 8 +-
.../GridBinaryCacheEntryMemorySizeSelfTest.java | 2 +-
...ryDuplicateIndexObjectsAbstractSelfTest.java | 20 +-
...naryObjectsAbstractDataStreamerSelfTest.java | 2 +-
...aryObjectsAbstractMultiThreadedSelfTest.java | 10 +-
.../GridCacheBinaryObjectsAbstractSelfTest.java | 56 ++--
.../GridCacheBinaryStoreAbstractSelfTest.java | 4 +-
.../GridCacheBinaryStoreBinariesSelfTest.java | 10 +-
.../GridCacheBinaryStoreObjectsSelfTest.java | 2 +-
...ntNodeBinaryObjectMetadataMultinodeTest.java | 28 +-
...CacheClientNodeBinaryObjectMetadataTest.java | 2 +-
.../GridDataStreamerImplSelfTest.java | 22 +-
...BinaryObjectsAtomicNearDisabledSelfTest.java | 2 +-
.../GridCacheBinaryObjectsAtomicSelfTest.java | 2 +-
...yObjectsPartitionedNearDisabledSelfTest.java | 2 +-
...idCacheBinaryObjectsPartitionedSelfTest.java | 2 +-
...dCacheOffHeapTieredAtomicBinarySelfTest.java | 2 +-
.../GridCacheOffHeapTieredBinarySelfTest.java | 2 +-
...fHeapTieredEvictionAtomicBinarySelfTest.java | 12 +-
...acheOffHeapTieredEvictionBinarySelfTest.java | 12 +-
...ridCacheBinaryObjectsReplicatedSelfTest.java | 2 +-
.../GridCacheBinaryObjectsLocalSelfTest.java | 2 +-
.../platform/PlatformComputeEchoTask.java | 20 +-
.../session/GridSessionCheckpointSelfTest.java | 2 +-
.../tcp/TcpClientDiscoverySpiMulticastTest.java | 97 +++++-
.../TcpDiscoveryIpFinderAbstractSelfTest.java | 2 +-
.../TcpDiscoveryMulticastIpFinderSelfTest.java | 16 +-
.../junits/IgniteTestResources.java | 2 +-
.../IgniteBinaryCacheFullApiTestSuite.java | 2 +-
.../testsuites/IgniteBinaryCacheTestSuite.java | 8 +-
.../IgniteBinaryObjectsCacheTestSuite3.java | 2 +-
.../IgniteBinaryObjectsTestSuite.java | 2 +-
.../ignite/util/GridMessageCollectionTest.java | 34 +-
.../ignite/binary/test1/1.1/test1-1.1.jar | Bin 2548 -> 0 bytes
.../ignite/binary/test1/1.1/test1-1.1.pom | 9 -
.../binary/test1/maven-metadata-local.xml | 12 -
.../ignite/binary/test2/1.1/test2-1.1.jar | Bin 1361 -> 0 bytes
.../ignite/binary/test2/1.1/test2-1.1.pom | 9 -
.../binary/test2/maven-metadata-local.xml | 12 -
.../processors/query/h2/IgniteH2Indexing.java | 10 +-
.../h2/twostep/GridReduceQueryExecutor.java | 8 +-
...niteCacheP2pUnmarshallingQueryErrorTest.java | 14 +-
.../query/IgniteSqlSplitterSelfTest.java | 4 +-
.../IgniteBinaryCacheQueryTestSuite.java | 8 +-
.../ignite/internal/GridFactorySelfTest.java | 16 +
parent/pom.xml | 12 +-
232 files changed, 2055 insertions(+), 1779 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ignite/blob/c453b2d4/parent/pom.xml
----------------------------------------------------------------------
diff --cc parent/pom.xml
index 6f377c8,486fc0d..a979f72
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@@ -846,11 -846,10 +846,11 @@@
<exclude>dev-tools/.gradle/**/*</exclude>
<exclude>dev-tools/gradle/wrapper/**/*</exclude>
<exclude>dev-tools/gradlew</exclude>
- <exclude>src/test/portables/repo/org/apache/ignite/binary/test2/1.1/test2-1.1.pom</exclude>
- <exclude>src/test/portables/repo/org/apache/ignite/binary/test2/maven-metadata-local.xml</exclude>
- <exclude>src/test/portables/repo/org/apache/ignite/binary/test1/1.1/test1-1.1.pom</exclude>
- <exclude>src/test/portables/repo/org/apache/ignite/binary/test1/maven-metadata-local.xml</exclude>
+ <exclude>src/test/binaries/repo/org/apache/ignite/binary/test2/1.1/test2-1.1.pom</exclude>
+ <exclude>src/test/binaries/repo/org/apache/ignite/binary/test2/maven-metadata-local.xml</exclude>
+ <exclude>src/test/binaries/repo/org/apache/ignite/binary/test1/1.1/test1-1.1.pom</exclude>
+ <exclude>src/test/binaries/repo/org/apache/ignite/binary/test1/maven-metadata-local.xml</exclude>
+ <exclude>src/main/js/package.json</exclude>
<!--shmem-->
<exclude>ipc/shmem/**/Makefile.in</exclude><!--auto generated files-->
<exclude>ipc/shmem/**/Makefile</exclude><!--auto generated files-->
[08/24] ignite git commit: ignite-2065: portable -> binary renaming
(methods, javadoc and etc.)
Posted by ak...@apache.org.
http://git-wip-us.apache.org/repos/asf/ignite/blob/10b83fb8/modules/core/src/main/java/org/apache/ignite/internal/binary/BinaryWriterExImpl.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/binary/BinaryWriterExImpl.java b/modules/core/src/main/java/org/apache/ignite/internal/binary/BinaryWriterExImpl.java
index f073dd0..6e05b40 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/binary/BinaryWriterExImpl.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/binary/BinaryWriterExImpl.java
@@ -41,7 +41,7 @@ import java.util.UUID;
import static java.nio.charset.StandardCharsets.UTF_8;
/**
- * Portable writer implementation.
+ * Binary writer implementation.
*/
public class BinaryWriterExImpl implements BinaryWriter, BinaryRawWriterEx, ObjectOutput {
/** Length: integer. */
@@ -145,7 +145,7 @@ public class BinaryWriterExImpl implements BinaryWriter, BinaryRawWriterEx, Obje
BinaryClassDescriptor desc = ctx.descriptorForClass(cls, false);
if (desc == null)
- throw new BinaryObjectException("Object is not portable: [class=" + cls + ']');
+ throw new BinaryObjectException("Object is not binary: [class=" + cls + ']');
if (desc.excluded()) {
out.writeByte(GridBinaryMarshaller.NULL);
@@ -748,7 +748,7 @@ public class BinaryWriterExImpl implements BinaryWriter, BinaryRawWriterEx, Obje
/**
* @param val Value.
*/
- void doWritePortableEnum(BinaryEnumObjectImpl val) {
+ void doWriteBinaryEnum(BinaryEnumObjectImpl val) {
assert val != null;
int typeId = val.typeId();
@@ -819,9 +819,9 @@ public class BinaryWriterExImpl implements BinaryWriter, BinaryRawWriterEx, Obje
}
/**
- * @param po Portable object.
+ * @param po Binary object.
*/
- public void doWritePortableObject(@Nullable BinaryObjectImpl po) {
+ public void doWriteBinaryObject(@Nullable BinaryObjectImpl po) {
if (po == null)
out.writeByte(GridBinaryMarshaller.NULL);
else {
@@ -829,7 +829,7 @@ public class BinaryWriterExImpl implements BinaryWriter, BinaryRawWriterEx, Obje
out.unsafeEnsure(1 + 4 + poArr.length + 4);
- out.unsafeWriteByte(GridBinaryMarshaller.PORTABLE_OBJ);
+ out.unsafeWriteByte(GridBinaryMarshaller.BINARY_OBJ);
out.unsafeWriteInt(poArr.length);
out.writeByteArray(poArr);
out.unsafeWriteInt(po.start());
@@ -1176,11 +1176,11 @@ public class BinaryWriterExImpl implements BinaryWriter, BinaryRawWriterEx, Obje
}
/**
- * @param po Portable object.
+ * @param po Binary object.
* @throws org.apache.ignite.binary.BinaryObjectException In case of error.
*/
- void writePortableObjectField(@Nullable BinaryObjectImpl po) throws BinaryObjectException {
- doWritePortableObject(po);
+ void writeBinaryObjectField(@Nullable BinaryObjectImpl po) throws BinaryObjectException {
+ doWriteBinaryObject(po);
}
/** {@inheritDoc} */
@@ -1760,7 +1760,7 @@ public class BinaryWriterExImpl implements BinaryWriter, BinaryRawWriterEx, Obje
}
/**
- * @return Portable context.
+ * @return Binary context.
*/
public BinaryContext context() {
return ctx;
http://git-wip-us.apache.org/repos/asf/ignite/blob/10b83fb8/modules/core/src/main/java/org/apache/ignite/internal/binary/GridBinaryMarshaller.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/binary/GridBinaryMarshaller.java b/modules/core/src/main/java/org/apache/ignite/internal/binary/GridBinaryMarshaller.java
index 277abd0..b21c679 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/binary/GridBinaryMarshaller.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/binary/GridBinaryMarshaller.java
@@ -24,11 +24,11 @@ import org.apache.ignite.binary.BinaryObjectException;
import org.jetbrains.annotations.Nullable;
/**
- * Portable objects marshaller.
+ * Binary objects marshaller.
*/
public class GridBinaryMarshaller {
/** */
- public static final ThreadLocal<Boolean> KEEP_PORTABLES = new ThreadLocal<Boolean>() {
+ public static final ThreadLocal<Boolean> KEEP_BINARIES = new ThreadLocal<Boolean>() {
@Override protected Boolean initialValue() {
return true;
}
@@ -119,7 +119,7 @@ public class GridBinaryMarshaller {
public static final byte MAP = 25;
/** */
- public static final byte PORTABLE_OBJ = 27;
+ public static final byte BINARY_OBJ = 27;
/** */
public static final byte ENUM = 28;
@@ -230,7 +230,7 @@ public class GridBinaryMarshaller {
/**
* @param bytes Bytes array.
- * @return Portable object.
+ * @return Binary object.
* @throws org.apache.ignite.binary.BinaryObjectException In case of error.
*/
@SuppressWarnings("unchecked")
@@ -242,7 +242,7 @@ public class GridBinaryMarshaller {
/**
* @param in Input stream.
- * @return Portable object.
+ * @return Binary object.
* @throws org.apache.ignite.binary.BinaryObjectException In case of error.
*/
@SuppressWarnings("unchecked")
http://git-wip-us.apache.org/repos/asf/ignite/blob/10b83fb8/modules/core/src/main/java/org/apache/ignite/internal/binary/builder/BinaryBuilderEnum.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/binary/builder/BinaryBuilderEnum.java b/modules/core/src/main/java/org/apache/ignite/internal/binary/builder/BinaryBuilderEnum.java
index d8dd00b..bc5eb9e 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/binary/builder/BinaryBuilderEnum.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/binary/builder/BinaryBuilderEnum.java
@@ -46,7 +46,7 @@ public class BinaryBuilderEnum implements BinaryBuilderSerializationAware {
}
/**
- * @param reader PortableBuilderReader.
+ * @param reader BinaryBuilderReader.
*/
public BinaryBuilderEnum(BinaryBuilderReader reader) {
int typeId = reader.readInt();
@@ -57,13 +57,13 @@ public class BinaryBuilderEnum implements BinaryBuilderSerializationAware {
Class cls;
try {
- cls = U.forName(reader.readString(), reader.portableContext().configuration().getClassLoader());
+ cls = U.forName(reader.readString(), reader.binaryContext().configuration().getClassLoader());
}
catch (ClassNotFoundException e) {
throw new BinaryInvalidTypeException("Failed to load the class: " + clsName, e);
}
- this.typeId = reader.portableContext().descriptorForClass(cls, false).typeId();
+ this.typeId = reader.binaryContext().descriptorForClass(cls, false).typeId();
}
else {
this.typeId = typeId;
http://git-wip-us.apache.org/repos/asf/ignite/blob/10b83fb8/modules/core/src/main/java/org/apache/ignite/internal/binary/builder/BinaryBuilderReader.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/binary/builder/BinaryBuilderReader.java b/modules/core/src/main/java/org/apache/ignite/internal/binary/builder/BinaryBuilderReader.java
index 9b9e8b8..662ad1d 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/binary/builder/BinaryBuilderReader.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/binary/builder/BinaryBuilderReader.java
@@ -58,7 +58,7 @@ public class BinaryBuilderReader implements BinaryPositionReadable {
/*
* Constructor.
*
- * @param objImpl Portable object
+ * @param objImpl Binary object
*/
BinaryBuilderReader(BinaryObjectImpl objImpl) {
ctx = objImpl.context();
@@ -89,14 +89,14 @@ public class BinaryBuilderReader implements BinaryPositionReadable {
}
/**
- * @return Portable context.
+ * @return Binary context.
*/
- public BinaryContext portableContext() {
+ public BinaryContext binaryContext() {
return ctx;
}
/**
- * @param obj Mutable portable object.
+ * @param obj Mutable binary object.
*/
public void registerObject(BinaryObjectBuilderImpl obj) {
objMap.put(obj.start(), obj);
@@ -343,7 +343,7 @@ public class BinaryBuilderReader implements BinaryPositionReadable {
return;
}
- case GridBinaryMarshaller.PORTABLE_OBJ:
+ case GridBinaryMarshaller.BINARY_OBJ:
len = readInt() + 4;
break;
@@ -460,14 +460,14 @@ public class BinaryBuilderReader implements BinaryPositionReadable {
return builderEnum;
}
- case GridBinaryMarshaller.PORTABLE_OBJ: {
+ case GridBinaryMarshaller.BINARY_OBJ: {
int size = readIntPositioned(pos + 1);
int start = readIntPositioned(pos + 4 + size);
- BinaryObjectImpl portableObj = new BinaryObjectImpl(ctx, arr, pos + 4 + start);
+ BinaryObjectImpl binaryObj = new BinaryObjectImpl(ctx, arr, pos + 4 + start);
- return new BinaryPlainBinaryObject(portableObj);
+ return new BinaryPlainBinaryObject(binaryObj);
}
default:
@@ -739,17 +739,17 @@ public class BinaryBuilderReader implements BinaryPositionReadable {
case GridBinaryMarshaller.ENUM_ARR:
return new BinaryEnumArrayLazyValue(this);
- case GridBinaryMarshaller.PORTABLE_OBJ: {
+ case GridBinaryMarshaller.BINARY_OBJ: {
int size = readInt();
pos += size;
int start = readInt();
- BinaryObjectImpl portableObj = new BinaryObjectImpl(ctx, arr,
+ BinaryObjectImpl binaryObj = new BinaryObjectImpl(ctx, arr,
pos - 4 - size + start);
- return new BinaryPlainBinaryObject(portableObj);
+ return new BinaryPlainBinaryObject(binaryObj);
}
default:
http://git-wip-us.apache.org/repos/asf/ignite/blob/10b83fb8/modules/core/src/main/java/org/apache/ignite/internal/binary/builder/BinaryBuilderSerializer.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/binary/builder/BinaryBuilderSerializer.java b/modules/core/src/main/java/org/apache/ignite/internal/binary/builder/BinaryBuilderSerializer.java
index 458602d..a095242 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/binary/builder/BinaryBuilderSerializer.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/binary/builder/BinaryBuilderSerializer.java
@@ -37,7 +37,7 @@ class BinaryBuilderSerializer {
private final Map<BinaryObjectBuilderImpl, Integer> objToPos = new IdentityHashMap<>();
/** */
- private Map<BinaryObject, BinaryObjectBuilderImpl> portableObjToWrapper;
+ private Map<BinaryObject, BinaryObjectBuilderImpl> binaryObjToWrapper;
/**
* @param obj Mutable object.
@@ -65,15 +65,15 @@ class BinaryBuilderSerializer {
}
if (val instanceof BinaryObjectExImpl) {
- if (portableObjToWrapper == null)
- portableObjToWrapper = new IdentityHashMap<>();
+ if (binaryObjToWrapper == null)
+ binaryObjToWrapper = new IdentityHashMap<>();
- BinaryObjectBuilderImpl wrapper = portableObjToWrapper.get(val);
+ BinaryObjectBuilderImpl wrapper = binaryObjToWrapper.get(val);
if (wrapper == null) {
wrapper = BinaryObjectBuilderImpl.wrap((BinaryObject)val);
- portableObjToWrapper.put((BinaryObject)val, wrapper);
+ binaryObjToWrapper.put((BinaryObject)val, wrapper);
}
val = wrapper;
http://git-wip-us.apache.org/repos/asf/ignite/blob/10b83fb8/modules/core/src/main/java/org/apache/ignite/internal/binary/builder/BinaryEnumArrayLazyValue.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/binary/builder/BinaryEnumArrayLazyValue.java b/modules/core/src/main/java/org/apache/ignite/internal/binary/builder/BinaryEnumArrayLazyValue.java
index db55050..787ff63 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/binary/builder/BinaryEnumArrayLazyValue.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/binary/builder/BinaryEnumArrayLazyValue.java
@@ -50,13 +50,13 @@ class BinaryEnumArrayLazyValue extends BinaryAbstractLazyValue {
Class cls;
try {
- cls = U.forName(reader.readString(), reader.portableContext().configuration().getClassLoader());
+ cls = U.forName(reader.readString(), reader.binaryContext().configuration().getClassLoader());
}
catch (ClassNotFoundException e) {
throw new BinaryInvalidTypeException("Failed to load the class: " + clsName, e);
}
- compTypeId = reader.portableContext().descriptorForClass(cls, true).typeId();
+ compTypeId = reader.binaryContext().descriptorForClass(cls, true).typeId();
}
else {
compTypeId = typeId;
http://git-wip-us.apache.org/repos/asf/ignite/blob/10b83fb8/modules/core/src/main/java/org/apache/ignite/internal/binary/builder/BinaryLazyArrayList.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/binary/builder/BinaryLazyArrayList.java b/modules/core/src/main/java/org/apache/ignite/internal/binary/builder/BinaryLazyArrayList.java
index 3627b1d..21d7dcb 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/binary/builder/BinaryLazyArrayList.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/binary/builder/BinaryLazyArrayList.java
@@ -160,7 +160,7 @@ class BinaryLazyArrayList extends AbstractList<Object> implements BinaryBuilderS
for (Object o : delegate)
ctx.writeValue(writer, o);
- // PortableBuilderImpl might have been written. It could override reader's position.
+ // BinaryBuilderImpl might have been written. It could override reader's position.
reader.position(oldPos);
}
}
http://git-wip-us.apache.org/repos/asf/ignite/blob/10b83fb8/modules/core/src/main/java/org/apache/ignite/internal/binary/builder/BinaryLazyMap.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/binary/builder/BinaryLazyMap.java b/modules/core/src/main/java/org/apache/ignite/internal/binary/builder/BinaryLazyMap.java
index c82ff7d..6afe798 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/binary/builder/BinaryLazyMap.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/binary/builder/BinaryLazyMap.java
@@ -52,7 +52,7 @@ class BinaryLazyMap extends AbstractMap<Object, Object> implements BinaryBuilder
/**
* @param reader Reader.
- * @return PortableLazyMap.
+ * @return BinaryLazyMap.
*/
@Nullable public static BinaryLazyMap parseMap(BinaryBuilderReader reader) {
int off = reader.position() - 1;
http://git-wip-us.apache.org/repos/asf/ignite/blob/10b83fb8/modules/core/src/main/java/org/apache/ignite/internal/binary/builder/BinaryObjectArrayLazyValue.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/binary/builder/BinaryObjectArrayLazyValue.java b/modules/core/src/main/java/org/apache/ignite/internal/binary/builder/BinaryObjectArrayLazyValue.java
index 05713b4..8962107 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/binary/builder/BinaryObjectArrayLazyValue.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/binary/builder/BinaryObjectArrayLazyValue.java
@@ -49,13 +49,13 @@ class BinaryObjectArrayLazyValue extends BinaryAbstractLazyValue {
Class cls;
try {
- cls = U.forName(reader.readString(), reader.portableContext().configuration().getClassLoader());
+ cls = U.forName(reader.readString(), reader.binaryContext().configuration().getClassLoader());
}
catch (ClassNotFoundException e) {
throw new BinaryInvalidTypeException("Failed to load the class: " + clsName, e);
}
- compTypeId = reader.portableContext().descriptorForClass(cls, true).typeId();
+ compTypeId = reader.binaryContext().descriptorForClass(cls, true).typeId();
}
else {
compTypeId = typeId;
http://git-wip-us.apache.org/repos/asf/ignite/blob/10b83fb8/modules/core/src/main/java/org/apache/ignite/internal/binary/builder/BinaryObjectBuilderImpl.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/binary/builder/BinaryObjectBuilderImpl.java b/modules/core/src/main/java/org/apache/ignite/internal/binary/builder/BinaryObjectBuilderImpl.java
index 5e60a20..8353cdb 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/binary/builder/BinaryObjectBuilderImpl.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/binary/builder/BinaryObjectBuilderImpl.java
@@ -70,7 +70,7 @@ public class BinaryObjectBuilderImpl implements BinaryObjectBuilder {
/** */
private Map<Integer, Object> readCache;
- /** Position of object in source array, or -1 if object is not created from PortableObject. */
+ /** Position of object in source array, or -1 if object is not created from BinaryObject. */
private final int start;
/** Flags. */
@@ -79,7 +79,7 @@ public class BinaryObjectBuilderImpl implements BinaryObjectBuilder {
/** Total header length */
private final int hdrLen;
- /** Context of PortableObject reading process. Or {@code null} if object is not created from PortableObject. */
+ /** Context of BinaryObject reading process. Or {@code null} if object is not created from BinaryObject. */
private final BinaryBuilderReader reader;
/** */
@@ -87,7 +87,7 @@ public class BinaryObjectBuilderImpl implements BinaryObjectBuilder {
/**
* @param clsName Class name.
- * @param ctx Portable context.
+ * @param ctx Binary context.
*/
public BinaryObjectBuilderImpl(BinaryContext ctx, String clsName) {
this(ctx, ctx.typeId(clsName), BinaryContext.typeName(clsName));
@@ -134,7 +134,7 @@ public class BinaryObjectBuilderImpl implements BinaryObjectBuilder {
BinaryUtils.checkProtocolVersion(ver);
int typeId = reader.readIntPositioned(start + GridBinaryMarshaller.TYPE_ID_POS);
- ctx = reader.portableContext();
+ ctx = reader.binaryContext();
hashCode = reader.readIntPositioned(start + GridBinaryMarshaller.HASH_CODE_POS);
if (typeId == GridBinaryMarshaller.UNREGISTERED_TYPE_ID) {
@@ -525,7 +525,7 @@ public class BinaryObjectBuilderImpl implements BinaryObjectBuilder {
}
/**
- * Removes field from portable object.
+ * Removes field from binary object.
*
* @param name Field name.
* @return {@code this} instance for chaining.
@@ -540,9 +540,9 @@ public class BinaryObjectBuilderImpl implements BinaryObjectBuilder {
}
/**
- * Creates builder initialized by specified portable object.
+ * Creates builder initialized by specified binary object.
*
- * @param obj Portable object to initialize builder.
+ * @param obj Binary object to initialize builder.
* @return New builder.
*/
public static BinaryObjectBuilderImpl wrap(BinaryObject obj) {
http://git-wip-us.apache.org/repos/asf/ignite/blob/10b83fb8/modules/core/src/main/java/org/apache/ignite/internal/binary/builder/BinaryPlainBinaryObject.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/binary/builder/BinaryPlainBinaryObject.java b/modules/core/src/main/java/org/apache/ignite/internal/binary/builder/BinaryPlainBinaryObject.java
index 5ac4e97..f6432c3 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/binary/builder/BinaryPlainBinaryObject.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/binary/builder/BinaryPlainBinaryObject.java
@@ -27,27 +27,27 @@ import org.apache.ignite.binary.BinaryObject;
*/
public class BinaryPlainBinaryObject implements BinaryLazyValue {
/** */
- private final BinaryObject portableObj;
+ private final BinaryObject binaryObj;
/**
- * @param portableObj Portable object.
+ * @param binaryObj Binary object.
*/
- public BinaryPlainBinaryObject(BinaryObject portableObj) {
- this.portableObj = portableObj;
+ public BinaryPlainBinaryObject(BinaryObject binaryObj) {
+ this.binaryObj = binaryObj;
}
/** {@inheritDoc} */
@Override public Object value() {
- return portableObj;
+ return binaryObj;
}
/** {@inheritDoc} */
@Override public void writeTo(BinaryWriterExImpl writer, BinaryBuilderSerializer ctx) {
- BinaryObject val = portableObj;
+ BinaryObject val = binaryObj;
if (val instanceof BinaryObjectOffheapImpl)
val = ((BinaryObjectOffheapImpl)val).heapCopy();
- writer.doWritePortableObject((BinaryObjectImpl)val);
+ writer.doWriteBinaryObject((BinaryObjectImpl)val);
}
}
http://git-wip-us.apache.org/repos/asf/ignite/blob/10b83fb8/modules/core/src/main/java/org/apache/ignite/internal/binary/builder/package-info.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/binary/builder/package-info.java b/modules/core/src/main/java/org/apache/ignite/internal/binary/builder/package-info.java
index f2c4b55..15aa947 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/binary/builder/package-info.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/binary/builder/package-info.java
@@ -17,6 +17,6 @@
/**
* <!-- Package description. -->
- * Contains classes specific to portable builder API.
+ * Contains classes specific to binary builder API.
*/
package org.apache.ignite.internal.binary.builder;
http://git-wip-us.apache.org/repos/asf/ignite/blob/10b83fb8/modules/core/src/main/java/org/apache/ignite/internal/binary/package-info.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/binary/package-info.java b/modules/core/src/main/java/org/apache/ignite/internal/binary/package-info.java
index 4bb0fb1..849ef5f 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/binary/package-info.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/binary/package-info.java
@@ -17,6 +17,6 @@
/**
* <!-- Package description. -->
- * Contains portable APIs internal implementation.
+ * Contains binary APIs internal implementation.
*/
package org.apache.ignite.internal.binary;
http://git-wip-us.apache.org/repos/asf/ignite/blob/10b83fb8/modules/core/src/main/java/org/apache/ignite/internal/binary/streams/BinaryAbstractInputStream.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/binary/streams/BinaryAbstractInputStream.java b/modules/core/src/main/java/org/apache/ignite/internal/binary/streams/BinaryAbstractInputStream.java
index e3be794..334f455 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/binary/streams/BinaryAbstractInputStream.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/binary/streams/BinaryAbstractInputStream.java
@@ -20,7 +20,7 @@ package org.apache.ignite.internal.binary.streams;
import org.apache.ignite.binary.BinaryObjectException;
/**
- * Portable abstract input stream.
+ * Binary abstract input stream.
*/
public abstract class BinaryAbstractInputStream extends BinaryAbstractStream
implements BinaryInputStream {
http://git-wip-us.apache.org/repos/asf/ignite/blob/10b83fb8/modules/core/src/main/java/org/apache/ignite/internal/binary/streams/BinaryAbstractOutputStream.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/binary/streams/BinaryAbstractOutputStream.java b/modules/core/src/main/java/org/apache/ignite/internal/binary/streams/BinaryAbstractOutputStream.java
index 199ee71..4221cbe 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/binary/streams/BinaryAbstractOutputStream.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/binary/streams/BinaryAbstractOutputStream.java
@@ -18,7 +18,7 @@
package org.apache.ignite.internal.binary.streams;
/**
- * Base portable output stream.
+ * Base binary output stream.
*/
public abstract class BinaryAbstractOutputStream extends BinaryAbstractStream
implements BinaryOutputStream {
http://git-wip-us.apache.org/repos/asf/ignite/blob/10b83fb8/modules/core/src/main/java/org/apache/ignite/internal/binary/streams/BinaryAbstractStream.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/binary/streams/BinaryAbstractStream.java b/modules/core/src/main/java/org/apache/ignite/internal/binary/streams/BinaryAbstractStream.java
index ce57631..1e8ce09 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/binary/streams/BinaryAbstractStream.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/binary/streams/BinaryAbstractStream.java
@@ -22,7 +22,7 @@ import org.apache.ignite.internal.util.GridUnsafe;
import sun.misc.Unsafe;
/**
- * Portable abstract stream.
+ * Binary abstract stream.
*/
public abstract class BinaryAbstractStream implements BinaryStream {
/** Byte: zero. */
http://git-wip-us.apache.org/repos/asf/ignite/blob/10b83fb8/modules/core/src/main/java/org/apache/ignite/internal/binary/streams/BinaryHeapInputStream.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/binary/streams/BinaryHeapInputStream.java b/modules/core/src/main/java/org/apache/ignite/internal/binary/streams/BinaryHeapInputStream.java
index 502b9dc..732b8c7 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/binary/streams/BinaryHeapInputStream.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/binary/streams/BinaryHeapInputStream.java
@@ -20,7 +20,7 @@ package org.apache.ignite.internal.binary.streams;
import java.util.Arrays;
/**
- * Portable off-heap input stream.
+ * Binary off-heap input stream.
*/
public final class BinaryHeapInputStream extends BinaryAbstractInputStream {
/**
http://git-wip-us.apache.org/repos/asf/ignite/blob/10b83fb8/modules/core/src/main/java/org/apache/ignite/internal/binary/streams/BinaryHeapOutputStream.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/binary/streams/BinaryHeapOutputStream.java b/modules/core/src/main/java/org/apache/ignite/internal/binary/streams/BinaryHeapOutputStream.java
index 02c3441..7553f3b 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/binary/streams/BinaryHeapOutputStream.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/binary/streams/BinaryHeapOutputStream.java
@@ -18,7 +18,7 @@
package org.apache.ignite.internal.binary.streams;
/**
- * Portable heap output stream.
+ * Binary heap output stream.
*/
public final class BinaryHeapOutputStream extends BinaryAbstractOutputStream {
/** Allocator. */
http://git-wip-us.apache.org/repos/asf/ignite/blob/10b83fb8/modules/core/src/main/java/org/apache/ignite/internal/binary/streams/BinaryInputStream.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/binary/streams/BinaryInputStream.java b/modules/core/src/main/java/org/apache/ignite/internal/binary/streams/BinaryInputStream.java
index 63457e4..1765715 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/binary/streams/BinaryInputStream.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/binary/streams/BinaryInputStream.java
@@ -20,7 +20,7 @@ package org.apache.ignite.internal.binary.streams;
import org.apache.ignite.internal.binary.BinaryPositionReadable;
/**
- * Portable input stream.
+ * Binary input stream.
*/
public interface BinaryInputStream extends BinaryStream, BinaryPositionReadable {
/**
http://git-wip-us.apache.org/repos/asf/ignite/blob/10b83fb8/modules/core/src/main/java/org/apache/ignite/internal/binary/streams/BinaryOffheapInputStream.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/binary/streams/BinaryOffheapInputStream.java b/modules/core/src/main/java/org/apache/ignite/internal/binary/streams/BinaryOffheapInputStream.java
index dc18c9e..cff002f 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/binary/streams/BinaryOffheapInputStream.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/binary/streams/BinaryOffheapInputStream.java
@@ -18,7 +18,7 @@
package org.apache.ignite.internal.binary.streams;
/**
- * Portable off-heap input stream.
+ * Binary off-heap input stream.
*/
public class BinaryOffheapInputStream extends BinaryAbstractInputStream {
/** Pointer. */
http://git-wip-us.apache.org/repos/asf/ignite/blob/10b83fb8/modules/core/src/main/java/org/apache/ignite/internal/binary/streams/BinaryOffheapOutputStream.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/binary/streams/BinaryOffheapOutputStream.java b/modules/core/src/main/java/org/apache/ignite/internal/binary/streams/BinaryOffheapOutputStream.java
index 24b65b2..080a357 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/binary/streams/BinaryOffheapOutputStream.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/binary/streams/BinaryOffheapOutputStream.java
@@ -18,7 +18,7 @@
package org.apache.ignite.internal.binary.streams;
/**
- * Portable offheap output stream.
+ * Binary offheap output stream.
*/
public class BinaryOffheapOutputStream extends BinaryAbstractOutputStream {
/** Pointer. */
http://git-wip-us.apache.org/repos/asf/ignite/blob/10b83fb8/modules/core/src/main/java/org/apache/ignite/internal/binary/streams/BinaryOutputStream.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/binary/streams/BinaryOutputStream.java b/modules/core/src/main/java/org/apache/ignite/internal/binary/streams/BinaryOutputStream.java
index 1c3f4bf..8494120 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/binary/streams/BinaryOutputStream.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/binary/streams/BinaryOutputStream.java
@@ -18,7 +18,7 @@
package org.apache.ignite.internal.binary.streams;
/**
- * Portable output stream.
+ * Binary output stream.
*/
public interface BinaryOutputStream extends BinaryStream, AutoCloseable {
/**
http://git-wip-us.apache.org/repos/asf/ignite/blob/10b83fb8/modules/core/src/main/java/org/apache/ignite/internal/binary/streams/BinaryStream.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/binary/streams/BinaryStream.java b/modules/core/src/main/java/org/apache/ignite/internal/binary/streams/BinaryStream.java
index 229e34c..b868199 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/binary/streams/BinaryStream.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/binary/streams/BinaryStream.java
@@ -18,7 +18,7 @@
package org.apache.ignite.internal.binary.streams;
/**
- * Portable stream.
+ * Binary stream.
*/
public interface BinaryStream {
/**
http://git-wip-us.apache.org/repos/asf/ignite/blob/10b83fb8/modules/core/src/main/java/org/apache/ignite/internal/binary/streams/package-info.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/binary/streams/package-info.java b/modules/core/src/main/java/org/apache/ignite/internal/binary/streams/package-info.java
index 2a6ad62..8ce839c 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/binary/streams/package-info.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/binary/streams/package-info.java
@@ -17,6 +17,6 @@
/**
* <!-- Package description. -->
- * Contains portable APIs implementation for streams.
+ * Contains binary APIs implementation for streams.
*/
package org.apache.ignite.internal.binary.streams;
http://git-wip-us.apache.org/repos/asf/ignite/blob/10b83fb8/modules/core/src/main/java/org/apache/ignite/internal/client/GridClientCacheFlag.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/client/GridClientCacheFlag.java b/modules/core/src/main/java/org/apache/ignite/internal/client/GridClientCacheFlag.java
index 382141c..2e4831e 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/client/GridClientCacheFlag.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/client/GridClientCacheFlag.java
@@ -27,15 +27,15 @@ public enum GridClientCacheFlag {
SKIP_STORE,
/**
- * Disable deserialization of portable objects on get operations.
- * If set and portable marshaller is used, {@link GridClientData#get(Object)}
+ * Disable deserialization of binary objects on get operations.
+ * If set and binary marshaller is used, {@link GridClientData#get(Object)}
* and {@link GridClientData#getAll(Collection)} methods will return
- * instances of {@code PortableObject} class instead of user objects.
+ * instances of {@code BinaryObject} class instead of user objects.
* Use this flag if you don't have corresponding class on your client of
* if you want to get access to some individual fields, but do not want to
* fully deserialize the object.
*/
- KEEP_PORTABLES;
+ KEEP_BINARIES;
/** */
private static final GridClientCacheFlag[] VALS = values();
@@ -49,4 +49,4 @@ public enum GridClientCacheFlag {
public static GridClientCacheFlag fromOrdinal(int ord) {
return ord >= 0 && ord < VALS.length ? VALS[ord] : null;
}
-}
\ 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/client/GridClientCompute.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/client/GridClientCompute.java b/modules/core/src/main/java/org/apache/ignite/internal/client/GridClientCompute.java
index e7255f9..c0e31c7 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/client/GridClientCompute.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/client/GridClientCompute.java
@@ -416,5 +416,5 @@ public interface GridClientCompute {
/**
* Sets keep binary flag for the next task execution in the current thread.
*/
- public GridClientCompute withKeepPortables();
-}
\ No newline at end of file
+ public GridClientCompute withKeepBinaries();
+}
http://git-wip-us.apache.org/repos/asf/ignite/blob/10b83fb8/modules/core/src/main/java/org/apache/ignite/internal/client/GridClientConfiguration.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/client/GridClientConfiguration.java b/modules/core/src/main/java/org/apache/ignite/internal/client/GridClientConfiguration.java
index 2015970..e9d2958 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/client/GridClientConfiguration.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/client/GridClientConfiguration.java
@@ -615,7 +615,7 @@ public class GridClientConfiguration {
* Options, that can be used out-of-the-box:
* <ul>
* <li>{@link GridClientOptimizedMarshaller} (default) - Ignite's optimized marshaller.</li>
- * <li>{@code GridClientPortableMarshaller} - Marshaller that supports portable objects.</li>
+ * <li>{@code GridClientBinaryMarshaller} - Marshaller that supports binary objects.</li>
* <li>{@link org.apache.ignite.internal.client.marshaller.jdk.GridClientJdkMarshaller} - JDK marshaller (not recommended).</li>
* </ul>
*
@@ -850,4 +850,4 @@ public class GridClientConfiguration {
public boolean isDaemon() {
return daemon;
}
-}
\ 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/client/impl/GridClientComputeImpl.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/client/impl/GridClientComputeImpl.java b/modules/core/src/main/java/org/apache/ignite/internal/client/impl/GridClientComputeImpl.java
index 0c3b155..463a074 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/client/impl/GridClientComputeImpl.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/client/impl/GridClientComputeImpl.java
@@ -41,7 +41,7 @@ import static org.apache.ignite.internal.client.util.GridClientUtils.applyFilter
*/
class GridClientComputeImpl extends GridClientAbstractProjection<GridClientComputeImpl> implements GridClientCompute {
/** */
- private static final ThreadLocal<Boolean> KEEP_PORTABLES = new ThreadLocal<Boolean>() {
+ private static final ThreadLocal<Boolean> KEEP_BINARIES = new ThreadLocal<Boolean>() {
@Override protected Boolean initialValue() {
return false;
}
@@ -125,14 +125,14 @@ class GridClientComputeImpl extends GridClientAbstractProjection<GridClientCompu
@Override public <R> GridClientFuture<R> executeAsync(final String taskName, final Object taskArg) {
A.notNull(taskName, "taskName");
- final boolean keepPortables = KEEP_PORTABLES.get();
+ final boolean keepBinaries = KEEP_BINARIES.get();
- KEEP_PORTABLES.set(false);
+ KEEP_BINARIES.set(false);
return withReconnectHandling(new ClientProjectionClosure<R>() {
@Override public GridClientFuture<R> apply(GridClientConnection conn, UUID destNodeId)
throws GridClientConnectionResetException, GridClientClosedException {
- return conn.execute(taskName, taskArg, destNodeId, keepPortables);
+ return conn.execute(taskName, taskArg, destNodeId, keepBinaries);
}
});
}
@@ -148,14 +148,14 @@ class GridClientComputeImpl extends GridClientAbstractProjection<GridClientCompu
Object affKey, final Object taskArg) {
A.notNull(taskName, "taskName");
- final boolean keepPortables = KEEP_PORTABLES.get();
+ final boolean keepBinaries = KEEP_BINARIES.get();
- KEEP_PORTABLES.set(false);
+ KEEP_BINARIES.set(false);
return withReconnectHandling(new ClientProjectionClosure<R>() {
@Override public GridClientFuture<R> apply(GridClientConnection conn, UUID destNodeId)
throws GridClientConnectionResetException, GridClientClosedException {
- return conn.execute(taskName, taskArg, destNodeId, keepPortables);
+ return conn.execute(taskName, taskArg, destNodeId, keepBinaries);
}
}, cacheName, affKey);
}
@@ -254,8 +254,8 @@ class GridClientComputeImpl extends GridClientAbstractProjection<GridClientCompu
}
/** {@inheritDoc} */
- @Override public GridClientCompute withKeepPortables() {
- KEEP_PORTABLES.set(true);
+ @Override public GridClientCompute withKeepBinaries() {
+ KEEP_BINARIES.set(true);
return this;
}
@@ -268,4 +268,4 @@ class GridClientComputeImpl extends GridClientAbstractProjection<GridClientCompu
return new GridClientComputeImpl(client, nodes, filter, balancer);
}
}
-}
\ 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/client/impl/connection/GridClientConnection.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/client/impl/connection/GridClientConnection.java b/modules/core/src/main/java/org/apache/ignite/internal/client/impl/connection/GridClientConnection.java
index 8bdb1d0..c129f54 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/client/impl/connection/GridClientConnection.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/client/impl/connection/GridClientConnection.java
@@ -313,13 +313,13 @@ public abstract class GridClientConnection {
* @param taskName Task name.
* @param arg Task argument.
* @param destNodeId Destination node ID.
- * @param keepPortables Keep binary flag.
+ * @param keepBinaries Keep binary flag.
* @return Task execution result.
* @throws GridClientConnectionResetException In case of error.
* @throws GridClientClosedException If client was manually closed before request was sent over network.
*/
public abstract <R> GridClientFutureAdapter<R> execute(String taskName, Object arg, UUID destNodeId,
- boolean keepPortables) throws GridClientConnectionResetException, GridClientClosedException;
+ boolean keepBinaries) throws GridClientConnectionResetException, GridClientClosedException;
/**
* Gets node by node ID.
@@ -514,4 +514,4 @@ public abstract class GridClientConnection {
return null;
}
-}
\ 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/client/impl/connection/GridClientConnectionManagerAdapter.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/client/impl/connection/GridClientConnectionManagerAdapter.java b/modules/core/src/main/java/org/apache/ignite/internal/client/impl/connection/GridClientConnectionManagerAdapter.java
index dedee10..1bea3cc 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/client/impl/connection/GridClientConnectionManagerAdapter.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/client/impl/connection/GridClientConnectionManagerAdapter.java
@@ -462,7 +462,7 @@ public abstract class GridClientConnectionManagerAdapter implements GridClientCo
if (cfg.getProtocol() == GridClientProtocol.TCP) {
conn = new GridClientNioTcpConnection(srv, clientId, addr, sslCtx, pingExecutor,
cfg.getConnectTimeout(), cfg.getPingInterval(), cfg.getPingTimeout(),
- cfg.isTcpNoDelay(), cfg.getMarshaller(), marshId, top, cred, keepPortablesThreadLocal());
+ cfg.isTcpNoDelay(), cfg.getMarshaller(), marshId, top, cred, keepBinariesThreadLocal());
}
else
throw new GridServerUnreachableException("Failed to create client (protocol is not supported): " +
@@ -485,7 +485,7 @@ public abstract class GridClientConnectionManagerAdapter implements GridClientCo
/**
* @return Get thread local used to enable keep binary mode.
*/
- protected ThreadLocal<Boolean> keepPortablesThreadLocal() {
+ protected ThreadLocal<Boolean> keepBinariesThreadLocal() {
return null;
}
@@ -668,4 +668,4 @@ public abstract class GridClientConnectionManagerAdapter implements GridClientCo
ses.close();
}
}
-}
\ 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/client/impl/connection/GridClientNioTcpConnection.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/client/impl/connection/GridClientNioTcpConnection.java b/modules/core/src/main/java/org/apache/ignite/internal/client/impl/connection/GridClientNioTcpConnection.java
index 24c9c70..576df3a 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/client/impl/connection/GridClientNioTcpConnection.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/client/impl/connection/GridClientNioTcpConnection.java
@@ -79,7 +79,7 @@ import org.apache.ignite.internal.util.typedef.internal.U;
import org.jetbrains.annotations.Nullable;
import static java.util.concurrent.TimeUnit.MILLISECONDS;
-import static org.apache.ignite.internal.client.GridClientCacheFlag.KEEP_PORTABLES;
+import static org.apache.ignite.internal.client.GridClientCacheFlag.KEEP_BINARIES;
import static org.apache.ignite.internal.client.impl.connection.GridClientConnectionCloseReason.CONN_IDLE;
import static org.apache.ignite.internal.client.impl.connection.GridClientConnectionCloseReason.FAILED;
import static org.apache.ignite.internal.processors.rest.client.message.GridClientCacheRequest.GridCacheOperation.APPEND;
@@ -156,7 +156,7 @@ public class GridClientNioTcpConnection extends GridClientConnection {
private final GridClientMarshaller marsh;
/** */
- private final ThreadLocal<Boolean> keepPortablesMode;
+ private final ThreadLocal<Boolean> keepBinariesMode;
/**
* Creates a client facade, tries to connect to remote server, in case of success starts reader thread.
@@ -190,7 +190,7 @@ public class GridClientNioTcpConnection extends GridClientConnection {
Byte marshId,
GridClientTopology top,
Object cred,
- ThreadLocal<Boolean> keepPortablesMode
+ ThreadLocal<Boolean> keepBinariesMode
) throws IOException, GridClientException {
super(clientId, srvAddr, sslCtx, top, cred);
@@ -199,7 +199,7 @@ public class GridClientNioTcpConnection extends GridClientConnection {
this.marsh = marsh;
this.pingInterval = pingInterval;
this.pingTimeout = pingTimeout;
- this.keepPortablesMode = keepPortablesMode;
+ this.keepBinariesMode = keepBinariesMode;
SocketChannel ch = null;
Socket sock = null;
@@ -385,16 +385,16 @@ public class GridClientNioTcpConnection extends GridClientConnection {
*
* @param msg Message to request,
* @param destId Destination node identifier.
- * @param keepPortables Keep binary flag.
+ * @param keepBinaries Keep binary flag.
* @return Response object.
* @throws GridClientConnectionResetException If request failed.
* @throws GridClientClosedException If client was closed.
*/
- private <R> GridClientFutureAdapter<R> makeRequest(GridClientMessage msg, UUID destId, boolean keepPortables)
+ private <R> GridClientFutureAdapter<R> makeRequest(GridClientMessage msg, UUID destId, boolean keepBinaries)
throws GridClientConnectionResetException, GridClientClosedException {
assert msg != null;
- TcpClientFuture<R> res = new TcpClientFuture<>(false, keepPortables);
+ TcpClientFuture<R> res = new TcpClientFuture<>(false, keepBinaries);
msg.destinationId(destId);
@@ -667,7 +667,7 @@ public class GridClientNioTcpConnection extends GridClientConnection {
req.keys((Iterable<Object>)keys);
req.cacheFlagsOn(encodeCacheFlags(flags));
- return makeRequest(req, destNodeId, flags.contains(KEEP_PORTABLES));
+ return makeRequest(req, destNodeId, flags.contains(KEEP_BINARIES));
}
/** {@inheritDoc} */
@@ -786,12 +786,12 @@ public class GridClientNioTcpConnection extends GridClientConnection {
/** {@inheritDoc} */
@Override public <R> GridClientFutureAdapter<R> execute(String taskName, Object arg, UUID destNodeId,
- final boolean keepPortables) throws GridClientConnectionResetException, GridClientClosedException {
+ final boolean keepBinaries) throws GridClientConnectionResetException, GridClientClosedException {
GridClientTaskRequest msg = new GridClientTaskRequest();
msg.taskName(taskName);
msg.argument(arg);
- msg.keepPortables(keepPortables);
+ msg.keepBinaries(keepBinaries);
return this.<GridClientTaskResultBean>makeRequest(msg, destNodeId).chain(
new GridClientFutureCallback<GridClientTaskResultBean, R>() {
@@ -1038,7 +1038,7 @@ public class GridClientNioTcpConnection extends GridClientConnection {
private final boolean forward;
/** Keep binary flag. */
- private final boolean keepPortables;
+ private final boolean keepBinaries;
/** Pending message for this future. */
private GridClientMessage pendingMsg;
@@ -1052,7 +1052,7 @@ public class GridClientNioTcpConnection extends GridClientConnection {
*/
private TcpClientFuture() {
forward = false;
- keepPortables = false;
+ keepBinaries = false;
}
/**
@@ -1060,9 +1060,9 @@ public class GridClientNioTcpConnection extends GridClientConnection {
*
* @param forward Flag value.
*/
- private TcpClientFuture(boolean forward, boolean keepPortables) {
+ private TcpClientFuture(boolean forward, boolean keepBinaries) {
this.forward = forward;
- this.keepPortables = keepPortables;
+ this.keepBinaries = keepBinaries;
}
/**
@@ -1103,8 +1103,8 @@ public class GridClientNioTcpConnection extends GridClientConnection {
/**
* @return Keep binary flag.
*/
- public boolean keepPortables() {
- return keepPortables;
+ public boolean keepBinaries() {
+ return keepBinaries;
}
/** {@inheritDoc} */
@@ -1112,4 +1112,4 @@ public class GridClientNioTcpConnection extends GridClientConnection {
return "TcpClientFuture [state=" + authRetry + ", forward=" + forward + ", message=" + pendingMsg + "]";
}
}
-}
\ 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/CacheDefaultBinaryAffinityKeyMapper.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/CacheDefaultBinaryAffinityKeyMapper.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/CacheDefaultBinaryAffinityKeyMapper.java
index 4f9c188..9b3dd15 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/CacheDefaultBinaryAffinityKeyMapper.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/CacheDefaultBinaryAffinityKeyMapper.java
@@ -37,10 +37,10 @@ public class CacheDefaultBinaryAffinityKeyMapper extends GridCacheDefaultAffinit
/** {@inheritDoc} */
@Override public Object affinityKey(Object key) {
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/CacheInvokeEntry.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/CacheInvokeEntry.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/CacheInvokeEntry.java
index 2de26fc..2ecfdbf 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/CacheInvokeEntry.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/CacheInvokeEntry.java
@@ -50,9 +50,9 @@ public class CacheInvokeEntry<K, V> extends CacheLazyEntry<K, V> implements Muta
KeyCacheObject keyObj,
@Nullable CacheObject valObj,
GridCacheVersion ver,
- boolean keepPortable
+ boolean keepBinary
) {
- super(cctx, keyObj, valObj, keepPortable);
+ super(cctx, keyObj, valObj, keepBinary);
this.hadVal = valObj != null;
this.ver = ver;
@@ -72,9 +72,9 @@ public class CacheInvokeEntry<K, V> extends CacheLazyEntry<K, V> implements Muta
@Nullable CacheObject valObj,
@Nullable V val,
GridCacheVersion ver,
- boolean keepPortable
+ boolean keepBinary
) {
- super(ctx, keyObj, key, valObj, val, keepPortable);
+ super(ctx, keyObj, key, valObj, val, keepBinary);
this.hadVal = valObj != null || val != null;
this.ver = ver;
@@ -152,4 +152,4 @@ public class CacheInvokeEntry<K, V> extends CacheLazyEntry<K, V> implements Muta
/** */
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/cache/CacheLazyEntry.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/CacheLazyEntry.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/CacheLazyEntry.java
index 713bb3f..05a6fef 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/CacheLazyEntry.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/CacheLazyEntry.java
@@ -43,19 +43,19 @@ public class CacheLazyEntry<K, V> implements Cache.Entry<K, V> {
@GridToStringInclude
protected V val;
- /** Keep portable flag. */
- private boolean keepPortable;
+ /** Keep binary flag. */
+ private boolean keepBinary;
/**
* @param cctx Cache context.
* @param keyObj Key cache object.
* @param valObj Cache object value.
*/
- public CacheLazyEntry(GridCacheContext cctx, KeyCacheObject keyObj, CacheObject valObj, boolean keepPortable) {
+ public CacheLazyEntry(GridCacheContext cctx, KeyCacheObject keyObj, CacheObject valObj, boolean keepBinary) {
this.cctx = cctx;
this.keyObj = keyObj;
this.valObj = valObj;
- this.keepPortable = keepPortable;
+ this.keepBinary = keepBinary;
}
/**
@@ -63,11 +63,11 @@ public class CacheLazyEntry<K, V> implements Cache.Entry<K, V> {
* @param val Value.
* @param cctx Cache context.
*/
- public CacheLazyEntry(GridCacheContext cctx, KeyCacheObject keyObj, V val, boolean keepPortable) {
+ public CacheLazyEntry(GridCacheContext cctx, KeyCacheObject keyObj, V val, boolean keepBinary) {
this.cctx = cctx;
this.keyObj = keyObj;
this.val = val;
- this.keepPortable = keepPortable;
+ this.keepBinary = keepBinary;
}
/**
@@ -82,38 +82,38 @@ public class CacheLazyEntry<K, V> implements Cache.Entry<K, V> {
K key,
CacheObject valObj,
V val,
- boolean keepPortable
+ boolean keepBinary
) {
this.cctx = ctx;
this.keyObj = keyObj;
this.key = key;
this.valObj = valObj;
this.val = val;
- this.keepPortable = keepPortable;
+ this.keepBinary = keepBinary;
}
/** {@inheritDoc} */
@Override public K getKey() {
if (key == null)
- key = (K)cctx.unwrapPortableIfNeeded(keyObj, keepPortable);
+ key = (K)cctx.unwrapBinaryIfNeeded(keyObj, keepBinary);
return key;
}
/** {@inheritDoc} */
@Override public V getValue() {
- return getValue(keepPortable);
+ return getValue(keepBinary);
}
/**
* Returns the value stored in the cache when this entry was created.
*
- * @param keepPortable Flag to keep portable if needed.
+ * @param keepBinary Flag to keep binary if needed.
* @return the value corresponding to this entry
*/
- public V getValue(boolean keepPortable) {
+ public V getValue(boolean keepBinary) {
if (val == null)
- val = (V)cctx.unwrapPortableIfNeeded(valObj, keepPortable, false);
+ val = (V)cctx.unwrapBinaryIfNeeded(valObj, keepBinary, false);
return val;
}
@@ -147,4 +147,4 @@ public class CacheLazyEntry<K, V> implements Cache.Entry<K, V> {
public String toString() {
return S.toString(CacheLazyEntry.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/CacheObjectContext.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/CacheObjectContext.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/CacheObjectContext.java
index 88a8027..7401434 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/CacheObjectContext.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/CacheObjectContext.java
@@ -125,69 +125,69 @@ import org.apache.ignite.internal.util.typedef.F;
/**
* @param o Object to unwrap.
- * @param keepPortable Keep binary flag.
+ * @param keepBinary Keep binary flag.
* @return Unwrapped object.
*/
- public Object unwrapPortableIfNeeded(Object o, boolean keepPortable) {
- return unwrapPortableIfNeeded(o, keepPortable, true);
+ public Object unwrapBinaryIfNeeded(Object o, boolean keepBinary) {
+ return unwrapBinaryIfNeeded(o, keepBinary, true);
}
/**
* @param o Object to unwrap.
- * @param keepPortable Keep binary flag.
+ * @param keepBinary Keep binary flag.
* @param cpy Copy value flag.
* @return Unwrapped object.
*/
- public Object unwrapPortableIfNeeded(Object o, boolean keepPortable, boolean cpy) {
+ public Object unwrapBinaryIfNeeded(Object o, boolean keepBinary, boolean cpy) {
if (o == null)
return null;
- return unwrapPortable(o, keepPortable, cpy);
+ return unwrapBinary(o, keepBinary, cpy);
}
/**
* @param col Collection of objects to unwrap.
- * @param keepPortable Keep binary flag.
+ * @param keepBinary Keep binary flag.
* @return Unwrapped collection.
*/
- public Collection<Object> unwrapPortablesIfNeeded(Collection<Object> col, boolean keepPortable) {
- return unwrapPortablesIfNeeded(col, keepPortable, true);
+ public Collection<Object> unwrapBinariesIfNeeded(Collection<Object> col, boolean keepBinary) {
+ return unwrapBinariesIfNeeded(col, keepBinary, true);
}
/**
* @param col Collection to unwrap.
- * @param keepPortable Keep binary flag.
+ * @param keepBinary Keep binary flag.
* @param cpy Copy value flag.
* @return Unwrapped collection.
*/
- public Collection<Object> unwrapPortablesIfNeeded(Collection<Object> col, boolean keepPortable, boolean cpy) {
+ public Collection<Object> unwrapBinariesIfNeeded(Collection<Object> col, boolean keepBinary, boolean cpy) {
if (col instanceof ArrayList)
- return unwrapPortables((ArrayList<Object>)col, keepPortable, cpy);
+ return unwrapBinaries((ArrayList<Object>)col, keepBinary, cpy);
if (col instanceof Set)
- return unwrapPortables((Set<Object>)col, keepPortable, cpy);
+ return unwrapBinaries((Set<Object>)col, keepBinary, cpy);
Collection<Object> col0 = new ArrayList<>(col.size());
for (Object obj : col)
- col0.add(unwrapPortable(obj, keepPortable, cpy));
+ col0.add(unwrapBinary(obj, keepBinary, cpy));
return col0;
}
/**
- * Unwrap array of portables if needed.
+ * Unwrap array of binaries if needed.
*
* @param arr Array.
- * @param keepPortable Keep portable flag.
+ * @param keepBinary Keep binary flag.
* @param cpy Copy.
* @return Result.
*/
- public Object[] unwrapPortablesInArrayIfNeeded(Object[] arr, boolean keepPortable, boolean cpy) {
+ public Object[] unwrapBinariesInArrayIfNeeded(Object[] arr, boolean keepBinary, boolean cpy) {
Object[] res = new Object[arr.length];
for (int i = 0; i < arr.length; i++)
- res[i] = unwrapPortable(arr[i], keepPortable, cpy);
+ res[i] = unwrapBinary(arr[i], keepBinary, cpy);
return res;
}
@@ -196,17 +196,17 @@ import org.apache.ignite.internal.util.typedef.F;
* Unwraps map.
*
* @param map Map to unwrap.
- * @param keepPortable Keep portable flag.
+ * @param keepBinary Keep binary flag.
* @return Unwrapped collection.
*/
- private Map<Object, Object> unwrapPortablesIfNeeded(Map<Object, Object> map, boolean keepPortable, boolean cpy) {
- if (keepPortable)
+ private Map<Object, Object> unwrapBinariesIfNeeded(Map<Object, Object> map, boolean keepBinary, boolean cpy) {
+ if (keepBinary)
return map;
Map<Object, Object> map0 = BinaryUtils.newMap(map);
for (Map.Entry<Object, Object> e : map.entrySet())
- map0.put(unwrapPortable(e.getKey(), keepPortable, cpy), unwrapPortable(e.getValue(), keepPortable, cpy));
+ map0.put(unwrapBinary(e.getKey(), keepBinary, cpy), unwrapBinary(e.getValue(), keepBinary, cpy));
return map0;
}
@@ -217,7 +217,7 @@ import org.apache.ignite.internal.util.typedef.F;
* @param col List to unwrap.
* @return Unwrapped list.
*/
- private Collection<Object> unwrapPortables(ArrayList<Object> col, boolean keepPortable, boolean cpy) {
+ private Collection<Object> unwrapBinaries(ArrayList<Object> col, boolean keepBinary, boolean cpy) {
int size = col.size();
col = new ArrayList<>(col);
@@ -225,7 +225,7 @@ import org.apache.ignite.internal.util.typedef.F;
for (int i = 0; i < size; i++) {
Object o = col.get(i);
- Object unwrapped = unwrapPortable(o, keepPortable, cpy);
+ Object unwrapped = unwrapBinary(o, keepBinary, cpy);
if (o != unwrapped)
col.set(i, unwrapped);
@@ -240,11 +240,11 @@ import org.apache.ignite.internal.util.typedef.F;
* @param set Set to unwrap.
* @return Unwrapped set.
*/
- private Set<Object> unwrapPortables(Set<Object> set, boolean keepPortable, boolean cpy) {
+ private Set<Object> unwrapBinaries(Set<Object> set, boolean keepBinary, boolean cpy) {
Set<Object> set0 = BinaryUtils.newSet(set);
for (Object obj : set)
- set0.add(unwrapPortable(obj, keepPortable, cpy));
+ set0.add(unwrapBinary(obj, keepBinary, cpy));
return set0;
}
@@ -253,31 +253,31 @@ import org.apache.ignite.internal.util.typedef.F;
* @param o Object to unwrap.
* @return Unwrapped object.
*/
- private Object unwrapPortable(Object o, boolean keepPortable, boolean cpy) {
+ private Object unwrapBinary(Object o, boolean keepBinary, boolean cpy) {
if (o instanceof Map.Entry) {
Map.Entry entry = (Map.Entry)o;
Object key = entry.getKey();
- Object uKey = unwrapPortable(key, keepPortable, cpy);
+ Object uKey = unwrapBinary(key, keepBinary, cpy);
Object val = entry.getValue();
- Object uVal = unwrapPortable(val, keepPortable, cpy);
+ Object uVal = unwrapBinary(val, keepBinary, cpy);
return (key != uKey || val != uVal) ? F.t(uKey, uVal) : o;
}
else if (o instanceof Collection)
- return unwrapPortablesIfNeeded((Collection<Object>)o, keepPortable, cpy);
+ return unwrapBinariesIfNeeded((Collection<Object>)o, keepBinary, cpy);
else if (o instanceof Map)
- return unwrapPortablesIfNeeded((Map<Object, Object>)o, keepPortable, cpy);
+ return unwrapBinariesIfNeeded((Map<Object, Object>)o, keepBinary, cpy);
else if (o instanceof Object[])
- return unwrapPortablesInArrayIfNeeded((Object[])o, keepPortable, cpy);
+ return unwrapBinariesInArrayIfNeeded((Object[])o, keepBinary, cpy);
else if (o instanceof CacheObject) {
CacheObject co = (CacheObject)o;
- if (!keepPortable || co.isPlatformType())
- return unwrapPortable(co.value(this, cpy), keepPortable, cpy);
+ if (!keepBinary || co.isPlatformType())
+ return unwrapBinary(co.value(this, cpy), keepBinary, cpy);
}
return o;
http://git-wip-us.apache.org/repos/asf/ignite/blob/10b83fb8/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/CacheOperationContext.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/CacheOperationContext.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/CacheOperationContext.java
index 3993146..21934d0 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/CacheOperationContext.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/CacheOperationContext.java
@@ -42,7 +42,7 @@ public class CacheOperationContext implements Serializable {
/** Client ID which operates over this projection. */
private final UUID subjId;
- /** Keep portable flag. */
+ /** Keep binary flag. */
private final boolean keepBinary;
/** Expiry policy. */
@@ -66,7 +66,7 @@ public class CacheOperationContext implements Serializable {
/**
* @param skipStore Skip store flag.
* @param subjId Subject ID.
- * @param keepBinary Keep portable flag.
+ * @param keepBinary Keep binary flag.
* @param expiryPlc Expiry policy.
*/
public CacheOperationContext(
@@ -87,16 +87,16 @@ public class CacheOperationContext implements Serializable {
}
/**
- * @return Keep portable flag.
+ * @return Keep binary flag.
*/
public boolean isKeepBinary() {
return keepBinary;
}
/**
- * See {@link IgniteInternalCache#keepPortable()}.
+ * See {@link IgniteInternalCache#keepBinary()}.
*
- * @return New instance of CacheOperationContext with keep portable flag.
+ * @return New instance of CacheOperationContext with keep binary flag.
*/
public CacheOperationContext keepBinary() {
return new CacheOperationContext(
@@ -200,4 +200,4 @@ public class CacheOperationContext implements Serializable {
@Override public String toString() {
return S.toString(CacheOperationContext.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/GridCacheAdapter.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheAdapter.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheAdapter.java
index 034640f..ea57caf 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheAdapter.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheAdapter.java
@@ -468,7 +468,7 @@ public abstract class GridCacheAdapter<K, V> implements IgniteInternalCache<K, V
}
/** {@inheritDoc} */
- @Override public <K1, V1> GridCacheProxyImpl<K1, V1> keepPortable() {
+ @Override public <K1, V1> GridCacheProxyImpl<K1, V1> keepBinary() {
CacheOperationContext opCtx = new CacheOperationContext(false, null, true, null, false);
return new GridCacheProxyImpl<>((GridCacheContext<K1, V1>)ctx, (GridCacheAdapter<K1, V1>)this, opCtx);
@@ -608,7 +608,7 @@ public abstract class GridCacheAdapter<K, V> implements IgniteInternalCache<K, V
/*skip tx*/false,
/*subj id*/null,
/*task name*/null,
- /*deserialize portable*/false,
+ /*deserialize binary*/false,
/*skip values*/true,
/*can remap*/true
);
@@ -634,7 +634,7 @@ public abstract class GridCacheAdapter<K, V> implements IgniteInternalCache<K, V
/*skip tx*/false,
/*subj id*/null,
/*task name*/null,
- /*deserialize portable*/false,
+ /*deserialize binary*/false,
/*skip values*/true,
/*can remap*/true
).chain(new CX1<IgniteInternalFuture<Map<K, V>>, Boolean>() {
@@ -669,7 +669,7 @@ public abstract class GridCacheAdapter<K, V> implements IgniteInternalCache<K, V
modes.backup = true;
if (modes.heap)
- its.add(iterator(map.entries0().iterator(), !ctx.keepPortable()));
+ its.add(iterator(map.entries0().iterator(), !ctx.keepBinary()));
}
else if (modes.heap) {
if (modes.near && ctx.isNear())
@@ -799,7 +799,7 @@ public abstract class GridCacheAdapter<K, V> implements IgniteInternalCache<K, V
else
cacheVal = localCachePeek0(cacheKey, modes.heap, modes.offheap, modes.swap, plc);
- Object val = ctx.unwrapPortableIfNeeded(cacheVal, ctx.keepPortable(), false);
+ Object val = ctx.unwrapBinaryIfNeeded(cacheVal, ctx.keepBinary(), false);
return (V)val;
}
@@ -1353,7 +1353,7 @@ public abstract class GridCacheAdapter<K, V> implements IgniteInternalCache<K, V
/*skip tx*/true,
null,
taskName,
- !ctx.keepPortable(),
+ !ctx.keepBinary(),
/*skip values*/false,
/*can remap*/true);
}
@@ -1375,7 +1375,7 @@ public abstract class GridCacheAdapter<K, V> implements IgniteInternalCache<K, V
long start = statsEnabled ? System.nanoTime() : 0L;
- V val = get(key, !ctx.keepPortable());
+ V val = get(key, !ctx.keepBinary());
if (ctx.config().getInterceptor() != null)
val = (V)ctx.config().getInterceptor().onGet(key, val);
@@ -1394,7 +1394,7 @@ public abstract class GridCacheAdapter<K, V> implements IgniteInternalCache<K, V
final long start = statsEnabled ? System.nanoTime() : 0L;
- IgniteInternalFuture<V> fut = getAsync(key, !ctx.keepPortable());
+ IgniteInternalFuture<V> fut = getAsync(key, !ctx.keepBinary());
if (ctx.config().getInterceptor() != null)
fut = fut.chain(new CX1<IgniteInternalFuture<V>, V>() {
@@ -1417,7 +1417,7 @@ public abstract class GridCacheAdapter<K, V> implements IgniteInternalCache<K, V
long start = statsEnabled ? System.nanoTime() : 0L;
- Map<K, V> map = getAll(keys, !ctx.keepPortable());
+ Map<K, V> map = getAll(keys, !ctx.keepBinary());
if (ctx.config().getInterceptor() != null)
map = interceptGet(keys, map);
@@ -1436,7 +1436,7 @@ public abstract class GridCacheAdapter<K, V> implements IgniteInternalCache<K, V
final long start = statsEnabled ? System.nanoTime() : 0L;
- IgniteInternalFuture<Map<K, V>> fut = getAllAsync(keys, !ctx.keepPortable());
+ IgniteInternalFuture<Map<K, V>> fut = getAllAsync(keys, !ctx.keepBinary());
if (ctx.config().getInterceptor() != null)
return fut.chain(new CX1<IgniteInternalFuture<Map<K, V>>, Map<K, V>>() {
@@ -1498,7 +1498,7 @@ public abstract class GridCacheAdapter<K, V> implements IgniteInternalCache<K, V
* @param skipTx Skip tx.
* @param subjId Subj Id.
* @param taskName Task name.
- * @param deserializePortable Deserialize portable.
+ * @param deserializeBinary Deserialize binary.
* @param skipVals Skip values.
* @param canRemap Can remap flag.
* @return Future for the get operation.
@@ -1509,7 +1509,7 @@ public abstract class GridCacheAdapter<K, V> implements IgniteInternalCache<K, V
boolean skipTx,
@Nullable UUID subjId,
String taskName,
- boolean deserializePortable,
+ boolean deserializeBinary,
final boolean skipVals,
boolean canRemap
) {
@@ -1518,7 +1518,7 @@ public abstract class GridCacheAdapter<K, V> implements IgniteInternalCache<K, V
skipTx,
subjId,
taskName,
- deserializePortable,
+ deserializeBinary,
skipVals,
canRemap).chain(
new CX1<IgniteInternalFuture<Map<K, V>>, V>() {
@@ -1544,7 +1544,7 @@ public abstract class GridCacheAdapter<K, V> implements IgniteInternalCache<K, V
* @param skipTx Skip tx.
* @param subjId Subj Id.
* @param taskName Task name.
- * @param deserializePortable Deserialize portable.
+ * @param deserializeBinary Deserialize binary.
* @param skipVals Skip values.
* @param canRemap Can remap flag.
* @return Future for the get operation.
@@ -1556,7 +1556,7 @@ public abstract class GridCacheAdapter<K, V> implements IgniteInternalCache<K, V
boolean skipTx,
@Nullable UUID subjId,
String taskName,
- boolean deserializePortable,
+ boolean deserializeBinary,
boolean skipVals,
boolean canRemap
) {
@@ -1569,7 +1569,7 @@ public abstract class GridCacheAdapter<K, V> implements IgniteInternalCache<K, V
!skipTx,
subjId,
taskName,
- deserializePortable,
+ deserializeBinary,
forcePrimary,
skipVals ? null : expiryPolicy(opCtx != null ? opCtx.expiry() : null),
skipVals,
@@ -1582,7 +1582,7 @@ public abstract class GridCacheAdapter<K, V> implements IgniteInternalCache<K, V
* @param checkTx Check tx.
* @param subjId Subj Id.
* @param taskName Task name.
- * @param deserializePortable Deserialize portable.
+ * @param deserializeBinary Deserialize binary.
* @param forcePrimary Froce primary.
* @param expiry Expiry policy.
* @param skipVals Skip values.
@@ -1595,7 +1595,7 @@ public abstract class GridCacheAdapter<K, V> implements IgniteInternalCache<K, V
boolean checkTx,
@Nullable final UUID subjId,
final String taskName,
- final boolean deserializePortable,
+ final boolean deserializeBinary,
final boolean forcePrimary,
@Nullable IgniteCacheExpiryPolicy expiry,
final boolean skipVals,
@@ -1611,7 +1611,7 @@ public abstract class GridCacheAdapter<K, V> implements IgniteInternalCache<K, V
checkTx,
subjId,
taskName,
- deserializePortable,
+ deserializeBinary,
expiry,
skipVals,
false,
@@ -1625,7 +1625,7 @@ public abstract class GridCacheAdapter<K, V> implements IgniteInternalCache<K, V
* @param checkTx Check local transaction flag.
* @param subjId Subject ID.
* @param taskName Task name/
- * @param deserializePortable Deserialize portable flag.
+ * @param deserializeBinary Deserialize binary flag.
* @param expiry Expiry policy.
* @param skipVals Skip values flag.
* @param keepCacheObjects Keep cache objects.
@@ -1638,7 +1638,7 @@ public abstract class GridCacheAdapter<K, V> implements IgniteInternalCache<K, V
boolean checkTx,
@Nullable final UUID subjId,
final String taskName,
- final boolean deserializePortable,
+ final boolean deserializeBinary,
@Nullable IgniteCacheExpiryPolicy expiry,
final boolean skipVals,
final boolean keepCacheObjects,
@@ -1696,7 +1696,7 @@ public abstract class GridCacheAdapter<K, V> implements IgniteInternalCache<K, V
null,
taskName,
expiry,
- !deserializePortable);
+ !deserializeBinary);
if (res == null) {
if (storeEnabled) {
@@ -1722,7 +1722,7 @@ public abstract class GridCacheAdapter<K, V> implements IgniteInternalCache<K, V
res.get1(),
skipVals,
keepCacheObjects,
- deserializePortable,
+ deserializeBinary,
true);
}
@@ -1797,7 +1797,7 @@ public abstract class GridCacheAdapter<K, V> implements IgniteInternalCache<K, V
cacheVal,
skipVals,
keepCacheObjects,
- deserializePortable,
+ deserializeBinary,
false);
}
}
@@ -1896,7 +1896,7 @@ public abstract class GridCacheAdapter<K, V> implements IgniteInternalCache<K, V
return asyncOp(tx, new AsyncOp<Map<K1, V1>>(keys) {
@Override public IgniteInternalFuture<Map<K1, V1>> op(IgniteTxLocalAdapter tx) {
- return tx.getAllAsync(ctx, keys, deserializePortable, skipVals, false, !readThrough);
+ return tx.getAllAsync(ctx, keys, deserializeBinary, skipVals, false, !readThrough);
}
}, ctx.operationContextPerCall());
}
@@ -3815,7 +3815,7 @@ public abstract class GridCacheAdapter<K, V> implements IgniteInternalCache<K, V
if (!ctx0.isSwapOrOffheapEnabled() && ctx0.kernalContext().discovery().size() == 1)
return localIteratorHonorExpirePolicy(opCtx);
- CacheQueryFuture<Map.Entry<K, V>> fut = ctx0.queries().createScanQuery(null, null, ctx.keepPortable())
+ CacheQueryFuture<Map.Entry<K, V>> fut = ctx0.queries().createScanQuery(null, null, ctx.keepBinary())
.keepAll(false)
.execute();
@@ -3842,12 +3842,12 @@ public abstract class GridCacheAdapter<K, V> implements IgniteInternalCache<K, V
/**
* @param key Key.
- * @param deserializePortable Deserialize portable flag.
+ * @param deserializeBinary Deserialize binary flag.
* @return Value.
* @throws IgniteCheckedException If failed.
*/
@SuppressWarnings("IfMayBeConditional")
- @Nullable public V promote(K key, boolean deserializePortable) throws IgniteCheckedException {
+ @Nullable public V promote(K key, boolean deserializeBinary) throws IgniteCheckedException {
A.notNull(key, "key");
if (keyCheck)
@@ -3877,7 +3877,7 @@ public abstract class GridCacheAdapter<K, V> implements IgniteInternalCache<K, V
Object val0 = val != null ? val.value(ctx.cacheObjectContext(), true) : null;
- return (V)ctx.unwrapPortableIfNeeded(val0, !deserializePortable);
+ return (V)ctx.unwrapBinaryIfNeeded(val0, !deserializeBinary);
}
/** {@inheritDoc} */
@@ -4513,21 +4513,21 @@ public abstract class GridCacheAdapter<K, V> implements IgniteInternalCache<K, V
/**
* @param key Key.
- * @param deserializePortable Deserialize portable flag.
+ * @param deserializeBinary Deserialize binary flag.
* @return Cached value.
* @throws IgniteCheckedException If failed.
*/
- @Nullable public V get(K key, boolean deserializePortable)
+ @Nullable public V get(K key, boolean deserializeBinary)
throws IgniteCheckedException {
- return getAsync(key, deserializePortable).get();
+ return getAsync(key, deserializeBinary).get();
}
/**
* @param key Key.
- * @param deserializePortable Deserialize portable flag.
+ * @param deserializeBinary Deserialize binary flag.
* @return Read operation future.
*/
- public final IgniteInternalFuture<V> getAsync(final K key, boolean deserializePortable) {
+ public final IgniteInternalFuture<V> getAsync(final K key, boolean deserializeBinary) {
try {
checkJta();
}
@@ -4542,30 +4542,30 @@ public abstract class GridCacheAdapter<K, V> implements IgniteInternalCache<K, V
/*skip tx*/false,
null,
taskName,
- deserializePortable,
+ deserializeBinary,
false,
/*can remap*/true);
}
/**
* @param keys Keys.
- * @param deserializePortable Deserialize portable flag.
+ * @param deserializeBinary Deserialize binary flag.
* @return Map of cached values.
* @throws IgniteCheckedException If read failed.
*/
- public Map<K, V> getAll(Collection<? extends K> keys, boolean deserializePortable) throws IgniteCheckedException {
+ public Map<K, V> getAll(Collection<? extends K> keys, boolean deserializeBinary) throws IgniteCheckedException {
checkJta();
- return getAllAsync(keys, deserializePortable).get();
+ return getAllAsync(keys, deserializeBinary).get();
}
/**
* @param keys Keys.
- * @param deserializePortable Deserialize portable flag.
+ * @param deserializeBinary Deserialize binary flag.
* @return Read future.
*/
public IgniteInternalFuture<Map<K, V>> getAllAsync(@Nullable Collection<? extends K> keys,
- boolean deserializePortable) {
+ boolean deserializeBinary) {
String taskName = ctx.kernalContext().job().currentTaskName();
return getAllAsync(keys,
@@ -4573,7 +4573,7 @@ public abstract class GridCacheAdapter<K, V> implements IgniteInternalCache<K, V
/*skip tx*/false,
/*subject id*/null,
taskName,
- deserializePortable,
+ deserializeBinary,
/*skip vals*/false,
/*can remap*/true);
}
@@ -4662,11 +4662,11 @@ public abstract class GridCacheAdapter<K, V> implements IgniteInternalCache<K, V
/**
* @param it Internal entry iterator.
- * @param deserializePortable Deserialize portable flag.
+ * @param deserializeBinary Deserialize binary flag.
* @return Public API iterator.
*/
protected Iterator<Cache.Entry<K, V>> iterator(final Iterator<GridCacheEntryEx> it,
- final boolean deserializePortable) {
+ final boolean deserializeBinary) {
return new Iterator<Cache.Entry<K, V>>() {
{
advance();
@@ -4704,7 +4704,7 @@ public abstract class GridCacheAdapter<K, V> implements IgniteInternalCache<K, V
GridCacheEntryEx entry = it.next();
try {
- next = toCacheEntry(entry, deserializePortable);
+ next = toCacheEntry(entry, deserializeBinary);
if (next == null)
continue;
@@ -4724,13 +4724,13 @@ public abstract class GridCacheAdapter<K, V> implements IgniteInternalCache<K, V
/**
* @param entry Internal entry.
- * @param deserializePortable Deserialize portable flag.
+ * @param deserializeBinary Deserialize binary flag.
* @return Public API entry.
* @throws IgniteCheckedException If failed.
* @throws GridCacheEntryRemovedException If entry removed.
*/
@Nullable private Cache.Entry<K, V> toCacheEntry(GridCacheEntryEx entry,
- boolean deserializePortable)
+ boolean deserializeBinary)
throws IgniteCheckedException, GridCacheEntryRemovedException
{
CacheObject val = entry.innerGet(
@@ -4746,7 +4746,7 @@ public abstract class GridCacheAdapter<K, V> implements IgniteInternalCache<K, V
null,
null,
null,
- !deserializePortable);
+ !deserializeBinary);
if (val == null)
return null;
@@ -4756,9 +4756,9 @@ public abstract class GridCacheAdapter<K, V> implements IgniteInternalCache<K, V
Object key0 = key.value(ctx.cacheObjectContext(), true);
Object val0 = val.value(ctx.cacheObjectContext(), true);
- if (deserializePortable) {
- key0 = ctx.unwrapPortableIfNeeded(key0, true);
- val0 = ctx.unwrapPortableIfNeeded(val0, true);
+ if (deserializeBinary) {
+ key0 = ctx.unwrapBinaryIfNeeded(key0, true);
+ val0 = ctx.unwrapBinaryIfNeeded(val0, true);
}
return new CacheEntryImpl<>((K)key0, (V)val0, entry.version());
http://git-wip-us.apache.org/repos/asf/ignite/blob/10b83fb8/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheConcurrentMap.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheConcurrentMap.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheConcurrentMap.java
index f78a606..05ff71a 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheConcurrentMap.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheConcurrentMap.java
@@ -1781,7 +1781,7 @@ public class GridCacheConcurrentMap {
/** {@inheritDoc} */
@Override public K next() {
- return (K)it.ctx.cacheObjectContext().unwrapPortableIfNeeded(it.next().key(), keepBinary, true);
+ return (K)it.ctx.cacheObjectContext().unwrapBinaryIfNeeded(it.next().key(), keepBinary, true);
}
/** {@inheritDoc} */
[09/24] ignite git commit: ignite-2065: portable -> binary renaming
(methods, javadoc and etc.)
Posted by ak...@apache.org.
ignite-2065: portable -> binary renaming (methods, javadoc and etc.)
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/10b83fb8
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/10b83fb8
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/10b83fb8
Branch: refs/heads/ignite-843-rc2
Commit: 10b83fb852e67ab904453034c1d187d1e7f4f36f
Parents: 1f2af31
Author: ashutak <as...@gridgain.com>
Authored: Fri Dec 11 21:43:33 2015 +0300
Committer: ashutak <as...@gridgain.com>
Committed: Fri Dec 11 21:43:33 2015 +0300
----------------------------------------------------------------------
.../examples/CacheClientBinaryExampleTest.java | 6 +-
.../ComputeClientBinaryExampleTest.java | 4 +-
.../testsuites/IgniteExamplesSelfTestSuite.java | 2 +-
.../client/impl/ClientCacheFlagsCodecTest.java | 8 +-
.../src/test/resources/spring-server-node.xml | 8 +-
.../test/resources/spring-server-ssl-node.xml | 8 +-
modules/core/pom.xml | 4 +-
.../java/org/apache/ignite/IgniteBinary.java | 124 +++----
.../java/org/apache/ignite/IgniteCache.java | 8 +-
.../org/apache/ignite/binary/BinaryReader.java | 4 +-
.../affinity/AffinityNodeHashResolver.java | 6 +-
.../configuration/BinaryConfiguration.java | 4 +-
.../ignite/internal/IgniteNodeAttributes.java | 4 +-
.../internal/binary/BinaryClassDescriptor.java | 30 +-
.../ignite/internal/binary/BinaryContext.java | 14 +-
.../internal/binary/BinaryEnumObjectImpl.java | 2 +-
.../internal/binary/BinaryFieldAccessor.java | 16 +-
.../ignite/internal/binary/BinaryFieldImpl.java | 2 +-
.../internal/binary/BinaryMarshaller.java | 6 +-
.../ignite/internal/binary/BinaryMetadata.java | 4 +-
.../internal/binary/BinaryMetadataHandler.java | 2 +-
.../internal/binary/BinaryObjectExImpl.java | 4 +-
.../internal/binary/BinaryObjectImpl.java | 8 +-
.../binary/BinaryObjectOffheapImpl.java | 4 +-
.../internal/binary/BinaryReaderExImpl.java | 20 +-
.../ignite/internal/binary/BinarySchema.java | 2 +-
.../internal/binary/BinarySchemaRegistry.java | 2 +-
.../ignite/internal/binary/BinaryTypeImpl.java | 4 +-
.../ignite/internal/binary/BinaryUtils.java | 104 +++---
.../ignite/internal/binary/BinaryWriteMode.java | 8 +-
.../internal/binary/BinaryWriterExImpl.java | 20 +-
.../internal/binary/GridBinaryMarshaller.java | 10 +-
.../binary/builder/BinaryBuilderEnum.java | 6 +-
.../binary/builder/BinaryBuilderReader.java | 22 +-
.../binary/builder/BinaryBuilderSerializer.java | 10 +-
.../builder/BinaryEnumArrayLazyValue.java | 4 +-
.../binary/builder/BinaryLazyArrayList.java | 2 +-
.../internal/binary/builder/BinaryLazyMap.java | 2 +-
.../builder/BinaryObjectArrayLazyValue.java | 4 +-
.../binary/builder/BinaryObjectBuilderImpl.java | 14 +-
.../binary/builder/BinaryPlainBinaryObject.java | 14 +-
.../internal/binary/builder/package-info.java | 2 +-
.../ignite/internal/binary/package-info.java | 2 +-
.../streams/BinaryAbstractInputStream.java | 2 +-
.../streams/BinaryAbstractOutputStream.java | 2 +-
.../binary/streams/BinaryAbstractStream.java | 2 +-
.../binary/streams/BinaryHeapInputStream.java | 2 +-
.../binary/streams/BinaryHeapOutputStream.java | 2 +-
.../binary/streams/BinaryInputStream.java | 2 +-
.../streams/BinaryOffheapInputStream.java | 2 +-
.../streams/BinaryOffheapOutputStream.java | 2 +-
.../binary/streams/BinaryOutputStream.java | 2 +-
.../internal/binary/streams/BinaryStream.java | 2 +-
.../internal/binary/streams/package-info.java | 2 +-
.../internal/client/GridClientCacheFlag.java | 10 +-
.../internal/client/GridClientCompute.java | 4 +-
.../client/GridClientConfiguration.java | 4 +-
.../client/impl/GridClientComputeImpl.java | 20 +-
.../impl/connection/GridClientConnection.java | 6 +-
.../GridClientConnectionManagerAdapter.java | 6 +-
.../connection/GridClientNioTcpConnection.java | 34 +-
.../CacheDefaultBinaryAffinityKeyMapper.java | 4 +-
.../processors/cache/CacheInvokeEntry.java | 10 +-
.../processors/cache/CacheLazyEntry.java | 28 +-
.../processors/cache/CacheObjectContext.java | 68 ++--
.../processors/cache/CacheOperationContext.java | 12 +-
.../processors/cache/GridCacheAdapter.java | 100 +++---
.../cache/GridCacheConcurrentMap.java | 2 +-
.../processors/cache/GridCacheContext.java | 36 +-
.../processors/cache/GridCacheEntryEx.java | 8 +-
.../processors/cache/GridCacheEventManager.java | 24 +-
.../processors/cache/GridCacheMapEntry.java | 54 +--
.../cache/GridCacheOffheapSwapEntry.java | 4 +-
.../processors/cache/GridCacheProxyImpl.java | 2 +-
.../processors/cache/GridCacheReturn.java | 10 +-
.../processors/cache/IgniteCacheProxy.java | 36 +-
.../processors/cache/IgniteInternalCache.java | 48 +--
.../cache/binary/BinaryMetadataKey.java | 2 +-
.../CacheDefaultBinaryAffinityKeyMapper.java | 4 +-
.../cache/binary/CacheObjectBinaryContext.java | 16 +-
.../binary/CacheObjectBinaryProcessor.java | 14 +-
.../binary/CacheObjectBinaryProcessorImpl.java | 132 ++++----
.../cache/binary/IgniteBinaryImpl.java | 8 +-
.../processors/cache/binary/package-info.java | 2 +-
.../CacheDataStructuresManager.java | 6 +-
.../distributed/GridDistributedLockRequest.java | 2 +-
.../dht/CacheDistributedGetFutureAdapter.java | 10 +-
.../distributed/dht/GridDhtCacheAdapter.java | 8 +-
.../cache/distributed/dht/GridDhtGetFuture.java | 4 +-
.../dht/GridPartitionedGetFuture.java | 14 +-
.../dht/GridPartitionedSingleGetFuture.java | 12 +-
.../dht/atomic/GridDhtAtomicCache.java | 26 +-
.../dht/atomic/GridDhtAtomicUpdateRequest.java | 4 +-
.../dht/atomic/GridNearAtomicUpdateFuture.java | 4 +-
.../dht/atomic/GridNearAtomicUpdateRequest.java | 4 +-
.../dht/colocated/GridDhtColocatedCache.java | 36 +-
.../distributed/near/GridNearAtomicCache.java | 10 +-
.../distributed/near/GridNearCacheAdapter.java | 10 +-
.../distributed/near/GridNearGetFuture.java | 22 +-
.../near/GridNearTransactionalCache.java | 12 +-
.../cache/distributed/near/GridNearTxLocal.java | 6 +-
.../local/atomic/GridLocalAtomicCache.java | 74 ++---
.../query/GridCacheDistributedQueryManager.java | 8 +-
.../cache/query/GridCacheQueryAdapter.java | 32 +-
.../query/GridCacheQueryFutureAdapter.java | 4 +-
.../cache/query/GridCacheQueryManager.java | 64 ++--
.../cache/query/GridCacheQueryRequest.java | 22 +-
.../continuous/CacheContinuousQueryEvent.java | 8 +-
.../cache/store/CacheOsStoreManager.java | 8 +-
.../cache/store/CacheStoreManager.java | 10 +-
.../store/GridCacheStoreManagerAdapter.java | 18 +-
.../transactions/IgniteTxLocalAdapter.java | 44 +--
.../cache/transactions/IgniteTxLocalEx.java | 6 +-
.../cacheobject/IgniteCacheObjectProcessor.java | 16 +-
.../IgniteCacheObjectProcessorImpl.java | 6 +-
.../processors/cacheobject/NoOpBinary.java | 2 +-
.../datastreamer/DataStreamerEntry.java | 6 +-
.../platform/PlatformAbstractPredicate.java | 6 +-
.../platform/PlatformAbstractTarget.java | 14 +-
.../processors/platform/PlatformContext.java | 4 +-
.../platform/PlatformContextImpl.java | 6 +-
.../platform/PlatformNoopProcessor.java | 4 +-
.../processors/platform/PlatformProcessor.java | 8 +-
.../platform/PlatformProcessorImpl.java | 34 +-
.../platform/cache/PlatformCache.java | 28 +-
.../cache/PlatformCacheEntryFilterImpl.java | 2 +-
.../cache/PlatformCacheEntryProcessorImpl.java | 10 +-
.../PlatformCachePartialUpdateException.java | 12 +-
.../callback/PlatformCallbackGateway.java | 8 +-
.../callback/PlatformCallbackUtils.java | 6 +-
.../cluster/PlatformClusterNodeFilterImpl.java | 2 +-
.../platform/compute/PlatformCompute.java | 12 +-
.../datastreamer/PlatformDataStreamer.java | 10 +-
.../PlatformStreamReceiverImpl.java | 16 +-
.../dotnet/PlatformDotNetCacheStore.java | 12 +-
.../PlatformDotNetConfigurationClosure.java | 2 +-
.../dotnet/PlatformDotNetServiceImpl.java | 8 +-
.../events/PlatformEventFilterListenerImpl.java | 2 +-
.../messaging/PlatformMessageFilterImpl.java | 2 +-
.../services/PlatformAbstractService.java | 26 +-
.../platform/services/PlatformService.java | 6 +-
.../platform/services/PlatformServices.java | 26 +-
.../query/GridQueryCacheObjectsIterator.java | 14 +-
.../processors/query/GridQueryProcessor.java | 72 ++--
.../message/GridClientBinaryMetaData.java | 2 +-
.../client/message/GridClientTaskRequest.java | 14 +-
.../internal/visor/util/VisorMimeTypes.java | 10 +-
.../marshaller/portable/package-info.java | 22 --
.../PlatformDotNetBinaryConfiguration.java | 6 +-
.../dotnet/PlatformDotNetConfiguration.java | 8 +-
.../ignite/spi/discovery/tcp/ServerImpl.java | 4 +-
.../java/org/jsr166/ConcurrentHashMap8.java | 2 +-
.../resources/META-INF/classnames.properties | 12 +-
.../ignite/binary/test1/1.1/test1-1.1.jar | Bin 0 -> 2548 bytes
.../ignite/binary/test1/1.1/test1-1.1.pom | 9 +
.../binary/test1/maven-metadata-local.xml | 12 +
.../ignite/binary/test2/1.1/test2-1.1.jar | Bin 0 -> 1361 bytes
.../ignite/binary/test2/1.1/test2-1.1.pom | 9 +
.../binary/test2/maven-metadata-local.xml | 12 +
.../binary/BinaryFieldsAbstractSelfTest.java | 30 +-
.../binary/BinaryFieldsHeapSelfTest.java | 6 +-
.../binary/BinaryFieldsOffheapSelfTest.java | 6 +-
.../BinaryFooterOffsetsAbstractSelfTest.java | 14 +-
.../binary/BinaryFooterOffsetsHeapSelfTest.java | 4 +-
.../BinaryFooterOffsetsOffheapSelfTest.java | 4 +-
.../binary/BinaryMarshallerSelfTest.java | 330 +++++++++----------
.../BinaryObjectBuilderAdditionalSelfTest.java | 38 +--
.../binary/BinaryObjectBuilderSelfTest.java | 50 +--
.../binary/GridBinaryAffinityKeySelfTest.java | 2 +-
...GridBinaryMarshallerCtxDisabledSelfTest.java | 12 +-
.../binary/GridBinaryMetaDataSelfTest.java | 30 +-
.../binary/GridBinaryWildcardsSelfTest.java | 126 +++----
.../mutabletest/GridBinaryTestClasses.java | 12 +-
.../BinaryFieldsHeapNonCompactSelfTest.java | 2 +-
.../BinaryFieldsOffheapNonCompactSelfTest.java | 2 +-
...naryFooterOffsetsHeapNonCompactSelfTest.java | 2 +-
...yFooterOffsetsOffheapNonCompactSelfTest.java | 2 +-
.../BinaryObjectBuilderNonCompactSelfTest.java | 2 +-
.../GridCacheOffHeapTieredAbstractSelfTest.java | 8 +-
.../GridCacheOnCopyFlagAbstractSelfTest.java | 6 +-
.../processors/cache/GridCacheTestEntryEx.java | 8 +-
.../GridBinaryCacheEntryMemorySizeSelfTest.java | 2 +-
...ryDuplicateIndexObjectsAbstractSelfTest.java | 20 +-
...naryObjectsAbstractDataStreamerSelfTest.java | 2 +-
...aryObjectsAbstractMultiThreadedSelfTest.java | 10 +-
.../GridCacheBinaryObjectsAbstractSelfTest.java | 56 ++--
.../GridCacheBinaryStoreAbstractSelfTest.java | 4 +-
.../GridCacheBinaryStoreBinariesSelfTest.java | 10 +-
.../GridCacheBinaryStoreObjectsSelfTest.java | 2 +-
...ntNodeBinaryObjectMetadataMultinodeTest.java | 28 +-
...CacheClientNodeBinaryObjectMetadataTest.java | 2 +-
.../GridDataStreamerImplSelfTest.java | 22 +-
...BinaryObjectsAtomicNearDisabledSelfTest.java | 2 +-
.../GridCacheBinaryObjectsAtomicSelfTest.java | 2 +-
...yObjectsPartitionedNearDisabledSelfTest.java | 2 +-
...idCacheBinaryObjectsPartitionedSelfTest.java | 2 +-
...dCacheOffHeapTieredAtomicBinarySelfTest.java | 2 +-
.../GridCacheOffHeapTieredBinarySelfTest.java | 2 +-
...fHeapTieredEvictionAtomicBinarySelfTest.java | 12 +-
...acheOffHeapTieredEvictionBinarySelfTest.java | 12 +-
...ridCacheBinaryObjectsReplicatedSelfTest.java | 2 +-
.../GridCacheBinaryObjectsLocalSelfTest.java | 2 +-
.../platform/PlatformComputeEchoTask.java | 20 +-
.../session/GridSessionCheckpointSelfTest.java | 2 +-
.../junits/IgniteTestResources.java | 2 +-
.../IgniteBinaryCacheFullApiTestSuite.java | 2 +-
.../testsuites/IgniteBinaryCacheTestSuite.java | 8 +-
.../IgniteBinaryObjectsCacheTestSuite3.java | 2 +-
.../IgniteBinaryObjectsTestSuite.java | 2 +-
.../ignite/binary/test1/1.1/test1-1.1.jar | Bin 2548 -> 0 bytes
.../ignite/binary/test1/1.1/test1-1.1.pom | 9 -
.../binary/test1/maven-metadata-local.xml | 12 -
.../ignite/binary/test2/1.1/test2-1.1.jar | Bin 1361 -> 0 bytes
.../ignite/binary/test2/1.1/test2-1.1.pom | 9 -
.../binary/test2/maven-metadata-local.xml | 12 -
.../processors/query/h2/IgniteH2Indexing.java | 10 +-
.../h2/twostep/GridReduceQueryExecutor.java | 8 +-
...niteCacheP2pUnmarshallingQueryErrorTest.java | 14 +-
.../IgniteBinaryCacheQueryTestSuite.java | 8 +-
parent/pom.xml | 12 +-
220 files changed, 1630 insertions(+), 1652 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ignite/blob/10b83fb8/examples/src/test/java/org/apache/ignite/examples/CacheClientBinaryExampleTest.java
----------------------------------------------------------------------
diff --git a/examples/src/test/java/org/apache/ignite/examples/CacheClientBinaryExampleTest.java b/examples/src/test/java/org/apache/ignite/examples/CacheClientBinaryExampleTest.java
index d5f8cc0..01be0bc 100644
--- a/examples/src/test/java/org/apache/ignite/examples/CacheClientBinaryExampleTest.java
+++ b/examples/src/test/java/org/apache/ignite/examples/CacheClientBinaryExampleTest.java
@@ -27,20 +27,20 @@ import org.apache.ignite.testframework.junits.common.GridAbstractExamplesTest;
public class CacheClientBinaryExampleTest extends GridAbstractExamplesTest {
/** {@inheritDoc} */
@Override protected String defaultConfig() {
- return "examples/config/portable/example-ignite-portable.xml";
+ return "examples/config/binary/example-ignite-binary.xml";
}
/**
* @throws Exception If failed.
*/
- public void testPortablePutGetExample() throws Exception {
+ public void testBinaryPutGetExample() throws Exception {
CacheClientBinaryPutGetExample.main(new String[] {});
}
/**
* @throws Exception If failed.
*/
- public void testPortableQueryExample() throws Exception {
+ public void testBinaryQueryExample() throws Exception {
CacheClientBinaryQueryExample.main(new String[] {});
}
}
http://git-wip-us.apache.org/repos/asf/ignite/blob/10b83fb8/examples/src/test/java/org/apache/ignite/examples/ComputeClientBinaryExampleTest.java
----------------------------------------------------------------------
diff --git a/examples/src/test/java/org/apache/ignite/examples/ComputeClientBinaryExampleTest.java b/examples/src/test/java/org/apache/ignite/examples/ComputeClientBinaryExampleTest.java
index bdba7c3..5dcad62 100644
--- a/examples/src/test/java/org/apache/ignite/examples/ComputeClientBinaryExampleTest.java
+++ b/examples/src/test/java/org/apache/ignite/examples/ComputeClientBinaryExampleTest.java
@@ -25,13 +25,13 @@ import org.apache.ignite.testframework.junits.common.GridAbstractExamplesTest;
public class ComputeClientBinaryExampleTest extends GridAbstractExamplesTest {
/** {@inheritDoc} */
@Override protected String defaultConfig() {
- return "examples/config/portable/example-ignite-portable.xml";
+ return "examples/config/binary/example-ignite-binary.xml";
}
/**
* @throws Exception If failed.
*/
- public void testPortableTaskExecutionExample() throws Exception {
+ public void testBinaryTaskExecutionExample() throws Exception {
ComputeClientBinaryTaskExecutionExample.main(new String[] {});
}
}
http://git-wip-us.apache.org/repos/asf/ignite/blob/10b83fb8/examples/src/test/java/org/apache/ignite/testsuites/IgniteExamplesSelfTestSuite.java
----------------------------------------------------------------------
diff --git a/examples/src/test/java/org/apache/ignite/testsuites/IgniteExamplesSelfTestSuite.java b/examples/src/test/java/org/apache/ignite/testsuites/IgniteExamplesSelfTestSuite.java
index 54fa8a3..fcf9be9 100644
--- a/examples/src/test/java/org/apache/ignite/testsuites/IgniteExamplesSelfTestSuite.java
+++ b/examples/src/test/java/org/apache/ignite/testsuites/IgniteExamplesSelfTestSuite.java
@@ -88,7 +88,7 @@ public class IgniteExamplesSelfTestSuite extends TestSuite {
suite.addTest(new TestSuite(MemcacheRestExamplesMultiNodeSelfTest.class));
suite.addTest(new TestSuite(MonteCarloExamplesMultiNodeSelfTest.class));
- // Portable.
+ // Binary.
suite.addTest(new TestSuite(CacheClientBinaryExampleTest.class));
suite.addTest(new TestSuite(ComputeClientBinaryExampleTest.class));
http://git-wip-us.apache.org/repos/asf/ignite/blob/10b83fb8/modules/clients/src/test/java/org/apache/ignite/internal/client/impl/ClientCacheFlagsCodecTest.java
----------------------------------------------------------------------
diff --git a/modules/clients/src/test/java/org/apache/ignite/internal/client/impl/ClientCacheFlagsCodecTest.java b/modules/clients/src/test/java/org/apache/ignite/internal/client/impl/ClientCacheFlagsCodecTest.java
index bd7ca71..22e9a25 100644
--- a/modules/clients/src/test/java/org/apache/ignite/internal/client/impl/ClientCacheFlagsCodecTest.java
+++ b/modules/clients/src/test/java/org/apache/ignite/internal/client/impl/ClientCacheFlagsCodecTest.java
@@ -26,7 +26,7 @@ import org.apache.ignite.internal.client.impl.connection.GridClientConnection;
import org.apache.ignite.internal.processors.rest.handlers.cache.GridCacheCommandHandler;
import org.apache.ignite.internal.util.typedef.F;
-import static org.apache.ignite.internal.client.GridClientCacheFlag.KEEP_PORTABLES;
+import static org.apache.ignite.internal.client.GridClientCacheFlag.KEEP_BINARIES;
/**
* Tests conversions between GridClientCacheFlag.
@@ -37,7 +37,7 @@ public class ClientCacheFlagsCodecTest extends TestCase {
*/
public void testEncodingDecodingFullness() {
for (GridClientCacheFlag f : GridClientCacheFlag.values()) {
- if (f == KEEP_PORTABLES)
+ if (f == KEEP_BINARIES)
continue;
int bits = GridClientConnection.encodeCacheFlags(Collections.singleton(f));
@@ -71,8 +71,8 @@ public class ClientCacheFlagsCodecTest extends TestCase {
boolean out = GridCacheCommandHandler.parseCacheFlags(bits);
- int length = flagSet.contains(KEEP_PORTABLES) ? flagSet.size() - 1 : flagSet.size();
+ int length = flagSet.contains(KEEP_BINARIES) ? flagSet.size() - 1 : flagSet.size();
assertEquals(length > 0, out);
}
-}
\ No newline at end of file
+}
http://git-wip-us.apache.org/repos/asf/ignite/blob/10b83fb8/modules/clients/src/test/resources/spring-server-node.xml
----------------------------------------------------------------------
diff --git a/modules/clients/src/test/resources/spring-server-node.xml b/modules/clients/src/test/resources/spring-server-node.xml
index 176f0d5..f52640b 100644
--- a/modules/clients/src/test/resources/spring-server-node.xml
+++ b/modules/clients/src/test/resources/spring-server-node.xml
@@ -123,12 +123,12 @@
</bean>
</property>
- <property name="portableEnabled" value="true"/>
+ <property name="binaryEnabled" value="true"/>
<property name="typeMetadata">
<list>
<bean class="org.apache.ignite.cache.CacheTypeMetadata">
- <property name="valueType" value="GridPortablePerson"/>
+ <property name="valueType" value="GridBinaryPerson"/>
<property name="ascendingFields">
<map>
<entry key="age" value="java.lang.Integer"/>
@@ -146,7 +146,7 @@
</property>
</bean>
<bean class="org.apache.ignite.cache.CacheTypeMetadata">
- <property name="valueType" value="GridImplicitPortablePerson"/>
+ <property name="valueType" value="GridImplicitBinaryPerson"/>
<property name="ascendingFields">
<map>
<entry key="age" value="java.lang.Integer"/>
@@ -159,7 +159,7 @@
</property>
</bean>
<bean class="org.apache.ignite.cache.CacheTypeMetadata">
- <property name="valueType" value="GridNoDefPortablePerson"/>
+ <property name="valueType" value="GridNoDefBinaryPerson"/>
<property name="ascendingFields">
<map>
<entry key="age" value="java.lang.Integer"/>
http://git-wip-us.apache.org/repos/asf/ignite/blob/10b83fb8/modules/clients/src/test/resources/spring-server-ssl-node.xml
----------------------------------------------------------------------
diff --git a/modules/clients/src/test/resources/spring-server-ssl-node.xml b/modules/clients/src/test/resources/spring-server-ssl-node.xml
index ceaab53..073ac65 100644
--- a/modules/clients/src/test/resources/spring-server-ssl-node.xml
+++ b/modules/clients/src/test/resources/spring-server-ssl-node.xml
@@ -125,12 +125,12 @@
</bean>
</property>
- <property name="portableEnabled" value="true"/>
+ <property name="binaryEnabled" value="true"/>
<property name="typeMetadata">
<list>
<bean class="org.apache.ignite.cache.CacheTypeMetadata">
- <property name="valueType" value="GridPortablePerson"/>
+ <property name="valueType" value="GridBinaryPerson"/>
<property name="ascendingFields">
<map>
<entry key="age" value="java.lang.Integer"/>
@@ -148,7 +148,7 @@
</property>
</bean>
<bean class="org.apache.ignite.cache.CacheTypeMetadata">
- <property name="valueType" value="GridImplicitPortablePerson"/>
+ <property name="valueType" value="GridImplicitBinaryPerson"/>
<property name="ascendingFields">
<map>
<entry key="age" value="java.lang.Integer"/>
@@ -161,7 +161,7 @@
</property>
</bean>
<bean class="org.apache.ignite.cache.CacheTypeMetadata">
- <property name="valueType" value="GridNoDefPortablePerson"/>
+ <property name="valueType" value="GridNoDefBinaryPerson"/>
<property name="ascendingFields">
<map>
<entry key="age" value="java.lang.Integer"/>
http://git-wip-us.apache.org/repos/asf/ignite/blob/10b83fb8/modules/core/pom.xml
----------------------------------------------------------------------
diff --git a/modules/core/pom.xml b/modules/core/pom.xml
index e4e975e..065082d 100644
--- a/modules/core/pom.xml
+++ b/modules/core/pom.xml
@@ -36,8 +36,8 @@
<repositories>
<repository>
- <id>ignite-portables-test-repo</id>
- <url>file://${basedir}/src/test/portables/repo</url>
+ <id>ignite-binaries-test-repo</id>
+ <url>file://${basedir}/src/test/binaries/repo</url>
</repository>
</repositories>
http://git-wip-us.apache.org/repos/asf/ignite/blob/10b83fb8/modules/core/src/main/java/org/apache/ignite/IgniteBinary.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/IgniteBinary.java b/modules/core/src/main/java/org/apache/ignite/IgniteBinary.java
index 2f68e7a..450cf70 100644
--- a/modules/core/src/main/java/org/apache/ignite/IgniteBinary.java
+++ b/modules/core/src/main/java/org/apache/ignite/IgniteBinary.java
@@ -32,11 +32,11 @@ import org.apache.ignite.binary.BinaryObject;
import org.jetbrains.annotations.Nullable;
/**
- * Defines portable objects functionality. With portable objects you are able to:
+ * Defines binary objects functionality. With binary objects you are able to:
* <ul>
* <li>Seamlessly interoperate between Java, .NET, and C++.</li>
- * <li>Make any object portable with zero code change to your existing code.</li>
- * <li>Nest portable objects within each other.</li>
+ * <li>Make any object binary with zero code change to your existing code.</li>
+ * <li>Nest binary objects within each other.</li>
* <li>Automatically handle {@code circular} or {@code null} references.</li>
* <li>Automatically convert collections and maps between Java, .NET, and C++.</li>
* <li>
@@ -45,24 +45,24 @@ import org.jetbrains.annotations.Nullable;
* </li>
* <li>Avoid need to have concrete class definitions on the server side.</li>
* <li>Dynamically change structure of the classes without having to restart the cluster.</li>
- * <li>Index into portable objects for querying purposes.</li>
+ * <li>Index into binary objects for querying purposes.</li>
* </ul>
- * <h1 class="header">Working With Portables Directly</h1>
- * Once an object is defined as portable,
- * Ignite will always store it in memory in the portable (i.e. binary) format.
- * User can choose to work either with the portable format or with the deserialized form
+ * <h1 class="header">Working With Binaries Directly</h1>
+ * Once an object is defined as binary,
+ * Ignite will always store it in memory in the 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).
* <p>
- * To work with the portable format directly, user should create a special cache projection
+ * To work with the binary format directly, user should create a special cache projection
* using IgniteCache.withKeepBinary() method and then retrieve individual fields as needed:
* <pre name=code class=java>
- * IgniteCache<PortableObject, PortableObject> prj = cache.withKeepBinary();
+ * IgniteCache<BinaryObject, BinaryObject> prj = cache.withKeepBinary();
*
- * // Convert instance of MyKey to portable format.
- * // We could also use PortableBuilder to create the key in portable format directly.
- * PortableObject key = grid.binary().toBinary(new MyKey());
+ * // Convert instance of MyKey to binary format.
+ * // We could also use BinaryBuilder to create the key in binary format directly.
+ * BinaryObject key = grid.binary().toBinary(new MyKey());
*
- * PortableObject val = prj.get(key);
+ * BinaryObject val = prj.get(key);
*
* String field = val.field("myFieldName");
* </pre>
@@ -76,14 +76,14 @@ import org.jetbrains.annotations.Nullable;
* // Normal java getter.
* String fieldVal = val.getMyFieldName();
* </pre>
- * If we used, for example, one of the automatically handled portable types for a key, like integer,
- * and still wanted to work with binary portable format for values, then we would declare cache projection
+ * If we used, for example, one of the automatically handled binary types for a key, like integer,
+ * and still wanted to work with binary binary format for values, then we would declare cache projection
* as follows:
* <pre name=code class=java>
- * IgniteCache<Integer.class, PortableObject> prj = cache.withKeepBinary();
+ * IgniteCache<Integer.class, BinaryObject> prj = cache.withKeepBinary();
* </pre>
- * <h1 class="header">Automatic Portable Types</h1>
- * Note that only portable classes are converted to {@link org.apache.ignite.binary.BinaryObject} format. Following
+ * <h1 class="header">Automatic Binary Types</h1>
+ * Note that only binary classes are converted to {@link org.apache.ignite.binary.BinaryObject} format. Following
* classes are never converted (e.g., {@link #toBinary(Object)} method will return original
* object, and instances of these classes will be stored in cache without changes):
* <ul>
@@ -96,74 +96,74 @@ import org.jetbrains.annotations.Nullable;
* <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>
* <h1 class="header">Working With Maps and Collections</h1>
- * All maps and collections in the portable objects are serialized automatically. When working
+ * All maps and collections in the binary objects are serialized automatically. When working
* with different platforms, e.g. C++ or .NET, Ignite will automatically pick the most
* adequate collection or map in either language. For example, {@link ArrayList} in Java will become
* {@code List} in C#, {@link LinkedList} in Java is {@link LinkedList} in C#, {@link HashMap}
* in Java is {@code Dictionary} in C#, and {@link TreeMap} in Java becomes {@code SortedDictionary}
* in C#, etc.
- * <h1 class="header">Building Portable Objects</h1>
- * Ignite comes with {@link org.apache.ignite.binary.BinaryObjectBuilder} which allows to build portable objects dynamically:
+ * <h1 class="header">Building Binary Objects</h1>
+ * Ignite comes with {@link org.apache.ignite.binary.BinaryObjectBuilder} which allows to build binary objects dynamically:
* <pre name=code class=java>
- * PortableBuilder builder = Ignition.ignite().binary().builder();
+ * BinaryBuilder builder = Ignition.ignite().binary().builder();
*
* builder.typeId("MyObject");
*
* builder.stringField("fieldA", "A");
* build.intField("fieldB", "B");
*
- * PortableObject portableObj = builder.build();
+ * BinaryObject binaryObj = builder.build();
* </pre>
* For the cases when class definition is present
* in the class path, it is also possible to populate a standard POJO and then
- * convert it to portable format, like so:
+ * convert it to binary format, like so:
* <pre name=code class=java>
* MyObject obj = new MyObject();
*
* obj.setFieldA("A");
* obj.setFieldB(123);
*
- * PortableObject portableObj = Ignition.ignite().binary().toBinary(obj);
+ * BinaryObject binaryObj = Ignition.ignite().binary().toBinary(obj);
* </pre>
- * NOTE: you don't need to convert typed objects to portable format before storing
+ * NOTE: you don't need to convert typed objects to binary format before storing
* them in cache, Ignite will do that automatically.
- * <h1 class="header">Portable Metadata</h1>
- * Even though Ignite portable protocol only works with hash codes for type and field names
- * to achieve better performance, Ignite provides metadata for all portable types which
+ * <h1 class="header">Binary Metadata</h1>
+ * Even though Ignite binary protocol only works with hash codes for type and field names
+ * to achieve better performance, Ignite provides metadata for all binary types which
* can be queried ar runtime via any of the {@link IgniteBinary#type(Class)}
- * methods. Having metadata also allows for proper formatting of {@code PortableObject#toString()} method,
- * even when portable objects are kept in binary format only, which may be necessary for audit reasons.
+ * methods. Having metadata also allows for proper formatting of {@code BinaryObject#toString()} method,
+ * even when binary objects are kept in binary format only, which may be necessary for audit reasons.
* <h1 class="header">Dynamic Structure Changes</h1>
- * Since objects are always cached in the portable binary format, server does not need to
+ * Since objects are always cached in the binary binary format, server does not need to
* be aware of the class definitions. Moreover, if class definitions are not present or not
- * used on the server, then clients can continuously change the structure of the portable
+ * used on the server, then clients can continuously change the structure of the binary
* objects without having to restart the cluster. For example, if one client stores a
* certain class with fields A and B, and another client stores the same class with
- * fields B and C, then the server-side portable object will have the fields A, B, and C.
- * As the structure of a portable object changes, the new fields become available for SQL queries
+ * fields B and C, then the server-side binary object will have the fields A, B, and C.
+ * As the structure of a binary object changes, the new fields become available for SQL queries
* automatically.
* <h1 class="header">Configuration</h1>
* By default all your objects are considered as binary and no specific configuration is needed.
* The only requirement Ignite imposes is that your object has an empty
* constructor. Note, that since server side does not have to know the class definition,
- * you only need to list portable objects in configuration on the client side. However, if you
- * list them on the server side as well, then you get the ability to deserialize portable objects
+ * you only need to list binary objects in configuration on the client side. However, if you
+ * list them on the server side as well, then you get the ability to deserialize binary objects
* into concrete types on the server as well as on the client.
* <p>
- * Here is an example of portable configuration (note that star (*) notation is supported):
+ * Here is an example of binary configuration (note that star (*) notation is supported):
* <pre name=code class=xml>
* ...
- * <!-- Explicit portable objects configuration. -->
+ * <!-- Explicit binary objects configuration. -->
* <property name="marshaller">
- * <bean class="org.apache.ignite.marshaller.portable.PortableMarshaller">
+ * <bean class="org.apache.ignite.marshaller.binary.BinaryMarshaller">
* <property name="classNames">
* <list>
- * <value>my.package.for.portable.objects.*</value>
- * <value>org.apache.ignite.examples.client.portable.Employee</value>
+ * <value>my.package.for.binary.objects.*</value>
+ * <value>org.apache.ignite.examples.client.binary.Employee</value>
* </list>
* </property>
* </bean>
@@ -174,7 +174,7 @@ import org.jetbrains.annotations.Nullable;
* <pre name=code class=java>
* IgniteConfiguration cfg = new IgniteConfiguration();
*
- * PortableMarshaller marsh = new PortableMarshaller();
+ * BinaryMarshaller marsh = new BinaryMarshaller();
*
* marsh.setClassNames(Arrays.asList(
* Employee.class.getName(),
@@ -183,7 +183,7 @@ import org.jetbrains.annotations.Nullable;
*
* cfg.setMarshaller(marsh);
* </pre>
- * You can also specify class name for a portable object via {@link org.apache.ignite.binary.BinaryTypeConfiguration}.
+ * You can also specify class name for a binary object via {@link org.apache.ignite.binary.BinaryTypeConfiguration}.
* Do it in case if you need to override other configuration properties on per-type level, like
* ID-mapper, or serializer.
* <h1 class="header">Custom Affinity Keys</h1>
@@ -191,15 +191,15 @@ import org.jetbrains.annotations.Nullable;
* storing objects in cache. For example, if you are caching {@code Employee} object with
* {@code Organization}, and want to colocate employees with organization they work for,
* so you can process them together, you need to specify an alternate affinity key.
- * With portable objects you would have to do it as following:
+ * With binary objects you would have to do it as following:
* <pre name=code class=xml>
* <property name="marshaller">
- * <bean class="org.gridgain.grid.marshaller.portable.PortableMarshaller">
+ * <bean class="org.gridgain.grid.marshaller.binary.BinaryMarshaller">
* ...
* <property name="typeConfigurations">
* <list>
- * <bean class="org.apache.ignite.binary.PortableTypeConfiguration">
- * <property name="className" value="org.apache.ignite.examples.client.portable.EmployeeKey"/>
+ * <bean class="org.apache.ignite.binary.BinaryTypeConfiguration">
+ * <property name="className" value="org.apache.ignite.examples.client.binary.EmployeeKey"/>
* <property name="affinityKeyFieldName" value="organizationId"/>
* </bean>
* </list>
@@ -212,19 +212,19 @@ import org.jetbrains.annotations.Nullable;
* Serialization and deserialization works out-of-the-box in Ignite. However, you can provide your own custom
* serialization logic by optionally implementing {@link org.apache.ignite.binary.Binarylizable} interface, like so:
* <pre name=code class=java>
- * public class Address implements PortableMarshalAware {
+ * public class Address implements BinaryMarshalAware {
* private String street;
* private int zip;
*
- * // Empty constructor required for portable deserialization.
+ * // Empty constructor required for binary deserialization.
* public Address() {}
*
- * @Override public void writeBinary(PortableWriter writer) throws PortableException {
+ * @Override public void writeBinary(BinaryWriter writer) throws BinaryException {
* writer.writeString("street", street);
* writer.writeInt("zip", zip);
* }
*
- * @Override public void readBinary(PortableReader reader) throws PortableException {
+ * @Override public void readBinary(BinaryReader reader) throws BinaryException {
* street = reader.readString("street");
* zip = reader.readInt("zip");
* }
@@ -255,7 +255,7 @@ import org.jetbrains.annotations.Nullable;
* ID-mapper may be provided either globally in {@link org.apache.ignite.configuration.BinaryConfiguration},
* or for a specific type via {@link org.apache.ignite.binary.BinaryTypeConfiguration} instance.
* <h1 class="header">Query Indexing</h1>
- * Portable objects can be indexed for querying by specifying index fields in
+ * Binary objects can be indexed for querying by specifying index fields in
* {@link org.apache.ignite.cache.CacheTypeMetadata} inside of specific
* {@link org.apache.ignite.configuration.CacheConfiguration} instance,
* like so:
@@ -273,7 +273,7 @@ import org.jetbrains.annotations.Nullable;
* <map>
* <entry key="name" value="java.lang.String"/>
*
- * <!-- Nested portable objects can also be indexed. -->
+ * <!-- Nested binary objects can also be indexed. -->
* <entry key="address.zip" value="java.lang.Integer"/>
* </map>
* </property>
@@ -302,20 +302,20 @@ public interface IgniteBinary {
public <T> T toBinary(@Nullable Object obj) throws BinaryObjectException;
/**
- * Creates new portable builder.
+ * Creates new binary builder.
*
* @param typeName Type name.
- * @return Newly portable builder.
+ * @return Newly binary builder.
*/
public BinaryObjectBuilder builder(String typeName) throws BinaryObjectException;
/**
- * Creates portable builder initialized by existing portable object.
+ * Creates binary builder initialized by existing binary object.
*
- * @param portableObj Portable object to initialize builder.
- * @return Portable builder.
+ * @param binaryObj Binary object to initialize builder.
+ * @return Binary builder.
*/
- public BinaryObjectBuilder builder(BinaryObject portableObj) throws BinaryObjectException;
+ public BinaryObjectBuilder builder(BinaryObject binaryObj) throws BinaryObjectException;
/**
* Gets metadata for provided class.
http://git-wip-us.apache.org/repos/asf/ignite/blob/10b83fb8/modules/core/src/main/java/org/apache/ignite/IgniteCache.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/IgniteCache.java b/modules/core/src/main/java/org/apache/ignite/IgniteCache.java
index 3376abc..f98d50a 100644
--- a/modules/core/src/main/java/org/apache/ignite/IgniteCache.java
+++ b/modules/core/src/main/java/org/apache/ignite/IgniteCache.java
@@ -138,7 +138,7 @@ public interface IgniteCache<K, V> extends javax.cache.Cache<K, V>, IgniteAsyncS
* so keys and values will be returned from cache API methods without changes. Therefore,
* signature of the cache can contain only following types:
* <ul>
- * <li><code>org.apache.ignite.binary.PortableObject</code> for portable classes</li>
+ * <li><code>org.apache.ignite.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>
@@ -148,7 +148,7 @@ public interface IgniteCache<K, V> extends javax.cache.Cache<K, V>, IgniteAsyncS
* <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>
@@ -158,7 +158,7 @@ public interface IgniteCache<K, V> extends javax.cache.Cache<K, V>, IgniteAsyncS
* <pre>
* IgniteCache<Integer, BinaryObject> prj = cache.withKeepBinary();
*
- * // Value is not deserialized and returned in portable format.
+ * // Value is not deserialized and returned in binary format.
* BinaryObject po = prj.get(1);
* </pre>
* <p>
@@ -166,7 +166,7 @@ public interface IgniteCache<K, V> extends javax.cache.Cache<K, V>, IgniteAsyncS
* if default marshaller is used.
* If not, this method is no-op and will return current cache.
*
- * @return New cache instance for portable objects.
+ * @return New cache instance for binary objects.
*/
public <K1, V1> IgniteCache<K1, V1> withKeepBinary();
http://git-wip-us.apache.org/repos/asf/ignite/blob/10b83fb8/modules/core/src/main/java/org/apache/ignite/binary/BinaryReader.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/binary/BinaryReader.java b/modules/core/src/main/java/org/apache/ignite/binary/BinaryReader.java
index be7a156..93a9469 100644
--- a/modules/core/src/main/java/org/apache/ignite/binary/BinaryReader.java
+++ b/modules/core/src/main/java/org/apache/ignite/binary/BinaryReader.java
@@ -25,7 +25,7 @@ import java.util.Map;
import java.util.UUID;
/**
- * Reader for portable objects used in {@link Binarylizable} implementations.
+ * Reader for binary objects used in {@link Binarylizable} implementations.
* Useful for the cases when user wants a fine-grained control over serialization.
* <p>
* Note that Ignite never writes full strings for field or type names. Instead,
@@ -286,4 +286,4 @@ public interface BinaryReader {
* @return Raw reader.
*/
public BinaryRawReader rawReader();
-}
\ 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/cache/affinity/AffinityNodeHashResolver.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/cache/affinity/AffinityNodeHashResolver.java b/modules/core/src/main/java/org/apache/ignite/cache/affinity/AffinityNodeHashResolver.java
index c879da6..fb5b039 100644
--- a/modules/core/src/main/java/org/apache/ignite/cache/affinity/AffinityNodeHashResolver.java
+++ b/modules/core/src/main/java/org/apache/ignite/cache/affinity/AffinityNodeHashResolver.java
@@ -29,8 +29,8 @@ import org.apache.ignite.configuration.IgniteConfiguration;
* will help to map keys to the same nodes whenever possible.
* <p>
* Note that on case clients exist they will query this object from the server and use it for affinity calculation.
- * Therefore you must ensure that server and clients can marshal and unmarshal this object in portable format,
- * i.e. all parties have object class(es) configured as portable.
+ * Therefore you must ensure that server and clients can marshal and unmarshal this object in binary format,
+ * i.e. all parties have object class(es) configured as binary.
*
* @deprecated Use {@link IgniteConfiguration#setConsistentId(Serializable)} instead.
*/
@@ -44,4 +44,4 @@ public interface AffinityNodeHashResolver extends Serializable {
*/
@Deprecated
public Object resolve(ClusterNode node);
-}
\ 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/configuration/BinaryConfiguration.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/configuration/BinaryConfiguration.java b/modules/core/src/main/java/org/apache/ignite/configuration/BinaryConfiguration.java
index 6d8f918..1151245 100644
--- a/modules/core/src/main/java/org/apache/ignite/configuration/BinaryConfiguration.java
+++ b/modules/core/src/main/java/org/apache/ignite/configuration/BinaryConfiguration.java
@@ -44,7 +44,7 @@ public class BinaryConfiguration {
private boolean compactFooter = DFLT_COMPACT_FOOTER;
/**
- * Sets class names of portable objects explicitly.
+ * Sets class names of binary objects explicitly.
*
* @param clsNames Class names.
*/
@@ -112,7 +112,7 @@ public class BinaryConfiguration {
/**
* Get whether to write footers in compact form. When enabled, Ignite will not write fields metadata
- * when serializing objects, because internally {@code PortableMarshaller} already distribute metadata inside
+ * when serializing objects, because internally {@code BinaryMarshaller} already distribute metadata inside
* cluster. This increases serialization performance.
* <p>
* <b>WARNING!</b> This mode should be disabled when already serialized data can be taken from some external
http://git-wip-us.apache.org/repos/asf/ignite/blob/10b83fb8/modules/core/src/main/java/org/apache/ignite/internal/IgniteNodeAttributes.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/IgniteNodeAttributes.java b/modules/core/src/main/java/org/apache/ignite/internal/IgniteNodeAttributes.java
index 946b686..ba04403 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/IgniteNodeAttributes.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/IgniteNodeAttributes.java
@@ -141,8 +141,8 @@ public final class IgniteNodeAttributes {
/** Node consistent id. */
public static final String ATTR_NODE_CONSISTENT_ID = ATTR_PREFIX + ".consistent.id";
- /** Portable protocol version. */
- public static final String ATTR_PORTABLE_PROTO_VER = ATTR_PREFIX + ".portable.proto.ver";
+ /** Binary protocol version. */
+ public static final String ATTR_BINARY_PROTO_VER = ATTR_PREFIX + ".binary.proto.ver";
/**
* Enforces singleton.
http://git-wip-us.apache.org/repos/asf/ignite/blob/10b83fb8/modules/core/src/main/java/org/apache/ignite/internal/binary/BinaryClassDescriptor.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/binary/BinaryClassDescriptor.java b/modules/core/src/main/java/org/apache/ignite/internal/binary/BinaryClassDescriptor.java
index 0c3275e..4a93bf6 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/binary/BinaryClassDescriptor.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/binary/BinaryClassDescriptor.java
@@ -53,7 +53,7 @@ import static java.lang.reflect.Modifier.isStatic;
import static java.lang.reflect.Modifier.isTransient;
/**
- * Portable class descriptor.
+ * Binary class descriptor.
*/
public class BinaryClassDescriptor {
/** */
@@ -167,9 +167,9 @@ public class BinaryClassDescriptor {
mode = BinaryWriteMode.EXCLUSION;
else {
if (cls == BinaryEnumObjectImpl.class)
- mode = BinaryWriteMode.PORTABLE_ENUM;
+ mode = BinaryWriteMode.BINARY_ENUM;
else
- mode = serializer != null ? BinaryWriteMode.PORTABLE : BinaryUtils.mode(cls);
+ mode = serializer != null ? BinaryWriteMode.BINARY : BinaryUtils.mode(cls);
}
switch (mode) {
@@ -210,9 +210,9 @@ public class BinaryClassDescriptor {
case OBJECT_ARR:
case COL:
case MAP:
- case PORTABLE_OBJ:
+ case BINARY_OBJ:
case ENUM:
- case PORTABLE_ENUM:
+ case BINARY_ENUM:
case ENUM_ARR:
case CLASS:
case EXCLUSION:
@@ -223,7 +223,7 @@ public class BinaryClassDescriptor {
break;
- case PORTABLE:
+ case BINARY:
case EXTERNALIZABLE:
ctor = constructor(cls);
fields = null;
@@ -284,7 +284,7 @@ public class BinaryClassDescriptor {
throw new BinaryObjectException("Invalid mode: " + mode);
}
- if (mode == BinaryWriteMode.PORTABLE || mode == BinaryWriteMode.EXTERNALIZABLE ||
+ if (mode == BinaryWriteMode.BINARY || mode == BinaryWriteMode.EXTERNALIZABLE ||
mode == BinaryWriteMode.OBJECT) {
readResolveMtd = U.findNonPublicMethod(cls, "readResolve");
writeReplaceMtd = U.findNonPublicMethod(cls, "writeReplace");
@@ -362,14 +362,14 @@ public class BinaryClassDescriptor {
}
/**
- * @return portableWriteReplace() method
+ * @return binaryWriteReplace() method
*/
@Nullable Method getWriteReplaceMethod() {
return writeReplaceMtd;
}
/**
- * @return portableReadResolve() method
+ * @return binaryReadResolve() method
*/
@SuppressWarnings("UnusedDeclaration")
@Nullable Method getReadResolveMethod() {
@@ -546,8 +546,8 @@ public class BinaryClassDescriptor {
break;
- case PORTABLE_ENUM:
- writer.doWritePortableEnum((BinaryEnumObjectImpl)obj);
+ case BINARY_ENUM:
+ writer.doWriteBinaryEnum((BinaryEnumObjectImpl)obj);
break;
@@ -561,12 +561,12 @@ public class BinaryClassDescriptor {
break;
- case PORTABLE_OBJ:
- writer.doWritePortableObject((BinaryObjectImpl)obj);
+ case BINARY_OBJ:
+ writer.doWriteBinaryObject((BinaryObjectImpl)obj);
break;
- case PORTABLE:
+ case BINARY:
if (preWrite(writer, obj)) {
try {
if (serializer != null)
@@ -660,7 +660,7 @@ public class BinaryClassDescriptor {
Object res;
switch (mode) {
- case PORTABLE:
+ case BINARY:
res = newInstance();
reader.setHandle(res);
http://git-wip-us.apache.org/repos/asf/ignite/blob/10b83fb8/modules/core/src/main/java/org/apache/ignite/internal/binary/BinaryContext.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/binary/BinaryContext.java b/modules/core/src/main/java/org/apache/ignite/internal/binary/BinaryContext.java
index 6293cfe..7f9bacf 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/binary/BinaryContext.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/binary/BinaryContext.java
@@ -75,7 +75,7 @@ import java.util.jar.JarEntry;
import java.util.jar.JarFile;
/**
- * Portable context.
+ * Binary context.
*/
public class BinaryContext implements Externalizable {
/** */
@@ -224,7 +224,7 @@ public class BinaryContext implements Externalizable {
}
/**
- * @param marsh Portable marshaller.
+ * @param marsh Binary marshaller.
* @param cfg Configuration.
* @throws BinaryObjectException In case of error.
*/
@@ -279,7 +279,7 @@ public class BinaryContext implements Externalizable {
String clsName = typeCfg.getTypeName();
if (clsName == null)
- throw new BinaryObjectException("Class name is required for portable type configuration.");
+ throw new BinaryObjectException("Class name is required for binary type configuration.");
BinaryIdMapper idMapper = globalIdMapper;
@@ -675,7 +675,7 @@ public class BinaryContext implements Externalizable {
}
/**
- * @return Portable context.
+ * @return Binary context.
* @throws ObjectStreamException In case of error.
*/
protected Object readResolve() throws ObjectStreamException {
@@ -685,7 +685,7 @@ public class BinaryContext implements Externalizable {
if (g == null)
throw new IllegalStateException("Failed to find grid for name: " + gridName);
- return ((CacheObjectBinaryProcessorImpl)g.context().cacheObjects()).portableContext();
+ return ((CacheObjectBinaryProcessorImpl)g.context().cacheObjects()).binaryContext();
}
catch (IllegalStateException e) {
throw U.withCause(new InvalidObjectException(e.getMessage()), e);
@@ -695,7 +695,7 @@ public class BinaryContext implements Externalizable {
/**
* @param cls Class.
* @param id Type ID.
- * @return GridPortableClassDescriptor.
+ * @return GridBinaryClassDescriptor.
*/
public BinaryClassDescriptor registerPredefinedType(Class<?> cls, int id) {
String typeName = typeName(cls.getName());
@@ -1047,7 +1047,7 @@ public class BinaryContext implements Externalizable {
}
/**
- * Override portable class descriptor.
+ * Override binary class descriptor.
*
* @param other Other descriptor.
* @throws BinaryObjectException If failed.
http://git-wip-us.apache.org/repos/asf/ignite/blob/10b83fb8/modules/core/src/main/java/org/apache/ignite/internal/binary/BinaryEnumObjectImpl.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/binary/BinaryEnumObjectImpl.java b/modules/core/src/main/java/org/apache/ignite/internal/binary/BinaryEnumObjectImpl.java
index 3321170..b2ee16f 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/binary/BinaryEnumObjectImpl.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/binary/BinaryEnumObjectImpl.java
@@ -219,7 +219,7 @@ public class BinaryEnumObjectImpl implements BinaryObjectEx, Externalizable, Cac
/** {@inheritDoc} */
@Override public void finishUnmarshal(CacheObjectContext ctx, ClassLoader ldr) throws IgniteCheckedException {
- this.ctx = ((CacheObjectBinaryProcessorImpl)ctx.processor()).portableContext();
+ this.ctx = ((CacheObjectBinaryProcessorImpl)ctx.processor()).binaryContext();
}
/** {@inheritDoc} */
http://git-wip-us.apache.org/repos/asf/ignite/blob/10b83fb8/modules/core/src/main/java/org/apache/ignite/internal/binary/BinaryFieldAccessor.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/binary/BinaryFieldAccessor.java b/modules/core/src/main/java/org/apache/ignite/internal/binary/BinaryFieldAccessor.java
index 8cf1a11..8050edd 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/binary/BinaryFieldAccessor.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/binary/BinaryFieldAccessor.java
@@ -103,8 +103,8 @@ public abstract class BinaryFieldAccessor {
case TIMESTAMP_ARR:
case ENUM_ARR:
case OBJECT_ARR:
- case PORTABLE_OBJ:
- case PORTABLE:
+ case BINARY_OBJ:
+ case BINARY:
case EXTERNALIZABLE:
return new DefaultFinalClassAccessor(field, id, mode, false);
@@ -608,8 +608,8 @@ public abstract class BinaryFieldAccessor {
break;
- case PORTABLE_OBJ:
- writer.writePortableObjectField((BinaryObjectImpl)val);
+ case BINARY_OBJ:
+ writer.writeBinaryObjectField((BinaryObjectImpl)val);
break;
@@ -623,7 +623,7 @@ public abstract class BinaryFieldAccessor {
break;
- case PORTABLE:
+ case BINARY:
case EXTERNALIZABLE:
case OBJECT:
writer.writeObjectField(val);
@@ -809,8 +809,8 @@ public abstract class BinaryFieldAccessor {
break;
- case PORTABLE_OBJ:
- val = reader.readPortableObject(id);
+ case BINARY_OBJ:
+ val = reader.readBinaryObject(id);
break;
@@ -824,7 +824,7 @@ public abstract class BinaryFieldAccessor {
break;
- case PORTABLE:
+ case BINARY:
case EXTERNALIZABLE:
case OBJECT:
val = reader.readObject(id);
http://git-wip-us.apache.org/repos/asf/ignite/blob/10b83fb8/modules/core/src/main/java/org/apache/ignite/internal/binary/BinaryFieldImpl.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/binary/BinaryFieldImpl.java b/modules/core/src/main/java/org/apache/ignite/internal/binary/BinaryFieldImpl.java
index 7f51631..78ed17a 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/binary/BinaryFieldImpl.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/binary/BinaryFieldImpl.java
@@ -24,7 +24,7 @@ import org.apache.ignite.binary.BinaryObject;
import org.apache.ignite.binary.BinaryField;
/**
- * Implementation of portable field descriptor.
+ * Implementation of binary field descriptor.
*/
public class BinaryFieldImpl implements BinaryField {
/** Type ID. */
http://git-wip-us.apache.org/repos/asf/ignite/blob/10b83fb8/modules/core/src/main/java/org/apache/ignite/internal/binary/BinaryMarshaller.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/binary/BinaryMarshaller.java b/modules/core/src/main/java/org/apache/ignite/internal/binary/BinaryMarshaller.java
index 03bf9f9..5480967 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/binary/BinaryMarshaller.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/binary/BinaryMarshaller.java
@@ -81,10 +81,10 @@ public class BinaryMarshaller extends AbstractMarshaller {
/**
* Sets {@link BinaryContext}.
* <p/>
- * @param ctx Portable context.
+ * @param ctx Binary context.
*/
@SuppressWarnings("UnusedDeclaration")
- private void setPortableContext(BinaryContext ctx, IgniteConfiguration cfg) {
+ private void setBinaryContext(BinaryContext ctx, IgniteConfiguration cfg) {
ctx.configure(this, cfg);
impl = new GridBinaryMarshaller(ctx);
@@ -116,7 +116,7 @@ public class BinaryMarshaller extends AbstractMarshaller {
@Override public <T> T unmarshal(InputStream in, @Nullable ClassLoader clsLdr) throws IgniteCheckedException {
ByteArrayOutputStream buf = new ByteArrayOutputStream();
- // we have to fully read the InputStream because GridPortableMarshaller requires support of a method that
+ // we have to fully read the InputStream because GridBinaryMarshaller requires support of a method that
// returns number of bytes remaining.
try {
byte[] arr = new byte[4096];
http://git-wip-us.apache.org/repos/asf/ignite/blob/10b83fb8/modules/core/src/main/java/org/apache/ignite/internal/binary/BinaryMetadata.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/binary/BinaryMetadata.java b/modules/core/src/main/java/org/apache/ignite/internal/binary/BinaryMetadata.java
index a8ff140..7de73b8 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/binary/BinaryMetadata.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/binary/BinaryMetadata.java
@@ -30,7 +30,7 @@ import org.apache.ignite.internal.util.typedef.internal.U;
import org.jetbrains.annotations.Nullable;
/**
- * Portable metadata which is passed over a wire.
+ * Binary metadata which is passed over a wire.
*/
public class BinaryMetadata implements Externalizable {
/** */
@@ -146,7 +146,7 @@ public class BinaryMetadata implements Externalizable {
/**
* Wrap metadata into binary type.
*
- * @param ctx Portable context.
+ * @param ctx Binary context.
* @return Binary type.
*/
public BinaryTypeImpl wrap(BinaryContext ctx) {
http://git-wip-us.apache.org/repos/asf/ignite/blob/10b83fb8/modules/core/src/main/java/org/apache/ignite/internal/binary/BinaryMetadataHandler.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/binary/BinaryMetadataHandler.java b/modules/core/src/main/java/org/apache/ignite/internal/binary/BinaryMetadataHandler.java
index fea2893..29ff7b3 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/binary/BinaryMetadataHandler.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/binary/BinaryMetadataHandler.java
@@ -21,7 +21,7 @@ import org.apache.ignite.binary.BinaryObjectException;
import org.apache.ignite.binary.BinaryType;
/**
- * Portable meta data handler.
+ * Binary meta data handler.
*/
public interface BinaryMetadataHandler {
/**
http://git-wip-us.apache.org/repos/asf/ignite/blob/10b83fb8/modules/core/src/main/java/org/apache/ignite/internal/binary/BinaryObjectExImpl.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/binary/BinaryObjectExImpl.java b/modules/core/src/main/java/org/apache/ignite/internal/binary/BinaryObjectExImpl.java
index 252c495..404300d 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/binary/BinaryObjectExImpl.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/binary/BinaryObjectExImpl.java
@@ -29,7 +29,7 @@ import org.apache.ignite.binary.BinaryObject;
import org.jetbrains.annotations.Nullable;
/**
- * Internal portable object interface.
+ * Internal binary object interface.
*/
public abstract class BinaryObjectExImpl implements BinaryObjectEx {
/**
@@ -245,7 +245,7 @@ public abstract class BinaryObjectExImpl implements BinaryObjectEx {
return toString(ctx, new IdentityHashMap<BinaryObject, Integer>());
}
catch (BinaryObjectException e) {
- throw new IgniteException("Failed to create string representation of portable object.", e);
+ throw new IgniteException("Failed to create string representation of binary object.", e);
}
}
}
http://git-wip-us.apache.org/repos/asf/ignite/blob/10b83fb8/modules/core/src/main/java/org/apache/ignite/internal/binary/BinaryObjectImpl.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/binary/BinaryObjectImpl.java b/modules/core/src/main/java/org/apache/ignite/internal/binary/BinaryObjectImpl.java
index 9fd5901..2342766 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/binary/BinaryObjectImpl.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/binary/BinaryObjectImpl.java
@@ -46,7 +46,7 @@ import org.jetbrains.annotations.Nullable;
import static java.nio.charset.StandardCharsets.UTF_8;
/**
- * Portable object implementation.
+ * Binary object implementation.
*/
@IgniteCodeGeneratingFail // Fields arr and start should not be generated by MessageCodeGenerator.
public final class BinaryObjectImpl extends BinaryObjectExImpl implements Externalizable, KeyCacheObject {
@@ -142,7 +142,7 @@ public final class BinaryObjectImpl extends BinaryObjectExImpl implements Extern
/** {@inheritDoc} */
@Override public void finishUnmarshal(CacheObjectContext ctx, ClassLoader ldr) throws IgniteCheckedException {
- this.ctx = ((CacheObjectBinaryProcessorImpl)ctx.processor()).portableContext();
+ this.ctx = ((CacheObjectBinaryProcessorImpl)ctx.processor()).binaryContext();
}
/** {@inheritDoc} */
@@ -156,7 +156,7 @@ public final class BinaryObjectImpl extends BinaryObjectExImpl implements Extern
}
/**
- * @return Detached portable object.
+ * @return Detached binary object.
*/
public BinaryObject detach() {
if (!detachAllowed || detached())
@@ -227,7 +227,7 @@ public final class BinaryObjectImpl extends BinaryObjectExImpl implements Extern
/** {@inheritDoc} */
@Nullable @Override public BinaryType type() throws BinaryObjectException {
if (ctx == null)
- throw new BinaryObjectException("PortableContext is not set for the object.");
+ throw new BinaryObjectException("BinaryContext is not set for the object.");
return ctx.metadata(typeId());
}
http://git-wip-us.apache.org/repos/asf/ignite/blob/10b83fb8/modules/core/src/main/java/org/apache/ignite/internal/binary/BinaryObjectOffheapImpl.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/binary/BinaryObjectOffheapImpl.java b/modules/core/src/main/java/org/apache/ignite/internal/binary/BinaryObjectOffheapImpl.java
index 1206db7..0246a36 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/binary/BinaryObjectOffheapImpl.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/binary/BinaryObjectOffheapImpl.java
@@ -45,7 +45,7 @@ import java.util.UUID;
import static java.nio.charset.StandardCharsets.UTF_8;
/**
- * Portable object implementation over offheap memory
+ * Binary object implementation over offheap memory
*/
public class BinaryObjectOffheapImpl extends BinaryObjectExImpl implements Externalizable, CacheObject {
/** */
@@ -141,7 +141,7 @@ public class BinaryObjectOffheapImpl extends BinaryObjectExImpl implements Exter
/** {@inheritDoc} */
@Nullable @Override public BinaryType type() throws BinaryObjectException {
if (ctx == null)
- throw new BinaryObjectException("PortableContext is not set for the object.");
+ throw new BinaryObjectException("BinaryContext is not set for the object.");
return ctx.metadata(typeId());
}
http://git-wip-us.apache.org/repos/asf/ignite/blob/10b83fb8/modules/core/src/main/java/org/apache/ignite/internal/binary/BinaryReaderExImpl.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/binary/BinaryReaderExImpl.java b/modules/core/src/main/java/org/apache/ignite/internal/binary/BinaryReaderExImpl.java
index b673e27..8f9cc92 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/binary/BinaryReaderExImpl.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/binary/BinaryReaderExImpl.java
@@ -69,7 +69,7 @@ import static org.apache.ignite.internal.binary.GridBinaryMarshaller.NULL;
import static org.apache.ignite.internal.binary.GridBinaryMarshaller.OBJ;
import static org.apache.ignite.internal.binary.GridBinaryMarshaller.OBJ_ARR;
import static org.apache.ignite.internal.binary.GridBinaryMarshaller.OPTM_MARSH;
-import static org.apache.ignite.internal.binary.GridBinaryMarshaller.PORTABLE_OBJ;
+import static org.apache.ignite.internal.binary.GridBinaryMarshaller.BINARY_OBJ;
import static org.apache.ignite.internal.binary.GridBinaryMarshaller.SHORT;
import static org.apache.ignite.internal.binary.GridBinaryMarshaller.SHORT_ARR;
import static org.apache.ignite.internal.binary.GridBinaryMarshaller.STRING;
@@ -81,11 +81,11 @@ import static org.apache.ignite.internal.binary.GridBinaryMarshaller.UUID;
import static org.apache.ignite.internal.binary.GridBinaryMarshaller.UUID_ARR;
/**
- * Portable reader implementation.
+ * Binary reader implementation.
*/
@SuppressWarnings("unchecked")
public class BinaryReaderExImpl implements BinaryReader, BinaryRawReaderEx, BinaryReaderHandlesHolder, ObjectInput {
- /** Portable context. */
+ /** Binary context. */
private final BinaryContext ctx;
/** Input stream. */
@@ -185,7 +185,7 @@ public class BinaryReaderExImpl implements BinaryReader, BinaryRawReaderEx, Bina
start = in.position();
- // Perform full header parsing in case of portable object.
+ // Perform full header parsing in case of binary object.
if (!skipHdrCheck && (in.readByte() == GridBinaryMarshaller.OBJ)) {
// Ensure protocol is fine.
BinaryUtils.checkProtocolVersion(in.readByte());
@@ -312,12 +312,12 @@ public class BinaryReaderExImpl implements BinaryReader, BinaryRawReaderEx, Bina
/**
* @param fieldId Field ID.
- * @return Portable object.
+ * @return Binary object.
* @throws BinaryObjectException In case of error.
*/
- @Nullable BinaryObject readPortableObject(int fieldId) throws BinaryObjectException {
+ @Nullable BinaryObject readBinaryObject(int fieldId) throws BinaryObjectException {
if (findFieldById(fieldId)) {
- if (checkFlag(PORTABLE_OBJ) == Flag.NULL)
+ if (checkFlag(BINARY_OBJ) == Flag.NULL)
return null;
return new BinaryObjectImpl(ctx, BinaryUtils.doReadByteArray(in), in.readInt());
@@ -1598,12 +1598,12 @@ public class BinaryReaderExImpl implements BinaryReader, BinaryRawReaderEx, Bina
break;
- case PORTABLE_OBJ:
- obj = BinaryUtils.doReadPortableObject(in, ctx);
+ case BINARY_OBJ:
+ obj = BinaryUtils.doReadBinaryObject(in, ctx);
((BinaryObjectImpl)obj).context(ctx);
- if (!GridBinaryMarshaller.KEEP_PORTABLES.get())
+ if (!GridBinaryMarshaller.KEEP_BINARIES.get())
obj = ((BinaryObject)obj).deserialize();
break;
http://git-wip-us.apache.org/repos/asf/ignite/blob/10b83fb8/modules/core/src/main/java/org/apache/ignite/internal/binary/BinarySchema.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/binary/BinarySchema.java b/modules/core/src/main/java/org/apache/ignite/internal/binary/BinarySchema.java
index 99e642c..156ac0f 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/binary/BinarySchema.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/binary/BinarySchema.java
@@ -26,7 +26,7 @@ import java.util.Iterator;
import java.util.List;
/**
- * Schema describing portable object content. We rely on the following assumptions:
+ * Schema describing binary object content. We rely on the following assumptions:
* - When amount of fields in the object is low, it is better to inline these values into int fields thus allowing
* for quick comparisons performed within already fetched L1 cache line.
* - When there are more fields, we store them inside a hash map.
http://git-wip-us.apache.org/repos/asf/ignite/blob/10b83fb8/modules/core/src/main/java/org/apache/ignite/internal/binary/BinarySchemaRegistry.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/binary/BinarySchemaRegistry.java b/modules/core/src/main/java/org/apache/ignite/internal/binary/BinarySchemaRegistry.java
index 6920a34..91f29b2 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/binary/BinarySchemaRegistry.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/binary/BinarySchemaRegistry.java
@@ -22,7 +22,7 @@ import org.jetbrains.annotations.Nullable;
import java.util.HashMap;
/**
- * Portable schema registry. Contains all well-known object schemas.
+ * Binary schema registry. Contains all well-known object schemas.
* <p>
* We rely on the fact that usually object has only few different schemas. For this reason we inline several
* of them with optional fallback to normal hash map lookup.
http://git-wip-us.apache.org/repos/asf/ignite/blob/10b83fb8/modules/core/src/main/java/org/apache/ignite/internal/binary/BinaryTypeImpl.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/binary/BinaryTypeImpl.java b/modules/core/src/main/java/org/apache/ignite/internal/binary/BinaryTypeImpl.java
index 23aacb2..d4fd625 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/binary/BinaryTypeImpl.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/binary/BinaryTypeImpl.java
@@ -25,7 +25,7 @@ import java.util.Collection;
* Binary type implementation.
*/
public class BinaryTypeImpl implements BinaryType {
- /** Portable context. */
+ /** Binary context. */
private final BinaryContext ctx;
/** Type metadata. */
@@ -34,7 +34,7 @@ public class BinaryTypeImpl implements BinaryType {
/**
* Constructor.
*
- * @param ctx Portable context.
+ * @param ctx Binary context.
* @param meta Type metadata.
*/
public BinaryTypeImpl(BinaryContext ctx, BinaryMetadata meta) {
http://git-wip-us.apache.org/repos/asf/ignite/blob/10b83fb8/modules/core/src/main/java/org/apache/ignite/internal/binary/BinaryUtils.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/binary/BinaryUtils.java b/modules/core/src/main/java/org/apache/ignite/internal/binary/BinaryUtils.java
index d285df5..8b5ec68 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/binary/BinaryUtils.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/binary/BinaryUtils.java
@@ -58,7 +58,7 @@ import java.util.concurrent.ConcurrentSkipListSet;
import static java.nio.charset.StandardCharsets.UTF_8;
/**
- * Portable utils.
+ * Binary utils.
*/
public class BinaryUtils {
/** */
@@ -70,8 +70,8 @@ public class BinaryUtils {
/** {@code true} if serialized value of this type cannot contain references to objects. */
private static final boolean[] PLAIN_TYPE_FLAG = new boolean[102];
- /** Portable classes. */
- private static final Collection<Class<?>> PORTABLE_CLS = new HashSet<>();
+ /** Binary classes. */
+ private static final Collection<Class<?>> BINARY_CLS = new HashSet<>();
/** Flag: user type. */
public static final short FLAG_USR_TYP = 0x0001;
@@ -166,32 +166,32 @@ public class BinaryUtils {
PLAIN_TYPE_FLAG[b] = true;
}
- PORTABLE_CLS.add(Byte.class);
- PORTABLE_CLS.add(Short.class);
- PORTABLE_CLS.add(Integer.class);
- PORTABLE_CLS.add(Long.class);
- PORTABLE_CLS.add(Float.class);
- PORTABLE_CLS.add(Double.class);
- PORTABLE_CLS.add(Character.class);
- PORTABLE_CLS.add(Boolean.class);
- PORTABLE_CLS.add(String.class);
- PORTABLE_CLS.add(UUID.class);
- PORTABLE_CLS.add(Date.class);
- PORTABLE_CLS.add(Timestamp.class);
- PORTABLE_CLS.add(BigDecimal.class);
- PORTABLE_CLS.add(byte[].class);
- PORTABLE_CLS.add(short[].class);
- PORTABLE_CLS.add(int[].class);
- PORTABLE_CLS.add(long[].class);
- PORTABLE_CLS.add(float[].class);
- PORTABLE_CLS.add(double[].class);
- PORTABLE_CLS.add(char[].class);
- PORTABLE_CLS.add(boolean[].class);
- PORTABLE_CLS.add(String[].class);
- PORTABLE_CLS.add(UUID[].class);
- PORTABLE_CLS.add(Date[].class);
- PORTABLE_CLS.add(Timestamp[].class);
- PORTABLE_CLS.add(BigDecimal[].class);
+ BINARY_CLS.add(Byte.class);
+ BINARY_CLS.add(Short.class);
+ BINARY_CLS.add(Integer.class);
+ BINARY_CLS.add(Long.class);
+ BINARY_CLS.add(Float.class);
+ BINARY_CLS.add(Double.class);
+ BINARY_CLS.add(Character.class);
+ BINARY_CLS.add(Boolean.class);
+ BINARY_CLS.add(String.class);
+ BINARY_CLS.add(UUID.class);
+ BINARY_CLS.add(Date.class);
+ BINARY_CLS.add(Timestamp.class);
+ BINARY_CLS.add(BigDecimal.class);
+ BINARY_CLS.add(byte[].class);
+ BINARY_CLS.add(short[].class);
+ BINARY_CLS.add(int[].class);
+ BINARY_CLS.add(long[].class);
+ BINARY_CLS.add(float[].class);
+ BINARY_CLS.add(double[].class);
+ BINARY_CLS.add(char[].class);
+ BINARY_CLS.add(boolean[].class);
+ BINARY_CLS.add(String[].class);
+ BINARY_CLS.add(UUID[].class);
+ BINARY_CLS.add(Date[].class);
+ BINARY_CLS.add(Timestamp[].class);
+ BINARY_CLS.add(BigDecimal[].class);
FIELD_TYPE_NAMES = new String[104];
@@ -210,7 +210,7 @@ public class BinaryUtils {
FIELD_TYPE_NAMES[GridBinaryMarshaller.TIMESTAMP] = "Timestamp";
FIELD_TYPE_NAMES[GridBinaryMarshaller.ENUM] = "Enum";
FIELD_TYPE_NAMES[GridBinaryMarshaller.OBJ] = "Object";
- FIELD_TYPE_NAMES[GridBinaryMarshaller.PORTABLE_OBJ] = "Object";
+ FIELD_TYPE_NAMES[GridBinaryMarshaller.BINARY_OBJ] = "Object";
FIELD_TYPE_NAMES[GridBinaryMarshaller.COL] = "Collection";
FIELD_TYPE_NAMES[GridBinaryMarshaller.MAP] = "Map";
FIELD_TYPE_NAMES[GridBinaryMarshaller.CLASS] = "Class";
@@ -547,7 +547,7 @@ public class BinaryUtils {
/**
* @param cls Class.
- * @return Portable field type.
+ * @return Binary field type.
*/
public static byte typeByClass(Class<?> cls) {
Byte type = PLAIN_CLASS_TO_FLAG.get(cls);
@@ -571,16 +571,16 @@ public class BinaryUtils {
}
/**
- * Tells whether provided type is portable.
+ * Tells whether provided type is binary.
*
* @param cls Class to check.
- * @return Whether type is portable.
+ * @return Whether type is binary.
*/
- public static boolean isPortableType(Class<?> cls) {
+ public static boolean isBinaryType(Class<?> cls) {
assert cls != null;
return BinaryObject.class.isAssignableFrom(cls) ||
- PORTABLE_CLS.contains(cls) ||
+ BINARY_CLS.contains(cls) ||
cls.isEnum() ||
(cls.isArray() && cls.getComponentType().isEnum());
}
@@ -632,7 +632,7 @@ public class BinaryUtils {
}
/**
- * Get portable object length.
+ * Get binary object length.
*
* @param in Input stream.
* @param start Start position.
@@ -801,7 +801,7 @@ public class BinaryUtils {
// Check type name.
if (!F.eq(oldMeta.typeName(), newMeta.typeName())) {
throw new BinaryObjectException(
- "Two portable types have duplicate type ID [" + "typeId=" + oldMeta.typeId() +
+ "Two binary types have duplicate type ID [" + "typeId=" + oldMeta.typeId() +
", typeName1=" + oldMeta.typeName() + ", typeName2=" + newMeta.typeName() + ']'
);
}
@@ -944,9 +944,9 @@ public class BinaryUtils {
else if (cls.isArray())
return cls.getComponentType().isEnum() ? BinaryWriteMode.ENUM_ARR : BinaryWriteMode.OBJECT_ARR;
else if (cls == BinaryObjectImpl.class)
- return BinaryWriteMode.PORTABLE_OBJ;
+ return BinaryWriteMode.BINARY_OBJ;
else if (Binarylizable.class.isAssignableFrom(cls))
- return BinaryWriteMode.PORTABLE;
+ return BinaryWriteMode.BINARY;
else if (Externalizable.class.isAssignableFrom(cls))
return BinaryWriteMode.EXTERNALIZABLE;
else if (isSpecialCollection(cls))
@@ -1249,7 +1249,7 @@ public class BinaryUtils {
/**
* @return Value.
*/
- public static BinaryObject doReadPortableObject(BinaryInputStream in, BinaryContext ctx) {
+ public static BinaryObject doReadBinaryObject(BinaryInputStream in, BinaryContext ctx) {
if (in.offheapPointer() > 0) {
int len = in.readInt();
@@ -1343,7 +1343,7 @@ public class BinaryUtils {
/**
* Resolve the class.
*
- * @param ctx Portable context.
+ * @param ctx Binary context.
* @param typeId Type ID.
* @param clsName Class name.
* @param ldr Class loaded.
@@ -1374,26 +1374,26 @@ public class BinaryUtils {
}
/**
- * Read portable enum.
+ * Read binary enum.
*
* @param in Input stream.
- * @param ctx Portable context.
+ * @param ctx Binary context.
* @param type Plain type.
* @return Enum.
*/
- private static BinaryEnumObjectImpl doReadPortableEnum(BinaryInputStream in, BinaryContext ctx,
+ private static BinaryEnumObjectImpl doReadBinaryEnum(BinaryInputStream in, BinaryContext ctx,
EnumType type) {
return new BinaryEnumObjectImpl(ctx, type.typeId, type.clsName, in.readInt());
}
/**
- * Read portable enum array.
+ * Read binary enum array.
*
* @param in Input stream.
- * @param ctx Portable context.
+ * @param ctx Binary context.
* @return Enum array.
*/
- private static Object[] doReadPortableEnumArray(BinaryInputStream in, BinaryContext ctx) {
+ private static Object[] doReadBinaryEnumArray(BinaryInputStream in, BinaryContext ctx) {
int len = in.readInt();
Object[] arr = (Object[]) Array.newInstance(BinaryObject.class, len);
@@ -1404,7 +1404,7 @@ public class BinaryUtils {
if (flag == GridBinaryMarshaller.NULL)
arr[i] = null;
else
- arr[i] = doReadPortableEnum(in, ctx, doReadEnumType(in));
+ arr[i] = doReadBinaryEnum(in, ctx, doReadEnumType(in));
}
return arr;
@@ -1644,16 +1644,16 @@ public class BinaryUtils {
case GridBinaryMarshaller.MAP:
return doReadMap(in, ctx, ldr, handles, false, null);
- case GridBinaryMarshaller.PORTABLE_OBJ:
- return doReadPortableObject(in, ctx);
+ case GridBinaryMarshaller.BINARY_OBJ:
+ return doReadBinaryObject(in, ctx);
case GridBinaryMarshaller.ENUM:
- return doReadPortableEnum(in, ctx, doReadEnumType(in));
+ return doReadBinaryEnum(in, ctx, doReadEnumType(in));
case GridBinaryMarshaller.ENUM_ARR:
doReadEnumType(in); // Simply skip this part as we do not need it.
- return doReadPortableEnumArray(in, ctx);
+ return doReadBinaryEnumArray(in, ctx);
case GridBinaryMarshaller.CLASS:
return doReadClass(in, ctx, ldr);
http://git-wip-us.apache.org/repos/asf/ignite/blob/10b83fb8/modules/core/src/main/java/org/apache/ignite/internal/binary/BinaryWriteMode.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/binary/BinaryWriteMode.java b/modules/core/src/main/java/org/apache/ignite/internal/binary/BinaryWriteMode.java
index 9a37bdb..90127f4 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/binary/BinaryWriteMode.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/binary/BinaryWriteMode.java
@@ -133,13 +133,13 @@ public enum BinaryWriteMode {
MAP(GridBinaryMarshaller.MAP),
/** */
- PORTABLE_OBJ(GridBinaryMarshaller.OBJ),
+ BINARY_OBJ(GridBinaryMarshaller.OBJ),
/** */
ENUM(GridBinaryMarshaller.ENUM),
- /** Portable enum. */
- PORTABLE_ENUM(GridBinaryMarshaller.ENUM),
+ /** Binary enum. */
+ BINARY_ENUM(GridBinaryMarshaller.ENUM),
/** */
ENUM_ARR(GridBinaryMarshaller.ENUM_ARR),
@@ -148,7 +148,7 @@ public enum BinaryWriteMode {
CLASS(GridBinaryMarshaller.CLASS),
/** */
- PORTABLE(GridBinaryMarshaller.PORTABLE_OBJ),
+ BINARY(GridBinaryMarshaller.BINARY_OBJ),
/** */
EXTERNALIZABLE(GridBinaryMarshaller.OBJ),
[21/24] ignite git commit: ignite-1.5 Updated classnames.properties
Posted by ak...@apache.org.
ignite-1.5 Updated classnames.properties
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/de0b1bad
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/de0b1bad
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/de0b1bad
Branch: refs/heads/ignite-843-rc2
Commit: de0b1badbf34538e04e7cf4be5378ef929fb6201
Parents: 4d08673
Author: Alexey Kuznetsov <ak...@apache.org>
Authored: Mon Dec 14 15:33:09 2015 +0700
Committer: Alexey Kuznetsov <ak...@apache.org>
Committed: Mon Dec 14 15:33:09 2015 +0700
----------------------------------------------------------------------
.../resources/META-INF/classnames.properties | 68 +++++++++++++-------
1 file changed, 44 insertions(+), 24 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ignite/blob/de0b1bad/modules/core/src/main/resources/META-INF/classnames.properties
----------------------------------------------------------------------
diff --git a/modules/core/src/main/resources/META-INF/classnames.properties b/modules/core/src/main/resources/META-INF/classnames.properties
index 913320b..d9a5514 100644
--- a/modules/core/src/main/resources/META-INF/classnames.properties
+++ b/modules/core/src/main/resources/META-INF/classnames.properties
@@ -80,8 +80,13 @@ org.apache.ignite.cache.query.SqlQuery
org.apache.ignite.cache.query.TextQuery
org.apache.ignite.cache.store.jdbc.CacheAbstractJdbcStore$EntryMapping$1
org.apache.ignite.cache.store.jdbc.CacheAbstractJdbcStore$EntryMapping$2
+org.apache.ignite.cache.store.jdbc.CacheAbstractJdbcStore$TypeKind
org.apache.ignite.cache.store.jdbc.CacheJdbcBlobStoreFactory
org.apache.ignite.cache.store.jdbc.CacheJdbcPojoStoreFactory
+org.apache.ignite.cache.store.jdbc.JdbcType
+org.apache.ignite.cache.store.jdbc.JdbcTypeDefaultHasher
+org.apache.ignite.cache.store.jdbc.JdbcTypeField
+org.apache.ignite.cache.store.jdbc.JdbcTypeHasher
org.apache.ignite.cache.store.jdbc.dialect.BasicJdbcDialect
org.apache.ignite.cache.store.jdbc.dialect.BasicJdbcDialect$1
org.apache.ignite.cache.store.jdbc.dialect.BasicJdbcDialect$2
@@ -220,6 +225,19 @@ org.apache.ignite.internal.IgniteMessagingImpl
org.apache.ignite.internal.IgniteSchedulerImpl
org.apache.ignite.internal.IgniteServicesImpl
org.apache.ignite.internal.IgnitionEx$IgniteNamedInstance$1
+org.apache.ignite.internal.NodeStoppingException
+org.apache.ignite.internal.binary.BinaryContext
+org.apache.ignite.internal.binary.BinaryEnumObjectImpl
+org.apache.ignite.internal.binary.BinaryMetadata
+org.apache.ignite.internal.binary.BinaryObjectEx
+org.apache.ignite.internal.binary.BinaryObjectExImpl
+org.apache.ignite.internal.binary.BinaryObjectImpl
+org.apache.ignite.internal.binary.BinaryObjectOffheapImpl
+org.apache.ignite.internal.binary.BinaryReaderExImpl$Flag
+org.apache.ignite.internal.binary.BinarySchema
+org.apache.ignite.internal.binary.BinarySchema$Confirmation
+org.apache.ignite.internal.binary.BinaryWriteMode
+org.apache.ignite.internal.binary.builder.BinaryLazyMap$1$1$1
org.apache.ignite.internal.client.GridClientAuthenticationException
org.apache.ignite.internal.client.GridClientCacheFlag
org.apache.ignite.internal.client.GridClientCacheMode
@@ -285,30 +303,21 @@ org.apache.ignite.internal.managers.discovery.CustomMessageWrapper
org.apache.ignite.internal.managers.discovery.DiscoveryCustomMessage
org.apache.ignite.internal.managers.discovery.GridDiscoveryManager$1
org.apache.ignite.internal.managers.discovery.GridDiscoveryManager$2
-org.apache.ignite.internal.managers.discovery.GridDiscoveryManager$5$1
-org.apache.ignite.internal.managers.discovery.GridDiscoveryManager$5$2
-org.apache.ignite.internal.managers.discovery.GridDiscoveryManager$7
+org.apache.ignite.internal.managers.discovery.GridDiscoveryManager$4$1
+org.apache.ignite.internal.managers.discovery.GridDiscoveryManager$4$2
+org.apache.ignite.internal.managers.discovery.GridDiscoveryManager$6
org.apache.ignite.internal.managers.discovery.GridDiscoveryManager$DiscoCache$1
org.apache.ignite.internal.managers.discovery.GridLocalMetrics
org.apache.ignite.internal.managers.eventstorage.GridEventStorageMessage
org.apache.ignite.internal.managers.indexing.GridIndexingManager$1
org.apache.ignite.internal.managers.loadbalancer.GridLoadBalancerAdapter
org.apache.ignite.internal.managers.loadbalancer.GridLoadBalancerManager$1
-org.apache.ignite.internal.binary.BinaryMetadata
-org.apache.ignite.internal.binary.BinaryObjectEx
-org.apache.ignite.internal.binary.BinaryObjectImpl
-org.apache.ignite.internal.binary.BinaryObjectOffheapImpl
-org.apache.ignite.internal.binary.BinaryReaderExImpl$Flag
-org.apache.ignite.internal.binary.BinaryWriteMode
-org.apache.ignite.internal.binary.BinaryContext
-org.apache.ignite.internal.binary.BinarySchema
-org.apache.ignite.internal.binary.BinarySchema$Confirmation
-org.apache.ignite.internal.binary.builder.BinaryLazyMap$1$1$1
org.apache.ignite.internal.processors.affinity.AffinityTopologyVersion
org.apache.ignite.internal.processors.affinity.GridAffinityAssignment
org.apache.ignite.internal.processors.affinity.GridAffinityMessage
org.apache.ignite.internal.processors.affinity.GridAffinityUtils$AffinityJob
org.apache.ignite.internal.processors.cache.CacheAtomicUpdateTimeoutCheckedException
+org.apache.ignite.internal.processors.cache.CacheDefaultBinaryAffinityKeyMapper
org.apache.ignite.internal.processors.cache.CacheEntryImpl
org.apache.ignite.internal.processors.cache.CacheEntryImplEx
org.apache.ignite.internal.processors.cache.CacheEntryInfoCollection
@@ -370,6 +379,8 @@ org.apache.ignite.internal.processors.cache.GridCacheAdapter$GlobalClearKeySetNe
org.apache.ignite.internal.processors.cache.GridCacheAdapter$LoadCacheClosure
org.apache.ignite.internal.processors.cache.GridCacheAdapter$LoadKeysCallable
org.apache.ignite.internal.processors.cache.GridCacheAdapter$SizeJob
+org.apache.ignite.internal.processors.cache.GridCacheAdapter$SizeLongJob
+org.apache.ignite.internal.processors.cache.GridCacheAdapter$SizeLongTask
org.apache.ignite.internal.processors.cache.GridCacheAdapter$SizeTask
org.apache.ignite.internal.processors.cache.GridCacheAdapter$TopologyVersionAwareJob
org.apache.ignite.internal.processors.cache.GridCacheAdapter$TopologyVersionAwareJob$1
@@ -393,6 +404,7 @@ org.apache.ignite.internal.processors.cache.GridCacheConcurrentMap$ValueIterator
org.apache.ignite.internal.processors.cache.GridCacheConcurrentMap$Values
org.apache.ignite.internal.processors.cache.GridCacheContext
org.apache.ignite.internal.processors.cache.GridCacheContext$4
+org.apache.ignite.internal.processors.cache.GridCacheContext$5
org.apache.ignite.internal.processors.cache.GridCacheDefaultAffinityKeyMapper
org.apache.ignite.internal.processors.cache.GridCacheDefaultAffinityKeyMapper$1
org.apache.ignite.internal.processors.cache.GridCacheDefaultAffinityKeyMapper$2
@@ -441,11 +453,11 @@ org.apache.ignite.internal.processors.cache.GridCachePartitionExchangeManager$7
org.apache.ignite.internal.processors.cache.GridCachePartitionExchangeManager$ExchangeFutureSet
org.apache.ignite.internal.processors.cache.GridCachePartitionExchangeManager$MessageHandler
org.apache.ignite.internal.processors.cache.GridCacheProcessor$2
-org.apache.ignite.internal.processors.cache.GridCacheProcessor$3
org.apache.ignite.internal.processors.cache.GridCacheProcessor$4
org.apache.ignite.internal.processors.cache.GridCacheProcessor$5
org.apache.ignite.internal.processors.cache.GridCacheProcessor$6
-org.apache.ignite.internal.processors.cache.GridCacheProcessor$8
+org.apache.ignite.internal.processors.cache.GridCacheProcessor$7
+org.apache.ignite.internal.processors.cache.GridCacheProcessor$9
org.apache.ignite.internal.processors.cache.GridCacheProcessor$LocalAffinityFunction
org.apache.ignite.internal.processors.cache.GridCacheProxyImpl
org.apache.ignite.internal.processors.cache.GridCacheReturn
@@ -506,6 +518,14 @@ org.apache.ignite.internal.processors.cache.IgniteCacheProxy$9
org.apache.ignite.internal.processors.cache.KeyCacheObject
org.apache.ignite.internal.processors.cache.KeyCacheObjectImpl
org.apache.ignite.internal.processors.cache.affinity.GridCacheAffinityProxy
+org.apache.ignite.internal.processors.cache.binary.BinaryMetadataKey
+org.apache.ignite.internal.processors.cache.binary.CacheDefaultBinaryAffinityKeyMapper
+org.apache.ignite.internal.processors.cache.binary.CacheObjectBinaryProcessorImpl$1
+org.apache.ignite.internal.processors.cache.binary.CacheObjectBinaryProcessorImpl$4
+org.apache.ignite.internal.processors.cache.binary.CacheObjectBinaryProcessorImpl$5
+org.apache.ignite.internal.processors.cache.binary.CacheObjectBinaryProcessorImpl$MetaDataEntryFilter
+org.apache.ignite.internal.processors.cache.binary.CacheObjectBinaryProcessorImpl$MetaDataPredicate
+org.apache.ignite.internal.processors.cache.binary.CacheObjectBinaryProcessorImpl$MetadataProcessor
org.apache.ignite.internal.processors.cache.datastructures.CacheDataStructuresManager$BlockSetCallable
org.apache.ignite.internal.processors.cache.datastructures.CacheDataStructuresManager$QueueHeaderPredicate
org.apache.ignite.internal.processors.cache.datastructures.CacheDataStructuresManager$RemoveSetDataCallable
@@ -612,6 +632,7 @@ org.apache.ignite.internal.processors.cache.distributed.dht.atomic.GridDhtAtomic
org.apache.ignite.internal.processors.cache.distributed.dht.atomic.GridDhtAtomicCache$21
org.apache.ignite.internal.processors.cache.distributed.dht.atomic.GridDhtAtomicCache$22
org.apache.ignite.internal.processors.cache.distributed.dht.atomic.GridDhtAtomicCache$23
+org.apache.ignite.internal.processors.cache.distributed.dht.atomic.GridDhtAtomicCache$24
org.apache.ignite.internal.processors.cache.distributed.dht.atomic.GridDhtAtomicCache$3
org.apache.ignite.internal.processors.cache.distributed.dht.atomic.GridDhtAtomicCache$4
org.apache.ignite.internal.processors.cache.distributed.dht.atomic.GridDhtAtomicCache$5
@@ -667,6 +688,8 @@ org.apache.ignite.internal.processors.cache.distributed.dht.preloader.GridDhtPar
org.apache.ignite.internal.processors.cache.distributed.dht.preloader.GridDhtPartitionsFullMessage
org.apache.ignite.internal.processors.cache.distributed.dht.preloader.GridDhtPartitionsSingleMessage
org.apache.ignite.internal.processors.cache.distributed.dht.preloader.GridDhtPartitionsSingleRequest
+org.apache.ignite.internal.processors.cache.distributed.dht.preloader.GridDhtPreloader$1$1
+org.apache.ignite.internal.processors.cache.distributed.dht.preloader.GridDhtPreloader$10
org.apache.ignite.internal.processors.cache.distributed.dht.preloader.GridDhtPreloader$2
org.apache.ignite.internal.processors.cache.distributed.dht.preloader.GridDhtPreloader$3
org.apache.ignite.internal.processors.cache.distributed.dht.preloader.GridDhtPreloader$4
@@ -710,6 +733,7 @@ org.apache.ignite.internal.processors.cache.distributed.near.GridNearOptimisticS
org.apache.ignite.internal.processors.cache.distributed.near.GridNearOptimisticSerializableTxPrepareFuture$MiniFuture$1$1
org.apache.ignite.internal.processors.cache.distributed.near.GridNearOptimisticTxPrepareFuture$1
org.apache.ignite.internal.processors.cache.distributed.near.GridNearOptimisticTxPrepareFuture$2
+org.apache.ignite.internal.processors.cache.distributed.near.GridNearOptimisticTxPrepareFuture$3
org.apache.ignite.internal.processors.cache.distributed.near.GridNearOptimisticTxPrepareFuture$MiniFuture$1
org.apache.ignite.internal.processors.cache.distributed.near.GridNearOptimisticTxPrepareFutureAdapter$1
org.apache.ignite.internal.processors.cache.distributed.near.GridNearPessimisticTxPrepareFuture$1
@@ -745,14 +769,6 @@ org.apache.ignite.internal.processors.cache.local.atomic.GridLocalAtomicCache$4
org.apache.ignite.internal.processors.cache.local.atomic.GridLocalAtomicCache$5
org.apache.ignite.internal.processors.cache.local.atomic.GridLocalAtomicCache$6
org.apache.ignite.internal.processors.cache.local.atomic.GridLocalAtomicCache$9
-org.apache.ignite.internal.binaryorg.apache.ignite.internal.processors.cache.binary.CacheDefaultBinaryAffinityKeyMapper
-org.apache.ignite.internal.binaryorg.apache.ignite.internal.processors.cache.binary.CacheObjectBinaryProcessorImpl$1
-org.apache.ignite.internal.binaryorg.apache.ignite.internal.processors.cache.binary.CacheObjectBinaryProcessorImpl$4
-org.apache.ignite.internal.binaryorg.apache.ignite.internal.processors.cache.binary.CacheObjectBinaryProcessorImpl$5
-org.apache.ignite.internal.binaryorg.apache.ignite.internal.processors.cache.binary.CacheObjectBinaryProcessorImpl$MetaDataEntryFilter
-org.apache.ignite.internal.binaryorg.apache.ignite.internal.processors.cache.binary.CacheObjectBinaryProcessorImpl$MetaDataPredicate
-org.apache.ignite.internal.binaryorg.apache.ignite.internal.processors.cache.binary.CacheObjectBinaryProcessorImpl$MetadataProcessor
-org.apache.ignite.internal.binaryorg.apache.ignite.internal.processors.cache.binary.BinaryMetadataKey
org.apache.ignite.internal.processors.cache.query.CacheQueryType
org.apache.ignite.internal.processors.cache.query.GridCacheDistributedQueryFuture$1
org.apache.ignite.internal.processors.cache.query.GridCacheDistributedQueryFuture$3
@@ -944,10 +960,13 @@ org.apache.ignite.internal.processors.datastructures.DataStructuresProcessor$13
org.apache.ignite.internal.processors.datastructures.DataStructuresProcessor$14
org.apache.ignite.internal.processors.datastructures.DataStructuresProcessor$15
org.apache.ignite.internal.processors.datastructures.DataStructuresProcessor$16
+org.apache.ignite.internal.processors.datastructures.DataStructuresProcessor$17
org.apache.ignite.internal.processors.datastructures.DataStructuresProcessor$18
org.apache.ignite.internal.processors.datastructures.DataStructuresProcessor$19
org.apache.ignite.internal.processors.datastructures.DataStructuresProcessor$2
-org.apache.ignite.internal.processors.datastructures.DataStructuresProcessor$20
+org.apache.ignite.internal.processors.datastructures.DataStructuresProcessor$21
+org.apache.ignite.internal.processors.datastructures.DataStructuresProcessor$22
+org.apache.ignite.internal.processors.datastructures.DataStructuresProcessor$23
org.apache.ignite.internal.processors.datastructures.DataStructuresProcessor$3
org.apache.ignite.internal.processors.datastructures.DataStructuresProcessor$4
org.apache.ignite.internal.processors.datastructures.DataStructuresProcessor$5
@@ -1277,6 +1296,7 @@ org.apache.ignite.internal.util.GridLogThrottle$LogLevel$1
org.apache.ignite.internal.util.GridLogThrottle$LogLevel$2
org.apache.ignite.internal.util.GridLogThrottle$LogLevel$3
org.apache.ignite.internal.util.GridLongList
+org.apache.ignite.internal.util.GridMessageCollection
org.apache.ignite.internal.util.GridMutex
org.apache.ignite.internal.util.GridRandom
org.apache.ignite.internal.util.GridReflectionCache
[12/24] ignite git commit: Fix to GridBinaryWildcardsSelfTest.
Posted by ak...@apache.org.
Fix to GridBinaryWildcardsSelfTest.
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/6d96bb6a
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/6d96bb6a
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/6d96bb6a
Branch: refs/heads/ignite-843-rc2
Commit: 6d96bb6a3219255b62af826e6806b1aa564bb005
Parents: 6c61598
Author: vozerov-gridgain <vo...@gridgain.com>
Authored: Mon Dec 14 10:08:00 2015 +0300
Committer: vozerov-gridgain <vo...@gridgain.com>
Committed: Mon Dec 14 10:08:00 2015 +0300
----------------------------------------------------------------------
.../binary/GridBinaryWildcardsSelfTest.java | 16 ++++++++--------
1 file changed, 8 insertions(+), 8 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ignite/blob/6d96bb6a/modules/core/src/test/java/org/apache/ignite/internal/binary/GridBinaryWildcardsSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/binary/GridBinaryWildcardsSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/binary/GridBinaryWildcardsSelfTest.java
index dc70f4d..2887afa 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/binary/GridBinaryWildcardsSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/binary/GridBinaryWildcardsSelfTest.java
@@ -213,7 +213,7 @@ public class GridBinaryWildcardsSelfTest extends GridCommonAbstractTest {
assertTrue(typeIds.containsKey("gridbinarytestclass1".hashCode()));
assertTrue(typeIds.containsKey("innerclass".hashCode()));
- assertFalse(typeIds.containsKey("gridbinarytestclass2".hashCode()));
+ assertFalse(typeIds.containsKey(100));
Map<String, BinaryIdMapper> typeMappers = U.field(ctx, "typeMappers");
@@ -225,7 +225,7 @@ public class GridBinaryWildcardsSelfTest extends GridCommonAbstractTest {
*/
public void testClassNamesJar() throws Exception {
BinaryMarshaller marsh = binaryMarshaller(Arrays.asList(
- new BinaryTypeConfiguration("org.apache.ignite.binary.testjar.*"),
+ new BinaryTypeConfiguration("org.apache.ignite.internal.binary.test.*"),
new BinaryTypeConfiguration("unknown.*")
));
@@ -258,7 +258,7 @@ public class GridBinaryWildcardsSelfTest extends GridCommonAbstractTest {
return 0;
}
}, Arrays.asList(
- new BinaryTypeConfiguration("org.apache.ignite.binary.testjar.*"),
+ new BinaryTypeConfiguration("org.apache.ignite.internal.binary.test.*"),
new BinaryTypeConfiguration("unknown.*")
));
@@ -277,7 +277,7 @@ public class GridBinaryWildcardsSelfTest extends GridCommonAbstractTest {
*/
public void testTypeConfigurationsJar() throws Exception {
BinaryMarshaller marsh = binaryMarshaller(Arrays.asList(
- new BinaryTypeConfiguration("org.apache.ignite.binary.testjar.*"),
+ new BinaryTypeConfiguration("org.apache.ignite.internal.binary.test.*"),
new BinaryTypeConfiguration("unknown.*")
));
@@ -310,7 +310,7 @@ public class GridBinaryWildcardsSelfTest extends GridCommonAbstractTest {
return 0;
}
}, Arrays.asList(
- new BinaryTypeConfiguration("org.apache.ignite.binary.testjar.*"),
+ new BinaryTypeConfiguration("org.apache.ignite.internal.binary.test.*"),
new BinaryTypeConfiguration("unknown.*")
));
@@ -343,7 +343,7 @@ public class GridBinaryWildcardsSelfTest extends GridCommonAbstractTest {
return 0;
}
}, Arrays.asList(
- new BinaryTypeConfiguration("org.apache.ignite.binary.testjar.*"),
+ new BinaryTypeConfiguration("org.apache.ignite.internal.binary.test.*"),
new BinaryTypeConfiguration("unknown.*")
));
@@ -362,7 +362,7 @@ public class GridBinaryWildcardsSelfTest extends GridCommonAbstractTest {
*/
public void testOverrideJar() throws Exception {
BinaryTypeConfiguration typeCfg = new BinaryTypeConfiguration(
- "org.apache.ignite.binary.testjar.GridBinaryTestClass2");
+ "org.apache.ignite.internal.binary.test.GridBinaryTestClass2");
typeCfg.setIdMapper(new BinaryIdMapper() {
@Override public int typeId(String clsName) {
@@ -375,7 +375,7 @@ public class GridBinaryWildcardsSelfTest extends GridCommonAbstractTest {
});
BinaryMarshaller marsh = binaryMarshaller(Arrays.asList(
- new BinaryTypeConfiguration("org.apache.ignite.binary.testjar.*"),
+ new BinaryTypeConfiguration("org.apache.ignite.internal.binary.test.*"),
typeCfg));
BinaryContext ctx = binaryContext(marsh);
[03/24] ignite git commit: ignite-2065: portable -> binary renaming
(methods, javadoc and etc.)
Posted by ak...@apache.org.
http://git-wip-us.apache.org/repos/asf/ignite/blob/10b83fb8/modules/core/src/test/java/org/apache/ignite/internal/binary/GridBinaryWildcardsSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/binary/GridBinaryWildcardsSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/binary/GridBinaryWildcardsSelfTest.java
index 9cf1242..dc70f4d 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/binary/GridBinaryWildcardsSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/binary/GridBinaryWildcardsSelfTest.java
@@ -40,19 +40,19 @@ public class GridBinaryWildcardsSelfTest extends GridCommonAbstractTest {
* @throws Exception If failed.
*/
public void testClassNames() throws Exception {
- BinaryMarshaller marsh = portableMarshaller(Arrays.asList(
+ BinaryMarshaller marsh = binaryMarshaller(Arrays.asList(
new BinaryTypeConfiguration("org.apache.ignite.internal.binary.test.*"),
new BinaryTypeConfiguration("unknown.*")
));
- BinaryContext ctx = portableContext(marsh);
+ BinaryContext ctx = binaryContext(marsh);
Map<Integer, Class> typeIds = U.field(ctx, "userTypes");
assertEquals(3, typeIds.size());
- assertTrue(typeIds.containsKey("gridportabletestclass1".hashCode()));
- assertTrue(typeIds.containsKey("gridportabletestclass2".hashCode()));
+ assertTrue(typeIds.containsKey("gridbinarytestclass1".hashCode()));
+ assertTrue(typeIds.containsKey("gridbinarytestclass2".hashCode()));
assertTrue(typeIds.containsKey("innerclass".hashCode()));
}
@@ -60,7 +60,7 @@ public class GridBinaryWildcardsSelfTest extends GridCommonAbstractTest {
* @throws Exception If failed.
*/
public void testClassNamesWithMapper() throws Exception {
- BinaryMarshaller marsh = portableMarshaller(new BinaryIdMapper() {
+ BinaryMarshaller marsh = binaryMarshaller(new BinaryIdMapper() {
@SuppressWarnings("IfMayBeConditional")
@Override public int typeId(String clsName) {
if (clsName.endsWith("1"))
@@ -81,14 +81,14 @@ public class GridBinaryWildcardsSelfTest extends GridCommonAbstractTest {
new BinaryTypeConfiguration("unknown.*")
));
- BinaryContext ctx = portableContext(marsh);
+ BinaryContext ctx = binaryContext(marsh);
Map<String, BinaryIdMapper> typeMappers = U.field(ctx, "typeMappers");
assertEquals(3, typeMappers.size());
- assertEquals(300, typeMappers.get("GridPortableTestClass1").typeId("GridPortableTestClass1"));
- assertEquals(400, typeMappers.get("GridPortableTestClass2").typeId("GridPortableTestClass2"));
+ assertEquals(300, typeMappers.get("GridBinaryTestClass1").typeId("GridBinaryTestClass1"));
+ assertEquals(400, typeMappers.get("GridBinaryTestClass2").typeId("GridBinaryTestClass2"));
assertEquals(500, typeMappers.get("InnerClass").typeId("InnerClass"));
}
@@ -96,19 +96,19 @@ public class GridBinaryWildcardsSelfTest extends GridCommonAbstractTest {
* @throws Exception If failed.
*/
public void testTypeConfigurations() throws Exception {
- BinaryMarshaller marsh = portableMarshaller(Arrays.asList(
+ BinaryMarshaller marsh = binaryMarshaller(Arrays.asList(
new BinaryTypeConfiguration("org.apache.ignite.internal.binary.test.*"),
new BinaryTypeConfiguration("unknown.*")
));
- BinaryContext ctx = portableContext(marsh);
+ BinaryContext ctx = binaryContext(marsh);
Map<Integer, Class> typeIds = U.field(ctx, "userTypes");
assertEquals(3, typeIds.size());
- assertTrue(typeIds.containsKey("gridportabletestclass1".hashCode()));
- assertTrue(typeIds.containsKey("gridportabletestclass2".hashCode()));
+ assertTrue(typeIds.containsKey("gridbinarytestclass1".hashCode()));
+ assertTrue(typeIds.containsKey("gridbinarytestclass2".hashCode()));
assertTrue(typeIds.containsKey("innerclass".hashCode()));
}
@@ -116,7 +116,7 @@ public class GridBinaryWildcardsSelfTest extends GridCommonAbstractTest {
* @throws Exception If failed.
*/
public void testTypeConfigurationsWithGlobalMapper() throws Exception {
- BinaryMarshaller marsh = portableMarshaller(new BinaryIdMapper() {
+ BinaryMarshaller marsh = binaryMarshaller(new BinaryIdMapper() {
@SuppressWarnings("IfMayBeConditional")
@Override public int typeId(String clsName) {
if (clsName.endsWith("1"))
@@ -137,14 +137,14 @@ public class GridBinaryWildcardsSelfTest extends GridCommonAbstractTest {
new BinaryTypeConfiguration("unknown.*")
));
- BinaryContext ctx = portableContext(marsh);
+ BinaryContext ctx = binaryContext(marsh);
Map<String, BinaryIdMapper> typeMappers = U.field(ctx, "typeMappers");
assertEquals(3, typeMappers.size());
- assertEquals(300, typeMappers.get("GridPortableTestClass1").typeId("GridPortableTestClass1"));
- assertEquals(400, typeMappers.get("GridPortableTestClass2").typeId("GridPortableTestClass2"));
+ assertEquals(300, typeMappers.get("GridBinaryTestClass1").typeId("GridBinaryTestClass1"));
+ assertEquals(400, typeMappers.get("GridBinaryTestClass2").typeId("GridBinaryTestClass2"));
assertEquals(500, typeMappers.get("InnerClass").typeId("InnerClass"));
}
@@ -152,7 +152,7 @@ public class GridBinaryWildcardsSelfTest extends GridCommonAbstractTest {
* @throws Exception If failed.
*/
public void testTypeConfigurationsWithNonGlobalMapper() throws Exception {
- BinaryMarshaller marsh = portableMarshaller(new BinaryIdMapper() {
+ BinaryMarshaller marsh = binaryMarshaller(new BinaryIdMapper() {
@SuppressWarnings("IfMayBeConditional")
@Override public int typeId(String clsName) {
if (clsName.endsWith("1"))
@@ -173,14 +173,14 @@ public class GridBinaryWildcardsSelfTest extends GridCommonAbstractTest {
new BinaryTypeConfiguration("unknown.*")
));
- BinaryContext ctx = portableContext(marsh);
+ BinaryContext ctx = binaryContext(marsh);
Map<String, BinaryIdMapper> typeMappers = U.field(ctx, "typeMappers");
assertEquals(3, typeMappers.size());
- assertEquals(300, typeMappers.get("GridPortableTestClass1").typeId("GridPortableTestClass1"));
- assertEquals(400, typeMappers.get("GridPortableTestClass2").typeId("GridPortableTestClass2"));
+ assertEquals(300, typeMappers.get("GridBinaryTestClass1").typeId("GridBinaryTestClass1"));
+ assertEquals(400, typeMappers.get("GridBinaryTestClass2").typeId("GridBinaryTestClass2"));
assertEquals(500, typeMappers.get("InnerClass").typeId("InnerClass"));
}
@@ -190,7 +190,7 @@ public class GridBinaryWildcardsSelfTest extends GridCommonAbstractTest {
public void testOverride() throws Exception {
BinaryTypeConfiguration typeCfg = new BinaryTypeConfiguration();
- typeCfg.setTypeName("GridPortableTestClass2");
+ typeCfg.setTypeName("GridBinaryTestClass2");
typeCfg.setIdMapper(new BinaryIdMapper() {
@Override public int typeId(String clsName) {
return 100;
@@ -201,49 +201,49 @@ public class GridBinaryWildcardsSelfTest extends GridCommonAbstractTest {
}
});
- BinaryMarshaller marsh = portableMarshaller(Arrays.asList(
+ BinaryMarshaller marsh = binaryMarshaller(Arrays.asList(
new BinaryTypeConfiguration("org.apache.ignite.internal.binary.test.*"),
typeCfg));
- BinaryContext ctx = portableContext(marsh);
+ BinaryContext ctx = binaryContext(marsh);
Map<Integer, Class> typeIds = U.field(ctx, "userTypes");
assertEquals(3, typeIds.size());
- assertTrue(typeIds.containsKey("gridportabletestclass1".hashCode()));
+ assertTrue(typeIds.containsKey("gridbinarytestclass1".hashCode()));
assertTrue(typeIds.containsKey("innerclass".hashCode()));
- assertFalse(typeIds.containsKey("gridportabletestclass2".hashCode()));
+ assertFalse(typeIds.containsKey("gridbinarytestclass2".hashCode()));
Map<String, BinaryIdMapper> typeMappers = U.field(ctx, "typeMappers");
- assertEquals(100, typeMappers.get("GridPortableTestClass2").typeId("GridPortableTestClass2"));
+ assertEquals(100, typeMappers.get("GridBinaryTestClass2").typeId("GridBinaryTestClass2"));
}
/**
* @throws Exception If failed.
*/
public void testClassNamesJar() throws Exception {
- BinaryMarshaller marsh = portableMarshaller(Arrays.asList(
+ BinaryMarshaller marsh = binaryMarshaller(Arrays.asList(
new BinaryTypeConfiguration("org.apache.ignite.binary.testjar.*"),
new BinaryTypeConfiguration("unknown.*")
));
- BinaryContext ctx = portableContext(marsh);
+ BinaryContext ctx = binaryContext(marsh);
Map<Integer, Class> typeIds = U.field(ctx, "userTypes");
assertEquals(3, typeIds.size());
- assertTrue(typeIds.containsKey("gridportabletestclass1".hashCode()));
- assertTrue(typeIds.containsKey("gridportabletestclass2".hashCode()));
+ assertTrue(typeIds.containsKey("gridbinarytestclass1".hashCode()));
+ assertTrue(typeIds.containsKey("gridbinarytestclass2".hashCode()));
}
/**
* @throws Exception If failed.
*/
public void testClassNamesWithMapperJar() throws Exception {
- BinaryMarshaller marsh = portableMarshaller(new BinaryIdMapper() {
+ BinaryMarshaller marsh = binaryMarshaller(new BinaryIdMapper() {
@SuppressWarnings("IfMayBeConditional")
@Override public int typeId(String clsName) {
if (clsName.endsWith("1"))
@@ -262,40 +262,40 @@ public class GridBinaryWildcardsSelfTest extends GridCommonAbstractTest {
new BinaryTypeConfiguration("unknown.*")
));
- BinaryContext ctx = portableContext(marsh);
+ BinaryContext ctx = binaryContext(marsh);
Map<String, BinaryIdMapper> typeMappers = U.field(ctx, "typeMappers");
assertEquals(3, typeMappers.size());
- assertEquals(300, typeMappers.get("GridPortableTestClass1").typeId("GridPortableTestClass1"));
- assertEquals(400, typeMappers.get("GridPortableTestClass2").typeId("GridPortableTestClass2"));
+ assertEquals(300, typeMappers.get("GridBinaryTestClass1").typeId("GridBinaryTestClass1"));
+ assertEquals(400, typeMappers.get("GridBinaryTestClass2").typeId("GridBinaryTestClass2"));
}
/**
* @throws Exception If failed.
*/
public void testTypeConfigurationsJar() throws Exception {
- BinaryMarshaller marsh = portableMarshaller(Arrays.asList(
+ BinaryMarshaller marsh = binaryMarshaller(Arrays.asList(
new BinaryTypeConfiguration("org.apache.ignite.binary.testjar.*"),
new BinaryTypeConfiguration("unknown.*")
));
- BinaryContext ctx = portableContext(marsh);
+ BinaryContext ctx = binaryContext(marsh);
Map<Integer, Class> typeIds = U.field(ctx, "userTypes");
assertEquals(3, typeIds.size());
- assertTrue(typeIds.containsKey("gridportabletestclass1".hashCode()));
- assertTrue(typeIds.containsKey("gridportabletestclass2".hashCode()));
+ assertTrue(typeIds.containsKey("gridbinarytestclass1".hashCode()));
+ assertTrue(typeIds.containsKey("gridbinarytestclass2".hashCode()));
}
/**
* @throws Exception If failed.
*/
public void testTypeConfigurationsWithGlobalMapperJar() throws Exception {
- BinaryMarshaller marsh = portableMarshaller(new BinaryIdMapper() {
+ BinaryMarshaller marsh = binaryMarshaller(new BinaryIdMapper() {
@SuppressWarnings("IfMayBeConditional")
@Override public int typeId(String clsName) {
if (clsName.endsWith("1"))
@@ -314,21 +314,21 @@ public class GridBinaryWildcardsSelfTest extends GridCommonAbstractTest {
new BinaryTypeConfiguration("unknown.*")
));
- BinaryContext ctx = portableContext(marsh);
+ BinaryContext ctx = binaryContext(marsh);
Map<String, BinaryIdMapper> typeMappers = U.field(ctx, "typeMappers");
assertEquals(3, typeMappers.size());
- assertEquals(300, typeMappers.get("GridPortableTestClass1").typeId("GridPortableTestClass1"));
- assertEquals(400, typeMappers.get("GridPortableTestClass2").typeId("GridPortableTestClass2"));
+ assertEquals(300, typeMappers.get("GridBinaryTestClass1").typeId("GridBinaryTestClass1"));
+ assertEquals(400, typeMappers.get("GridBinaryTestClass2").typeId("GridBinaryTestClass2"));
}
/**
* @throws Exception If failed.
*/
public void testTypeConfigurationsWithNonGlobalMapperJar() throws Exception {
- BinaryMarshaller marsh = portableMarshaller(new BinaryIdMapper() {
+ BinaryMarshaller marsh = binaryMarshaller(new BinaryIdMapper() {
@SuppressWarnings("IfMayBeConditional")
@Override public int typeId(String clsName) {
if (clsName.endsWith("1"))
@@ -347,14 +347,14 @@ public class GridBinaryWildcardsSelfTest extends GridCommonAbstractTest {
new BinaryTypeConfiguration("unknown.*")
));
- BinaryContext ctx = portableContext(marsh);
+ BinaryContext ctx = binaryContext(marsh);
Map<String, BinaryIdMapper> typeMappers = U.field(ctx, "typeMappers");
assertEquals(3, typeMappers.size());
- assertEquals(300, typeMappers.get("GridPortableTestClass1").typeId("GridPortableTestClass1"));
- assertEquals(400, typeMappers.get("GridPortableTestClass2").typeId("GridPortableTestClass2"));
+ assertEquals(300, typeMappers.get("GridBinaryTestClass1").typeId("GridBinaryTestClass1"));
+ assertEquals(400, typeMappers.get("GridBinaryTestClass2").typeId("GridBinaryTestClass2"));
}
/**
@@ -362,7 +362,7 @@ public class GridBinaryWildcardsSelfTest extends GridCommonAbstractTest {
*/
public void testOverrideJar() throws Exception {
BinaryTypeConfiguration typeCfg = new BinaryTypeConfiguration(
- "org.apache.ignite.binary.testjar.GridPortableTestClass2");
+ "org.apache.ignite.binary.testjar.GridBinaryTestClass2");
typeCfg.setIdMapper(new BinaryIdMapper() {
@Override public int typeId(String clsName) {
@@ -374,30 +374,30 @@ public class GridBinaryWildcardsSelfTest extends GridCommonAbstractTest {
}
});
- BinaryMarshaller marsh = portableMarshaller(Arrays.asList(
+ BinaryMarshaller marsh = binaryMarshaller(Arrays.asList(
new BinaryTypeConfiguration("org.apache.ignite.binary.testjar.*"),
typeCfg));
- BinaryContext ctx = portableContext(marsh);
+ BinaryContext ctx = binaryContext(marsh);
Map<Integer, Class> typeIds = U.field(ctx, "userTypes");
assertEquals(3, typeIds.size());
- assertTrue(typeIds.containsKey("gridportabletestclass1".hashCode()));
+ assertTrue(typeIds.containsKey("gridbinarytestclass1".hashCode()));
Map<String, BinaryIdMapper> typeMappers = U.field(ctx, "typeMappers");
assertEquals(3, typeMappers.size());
- assertEquals(100, typeMappers.get("GridPortableTestClass2").typeId("GridPortableTestClass2"));
+ assertEquals(100, typeMappers.get("GridBinaryTestClass2").typeId("GridBinaryTestClass2"));
}
/**
* @param marsh Marshaller.
- * @return Portable context.
+ * @return Binary context.
*/
- protected BinaryContext portableContext(BinaryMarshaller marsh) {
+ protected BinaryContext binaryContext(BinaryMarshaller marsh) {
GridBinaryMarshaller impl = U.field(marsh, "impl");
return impl.context();
@@ -406,36 +406,36 @@ public class GridBinaryWildcardsSelfTest extends GridCommonAbstractTest {
/**
*
*/
- protected BinaryMarshaller portableMarshaller()
+ protected BinaryMarshaller binaryMarshaller()
throws IgniteCheckedException {
- return portableMarshaller(null, null, null);
+ return binaryMarshaller(null, null, null);
}
/**
*
*/
- protected BinaryMarshaller portableMarshaller(Collection<BinaryTypeConfiguration> cfgs)
+ protected BinaryMarshaller binaryMarshaller(Collection<BinaryTypeConfiguration> cfgs)
throws IgniteCheckedException {
- return portableMarshaller(null, null, cfgs);
+ return binaryMarshaller(null, null, cfgs);
}
/**
*
*/
- protected BinaryMarshaller portableMarshaller(BinaryIdMapper mapper, Collection<BinaryTypeConfiguration> cfgs)
+ protected BinaryMarshaller binaryMarshaller(BinaryIdMapper mapper, Collection<BinaryTypeConfiguration> cfgs)
throws IgniteCheckedException {
- return portableMarshaller(mapper, null, cfgs);
+ return binaryMarshaller(mapper, null, cfgs);
}
/**
*
*/
- protected BinaryMarshaller portableMarshaller(BinarySerializer serializer, Collection<BinaryTypeConfiguration> cfgs)
+ protected BinaryMarshaller binaryMarshaller(BinarySerializer serializer, Collection<BinaryTypeConfiguration> cfgs)
throws IgniteCheckedException {
- return portableMarshaller(null, serializer, cfgs);
+ return binaryMarshaller(null, serializer, cfgs);
}
- protected BinaryMarshaller portableMarshaller(
+ protected BinaryMarshaller binaryMarshaller(
BinaryIdMapper mapper,
BinarySerializer serializer,
Collection<BinaryTypeConfiguration> cfgs
@@ -457,7 +457,7 @@ public class GridBinaryWildcardsSelfTest extends GridCommonAbstractTest {
marsh.setContext(new MarshallerContextTestImpl(null));
- IgniteUtils.invoke(BinaryMarshaller.class, marsh, "setPortableContext", ctx, iCfg);
+ IgniteUtils.invoke(BinaryMarshaller.class, marsh, "setBinaryContext", ctx, iCfg);
return marsh;
}
http://git-wip-us.apache.org/repos/asf/ignite/blob/10b83fb8/modules/core/src/test/java/org/apache/ignite/internal/binary/mutabletest/GridBinaryTestClasses.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/binary/mutabletest/GridBinaryTestClasses.java b/modules/core/src/test/java/org/apache/ignite/internal/binary/mutabletest/GridBinaryTestClasses.java
index 0170f99..ae615b1 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/binary/mutabletest/GridBinaryTestClasses.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/binary/mutabletest/GridBinaryTestClasses.java
@@ -110,22 +110,22 @@ public class GridBinaryTestClasses {
/**
*
*/
- public static class TestObjectPlainPortable {
+ public static class TestObjectPlainBinary {
/** */
- public BinaryObject plainPortable;
+ public BinaryObject plainBinary;
/**
*
*/
- public TestObjectPlainPortable() {
+ public TestObjectPlainBinary() {
// No-op.
}
/**
- * @param plainPortable Object.
+ * @param plainBinary Object.
*/
- public TestObjectPlainPortable(BinaryObject plainPortable) {
- this.plainPortable = plainPortable;
+ public TestObjectPlainBinary(BinaryObject plainBinary) {
+ this.plainBinary = plainBinary;
}
}
http://git-wip-us.apache.org/repos/asf/ignite/blob/10b83fb8/modules/core/src/test/java/org/apache/ignite/internal/binary/noncompact/BinaryFieldsHeapNonCompactSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/binary/noncompact/BinaryFieldsHeapNonCompactSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/binary/noncompact/BinaryFieldsHeapNonCompactSelfTest.java
index 7687f38..c657cfd 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/binary/noncompact/BinaryFieldsHeapNonCompactSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/binary/noncompact/BinaryFieldsHeapNonCompactSelfTest.java
@@ -20,7 +20,7 @@ package org.apache.ignite.internal.binary.noncompact;
import org.apache.ignite.internal.binary.BinaryFieldsHeapSelfTest;
/**
- * Field tests for heap-based portables with non-compact footer.
+ * Field tests for heap-based binaries with non-compact footer.
*/
public class BinaryFieldsHeapNonCompactSelfTest extends BinaryFieldsHeapSelfTest {
/** {@inheritDoc} */
http://git-wip-us.apache.org/repos/asf/ignite/blob/10b83fb8/modules/core/src/test/java/org/apache/ignite/internal/binary/noncompact/BinaryFieldsOffheapNonCompactSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/binary/noncompact/BinaryFieldsOffheapNonCompactSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/binary/noncompact/BinaryFieldsOffheapNonCompactSelfTest.java
index 52bccd8..f717f57 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/binary/noncompact/BinaryFieldsOffheapNonCompactSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/binary/noncompact/BinaryFieldsOffheapNonCompactSelfTest.java
@@ -20,7 +20,7 @@ package org.apache.ignite.internal.binary.noncompact;
import org.apache.ignite.internal.binary.BinaryFieldsOffheapSelfTest;
/**
- * Field tests for offheap-based portables with non-compact footer.
+ * Field tests for offheap-based binaries with non-compact footer.
*/
public class BinaryFieldsOffheapNonCompactSelfTest extends BinaryFieldsOffheapSelfTest {
/** {@inheritDoc} */
http://git-wip-us.apache.org/repos/asf/ignite/blob/10b83fb8/modules/core/src/test/java/org/apache/ignite/internal/binary/noncompact/BinaryFooterOffsetsHeapNonCompactSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/binary/noncompact/BinaryFooterOffsetsHeapNonCompactSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/binary/noncompact/BinaryFooterOffsetsHeapNonCompactSelfTest.java
index 279e4f0..14cc991 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/binary/noncompact/BinaryFooterOffsetsHeapNonCompactSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/binary/noncompact/BinaryFooterOffsetsHeapNonCompactSelfTest.java
@@ -20,7 +20,7 @@ package org.apache.ignite.internal.binary.noncompact;
import org.apache.ignite.internal.binary.BinaryFooterOffsetsHeapSelfTest;
/**
- * Compact offsets tests for heap portable objects with non-compact footer.
+ * Compact offsets tests for heap binary objects with non-compact footer.
*/
public class BinaryFooterOffsetsHeapNonCompactSelfTest extends BinaryFooterOffsetsHeapSelfTest {
/** {@inheritDoc} */
http://git-wip-us.apache.org/repos/asf/ignite/blob/10b83fb8/modules/core/src/test/java/org/apache/ignite/internal/binary/noncompact/BinaryFooterOffsetsOffheapNonCompactSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/binary/noncompact/BinaryFooterOffsetsOffheapNonCompactSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/binary/noncompact/BinaryFooterOffsetsOffheapNonCompactSelfTest.java
index 66a8d1a..fe2929a 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/binary/noncompact/BinaryFooterOffsetsOffheapNonCompactSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/binary/noncompact/BinaryFooterOffsetsOffheapNonCompactSelfTest.java
@@ -20,7 +20,7 @@ package org.apache.ignite.internal.binary.noncompact;
import org.apache.ignite.internal.binary.BinaryFooterOffsetsOffheapSelfTest;
/**
- * Compact offsets tests for offheap portable objects with non-compact footer.
+ * Compact offsets tests for offheap binary objects with non-compact footer.
*/
public class BinaryFooterOffsetsOffheapNonCompactSelfTest extends BinaryFooterOffsetsOffheapSelfTest {
/** {@inheritDoc} */
http://git-wip-us.apache.org/repos/asf/ignite/blob/10b83fb8/modules/core/src/test/java/org/apache/ignite/internal/binary/noncompact/BinaryObjectBuilderNonCompactSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/binary/noncompact/BinaryObjectBuilderNonCompactSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/binary/noncompact/BinaryObjectBuilderNonCompactSelfTest.java
index 1305b6e..c698783 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/binary/noncompact/BinaryObjectBuilderNonCompactSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/binary/noncompact/BinaryObjectBuilderNonCompactSelfTest.java
@@ -20,7 +20,7 @@ package org.apache.ignite.internal.binary.noncompact;
import org.apache.ignite.internal.binary.BinaryObjectBuilderSelfTest;
/**
- * Portable builder test for objects with non-compact footer.
+ * Binary builder test for objects with non-compact footer.
*/
public class BinaryObjectBuilderNonCompactSelfTest extends BinaryObjectBuilderSelfTest {
/** {@inheritDoc} */
http://git-wip-us.apache.org/repos/asf/ignite/blob/10b83fb8/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheOffHeapTieredAbstractSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheOffHeapTieredAbstractSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheOffHeapTieredAbstractSelfTest.java
index 363b8e4..23d248d 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheOffHeapTieredAbstractSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheOffHeapTieredAbstractSelfTest.java
@@ -66,7 +66,7 @@ public abstract class GridCacheOffHeapTieredAbstractSelfTest extends GridCacheAb
}
/** {@inheritDoc} */
- protected boolean portableEnabled() {
+ protected boolean binaryEnabled() {
return false;
}
@@ -444,14 +444,14 @@ public abstract class GridCacheOffHeapTieredAbstractSelfTest extends GridCacheAb
TestValue val2 = new TestValue(new byte[10]);
- if (portableEnabled()) // TODO: IGNITE-608, check return value when fixed.
+ if (binaryEnabled()) // TODO: IGNITE-608, check return value when fixed.
c.put(key, val);
else
assertEquals(val, c.getAndPut(key, val));
checkValue(key, val2);
- if (portableEnabled()) // TODO: IGNITE-608, check return value when fixed.
+ if (binaryEnabled()) // TODO: IGNITE-608, check return value when fixed.
c.remove(key);
else
assertEquals(val2, c.getAndRemove(key));
@@ -672,4 +672,4 @@ public abstract class GridCacheOffHeapTieredAbstractSelfTest extends GridCacheAb
'}';
}
}
-}
\ No newline at end of file
+}
http://git-wip-us.apache.org/repos/asf/ignite/blob/10b83fb8/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheOnCopyFlagAbstractSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheOnCopyFlagAbstractSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheOnCopyFlagAbstractSelfTest.java
index b9c1449..d29440e 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheOnCopyFlagAbstractSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheOnCopyFlagAbstractSelfTest.java
@@ -284,7 +284,7 @@ public abstract class GridCacheOnCopyFlagAbstractSelfTest extends GridCacheAbstr
GridCacheContext cctx = cache0.context();
- boolean binary = cctx.cacheObjects().isPortableEnabled(null);
+ boolean binary = cctx.cacheObjects().isBinaryEnabled(null);
for (Map.Entry<TestKey, TestValue> e : map.entrySet()) {
GridCacheEntryEx entry = cache0.peekEx(e.getKey());
@@ -335,7 +335,7 @@ public abstract class GridCacheOnCopyFlagAbstractSelfTest extends GridCacheAbstr
GridCacheContext cctx = cache0.context();
- boolean binary = cctx.cacheObjects().isPortableEnabled(null);
+ boolean binary = cctx.cacheObjects().isBinaryEnabled(null);
for (Map.Entry<TestKey, byte[]> e : map.entrySet()) {
GridCacheEntryEx entry = cache0.peekEx(e.getKey());
@@ -603,4 +603,4 @@ public abstract class GridCacheOnCopyFlagAbstractSelfTest extends GridCacheAbstr
this.delegate = delegate;
}
}
-}
\ No newline at end of file
+}
http://git-wip-us.apache.org/repos/asf/ignite/blob/10b83fb8/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheTestEntryEx.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheTestEntryEx.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheTestEntryEx.java
index a34e7df..f6eb430 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheTestEntryEx.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheTestEntryEx.java
@@ -474,7 +474,7 @@ public class GridCacheTestEntryEx extends GridMetadataAwareAdapter implements Gr
long ttl,
boolean evt,
boolean metrics,
- boolean keepPortable,
+ boolean keepBinary,
AffinityTopologyVersion topVer,
CacheEntryPredicate[] filter,
GridDrType drType,
@@ -497,7 +497,7 @@ public class GridCacheTestEntryEx extends GridMetadataAwareAdapter implements Gr
boolean writeThrough,
boolean readThrough,
boolean retval,
- boolean keepPortable,
+ boolean keepBinary,
@Nullable ExpiryPolicy expiryPlc,
boolean evt,
boolean metrics,
@@ -520,7 +520,7 @@ public class GridCacheTestEntryEx extends GridMetadataAwareAdapter implements Gr
boolean writeThrough,
boolean readThrough,
boolean retval,
- boolean keepPortable,
+ boolean keepBinary,
@Nullable IgniteCacheExpiryPolicy expiryPlc,
boolean evt,
boolean metrics,
@@ -552,7 +552,7 @@ public class GridCacheTestEntryEx extends GridMetadataAwareAdapter implements Gr
boolean retval,
boolean evt,
boolean metrics,
- boolean keepPortable,
+ boolean keepBinary,
AffinityTopologyVersion topVer,
CacheEntryPredicate[] filter,
GridDrType drType,
http://git-wip-us.apache.org/repos/asf/ignite/blob/10b83fb8/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/binary/GridBinaryCacheEntryMemorySizeSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/binary/GridBinaryCacheEntryMemorySizeSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/binary/GridBinaryCacheEntryMemorySizeSelfTest.java
index 128e316..d1f7826 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/binary/GridBinaryCacheEntryMemorySizeSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/binary/GridBinaryCacheEntryMemorySizeSelfTest.java
@@ -41,7 +41,7 @@ public class GridBinaryCacheEntryMemorySizeSelfTest extends GridCacheEntryMemory
BinaryContext pCtx = new BinaryContext(BinaryNoopMetadataHandler.instance(), iCfg);
- IgniteUtils.invoke(BinaryMarshaller.class, marsh, "setPortableContext", pCtx, iCfg);
+ IgniteUtils.invoke(BinaryMarshaller.class, marsh, "setBinaryContext", pCtx, iCfg);
return marsh;
}
http://git-wip-us.apache.org/repos/asf/ignite/blob/10b83fb8/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/binary/GridBinaryDuplicateIndexObjectsAbstractSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/binary/GridBinaryDuplicateIndexObjectsAbstractSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/binary/GridBinaryDuplicateIndexObjectsAbstractSelfTest.java
index 9306958..a3f8055 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/binary/GridBinaryDuplicateIndexObjectsAbstractSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/binary/GridBinaryDuplicateIndexObjectsAbstractSelfTest.java
@@ -35,7 +35,7 @@ import org.apache.ignite.internal.binary.BinaryMarshaller;
import org.apache.ignite.binary.BinaryObject;
/**
- * Tests that portable object is the same in cache entry and in index.
+ * Tests that binary object is the same in cache entry and in index.
*/
public abstract class GridBinaryDuplicateIndexObjectsAbstractSelfTest extends GridCacheAbstractSelfTest {
/** {@inheritDoc} */
@@ -49,7 +49,7 @@ public abstract class GridBinaryDuplicateIndexObjectsAbstractSelfTest extends Gr
BinaryConfiguration bCfg = new BinaryConfiguration();
- bCfg.setClassNames(Collections.singletonList(TestPortable.class.getName()));
+ bCfg.setClassNames(Collections.singletonList(TestBinary.class.getName()));
cfg.setBinaryConfiguration(bCfg);
@@ -67,7 +67,7 @@ public abstract class GridBinaryDuplicateIndexObjectsAbstractSelfTest extends Gr
CacheTypeMetadata meta = new CacheTypeMetadata();
meta.setKeyType(Integer.class);
- meta.setValueType(TestPortable.class.getName());
+ meta.setValueType(TestBinary.class.getName());
Map<String, Class<?>> idx = new HashMap<>();
@@ -91,13 +91,13 @@ public abstract class GridBinaryDuplicateIndexObjectsAbstractSelfTest extends Gr
* @throws Exception If failed.
*/
public void testIndexReferences() throws Exception {
- IgniteCache<Integer, TestPortable> cache = grid(0).cache(null);
+ IgniteCache<Integer, TestBinary> cache = grid(0).cache(null);
String fieldOneVal = "123";
int fieldTwoVal = 123;
int key = 0;
- cache.put(key, new TestPortable(fieldOneVal, fieldTwoVal));
+ cache.put(key, new TestBinary(fieldOneVal, fieldTwoVal));
IgniteCache<Integer, BinaryObject> prj = grid(0).cache(null).withKeepBinary();
@@ -107,7 +107,7 @@ public abstract class GridBinaryDuplicateIndexObjectsAbstractSelfTest extends Gr
assertEquals(new Integer(fieldTwoVal), cacheVal.field("fieldTwo"));
List<?> row = F.first(prj.query(new SqlFieldsQuery("select _val from " +
- "TestPortable where _key = ?").setArgs(key)).getAll());
+ "TestBinary where _key = ?").setArgs(key)).getAll());
assertEquals(1, row.size());
@@ -119,9 +119,9 @@ public abstract class GridBinaryDuplicateIndexObjectsAbstractSelfTest extends Gr
}
/**
- * Test portable object.
+ * Test binary object.
*/
- private static class TestPortable {
+ private static class TestBinary {
/** */
private String fieldOne;
@@ -131,7 +131,7 @@ public abstract class GridBinaryDuplicateIndexObjectsAbstractSelfTest extends Gr
/**
*
*/
- private TestPortable() {
+ private TestBinary() {
// No-op.
}
@@ -139,7 +139,7 @@ public abstract class GridBinaryDuplicateIndexObjectsAbstractSelfTest extends Gr
* @param fieldOne Field one.
* @param fieldTwo Field two.
*/
- private TestPortable(String fieldOne, int fieldTwo) {
+ private TestBinary(String fieldOne, int fieldTwo) {
this.fieldOne = fieldOne;
this.fieldTwo = fieldTwo;
}
http://git-wip-us.apache.org/repos/asf/ignite/blob/10b83fb8/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/binary/GridCacheBinaryObjectsAbstractDataStreamerSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/binary/GridCacheBinaryObjectsAbstractDataStreamerSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/binary/GridCacheBinaryObjectsAbstractDataStreamerSelfTest.java
index 5840149..beb76d1 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/binary/GridCacheBinaryObjectsAbstractDataStreamerSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/binary/GridCacheBinaryObjectsAbstractDataStreamerSelfTest.java
@@ -43,7 +43,7 @@ import org.jsr166.LongAdder8;
import static org.apache.ignite.cache.CacheWriteSynchronizationMode.PRIMARY_SYNC;
/**
- * Test for portable objects stored in cache.
+ * Test for binary objects stored in cache.
*/
public abstract class GridCacheBinaryObjectsAbstractDataStreamerSelfTest extends GridCommonAbstractTest {
/** */
http://git-wip-us.apache.org/repos/asf/ignite/blob/10b83fb8/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/binary/GridCacheBinaryObjectsAbstractMultiThreadedSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/binary/GridCacheBinaryObjectsAbstractMultiThreadedSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/binary/GridCacheBinaryObjectsAbstractMultiThreadedSelfTest.java
index 043f24f..0f73b53 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/binary/GridCacheBinaryObjectsAbstractMultiThreadedSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/binary/GridCacheBinaryObjectsAbstractMultiThreadedSelfTest.java
@@ -49,7 +49,7 @@ import org.jsr166.LongAdder8;
import static org.apache.ignite.cache.CacheWriteSynchronizationMode.PRIMARY_SYNC;
/**
- * Test for portable objects stored in cache.
+ * Test for binary objects stored in cache.
*/
public abstract class GridCacheBinaryObjectsAbstractMultiThreadedSelfTest extends GridCommonAbstractTest {
/** */
@@ -146,11 +146,11 @@ public abstract class GridCacheBinaryObjectsAbstractMultiThreadedSelfTest extend
switch (threadId) {
case 0:
- // Put/get/remove portable -> portable.
+ // Put/get/remove binary -> binary.
c.put(new TestObject(rnd.nextInt(10000)), new TestObject(rnd.nextInt(10000)));
- IgniteCache<Object, Object> p2 = ((IgniteCacheProxy<Object, Object>)c).keepPortable();
+ IgniteCache<Object, Object> p2 = ((IgniteCacheProxy<Object, Object>)c).keepBinary();
BinaryObject v = (BinaryObject)p2.get(new TestObject(rnd.nextInt(10000)));
@@ -162,10 +162,10 @@ public abstract class GridCacheBinaryObjectsAbstractMultiThreadedSelfTest extend
break;
case 1:
- // Put/get int -> portable.
+ // Put/get int -> binary.
c.put(rnd.nextInt(10000), new TestObject(rnd.nextInt(10000)));
- IgniteCache<Integer, BinaryObject> p4 = ((IgniteCacheProxy<Object, Object>)c).keepPortable();
+ IgniteCache<Integer, BinaryObject> p4 = ((IgniteCacheProxy<Object, Object>)c).keepBinary();
BinaryObject v1 = p4.get(rnd.nextInt(10000));
http://git-wip-us.apache.org/repos/asf/ignite/blob/10b83fb8/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/binary/GridCacheBinaryObjectsAbstractSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/binary/GridCacheBinaryObjectsAbstractSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/binary/GridCacheBinaryObjectsAbstractSelfTest.java
index d24e1e4..2da781b 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/binary/GridCacheBinaryObjectsAbstractSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/binary/GridCacheBinaryObjectsAbstractSelfTest.java
@@ -68,7 +68,7 @@ import static org.apache.ignite.transactions.TransactionIsolation.READ_COMMITTED
import static org.apache.ignite.transactions.TransactionIsolation.REPEATABLE_READ;
/**
- * Test for portable objects stored in cache.
+ * Test for binary objects stored in cache.
*/
public abstract class GridCacheBinaryObjectsAbstractSelfTest extends GridCommonAbstractTest {
/** */
@@ -184,7 +184,7 @@ public abstract class GridCacheBinaryObjectsAbstractSelfTest extends GridCommonA
*/
@SuppressWarnings("unchecked")
public void testCircularReference() throws Exception {
- IgniteCache c = keepPortableCache();
+ IgniteCache c = keepBinaryCache();
TestReferenceObject obj1 = new TestReferenceObject();
@@ -229,7 +229,7 @@ public abstract class GridCacheBinaryObjectsAbstractSelfTest extends GridCommonA
assertEquals(i, obj.val);
}
- IgniteCache<Integer, BinaryObject> kpc = keepPortableCache();
+ IgniteCache<Integer, BinaryObject> kpc = keepBinaryCache();
for (int i = 0; i < ENTRY_CNT; i++) {
BinaryObject po = kpc.get(i);
@@ -254,7 +254,7 @@ public abstract class GridCacheBinaryObjectsAbstractSelfTest extends GridCommonA
entries.put(i, val);
}
- IgniteCache<Integer, BinaryObject> prj = ((IgniteCacheProxy)c).keepPortable();
+ IgniteCache<Integer, BinaryObject> prj = ((IgniteCacheProxy)c).keepBinary();
Iterator<Cache.Entry<Integer, BinaryObject>> it = prj.iterator();
@@ -306,7 +306,7 @@ public abstract class GridCacheBinaryObjectsAbstractSelfTest extends GridCommonA
}
}
- IgniteCache<Integer, Collection<BinaryObject>> kpc = keepPortableCache();
+ IgniteCache<Integer, Collection<BinaryObject>> kpc = keepBinaryCache();
for (int i = 0; i < ENTRY_CNT; i++) {
Collection<BinaryObject> col = kpc.get(i);
@@ -353,7 +353,7 @@ public abstract class GridCacheBinaryObjectsAbstractSelfTest extends GridCommonA
}
}
- IgniteCache<Integer, Map<Integer, BinaryObject>> kpc = keepPortableCache();
+ IgniteCache<Integer, Map<Integer, BinaryObject>> kpc = keepBinaryCache();
for (int i = 0; i < ENTRY_CNT; i++) {
Map<Integer, BinaryObject> map = kpc.get(i);
@@ -389,14 +389,14 @@ public abstract class GridCacheBinaryObjectsAbstractSelfTest extends GridCommonA
assertEquals(i, obj.val);
}
- IgniteCache<Integer, BinaryObject> kpc = keepPortableCache();
+ IgniteCache<Integer, BinaryObject> kpc = keepBinaryCache();
- IgniteCache<Integer, BinaryObject> cachePortableAsync = kpc.withAsync();
+ IgniteCache<Integer, BinaryObject> cacheBinaryAsync = kpc.withAsync();
for (int i = 0; i < ENTRY_CNT; i++) {
- cachePortableAsync.get(i);
+ cacheBinaryAsync.get(i);
- BinaryObject po = cachePortableAsync.<BinaryObject>future().get();
+ BinaryObject po = cacheBinaryAsync.<BinaryObject>future().get();
assertEquals(i, (int)po.field("val"));
}
@@ -434,7 +434,7 @@ public abstract class GridCacheBinaryObjectsAbstractSelfTest extends GridCommonA
}
}
- IgniteCache<Integer, BinaryObject> kpc = keepPortableCache();
+ IgniteCache<Integer, BinaryObject> kpc = keepBinaryCache();
for (int i = 0; i < ENTRY_CNT; i++) {
try (Transaction tx = grid(0).transactions().txStart(PESSIMISTIC, REPEATABLE_READ)) {
@@ -483,14 +483,14 @@ public abstract class GridCacheBinaryObjectsAbstractSelfTest extends GridCommonA
}
}
- IgniteCache<Integer, BinaryObject> kpc = keepPortableCache();
- IgniteCache<Integer, BinaryObject> cachePortableAsync = kpc.withAsync();
+ IgniteCache<Integer, BinaryObject> kpc = keepBinaryCache();
+ IgniteCache<Integer, BinaryObject> cacheBinaryAsync = kpc.withAsync();
for (int i = 0; i < ENTRY_CNT; i++) {
try (Transaction tx = grid(0).transactions().txStart(PESSIMISTIC, REPEATABLE_READ)) {
- cachePortableAsync.get(i);
+ cacheBinaryAsync.get(i);
- BinaryObject po = cachePortableAsync.<BinaryObject>future().get();
+ BinaryObject po = cacheBinaryAsync.<BinaryObject>future().get();
assertEquals(i, (int)po.field("val"));
@@ -522,7 +522,7 @@ public abstract class GridCacheBinaryObjectsAbstractSelfTest extends GridCommonA
assertEquals(e.getKey().intValue(), e.getValue().val);
}
- IgniteCache<Integer, BinaryObject> kpc = keepPortableCache();
+ IgniteCache<Integer, BinaryObject> kpc = keepBinaryCache();
for (int i = 0; i < ENTRY_CNT; ) {
Set<Integer> keys = new HashSet<>();
@@ -566,8 +566,8 @@ public abstract class GridCacheBinaryObjectsAbstractSelfTest extends GridCommonA
assertEquals(e.getKey().intValue(), e.getValue().val);
}
- IgniteCache<Integer, BinaryObject> kpc = keepPortableCache();
- IgniteCache<Integer, BinaryObject> cachePortableAsync = kpc.withAsync();
+ IgniteCache<Integer, BinaryObject> kpc = keepBinaryCache();
+ IgniteCache<Integer, BinaryObject> cacheBinaryAsync = kpc.withAsync();
for (int i = 0; i < ENTRY_CNT; ) {
Set<Integer> keys = new HashSet<>();
@@ -576,9 +576,9 @@ public abstract class GridCacheBinaryObjectsAbstractSelfTest extends GridCommonA
keys.add(i++);
- cachePortableAsync.getAll(keys);
+ cacheBinaryAsync.getAll(keys);
- Map<Integer, BinaryObject> objs = cachePortableAsync.<Map<Integer, BinaryObject>>future().get();
+ Map<Integer, BinaryObject> objs = cacheBinaryAsync.<Map<Integer, BinaryObject>>future().get();
assertEquals(10, objs.size());
@@ -628,7 +628,7 @@ public abstract class GridCacheBinaryObjectsAbstractSelfTest extends GridCommonA
}
}
- IgniteCache<Integer, BinaryObject> kpc = keepPortableCache();
+ IgniteCache<Integer, BinaryObject> kpc = keepBinaryCache();
for (int i = 0; i < ENTRY_CNT; ) {
Set<Integer> keys = new HashSet<>();
@@ -693,7 +693,7 @@ public abstract class GridCacheBinaryObjectsAbstractSelfTest extends GridCommonA
}
}
- IgniteCache<Integer, BinaryObject> cache = keepPortableCache();
+ IgniteCache<Integer, BinaryObject> cache = keepBinaryCache();
for (int i = 0; i < ENTRY_CNT; ) {
Set<Integer> keys = new HashSet<>();
@@ -785,7 +785,7 @@ public abstract class GridCacheBinaryObjectsAbstractSelfTest extends GridCommonA
* @throws Exception If failed.
*/
public void testTransform() throws Exception {
- IgniteCache<Integer, BinaryObject> c = keepPortableCache();
+ IgniteCache<Integer, BinaryObject> c = keepBinaryCache();
checkTransform(primaryKey(c));
@@ -798,9 +798,9 @@ public abstract class GridCacheBinaryObjectsAbstractSelfTest extends GridCommonA
}
/**
- * @return Cache with keep portable flag.
+ * @return Cache with keep binary flag.
*/
- private <K, V> IgniteCache<K, V> keepPortableCache() {
+ private <K, V> IgniteCache<K, V> keepBinaryCache() {
return ignite(0).cache(null).withKeepBinary();
}
@@ -811,7 +811,7 @@ public abstract class GridCacheBinaryObjectsAbstractSelfTest extends GridCommonA
private void checkTransform(Integer key) throws Exception {
log.info("Transform: " + key);
- IgniteCache<Integer, BinaryObject> c = keepPortableCache();
+ IgniteCache<Integer, BinaryObject> c = keepBinaryCache();
try {
c.invoke(key, new EntryProcessor<Integer, BinaryObject, Void>() {
@@ -836,9 +836,9 @@ public abstract class GridCacheBinaryObjectsAbstractSelfTest extends GridCommonA
Ignite ignite = e.unwrap(Ignite.class);
- IgniteBinary portables = ignite.binary();
+ IgniteBinary binaries = ignite.binary();
- BinaryObjectBuilder builder = portables.builder(val);
+ BinaryObjectBuilder builder = binaries.builder(val);
builder.setField("val", 2);
http://git-wip-us.apache.org/repos/asf/ignite/blob/10b83fb8/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/binary/GridCacheBinaryStoreAbstractSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/binary/GridCacheBinaryStoreAbstractSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/binary/GridCacheBinaryStoreAbstractSelfTest.java
index 058dc0b..4f478f7 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/binary/GridCacheBinaryStoreAbstractSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/binary/GridCacheBinaryStoreAbstractSelfTest.java
@@ -62,7 +62,7 @@ public abstract class GridCacheBinaryStoreAbstractSelfTest extends GridCommonAbs
CacheConfiguration cacheCfg = new CacheConfiguration();
cacheCfg.setCacheStoreFactory(singletonFactory(STORE));
- cacheCfg.setKeepBinaryInStore(keepPortableInStore());
+ cacheCfg.setKeepBinaryInStore(keepBinaryInStore());
cacheCfg.setReadThrough(true);
cacheCfg.setWriteThrough(true);
cacheCfg.setLoadPreviousValue(true);
@@ -81,7 +81,7 @@ public abstract class GridCacheBinaryStoreAbstractSelfTest extends GridCommonAbs
/**
* @return Keep binary in store flag.
*/
- protected abstract boolean keepPortableInStore();
+ protected abstract boolean keepBinaryInStore();
/** {@inheritDoc} */
@Override protected void beforeTestsStarted() throws Exception {
http://git-wip-us.apache.org/repos/asf/ignite/blob/10b83fb8/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/binary/GridCacheBinaryStoreBinariesSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/binary/GridCacheBinaryStoreBinariesSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/binary/GridCacheBinaryStoreBinariesSelfTest.java
index 55f2da0..4d163b3 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/binary/GridCacheBinaryStoreBinariesSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/binary/GridCacheBinaryStoreBinariesSelfTest.java
@@ -24,7 +24,7 @@ import org.apache.ignite.binary.BinaryObject;
*/
public class GridCacheBinaryStoreBinariesSelfTest extends GridCacheBinaryStoreAbstractSelfTest {
/** {@inheritDoc} */
- @Override protected boolean keepPortableInStore() {
+ @Override protected boolean keepBinaryInStore() {
return true;
}
@@ -34,7 +34,7 @@ public class GridCacheBinaryStoreBinariesSelfTest extends GridCacheBinaryStoreAb
assert idxs != null;
for (int idx : idxs)
- map.put(portable(new Key(idx)), portable(new Value(idx)));
+ map.put(binary(new Key(idx)), binary(new Value(idx)));
}
/** {@inheritDoc} */
@@ -45,7 +45,7 @@ public class GridCacheBinaryStoreBinariesSelfTest extends GridCacheBinaryStoreAb
assertEquals(idxs.length, map.size());
for (int idx : idxs) {
- Object val = map.get(portable(new Key(idx)));
+ Object val = map.get(binary(new Key(idx)));
assertTrue(String.valueOf(val), val instanceof BinaryObject);
@@ -58,9 +58,9 @@ public class GridCacheBinaryStoreBinariesSelfTest extends GridCacheBinaryStoreAb
/**
* @param obj Object.
- * @return Portable object.
+ * @return Binary object.
*/
- private Object portable(Object obj) {
+ private Object binary(Object obj) {
return grid().binary().toBinary(obj);
}
}
http://git-wip-us.apache.org/repos/asf/ignite/blob/10b83fb8/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/binary/GridCacheBinaryStoreObjectsSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/binary/GridCacheBinaryStoreObjectsSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/binary/GridCacheBinaryStoreObjectsSelfTest.java
index a4d08ec..1096c15 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/binary/GridCacheBinaryStoreObjectsSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/binary/GridCacheBinaryStoreObjectsSelfTest.java
@@ -24,7 +24,7 @@ import java.util.Map;
*/
public class GridCacheBinaryStoreObjectsSelfTest extends GridCacheBinaryStoreAbstractSelfTest {
/** {@inheritDoc} */
- @Override protected boolean keepPortableInStore() {
+ @Override protected boolean keepBinaryInStore() {
return false;
}
http://git-wip-us.apache.org/repos/asf/ignite/blob/10b83fb8/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/binary/GridCacheClientNodeBinaryObjectMetadataMultinodeTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/binary/GridCacheClientNodeBinaryObjectMetadataMultinodeTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/binary/GridCacheClientNodeBinaryObjectMetadataMultinodeTest.java
index 004494e..fee302b 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/binary/GridCacheClientNodeBinaryObjectMetadataMultinodeTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/binary/GridCacheClientNodeBinaryObjectMetadataMultinodeTest.java
@@ -96,10 +96,10 @@ public class GridCacheClientNodeBinaryObjectMetadataMultinodeTest extends GridCo
IgniteInternalFuture<?> fut;
try {
- // Update portable metadata concurrently with client nodes start.
+ // Update binary metadata concurrently with client nodes start.
fut = GridTestUtils.runMultiThreadedAsync(new Callable<Object>() {
@Override public Object call() throws Exception {
- IgniteBinary portables = ignite(0).binary();
+ IgniteBinary binaries = ignite(0).binary();
IgniteCache<Object, Object> cache = ignite(0).cache(null).withKeepBinary();
@@ -108,12 +108,12 @@ public class GridCacheClientNodeBinaryObjectMetadataMultinodeTest extends GridCo
for (int i = 0; i < 1000; i++) {
log.info("Iteration: " + i);
- String type = "portable-type-" + i;
+ String type = "binary-type-" + i;
allTypes.add(type);
for (int f = 0; f < 10; f++) {
- BinaryObjectBuilder builder = portables.builder(type);
+ BinaryObjectBuilder builder = binaries.builder(type);
String fieldName = "f" + f;
@@ -145,7 +145,7 @@ public class GridCacheClientNodeBinaryObjectMetadataMultinodeTest extends GridCo
assertFalse(allTypes.isEmpty());
- log.info("Expected portable types: " + allTypes.size());
+ log.info("Expected binary types: " + allTypes.size());
assertEquals(7, ignite(0).cluster().nodes().size());
@@ -156,9 +156,9 @@ public class GridCacheClientNodeBinaryObjectMetadataMultinodeTest extends GridCo
assertEquals((Object)client, ignite(i).configuration().isClientMode());
- IgniteBinary portables = ignite(i).binary();
+ IgniteBinary binaries = ignite(i).binary();
- Collection<BinaryType> metaCol = portables.types();
+ Collection<BinaryType> metaCol = binaries.types();
assertEquals(allTypes.size(), metaCol.size());
@@ -182,12 +182,12 @@ public class GridCacheClientNodeBinaryObjectMetadataMultinodeTest extends GridCo
public void testFailoverOnStart() throws Exception {
startGrids(4);
- IgniteBinary portables = ignite(0).binary();
+ IgniteBinary binaries = ignite(0).binary();
IgniteCache<Object, Object> cache = ignite(0).cache(null).withKeepBinary();
for (int i = 0; i < 1000; i++) {
- BinaryObjectBuilder builder = portables.builder("type-" + i);
+ BinaryObjectBuilder builder = binaries.builder("type-" + i);
builder.setField("f0", i);
@@ -232,9 +232,9 @@ public class GridCacheClientNodeBinaryObjectMetadataMultinodeTest extends GridCo
assertEquals((Object) client, ignite(i).configuration().isClientMode());
- portables = ignite(i).binary();
+ binaries = ignite(i).binary();
- final IgniteBinary p0 = portables;
+ final IgniteBinary p0 = binaries;
GridTestUtils.waitForCondition(new GridAbsPredicate() {
@Override public boolean apply() {
@@ -244,7 +244,7 @@ public class GridCacheClientNodeBinaryObjectMetadataMultinodeTest extends GridCo
}
}, getTestTimeout());
- Collection<BinaryType> metaCol = portables.types();
+ Collection<BinaryType> metaCol = binaries.types();
assertEquals(1000, metaCol.size());
@@ -278,12 +278,12 @@ public class GridCacheClientNodeBinaryObjectMetadataMultinodeTest extends GridCo
assertFalse(ignite1.configuration().isClientMode());
- IgniteBinary portables = ignite(1).binary();
+ IgniteBinary binaries = ignite(1).binary();
IgniteCache<Object, Object> cache = ignite(1).cache(null).withKeepBinary();
for (int i = 0; i < 100; i++) {
- BinaryObjectBuilder builder = portables.builder("type-" + i);
+ BinaryObjectBuilder builder = binaries.builder("type-" + i);
builder.setField("f0", i);
http://git-wip-us.apache.org/repos/asf/ignite/blob/10b83fb8/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/binary/GridCacheClientNodeBinaryObjectMetadataTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/binary/GridCacheClientNodeBinaryObjectMetadataTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/binary/GridCacheClientNodeBinaryObjectMetadataTest.java
index 2a71748..b91b088 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/binary/GridCacheClientNodeBinaryObjectMetadataTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/binary/GridCacheClientNodeBinaryObjectMetadataTest.java
@@ -94,7 +94,7 @@ public class GridCacheClientNodeBinaryObjectMetadataTest extends GridCacheAbstra
/**
* @throws Exception If failed.
*/
- public void testPortableMetadataOnClient() throws Exception {
+ public void testBinaryMetadataOnClient() throws Exception {
Ignite ignite0 = ignite(gridCount() - 1);
assertTrue(ignite0.configuration().isClientMode());
http://git-wip-us.apache.org/repos/asf/ignite/blob/10b83fb8/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/binary/datastreaming/GridDataStreamerImplSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/binary/datastreaming/GridDataStreamerImplSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/binary/datastreaming/GridDataStreamerImplSelfTest.java
index 125a055..4caa5fb 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/binary/datastreaming/GridDataStreamerImplSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/binary/datastreaming/GridDataStreamerImplSelfTest.java
@@ -55,7 +55,7 @@ public class GridDataStreamerImplSelfTest extends GridCommonAbstractTest {
private static final int KEYS_COUNT = 1000;
/** Flag indicating should be cache configured with binary or not. */
- private static boolean portables;
+ private static boolean binaries;
/** {@inheritDoc} */
@Override protected IgniteConfiguration getConfiguration(String gridName) throws Exception {
@@ -66,7 +66,7 @@ public class GridDataStreamerImplSelfTest extends GridCommonAbstractTest {
cfg.setDiscoverySpi(discoSpi);
- if (portables) {
+ if (binaries) {
BinaryMarshaller marsh = new BinaryMarshaller();
cfg.setMarshaller(marsh);
@@ -101,7 +101,7 @@ public class GridDataStreamerImplSelfTest extends GridCommonAbstractTest {
*/
public void testAddDataFromMap() throws Exception {
try {
- portables = false;
+ binaries = false;
startGrids(2);
@@ -143,13 +143,13 @@ public class GridDataStreamerImplSelfTest extends GridCommonAbstractTest {
}
/**
- * Data streamer should add portable object that weren't registered explicitly.
+ * Data streamer should add binary object that weren't registered explicitly.
*
* @throws Exception If failed.
*/
- public void testAddMissingPortable() throws Exception {
+ public void testAddMissingBinary() throws Exception {
try {
- portables = true;
+ binaries = true;
startGrids(2);
@@ -177,14 +177,14 @@ public class GridDataStreamerImplSelfTest extends GridCommonAbstractTest {
}
/**
- * Data streamer should correctly load portable entries from HashMap in case of grids with more than one node
+ * Data streamer should correctly load binary entries from HashMap in case of grids with more than one node
* and with GridOptimizedMarshaller that requires serializable.
*
* @throws Exception If failed.
*/
- public void testAddPortableDataFromMap() throws Exception {
+ public void testAddBinaryDataFromMap() throws Exception {
try {
- portables = true;
+ binaries = true;
startGrids(2);
@@ -220,8 +220,8 @@ public class GridDataStreamerImplSelfTest extends GridCommonAbstractTest {
assertEquals(k, v.val());
}
- // Read random keys. Take values as PortableObject.
- IgniteCache<Integer, BinaryObject> c2 = ((IgniteCacheProxy)c).keepPortable();
+ // Read random keys. Take values as BinaryObject.
+ IgniteCache<Integer, BinaryObject> c2 = ((IgniteCacheProxy)c).keepBinary();
for (int i = 0; i < 100; i ++) {
Integer k = rnd.nextInt(KEYS_COUNT);
http://git-wip-us.apache.org/repos/asf/ignite/blob/10b83fb8/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/binary/distributed/dht/GridCacheBinaryObjectsAtomicNearDisabledSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/binary/distributed/dht/GridCacheBinaryObjectsAtomicNearDisabledSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/binary/distributed/dht/GridCacheBinaryObjectsAtomicNearDisabledSelfTest.java
index 0199217..db57cf9 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/binary/distributed/dht/GridCacheBinaryObjectsAtomicNearDisabledSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/binary/distributed/dht/GridCacheBinaryObjectsAtomicNearDisabledSelfTest.java
@@ -26,7 +26,7 @@ import static org.apache.ignite.cache.CacheAtomicityMode.ATOMIC;
import static org.apache.ignite.cache.CacheMode.PARTITIONED;
/**
- * Test for portable objects stored in cache.
+ * Test for binary objects stored in cache.
*/
public class GridCacheBinaryObjectsAtomicNearDisabledSelfTest extends GridCacheBinaryObjectsAbstractSelfTest {
/** {@inheritDoc} */
http://git-wip-us.apache.org/repos/asf/ignite/blob/10b83fb8/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/binary/distributed/dht/GridCacheBinaryObjectsAtomicSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/binary/distributed/dht/GridCacheBinaryObjectsAtomicSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/binary/distributed/dht/GridCacheBinaryObjectsAtomicSelfTest.java
index fcdd184..7501abc 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/binary/distributed/dht/GridCacheBinaryObjectsAtomicSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/binary/distributed/dht/GridCacheBinaryObjectsAtomicSelfTest.java
@@ -26,7 +26,7 @@ import static org.apache.ignite.cache.CacheAtomicityMode.ATOMIC;
import static org.apache.ignite.cache.CacheMode.PARTITIONED;
/**
- * Test for portable objects stored in cache.
+ * Test for binary objects stored in cache.
*/
public class GridCacheBinaryObjectsAtomicSelfTest extends GridCacheBinaryObjectsAbstractSelfTest {
/** {@inheritDoc} */
http://git-wip-us.apache.org/repos/asf/ignite/blob/10b83fb8/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/binary/distributed/dht/GridCacheBinaryObjectsPartitionedNearDisabledSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/binary/distributed/dht/GridCacheBinaryObjectsPartitionedNearDisabledSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/binary/distributed/dht/GridCacheBinaryObjectsPartitionedNearDisabledSelfTest.java
index dc439d7..a512bdf 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/binary/distributed/dht/GridCacheBinaryObjectsPartitionedNearDisabledSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/binary/distributed/dht/GridCacheBinaryObjectsPartitionedNearDisabledSelfTest.java
@@ -26,7 +26,7 @@ import static org.apache.ignite.cache.CacheAtomicityMode.TRANSACTIONAL;
import static org.apache.ignite.cache.CacheMode.PARTITIONED;
/**
- * Test for portable objects stored in cache.
+ * Test for binary objects stored in cache.
*/
public class GridCacheBinaryObjectsPartitionedNearDisabledSelfTest extends GridCacheBinaryObjectsAbstractSelfTest {
/** {@inheritDoc} */
http://git-wip-us.apache.org/repos/asf/ignite/blob/10b83fb8/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/binary/distributed/dht/GridCacheBinaryObjectsPartitionedSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/binary/distributed/dht/GridCacheBinaryObjectsPartitionedSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/binary/distributed/dht/GridCacheBinaryObjectsPartitionedSelfTest.java
index 550ae3f..341b571 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/binary/distributed/dht/GridCacheBinaryObjectsPartitionedSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/binary/distributed/dht/GridCacheBinaryObjectsPartitionedSelfTest.java
@@ -26,7 +26,7 @@ import static org.apache.ignite.cache.CacheAtomicityMode.TRANSACTIONAL;
import static org.apache.ignite.cache.CacheMode.PARTITIONED;
/**
- * Test for portable objects stored in cache.
+ * Test for binary objects stored in cache.
*/
public class GridCacheBinaryObjectsPartitionedSelfTest extends GridCacheBinaryObjectsAbstractSelfTest {
/** {@inheritDoc} */
http://git-wip-us.apache.org/repos/asf/ignite/blob/10b83fb8/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/binary/distributed/dht/GridCacheOffHeapTieredAtomicBinarySelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/binary/distributed/dht/GridCacheOffHeapTieredAtomicBinarySelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/binary/distributed/dht/GridCacheOffHeapTieredAtomicBinarySelfTest.java
index 3494b5c..d9b4663 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/binary/distributed/dht/GridCacheOffHeapTieredAtomicBinarySelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/binary/distributed/dht/GridCacheOffHeapTieredAtomicBinarySelfTest.java
@@ -28,7 +28,7 @@ import org.apache.ignite.internal.binary.BinaryMarshaller;
*/
public class GridCacheOffHeapTieredAtomicBinarySelfTest extends GridCacheOffHeapTieredAtomicSelfTest {
/** {@inheritDoc} */
- @Override protected boolean portableEnabled() {
+ @Override protected boolean binaryEnabled() {
return true;
}
http://git-wip-us.apache.org/repos/asf/ignite/blob/10b83fb8/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/binary/distributed/dht/GridCacheOffHeapTieredBinarySelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/binary/distributed/dht/GridCacheOffHeapTieredBinarySelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/binary/distributed/dht/GridCacheOffHeapTieredBinarySelfTest.java
index 7cde9e7..abfc739 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/binary/distributed/dht/GridCacheOffHeapTieredBinarySelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/binary/distributed/dht/GridCacheOffHeapTieredBinarySelfTest.java
@@ -28,7 +28,7 @@ import org.apache.ignite.internal.binary.BinaryMarshaller;
*/
public class GridCacheOffHeapTieredBinarySelfTest extends GridCacheOffHeapTieredSelfTest {
/** {@inheritDoc} */
- @Override protected boolean portableEnabled() {
+ @Override protected boolean binaryEnabled() {
return true;
}
http://git-wip-us.apache.org/repos/asf/ignite/blob/10b83fb8/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/binary/distributed/dht/GridCacheOffHeapTieredEvictionAtomicBinarySelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/binary/distributed/dht/GridCacheOffHeapTieredEvictionAtomicBinarySelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/binary/distributed/dht/GridCacheOffHeapTieredEvictionAtomicBinarySelfTest.java
index 79fe8d3..aec896a 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/binary/distributed/dht/GridCacheOffHeapTieredEvictionAtomicBinarySelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/binary/distributed/dht/GridCacheOffHeapTieredEvictionAtomicBinarySelfTest.java
@@ -44,24 +44,24 @@ public class GridCacheOffHeapTieredEvictionAtomicBinarySelfTest extends GridCach
/** {@inheritDoc} */
@Override protected TestPredicate testPredicate(String expVal, boolean acceptNull) {
- return new PortableValuePredicate(expVal, acceptNull);
+ return new BinaryValuePredicate(expVal, acceptNull);
}
/** {@inheritDoc} */
@Override protected TestProcessor testClosure(String expVal, boolean acceptNull) {
- return new PortableValueClosure(expVal, acceptNull);
+ return new BinaryValueClosure(expVal, acceptNull);
}
/**
*
*/
@SuppressWarnings("PackageVisibleInnerClass")
- static class PortableValuePredicate extends TestPredicate {
+ static class BinaryValuePredicate extends TestPredicate {
/**
* @param expVal Expected value.
* @param acceptNull If {@code true} value can be null;
*/
- PortableValuePredicate(String expVal, boolean acceptNull) {
+ BinaryValuePredicate(String expVal, boolean acceptNull) {
super(expVal, acceptNull);
}
@@ -77,12 +77,12 @@ public class GridCacheOffHeapTieredEvictionAtomicBinarySelfTest extends GridCach
*
*/
@SuppressWarnings("PackageVisibleInnerClass")
- static class PortableValueClosure extends TestProcessor {
+ static class BinaryValueClosure extends TestProcessor {
/**
* @param expVal Expected value.
* @param acceptNull If {@code true} value can be null;
*/
- PortableValueClosure(String expVal, boolean acceptNull) {
+ BinaryValueClosure(String expVal, boolean acceptNull) {
super(expVal, acceptNull);
}
http://git-wip-us.apache.org/repos/asf/ignite/blob/10b83fb8/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/binary/distributed/dht/GridCacheOffHeapTieredEvictionBinarySelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/binary/distributed/dht/GridCacheOffHeapTieredEvictionBinarySelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/binary/distributed/dht/GridCacheOffHeapTieredEvictionBinarySelfTest.java
index 9a47e4f..3138eb7 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/binary/distributed/dht/GridCacheOffHeapTieredEvictionBinarySelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/binary/distributed/dht/GridCacheOffHeapTieredEvictionBinarySelfTest.java
@@ -44,24 +44,24 @@ public class GridCacheOffHeapTieredEvictionBinarySelfTest extends GridCacheOffHe
/** {@inheritDoc} */
@Override protected TestPredicate testPredicate(String expVal, boolean acceptNull) {
- return new PortableValuePredicate(expVal, acceptNull);
+ return new BinaryValuePredicate(expVal, acceptNull);
}
/** {@inheritDoc} */
@Override protected TestProcessor testClosure(String expVal, boolean acceptNull) {
- return new PortableValueClosure(expVal, acceptNull);
+ return new BinaryValueClosure(expVal, acceptNull);
}
/**
*
*/
@SuppressWarnings("PackageVisibleInnerClass")
- static class PortableValuePredicate extends TestPredicate {
+ static class BinaryValuePredicate extends TestPredicate {
/**
* @param expVal Expected value.
* @param acceptNull If {@code true} value can be null;
*/
- PortableValuePredicate(String expVal, boolean acceptNull) {
+ BinaryValuePredicate(String expVal, boolean acceptNull) {
super(expVal, acceptNull);
}
@@ -77,12 +77,12 @@ public class GridCacheOffHeapTieredEvictionBinarySelfTest extends GridCacheOffHe
*
*/
@SuppressWarnings("PackageVisibleInnerClass")
- static class PortableValueClosure extends TestProcessor {
+ static class BinaryValueClosure extends TestProcessor {
/**
* @param expVal Expected value.
* @param acceptNull If {@code true} value can be null;
*/
- PortableValueClosure(String expVal, boolean acceptNull) {
+ BinaryValueClosure(String expVal, boolean acceptNull) {
super(expVal, acceptNull);
}
http://git-wip-us.apache.org/repos/asf/ignite/blob/10b83fb8/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/binary/distributed/replicated/GridCacheBinaryObjectsReplicatedSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/binary/distributed/replicated/GridCacheBinaryObjectsReplicatedSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/binary/distributed/replicated/GridCacheBinaryObjectsReplicatedSelfTest.java
index 90f060f..719c564 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/binary/distributed/replicated/GridCacheBinaryObjectsReplicatedSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/binary/distributed/replicated/GridCacheBinaryObjectsReplicatedSelfTest.java
@@ -26,7 +26,7 @@ import static org.apache.ignite.cache.CacheAtomicityMode.TRANSACTIONAL;
import static org.apache.ignite.cache.CacheMode.REPLICATED;
/**
- * Test for portable objects stored in cache.
+ * Test for binary objects stored in cache.
*/
public class GridCacheBinaryObjectsReplicatedSelfTest extends GridCacheBinaryObjectsAbstractSelfTest {
/** {@inheritDoc} */
http://git-wip-us.apache.org/repos/asf/ignite/blob/10b83fb8/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/binary/local/GridCacheBinaryObjectsLocalSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/binary/local/GridCacheBinaryObjectsLocalSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/binary/local/GridCacheBinaryObjectsLocalSelfTest.java
index fc38561..2712181 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/binary/local/GridCacheBinaryObjectsLocalSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/binary/local/GridCacheBinaryObjectsLocalSelfTest.java
@@ -26,7 +26,7 @@ import static org.apache.ignite.cache.CacheAtomicityMode.TRANSACTIONAL;
import static org.apache.ignite.cache.CacheMode.LOCAL;
/**
- * Test for portable objects stored in cache.
+ * Test for binary objects stored in cache.
*/
public class GridCacheBinaryObjectsLocalSelfTest extends GridCacheBinaryObjectsAbstractSelfTest {
/** {@inheritDoc} */
http://git-wip-us.apache.org/repos/asf/ignite/blob/10b83fb8/modules/core/src/test/java/org/apache/ignite/platform/PlatformComputeEchoTask.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/platform/PlatformComputeEchoTask.java b/modules/core/src/test/java/org/apache/ignite/platform/PlatformComputeEchoTask.java
index a284883..03ab998 100644
--- a/modules/core/src/test/java/org/apache/ignite/platform/PlatformComputeEchoTask.java
+++ b/modules/core/src/test/java/org/apache/ignite/platform/PlatformComputeEchoTask.java
@@ -74,17 +74,17 @@ public class PlatformComputeEchoTask extends ComputeTaskAdapter<Integer, Object>
/** Type: map. */
private static final int TYPE_MAP = 11;
- /** Type: portable object which exists in all platforms. */
- private static final int TYPE_PORTABLE = 12;
+ /** Type: binary object which exists in all platforms. */
+ private static final int TYPE_BINARY = 12;
- /** Type: portable object which exists only in Java. */
- private static final int TYPE_PORTABLE_JAVA = 13;
+ /** Type: binary object which exists only in Java. */
+ private static final int TYPE_BINARY_JAVA = 13;
/** Type: object array. */
private static final int TYPE_OBJ_ARRAY = 14;
- /** Type: portable object array. */
- private static final int TYPE_PORTABLE_ARRAY = 15;
+ /** Type: binary object array. */
+ private static final int TYPE_BINARY_ARRAY = 15;
/** Type: enum. */
private static final int TYPE_ENUM = 16;
@@ -165,16 +165,16 @@ public class PlatformComputeEchoTask extends ComputeTaskAdapter<Integer, Object>
case TYPE_MAP:
return Collections.singletonMap(1, 1);
- case TYPE_PORTABLE:
+ case TYPE_BINARY:
return new PlatformComputeBinarizable(1);
- case TYPE_PORTABLE_JAVA:
+ case TYPE_BINARY_JAVA:
return new PlatformComputeJavaBinarizable(1);
case TYPE_OBJ_ARRAY:
return new String[] { "foo", "bar", "baz" };
- case TYPE_PORTABLE_ARRAY:
+ case TYPE_BINARY_ARRAY:
return new PlatformComputeBinarizable[] {
new PlatformComputeBinarizable(1),
new PlatformComputeBinarizable(2),
@@ -203,4 +203,4 @@ public class PlatformComputeEchoTask extends ComputeTaskAdapter<Integer, Object>
}
}
}
-}
\ No newline at end of file
+}
http://git-wip-us.apache.org/repos/asf/ignite/blob/10b83fb8/modules/core/src/test/java/org/apache/ignite/session/GridSessionCheckpointSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/session/GridSessionCheckpointSelfTest.java b/modules/core/src/test/java/org/apache/ignite/session/GridSessionCheckpointSelfTest.java
index f3374c4..3038cba 100644
--- a/modules/core/src/test/java/org/apache/ignite/session/GridSessionCheckpointSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/session/GridSessionCheckpointSelfTest.java
@@ -102,7 +102,7 @@ public class GridSessionCheckpointSelfTest extends GridSessionCheckpointAbstract
marsh.setContext(new MarshallerContextTestImpl(null));
- IgniteUtils.invoke(BinaryMarshaller.class, marsh, "setPortableContext", ctx, cfg);
+ IgniteUtils.invoke(BinaryMarshaller.class, marsh, "setBinaryContext", ctx, cfg);
}
GridSessionCheckpointSelfTest.spi = spi;
http://git-wip-us.apache.org/repos/asf/ignite/blob/10b83fb8/modules/core/src/test/java/org/apache/ignite/testframework/junits/IgniteTestResources.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/testframework/junits/IgniteTestResources.java b/modules/core/src/test/java/org/apache/ignite/testframework/junits/IgniteTestResources.java
index 67a4f20..4e3f326 100644
--- a/modules/core/src/test/java/org/apache/ignite/testframework/junits/IgniteTestResources.java
+++ b/modules/core/src/test/java/org/apache/ignite/testframework/junits/IgniteTestResources.java
@@ -266,7 +266,7 @@ public class IgniteTestResources {
if (marsh instanceof BinaryMarshaller) {
BinaryContext ctx = new BinaryContext(BinaryCachingMetadataHandler.create(), new IgniteConfiguration());
- IgniteUtils.invoke(BinaryMarshaller.class, marsh, "setPortableContext", ctx, new IgniteConfiguration());
+ IgniteUtils.invoke(BinaryMarshaller.class, marsh, "setBinaryContext", ctx, new IgniteConfiguration());
}
return marsh;
http://git-wip-us.apache.org/repos/asf/ignite/blob/10b83fb8/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteBinaryCacheFullApiTestSuite.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteBinaryCacheFullApiTestSuite.java b/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteBinaryCacheFullApiTestSuite.java
index 3dc78cc..e891d35 100644
--- a/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteBinaryCacheFullApiTestSuite.java
+++ b/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteBinaryCacheFullApiTestSuite.java
@@ -22,7 +22,7 @@ import org.apache.ignite.internal.binary.BinaryMarshaller;
import org.apache.ignite.testframework.config.GridTestProperties;
/**
- * Cache full API suite with portable marshaller.
+ * Cache full API suite with binary marshaller.
*/
public class IgniteBinaryCacheFullApiTestSuite extends TestSuite {
/**
http://git-wip-us.apache.org/repos/asf/ignite/blob/10b83fb8/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteBinaryCacheTestSuite.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteBinaryCacheTestSuite.java b/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteBinaryCacheTestSuite.java
index 729bebe..982bd4c 100644
--- a/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteBinaryCacheTestSuite.java
+++ b/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteBinaryCacheTestSuite.java
@@ -47,7 +47,7 @@ import org.apache.ignite.internal.processors.datastreamer.DataStreamProcessorSel
import org.apache.ignite.testframework.config.GridTestProperties;
/**
- * Cache suite with portable marshaller.
+ * Cache suite with binary marshaller.
*/
public class IgniteBinaryCacheTestSuite extends TestSuite {
/**
@@ -57,11 +57,11 @@ public class IgniteBinaryCacheTestSuite extends TestSuite {
public static TestSuite suite() throws Exception {
GridTestProperties.setProperty(GridTestProperties.MARSH_CLASS_NAME, BinaryMarshaller.class.getName());
- TestSuite suite = new TestSuite("Portable Cache Test Suite");
+ TestSuite suite = new TestSuite("Binary Cache Test Suite");
HashSet<Class> ignoredTests = new HashSet<>();
- // Tests below have a special version for Portable Marshaller
+ // Tests below have a special version for Binary Marshaller
ignoredTests.add(DataStreamProcessorSelfTest.class);
ignoredTests.add(GridCacheOffHeapTieredEvictionAtomicSelfTest.class);
ignoredTests.add(GridCacheOffHeapTieredEvictionSelfTest.class);
@@ -71,7 +71,7 @@ public class IgniteBinaryCacheTestSuite extends TestSuite {
ignoredTests.add(IgniteCacheAtomicLocalExpiryPolicyTest.class);
ignoredTests.add(GridCacheEntryMemorySizeSelfTest.class);
- // Tests that are not ready to be used with PortableMarshaller
+ // Tests that are not ready to be used with BinaryMarshaller
ignoredTests.add(GridCacheMvccSelfTest.class);
suite.addTest(IgniteCacheTestSuite.suite(ignoredTests));
http://git-wip-us.apache.org/repos/asf/ignite/blob/10b83fb8/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteBinaryObjectsCacheTestSuite3.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteBinaryObjectsCacheTestSuite3.java b/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteBinaryObjectsCacheTestSuite3.java
index 7a6a0a6..d80478b 100644
--- a/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteBinaryObjectsCacheTestSuite3.java
+++ b/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteBinaryObjectsCacheTestSuite3.java
@@ -34,7 +34,7 @@ public class IgniteBinaryObjectsCacheTestSuite3 {
public static TestSuite suite() throws Exception {
GridTestProperties.setProperty(GridTestProperties.MARSH_CLASS_NAME, BinaryMarshaller.class.getName());
GridTestProperties.setProperty(GridTestProperties.ENTRY_PROCESSOR_CLASS_NAME,
- "org.apache.ignite.tests.p2p.CacheDeploymentPortableEntryProcessor");
+ "org.apache.ignite.tests.p2p.CacheDeploymentBinaryEntryProcessor");
TestSuite suite = IgniteCacheTestSuite3.suite();
[04/24] ignite git commit: ignite-2065: portable -> binary renaming
(methods, javadoc and etc.)
Posted by ak...@apache.org.
http://git-wip-us.apache.org/repos/asf/ignite/blob/10b83fb8/modules/core/src/main/java/org/apache/ignite/internal/processors/rest/client/message/GridClientBinaryMetaData.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/rest/client/message/GridClientBinaryMetaData.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/rest/client/message/GridClientBinaryMetaData.java
index daa056b..f1fd99c 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/rest/client/message/GridClientBinaryMetaData.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/rest/client/message/GridClientBinaryMetaData.java
@@ -21,7 +21,7 @@ import java.util.Map;
import org.apache.ignite.internal.util.typedef.internal.S;
/**
- * Portable meta data sent from client.
+ * Binary meta data sent from client.
*/
public class GridClientBinaryMetaData {
/** */
http://git-wip-us.apache.org/repos/asf/ignite/blob/10b83fb8/modules/core/src/main/java/org/apache/ignite/internal/processors/rest/client/message/GridClientTaskRequest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/rest/client/message/GridClientTaskRequest.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/rest/client/message/GridClientTaskRequest.java
index 3ac16f2..4977430 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/rest/client/message/GridClientTaskRequest.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/rest/client/message/GridClientTaskRequest.java
@@ -36,7 +36,7 @@ public class GridClientTaskRequest extends GridClientAbstractMessage {
private Object arg;
/** Keep binary flag. */
- private boolean keepPortables;
+ private boolean keepBinaries;
/**
* @return Task name.
@@ -69,15 +69,15 @@ public class GridClientTaskRequest extends GridClientAbstractMessage {
/**
* @return Keep binary flag.
*/
- public boolean keepPortables() {
- return keepPortables;
+ public boolean keepBinaries() {
+ return keepBinaries;
}
/**
- * @param keepPortables Keep binary flag.
+ * @param keepBinaries Keep binary flag.
*/
- public void keepPortables(boolean keepPortables) {
- this.keepPortables = keepPortables;
+ public void keepBinaries(boolean keepBinaries) {
+ this.keepBinaries = keepBinaries;
}
/** {@inheritDoc} */
@@ -122,4 +122,4 @@ public class GridClientTaskRequest extends GridClientAbstractMessage {
@Override public String toString() {
return getClass().getSimpleName() + " [taskName=" + taskName + ", arg=" + arg + "]";
}
-}
\ 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/visor/util/VisorMimeTypes.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/visor/util/VisorMimeTypes.java b/modules/core/src/main/java/org/apache/ignite/internal/visor/util/VisorMimeTypes.java
index 1792e04..1c27ecb 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/visor/util/VisorMimeTypes.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/visor/util/VisorMimeTypes.java
@@ -276,7 +276,7 @@ public class VisorMimeTypes {
mimeTypes.put("htm", "text/html");
mimeTypes.put("docm", "application/vnd.ms-word.document.macroenabled.12");
mimeTypes.put("xdssc", "application/dssc+xml");
- mimeTypes.put("pbm", "image/x-portable-bitmap");
+ mimeTypes.put("pbm", "image/x-binary-bitmap");
mimeTypes.put("fdf", "application/vnd.fdf");
mimeTypes.put("ggt", "application/vnd.geogebra.tool");
mimeTypes.put("cii", "application/vnd.anser-web-certificate-issue-initiation");
@@ -760,7 +760,7 @@ public class VisorMimeTypes {
mimeTypes.put("otf", "application/x-font-otf");
mimeTypes.put("clkx", "application/vnd.crick.clicker");
mimeTypes.put("xbd", "application/vnd.fujixerox.docuworks.binder");
- mimeTypes.put("ppm", "image/x-portable-pixmap");
+ mimeTypes.put("ppm", "image/x-binary-pixmap");
mimeTypes.put("wav", "audio/x-wav");
mimeTypes.put("ssml", "application/ssml+xml");
mimeTypes.put("p7b", "application/x-pkcs7-certificates");
@@ -808,7 +808,7 @@ public class VisorMimeTypes {
mimeTypes.put("xenc", "application/xenc+xml");
mimeTypes.put("wpl", "application/vnd.ms-wpl");
mimeTypes.put("dxf", "image/vnd.dxf");
- mimeTypes.put("pgm", "image/x-portable-graymap");
+ mimeTypes.put("pgm", "image/x-binary-graymap");
mimeTypes.put("spot", "text/vnd.in3d.spot");
mimeTypes.put("odt", "application/vnd.oasis.opendocument.text");
mimeTypes.put("azs", "application/vnd.airzip.filesecure.azs");
@@ -817,7 +817,7 @@ public class VisorMimeTypes {
mimeTypes.put("dd2", "application/vnd.oma.dd2+xml");
mimeTypes.put("semf", "application/vnd.semf");
mimeTypes.put("semd", "application/vnd.semd");
- mimeTypes.put("pnm", "image/x-portable-anymap");
+ mimeTypes.put("pnm", "image/x-binary-anymap");
mimeTypes.put("sema", "application/vnd.sema");
mimeTypes.put("wma", "audio/x-ms-wma");
mimeTypes.put("cww", "application/prs.cww");
@@ -1017,4 +1017,4 @@ public class VisorMimeTypes {
return null;
}
-}
\ 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/marshaller/portable/package-info.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/marshaller/portable/package-info.java b/modules/core/src/main/java/org/apache/ignite/marshaller/portable/package-info.java
deleted file mode 100644
index 90cc5e6..0000000
--- a/modules/core/src/main/java/org/apache/ignite/marshaller/portable/package-info.java
+++ /dev/null
@@ -1,22 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-/**
- * <!-- Package description. -->
- * Contains portable marshaller API classes.
- */
-package org.apache.ignite.marshaller.portable;
\ 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/platform/dotnet/PlatformDotNetBinaryConfiguration.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/platform/dotnet/PlatformDotNetBinaryConfiguration.java b/modules/core/src/main/java/org/apache/ignite/platform/dotnet/PlatformDotNetBinaryConfiguration.java
index 3914c32..7c5da2f 100644
--- a/modules/core/src/main/java/org/apache/ignite/platform/dotnet/PlatformDotNetBinaryConfiguration.java
+++ b/modules/core/src/main/java/org/apache/ignite/platform/dotnet/PlatformDotNetBinaryConfiguration.java
@@ -41,7 +41,7 @@ public class PlatformDotNetBinaryConfiguration {
/** Default serializer. */
private String dfltSerializer;
- /** Whether to cache deserialized value in IGridPortableObject */
+ /** Whether to cache deserialized value in IGridBinaryObject */
private boolean dfltKeepDeserialized = true;
/**
@@ -145,7 +145,7 @@ public class PlatformDotNetBinaryConfiguration {
/**
* Gets default keep deserialized flag. See {@link #setDefaultKeepDeserialized(boolean)} for more information.
*
- * @return Flag indicates whether to cache deserialized value in IGridPortableObject.
+ * @return Flag indicates whether to cache deserialized value in IGridBinaryObject.
*/
public boolean isDefaultKeepDeserialized() {
return dfltKeepDeserialized;
@@ -167,4 +167,4 @@ public class PlatformDotNetBinaryConfiguration {
@Override public String toString() {
return S.toString(PlatformDotNetBinaryConfiguration.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/platform/dotnet/PlatformDotNetConfiguration.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/platform/dotnet/PlatformDotNetConfiguration.java b/modules/core/src/main/java/org/apache/ignite/platform/dotnet/PlatformDotNetConfiguration.java
index f323085..d31ab95 100644
--- a/modules/core/src/main/java/org/apache/ignite/platform/dotnet/PlatformDotNetConfiguration.java
+++ b/modules/core/src/main/java/org/apache/ignite/platform/dotnet/PlatformDotNetConfiguration.java
@@ -61,10 +61,10 @@ public class PlatformDotNetConfiguration implements PlatformConfiguration {
}
/**
- * @param portableCfg Configuration.
+ * @param binaryCfg Configuration.
*/
- public void setBinaryConfiguration(PlatformDotNetBinaryConfiguration portableCfg) {
- this.binaryCfg = portableCfg;
+ public void setBinaryConfiguration(PlatformDotNetBinaryConfiguration binaryCfg) {
+ this.binaryCfg = binaryCfg;
}
/**
@@ -94,4 +94,4 @@ public class PlatformDotNetConfiguration implements PlatformConfiguration {
@Override public String toString() {
return S.toString(PlatformDotNetConfiguration.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/spi/discovery/tcp/ServerImpl.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/ServerImpl.java b/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/ServerImpl.java
index 2aa0f09..d801109 100644
--- a/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/ServerImpl.java
+++ b/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/ServerImpl.java
@@ -3228,7 +3228,7 @@ class ServerImpl extends TcpDiscoveryImpl {
boolean rmtMarshCompactFooterBool = rmtMarshCompactFooter != null ? rmtMarshCompactFooter : false;
if (locMarshCompactFooterBool != rmtMarshCompactFooterBool) {
- String errMsg = "Local node's portable marshaller \"compactFooter\" property differs from " +
+ String errMsg = "Local node's binary marshaller \"compactFooter\" property differs from " +
"the same property on remote node (make sure all nodes in topology have the same value " +
"of \"compactFooter\" property) [locMarshallerCompactFooter=" + locMarshCompactFooterBool +
", rmtMarshallerCompactFooter=" + rmtMarshCompactFooterBool +
@@ -3243,7 +3243,7 @@ class ServerImpl extends TcpDiscoveryImpl {
log.debug(errMsg);
try {
- String sndMsg = "Local node's portable marshaller \"compactFooter\" property differs from " +
+ String sndMsg = "Local node's binary marshaller \"compactFooter\" property differs from " +
"the same property on remote node (make sure all nodes in topology have the same value " +
"of \"compactFooter\" property) [locMarshallerCompactFooter=" + rmtMarshCompactFooterBool +
", rmtMarshallerCompactFooter=" + locMarshCompactFooterBool +
http://git-wip-us.apache.org/repos/asf/ignite/blob/10b83fb8/modules/core/src/main/java/org/jsr166/ConcurrentHashMap8.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/jsr166/ConcurrentHashMap8.java b/modules/core/src/main/java/org/jsr166/ConcurrentHashMap8.java
index b3747d7..df6afcc 100644
--- a/modules/core/src/main/java/org/jsr166/ConcurrentHashMap8.java
+++ b/modules/core/src/main/java/org/jsr166/ConcurrentHashMap8.java
@@ -3263,7 +3263,7 @@ public class ConcurrentHashMap8<K, V>
}
/**
- * Returns exportable snapshot entry for the given key and value
+ * Returns exbinary snapshot entry for the given key and value
* when write-through can't or shouldn't be used.
*/
static <K,V> AbstractMap.SimpleEntry<K,V> entryFor(K k, V v) {
http://git-wip-us.apache.org/repos/asf/ignite/blob/10b83fb8/modules/core/src/main/resources/META-INF/classnames.properties
----------------------------------------------------------------------
diff --git a/modules/core/src/main/resources/META-INF/classnames.properties b/modules/core/src/main/resources/META-INF/classnames.properties
index c1bac44..913320b 100644
--- a/modules/core/src/main/resources/META-INF/classnames.properties
+++ b/modules/core/src/main/resources/META-INF/classnames.properties
@@ -300,10 +300,10 @@ org.apache.ignite.internal.binary.BinaryObjectImpl
org.apache.ignite.internal.binary.BinaryObjectOffheapImpl
org.apache.ignite.internal.binary.BinaryReaderExImpl$Flag
org.apache.ignite.internal.binary.BinaryWriteMode
-org.apache.ignite.internal.binary.PortableContext
-org.apache.ignite.internal.binary.PortableSchema
-org.apache.ignite.internal.binary.PortableSchema$Confirmation
-org.apache.ignite.internal.binary.builder.PortableLazyMap$1$1$1
+org.apache.ignite.internal.binary.BinaryContext
+org.apache.ignite.internal.binary.BinarySchema
+org.apache.ignite.internal.binary.BinarySchema$Confirmation
+org.apache.ignite.internal.binary.builder.BinaryLazyMap$1$1$1
org.apache.ignite.internal.processors.affinity.AffinityTopologyVersion
org.apache.ignite.internal.processors.affinity.GridAffinityAssignment
org.apache.ignite.internal.processors.affinity.GridAffinityMessage
@@ -745,14 +745,14 @@ org.apache.ignite.internal.processors.cache.local.atomic.GridLocalAtomicCache$4
org.apache.ignite.internal.processors.cache.local.atomic.GridLocalAtomicCache$5
org.apache.ignite.internal.processors.cache.local.atomic.GridLocalAtomicCache$6
org.apache.ignite.internal.processors.cache.local.atomic.GridLocalAtomicCache$9
-org.apache.ignite.internal.binaryorg.apache.ignite.internal.processors.cache.binary.CacheDefaultPortableAffinityKeyMapper
+org.apache.ignite.internal.binaryorg.apache.ignite.internal.processors.cache.binary.CacheDefaultBinaryAffinityKeyMapper
org.apache.ignite.internal.binaryorg.apache.ignite.internal.processors.cache.binary.CacheObjectBinaryProcessorImpl$1
org.apache.ignite.internal.binaryorg.apache.ignite.internal.processors.cache.binary.CacheObjectBinaryProcessorImpl$4
org.apache.ignite.internal.binaryorg.apache.ignite.internal.processors.cache.binary.CacheObjectBinaryProcessorImpl$5
org.apache.ignite.internal.binaryorg.apache.ignite.internal.processors.cache.binary.CacheObjectBinaryProcessorImpl$MetaDataEntryFilter
org.apache.ignite.internal.binaryorg.apache.ignite.internal.processors.cache.binary.CacheObjectBinaryProcessorImpl$MetaDataPredicate
org.apache.ignite.internal.binaryorg.apache.ignite.internal.processors.cache.binary.CacheObjectBinaryProcessorImpl$MetadataProcessor
-org.apache.ignite.internal.binaryorg.apache.ignite.internal.processors.cache.binary.PortableMetadataKey
+org.apache.ignite.internal.binaryorg.apache.ignite.internal.processors.cache.binary.BinaryMetadataKey
org.apache.ignite.internal.processors.cache.query.CacheQueryType
org.apache.ignite.internal.processors.cache.query.GridCacheDistributedQueryFuture$1
org.apache.ignite.internal.processors.cache.query.GridCacheDistributedQueryFuture$3
http://git-wip-us.apache.org/repos/asf/ignite/blob/10b83fb8/modules/core/src/test/binaries/repo/org/apache/ignite/binary/test1/1.1/test1-1.1.jar
----------------------------------------------------------------------
diff --git a/modules/core/src/test/binaries/repo/org/apache/ignite/binary/test1/1.1/test1-1.1.jar b/modules/core/src/test/binaries/repo/org/apache/ignite/binary/test1/1.1/test1-1.1.jar
new file mode 100644
index 0000000..863350d
Binary files /dev/null and b/modules/core/src/test/binaries/repo/org/apache/ignite/binary/test1/1.1/test1-1.1.jar differ
http://git-wip-us.apache.org/repos/asf/ignite/blob/10b83fb8/modules/core/src/test/binaries/repo/org/apache/ignite/binary/test1/1.1/test1-1.1.pom
----------------------------------------------------------------------
diff --git a/modules/core/src/test/binaries/repo/org/apache/ignite/binary/test1/1.1/test1-1.1.pom b/modules/core/src/test/binaries/repo/org/apache/ignite/binary/test1/1.1/test1-1.1.pom
new file mode 100644
index 0000000..533a3c9
--- /dev/null
+++ b/modules/core/src/test/binaries/repo/org/apache/ignite/binary/test1/1.1/test1-1.1.pom
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+ <modelVersion>4.0.0</modelVersion>
+ <groupId>org.apache.ignite.binary</groupId>
+ <artifactId>test1</artifactId>
+ <version>1.1</version>
+ <description>POM was created from install:install-file</description>
+</project>
http://git-wip-us.apache.org/repos/asf/ignite/blob/10b83fb8/modules/core/src/test/binaries/repo/org/apache/ignite/binary/test1/maven-metadata-local.xml
----------------------------------------------------------------------
diff --git a/modules/core/src/test/binaries/repo/org/apache/ignite/binary/test1/maven-metadata-local.xml b/modules/core/src/test/binaries/repo/org/apache/ignite/binary/test1/maven-metadata-local.xml
new file mode 100644
index 0000000..4ca5d44
--- /dev/null
+++ b/modules/core/src/test/binaries/repo/org/apache/ignite/binary/test1/maven-metadata-local.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<metadata>
+ <groupId>org.apache.ignite.binary</groupId>
+ <artifactId>test1</artifactId>
+ <versioning>
+ <release>1.1</release>
+ <versions>
+ <version>1.1</version>
+ </versions>
+ <lastUpdated>20140806090184</lastUpdated>
+ </versioning>
+</metadata>
http://git-wip-us.apache.org/repos/asf/ignite/blob/10b83fb8/modules/core/src/test/binaries/repo/org/apache/ignite/binary/test2/1.1/test2-1.1.jar
----------------------------------------------------------------------
diff --git a/modules/core/src/test/binaries/repo/org/apache/ignite/binary/test2/1.1/test2-1.1.jar b/modules/core/src/test/binaries/repo/org/apache/ignite/binary/test2/1.1/test2-1.1.jar
new file mode 100644
index 0000000..ccf4ea2
Binary files /dev/null and b/modules/core/src/test/binaries/repo/org/apache/ignite/binary/test2/1.1/test2-1.1.jar differ
http://git-wip-us.apache.org/repos/asf/ignite/blob/10b83fb8/modules/core/src/test/binaries/repo/org/apache/ignite/binary/test2/1.1/test2-1.1.pom
----------------------------------------------------------------------
diff --git a/modules/core/src/test/binaries/repo/org/apache/ignite/binary/test2/1.1/test2-1.1.pom b/modules/core/src/test/binaries/repo/org/apache/ignite/binary/test2/1.1/test2-1.1.pom
new file mode 100644
index 0000000..2eaaeff
--- /dev/null
+++ b/modules/core/src/test/binaries/repo/org/apache/ignite/binary/test2/1.1/test2-1.1.pom
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+ <modelVersion>4.0.0</modelVersion>
+ <groupId>org.apache.ignite.binary</groupId>
+ <artifactId>test2</artifactId>
+ <version>1.1</version>
+ <description>POM was created from install:install-file</description>
+</project>
http://git-wip-us.apache.org/repos/asf/ignite/blob/10b83fb8/modules/core/src/test/binaries/repo/org/apache/ignite/binary/test2/maven-metadata-local.xml
----------------------------------------------------------------------
diff --git a/modules/core/src/test/binaries/repo/org/apache/ignite/binary/test2/maven-metadata-local.xml b/modules/core/src/test/binaries/repo/org/apache/ignite/binary/test2/maven-metadata-local.xml
new file mode 100644
index 0000000..c45c88f
--- /dev/null
+++ b/modules/core/src/test/binaries/repo/org/apache/ignite/binary/test2/maven-metadata-local.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<metadata>
+ <groupId>org.apache.ignite.binary</groupId>
+ <artifactId>test2</artifactId>
+ <versioning>
+ <release>1.1</release>
+ <versions>
+ <version>1.1</version>
+ </versions>
+ <lastUpdated>20140806090410</lastUpdated>
+ </versioning>
+</metadata>
http://git-wip-us.apache.org/repos/asf/ignite/blob/10b83fb8/modules/core/src/test/java/org/apache/ignite/internal/binary/BinaryFieldsAbstractSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/binary/BinaryFieldsAbstractSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/binary/BinaryFieldsAbstractSelfTest.java
index 7d53705..943c5aa 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/binary/BinaryFieldsAbstractSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/binary/BinaryFieldsAbstractSelfTest.java
@@ -34,7 +34,7 @@ import java.util.Date;
import java.util.UUID;
/**
- * Contains tests for portable object fields.
+ * Contains tests for binary object fields.
*/
public abstract class BinaryFieldsAbstractSelfTest extends GridCommonAbstractTest {
/** Marshaller. */
@@ -43,7 +43,7 @@ public abstract class BinaryFieldsAbstractSelfTest extends GridCommonAbstractTes
/**
* Create marshaller.
*
- * @return Portable marshaller.
+ * @return Binary marshaller.
* @throws Exception If failed.
*/
protected BinaryMarshaller createMarshaller() throws Exception {
@@ -67,7 +67,7 @@ public abstract class BinaryFieldsAbstractSelfTest extends GridCommonAbstractTes
marsh.setContext(new MarshallerContextTestImpl(null));
- IgniteUtils.invoke(BinaryMarshaller.class, marsh, "setPortableContext", ctx, iCfg);
+ IgniteUtils.invoke(BinaryMarshaller.class, marsh, "setBinaryContext", ctx, iCfg);
return marsh;
}
@@ -80,12 +80,12 @@ public abstract class BinaryFieldsAbstractSelfTest extends GridCommonAbstractTes
}
/**
- * Get portable context for the current marshaller.
+ * Get binary context for the current marshaller.
*
* @param marsh Marshaller.
- * @return Portable context.
+ * @return Binary context.
*/
- protected static BinaryContext portableContext(BinaryMarshaller marsh) {
+ protected static BinaryContext binaryContext(BinaryMarshaller marsh) {
GridBinaryMarshaller impl = U.field(marsh, "impl");
return impl.context();
@@ -478,7 +478,7 @@ public abstract class BinaryFieldsAbstractSelfTest extends GridCommonAbstractTes
/**
* Get test context.
*
- * @param marsh Portable marshaller.
+ * @param marsh Binary marshaller.
* @param fieldName Field name.
* @return Test context.
* @throws Exception If failed.
@@ -486,7 +486,7 @@ public abstract class BinaryFieldsAbstractSelfTest extends GridCommonAbstractTes
private TestContext context(BinaryMarshaller marsh, String fieldName) throws Exception {
TestObject obj = createObject();
- BinaryObjectExImpl portObj = toPortable(marsh, obj);
+ BinaryObjectExImpl portObj = toBinary(marsh, obj);
BinaryField field = portObj.type().field(fieldName);
@@ -496,7 +496,7 @@ public abstract class BinaryFieldsAbstractSelfTest extends GridCommonAbstractTes
/**
* Get test context with nested test object.
*
- * @param marsh Portable marshaller.
+ * @param marsh Binary marshaller.
* @param fieldName Field name.
* @return Test context.
* @throws Exception If failed.
@@ -506,7 +506,7 @@ public abstract class BinaryFieldsAbstractSelfTest extends GridCommonAbstractTes
TestObject obj = createObject();
TestOuterObject outObj = new TestOuterObject(obj);
- BinaryObjectExImpl portOutObj = toPortable(marsh, outObj);
+ BinaryObjectExImpl portOutObj = toBinary(marsh, outObj);
BinaryObjectExImpl portObj = portOutObj.field("fInner");
assert portObj != null;
@@ -526,14 +526,14 @@ public abstract class BinaryFieldsAbstractSelfTest extends GridCommonAbstractTes
}
/**
- * Convert object to portable object.
+ * Convert object to binary object.
*
* @param marsh Marshaller.
* @param obj Object.
- * @return Portable object.
+ * @return Binary object.
* @throws Exception If failed.
*/
- protected abstract BinaryObjectExImpl toPortable(BinaryMarshaller marsh, Object obj) throws Exception;
+ protected abstract BinaryObjectExImpl toBinary(BinaryMarshaller marsh, Object obj) throws Exception;
/**
* Outer test object.
@@ -696,7 +696,7 @@ public abstract class BinaryFieldsAbstractSelfTest extends GridCommonAbstractTes
/** Object. */
public final TestObject obj;
- /** Portable object. */
+ /** Binary object. */
public final BinaryObjectExImpl portObj;
/** Field. */
@@ -706,7 +706,7 @@ public abstract class BinaryFieldsAbstractSelfTest extends GridCommonAbstractTes
* Constructor.
*
* @param obj Object.
- * @param portObj Portable object.
+ * @param portObj Binary object.
* @param field Field.
*/
public TestContext(TestObject obj, BinaryObjectExImpl portObj, BinaryField field) {
http://git-wip-us.apache.org/repos/asf/ignite/blob/10b83fb8/modules/core/src/test/java/org/apache/ignite/internal/binary/BinaryFieldsHeapSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/binary/BinaryFieldsHeapSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/binary/BinaryFieldsHeapSelfTest.java
index 0e92bf4..fceffa0 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/binary/BinaryFieldsHeapSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/binary/BinaryFieldsHeapSelfTest.java
@@ -18,13 +18,13 @@
package org.apache.ignite.internal.binary;
/**
- * Field tests for heap-based portables.
+ * Field tests for heap-based binaries.
*/
public class BinaryFieldsHeapSelfTest extends BinaryFieldsAbstractSelfTest {
/** {@inheritDoc} */
- @Override protected BinaryObjectExImpl toPortable(BinaryMarshaller marsh, Object obj) throws Exception {
+ @Override protected BinaryObjectExImpl toBinary(BinaryMarshaller marsh, Object obj) throws Exception {
byte[] bytes = marsh.marshal(obj);
- return new BinaryObjectImpl(portableContext(marsh), bytes, 0);
+ return new BinaryObjectImpl(binaryContext(marsh), bytes, 0);
}
}
http://git-wip-us.apache.org/repos/asf/ignite/blob/10b83fb8/modules/core/src/test/java/org/apache/ignite/internal/binary/BinaryFieldsOffheapSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/binary/BinaryFieldsOffheapSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/binary/BinaryFieldsOffheapSelfTest.java
index d24d898..87cc527 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/binary/BinaryFieldsOffheapSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/binary/BinaryFieldsOffheapSelfTest.java
@@ -22,7 +22,7 @@ import org.eclipse.jetty.util.ConcurrentHashSet;
import sun.misc.Unsafe;
/**
- * Field tests for heap-based portables.
+ * Field tests for heap-based binaries.
*/
public class BinaryFieldsOffheapSelfTest extends BinaryFieldsAbstractSelfTest {
/** Unsafe instance. */
@@ -46,7 +46,7 @@ public class BinaryFieldsOffheapSelfTest extends BinaryFieldsAbstractSelfTest {
}
/** {@inheritDoc} */
- @Override protected BinaryObjectExImpl toPortable(BinaryMarshaller marsh, Object obj) throws Exception {
+ @Override protected BinaryObjectExImpl toBinary(BinaryMarshaller marsh, Object obj) throws Exception {
byte[] arr = marsh.marshal(obj);
long ptr = UNSAFE.allocateMemory(arr.length);
@@ -55,6 +55,6 @@ public class BinaryFieldsOffheapSelfTest extends BinaryFieldsAbstractSelfTest {
UNSAFE.copyMemory(arr, BYTE_ARR_OFF, null, ptr, arr.length);
- return new BinaryObjectOffheapImpl(portableContext(marsh), ptr, 0, arr.length);
+ return new BinaryObjectOffheapImpl(binaryContext(marsh), ptr, 0, arr.length);
}
}
http://git-wip-us.apache.org/repos/asf/ignite/blob/10b83fb8/modules/core/src/test/java/org/apache/ignite/internal/binary/BinaryFooterOffsetsAbstractSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/binary/BinaryFooterOffsetsAbstractSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/binary/BinaryFooterOffsetsAbstractSelfTest.java
index 43609b8..0e3749c 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/binary/BinaryFooterOffsetsAbstractSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/binary/BinaryFooterOffsetsAbstractSelfTest.java
@@ -39,7 +39,7 @@ public abstract class BinaryFooterOffsetsAbstractSelfTest extends GridCommonAbst
/** Marshaller. */
protected BinaryMarshaller marsh;
- /** Portable context. */
+ /** Binary context. */
protected BinaryContext ctx;
/** {@inheritDoc} */
@@ -62,7 +62,7 @@ public abstract class BinaryFooterOffsetsAbstractSelfTest extends GridCommonAbst
marsh.setContext(new MarshallerContextTestImpl(null));
- IgniteUtils.invoke(BinaryMarshaller.class, marsh, "setPortableContext", ctx, iCfg);
+ IgniteUtils.invoke(BinaryMarshaller.class, marsh, "setBinaryContext", ctx, iCfg);
}
/**
@@ -127,9 +127,9 @@ public abstract class BinaryFooterOffsetsAbstractSelfTest extends GridCommonAbst
private void check(int len) throws Exception {
TestObject obj = new TestObject(len);
- BinaryObjectExImpl portObj = toPortable(marsh, obj);
+ BinaryObjectExImpl portObj = toBinary(marsh, obj);
- // 1. Test portable object content.
+ // 1. Test binary object content.
assert portObj.hasField("field1");
assert portObj.hasField("field2");
@@ -162,14 +162,14 @@ public abstract class BinaryFooterOffsetsAbstractSelfTest extends GridCommonAbst
}
/**
- * Convert object to portable object.
+ * Convert object to binary object.
*
* @param marsh Marshaller.
* @param obj Object.
- * @return Portable object.
+ * @return Binary object.
* @throws Exception If failed.
*/
- protected abstract BinaryObjectExImpl toPortable(BinaryMarshaller marsh, Object obj) throws Exception;
+ protected abstract BinaryObjectExImpl toBinary(BinaryMarshaller marsh, Object obj) throws Exception;
/**
* Test object.
http://git-wip-us.apache.org/repos/asf/ignite/blob/10b83fb8/modules/core/src/test/java/org/apache/ignite/internal/binary/BinaryFooterOffsetsHeapSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/binary/BinaryFooterOffsetsHeapSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/binary/BinaryFooterOffsetsHeapSelfTest.java
index 68e897e..7b3a754 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/binary/BinaryFooterOffsetsHeapSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/binary/BinaryFooterOffsetsHeapSelfTest.java
@@ -18,11 +18,11 @@
package org.apache.ignite.internal.binary;
/**
- * Compact offsets tests for heap portable objects.
+ * Compact offsets tests for heap binary objects.
*/
public class BinaryFooterOffsetsHeapSelfTest extends BinaryFooterOffsetsAbstractSelfTest {
/** {@inheritDoc} */
- @Override protected BinaryObjectExImpl toPortable(BinaryMarshaller marsh, Object obj) throws Exception {
+ @Override protected BinaryObjectExImpl toBinary(BinaryMarshaller marsh, Object obj) throws Exception {
byte[] bytes = marsh.marshal(obj);
return new BinaryObjectImpl(ctx, bytes, 0);
http://git-wip-us.apache.org/repos/asf/ignite/blob/10b83fb8/modules/core/src/test/java/org/apache/ignite/internal/binary/BinaryFooterOffsetsOffheapSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/binary/BinaryFooterOffsetsOffheapSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/binary/BinaryFooterOffsetsOffheapSelfTest.java
index f0f0396..fe9ba17 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/binary/BinaryFooterOffsetsOffheapSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/binary/BinaryFooterOffsetsOffheapSelfTest.java
@@ -22,7 +22,7 @@ import org.eclipse.jetty.util.ConcurrentHashSet;
import sun.misc.Unsafe;
/**
- * Compact offsets tests for offheap portable objects.
+ * Compact offsets tests for offheap binary objects.
*/
public class BinaryFooterOffsetsOffheapSelfTest extends BinaryFooterOffsetsAbstractSelfTest {
/** Unsafe instance. */
@@ -46,7 +46,7 @@ public class BinaryFooterOffsetsOffheapSelfTest extends BinaryFooterOffsetsAbstr
}
/** {@inheritDoc} */
- @Override protected BinaryObjectExImpl toPortable(BinaryMarshaller marsh, Object obj) throws Exception {
+ @Override protected BinaryObjectExImpl toBinary(BinaryMarshaller marsh, Object obj) throws Exception {
byte[] arr = marsh.marshal(obj);
long ptr = UNSAFE.allocateMemory(arr.length);
http://git-wip-us.apache.org/repos/asf/ignite/blob/10b83fb8/modules/core/src/test/java/org/apache/ignite/internal/binary/BinaryMarshallerSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/binary/BinaryMarshallerSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/binary/BinaryMarshallerSelfTest.java
index 52fecbf..4ecad09 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/binary/BinaryMarshallerSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/binary/BinaryMarshallerSelfTest.java
@@ -89,7 +89,7 @@ import static org.junit.Assert.assertArrayEquals;
import static org.junit.Assert.assertNotEquals;
/**
- * Portable marshaller tests.
+ * Binary marshaller tests.
*/
@SuppressWarnings({"OverlyStrongTypeCast", "ArrayHashCode", "ConstantConditions"})
public class BinaryMarshallerSelfTest extends GridCommonAbstractTest {
@@ -632,7 +632,7 @@ public class BinaryMarshallerSelfTest extends GridCommonAbstractTest {
/**
* @throws Exception If failed.
*/
- public void testPortable() throws Exception {
+ public void testBinary() throws Exception {
BinaryMarshaller marsh = binaryMarshaller(Arrays.asList(
new BinaryTypeConfiguration(SimpleObject.class.getName()),
new BinaryTypeConfiguration(TestBinary.class.getName())
@@ -711,45 +711,45 @@ public class BinaryMarshallerSelfTest extends GridCommonAbstractTest {
new Integer(((BinaryObject)simplePo.field("enumVal")).enumOrdinal()));
assertArrayEquals(ordinals(obj.simple.enumArr), ordinals((BinaryObject[])simplePo.field("enumArr")));
assertNull(simplePo.field("simple"));
- assertNull(simplePo.field("portable"));
+ assertNull(simplePo.field("binary"));
assertNull(simplePo.field("unknown"));
- BinaryObject portablePo = po.field("_portable");
-
- assertEquals(obj.portable, portablePo.deserialize());
-
- assertEquals(obj.portable.b, (byte)portablePo.field("_b"));
- assertEquals(obj.portable.s, (short)portablePo.field("_s"));
- assertEquals(obj.portable.i, (int)portablePo.field("_i"));
- assertEquals(obj.portable.l, (long)portablePo.field("_l"));
- assertEquals(obj.portable.f, (float)portablePo.field("_f"), 0);
- assertEquals(obj.portable.d, (double)portablePo.field("_d"), 0);
- assertEquals(obj.portable.c, (char)portablePo.field("_c"));
- assertEquals(obj.portable.bool, (boolean)portablePo.field("_bool"));
- assertEquals(obj.portable.str, portablePo.field("_str"));
- assertEquals(obj.portable.uuid, portablePo.field("_uuid"));
- assertEquals(obj.portable.date, portablePo.field("_date"));
- assertEquals(obj.portable.ts, portablePo.field("_ts"));
- assertArrayEquals(obj.portable.bArr, (byte[])portablePo.field("_bArr"));
- assertArrayEquals(obj.portable.sArr, (short[])portablePo.field("_sArr"));
- assertArrayEquals(obj.portable.iArr, (int[])portablePo.field("_iArr"));
- assertArrayEquals(obj.portable.lArr, (long[])portablePo.field("_lArr"));
- assertArrayEquals(obj.portable.fArr, (float[])portablePo.field("_fArr"), 0);
- assertArrayEquals(obj.portable.dArr, (double[])portablePo.field("_dArr"), 0);
- assertArrayEquals(obj.portable.cArr, (char[])portablePo.field("_cArr"));
- assertBooleanArrayEquals(obj.portable.boolArr, (boolean[])portablePo.field("_boolArr"));
- assertArrayEquals(obj.portable.strArr, (String[])portablePo.field("_strArr"));
- assertArrayEquals(obj.portable.uuidArr, (UUID[])portablePo.field("_uuidArr"));
- assertArrayEquals(obj.portable.dateArr, (Date[])portablePo.field("_dateArr"));
- assertArrayEquals(obj.portable.objArr, (Object[])portablePo.field("_objArr"));
- assertEquals(obj.portable.col, portablePo.field("_col"));
- assertEquals(obj.portable.map, portablePo.field("_map"));
- assertEquals(new Integer(obj.portable.enumVal.ordinal()),
- new Integer(((BinaryObject)portablePo.field("_enumVal")).enumOrdinal()));
- assertArrayEquals(ordinals(obj.portable.enumArr), ordinals((BinaryObject[])portablePo.field("_enumArr")));
- assertNull(portablePo.field("_simple"));
- assertNull(portablePo.field("_portable"));
- assertNull(portablePo.field("unknown"));
+ BinaryObject binaryPo = po.field("_binary");
+
+ assertEquals(obj.binary, binaryPo.deserialize());
+
+ assertEquals(obj.binary.b, (byte)binaryPo.field("_b"));
+ assertEquals(obj.binary.s, (short)binaryPo.field("_s"));
+ assertEquals(obj.binary.i, (int)binaryPo.field("_i"));
+ assertEquals(obj.binary.l, (long)binaryPo.field("_l"));
+ assertEquals(obj.binary.f, (float)binaryPo.field("_f"), 0);
+ assertEquals(obj.binary.d, (double)binaryPo.field("_d"), 0);
+ assertEquals(obj.binary.c, (char)binaryPo.field("_c"));
+ assertEquals(obj.binary.bool, (boolean)binaryPo.field("_bool"));
+ assertEquals(obj.binary.str, binaryPo.field("_str"));
+ assertEquals(obj.binary.uuid, binaryPo.field("_uuid"));
+ assertEquals(obj.binary.date, binaryPo.field("_date"));
+ assertEquals(obj.binary.ts, binaryPo.field("_ts"));
+ assertArrayEquals(obj.binary.bArr, (byte[])binaryPo.field("_bArr"));
+ assertArrayEquals(obj.binary.sArr, (short[])binaryPo.field("_sArr"));
+ assertArrayEquals(obj.binary.iArr, (int[])binaryPo.field("_iArr"));
+ assertArrayEquals(obj.binary.lArr, (long[])binaryPo.field("_lArr"));
+ assertArrayEquals(obj.binary.fArr, (float[])binaryPo.field("_fArr"), 0);
+ assertArrayEquals(obj.binary.dArr, (double[])binaryPo.field("_dArr"), 0);
+ assertArrayEquals(obj.binary.cArr, (char[])binaryPo.field("_cArr"));
+ assertBooleanArrayEquals(obj.binary.boolArr, (boolean[])binaryPo.field("_boolArr"));
+ assertArrayEquals(obj.binary.strArr, (String[])binaryPo.field("_strArr"));
+ assertArrayEquals(obj.binary.uuidArr, (UUID[])binaryPo.field("_uuidArr"));
+ assertArrayEquals(obj.binary.dateArr, (Date[])binaryPo.field("_dateArr"));
+ assertArrayEquals(obj.binary.objArr, (Object[])binaryPo.field("_objArr"));
+ assertEquals(obj.binary.col, binaryPo.field("_col"));
+ assertEquals(obj.binary.map, binaryPo.field("_map"));
+ assertEquals(new Integer(obj.binary.enumVal.ordinal()),
+ new Integer(((BinaryObject)binaryPo.field("_enumVal")).enumOrdinal()));
+ assertArrayEquals(ordinals(obj.binary.enumArr), ordinals((BinaryObject[])binaryPo.field("_enumArr")));
+ assertNull(binaryPo.field("_simple"));
+ assertNull(binaryPo.field("_binary"));
+ assertNull(binaryPo.field("unknown"));
}
/**
@@ -859,7 +859,7 @@ public class BinaryMarshallerSelfTest extends GridCommonAbstractTest {
/**
* @param obj Simple object.
- * @param po Portable object.
+ * @param po Binary object.
*/
private void checkSimpleObjectData(SimpleObject obj, BinaryObject po) {
assertEquals(obj.b, (byte)po.field("b"));
@@ -1343,7 +1343,7 @@ public class BinaryMarshallerSelfTest extends GridCommonAbstractTest {
customType4
));
- BinaryContext ctx = portableContext(marsh);
+ BinaryContext ctx = binaryContext(marsh);
assertEquals("notconfiguredclass".hashCode(), ctx.typeId("NotConfiguredClass"));
assertEquals("key".hashCode(), ctx.typeId("Key"));
@@ -1406,7 +1406,7 @@ public class BinaryMarshallerSelfTest extends GridCommonAbstractTest {
customType1,
customType2));
- BinaryContext ctx = portableContext(marsh);
+ BinaryContext ctx = binaryContext(marsh);
assertEquals("val".hashCode(), ctx.fieldId("key".hashCode(), "val"));
assertEquals("val".hashCode(), ctx.fieldId("nonexistentclass2".hashCode(), "val"));
@@ -1463,7 +1463,7 @@ public class BinaryMarshallerSelfTest extends GridCommonAbstractTest {
/**
* @throws Exception If failed.
*/
- public void testPortableCopy() throws Exception {
+ public void testBinaryCopy() throws Exception {
BinaryMarshaller marsh = binaryMarshaller(Arrays.asList(
new BinaryTypeConfiguration(SimpleObject.class.getName())
));
@@ -1578,7 +1578,7 @@ public class BinaryMarshallerSelfTest extends GridCommonAbstractTest {
// return null;
// }
// },
-// PortableException.class,
+// BinaryException.class,
// "Invalid value type for field: i"
// );
}
@@ -1586,7 +1586,7 @@ public class BinaryMarshallerSelfTest extends GridCommonAbstractTest {
/**
* @throws Exception If failed.
*/
- public void testPortableCopyString() throws Exception {
+ public void testBinaryCopyString() throws Exception {
BinaryMarshaller marsh = binaryMarshaller(Arrays.asList(
new BinaryTypeConfiguration(SimpleObject.class.getName())
));
@@ -1607,7 +1607,7 @@ public class BinaryMarshallerSelfTest extends GridCommonAbstractTest {
/**
* @throws Exception If failed.
*/
- public void testPortableCopyUuid() throws Exception {
+ public void testBinaryCopyUuid() throws Exception {
BinaryMarshaller marsh = binaryMarshaller(Arrays.asList(
new BinaryTypeConfiguration(SimpleObject.class.getName())
));
@@ -1630,7 +1630,7 @@ public class BinaryMarshallerSelfTest extends GridCommonAbstractTest {
/**
* @throws Exception If failed.
*/
- public void testPortableCopyByteArray() throws Exception {
+ public void testBinaryCopyByteArray() throws Exception {
BinaryMarshaller marsh = binaryMarshaller(Arrays.asList(
new BinaryTypeConfiguration(SimpleObject.class.getName())
));
@@ -1649,7 +1649,7 @@ public class BinaryMarshallerSelfTest extends GridCommonAbstractTest {
}
/**
- * @param po Portable object.
+ * @param po Binary object.
* @param fields Fields.
* @return Copy.
*/
@@ -1667,7 +1667,7 @@ public class BinaryMarshallerSelfTest extends GridCommonAbstractTest {
/**
* @throws Exception If failed.
*/
- public void testPortableCopyShortArray() throws Exception {
+ public void testBinaryCopyShortArray() throws Exception {
BinaryMarshaller marsh = binaryMarshaller(Arrays.asList(
new BinaryTypeConfiguration(SimpleObject.class.getName())
));
@@ -1688,7 +1688,7 @@ public class BinaryMarshallerSelfTest extends GridCommonAbstractTest {
/**
* @throws Exception If failed.
*/
- public void testPortableCopyIntArray() throws Exception {
+ public void testBinaryCopyIntArray() throws Exception {
BinaryMarshaller marsh = binaryMarshaller(Arrays.asList(
new BinaryTypeConfiguration(SimpleObject.class.getName())
));
@@ -1709,7 +1709,7 @@ public class BinaryMarshallerSelfTest extends GridCommonAbstractTest {
/**
* @throws Exception If failed.
*/
- public void testPortableCopyLongArray() throws Exception {
+ public void testBinaryCopyLongArray() throws Exception {
BinaryMarshaller marsh = binaryMarshaller(Arrays.asList(
new BinaryTypeConfiguration(SimpleObject.class.getName())
));
@@ -1730,7 +1730,7 @@ public class BinaryMarshallerSelfTest extends GridCommonAbstractTest {
/**
* @throws Exception If failed.
*/
- public void testPortableCopyFloatArray() throws Exception {
+ public void testBinaryCopyFloatArray() throws Exception {
BinaryMarshaller marsh = binaryMarshaller(Arrays.asList(
new BinaryTypeConfiguration(SimpleObject.class.getName())
));
@@ -1751,7 +1751,7 @@ public class BinaryMarshallerSelfTest extends GridCommonAbstractTest {
/**
* @throws Exception If failed.
*/
- public void testPortableCopyDoubleArray() throws Exception {
+ public void testBinaryCopyDoubleArray() throws Exception {
BinaryMarshaller marsh = binaryMarshaller(Arrays.asList(
new BinaryTypeConfiguration(SimpleObject.class.getName())
));
@@ -1772,7 +1772,7 @@ public class BinaryMarshallerSelfTest extends GridCommonAbstractTest {
/**
* @throws Exception If failed.
*/
- public void testPortableCopyCharArray() throws Exception {
+ public void testBinaryCopyCharArray() throws Exception {
BinaryMarshaller marsh = binaryMarshaller(Arrays.asList(
new BinaryTypeConfiguration(SimpleObject.class.getName())
));
@@ -1793,7 +1793,7 @@ public class BinaryMarshallerSelfTest extends GridCommonAbstractTest {
/**
* @throws Exception If failed.
*/
- public void testPortableCopyStringArray() throws Exception {
+ public void testBinaryCopyStringArray() throws Exception {
BinaryMarshaller marsh = binaryMarshaller(Arrays.asList(
new BinaryTypeConfiguration(SimpleObject.class.getName())
));
@@ -1814,7 +1814,7 @@ public class BinaryMarshallerSelfTest extends GridCommonAbstractTest {
/**
* @throws Exception If failed.
*/
- public void testPortableCopyObject() throws Exception {
+ public void testBinaryCopyObject() throws Exception {
BinaryMarshaller marsh = binaryMarshaller(Arrays.asList(
new BinaryTypeConfiguration(SimpleObject.class.getName())
));
@@ -1841,7 +1841,7 @@ public class BinaryMarshallerSelfTest extends GridCommonAbstractTest {
/**
* @throws Exception If failed.
*/
- public void testPortableCopyNonPrimitives() throws Exception {
+ public void testBinaryCopyNonPrimitives() throws Exception {
BinaryMarshaller marsh = binaryMarshaller(Arrays.asList(
new BinaryTypeConfiguration(SimpleObject.class.getName())
));
@@ -1878,7 +1878,7 @@ public class BinaryMarshallerSelfTest extends GridCommonAbstractTest {
/**
* @throws Exception If failed.
*/
- public void testPortableCopyMixed() throws Exception {
+ public void testBinaryCopyMixed() throws Exception {
BinaryMarshaller marsh = binaryMarshaller(Arrays.asList(new BinaryTypeConfiguration(SimpleObject.class.getName())));
SimpleObject obj = simpleObject();
@@ -1939,10 +1939,10 @@ public class BinaryMarshallerSelfTest extends GridCommonAbstractTest {
/**
* @throws Exception If failed.
*/
- public void testOffheapPortable() throws Exception {
+ public void testOffheapBinary() throws Exception {
BinaryMarshaller marsh = binaryMarshaller(Arrays.asList(new BinaryTypeConfiguration(SimpleObject.class.getName())));
- BinaryContext ctx = portableContext(marsh);
+ BinaryContext ctx = binaryContext(marsh);
SimpleObject simpleObj = simpleObject();
@@ -2038,11 +2038,11 @@ public class BinaryMarshallerSelfTest extends GridCommonAbstractTest {
new BinaryTypeConfiguration(MySingleton.class.getName()),
new BinaryTypeConfiguration(SingletonMarker.class.getName())));
- BinaryObjectImpl portableObj = marshal(MySingleton.INSTANCE, marsh);
+ BinaryObjectImpl binaryObj = marshal(MySingleton.INSTANCE, marsh);
- assertTrue(portableObj.array().length <= 1024); // Check that big string was not serialized.
+ assertTrue(binaryObj.array().length <= 1024); // Check that big string was not serialized.
- MySingleton singleton = portableObj.deserialize();
+ MySingleton singleton = binaryObj.deserialize();
assertSame(MySingleton.INSTANCE, singleton);
}
@@ -2050,13 +2050,13 @@ public class BinaryMarshallerSelfTest extends GridCommonAbstractTest {
/**
*
*/
- public void testReadResolveOnPortableAware() throws Exception {
+ public void testReadResolveOnBinaryAware() throws Exception {
BinaryMarshaller marsh = binaryMarshaller(Collections.singletonList(
new BinaryTypeConfiguration(MyTestClass.class.getName())));
- BinaryObjectImpl portableObj = marshal(new MyTestClass(), marsh);
+ BinaryObjectImpl binaryObj = marshal(new MyTestClass(), marsh);
- MyTestClass obj = portableObj.deserialize();
+ MyTestClass obj = binaryObj.deserialize();
assertEquals("readResolve", obj.s);
}
@@ -2065,11 +2065,11 @@ public class BinaryMarshallerSelfTest extends GridCommonAbstractTest {
* @throws Exception If ecxeption thrown.
*/
public void testDeclareReadResolveInParent() throws Exception {
- BinaryMarshaller marsh = binaryMarshaller(Arrays.asList(new BinaryTypeConfiguration(ChildPortable.class.getName())));
+ BinaryMarshaller marsh = binaryMarshaller(Arrays.asList(new BinaryTypeConfiguration(ChildBinary.class.getName())));
- BinaryObjectImpl portableObj = marshal(new ChildPortable(), marsh);
+ BinaryObjectImpl binaryObj = marshal(new ChildBinary(), marsh);
- ChildPortable singleton = portableObj.deserialize();
+ ChildBinary singleton = binaryObj.deserialize();
assertNotNull(singleton.s);
}
@@ -2140,7 +2140,7 @@ public class BinaryMarshallerSelfTest extends GridCommonAbstractTest {
BinaryMarshaller marsh = binaryMarshaller();
- try (BinaryWriterExImpl writer = new BinaryWriterExImpl(portableContext(marsh))) {
+ try (BinaryWriterExImpl writer = new BinaryWriterExImpl(binaryContext(marsh))) {
assertEquals(true, INSTANCE.isAcquired());
writer.writeString("Thread local test");
@@ -2150,7 +2150,7 @@ public class BinaryMarshallerSelfTest extends GridCommonAbstractTest {
assertEquals(true, INSTANCE.isAcquired());
}
- // Checking the portable marshaller.
+ // Checking the binary marshaller.
assertEquals(false, INSTANCE.isAcquired());
marsh = binaryMarshaller();
@@ -2162,12 +2162,12 @@ public class BinaryMarshallerSelfTest extends GridCommonAbstractTest {
marsh = binaryMarshaller();
// Checking the builder.
- BinaryObjectBuilder builder = new BinaryObjectBuilderImpl(portableContext(marsh),
+ BinaryObjectBuilder builder = new BinaryObjectBuilderImpl(binaryContext(marsh),
"org.gridgain.foo.bar.TestClass");
builder.setField("a", "1");
- BinaryObject portableObj = builder.build();
+ BinaryObject binaryObj = builder.build();
assertEquals(false, INSTANCE.isAcquired());
}
@@ -2273,7 +2273,7 @@ public class BinaryMarshallerSelfTest extends GridCommonAbstractTest {
public void testPredefinedTypeIds() throws Exception {
BinaryMarshaller marsh = binaryMarshaller();
- BinaryContext pCtx = portableContext(marsh);
+ BinaryContext pCtx = binaryContext(marsh);
Field field = pCtx.getClass().getDeclaredField("predefinedTypeNames");
@@ -2615,11 +2615,11 @@ public class BinaryMarshallerSelfTest extends GridCommonAbstractTest {
}
/**
- * @param po Portable object.
+ * @param po Binary object.
* @param off Offset.
* @return Value.
*/
- private int intFromPortable(BinaryObject po, int off) {
+ private int intFromBinary(BinaryObject po, int off) {
byte[] arr = U.field(po, "arr");
return Integer.reverseBytes(U.bytesToInt(arr, off));
@@ -2647,7 +2647,7 @@ public class BinaryMarshallerSelfTest extends GridCommonAbstractTest {
/**
* @param obj Object.
* @param marsh Marshaller.
- * @return Portable object.
+ * @return Binary object.
*/
private <T> BinaryObjectImpl marshal(T obj, BinaryMarshaller marsh) throws IgniteCheckedException {
byte[] bytes = marsh.marshal(obj);
@@ -2665,9 +2665,9 @@ public class BinaryMarshallerSelfTest extends GridCommonAbstractTest {
/**
* @param marsh Marshaller.
- * @return Portable context.
+ * @return Binary context.
*/
- protected BinaryContext portableContext(BinaryMarshaller marsh) {
+ protected BinaryContext binaryContext(BinaryMarshaller marsh) {
GridBinaryMarshaller impl = U.field(marsh, "impl");
return impl.context();
@@ -2731,7 +2731,7 @@ public class BinaryMarshallerSelfTest extends GridCommonAbstractTest {
marsh.setContext(new MarshallerContextTestImpl(null));
- IgniteUtils.invoke(BinaryMarshaller.class, marsh, "setPortableContext", ctx, iCfg);
+ IgniteUtils.invoke(BinaryMarshaller.class, marsh, "setBinaryContext", ctx, iCfg);
return marsh;
}
@@ -2849,7 +2849,7 @@ public class BinaryMarshallerSelfTest extends GridCommonAbstractTest {
}
/**
- * @return Portable object.
+ * @return Binary object.
*/
private TestBinary binaryObject() {
SimpleObject innerSimple = new SimpleObject();
@@ -2891,80 +2891,80 @@ public class BinaryMarshallerSelfTest extends GridCommonAbstractTest {
innerSimple.map.put(2, "str2");
innerSimple.map.put(3, "str3");
- TestBinary innerPortable = new TestBinary();
-
- innerPortable.b = 2;
- innerPortable.s = 2;
- innerPortable.i = 2;
- innerPortable.l = 2;
- innerPortable.f = 2.2f;
- innerPortable.d = 2.2d;
- innerPortable.c = 2;
- innerPortable.bool = true;
- innerPortable.str = "str2";
- innerPortable.uuid = UUID.randomUUID();
- innerPortable.date = new Date();
- innerPortable.ts = new Timestamp(System.currentTimeMillis());
- innerPortable.bArr = new byte[] {10, 20, 30};
- innerPortable.sArr = new short[] {10, 20, 30};
- innerPortable.iArr = new int[] {10, 20, 30};
- innerPortable.lArr = new long[] {10, 20, 30};
- innerPortable.fArr = new float[] {10.01f, 20.02f, 30.03f};
- innerPortable.dArr = new double[] {10.01d, 20.02d, 30.03d};
- innerPortable.cArr = new char[] {10, 20, 30};
- innerPortable.boolArr = new boolean[] {true, false, true};
- innerPortable.strArr = new String[] {"str10", "str20", "str30"};
- innerPortable.uuidArr = new UUID[] {UUID.randomUUID(), UUID.randomUUID(), UUID.randomUUID()};
- innerPortable.dateArr = new Date[] {new Date(44444), new Date(55555), new Date(66666)};
- innerPortable.objArr = new Object[] {UUID.randomUUID(), UUID.randomUUID(), UUID.randomUUID()};
- innerPortable.bRaw = 3;
- innerPortable.sRaw = 3;
- innerPortable.iRaw = 3;
- innerPortable.lRaw = 3;
- innerPortable.fRaw = 3.3f;
- innerPortable.dRaw = 3.3d;
- innerPortable.cRaw = 3;
- innerPortable.boolRaw = true;
- innerPortable.strRaw = "str3";
- innerPortable.uuidRaw = UUID.randomUUID();
- innerPortable.dateRaw = new Date();
- innerPortable.tsRaw = new Timestamp(System.currentTimeMillis());
- innerPortable.bArrRaw = new byte[] {11, 21, 31};
- innerPortable.sArrRaw = new short[] {11, 21, 31};
- innerPortable.iArrRaw = new int[] {11, 21, 31};
- innerPortable.lArrRaw = new long[] {11, 21, 31};
- innerPortable.fArrRaw = new float[] {11.11f, 21.12f, 31.13f};
- innerPortable.dArrRaw = new double[] {11.11d, 21.12d, 31.13d};
- innerPortable.cArrRaw = new char[] {11, 21, 31};
- innerPortable.boolArrRaw = new boolean[] {true, false, true};
- innerPortable.strArrRaw = new String[] {"str11", "str21", "str31"};
- innerPortable.uuidArrRaw = new UUID[] {UUID.randomUUID(), UUID.randomUUID(), UUID.randomUUID()};
- innerPortable.dateArrRaw = new Date[] {new Date(77777), new Date(88888), new Date(99999)};
- innerPortable.objArrRaw = new Object[] {UUID.randomUUID(), UUID.randomUUID(), UUID.randomUUID()};
- innerPortable.col = new ArrayList<>();
- innerPortable.colRaw = new ArrayList<>();
- innerPortable.map = new HashMap<>();
- innerPortable.mapRaw = new HashMap<>();
- innerPortable.enumVal = TestEnum.B;
- innerPortable.enumValRaw = TestEnum.C;
- innerPortable.enumArr = new TestEnum[] {TestEnum.B, TestEnum.C};
- innerPortable.enumArrRaw = new TestEnum[] {TestEnum.C, TestEnum.D};
-
- innerPortable.col.add("str4");
- innerPortable.col.add("str5");
- innerPortable.col.add("str6");
-
- innerPortable.map.put(4, "str4");
- innerPortable.map.put(5, "str5");
- innerPortable.map.put(6, "str6");
-
- innerPortable.colRaw.add("str7");
- innerPortable.colRaw.add("str8");
- innerPortable.colRaw.add("str9");
-
- innerPortable.mapRaw.put(7, "str7");
- innerPortable.mapRaw.put(8, "str8");
- innerPortable.mapRaw.put(9, "str9");
+ TestBinary innerBinary = new TestBinary();
+
+ innerBinary.b = 2;
+ innerBinary.s = 2;
+ innerBinary.i = 2;
+ innerBinary.l = 2;
+ innerBinary.f = 2.2f;
+ innerBinary.d = 2.2d;
+ innerBinary.c = 2;
+ innerBinary.bool = true;
+ innerBinary.str = "str2";
+ innerBinary.uuid = UUID.randomUUID();
+ innerBinary.date = new Date();
+ innerBinary.ts = new Timestamp(System.currentTimeMillis());
+ innerBinary.bArr = new byte[] {10, 20, 30};
+ innerBinary.sArr = new short[] {10, 20, 30};
+ innerBinary.iArr = new int[] {10, 20, 30};
+ innerBinary.lArr = new long[] {10, 20, 30};
+ innerBinary.fArr = new float[] {10.01f, 20.02f, 30.03f};
+ innerBinary.dArr = new double[] {10.01d, 20.02d, 30.03d};
+ innerBinary.cArr = new char[] {10, 20, 30};
+ innerBinary.boolArr = new boolean[] {true, false, true};
+ innerBinary.strArr = new String[] {"str10", "str20", "str30"};
+ innerBinary.uuidArr = new UUID[] {UUID.randomUUID(), UUID.randomUUID(), UUID.randomUUID()};
+ innerBinary.dateArr = new Date[] {new Date(44444), new Date(55555), new Date(66666)};
+ innerBinary.objArr = new Object[] {UUID.randomUUID(), UUID.randomUUID(), UUID.randomUUID()};
+ innerBinary.bRaw = 3;
+ innerBinary.sRaw = 3;
+ innerBinary.iRaw = 3;
+ innerBinary.lRaw = 3;
+ innerBinary.fRaw = 3.3f;
+ innerBinary.dRaw = 3.3d;
+ innerBinary.cRaw = 3;
+ innerBinary.boolRaw = true;
+ innerBinary.strRaw = "str3";
+ innerBinary.uuidRaw = UUID.randomUUID();
+ innerBinary.dateRaw = new Date();
+ innerBinary.tsRaw = new Timestamp(System.currentTimeMillis());
+ innerBinary.bArrRaw = new byte[] {11, 21, 31};
+ innerBinary.sArrRaw = new short[] {11, 21, 31};
+ innerBinary.iArrRaw = new int[] {11, 21, 31};
+ innerBinary.lArrRaw = new long[] {11, 21, 31};
+ innerBinary.fArrRaw = new float[] {11.11f, 21.12f, 31.13f};
+ innerBinary.dArrRaw = new double[] {11.11d, 21.12d, 31.13d};
+ innerBinary.cArrRaw = new char[] {11, 21, 31};
+ innerBinary.boolArrRaw = new boolean[] {true, false, true};
+ innerBinary.strArrRaw = new String[] {"str11", "str21", "str31"};
+ innerBinary.uuidArrRaw = new UUID[] {UUID.randomUUID(), UUID.randomUUID(), UUID.randomUUID()};
+ innerBinary.dateArrRaw = new Date[] {new Date(77777), new Date(88888), new Date(99999)};
+ innerBinary.objArrRaw = new Object[] {UUID.randomUUID(), UUID.randomUUID(), UUID.randomUUID()};
+ innerBinary.col = new ArrayList<>();
+ innerBinary.colRaw = new ArrayList<>();
+ innerBinary.map = new HashMap<>();
+ innerBinary.mapRaw = new HashMap<>();
+ innerBinary.enumVal = TestEnum.B;
+ innerBinary.enumValRaw = TestEnum.C;
+ innerBinary.enumArr = new TestEnum[] {TestEnum.B, TestEnum.C};
+ innerBinary.enumArrRaw = new TestEnum[] {TestEnum.C, TestEnum.D};
+
+ innerBinary.col.add("str4");
+ innerBinary.col.add("str5");
+ innerBinary.col.add("str6");
+
+ innerBinary.map.put(4, "str4");
+ innerBinary.map.put(5, "str5");
+ innerBinary.map.put(6, "str6");
+
+ innerBinary.colRaw.add("str7");
+ innerBinary.colRaw.add("str8");
+ innerBinary.colRaw.add("str9");
+
+ innerBinary.mapRaw.put(7, "str7");
+ innerBinary.mapRaw.put(8, "str8");
+ innerBinary.mapRaw.put(9, "str9");
TestBinary outer = new TestBinary();
@@ -2993,7 +2993,7 @@ public class BinaryMarshallerSelfTest extends GridCommonAbstractTest {
outer.dateArr = new Date[] {new Date(10101), new Date(20202), new Date(30303)};
outer.objArr = new Object[] {UUID.randomUUID(), UUID.randomUUID(), UUID.randomUUID()};
outer.simple = innerSimple;
- outer.portable = innerPortable;
+ outer.binary = innerBinary;
outer.bRaw = 5;
outer.sRaw = 5;
outer.iRaw = 5;
@@ -3027,7 +3027,7 @@ public class BinaryMarshallerSelfTest extends GridCommonAbstractTest {
outer.enumArr = new TestEnum[] {TestEnum.D, TestEnum.E};
outer.enumArrRaw = new TestEnum[] {TestEnum.E, TestEnum.A};
outer.simpleRaw = innerSimple;
- outer.portableRaw = innerPortable;
+ outer.binaryRaw = innerBinary;
outer.col.add("str10");
outer.col.add("str11");
@@ -3346,10 +3346,10 @@ public class BinaryMarshallerSelfTest extends GridCommonAbstractTest {
private SimpleObject simpleRaw;
/** */
- private TestBinary portable;
+ private TestBinary binary;
/** */
- private TestBinary portableRaw;
+ private TestBinary binaryRaw;
/** {@inheritDoc} */
@Override public void writeBinary(BinaryWriter writer) throws BinaryObjectException {
@@ -3382,7 +3382,7 @@ public class BinaryMarshallerSelfTest extends GridCommonAbstractTest {
writer.writeEnum("_enumVal", enumVal);
writer.writeEnumArray("_enumArr", enumArr);
writer.writeObject("_simple", simple);
- writer.writeObject("_portable", portable);
+ writer.writeObject("_binary", binary);
BinaryRawWriter raw = writer.rawWriter();
@@ -3415,7 +3415,7 @@ public class BinaryMarshallerSelfTest extends GridCommonAbstractTest {
raw.writeEnum(enumValRaw);
raw.writeEnumArray(enumArrRaw);
raw.writeObject(simpleRaw);
- raw.writeObject(portableRaw);
+ raw.writeObject(binaryRaw);
}
/** {@inheritDoc} */
@@ -3449,7 +3449,7 @@ public class BinaryMarshallerSelfTest extends GridCommonAbstractTest {
enumVal = reader.readEnum("_enumVal");
enumArr = reader.readEnumArray("_enumArr");
simple = reader.readObject("_simple");
- portable = reader.readObject("_portable");
+ binary = reader.readObject("_binary");
BinaryRawReader raw = reader.rawReader();
@@ -3482,7 +3482,7 @@ public class BinaryMarshallerSelfTest extends GridCommonAbstractTest {
enumValRaw = raw.readEnum();
enumArrRaw = raw.readEnumArray();
simpleRaw = raw.readObject();
- portableRaw = raw.readObject();
+ binaryRaw = raw.readObject();
}
/** {@inheritDoc} */
@@ -4089,7 +4089,7 @@ public class BinaryMarshallerSelfTest extends GridCommonAbstractTest {
/**
*
*/
- public static class ChildPortable extends ParentPortable {
+ public static class ChildBinary extends ParentBinary {
}
@@ -4147,7 +4147,7 @@ public class BinaryMarshallerSelfTest extends GridCommonAbstractTest {
/**
*
*/
- private static class ParentPortable {
+ private static class ParentBinary {
/** */
public String s;
http://git-wip-us.apache.org/repos/asf/ignite/blob/10b83fb8/modules/core/src/test/java/org/apache/ignite/internal/binary/BinaryObjectBuilderAdditionalSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/binary/BinaryObjectBuilderAdditionalSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/binary/BinaryObjectBuilderAdditionalSelfTest.java
index a1f980c..572df88 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/binary/BinaryObjectBuilderAdditionalSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/binary/BinaryObjectBuilderAdditionalSelfTest.java
@@ -106,9 +106,9 @@ public class BinaryObjectBuilderAdditionalSelfTest extends GridCommonAbstractTes
}
/**
- * @return Portables API.
+ * @return Binaries API.
*/
- protected IgniteBinary portables() {
+ protected IgniteBinary binaries() {
return grid(0).binary();
}
@@ -931,7 +931,7 @@ public class BinaryObjectBuilderAdditionalSelfTest extends GridCommonAbstractTes
mutableObj.build();
- BinaryType metadata = portables().type(GridBinaryTestClasses.TestObjectContainer.class);
+ BinaryType metadata = binaries().type(GridBinaryTestClasses.TestObjectContainer.class);
assertEquals("String", metadata.fieldTypeName("xx567"));
}
@@ -947,7 +947,7 @@ public class BinaryObjectBuilderAdditionalSelfTest extends GridCommonAbstractTes
mutableObj.build();
- BinaryType metadata = portables().type(GridBinaryTestClasses.TestObjectContainer.class);
+ BinaryType metadata = binaries().type(GridBinaryTestClasses.TestObjectContainer.class);
assertEquals("String", metadata.fieldTypeName("xx567"));
}
@@ -971,7 +971,7 @@ public class BinaryObjectBuilderAdditionalSelfTest extends GridCommonAbstractTes
mutableObj.build();
- BinaryType metadata = portables().type(c.getClass());
+ BinaryType metadata = binaries().type(c.getClass());
assertTrue(metadata.fieldNames().containsAll(Arrays.asList("intField", "intArrField", "arrField", "strField",
"colField", "mapField", "enumField", "enumArrField")));
@@ -1140,8 +1140,8 @@ public class BinaryObjectBuilderAdditionalSelfTest extends GridCommonAbstractTes
/**
*
*/
- public void testPortableObjectField() {
- GridBinaryTestClasses.TestObjectContainer container = new GridBinaryTestClasses.TestObjectContainer(toPortable(new GridBinaryTestClasses.TestObjectArrayList()));
+ public void testBinaryObjectField() {
+ GridBinaryTestClasses.TestObjectContainer container = new GridBinaryTestClasses.TestObjectContainer(toBinary(new GridBinaryTestClasses.TestObjectArrayList()));
BinaryObjectBuilderImpl wrapper = wrap(container);
@@ -1154,12 +1154,12 @@ public class BinaryObjectBuilderAdditionalSelfTest extends GridCommonAbstractTes
/**
*
*/
- public void testAssignPortableObject() {
+ public void testAssignBinaryObject() {
GridBinaryTestClasses.TestObjectContainer container = new GridBinaryTestClasses.TestObjectContainer();
BinaryObjectBuilderImpl wrapper = wrap(container);
- wrapper.setField("foo", toPortable(new GridBinaryTestClasses.TestObjectArrayList()));
+ wrapper.setField("foo", toBinary(new GridBinaryTestClasses.TestObjectArrayList()));
GridBinaryTestClasses.TestObjectContainer deserialized = wrapper.build().deserialize();
assertTrue(deserialized.foo instanceof GridBinaryTestClasses.TestObjectArrayList);
@@ -1185,7 +1185,7 @@ public class BinaryObjectBuilderAdditionalSelfTest extends GridCommonAbstractTes
GridBinaryTestClasses.TestObjectAllTypes obj = new GridBinaryTestClasses.TestObjectAllTypes();
obj.setDefaultData();
- BinaryObjectBuilderImpl wrapper = wrap(toPortable(obj));
+ BinaryObjectBuilderImpl wrapper = wrap(toBinary(obj));
wrapper.removeField("str");
@@ -1205,7 +1205,7 @@ public class BinaryObjectBuilderAdditionalSelfTest extends GridCommonAbstractTes
obj.foo = arr1;
- GridBinaryTestClasses.TestObjectContainer res = toPortable(obj).deserialize();
+ GridBinaryTestClasses.TestObjectContainer res = toBinary(obj).deserialize();
Object[] resArr = (Object[])res.foo;
@@ -1227,7 +1227,7 @@ public class BinaryObjectBuilderAdditionalSelfTest extends GridCommonAbstractTes
obj.foo = arr1;
- GridBinaryTestClasses.TestObjectContainer res = toPortable(obj).deserialize();
+ GridBinaryTestClasses.TestObjectContainer res = toBinary(obj).deserialize();
List<?> resArr = (List<?>)res.foo;
@@ -1236,18 +1236,18 @@ public class BinaryObjectBuilderAdditionalSelfTest extends GridCommonAbstractTes
/**
* @param obj Object.
- * @return Object in portable format.
+ * @return Object in binary format.
*/
- private BinaryObject toPortable(Object obj) {
- return portables().toBinary(obj);
+ private BinaryObject toBinary(Object obj) {
+ return binaries().toBinary(obj);
}
/**
* @param obj Object.
- * @return GridMutablePortableObject.
+ * @return GridMutableBinaryObject.
*/
private BinaryObjectBuilderImpl wrap(Object obj) {
- return BinaryObjectBuilderImpl.wrap(toPortable(obj));
+ return BinaryObjectBuilderImpl.wrap(toBinary(obj));
}
/**
@@ -1256,9 +1256,9 @@ public class BinaryObjectBuilderAdditionalSelfTest extends GridCommonAbstractTes
*/
private BinaryObjectBuilderImpl newWrapper(Class<?> aCls) {
CacheObjectBinaryProcessorImpl processor = (CacheObjectBinaryProcessorImpl)(
- (IgniteBinaryImpl)portables()).processor();
+ (IgniteBinaryImpl)binaries()).processor();
- return new BinaryObjectBuilderImpl(processor.portableContext(), processor.typeId(aCls.getName()),
+ return new BinaryObjectBuilderImpl(processor.binaryContext(), processor.typeId(aCls.getName()),
aCls.getSimpleName());
}
}
http://git-wip-us.apache.org/repos/asf/ignite/blob/10b83fb8/modules/core/src/test/java/org/apache/ignite/internal/binary/BinaryObjectBuilderSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/binary/BinaryObjectBuilderSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/binary/BinaryObjectBuilderSelfTest.java
index 2a3fe53..2424fe8 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/binary/BinaryObjectBuilderSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/binary/BinaryObjectBuilderSelfTest.java
@@ -46,7 +46,7 @@ import org.apache.ignite.testframework.junits.common.GridCommonAbstractTest;
import sun.misc.Unsafe;
/**
- * Portable builder test.
+ * Binary builder test.
*/
@SuppressWarnings("ResultOfMethodCallIgnored")
public class BinaryObjectBuilderSelfTest extends GridCommonAbstractTest {
@@ -80,7 +80,7 @@ public class BinaryObjectBuilderSelfTest extends GridCommonAbstractTest {
bCfg.setTypeConfigurations(Arrays.asList(
new BinaryTypeConfiguration(Key.class.getName()),
new BinaryTypeConfiguration(Value.class.getName()),
- new BinaryTypeConfiguration("org.gridgain.grid.internal.util.portable.mutabletest.*"),
+ new BinaryTypeConfiguration("org.gridgain.grid.internal.util.binary.mutabletest.*"),
customTypeCfg));
cfg.setBinaryConfiguration(bCfg);
@@ -115,7 +115,7 @@ public class BinaryObjectBuilderSelfTest extends GridCommonAbstractTest {
obj.setDefaultData();
obj.enumArr = null;
- GridBinaryTestClasses.TestObjectAllTypes deserialized = builder(toPortable(obj)).build().deserialize();
+ GridBinaryTestClasses.TestObjectAllTypes deserialized = builder(toBinary(obj)).build().deserialize();
GridTestUtils.deepEquals(obj, deserialized);
}
@@ -723,7 +723,7 @@ public class BinaryObjectBuilderSelfTest extends GridCommonAbstractTest {
/**
* @throws Exception If failed.
*/
- public void testOffheapPortable() throws Exception {
+ public void testOffheapBinary() throws Exception {
BinaryObjectBuilder builder = builder("Class");
builder.hashCode(100);
@@ -891,7 +891,7 @@ public class BinaryObjectBuilderSelfTest extends GridCommonAbstractTest {
GridBinaryTestClasses.TestObjectContainer c = new GridBinaryTestClasses.TestObjectContainer(list);
- BinaryObjectBuilderImpl builder = builder(toPortable(c));
+ BinaryObjectBuilderImpl builder = builder(toBinary(c));
builder.<List>getField("foo").add("!!!");
BinaryObject res = builder.build();
@@ -908,25 +908,25 @@ public class BinaryObjectBuilderSelfTest extends GridCommonAbstractTest {
/**
*
*/
- public void testSetPortableObject() {
- BinaryObject portableObj = builder(GridBinaryTestClasses.TestObjectContainer.class.getName())
- .setField("foo", toPortable(new GridBinaryTestClasses.TestObjectAllTypes()))
+ public void testSetBinaryObject() {
+ BinaryObject binaryObj = builder(GridBinaryTestClasses.TestObjectContainer.class.getName())
+ .setField("foo", toBinary(new GridBinaryTestClasses.TestObjectAllTypes()))
.build();
- assertTrue(portableObj.<GridBinaryTestClasses.TestObjectContainer>deserialize().foo instanceof GridBinaryTestClasses.TestObjectAllTypes);
+ assertTrue(binaryObj.<GridBinaryTestClasses.TestObjectContainer>deserialize().foo instanceof GridBinaryTestClasses.TestObjectAllTypes);
}
/**
*
*/
- public void testPlainPortableObjectCopyFrom() {
- GridBinaryTestClasses.TestObjectPlainPortable obj = new GridBinaryTestClasses.TestObjectPlainPortable(toPortable(new GridBinaryTestClasses.TestObjectAllTypes()));
+ public void testPlainBinaryObjectCopyFrom() {
+ GridBinaryTestClasses.TestObjectPlainBinary obj = new GridBinaryTestClasses.TestObjectPlainBinary(toBinary(new GridBinaryTestClasses.TestObjectAllTypes()));
- BinaryObjectBuilderImpl builder = builder(toPortable(obj));
- assertTrue(builder.getField("plainPortable") instanceof BinaryObject);
+ BinaryObjectBuilderImpl builder = builder(toBinary(obj));
+ assertTrue(builder.getField("plainBinary") instanceof BinaryObject);
- GridBinaryTestClasses.TestObjectPlainPortable deserialized = builder.build().deserialize();
- assertTrue(deserialized.plainPortable != null);
+ GridBinaryTestClasses.TestObjectPlainBinary deserialized = builder.build().deserialize();
+ assertTrue(deserialized.plainBinary != null);
}
/**
@@ -950,7 +950,7 @@ public class BinaryObjectBuilderSelfTest extends GridCommonAbstractTest {
obj.setDefaultData();
obj.enumArr = null;
- BinaryObjectBuilder builder = builder(toPortable(obj));
+ BinaryObjectBuilder builder = builder(toBinary(obj));
builder.removeField("str");
@@ -969,7 +969,7 @@ public class BinaryObjectBuilderSelfTest extends GridCommonAbstractTest {
obj.setDefaultData();
obj.enumArr = null;
- BinaryObjectBuilderImpl builder = builder(toPortable(obj));
+ BinaryObjectBuilderImpl builder = builder(toBinary(obj));
builder.getField("i_");
@@ -987,7 +987,7 @@ public class BinaryObjectBuilderSelfTest extends GridCommonAbstractTest {
outer.inner.outer = outer;
outer.foo = "a";
- BinaryObjectBuilder builder = builder(toPortable(outer));
+ BinaryObjectBuilder builder = builder(toBinary(outer));
builder.setField("foo", "b");
@@ -998,32 +998,32 @@ public class BinaryObjectBuilderSelfTest extends GridCommonAbstractTest {
}
/**
- * @return Portables.
+ * @return Binaries.
*/
- private IgniteBinary portables() {
+ private IgniteBinary binaries() {
return grid(0).binary();
}
/**
* @param obj Object.
- * @return Portable object.
+ * @return Binary object.
*/
- private BinaryObject toPortable(Object obj) {
- return portables().toBinary(obj);
+ private BinaryObject toBinary(Object obj) {
+ return binaries().toBinary(obj);
}
/**
* @return Builder.
*/
private BinaryObjectBuilder builder(String clsName) {
- return portables().builder(clsName);
+ return binaries().builder(clsName);
}
/**
* @return Builder.
*/
private BinaryObjectBuilderImpl builder(BinaryObject obj) {
- return (BinaryObjectBuilderImpl)portables().builder(obj);
+ return (BinaryObjectBuilderImpl)binaries().builder(obj);
}
/**
http://git-wip-us.apache.org/repos/asf/ignite/blob/10b83fb8/modules/core/src/test/java/org/apache/ignite/internal/binary/GridBinaryAffinityKeySelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/binary/GridBinaryAffinityKeySelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/binary/GridBinaryAffinityKeySelfTest.java
index 2528f17..06406e0 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/binary/GridBinaryAffinityKeySelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/binary/GridBinaryAffinityKeySelfTest.java
@@ -44,7 +44,7 @@ import org.apache.ignite.testframework.junits.common.GridCommonAbstractTest;
import static org.apache.ignite.cache.CacheMode.PARTITIONED;
/**
- * Test for portable object affinity key.
+ * Test for binary object affinity key.
*/
public class GridBinaryAffinityKeySelfTest extends GridCommonAbstractTest {
/** */
http://git-wip-us.apache.org/repos/asf/ignite/blob/10b83fb8/modules/core/src/test/java/org/apache/ignite/internal/binary/GridBinaryMarshallerCtxDisabledSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/binary/GridBinaryMarshallerCtxDisabledSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/binary/GridBinaryMarshallerCtxDisabledSelfTest.java
index c48b056..e433ec0 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/binary/GridBinaryMarshallerCtxDisabledSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/binary/GridBinaryMarshallerCtxDisabledSelfTest.java
@@ -48,7 +48,7 @@ public class GridBinaryMarshallerCtxDisabledSelfTest extends GridCommonAbstractT
BinaryContext context = new BinaryContext(BinaryCachingMetadataHandler.create(), cfg);
- IgniteUtils.invoke(BinaryMarshaller.class, marsh, "setPortableContext", context, cfg);
+ IgniteUtils.invoke(BinaryMarshaller.class, marsh, "setBinaryContext", context, cfg);
SimpleObject simpleObj = new SimpleObject();
@@ -68,12 +68,12 @@ public class GridBinaryMarshallerCtxDisabledSelfTest extends GridCommonAbstractT
assertEquals(simpleObj, marsh.unmarshal(marsh.marshal(simpleObj), null));
- SimpleBinary simplePortable = new SimpleBinary();
+ SimpleBinary simpleBinary = new SimpleBinary();
- simplePortable.str = "portable";
- simplePortable.arr = new long[] {100, 200, 300};
+ simpleBinary.str = "binary";
+ simpleBinary.arr = new long[] {100, 200, 300};
- assertEquals(simplePortable, marsh.unmarshal(marsh.marshal(simplePortable), null));
+ assertEquals(simpleBinary, marsh.unmarshal(marsh.marshal(simpleBinary), null));
SimpleExternalizable simpleExtr = new SimpleExternalizable();
@@ -85,7 +85,7 @@ public class GridBinaryMarshallerCtxDisabledSelfTest extends GridCommonAbstractT
/**
* Marshaller context with no storage. Platform has to work in such environment as well by marshalling class name of
- * a portable object.
+ * a binary object.
*/
private static class MarshallerContextWithNoStorage extends MarshallerContextAdapter {
/** */
http://git-wip-us.apache.org/repos/asf/ignite/blob/10b83fb8/modules/core/src/test/java/org/apache/ignite/internal/binary/GridBinaryMetaDataSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/binary/GridBinaryMetaDataSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/binary/GridBinaryMetaDataSelfTest.java
index 970cbc7..5c5d6c3 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/binary/GridBinaryMetaDataSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/binary/GridBinaryMetaDataSelfTest.java
@@ -36,7 +36,7 @@ import org.apache.ignite.binary.BinaryWriter;
import org.apache.ignite.testframework.junits.common.GridCommonAbstractTest;
/**
- * Portable meta data test.
+ * Binary meta data test.
*/
public class GridBinaryMetaDataSelfTest extends GridCommonAbstractTest {
/** */
@@ -74,9 +74,9 @@ public class GridBinaryMetaDataSelfTest extends GridCommonAbstractTest {
}
/**
- * @return Portables API.
+ * @return Binaries API.
*/
- protected IgniteBinary portables() {
+ protected IgniteBinary binaries() {
return grid().binary();
}
@@ -84,9 +84,9 @@ public class GridBinaryMetaDataSelfTest extends GridCommonAbstractTest {
* @throws Exception If failed.
*/
public void testGetAll() throws Exception {
- portables().toBinary(new TestObject2());
+ binaries().toBinary(new TestObject2());
- Collection<BinaryType> metas = portables().types();
+ Collection<BinaryType> metas = binaries().types();
assertEquals(2, metas.size());
@@ -150,16 +150,16 @@ public class GridBinaryMetaDataSelfTest extends GridCommonAbstractTest {
* @throws Exception If failed.
*/
public void testNoConfiguration() throws Exception {
- portables().toBinary(new TestObject3());
+ binaries().toBinary(new TestObject3());
- assertNotNull(portables().type(TestObject3.class));
+ assertNotNull(binaries().type(TestObject3.class));
}
/**
* @throws Exception If failed.
*/
public void testReflection() throws Exception {
- BinaryType meta = portables().type(TestObject1.class);
+ BinaryType meta = binaries().type(TestObject1.class);
assertNotNull(meta);
@@ -189,10 +189,10 @@ public class GridBinaryMetaDataSelfTest extends GridCommonAbstractTest {
/**
* @throws Exception If failed.
*/
- public void testPortableMarshalAware() throws Exception {
- portables().toBinary(new TestObject2());
+ public void testBinaryMarshalAware() throws Exception {
+ binaries().toBinary(new TestObject2());
- BinaryType meta = portables().type(TestObject2.class);
+ BinaryType meta = binaries().type(TestObject2.class);
assertNotNull(meta);
@@ -223,13 +223,13 @@ public class GridBinaryMetaDataSelfTest extends GridCommonAbstractTest {
* @throws Exception If failed.
*/
public void testMerge() throws Exception {
- portables().toBinary(new TestObject2());
+ binaries().toBinary(new TestObject2());
idx = 1;
- portables().toBinary(new TestObject2());
+ binaries().toBinary(new TestObject2());
- BinaryType meta = portables().type(TestObject2.class);
+ BinaryType meta = binaries().type(TestObject2.class);
assertNotNull(meta);
@@ -274,7 +274,7 @@ public class GridBinaryMetaDataSelfTest extends GridCommonAbstractTest {
obj.decVal = BigDecimal.ZERO;
obj.decArrVal = new BigDecimal[] { BigDecimal.ONE };
- BinaryObject po = portables().toBinary(obj);
+ BinaryObject po = binaries().toBinary(obj);
info(po.toString());
[17/24] ignite git commit: Merge remote-tracking branch
'origin/ignite-1.5' into ignite-1.5
Posted by ak...@apache.org.
Merge remote-tracking branch 'origin/ignite-1.5' into ignite-1.5
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/ec2a6471
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/ec2a6471
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/ec2a6471
Branch: refs/heads/ignite-843-rc2
Commit: ec2a64714c176f3a5aca60a058686d3354dc6a76
Parents: acb57c5 3db1448
Author: sboikov <sb...@gridgain.com>
Authored: Mon Dec 14 10:41:18 2015 +0300
Committer: sboikov <sb...@gridgain.com>
Committed: Mon Dec 14 10:41:18 2015 +0300
----------------------------------------------------------------------
.../ignite/internal/binary/BinaryUtils.java | 19 ++++++++++++-------
.../binary/BinaryObjectBuilderSelfTest.java | 10 +++++++++-
.../binary/GridBinaryWildcardsSelfTest.java | 16 ++++++++--------
3 files changed, 29 insertions(+), 16 deletions(-)
----------------------------------------------------------------------
[06/24] ignite git commit: ignite-2065: portable -> binary renaming
(methods, javadoc and etc.)
Posted by ak...@apache.org.
http://git-wip-us.apache.org/repos/asf/ignite/blob/10b83fb8/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridDhtAtomicCache.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridDhtAtomicCache.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridDhtAtomicCache.java
index d5e849e..481317a 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridDhtAtomicCache.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridDhtAtomicCache.java
@@ -321,7 +321,7 @@ public class GridDhtAtomicCache<K, V> extends GridDhtCacheAdapter<K, V> {
final boolean skipTx,
@Nullable UUID subjId,
final String taskName,
- final boolean deserializePortable,
+ final boolean deserializeBinary,
final boolean skipVals,
final boolean canRemap) {
ctx.checkSecurity(SecurityPermission.CACHE_READ);
@@ -345,7 +345,7 @@ public class GridDhtAtomicCache<K, V> extends GridDhtCacheAdapter<K, V> {
forcePrimary,
subjId0,
taskName,
- deserializePortable,
+ deserializeBinary,
expiryPlc,
skipVals,
skipStore,
@@ -361,7 +361,7 @@ public class GridDhtAtomicCache<K, V> extends GridDhtCacheAdapter<K, V> {
boolean skipTx,
@Nullable UUID subjId,
final String taskName,
- final boolean deserializePortable,
+ final boolean deserializeBinary,
final boolean skipVals,
final boolean canRemap
) {
@@ -389,7 +389,7 @@ public class GridDhtAtomicCache<K, V> extends GridDhtCacheAdapter<K, V> {
forcePrimary,
subjId0,
taskName,
- deserializePortable,
+ deserializeBinary,
expiryPlc,
skipVals,
skipStore,
@@ -779,7 +779,7 @@ public class GridDhtAtomicCache<K, V> extends GridDhtCacheAdapter<K, V> {
CacheInvokeResult invokeRes = (CacheInvokeResult)res;
if (invokeRes.result() != null)
- res = CacheInvokeResult.fromResult((T)ctx.unwrapPortableIfNeeded(invokeRes.result(),
+ res = CacheInvokeResult.fromResult((T)ctx.unwrapBinaryIfNeeded(invokeRes.result(),
keepBinary, false));
}
@@ -1004,7 +1004,7 @@ public class GridDhtAtomicCache<K, V> extends GridDhtCacheAdapter<K, V> {
* @param forcePrimary Force primary flag.
* @param subjId Subject ID.
* @param taskName Task name.
- * @param deserializePortable Deserialize portable flag.
+ * @param deserializeBinary Deserialize binary flag.
* @param expiryPlc Expiry policy.
* @param skipVals Skip values flag.
* @param skipStore Skip store flag.
@@ -1015,7 +1015,7 @@ public class GridDhtAtomicCache<K, V> extends GridDhtCacheAdapter<K, V> {
boolean forcePrimary,
UUID subjId,
String taskName,
- boolean deserializePortable,
+ boolean deserializeBinary,
@Nullable ExpiryPolicy expiryPlc,
boolean skipVals,
boolean skipStore,
@@ -1033,7 +1033,7 @@ public class GridDhtAtomicCache<K, V> extends GridDhtCacheAdapter<K, V> {
forcePrimary,
subjId,
taskName,
- deserializePortable,
+ deserializeBinary,
expiry,
skipVals,
canRemap,
@@ -1052,7 +1052,7 @@ public class GridDhtAtomicCache<K, V> extends GridDhtCacheAdapter<K, V> {
* @param forcePrimary Force primary flag.
* @param subjId Subject ID.
* @param taskName Task name.
- * @param deserializePortable Deserialize portable flag.
+ * @param deserializeBinary Deserialize binary flag.
* @param expiryPlc Expiry policy.
* @param skipVals Skip values flag.
* @param skipStore Skip store flag.
@@ -1062,7 +1062,7 @@ public class GridDhtAtomicCache<K, V> extends GridDhtCacheAdapter<K, V> {
boolean forcePrimary,
UUID subjId,
String taskName,
- boolean deserializePortable,
+ boolean deserializeBinary,
@Nullable ExpiryPolicy expiryPlc,
boolean skipVals,
boolean skipStore,
@@ -1103,7 +1103,7 @@ public class GridDhtAtomicCache<K, V> extends GridDhtCacheAdapter<K, V> {
null,
taskName,
expiry,
- !deserializePortable);
+ !deserializeBinary);
// Entry was not in memory or in swap, so we remove it from cache.
if (v == null) {
@@ -1115,7 +1115,7 @@ public class GridDhtAtomicCache<K, V> extends GridDhtCacheAdapter<K, V> {
success = false;
}
else
- ctx.addResult(locVals, key, v, skipVals, false, deserializePortable, true);
+ ctx.addResult(locVals, key, v, skipVals, false, deserializeBinary, true);
}
else
success = false;
@@ -1163,7 +1163,7 @@ public class GridDhtAtomicCache<K, V> extends GridDhtCacheAdapter<K, V> {
forcePrimary,
subjId,
taskName,
- deserializePortable,
+ deserializeBinary,
expiry,
skipVals,
canRemap,
http://git-wip-us.apache.org/repos/asf/ignite/blob/10b83fb8/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridDhtAtomicUpdateRequest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridDhtAtomicUpdateRequest.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridDhtAtomicUpdateRequest.java
index 4f15fa1..1f4cb6a 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridDhtAtomicUpdateRequest.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridDhtAtomicUpdateRequest.java
@@ -157,7 +157,7 @@ public class GridDhtAtomicUpdateRequest extends GridCacheMessage implements Grid
@GridDirectTransient
private List<CacheObject> localPrevVals;
- /** Keep portable flag. */
+ /** Keep binary flag. */
private boolean keepBinary;
/**
@@ -486,7 +486,7 @@ public class GridDhtAtomicUpdateRequest extends GridCacheMessage implements Grid
}
/**
- * @return Keep portable flag.
+ * @return Keep binary flag.
*/
public boolean keepBinary() {
return keepBinary;
http://git-wip-us.apache.org/repos/asf/ignite/blob/10b83fb8/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridNearAtomicUpdateFuture.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridNearAtomicUpdateFuture.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridNearAtomicUpdateFuture.java
index 513e6e8..ba3d546 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridNearAtomicUpdateFuture.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridNearAtomicUpdateFuture.java
@@ -325,7 +325,7 @@ public class GridNearAtomicUpdateFuture extends GridFutureAdapter<Object>
Object retval =
res == null ? null : rawRetval ? ret : (this.retval || op == TRANSFORM) ?
- cctx.unwrapPortableIfNeeded(ret.value(), keepBinary) : ret.success();
+ cctx.unwrapBinaryIfNeeded(ret.value(), keepBinary) : ret.success();
if (op == TRANSFORM && retval == null)
retval = Collections.emptyMap();
@@ -1191,7 +1191,7 @@ public class GridNearAtomicUpdateFuture extends GridFutureAdapter<Object>
Collection<Object> keys = new ArrayList<>(failedKeys.size());
for (KeyCacheObject key : failedKeys)
- keys.add(cctx.cacheObjectContext().unwrapPortableIfNeeded(key, keepBinary, false));
+ keys.add(cctx.cacheObjectContext().unwrapBinaryIfNeeded(key, keepBinary, false));
err0.add(keys, err, topVer);
}
http://git-wip-us.apache.org/repos/asf/ignite/blob/10b83fb8/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridNearAtomicUpdateRequest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridNearAtomicUpdateRequest.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridNearAtomicUpdateRequest.java
index b7100dd..c24ad34 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridNearAtomicUpdateRequest.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridNearAtomicUpdateRequest.java
@@ -151,7 +151,7 @@ public class GridNearAtomicUpdateRequest extends GridCacheMessage implements Gri
/** */
private boolean clientReq;
- /** Keep portable flag. */
+ /** Keep binary flag. */
private boolean keepBinary;
/**
@@ -341,7 +341,7 @@ public class GridNearAtomicUpdateRequest extends GridCacheMessage implements Gri
}
/**
- * @return Keep portable flag.
+ * @return Keep binary flag.
*/
public boolean keepBinary() {
return keepBinary;
http://git-wip-us.apache.org/repos/asf/ignite/blob/10b83fb8/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/colocated/GridDhtColocatedCache.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/colocated/GridDhtColocatedCache.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/colocated/GridDhtColocatedCache.java
index 19fefdb..073043d 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/colocated/GridDhtColocatedCache.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/colocated/GridDhtColocatedCache.java
@@ -198,7 +198,7 @@ public class GridDhtColocatedCache<K, V> extends GridDhtTransactionalCacheAdapte
boolean skipTx,
@Nullable UUID subjId,
String taskName,
- final boolean deserializePortable,
+ final boolean deserializeBinary,
final boolean skipVals,
boolean canRemap) {
ctx.checkSecurity(SecurityPermission.CACHE_READ);
@@ -215,7 +215,7 @@ public class GridDhtColocatedCache<K, V> extends GridDhtTransactionalCacheAdapte
@Override public IgniteInternalFuture<V> op(IgniteTxLocalAdapter tx) {
IgniteInternalFuture<Map<Object, Object>> fut = tx.getAllAsync(ctx,
Collections.singleton(ctx.toCacheKeyObject(key)),
- deserializePortable,
+ deserializeBinary,
skipVals,
false,
opCtx != null && opCtx.skipStore());
@@ -254,7 +254,7 @@ public class GridDhtColocatedCache<K, V> extends GridDhtTransactionalCacheAdapte
forcePrimary,
subjId,
taskName,
- deserializePortable,
+ deserializeBinary,
skipVals ? null : expiryPolicy(opCtx != null ? opCtx.expiry() : null),
skipVals,
canRemap,
@@ -273,7 +273,7 @@ public class GridDhtColocatedCache<K, V> extends GridDhtTransactionalCacheAdapte
boolean skipTx,
@Nullable UUID subjId,
String taskName,
- final boolean deserializePortable,
+ final boolean deserializeBinary,
final boolean skipVals,
boolean canRemap
) {
@@ -294,7 +294,7 @@ public class GridDhtColocatedCache<K, V> extends GridDhtTransactionalCacheAdapte
@Override public IgniteInternalFuture<Map<K, V>> op(IgniteTxLocalAdapter tx) {
return tx.getAllAsync(ctx,
ctx.cacheKeysView(keys),
- deserializePortable,
+ deserializeBinary,
skipVals,
false,
opCtx != null && opCtx.skipStore());
@@ -315,7 +315,7 @@ public class GridDhtColocatedCache<K, V> extends GridDhtTransactionalCacheAdapte
topVer,
subjId,
taskName,
- deserializePortable,
+ deserializeBinary,
skipVals ? null : expiryPolicy(opCtx != null ? opCtx.expiry() : null),
skipVals,
canRemap);
@@ -341,7 +341,7 @@ public class GridDhtColocatedCache<K, V> extends GridDhtTransactionalCacheAdapte
* @param topVer Topology version.
* @param subjId Subject ID.
* @param taskName Task name.
- * @param deserializePortable Deserialize portable flag.
+ * @param deserializeBinary Deserialize binary flag.
* @param expiryPlc Expiry policy.
* @param skipVals Skip values flag.
* @param canRemap Can remap flag.
@@ -354,7 +354,7 @@ public class GridDhtColocatedCache<K, V> extends GridDhtTransactionalCacheAdapte
AffinityTopologyVersion topVer,
@Nullable UUID subjId,
String taskName,
- boolean deserializePortable,
+ boolean deserializeBinary,
@Nullable IgniteCacheExpiryPolicy expiryPlc,
boolean skipVals,
boolean canRemap) {
@@ -363,7 +363,7 @@ public class GridDhtColocatedCache<K, V> extends GridDhtTransactionalCacheAdapte
forcePrimary,
topVer, subjId,
taskName,
- deserializePortable,
+ deserializeBinary,
expiryPlc,
skipVals,
canRemap,
@@ -378,7 +378,7 @@ public class GridDhtColocatedCache<K, V> extends GridDhtTransactionalCacheAdapte
* @param topVer Topology version.
* @param subjId Subject ID.
* @param taskName Task name.
- * @param deserializePortable Deserialize portable flag.
+ * @param deserializeBinary Deserialize binary flag.
* @param expiryPlc Expiry policy.
* @param skipVals Skip values flag.
* @param canRemap Flag indicating whether future can be remapped on a newer topology version.
@@ -393,7 +393,7 @@ public class GridDhtColocatedCache<K, V> extends GridDhtTransactionalCacheAdapte
AffinityTopologyVersion topVer,
@Nullable UUID subjId,
String taskName,
- boolean deserializePortable,
+ boolean deserializeBinary,
@Nullable IgniteCacheExpiryPolicy expiryPlc,
boolean skipVals,
boolean canRemap,
@@ -407,7 +407,7 @@ public class GridDhtColocatedCache<K, V> extends GridDhtTransactionalCacheAdapte
forcePrimary,
subjId,
taskName,
- deserializePortable,
+ deserializeBinary,
expiryPlc,
skipVals,
canRemap,
@@ -426,7 +426,7 @@ public class GridDhtColocatedCache<K, V> extends GridDhtTransactionalCacheAdapte
* @param topVer Topology version.
* @param subjId Subject ID.
* @param taskName Task name.
- * @param deserializePortable Deserialize portable flag.
+ * @param deserializeBinary Deserialize binary flag.
* @param expiryPlc Expiry policy.
* @param skipVals Skip values flag.
* @param canRemap Flag indicating whether future can be remapped on a newer topology version.
@@ -441,7 +441,7 @@ public class GridDhtColocatedCache<K, V> extends GridDhtTransactionalCacheAdapte
AffinityTopologyVersion topVer,
@Nullable UUID subjId,
String taskName,
- boolean deserializePortable,
+ boolean deserializeBinary,
@Nullable IgniteCacheExpiryPolicy expiryPlc,
boolean skipVals,
boolean canRemap,
@@ -486,7 +486,7 @@ public class GridDhtColocatedCache<K, V> extends GridDhtTransactionalCacheAdapte
null,
taskName,
expiryPlc,
- !deserializePortable);
+ !deserializeBinary);
if (res != null) {
v = res.get1();
@@ -506,7 +506,7 @@ public class GridDhtColocatedCache<K, V> extends GridDhtTransactionalCacheAdapte
null,
taskName,
expiryPlc,
- !deserializePortable);
+ !deserializeBinary);
}
// Entry was not in memory or in swap, so we remove it from cache.
@@ -530,7 +530,7 @@ public class GridDhtColocatedCache<K, V> extends GridDhtTransactionalCacheAdapte
v,
skipVals,
keepCacheObj,
- deserializePortable,
+ deserializeBinary,
true);
}
}
@@ -582,7 +582,7 @@ public class GridDhtColocatedCache<K, V> extends GridDhtTransactionalCacheAdapte
forcePrimary,
subjId,
taskName,
- deserializePortable,
+ deserializeBinary,
expiryPlc,
skipVals,
canRemap,
http://git-wip-us.apache.org/repos/asf/ignite/blob/10b83fb8/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearAtomicCache.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearAtomicCache.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearAtomicCache.java
index 49a267a..06898cd 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearAtomicCache.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearAtomicCache.java
@@ -225,7 +225,7 @@ public class GridNearAtomicCache<K, V> extends GridNearCacheAdapter<K, V> {
@Nullable byte[] valBytes,
long ttl,
long expireTime,
- boolean keepPortable,
+ boolean keepBinary,
UUID nodeId,
UUID subjId,
String taskName
@@ -251,7 +251,7 @@ public class GridNearAtomicCache<K, V> extends GridNearCacheAdapter<K, V> {
/*write-through*/false,
/*read-through*/false,
/*retval*/false,
- keepPortable,
+ keepBinary,
/*expiry policy*/null,
/*event*/true,
/*metrics*/true,
@@ -395,7 +395,7 @@ public class GridNearAtomicCache<K, V> extends GridNearCacheAdapter<K, V> {
boolean skipTx,
@Nullable UUID subjId,
String taskName,
- boolean deserializePortable,
+ boolean deserializeBinary,
boolean skipVals,
boolean canRemap
) {
@@ -416,7 +416,7 @@ public class GridNearAtomicCache<K, V> extends GridNearCacheAdapter<K, V> {
forcePrimary,
subjId,
taskName,
- deserializePortable,
+ deserializeBinary,
skipVals ? null : opCtx != null ? opCtx.expiry() : null,
skipVals,
opCtx != null && opCtx.skipStore(),
@@ -690,4 +690,4 @@ public class GridNearAtomicCache<K, V> extends GridNearCacheAdapter<K, V> {
Thread.currentThread().interrupt();
}
}
-}
\ No newline at end of file
+}
http://git-wip-us.apache.org/repos/asf/ignite/blob/10b83fb8/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearCacheAdapter.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearCacheAdapter.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearCacheAdapter.java
index 27ef996..5bf18d9 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearCacheAdapter.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearCacheAdapter.java
@@ -225,7 +225,7 @@ public abstract class GridNearCacheAdapter<K, V> extends GridDistributedCacheAda
* @param forcePrimary Force primary flag.
* @param subjId Subject ID.
* @param taskName Task name.
- * @param deserializePortable Deserialize portable flag.
+ * @param deserializeBinary Deserialize binary flag.
* @param expiryPlc Expiry policy.
* @param skipVal Skip value flag.
* @param skipStore Skip store flag.
@@ -237,7 +237,7 @@ public abstract class GridNearCacheAdapter<K, V> extends GridDistributedCacheAda
boolean forcePrimary,
@Nullable UUID subjId,
String taskName,
- boolean deserializePortable,
+ boolean deserializeBinary,
@Nullable ExpiryPolicy expiryPlc,
boolean skipVal,
boolean skipStore,
@@ -257,7 +257,7 @@ public abstract class GridNearCacheAdapter<K, V> extends GridDistributedCacheAda
txx,
subjId,
taskName,
- deserializePortable,
+ deserializeBinary,
expiry,
skipVal,
canRemap,
@@ -445,9 +445,9 @@ public abstract class GridNearCacheAdapter<K, V> extends GridDistributedCacheAda
}
/** {@inheritDoc} */
- @Override public V promote(K key, boolean deserializePortable) throws IgniteCheckedException {
+ @Override public V promote(K key, boolean deserializeBinary) throws IgniteCheckedException {
// Unswap only from dht(). Near cache does not have swap storage.
- return dht().promote(key, deserializePortable);
+ return dht().promote(key, deserializeBinary);
}
/** {@inheritDoc} */
http://git-wip-us.apache.org/repos/asf/ignite/blob/10b83fb8/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearGetFuture.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearGetFuture.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearGetFuture.java
index 9705569..cb866e3 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearGetFuture.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearGetFuture.java
@@ -91,7 +91,7 @@ public final class GridNearGetFuture<K, V> extends CacheDistributedGetFutureAdap
* @param tx Transaction.
* @param subjId Subject ID.
* @param taskName Task name.
- * @param deserializePortable Deserialize portable flag.
+ * @param deserializeBinary Deserialize binary flag.
* @param expiryPlc Expiry policy.
* @param skipVals Skip values flag.
* @param canRemap Flag indicating whether future can be remapped on a newer topology version.
@@ -106,7 +106,7 @@ public final class GridNearGetFuture<K, V> extends CacheDistributedGetFutureAdap
@Nullable IgniteTxLocalEx tx,
@Nullable UUID subjId,
String taskName,
- boolean deserializePortable,
+ boolean deserializeBinary,
@Nullable IgniteCacheExpiryPolicy expiryPlc,
boolean skipVals,
boolean canRemap,
@@ -119,7 +119,7 @@ public final class GridNearGetFuture<K, V> extends CacheDistributedGetFutureAdap
forcePrimary,
subjId,
taskName,
- deserializePortable,
+ deserializeBinary,
expiryPlc,
skipVals,
canRemap,
@@ -423,7 +423,7 @@ public final class GridNearGetFuture<K, V> extends CacheDistributedGetFutureAdap
null,
taskName,
expiryPlc,
- !deserializePortable);
+ !deserializeBinary);
if (res != null) {
v = res.get1();
@@ -443,7 +443,7 @@ public final class GridNearGetFuture<K, V> extends CacheDistributedGetFutureAdap
null,
taskName,
expiryPlc,
- !deserializePortable);
+ !deserializeBinary);
}
}
@@ -472,7 +472,7 @@ public final class GridNearGetFuture<K, V> extends CacheDistributedGetFutureAdap
null,
taskName,
expiryPlc,
- !deserializePortable);
+ !deserializeBinary);
if (res != null) {
v = res.get1();
@@ -492,7 +492,7 @@ public final class GridNearGetFuture<K, V> extends CacheDistributedGetFutureAdap
null,
taskName,
expiryPlc,
- !deserializePortable);
+ !deserializeBinary);
}
// Entry was not in memory or in swap, so we remove it from cache.
@@ -544,9 +544,9 @@ public final class GridNearGetFuture<K, V> extends CacheDistributedGetFutureAdap
add(new GridFinishedFuture<>(Collections.singletonMap(key0, val0)));
}
else {
- K key0 = (K)cctx.unwrapPortableIfNeeded(key, !deserializePortable, false);
+ K key0 = (K)cctx.unwrapBinaryIfNeeded(key, !deserializeBinary, false);
V val0 = !skipVals ?
- (V)cctx.unwrapPortableIfNeeded(v, !deserializePortable, false) :
+ (V)cctx.unwrapBinaryIfNeeded(v, !deserializeBinary, false) :
(V)Boolean.TRUE;
add(new GridFinishedFuture<>(Collections.singletonMap(key0, val0)));
@@ -681,7 +681,7 @@ public final class GridNearGetFuture<K, V> extends CacheDistributedGetFutureAdap
info.ttl(),
info.expireTime(),
true,
- !deserializePortable,
+ !deserializeBinary,
topVer,
subjId);
}
@@ -699,7 +699,7 @@ public final class GridNearGetFuture<K, V> extends CacheDistributedGetFutureAdap
val,
skipVals,
keepCacheObjects,
- deserializePortable,
+ deserializeBinary,
false);
}
catch (GridCacheEntryRemovedException ignore) {
http://git-wip-us.apache.org/repos/asf/ignite/blob/10b83fb8/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearTransactionalCache.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearTransactionalCache.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearTransactionalCache.java
index 3441eee..a09dec0 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearTransactionalCache.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearTransactionalCache.java
@@ -120,7 +120,7 @@ public class GridNearTransactionalCache<K, V> extends GridNearCacheAdapter<K, V>
boolean skipTx,
@Nullable UUID subjId,
String taskName,
- final boolean deserializePortable,
+ final boolean deserializeBinary,
final boolean skipVals,
boolean canRemap
) {
@@ -143,7 +143,7 @@ public class GridNearTransactionalCache<K, V> extends GridNearCacheAdapter<K, V>
@Override public IgniteInternalFuture<Map<K, V>> op(IgniteTxLocalAdapter tx) {
return tx.getAllAsync(ctx,
ctx.cacheKeysView(keys),
- deserializePortable,
+ deserializeBinary,
skipVals,
false,
skipStore);
@@ -158,7 +158,7 @@ public class GridNearTransactionalCache<K, V> extends GridNearCacheAdapter<K, V>
forcePrimary,
subjId,
taskName,
- deserializePortable,
+ deserializeBinary,
skipVals ? null : opCtx != null ? opCtx.expiry() : null,
skipVals,
skipStore,
@@ -169,7 +169,7 @@ public class GridNearTransactionalCache<K, V> extends GridNearCacheAdapter<K, V>
* @param tx Transaction.
* @param keys Keys to load.
* @param readThrough Read through flag.
- * @param deserializePortable Deserialize portable flag.
+ * @param deserializeBinary Deserialize binary flag.
* @param expiryPlc Expiry policy.
* @param skipVals Skip values flag.
* @param needVer If {@code true} returns values as tuples containing value and version.
@@ -178,7 +178,7 @@ public class GridNearTransactionalCache<K, V> extends GridNearCacheAdapter<K, V>
IgniteInternalFuture<Map<K, V>> txLoadAsync(GridNearTxLocal tx,
@Nullable Collection<KeyCacheObject> keys,
boolean readThrough,
- boolean deserializePortable,
+ boolean deserializeBinary,
@Nullable IgniteCacheExpiryPolicy expiryPlc,
boolean skipVals,
boolean needVer) {
@@ -191,7 +191,7 @@ public class GridNearTransactionalCache<K, V> extends GridNearCacheAdapter<K, V>
tx,
CU.subjectId(tx, ctx.shared()),
tx.resolveTaskName(),
- deserializePortable,
+ deserializeBinary,
expiryPlc,
skipVals,
/*can remap*/true,
http://git-wip-us.apache.org/repos/asf/ignite/blob/10b83fb8/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearTxLocal.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearTxLocal.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearTxLocal.java
index 2eb4c68..ae4972e 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearTxLocal.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearTxLocal.java
@@ -341,7 +341,7 @@ public class GridNearTxLocal extends GridDhtTxLocalAdapter {
return cacheCtx.nearTx().txLoadAsync(this,
keys,
readThrough,
- /*deserializePortable*/false,
+ /*deserializeBinary*/false,
accessPolicy(cacheCtx, keys),
skipVals,
needVer).chain(new C1<IgniteInternalFuture<Map<Object, Object>>, Void>() {
@@ -372,7 +372,7 @@ public class GridNearTxLocal extends GridDhtTxLocalAdapter {
topologyVersion(),
CU.subjectId(this, cctx),
resolveTaskName(),
- /*deserializePortable*/false,
+ /*deserializeBinary*/false,
accessPolicy(cacheCtx, keys),
skipVals,
/*can remap*/true,
@@ -403,7 +403,7 @@ public class GridNearTxLocal extends GridDhtTxLocalAdapter {
topologyVersion(),
CU.subjectId(this, cctx),
resolveTaskName(),
- /*deserializePortable*/false,
+ /*deserializeBinary*/false,
accessPolicy(cacheCtx, keys),
skipVals,
/*can remap*/true,
http://git-wip-us.apache.org/repos/asf/ignite/blob/10b83fb8/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/local/atomic/GridLocalAtomicCache.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/local/atomic/GridLocalAtomicCache.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/local/atomic/GridLocalAtomicCache.java
index dda5ed2..6130ead 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/local/atomic/GridLocalAtomicCache.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/local/atomic/GridLocalAtomicCache.java
@@ -477,14 +477,14 @@ public class GridLocalAtomicCache<K, V> extends GridCacheAdapter<K, V> {
/** {@inheritDoc} */
@SuppressWarnings("unchecked")
- @Override @Nullable public V get(K key, boolean deserializePortable) throws IgniteCheckedException {
+ @Override @Nullable public V get(K key, boolean deserializeBinary) throws IgniteCheckedException {
String taskName = ctx.kernalContext().job().currentTaskName();
Map<K, V> m = getAllInternal(Collections.singleton(key),
ctx.isSwapOrOffheapEnabled(),
ctx.readThrough(),
taskName,
- deserializePortable,
+ deserializeBinary,
false);
assert m.isEmpty() || m.size() == 1 : m.size();
@@ -494,7 +494,7 @@ public class GridLocalAtomicCache<K, V> extends GridCacheAdapter<K, V> {
/** {@inheritDoc} */
@SuppressWarnings("unchecked")
- @Override public final Map<K, V> getAll(Collection<? extends K> keys, boolean deserializePortable)
+ @Override public final Map<K, V> getAll(Collection<? extends K> keys, boolean deserializeBinary)
throws IgniteCheckedException {
A.notNull(keys, "keys");
@@ -504,7 +504,7 @@ public class GridLocalAtomicCache<K, V> extends GridCacheAdapter<K, V> {
ctx.isSwapOrOffheapEnabled(),
ctx.readThrough(),
taskName,
- deserializePortable,
+ deserializeBinary,
false);
}
@@ -517,7 +517,7 @@ public class GridLocalAtomicCache<K, V> extends GridCacheAdapter<K, V> {
boolean skipTx,
@Nullable UUID subjId,
final String taskName,
- final boolean deserializePortable,
+ final boolean deserializeBinary,
final boolean skipVals,
boolean canRemap
) {
@@ -528,7 +528,7 @@ public class GridLocalAtomicCache<K, V> extends GridCacheAdapter<K, V> {
return asyncOp(new Callable<Map<K, V>>() {
@Override public Map<K, V> call() throws Exception {
- return getAllInternal(keys, swapOrOffheap, storeEnabled, taskName, deserializePortable, skipVals);
+ return getAllInternal(keys, swapOrOffheap, storeEnabled, taskName, deserializeBinary, skipVals);
}
});
}
@@ -540,7 +540,7 @@ public class GridLocalAtomicCache<K, V> extends GridCacheAdapter<K, V> {
* @param swapOrOffheap {@code True} if swap of off-heap storage are enabled.
* @param storeEnabled Store enabled flag.
* @param taskName Task name.
- * @param deserializePortable Deserialize portable .
+ * @param deserializeBinary Deserialize binary .
* @param skipVals Skip value flag.
* @return Key-value map.
* @throws IgniteCheckedException If failed.
@@ -550,7 +550,7 @@ public class GridLocalAtomicCache<K, V> extends GridCacheAdapter<K, V> {
boolean swapOrOffheap,
boolean storeEnabled,
String taskName,
- boolean deserializePortable,
+ boolean deserializeBinary,
boolean skipVals
) throws IgniteCheckedException {
ctx.checkSecurity(SecurityPermission.CACHE_READ);
@@ -596,10 +596,10 @@ public class GridLocalAtomicCache<K, V> extends GridCacheAdapter<K, V> {
null,
taskName,
expiry,
- !deserializePortable);
+ !deserializeBinary);
if (v != null)
- ctx.addResult(vals, cacheKey, v, skipVals, false, deserializePortable, true);
+ ctx.addResult(vals, cacheKey, v, skipVals, false, deserializeBinary, true);
else
success = false;
}
@@ -634,7 +634,7 @@ public class GridLocalAtomicCache<K, V> extends GridCacheAdapter<K, V> {
false,
subjId,
taskName,
- deserializePortable,
+ deserializeBinary,
/*force primary*/false,
expiry,
skipVals,
@@ -667,7 +667,7 @@ public class GridLocalAtomicCache<K, V> extends GridCacheAdapter<K, V> {
CacheOperationContext opCtx = ctx.operationContextPerCall();
- final boolean keepPortable = opCtx != null && opCtx.isKeepBinary();
+ final boolean keepBinary = opCtx != null && opCtx.isKeepBinary();
return (Map<K, EntryProcessorResult<T>>)updateAllInternal(TRANSFORM,
invokeMap.keySet(),
@@ -679,7 +679,7 @@ public class GridLocalAtomicCache<K, V> extends GridCacheAdapter<K, V> {
null,
ctx.writeThrough(),
ctx.readThrough(),
- keepPortable);
+ keepBinary);
}
/** {@inheritDoc} */
@@ -820,7 +820,7 @@ public class GridLocalAtomicCache<K, V> extends GridCacheAdapter<K, V> {
final ExpiryPolicy expiry = expiryPerCall();
- final boolean keepPortable = opCtx != null && opCtx.isKeepBinary();
+ final boolean keepBinary = opCtx != null && opCtx.isKeepBinary();
IgniteInternalFuture fut = asyncOp(new Callable<Object>() {
@Override public Object call() throws Exception {
@@ -834,7 +834,7 @@ public class GridLocalAtomicCache<K, V> extends GridCacheAdapter<K, V> {
filter,
writeThrough,
readThrough,
- keepPortable);
+ keepBinary);
}
});
@@ -871,7 +871,7 @@ public class GridLocalAtomicCache<K, V> extends GridCacheAdapter<K, V> {
CacheOperationContext opCtx = ctx.operationContextPerCall();
- final boolean keepPortable = opCtx != null && opCtx.isKeepBinary();
+ final boolean keepBinary = opCtx != null && opCtx.isKeepBinary();
IgniteInternalFuture fut = asyncOp(new Callable<Object>() {
@Override public Object call() throws Exception {
@@ -885,7 +885,7 @@ public class GridLocalAtomicCache<K, V> extends GridCacheAdapter<K, V> {
filter,
writeThrough,
readThrough,
- keepPortable);
+ keepBinary);
}
});
@@ -922,7 +922,7 @@ public class GridLocalAtomicCache<K, V> extends GridCacheAdapter<K, V> {
CacheEntryPredicate[] filter,
boolean writeThrough,
boolean readThrough,
- boolean keepPortable
+ boolean keepBinary
) throws IgniteCheckedException {
if (keyCheck)
validateCacheKeys(keys);
@@ -946,7 +946,7 @@ public class GridLocalAtomicCache<K, V> extends GridCacheAdapter<K, V> {
expiryPlc,
ver,
filter,
- keepPortable,
+ keepBinary,
subjId,
taskName);
}
@@ -987,7 +987,7 @@ public class GridLocalAtomicCache<K, V> extends GridCacheAdapter<K, V> {
writeThrough,
readThrough,
retval,
- keepPortable,
+ keepBinary,
expiryPlc,
true,
true,
@@ -1042,7 +1042,7 @@ public class GridLocalAtomicCache<K, V> extends GridCacheAdapter<K, V> {
if (err != null)
throw err;
- Object ret = res == null ? null : rawRetval ? new GridCacheReturn(ctx, true, keepPortable, res.get2(), res.get1()) :
+ Object ret = res == null ? null : rawRetval ? new GridCacheReturn(ctx, true, keepBinary, res.get2(), res.get1()) :
(retval || op == TRANSFORM) ? res.get2() : res.get1();
if (op == TRANSFORM && ret == null)
@@ -1075,7 +1075,7 @@ public class GridLocalAtomicCache<K, V> extends GridCacheAdapter<K, V> {
@Nullable ExpiryPolicy expiryPlc,
GridCacheVersion ver,
@Nullable CacheEntryPredicate[] filter,
- boolean keepPortable,
+ boolean keepBinary,
UUID subjId,
String taskName
) throws IgniteCheckedException {
@@ -1144,12 +1144,12 @@ public class GridLocalAtomicCache<K, V> extends GridCacheAdapter<K, V> {
entryProcessor,
taskName,
null,
- keepPortable);
+ keepBinary);
Object oldVal = null;
CacheInvokeEntry<Object, Object> invokeEntry = new CacheInvokeEntry<>(ctx, entry.key(), old,
- entry.version(), keepPortable);
+ entry.version(), keepBinary);
CacheObject updated;
Object updatedVal = null;
@@ -1178,7 +1178,7 @@ public class GridLocalAtomicCache<K, V> extends GridCacheAdapter<K, V> {
if (intercept) {
IgniteBiTuple<Boolean, ?> interceptorRes = ctx.config().getInterceptor()
.onBeforeRemove(new CacheLazyEntry(ctx, entry.key(), invokeEntry.key(),
- old, oldVal, keepPortable));
+ old, oldVal, keepBinary));
if (ctx.cancelRemove(interceptorRes))
continue;
@@ -1193,7 +1193,7 @@ public class GridLocalAtomicCache<K, V> extends GridCacheAdapter<K, V> {
putMap,
null,
expiryPlc,
- keepPortable,
+ keepBinary,
err,
subjId,
taskName);
@@ -1214,7 +1214,7 @@ public class GridLocalAtomicCache<K, V> extends GridCacheAdapter<K, V> {
if (intercept) {
Object interceptorVal = ctx.config().getInterceptor()
.onBeforePut(new CacheLazyEntry(ctx, entry.key(), invokeEntry.getKey(),
- old, oldVal, keepPortable), updatedVal);
+ old, oldVal, keepBinary), updatedVal);
if (interceptorVal == null)
continue;
@@ -1231,7 +1231,7 @@ public class GridLocalAtomicCache<K, V> extends GridCacheAdapter<K, V> {
null,
rmvKeys,
expiryPlc,
- keepPortable,
+ keepBinary,
err,
subjId,
taskName);
@@ -1266,10 +1266,10 @@ public class GridLocalAtomicCache<K, V> extends GridCacheAdapter<K, V> {
null,
taskName,
null,
- keepPortable);
+ keepBinary);
Object interceptorVal = ctx.config().getInterceptor().onBeforePut(new CacheLazyEntry(
- ctx, entry.key(), old, keepPortable), val);
+ ctx, entry.key(), old, keepBinary), val);
if (interceptorVal == null)
continue;
@@ -1301,10 +1301,10 @@ public class GridLocalAtomicCache<K, V> extends GridCacheAdapter<K, V> {
null,
taskName,
null,
- keepPortable);
+ keepBinary);
IgniteBiTuple<Boolean, ?> interceptorRes = ctx.config().getInterceptor()
- .onBeforeRemove(new CacheLazyEntry(ctx, entry.key(), old, keepPortable));
+ .onBeforeRemove(new CacheLazyEntry(ctx, entry.key(), old, keepBinary));
if (ctx.cancelRemove(interceptorRes))
continue;
@@ -1338,7 +1338,7 @@ public class GridLocalAtomicCache<K, V> extends GridCacheAdapter<K, V> {
putMap,
rmvKeys,
expiryPlc,
- keepPortable,
+ keepBinary,
err,
subjId,
taskName);
@@ -1376,7 +1376,7 @@ public class GridLocalAtomicCache<K, V> extends GridCacheAdapter<K, V> {
@Nullable Map<Object, Object> putMap,
@Nullable Collection<Object> rmvKeys,
@Nullable ExpiryPolicy expiryPlc,
- boolean keepPortable,
+ boolean keepBinary,
@Nullable CachePartialUpdateCheckedException err,
UUID subjId,
String taskName
@@ -1446,7 +1446,7 @@ public class GridLocalAtomicCache<K, V> extends GridCacheAdapter<K, V> {
false,
false,
false,
- keepPortable,
+ keepBinary,
expiryPlc,
true,
true,
@@ -1457,9 +1457,9 @@ public class GridLocalAtomicCache<K, V> extends GridCacheAdapter<K, V> {
if (intercept) {
if (op == UPDATE)
- ctx.config().getInterceptor().onAfterPut(new CacheLazyEntry(ctx, entry.key(), writeVal, keepPortable));
+ ctx.config().getInterceptor().onAfterPut(new CacheLazyEntry(ctx, entry.key(), writeVal, keepBinary));
else
- ctx.config().getInterceptor().onAfterRemove(new CacheLazyEntry(ctx, entry.key(), t.get2(), keepPortable));
+ ctx.config().getInterceptor().onAfterRemove(new CacheLazyEntry(ctx, entry.key(), t.get2(), keepBinary));
}
}
catch (GridCacheEntryRemovedException ignore) {
http://git-wip-us.apache.org/repos/asf/ignite/blob/10b83fb8/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/query/GridCacheDistributedQueryManager.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/query/GridCacheDistributedQueryManager.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/query/GridCacheDistributedQueryManager.java
index 578f6de..7f63b4c 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/query/GridCacheDistributedQueryManager.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/query/GridCacheDistributedQueryManager.java
@@ -273,7 +273,7 @@ public class GridCacheDistributedQueryManager<K, V> extends GridCacheQueryManage
req.className(),
req.clause(),
req.includeMetaData(),
- req.keepPortable(),
+ req.keepBinary(),
req.subjectId(),
req.taskHash()
);
@@ -566,7 +566,7 @@ public class GridCacheDistributedQueryManager<K, V> extends GridCacheQueryManage
qry.query().includeBackups(),
qry.arguments(),
false,
- qry.query().keepPortable(),
+ qry.query().keepBinary(),
qry.query().subjectId(),
qry.query().taskHash(),
queryTopologyVersion(),
@@ -612,7 +612,7 @@ public class GridCacheDistributedQueryManager<K, V> extends GridCacheQueryManage
qry.includeBackups(),
fut.fields(),
all,
- qry.keepPortable(),
+ qry.keepBinary(),
qry.subjectId(),
qry.taskHash(),
queryTopologyVersion(),
@@ -679,7 +679,7 @@ public class GridCacheDistributedQueryManager<K, V> extends GridCacheQueryManage
qry.query().includeBackups(),
qry.arguments(),
qry.query().includeMetadata(),
- qry.query().keepPortable(),
+ qry.query().keepBinary(),
qry.query().subjectId(),
qry.query().taskHash(),
queryTopologyVersion(),
http://git-wip-us.apache.org/repos/asf/ignite/blob/10b83fb8/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/query/GridCacheQueryAdapter.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/query/GridCacheQueryAdapter.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/query/GridCacheQueryAdapter.java
index 855e239..b948dc5 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/query/GridCacheQueryAdapter.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/query/GridCacheQueryAdapter.java
@@ -73,7 +73,7 @@ public class GridCacheQueryAdapter<T> implements CacheQuery<T> {
/** */
private final IgniteLogger log;
- /** Class name in case of portable query. */
+ /** Class name in case of binary query. */
private final String clsName;
/** */
@@ -110,7 +110,7 @@ public class GridCacheQueryAdapter<T> implements CacheQuery<T> {
private volatile ClusterGroup prj;
/** */
- private boolean keepPortable;
+ private boolean keepBinary;
/** */
private UUID subjId;
@@ -126,7 +126,7 @@ public class GridCacheQueryAdapter<T> implements CacheQuery<T> {
* @param filter Scan filter.
* @param part Partition.
* @param incMeta Include metadata flag.
- * @param keepPortable Keep portable flag.
+ * @param keepBinary Keep binary flag.
*/
public GridCacheQueryAdapter(GridCacheContext<?, ?> cctx,
GridCacheQueryType type,
@@ -135,7 +135,7 @@ public class GridCacheQueryAdapter<T> implements CacheQuery<T> {
@Nullable IgniteBiPredicate<Object, Object> filter,
@Nullable Integer part,
boolean incMeta,
- boolean keepPortable) {
+ boolean keepBinary) {
assert cctx != null;
assert type != null;
assert part == null || part >= 0;
@@ -147,7 +147,7 @@ public class GridCacheQueryAdapter<T> implements CacheQuery<T> {
this.filter = filter;
this.part = part;
this.incMeta = incMeta;
- this.keepPortable = keepPortable;
+ this.keepBinary = keepBinary;
log = cctx.logger(getClass());
@@ -169,7 +169,7 @@ public class GridCacheQueryAdapter<T> implements CacheQuery<T> {
* @param clsName Class name.
* @param clause Clause.
* @param incMeta Include metadata flag.
- * @param keepPortable Keep portable flag.
+ * @param keepBinary Keep binary flag.
* @param subjId Security subject ID.
* @param taskHash Task hash.
*/
@@ -187,7 +187,7 @@ public class GridCacheQueryAdapter<T> implements CacheQuery<T> {
@Nullable String clsName,
String clause,
boolean incMeta,
- boolean keepPortable,
+ boolean keepBinary,
UUID subjId,
int taskHash) {
this.cctx = cctx;
@@ -204,7 +204,7 @@ public class GridCacheQueryAdapter<T> implements CacheQuery<T> {
this.clsName = clsName;
this.clause = clause;
this.incMeta = incMeta;
- this.keepPortable = keepPortable;
+ this.keepBinary = keepBinary;
this.subjId = subjId;
this.taskHash = taskHash;
}
@@ -238,19 +238,19 @@ public class GridCacheQueryAdapter<T> implements CacheQuery<T> {
}
/**
- * @return {@code True} if portable should not be deserialized.
+ * @return {@code True} if binary should not be deserialized.
*/
- public boolean keepPortable() {
- return keepPortable;
+ public boolean keepBinary() {
+ return keepBinary;
}
/**
- * Forces query to keep portable object representation even if query was created on plain projection.
+ * Forces query to keep binary object representation even if query was created on plain projection.
*
- * @param keepPortable Keep portable flag.
+ * @param keepBinary Keep binary flag.
*/
- public void keepPortable(boolean keepPortable) {
- this.keepPortable = keepPortable;
+ public void keepBinary(boolean keepBinary) {
+ this.keepBinary = keepBinary;
}
/**
@@ -721,4 +721,4 @@ public class GridCacheQueryAdapter<T> implements CacheQuery<T> {
}
}
}
-}
\ No newline at end of file
+}
http://git-wip-us.apache.org/repos/asf/ignite/blob/10b83fb8/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/query/GridCacheQueryFutureAdapter.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/query/GridCacheQueryFutureAdapter.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/query/GridCacheQueryFutureAdapter.java
index 2a4fbda..e3e5d98 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/query/GridCacheQueryFutureAdapter.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/query/GridCacheQueryFutureAdapter.java
@@ -402,7 +402,7 @@ public abstract class GridCacheQueryFutureAdapter<K, V, R> extends GridFutureAda
data = dedupIfRequired((Collection<Object>)data);
- data = cctx.unwrapPortablesIfNeeded((Collection<Object>)data, qry.query().keepPortable());
+ data = cctx.unwrapBinariesIfNeeded((Collection<Object>)data, qry.query().keepBinary());
synchronized (mux) {
enqueue(data);
@@ -583,4 +583,4 @@ public abstract class GridCacheQueryFutureAdapter<K, V, R> extends GridFutureAda
X.println(">>> keysSize: " + keys.size());
X.println(">>> cnt: " + cnt);
}
-}
\ No newline at end of file
+}
http://git-wip-us.apache.org/repos/asf/ignite/blob/10b83fb8/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/query/GridCacheQueryManager.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/query/GridCacheQueryManager.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/query/GridCacheQueryManager.java
index 4681e47..15502a0 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/query/GridCacheQueryManager.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/query/GridCacheQueryManager.java
@@ -807,8 +807,8 @@ public abstract class GridCacheQueryManager<K, V> extends GridCacheManagerAdapte
throws IgniteCheckedException {
IgniteInternalCache<K, V> prj0 = cctx.cache();
- if (qry.keepPortable())
- prj0 = prj0.keepPortable();
+ if (qry.keepBinary())
+ prj0 = prj0.keepBinary();
final IgniteInternalCache<K, V> prj = prj0;
@@ -907,7 +907,7 @@ public abstract class GridCacheQueryManager<K, V> extends GridCacheManagerAdapte
entry != null ? entry.peek(true, false, false, topVer, expiryPlc) : null;
// TODO 950 nocopy
- val = (V)cctx.cacheObjectContext().unwrapPortableIfNeeded(cacheVal, qry.keepPortable());
+ val = (V)cctx.cacheObjectContext().unwrapBinaryIfNeeded(cacheVal, qry.keepBinary());
}
catch (GridCacheEntryRemovedException e) {
val = null;
@@ -960,7 +960,7 @@ public abstract class GridCacheQueryManager<K, V> extends GridCacheManagerAdapte
private boolean checkPredicate(Map.Entry<K, V> e) {
if (keyValFilter != null) {
- Map.Entry<K, V> e0 = (Map.Entry<K, V>)cctx.unwrapPortableIfNeeded(e, qry.keepPortable());
+ Map.Entry<K, V> e0 = (Map.Entry<K, V>)cctx.unwrapBinaryIfNeeded(e, qry.keepBinary());
return keyValFilter.apply(e0.getKey(), e0.getValue());
}
@@ -1043,7 +1043,7 @@ public abstract class GridCacheQueryManager<K, V> extends GridCacheManagerAdapte
Iterator<Map.Entry<byte[], byte[]>> it = part == null ? cctx.swap().rawSwapIterator(true, backups) :
cctx.swap().rawSwapIterator(part);
- return scanIterator(it, filter, qry.keepPortable());
+ return scanIterator(it, filter, qry.keepBinary());
}
/**
@@ -1055,27 +1055,27 @@ public abstract class GridCacheQueryManager<K, V> extends GridCacheManagerAdapte
IgniteBiPredicate<K, V> filter = qry.scanFilter();
if (cctx.offheapTiered() && filter != null) {
- OffheapIteratorClosure c = new OffheapIteratorClosure(filter, qry.keepPortable());
+ OffheapIteratorClosure c = new OffheapIteratorClosure(filter, qry.keepBinary());
return cctx.swap().rawOffHeapIterator(c, qry.partition(), true, backups);
}
else {
Iterator<Map.Entry<byte[], byte[]>> it = cctx.swap().rawOffHeapIterator(qry.partition(), true, backups);
- return scanIterator(it, filter, qry.keepPortable());
+ return scanIterator(it, filter, qry.keepBinary());
}
}
/**
* @param it Lazy swap or offheap iterator.
* @param filter Scan filter.
- * @param keepPortable Keep portable flag.
+ * @param keepBinary Keep binary flag.
* @return Iterator.
*/
private GridIteratorAdapter<IgniteBiTuple<K, V>> scanIterator(
@Nullable final Iterator<Map.Entry<byte[], byte[]>> it,
@Nullable final IgniteBiPredicate<K, V> filter,
- final boolean keepPortable) {
+ final boolean keepBinary) {
if (it == null)
return new GridEmptyCloseableIterator<>();
@@ -1109,11 +1109,11 @@ public abstract class GridCacheQueryManager<K, V> extends GridCacheManagerAdapte
next = null;
while (it.hasNext()) {
- final LazySwapEntry e = new LazySwapEntry(it.next(), keepPortable);
+ final LazySwapEntry e = new LazySwapEntry(it.next(), keepBinary);
if (filter != null) {
- K key = (K)cctx.unwrapPortableIfNeeded(e.key(), keepPortable);
- V val = (V)cctx.unwrapPortableIfNeeded(e.value(), keepPortable);
+ K key = (K)cctx.unwrapBinaryIfNeeded(e.key(), keepBinary);
+ V val = (V)cctx.unwrapBinaryIfNeeded(e.value(), keepBinary);
if (!filter.apply(key, val))
continue;
@@ -1536,7 +1536,7 @@ public abstract class GridCacheQueryManager<K, V> extends GridCacheManagerAdapte
// Unwrap entry for reducer or transformer only.
if (rdc != null || trans != null)
- entry = (Map.Entry<K, V>)cctx.unwrapPortableIfNeeded(entry, qry.keepPortable());
+ entry = (Map.Entry<K, V>)cctx.unwrapBinaryIfNeeded(entry, qry.keepBinary());
// Reduce.
if (rdc != null) {
@@ -2549,7 +2549,7 @@ public abstract class GridCacheQueryManager<K, V> extends GridCacheManagerAdapte
CacheObject obj = cctx.cacheObjects().toCacheObject(cctx.cacheObjectContext(), t.get2(), t.get1());
- return (V)cctx.cacheObjectContext().unwrapPortableIfNeeded(obj, keepBinary);
+ return (V)cctx.cacheObjectContext().unwrapBinaryIfNeeded(obj, keepBinary);
}
/** {@inheritDoc} */
@@ -2636,19 +2636,19 @@ public abstract class GridCacheQueryManager<K, V> extends GridCacheManagerAdapte
private IgniteBiPredicate<K, V> filter;
/** */
- private boolean keepPortable;
+ private boolean keepBinary;
/**
* @param filter Filter.
- * @param keepPortable Keep portable flag.
+ * @param keepBinary Keep binary flag.
*/
private OffheapIteratorClosure(
@Nullable IgniteBiPredicate<K, V> filter,
- boolean keepPortable) {
+ boolean keepBinary) {
assert filter != null;
this.filter = filter;
- this.keepPortable = keepPortable;
+ this.keepBinary = keepBinary;
}
/** {@inheritDoc} */
@@ -2657,8 +2657,8 @@ public abstract class GridCacheQueryManager<K, V> extends GridCacheManagerAdapte
throws IgniteCheckedException {
LazyOffheapEntry e = new LazyOffheapEntry(keyPtr, valPtr);
- K key = (K)cctx.unwrapPortableIfNeeded(e.key(), keepPortable);
- V val = (V)cctx.unwrapPortableIfNeeded(e.value(), keepPortable);
+ K key = (K)cctx.unwrapBinaryIfNeeded(e.key(), keepBinary);
+ V val = (V)cctx.unwrapBinaryIfNeeded(e.value(), keepBinary);
if (!filter.apply(key, val))
return null;
@@ -3042,10 +3042,10 @@ public abstract class GridCacheQueryManager<K, V> extends GridCacheManagerAdapte
/**
* Query for {@link IndexingSpi}.
*
- * @param keepPortable Keep portable flag.
+ * @param keepBinary Keep binary flag.
* @return Query.
*/
- public <R> CacheQuery<R> createSpiQuery(boolean keepPortable) {
+ public <R> CacheQuery<R> createSpiQuery(boolean keepBinary) {
return new GridCacheQueryAdapter<>(cctx,
SPI,
null,
@@ -3053,7 +3053,7 @@ public abstract class GridCacheQueryManager<K, V> extends GridCacheManagerAdapte
null,
null,
false,
- keepPortable);
+ keepBinary);
}
/**
@@ -3061,11 +3061,11 @@ public abstract class GridCacheQueryManager<K, V> extends GridCacheManagerAdapte
*
* @param filter Scan filter.
* @param part Partition.
- * @param keepPortable Keep portable flag.
+ * @param keepBinary Keep binary flag.
* @return Created query.
*/
public CacheQuery<Map.Entry<K, V>> createScanQuery(@Nullable IgniteBiPredicate<K, V> filter,
- @Nullable Integer part, boolean keepPortable) {
+ @Nullable Integer part, boolean keepBinary) {
return new GridCacheQueryAdapter<>(cctx,
SCAN,
@@ -3074,7 +3074,7 @@ public abstract class GridCacheQueryManager<K, V> extends GridCacheManagerAdapte
(IgniteBiPredicate<Object, Object>)filter,
part,
false,
- keepPortable);
+ keepBinary);
}
/**
@@ -3083,11 +3083,11 @@ public abstract class GridCacheQueryManager<K, V> extends GridCacheManagerAdapte
*
* @param clsName Query class name.
* @param search Search clause.
- * @param keepPortable Keep portable flag.
+ * @param keepBinary Keep binary flag.
* @return Created query.
*/
public CacheQuery<Map.Entry<K, V>> createFullTextQuery(String clsName,
- String search, boolean keepPortable) {
+ String search, boolean keepBinary) {
A.notNull("clsName", clsName);
A.notNull("search", search);
@@ -3098,7 +3098,7 @@ public abstract class GridCacheQueryManager<K, V> extends GridCacheManagerAdapte
null,
null,
false,
- keepPortable);
+ keepBinary);
}
/**
@@ -3106,10 +3106,10 @@ public abstract class GridCacheQueryManager<K, V> extends GridCacheManagerAdapte
* documentation.
*
* @param qry Query.
- * @param keepPortable Keep portable flag.
+ * @param keepBinary Keep binary flag.
* @return Created query.
*/
- public CacheQuery<List<?>> createSqlFieldsQuery(String qry, boolean keepPortable) {
+ public CacheQuery<List<?>> createSqlFieldsQuery(String qry, boolean keepBinary) {
A.notNull(qry, "qry");
return new GridCacheQueryAdapter<>(cctx,
@@ -3119,6 +3119,6 @@ public abstract class GridCacheQueryManager<K, V> extends GridCacheManagerAdapte
null,
null,
false,
- keepPortable);
+ keepBinary);
}
}
http://git-wip-us.apache.org/repos/asf/ignite/blob/10b83fb8/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/query/GridCacheQueryRequest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/query/GridCacheQueryRequest.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/query/GridCacheQueryRequest.java
index fa2d6b1..9fae5e1 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/query/GridCacheQueryRequest.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/query/GridCacheQueryRequest.java
@@ -111,7 +111,7 @@ public class GridCacheQueryRequest extends GridCacheMessage implements GridCache
private boolean all;
/** */
- private boolean keepPortable;
+ private boolean keepBinary;
/** */
private UUID subjId;
@@ -165,7 +165,7 @@ public class GridCacheQueryRequest extends GridCacheMessage implements GridCache
* @param incBackups {@code true} if need to include backups.
* @param fields Fields query flag.
* @param all Whether to load all pages.
- * @param keepPortable Whether to keep binary.
+ * @param keepBinary Whether to keep binary.
* @param subjId Subject ID.
* @param taskHash Task name hash code.
* @param topVer Topology version.
@@ -179,7 +179,7 @@ public class GridCacheQueryRequest extends GridCacheMessage implements GridCache
boolean incBackups,
boolean fields,
boolean all,
- boolean keepPortable,
+ boolean keepBinary,
UUID subjId,
int taskHash,
AffinityTopologyVersion topVer,
@@ -192,7 +192,7 @@ public class GridCacheQueryRequest extends GridCacheMessage implements GridCache
this.incBackups = incBackups;
this.fields = fields;
this.all = all;
- this.keepPortable = keepPortable;
+ this.keepBinary = keepBinary;
this.subjId = subjId;
this.taskHash = taskHash;
this.topVer = topVer;
@@ -215,7 +215,7 @@ public class GridCacheQueryRequest extends GridCacheMessage implements GridCache
* @param incBackups {@code true} if need to include backups.
* @param args Query arguments.
* @param incMeta Include meta data or not.
- * @param keepPortable Keep portable flag.
+ * @param keepBinary Keep binary flag.
* @param subjId Subject ID.
* @param taskHash Task name hash code.
* @param topVer Topology version.
@@ -237,7 +237,7 @@ public class GridCacheQueryRequest extends GridCacheMessage implements GridCache
boolean incBackups,
Object[] args,
boolean incMeta,
- boolean keepPortable,
+ boolean keepBinary,
UUID subjId,
int taskHash,
AffinityTopologyVersion topVer,
@@ -262,7 +262,7 @@ public class GridCacheQueryRequest extends GridCacheMessage implements GridCache
this.incBackups = incBackups;
this.args = args;
this.incMeta = incMeta;
- this.keepPortable = keepPortable;
+ this.keepBinary = keepBinary;
this.subjId = subjId;
this.taskHash = taskHash;
this.topVer = topVer;
@@ -454,8 +454,8 @@ public class GridCacheQueryRequest extends GridCacheMessage implements GridCache
/**
* @return Whether to keep binary.
*/
- public boolean keepPortable() {
- return keepPortable;
+ public boolean keepBinary() {
+ return keepBinary;
}
/**
@@ -555,7 +555,7 @@ public class GridCacheQueryRequest extends GridCacheMessage implements GridCache
writer.incrementState();
case 13:
- if (!writer.writeBoolean("keepPortable", keepPortable))
+ if (!writer.writeBoolean("keepBinary", keepBinary))
return false;
writer.incrementState();
@@ -711,7 +711,7 @@ public class GridCacheQueryRequest extends GridCacheMessage implements GridCache
reader.incrementState();
case 13:
- keepPortable = reader.readBoolean("keepPortable");
+ keepBinary = reader.readBoolean("keepBinary");
if (!reader.isLastRead())
return false;
http://git-wip-us.apache.org/repos/asf/ignite/blob/10b83fb8/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/query/continuous/CacheContinuousQueryEvent.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/query/continuous/CacheContinuousQueryEvent.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/query/continuous/CacheContinuousQueryEvent.java
index f665339..d26e666 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/query/continuous/CacheContinuousQueryEvent.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/query/continuous/CacheContinuousQueryEvent.java
@@ -59,18 +59,18 @@ class CacheContinuousQueryEvent<K, V> extends CacheEntryEvent<K, V> {
/** {@inheritDoc} */
@Override
public K getKey() {
- return (K)cctx.cacheObjectContext().unwrapPortableIfNeeded(e.key(), e.isKeepBinary(), false);
+ return (K)cctx.cacheObjectContext().unwrapBinaryIfNeeded(e.key(), e.isKeepBinary(), false);
}
/** {@inheritDoc} */
@Override public V getValue() {
- return (V)cctx.cacheObjectContext().unwrapPortableIfNeeded(e.value(), e.isKeepBinary(), false);
+ return (V)cctx.cacheObjectContext().unwrapBinaryIfNeeded(e.value(), e.isKeepBinary(), false);
}
/** {@inheritDoc} */
@Override
public V getOldValue() {
- return (V)cctx.cacheObjectContext().unwrapPortableIfNeeded(e.oldValue(), e.isKeepBinary(), false);
+ return (V)cctx.cacheObjectContext().unwrapBinaryIfNeeded(e.oldValue(), e.isKeepBinary(), false);
}
/** {@inheritDoc} */
@@ -94,4 +94,4 @@ class CacheContinuousQueryEvent<K, V> extends CacheEntryEvent<K, V> {
"newVal", getValue(),
"oldVal", getOldValue());
}
-}
\ No newline at end of file
+}
http://git-wip-us.apache.org/repos/asf/ignite/blob/10b83fb8/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/store/CacheOsStoreManager.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/store/CacheOsStoreManager.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/store/CacheOsStoreManager.java
index d001c76..e89483a 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/store/CacheOsStoreManager.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/store/CacheOsStoreManager.java
@@ -57,7 +57,7 @@ public class CacheOsStoreManager extends GridCacheStoreManagerAdapter {
if (store instanceof PlatformCacheStore) {
PlatformProcessor proc = ctx.platform();
- proc.registerStore((PlatformCacheStore)store, configuredConvertPortable());
+ proc.registerStore((PlatformCacheStore)store, configuredConvertBinary());
}
}
@@ -76,12 +76,12 @@ public class CacheOsStoreManager extends GridCacheStoreManagerAdapter {
}
/** {@inheritDoc} */
- @Override public boolean convertPortable() {
- return configuredConvertPortable() && !(cfgStore instanceof PlatformCacheStore);
+ @Override public boolean convertBinary() {
+ return configuredConvertBinary() && !(cfgStore instanceof PlatformCacheStore);
}
/** {@inheritDoc} */
- @Override public boolean configuredConvertPortable() {
+ @Override public boolean configuredConvertBinary() {
return !(ctx.config().getMarshaller() instanceof BinaryMarshaller && cfg.isKeepBinaryInStore());
}
}
http://git-wip-us.apache.org/repos/asf/ignite/blob/10b83fb8/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/store/CacheStoreManager.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/store/CacheStoreManager.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/store/CacheStoreManager.java
index 509c806..67c9334 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/store/CacheStoreManager.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/store/CacheStoreManager.java
@@ -188,12 +188,12 @@ public interface CacheStoreManager<K, V> extends GridCacheManager<K, V> {
public void forceFlush() throws IgniteCheckedException;
/**
- * @return Convert-portable flag.
+ * @return Convert-binary flag.
*/
- public boolean convertPortable();
+ public boolean convertBinary();
/**
- * @return Configured convert portable flag.
+ * @return Configured convert binary flag.
*/
- public boolean configuredConvertPortable();
-}
\ No newline at end of file
+ public boolean configuredConvertBinary();
+}
http://git-wip-us.apache.org/repos/asf/ignite/blob/10b83fb8/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/store/GridCacheStoreManagerAdapter.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/store/GridCacheStoreManagerAdapter.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/store/GridCacheStoreManagerAdapter.java
index af3a77b..7ffebbd 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/store/GridCacheStoreManagerAdapter.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/store/GridCacheStoreManagerAdapter.java
@@ -283,7 +283,7 @@ public abstract class GridCacheStoreManagerAdapter extends GridCacheManagerAdapt
// Never load internal keys from store as they are never persisted.
return null;
- Object storeKey = cctx.unwrapPortableIfNeeded(key, !convertPortable());
+ Object storeKey = cctx.unwrapBinaryIfNeeded(key, !convertBinary());
if (log.isDebugEnabled())
log.debug("Loading value from store for key: " + storeKey);
@@ -410,7 +410,7 @@ public abstract class GridCacheStoreManagerAdapter extends GridCacheManagerAdapt
Collection<Object> keys0 = F.viewReadOnly(keys,
new C1<KeyCacheObject, Object>() {
@Override public Object apply(KeyCacheObject key) {
- return cctx.unwrapPortableIfNeeded(key, !convertPortable());
+ return cctx.unwrapBinaryIfNeeded(key, !convertBinary());
}
});
@@ -533,8 +533,8 @@ public abstract class GridCacheStoreManagerAdapter extends GridCacheManagerAdapt
if (key instanceof GridCacheInternal)
return true;
- key = cctx.unwrapPortableIfNeeded(key, !convertPortable());
- val = cctx.unwrapPortableIfNeeded(val, !convertPortable());
+ key = cctx.unwrapBinaryIfNeeded(key, !convertBinary());
+ val = cctx.unwrapBinaryIfNeeded(val, !convertBinary());
if (log.isDebugEnabled())
log.debug("Storing value in cache store [key=" + key + ", val=" + val + ']');
@@ -636,7 +636,7 @@ public abstract class GridCacheStoreManagerAdapter extends GridCacheManagerAdapt
if (key instanceof GridCacheInternal)
return false;
- key = cctx.unwrapPortableIfNeeded(key, !convertPortable());
+ key = cctx.unwrapBinaryIfNeeded(key, !convertBinary());
if (log.isDebugEnabled())
log.debug("Removing value from cache store [key=" + key + ']');
@@ -684,7 +684,7 @@ public abstract class GridCacheStoreManagerAdapter extends GridCacheManagerAdapt
}
if (store != null) {
- Collection<Object> keys0 = cctx.unwrapPortablesIfNeeded(keys, !convertPortable());
+ Collection<Object> keys0 = cctx.unwrapBinariesIfNeeded(keys, !convertBinary());
if (log.isDebugEnabled())
log.debug("Removing values from cache store [keys=" + keys0 + ']');
@@ -771,7 +771,7 @@ public abstract class GridCacheStoreManagerAdapter extends GridCacheManagerAdapt
assert e != null;
if (e.getMessage() != null) {
- throw new IgniteCheckedException("Cache store must work with portable objects if binary are " +
+ throw new IgniteCheckedException("Cache store must work with binary objects if binary are " +
"enabled for cache [cacheName=" + cctx.namex() + ']', e);
}
else
@@ -1093,8 +1093,8 @@ public abstract class GridCacheStoreManagerAdapter extends GridCacheManagerAdapt
Object v = locStore ? e.getValue() : e.getValue().get1();
- k = cctx.unwrapPortableIfNeeded(k, !convertPortable());
- v = cctx.unwrapPortableIfNeeded(v, !convertPortable());
+ k = cctx.unwrapBinaryIfNeeded(k, !convertBinary());
+ v = cctx.unwrapBinaryIfNeeded(v, !convertBinary());
if (rmvd != null && rmvd.contains(k))
continue;