http://git-wip-us.apache.org/repos/asf/ignite/blob/20f5b9cd/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 3c071db..71bbc15 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 @@ -28,8 +28,8 @@ import org.apache.ignite.cache.query.ScanQuery; import org.apache.ignite.cache.query.SqlFieldsQuery; import org.apache.ignite.cache.query.SqlQuery; import org.apache.ignite.cache.query.TextQuery; -import org.apache.ignite.internal.portable.IgniteObjectRawReaderEx; -import org.apache.ignite.internal.portable.IgniteObjectRawWriterEx; +import org.apache.ignite.internal.portable.BinaryRawReaderEx; +import org.apache.ignite.internal.portable.BinaryRawWriterEx; import org.apache.ignite.internal.processors.cache.CacheOperationContext; import org.apache.ignite.internal.processors.cache.CachePartialUpdateCheckedException; import org.apache.ignite.internal.processors.cache.IgniteCacheProxy; @@ -179,7 +179,7 @@ public class PlatformCache extends PlatformAbstractTarget { /** Underlying JCache. */ private final IgniteCacheProxy cache; - /** Whether this cache is created with "keepPortable" flag on the other side. */ + /** Whether this cache is created with "keepBinary" flag on the other side. */ private final boolean keepPortable; /** */ @@ -276,7 +276,7 @@ public class PlatformCache extends PlatformAbstractTarget { } /** {@inheritDoc} */ - @Override protected long processInStreamOutLong(int type, IgniteObjectRawReaderEx reader) throws IgniteCheckedException { + @Override protected long processInStreamOutLong(int type, BinaryRawReaderEx reader) throws IgniteCheckedException { switch (type) { case OP_PUT: cache.put(reader.readObjectDetached(), reader.readObjectDetached()); @@ -372,7 +372,7 @@ public class PlatformCache extends PlatformAbstractTarget { /** * Loads cache via localLoadCache or loadCache. */ - private void loadCache0(IgniteObjectRawReaderEx reader, boolean loc) throws IgniteCheckedException { + private void loadCache0(BinaryRawReaderEx reader, boolean loc) throws IgniteCheckedException { PlatformCacheEntryFilter filter = null; Object pred = reader.readObjectDetached(); @@ -389,7 +389,7 @@ public class PlatformCache extends PlatformAbstractTarget { } /** {@inheritDoc} */ - @Override protected Object processInStreamOutObject(int type, IgniteObjectRawReaderEx reader) + @Override protected Object processInStreamOutObject(int type, BinaryRawReaderEx reader) throws IgniteCheckedException { switch (type) { case OP_QRY_SQL: @@ -432,7 +432,7 @@ public class PlatformCache extends PlatformAbstractTarget { * @param reader Reader. * @return Arguments. */ - @Nullable private Object[] readQueryArgs(IgniteObjectRawReaderEx reader) { + @Nullable private Object[] readQueryArgs(BinaryRawReaderEx reader) { int cnt = reader.readInt(); if (cnt > 0) { @@ -448,7 +448,7 @@ public class PlatformCache extends PlatformAbstractTarget { } /** {@inheritDoc} */ - @Override protected void processOutStream(int type, IgniteObjectRawWriterEx writer) throws IgniteCheckedException { + @Override protected void processOutStream(int type, BinaryRawWriterEx writer) throws IgniteCheckedException { switch (type) { case OP_GET_NAME: writer.writeObject(cache.getName()); @@ -521,7 +521,7 @@ public class PlatformCache extends PlatformAbstractTarget { /** {@inheritDoc} */ @SuppressWarnings({"IfMayBeConditional", "ConstantConditions"}) - @Override protected void processInStreamOutStream(int type, IgniteObjectRawReaderEx reader, IgniteObjectRawWriterEx writer) + @Override protected void processInStreamOutStream(int type, BinaryRawReaderEx reader, BinaryRawWriterEx writer) throws IgniteCheckedException { switch (type) { case OP_GET: { @@ -640,7 +640,7 @@ public class PlatformCache extends PlatformAbstractTarget { * @param writer Writer. * @param results Results. */ - private static void writeInvokeAllResult(IgniteObjectRawWriterEx writer, Map<Object, EntryProcessorResult> results) { + private static void writeInvokeAllResult(BinaryRawWriterEx writer, Map<Object, EntryProcessorResult> results) { if (results == null) { writer.writeInt(-1); @@ -674,7 +674,7 @@ public class PlatformCache extends PlatformAbstractTarget { * @param writer Writer. * @param ex Exception. */ - private static void writeError(IgniteObjectRawWriterEx writer, Exception ex) { + private static void writeError(BinaryRawWriterEx writer, Exception ex) { if (ex.getCause() instanceof PlatformNativeException) writer.writeObjectDetached(((PlatformNativeException)ex.getCause()).cause()); else { @@ -845,7 +845,7 @@ public class PlatformCache extends PlatformAbstractTarget { /** * Runs specified query. */ - private PlatformQueryCursor runQuery(IgniteObjectRawReaderEx reader, Query qry) throws IgniteCheckedException { + private PlatformQueryCursor runQuery(BinaryRawReaderEx reader, Query qry) throws IgniteCheckedException { try { QueryCursorEx cursor = (QueryCursorEx) cache.query(qry); @@ -861,7 +861,7 @@ public class PlatformCache extends PlatformAbstractTarget { /** * Runs specified fields query. */ - private PlatformFieldsQueryCursor runFieldsQuery(IgniteObjectRawReaderEx reader, Query qry) + private PlatformFieldsQueryCursor runFieldsQuery(BinaryRawReaderEx reader, Query qry) throws IgniteCheckedException { try { QueryCursorEx cursor = (QueryCursorEx) cache.query(qry); @@ -877,7 +877,7 @@ public class PlatformCache extends PlatformAbstractTarget { /** * Reads the query of specified type. */ - private Query readInitialQuery(IgniteObjectRawReaderEx reader) throws IgniteCheckedException { + private Query readInitialQuery(BinaryRawReaderEx reader) throws IgniteCheckedException { int typ = reader.readInt(); switch (typ) { @@ -900,7 +900,7 @@ public class PlatformCache extends PlatformAbstractTarget { /** * Reads sql query. */ - private Query readSqlQuery(IgniteObjectRawReaderEx reader) { + private Query readSqlQuery(BinaryRawReaderEx reader) { boolean loc = reader.readBoolean(); String sql = reader.readString(); String typ = reader.readString(); @@ -914,7 +914,7 @@ public class PlatformCache extends PlatformAbstractTarget { /** * Reads fields query. */ - private Query readFieldsQuery(IgniteObjectRawReaderEx reader) { + private Query readFieldsQuery(BinaryRawReaderEx reader) { boolean loc = reader.readBoolean(); String sql = reader.readString(); final int pageSize = reader.readInt(); @@ -927,7 +927,7 @@ public class PlatformCache extends PlatformAbstractTarget { /** * Reads text query. */ - private Query readTextQuery(IgniteObjectRawReaderEx reader) { + private Query readTextQuery(BinaryRawReaderEx reader) { boolean loc = reader.readBoolean(); String txt = reader.readString(); String typ = reader.readString(); @@ -939,7 +939,7 @@ public class PlatformCache extends PlatformAbstractTarget { /** * Reads scan query. */ - private Query readScanQuery(IgniteObjectRawReaderEx reader) { + private Query readScanQuery(BinaryRawReaderEx reader) { boolean loc = reader.readBoolean(); final int pageSize = reader.readInt(); @@ -966,7 +966,7 @@ public class PlatformCache extends PlatformAbstractTarget { */ private static class GetAllWriter implements PlatformFutureUtils.Writer { /** <inheritDoc /> */ - @Override public void write(IgniteObjectRawWriterEx writer, Object obj, Throwable err) { + @Override public void write(BinaryRawWriterEx writer, Object obj, Throwable err) { assert obj instanceof Map; PlatformUtils.writeNullableMap(writer, (Map) obj); @@ -983,7 +983,7 @@ public class PlatformCache extends PlatformAbstractTarget { */ private static class EntryProcessorInvokeWriter implements PlatformFutureUtils.Writer { /** <inheritDoc /> */ - @Override public void write(IgniteObjectRawWriterEx writer, Object obj, Throwable err) { + @Override public void write(BinaryRawWriterEx writer, Object obj, Throwable err) { if (err == null) { writer.writeBoolean(false); // No error. @@ -1007,7 +1007,7 @@ public class PlatformCache extends PlatformAbstractTarget { */ private static class EntryProcessorInvokeAllWriter implements PlatformFutureUtils.Writer { /** <inheritDoc /> */ - @Override public void write(IgniteObjectRawWriterEx writer, Object obj, Throwable err) { + @Override public void write(BinaryRawWriterEx writer, Object obj, Throwable err) { writeInvokeAllResult(writer, (Map)obj); }
http://git-wip-us.apache.org/repos/asf/ignite/blob/20f5b9cd/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 1dfb428..6998451 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 @@ -18,7 +18,7 @@ package org.apache.ignite.internal.processors.platform.cache; import org.apache.ignite.Ignite; -import org.apache.ignite.internal.portable.IgniteObjectRawWriterEx; +import org.apache.ignite.internal.portable.BinaryRawWriterEx; import org.apache.ignite.internal.processors.platform.PlatformAbstractPredicate; import org.apache.ignite.internal.processors.platform.PlatformContext; import org.apache.ignite.internal.processors.platform.memory.PlatformMemory; @@ -58,7 +58,7 @@ public class PlatformCacheEntryFilterImpl extends PlatformAbstractPredicate impl try (PlatformMemory mem = ctx.memory().allocate()) { PlatformOutputStream out = mem.output(); - IgniteObjectRawWriterEx writer = ctx.writer(out); + BinaryRawWriterEx writer = ctx.writer(out); writer.writeObject(k); writer.writeObject(v); @@ -94,7 +94,7 @@ public class PlatformCacheEntryFilterImpl extends PlatformAbstractPredicate impl try (PlatformMemory mem = ctx.memory().allocate()) { PlatformOutputStream out = mem.output(); - IgniteObjectRawWriterEx writer = ctx.writer(out); + BinaryRawWriterEx writer = ctx.writer(out); writer.writeObject(pred); http://git-wip-us.apache.org/repos/asf/ignite/blob/20f5b9cd/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 4be6d7e..ce06ec1 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 @@ -26,8 +26,8 @@ import javax.cache.processor.MutableEntry; import org.apache.ignite.Ignite; import org.apache.ignite.IgniteCheckedException; import org.apache.ignite.internal.IgniteKernal; -import org.apache.ignite.internal.portable.IgniteObjectRawReaderEx; -import org.apache.ignite.internal.portable.IgniteObjectRawWriterEx; +import org.apache.ignite.internal.portable.BinaryRawReaderEx; +import org.apache.ignite.internal.portable.BinaryRawWriterEx; import org.apache.ignite.internal.processors.platform.PlatformContext; import org.apache.ignite.internal.processors.platform.PlatformProcessor; import org.apache.ignite.internal.processors.platform.memory.PlatformInputStream; @@ -119,7 +119,7 @@ public class PlatformCacheEntryProcessorImpl implements PlatformCacheEntryProces try (PlatformMemory outMem = ctx.memory().allocate()) { PlatformOutputStream out = outMem.output(); - IgniteObjectRawWriterEx writer = ctx.writer(out); + BinaryRawWriterEx writer = ctx.writer(out); writeEntryAndProcessor(entry, writer); @@ -132,7 +132,7 @@ public class PlatformCacheEntryProcessorImpl implements PlatformCacheEntryProces in.synchronize(); - IgniteObjectRawReaderEx reader = ctx.reader(in); + BinaryRawReaderEx reader = ctx.reader(in); return readResultAndUpdateEntry(ctx, entry, reader); } @@ -145,7 +145,7 @@ public class PlatformCacheEntryProcessorImpl implements PlatformCacheEntryProces * @param entry Entry to process. * @param writer Writer. */ - private void writeEntryAndProcessor(MutableEntry entry, IgniteObjectRawWriterEx writer) { + private void writeEntryAndProcessor(MutableEntry entry, BinaryRawWriterEx writer) { writer.writeObject(entry.getKey()); writer.writeObject(entry.getValue()); @@ -170,7 +170,7 @@ public class PlatformCacheEntryProcessorImpl implements PlatformCacheEntryProces * @throws javax.cache.processor.EntryProcessorException If processing has failed in user code. */ @SuppressWarnings("unchecked") - private Object readResultAndUpdateEntry(PlatformContext ctx, MutableEntry entry, IgniteObjectRawReaderEx reader) { + private Object readResultAndUpdateEntry(PlatformContext ctx, MutableEntry entry, BinaryRawReaderEx reader) { byte state = reader.readByte(); switch (state) { http://git-wip-us.apache.org/repos/asf/ignite/blob/20f5b9cd/modules/core/src/main/java/org/apache/ignite/internal/processors/platform/cache/PlatformCacheIterator.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/platform/cache/PlatformCacheIterator.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/platform/cache/PlatformCacheIterator.java index d4c5bfa..a5659af 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/platform/cache/PlatformCacheIterator.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/platform/cache/PlatformCacheIterator.java @@ -20,7 +20,7 @@ package org.apache.ignite.internal.processors.platform.cache; import java.util.Iterator; import javax.cache.Cache; import org.apache.ignite.IgniteCheckedException; -import org.apache.ignite.internal.portable.IgniteObjectRawWriterEx; +import org.apache.ignite.internal.portable.BinaryRawWriterEx; import org.apache.ignite.internal.processors.platform.PlatformAbstractTarget; import org.apache.ignite.internal.processors.platform.PlatformContext; @@ -47,7 +47,7 @@ public class PlatformCacheIterator extends PlatformAbstractTarget { } /** {@inheritDoc} */ - @Override protected void processOutStream(int type, IgniteObjectRawWriterEx writer) throws IgniteCheckedException { + @Override protected void processOutStream(int type, BinaryRawWriterEx writer) throws IgniteCheckedException { switch (type) { case OP_NEXT: if (iter.hasNext()) { http://git-wip-us.apache.org/repos/asf/ignite/blob/20f5b9cd/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 4323ae0..8314e3a 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 @@ -17,7 +17,7 @@ package org.apache.ignite.internal.processors.platform.cache; -import org.apache.ignite.internal.portable.IgniteObjectRawWriterEx; +import org.apache.ignite.internal.portable.BinaryRawWriterEx; import org.apache.ignite.internal.processors.cache.CachePartialUpdateCheckedException; import org.apache.ignite.internal.processors.platform.PlatformContext; import org.apache.ignite.internal.processors.platform.PlatformExtendedException; @@ -49,7 +49,7 @@ public class PlatformCachePartialUpdateException extends PlatformExtendedExcepti } /** {@inheritDoc} */ - @Override public void writeData(IgniteObjectRawWriterEx writer) { + @Override public void writeData(BinaryRawWriterEx writer) { Collection keys = ((CachePartialUpdateCheckedException)getCause()).failedKeys(); writer.writeBoolean(keepPortable); http://git-wip-us.apache.org/repos/asf/ignite/blob/20f5b9cd/modules/core/src/main/java/org/apache/ignite/internal/processors/platform/cache/affinity/PlatformAffinity.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/platform/cache/affinity/PlatformAffinity.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/platform/cache/affinity/PlatformAffinity.java index b628855..c4e0350 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/platform/cache/affinity/PlatformAffinity.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/platform/cache/affinity/PlatformAffinity.java @@ -25,8 +25,8 @@ import org.apache.ignite.cache.affinity.Affinity; import org.apache.ignite.cluster.ClusterNode; import org.apache.ignite.internal.GridKernalContext; import org.apache.ignite.internal.managers.discovery.GridDiscoveryManager; -import org.apache.ignite.internal.portable.IgniteObjectRawReaderEx; -import org.apache.ignite.internal.portable.IgniteObjectRawWriterEx; +import org.apache.ignite.internal.portable.BinaryRawReaderEx; +import org.apache.ignite.internal.portable.BinaryRawWriterEx; import org.apache.ignite.internal.processors.platform.PlatformAbstractTarget; import org.apache.ignite.internal.processors.platform.PlatformContext; import org.apache.ignite.internal.processors.platform.utils.PlatformUtils; @@ -114,7 +114,7 @@ public class PlatformAffinity extends PlatformAbstractTarget { } /** {@inheritDoc} */ - @Override protected long processInStreamOutLong(int type, IgniteObjectRawReaderEx reader) throws IgniteCheckedException { + @Override protected long processInStreamOutLong(int type, BinaryRawReaderEx reader) throws IgniteCheckedException { switch (type) { case OP_PARTITION: return aff.partition(reader.readObjectDetached()); @@ -165,7 +165,7 @@ public class PlatformAffinity extends PlatformAbstractTarget { /** {@inheritDoc} */ @SuppressWarnings({"IfMayBeConditional", "ConstantConditions"}) - @Override protected void processInStreamOutStream(int type, IgniteObjectRawReaderEx reader, IgniteObjectRawWriterEx writer) + @Override protected void processInStreamOutStream(int type, BinaryRawReaderEx reader, BinaryRawWriterEx writer) throws IgniteCheckedException { switch (type) { case OP_PRIMARY_PARTITIONS: { http://git-wip-us.apache.org/repos/asf/ignite/blob/20f5b9cd/modules/core/src/main/java/org/apache/ignite/internal/processors/platform/cache/query/PlatformAbstractQueryCursor.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/platform/cache/query/PlatformAbstractQueryCursor.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/platform/cache/query/PlatformAbstractQueryCursor.java index 737e79f..8c24d23 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/platform/cache/query/PlatformAbstractQueryCursor.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/platform/cache/query/PlatformAbstractQueryCursor.java @@ -19,7 +19,7 @@ package org.apache.ignite.internal.processors.platform.cache.query; import java.util.Iterator; import org.apache.ignite.IgniteCheckedException; -import org.apache.ignite.internal.portable.IgniteObjectRawWriterEx; +import org.apache.ignite.internal.portable.BinaryRawWriterEx; import org.apache.ignite.internal.processors.cache.query.QueryCursorEx; import org.apache.ignite.internal.processors.platform.PlatformAbstractTarget; import org.apache.ignite.internal.processors.platform.PlatformContext; @@ -62,7 +62,7 @@ public abstract class PlatformAbstractQueryCursor<T> extends PlatformAbstractTar } /** {@inheritDoc} */ - @Override protected void processOutStream(int type, final IgniteObjectRawWriterEx writer) throws IgniteCheckedException { + @Override protected void processOutStream(int type, final BinaryRawWriterEx writer) throws IgniteCheckedException { switch (type) { case OP_GET_BATCH: { assert iter != null : "iterator() has not been called"; @@ -157,7 +157,7 @@ public abstract class PlatformAbstractQueryCursor<T> extends PlatformAbstractTar * @param writer Writer. * @param val Value. */ - protected abstract void write(IgniteObjectRawWriterEx writer, T val); + protected abstract void write(BinaryRawWriterEx writer, T val); /** * Query cursor consumer. @@ -167,7 +167,7 @@ public abstract class PlatformAbstractQueryCursor<T> extends PlatformAbstractTar private final PlatformAbstractQueryCursor<T> cursor; /** Writer. */ - private final IgniteObjectRawWriterEx writer; + private final BinaryRawWriterEx writer; /** Count. */ private int cnt; @@ -177,7 +177,7 @@ public abstract class PlatformAbstractQueryCursor<T> extends PlatformAbstractTar * * @param writer Writer. */ - public Consumer(PlatformAbstractQueryCursor<T> cursor, IgniteObjectRawWriterEx writer) { + public Consumer(PlatformAbstractQueryCursor<T> cursor, BinaryRawWriterEx writer) { this.cursor = cursor; this.writer = writer; } http://git-wip-us.apache.org/repos/asf/ignite/blob/20f5b9cd/modules/core/src/main/java/org/apache/ignite/internal/processors/platform/cache/query/PlatformContinuousQueryRemoteFilter.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/platform/cache/query/PlatformContinuousQueryRemoteFilter.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/platform/cache/query/PlatformContinuousQueryRemoteFilter.java index 0100a59..9f67118 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/platform/cache/query/PlatformContinuousQueryRemoteFilter.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/platform/cache/query/PlatformContinuousQueryRemoteFilter.java @@ -18,7 +18,7 @@ package org.apache.ignite.internal.processors.platform.cache.query; import org.apache.ignite.Ignite; -import org.apache.ignite.internal.portable.IgniteObjectRawWriterEx; +import org.apache.ignite.internal.portable.BinaryRawWriterEx; import org.apache.ignite.internal.processors.platform.PlatformContext; import org.apache.ignite.internal.processors.platform.memory.PlatformMemory; import org.apache.ignite.internal.processors.platform.memory.PlatformOutputStream; @@ -115,7 +115,7 @@ public class PlatformContinuousQueryRemoteFilter implements PlatformContinuousQu try (PlatformMemory mem = ctx.memory().allocate()) { PlatformOutputStream out = mem.output(); - IgniteObjectRawWriterEx writer = ctx.writer(out); + BinaryRawWriterEx writer = ctx.writer(out); writer.writeObject(filter); http://git-wip-us.apache.org/repos/asf/ignite/blob/20f5b9cd/modules/core/src/main/java/org/apache/ignite/internal/processors/platform/cache/query/PlatformFieldsQueryCursor.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/platform/cache/query/PlatformFieldsQueryCursor.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/platform/cache/query/PlatformFieldsQueryCursor.java index 6f8f6dd..035e927 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/platform/cache/query/PlatformFieldsQueryCursor.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/platform/cache/query/PlatformFieldsQueryCursor.java @@ -18,7 +18,7 @@ package org.apache.ignite.internal.processors.platform.cache.query; import java.util.List; -import org.apache.ignite.internal.portable.IgniteObjectRawWriterEx; +import org.apache.ignite.internal.portable.BinaryRawWriterEx; import org.apache.ignite.internal.processors.cache.query.QueryCursorEx; import org.apache.ignite.internal.processors.platform.PlatformContext; @@ -38,7 +38,7 @@ public class PlatformFieldsQueryCursor extends PlatformAbstractQueryCursor<List< } /** {@inheritDoc} */ - @Override protected void write(IgniteObjectRawWriterEx writer, List vals) { + @Override protected void write(BinaryRawWriterEx writer, List vals) { assert vals != null; writer.writeInt(vals.size()); http://git-wip-us.apache.org/repos/asf/ignite/blob/20f5b9cd/modules/core/src/main/java/org/apache/ignite/internal/processors/platform/cache/query/PlatformQueryCursor.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/platform/cache/query/PlatformQueryCursor.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/platform/cache/query/PlatformQueryCursor.java index 6429663..fe94e65 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/platform/cache/query/PlatformQueryCursor.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/platform/cache/query/PlatformQueryCursor.java @@ -18,7 +18,7 @@ package org.apache.ignite.internal.processors.platform.cache.query; import javax.cache.Cache; -import org.apache.ignite.internal.portable.IgniteObjectRawWriterEx; +import org.apache.ignite.internal.portable.BinaryRawWriterEx; import org.apache.ignite.internal.processors.cache.query.QueryCursorEx; import org.apache.ignite.internal.processors.platform.PlatformContext; @@ -38,7 +38,7 @@ public class PlatformQueryCursor extends PlatformAbstractQueryCursor<Cache.Entry } /** {@inheritDoc} */ - @Override protected void write(IgniteObjectRawWriterEx writer, Cache.Entry val) { + @Override protected void write(BinaryRawWriterEx writer, Cache.Entry val) { writer.writeObjectDetached(val.getKey()); writer.writeObjectDetached(val.getValue()); } http://git-wip-us.apache.org/repos/asf/ignite/blob/20f5b9cd/modules/core/src/main/java/org/apache/ignite/internal/processors/platform/cache/store/PlatformCacheStoreCallback.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/platform/cache/store/PlatformCacheStoreCallback.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/platform/cache/store/PlatformCacheStoreCallback.java index 42f9b86..45110ce 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/platform/cache/store/PlatformCacheStoreCallback.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/platform/cache/store/PlatformCacheStoreCallback.java @@ -17,7 +17,7 @@ package org.apache.ignite.internal.processors.platform.cache.store; -import org.apache.ignite.internal.portable.IgniteObjectRawReaderEx; +import org.apache.ignite.internal.portable.BinaryRawReaderEx; import org.apache.ignite.internal.processors.platform.PlatformContext; import org.apache.ignite.internal.processors.platform.memory.PlatformMemory; @@ -45,7 +45,7 @@ public abstract class PlatformCacheStoreCallback { public void invoke(long memPtr) { if (memPtr > 0) { try (PlatformMemory mem = ctx.memory().get(memPtr)) { - IgniteObjectRawReaderEx reader = ctx.reader(mem); + BinaryRawReaderEx reader = ctx.reader(mem); invoke0(reader); } @@ -57,5 +57,5 @@ public abstract class PlatformCacheStoreCallback { * * @param reader Reader. */ - protected abstract void invoke0(IgniteObjectRawReaderEx reader); + protected abstract void invoke0(BinaryRawReaderEx reader); } \ No newline at end of file http://git-wip-us.apache.org/repos/asf/ignite/blob/20f5b9cd/modules/core/src/main/java/org/apache/ignite/internal/processors/platform/cluster/PlatformClusterGroup.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/platform/cluster/PlatformClusterGroup.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/platform/cluster/PlatformClusterGroup.java index f839653..fc47a4b 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/platform/cluster/PlatformClusterGroup.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/platform/cluster/PlatformClusterGroup.java @@ -24,8 +24,8 @@ import org.apache.ignite.IgniteCluster; import org.apache.ignite.cluster.ClusterMetrics; import org.apache.ignite.cluster.ClusterNode; import org.apache.ignite.internal.cluster.ClusterGroupEx; -import org.apache.ignite.internal.portable.IgniteObjectRawReaderEx; -import org.apache.ignite.internal.portable.IgniteObjectRawWriterEx; +import org.apache.ignite.internal.portable.BinaryRawReaderEx; +import org.apache.ignite.internal.portable.BinaryRawWriterEx; import org.apache.ignite.internal.processors.platform.PlatformAbstractTarget; import org.apache.ignite.internal.processors.platform.PlatformContext; import org.apache.ignite.internal.processors.platform.utils.PlatformUtils; @@ -94,7 +94,7 @@ public class PlatformClusterGroup extends PlatformAbstractTarget { /** {@inheritDoc} */ @SuppressWarnings("deprecation") - @Override protected void processOutStream(int type, IgniteObjectRawWriterEx writer) throws IgniteCheckedException { + @Override protected void processOutStream(int type, BinaryRawWriterEx writer) throws IgniteCheckedException { switch (type) { case OP_METRICS: platformCtx.writeClusterMetrics(writer, prj.metrics()); @@ -113,7 +113,7 @@ public class PlatformClusterGroup extends PlatformAbstractTarget { /** {@inheritDoc} */ @SuppressWarnings({"ConstantConditions", "deprecation"}) - @Override protected void processInStreamOutStream(int type, IgniteObjectRawReaderEx reader, IgniteObjectRawWriterEx writer) + @Override protected void processInStreamOutStream(int type, BinaryRawReaderEx reader, BinaryRawWriterEx writer) throws IgniteCheckedException { switch (type) { case OP_METRICS_FILTERED: { @@ -194,7 +194,7 @@ public class PlatformClusterGroup extends PlatformAbstractTarget { } /** {@inheritDoc} */ - @Override protected long processInStreamOutLong(int type, IgniteObjectRawReaderEx reader) throws IgniteCheckedException { + @Override protected long processInStreamOutLong(int type, BinaryRawReaderEx reader) throws IgniteCheckedException { switch (type) { case OP_PING_NODE: return pingNode(reader.readUuid()) ? TRUE : FALSE; @@ -205,7 +205,7 @@ public class PlatformClusterGroup extends PlatformAbstractTarget { } /** {@inheritDoc} */ - @Override protected Object processInStreamOutObject(int type, IgniteObjectRawReaderEx reader) throws IgniteCheckedException { + @Override protected Object processInStreamOutObject(int type, BinaryRawReaderEx reader) throws IgniteCheckedException { switch (type) { case OP_FOR_NODE_IDS: { Collection<UUID> ids = PlatformUtils.readCollection(reader); http://git-wip-us.apache.org/repos/asf/ignite/blob/20f5b9cd/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 022aad4..92aabd8 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 @@ -19,7 +19,7 @@ package org.apache.ignite.internal.processors.platform.cluster; import org.apache.ignite.Ignite; import org.apache.ignite.cluster.ClusterNode; -import org.apache.ignite.internal.portable.IgniteObjectRawWriterEx; +import org.apache.ignite.internal.portable.BinaryRawWriterEx; import org.apache.ignite.internal.processors.platform.PlatformAbstractPredicate; import org.apache.ignite.internal.processors.platform.PlatformContext; import org.apache.ignite.internal.processors.platform.memory.PlatformMemory; @@ -56,7 +56,7 @@ public class PlatformClusterNodeFilterImpl extends PlatformAbstractPredicate imp try (PlatformMemory mem = ctx.memory().allocate()) { PlatformOutputStream out = mem.output(); - IgniteObjectRawWriterEx writer = ctx.writer(out); + BinaryRawWriterEx writer = ctx.writer(out); writer.writeObject(pred); ctx.writeNode(writer, clusterNode); http://git-wip-us.apache.org/repos/asf/ignite/blob/20f5b9cd/modules/core/src/main/java/org/apache/ignite/internal/processors/platform/compute/PlatformAbstractJob.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/platform/compute/PlatformAbstractJob.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/platform/compute/PlatformAbstractJob.java index 7051164..462f2c4 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/platform/compute/PlatformAbstractJob.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/platform/compute/PlatformAbstractJob.java @@ -20,7 +20,7 @@ package org.apache.ignite.internal.processors.platform.compute; import java.io.Externalizable; import org.apache.ignite.Ignite; import org.apache.ignite.IgniteCheckedException; -import org.apache.ignite.internal.portable.IgniteObjectRawWriterEx; +import org.apache.ignite.internal.portable.BinaryRawWriterEx; import org.apache.ignite.internal.processors.platform.PlatformContext; import org.apache.ignite.internal.processors.platform.PlatformProcessor; import org.apache.ignite.internal.processors.platform.memory.PlatformMemory; @@ -105,7 +105,7 @@ public abstract class PlatformAbstractJob implements PlatformJob, Externalizable try (PlatformMemory mem = ctx.memory().allocate()) { PlatformOutputStream out = mem.output(); - IgniteObjectRawWriterEx writer = ctx.writer(out); + BinaryRawWriterEx writer = ctx.writer(out); writer.writeObject(job); http://git-wip-us.apache.org/repos/asf/ignite/blob/20f5b9cd/modules/core/src/main/java/org/apache/ignite/internal/processors/platform/compute/PlatformAbstractTask.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/platform/compute/PlatformAbstractTask.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/platform/compute/PlatformAbstractTask.java index 740c901..c293c51 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/platform/compute/PlatformAbstractTask.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/platform/compute/PlatformAbstractTask.java @@ -24,7 +24,7 @@ import org.apache.ignite.IgniteException; import org.apache.ignite.compute.ComputeJobResult; import org.apache.ignite.compute.ComputeJobResultPolicy; import org.apache.ignite.compute.ComputeTask; -import org.apache.ignite.internal.portable.IgniteObjectRawWriterEx; +import org.apache.ignite.internal.portable.BinaryRawWriterEx; import org.apache.ignite.internal.processors.platform.PlatformContext; import org.apache.ignite.internal.processors.platform.PlatformNativeException; import org.apache.ignite.internal.processors.platform.memory.PlatformMemory; @@ -86,7 +86,7 @@ public abstract class PlatformAbstractTask implements ComputeTask<Object, Void> try (PlatformMemory mem = ctx.memory().allocate()) { PlatformOutputStream out = mem.output(); - IgniteObjectRawWriterEx writer = ctx.writer(out); + BinaryRawWriterEx writer = ctx.writer(out); writer.writeUuid(res.getNode().id()); writer.writeBoolean(res.isCancelled()); @@ -151,7 +151,7 @@ public abstract class PlatformAbstractTask implements ComputeTask<Object, Void> try (PlatformMemory mem = ctx.memory().allocate()) { PlatformOutputStream out = mem.output(); - IgniteObjectRawWriterEx writer = ctx.writer(out); + BinaryRawWriterEx writer = ctx.writer(out); if (e0 == null) { writer.writeBoolean(false); http://git-wip-us.apache.org/repos/asf/ignite/blob/20f5b9cd/modules/core/src/main/java/org/apache/ignite/internal/processors/platform/compute/PlatformClosureJob.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/platform/compute/PlatformClosureJob.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/platform/compute/PlatformClosureJob.java index 281dc52..b35f31c 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/platform/compute/PlatformClosureJob.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/platform/compute/PlatformClosureJob.java @@ -21,7 +21,7 @@ import java.io.IOException; import java.io.ObjectInput; import java.io.ObjectOutput; import org.apache.ignite.IgniteCheckedException; -import org.apache.ignite.internal.portable.IgniteObjectRawReaderEx; +import org.apache.ignite.internal.portable.BinaryRawReaderEx; import org.apache.ignite.internal.processors.platform.PlatformContext; import org.apache.ignite.internal.processors.platform.memory.PlatformInputStream; import org.apache.ignite.internal.processors.platform.memory.PlatformMemory; @@ -69,7 +69,7 @@ public class PlatformClosureJob extends PlatformAbstractJob { in.synchronize(); - IgniteObjectRawReaderEx reader = ctx.reader(in); + BinaryRawReaderEx reader = ctx.reader(in); return PlatformUtils.readInvocationResult(ctx, reader); } http://git-wip-us.apache.org/repos/asf/ignite/blob/20f5b9cd/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 35e0051..11d4c74 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 @@ -25,15 +25,15 @@ import org.apache.ignite.IgniteCheckedException; import org.apache.ignite.IgniteCompute; import org.apache.ignite.internal.IgniteComputeImpl; import org.apache.ignite.internal.IgniteInternalFuture; -import org.apache.ignite.internal.portable.IgniteObjectImpl; -import org.apache.ignite.internal.portable.IgniteObjectRawReaderEx; -import org.apache.ignite.internal.portable.IgniteObjectRawWriterEx; +import org.apache.ignite.internal.portable.BinaryObjectImpl; +import org.apache.ignite.internal.portable.BinaryRawReaderEx; +import org.apache.ignite.internal.portable.BinaryRawWriterEx; import org.apache.ignite.internal.processors.platform.PlatformAbstractTarget; import org.apache.ignite.internal.processors.platform.PlatformContext; import org.apache.ignite.internal.util.typedef.C1; import org.apache.ignite.lang.IgniteFuture; import org.apache.ignite.lang.IgniteInClosure; -import org.apache.ignite.igniteobject.IgniteObject; +import org.apache.ignite.binary.BinaryObject; import static org.apache.ignite.internal.processors.task.GridTaskThreadContextKey.TC_SUBGRID; @@ -75,7 +75,7 @@ public class PlatformCompute extends PlatformAbstractTarget { } /** {@inheritDoc} */ - @Override protected long processInStreamOutLong(int type, IgniteObjectRawReaderEx reader) throws IgniteCheckedException { + @Override protected long processInStreamOutLong(int type, BinaryRawReaderEx reader) throws IgniteCheckedException { switch (type) { case OP_UNICAST: processClosures(reader.readLong(), reader, false, false); @@ -104,7 +104,7 @@ public class PlatformCompute extends PlatformAbstractTarget { * @param reader Reader. * @param broadcast broadcast flag. */ - private void processClosures(long taskPtr, IgniteObjectRawReaderEx reader, boolean broadcast, boolean affinity) { + private void processClosures(long taskPtr, BinaryRawReaderEx reader, boolean broadcast, boolean affinity) { PlatformAbstractTask task; int size = reader.readInt(); @@ -165,12 +165,12 @@ public class PlatformCompute extends PlatformAbstractTarget { * @param reader Reader. * @return Closure job. */ - private PlatformJob nextClosureJob(PlatformAbstractTask task, IgniteObjectRawReaderEx reader) { + private PlatformJob nextClosureJob(PlatformAbstractTask task, BinaryRawReaderEx reader) { return platformCtx.createClosureJob(task, reader.readLong(), reader.readObjectDetached()); } /** {@inheritDoc} */ - @Override protected void processInStreamOutStream(int type, IgniteObjectRawReaderEx reader, IgniteObjectRawWriterEx writer) + @Override protected void processInStreamOutStream(int type, BinaryRawReaderEx reader, BinaryRawWriterEx writer) throws IgniteCheckedException { switch (type) { case OP_EXEC: @@ -256,7 +256,7 @@ public class PlatformCompute extends PlatformAbstractTarget { * @param reader Reader. * @return Task result. */ - protected Object executeJavaTask(IgniteObjectRawReaderEx reader, boolean async) { + protected Object executeJavaTask(BinaryRawReaderEx reader, boolean async) { String taskName = reader.readString(); boolean keepPortable = reader.readBoolean(); Object arg = reader.readObjectDetached(); @@ -268,8 +268,8 @@ public class PlatformCompute extends PlatformAbstractTarget { if (async) compute0 = compute0.withAsync(); - if (!keepPortable && arg instanceof IgniteObjectImpl) - arg = ((IgniteObject)arg).deserialize(); + if (!keepPortable && arg instanceof BinaryObjectImpl) + arg = ((BinaryObject)arg).deserialize(); Object res = compute0.execute(taskName, arg); @@ -304,7 +304,7 @@ public class PlatformCompute extends PlatformAbstractTarget { * @param reader Reader. * @return Node IDs. */ - protected Collection<UUID> readNodeIds(IgniteObjectRawReaderEx reader) { + protected Collection<UUID> readNodeIds(BinaryRawReaderEx reader) { if (reader.readBoolean()) { int len = reader.readInt(); http://git-wip-us.apache.org/repos/asf/ignite/blob/20f5b9cd/modules/core/src/main/java/org/apache/ignite/internal/processors/platform/compute/PlatformFullJob.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/platform/compute/PlatformFullJob.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/platform/compute/PlatformFullJob.java index 5fc9078..9302c03 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/platform/compute/PlatformFullJob.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/platform/compute/PlatformFullJob.java @@ -21,7 +21,7 @@ import java.io.IOException; import java.io.ObjectInput; import java.io.ObjectOutput; import org.apache.ignite.IgniteCheckedException; -import org.apache.ignite.internal.portable.IgniteObjectRawReaderEx; +import org.apache.ignite.internal.portable.BinaryRawReaderEx; import org.apache.ignite.internal.processors.platform.PlatformContext; import org.apache.ignite.internal.processors.platform.PlatformProcessor; import org.apache.ignite.internal.processors.platform.memory.PlatformInputStream; @@ -120,7 +120,7 @@ public class PlatformFullJob extends PlatformAbstractJob { in.synchronize(); - IgniteObjectRawReaderEx reader = ctx.reader(in); + BinaryRawReaderEx reader = ctx.reader(in); return PlatformUtils.readInvocationResult(ctx, reader); } @@ -209,7 +209,7 @@ public class PlatformFullJob extends PlatformAbstractJob { in.synchronize(); - IgniteObjectRawReaderEx reader = ctx.reader(in); + BinaryRawReaderEx reader = ctx.reader(in); if (res) job = reader.readObjectDetached(); http://git-wip-us.apache.org/repos/asf/ignite/blob/20f5b9cd/modules/core/src/main/java/org/apache/ignite/internal/processors/platform/compute/PlatformFullTask.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/platform/compute/PlatformFullTask.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/platform/compute/PlatformFullTask.java index 1c943e7..d789003 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/platform/compute/PlatformFullTask.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/platform/compute/PlatformFullTask.java @@ -27,8 +27,8 @@ import org.apache.ignite.compute.ComputeJob; import org.apache.ignite.compute.ComputeTaskNoResultCache; import org.apache.ignite.internal.IgniteComputeImpl; import org.apache.ignite.internal.managers.discovery.GridDiscoveryManager; -import org.apache.ignite.internal.portable.IgniteObjectRawReaderEx; -import org.apache.ignite.internal.portable.IgniteObjectRawWriterEx; +import org.apache.ignite.internal.portable.BinaryRawReaderEx; +import org.apache.ignite.internal.portable.BinaryRawWriterEx; import org.apache.ignite.internal.processors.platform.PlatformContext; import org.apache.ignite.internal.processors.platform.memory.PlatformInputStream; import org.apache.ignite.internal.processors.platform.memory.PlatformMemory; @@ -83,7 +83,7 @@ public final class PlatformFullTask extends PlatformAbstractTask { try (PlatformMemory outMem = memMgr.allocate()) { PlatformOutputStream out = outMem.output(); - IgniteObjectRawWriterEx writer = ctx.writer(out); + BinaryRawWriterEx writer = ctx.writer(out); write(writer, nodes, subgrid); @@ -96,7 +96,7 @@ public final class PlatformFullTask extends PlatformAbstractTask { in.synchronize(); - IgniteObjectRawReaderEx reader = ctx.reader(in); + BinaryRawReaderEx reader = ctx.reader(in); return read(reader, nodes); } @@ -114,7 +114,7 @@ public final class PlatformFullTask extends PlatformAbstractTask { * @param nodes Current topology nodes. * @param subgrid Subgrid. */ - private void write(IgniteObjectRawWriterEx writer, Collection<ClusterNode> nodes, List<ClusterNode> subgrid) { + private void write(BinaryRawWriterEx writer, Collection<ClusterNode> nodes, List<ClusterNode> subgrid) { GridDiscoveryManager discoMgr = ctx.kernalContext().discovery(); long curTopVer = discoMgr.topologyVersion(); @@ -145,7 +145,7 @@ public final class PlatformFullTask extends PlatformAbstractTask { * @param nodes Current topology nodes. * @return Map result. */ - private Map<ComputeJob, ClusterNode> read(IgniteObjectRawReaderEx reader, Collection<ClusterNode> nodes) { + private Map<ComputeJob, ClusterNode> read(BinaryRawReaderEx reader, Collection<ClusterNode> nodes) { if (reader.readBoolean()) { if (!reader.readBoolean()) return null; http://git-wip-us.apache.org/repos/asf/ignite/blob/20f5b9cd/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 776f26b..7f87bcd 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 @@ -24,7 +24,7 @@ import org.apache.ignite.events.DiscoveryEvent; import org.apache.ignite.events.Event; import org.apache.ignite.internal.managers.discovery.GridDiscoveryManager; import org.apache.ignite.internal.managers.eventstorage.GridLocalEventListener; -import org.apache.ignite.internal.portable.IgniteObjectRawReaderEx; +import org.apache.ignite.internal.portable.BinaryRawReaderEx; import org.apache.ignite.internal.processors.affinity.AffinityTopologyVersion; import org.apache.ignite.internal.processors.datastreamer.DataStreamerImpl; import org.apache.ignite.internal.processors.platform.PlatformAbstractTarget; @@ -87,7 +87,7 @@ public class PlatformDataStreamer extends PlatformAbstractTarget { } /** {@inheritDoc} */ - @Override protected long processInStreamOutLong(int type, IgniteObjectRawReaderEx reader) throws IgniteCheckedException { + @Override protected long processInStreamOutLong(int type, BinaryRawReaderEx reader) throws IgniteCheckedException { switch (type) { case OP_UPDATE: int plc = reader.readInt(); http://git-wip-us.apache.org/repos/asf/ignite/blob/20f5b9cd/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 e814b03..5915496 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 @@ -20,7 +20,7 @@ package org.apache.ignite.internal.processors.platform.datastreamer; import org.apache.ignite.Ignite; import org.apache.ignite.IgniteCache; import org.apache.ignite.IgniteException; -import org.apache.ignite.internal.portable.IgniteObjectRawWriterEx; +import org.apache.ignite.internal.portable.BinaryRawWriterEx; import org.apache.ignite.internal.processors.platform.PlatformAbstractPredicate; import org.apache.ignite.internal.processors.platform.PlatformContext; import org.apache.ignite.internal.processors.platform.cache.PlatformCache; @@ -76,7 +76,7 @@ public class PlatformStreamReceiverImpl extends PlatformAbstractPredicate implem try (PlatformMemory mem = ctx.memory().allocate()) { PlatformOutputStream out = mem.output(); - IgniteObjectRawWriterEx writer = ctx.writer(out); + BinaryRawWriterEx writer = ctx.writer(out); writer.writeObject(pred); http://git-wip-us.apache.org/repos/asf/ignite/blob/20f5b9cd/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 68ede20..25521dc 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 @@ -21,8 +21,8 @@ import org.apache.ignite.IgniteCheckedException; import org.apache.ignite.cache.store.CacheStore; import org.apache.ignite.cache.store.CacheStoreSession; import org.apache.ignite.internal.GridKernalContext; -import org.apache.ignite.internal.portable.IgniteObjectRawReaderEx; -import org.apache.ignite.internal.portable.IgniteObjectRawWriterEx; +import org.apache.ignite.internal.portable.BinaryRawReaderEx; +import org.apache.ignite.internal.portable.BinaryRawWriterEx; import org.apache.ignite.internal.processors.platform.PlatformContext; import org.apache.ignite.internal.processors.platform.cache.store.PlatformCacheStore; import org.apache.ignite.internal.processors.platform.cache.store.PlatformCacheStoreCallback; @@ -149,8 +149,8 @@ public class PlatformDotNetCacheStore<K, V> implements CacheStore<K, V>, Platfor try { final GridTuple<V> val = new GridTuple<>(); - doInvoke(new IgniteInClosureX<IgniteObjectRawWriterEx>() { - @Override public void applyx(IgniteObjectRawWriterEx writer) throws IgniteCheckedException { + doInvoke(new IgniteInClosureX<BinaryRawWriterEx>() { + @Override public void applyx(BinaryRawWriterEx writer) throws IgniteCheckedException { writer.writeByte(OP_LOAD); writer.writeLong(session()); writer.writeString(ses.cacheName()); @@ -170,8 +170,8 @@ public class PlatformDotNetCacheStore<K, V> implements CacheStore<K, V>, Platfor try { final Map<K, V> loaded = new HashMap<>(); - doInvoke(new IgniteInClosureX<IgniteObjectRawWriterEx>() { - @Override public void applyx(IgniteObjectRawWriterEx writer) throws IgniteCheckedException { + doInvoke(new IgniteInClosureX<BinaryRawWriterEx>() { + @Override public void applyx(BinaryRawWriterEx writer) throws IgniteCheckedException { writer.writeByte(OP_LOAD_ALL); writer.writeLong(session()); writer.writeString(ses.cacheName()); @@ -189,8 +189,8 @@ public class PlatformDotNetCacheStore<K, V> implements CacheStore<K, V>, Platfor /** {@inheritDoc} */ @Override public void loadCache(final IgniteBiInClosure<K, V> clo, final @Nullable Object... args) { try { - doInvoke(new IgniteInClosureX<IgniteObjectRawWriterEx>() { - @Override public void applyx(IgniteObjectRawWriterEx writer) throws IgniteCheckedException { + doInvoke(new IgniteInClosureX<BinaryRawWriterEx>() { + @Override public void applyx(BinaryRawWriterEx writer) throws IgniteCheckedException { writer.writeByte(OP_LOAD_CACHE); writer.writeLong(session()); writer.writeString(ses.cacheName()); @@ -206,8 +206,8 @@ public class PlatformDotNetCacheStore<K, V> implements CacheStore<K, V>, Platfor /** {@inheritDoc} */ @Override public void write(final Cache.Entry<? extends K, ? extends V> entry) { try { - doInvoke(new IgniteInClosureX<IgniteObjectRawWriterEx>() { - @Override public void applyx(IgniteObjectRawWriterEx writer) throws IgniteCheckedException { + doInvoke(new IgniteInClosureX<BinaryRawWriterEx>() { + @Override public void applyx(BinaryRawWriterEx writer) throws IgniteCheckedException { writer.writeByte(OP_PUT); writer.writeLong(session()); writer.writeString(ses.cacheName()); @@ -225,8 +225,8 @@ public class PlatformDotNetCacheStore<K, V> implements CacheStore<K, V>, Platfor @SuppressWarnings({"NullableProblems", "unchecked"}) @Override public void writeAll(final Collection<Cache.Entry<? extends K, ? extends V>> entries) { try { - doInvoke(new IgniteInClosureX<IgniteObjectRawWriterEx>() { - @Override public void applyx(IgniteObjectRawWriterEx writer) throws IgniteCheckedException { + doInvoke(new IgniteInClosureX<BinaryRawWriterEx>() { + @Override public void applyx(BinaryRawWriterEx writer) throws IgniteCheckedException { Map<K, V> map = new AbstractMap<K, V>() { @Override public int size() { return entries.size(); @@ -266,8 +266,8 @@ public class PlatformDotNetCacheStore<K, V> implements CacheStore<K, V>, Platfor /** {@inheritDoc} */ @Override public void delete(final Object key) { try { - doInvoke(new IgniteInClosureX<IgniteObjectRawWriterEx>() { - @Override public void applyx(IgniteObjectRawWriterEx writer) throws IgniteCheckedException { + doInvoke(new IgniteInClosureX<BinaryRawWriterEx>() { + @Override public void applyx(BinaryRawWriterEx writer) throws IgniteCheckedException { writer.writeByte(OP_RMV); writer.writeLong(session()); writer.writeString(ses.cacheName()); @@ -283,8 +283,8 @@ public class PlatformDotNetCacheStore<K, V> implements CacheStore<K, V>, Platfor /** {@inheritDoc} */ @Override public void deleteAll(final Collection<?> keys) { try { - doInvoke(new IgniteInClosureX<IgniteObjectRawWriterEx>() { - @Override public void applyx(IgniteObjectRawWriterEx writer) throws IgniteCheckedException { + doInvoke(new IgniteInClosureX<BinaryRawWriterEx>() { + @Override public void applyx(BinaryRawWriterEx writer) throws IgniteCheckedException { writer.writeByte(OP_RMV_ALL); writer.writeLong(session()); writer.writeString(ses.cacheName()); @@ -300,8 +300,8 @@ public class PlatformDotNetCacheStore<K, V> implements CacheStore<K, V>, Platfor /** {@inheritDoc} */ @Override public void sessionEnd(final boolean commit) { try { - doInvoke(new IgniteInClosureX<IgniteObjectRawWriterEx>() { - @Override public void applyx(IgniteObjectRawWriterEx writer) throws IgniteCheckedException { + doInvoke(new IgniteInClosureX<BinaryRawWriterEx>() { + @Override public void applyx(BinaryRawWriterEx writer) throws IgniteCheckedException { writer.writeByte(OP_SES_END); writer.writeLong(session()); writer.writeString(ses.cacheName()); @@ -329,7 +329,7 @@ public class PlatformDotNetCacheStore<K, V> implements CacheStore<K, V>, Platfor try (PlatformMemory mem = platformCtx.memory().allocate()) { PlatformOutputStream out = mem.output(); - IgniteObjectRawWriterEx writer = platformCtx.writer(out); + BinaryRawWriterEx writer = platformCtx.writer(out); write(writer, convertPortable); @@ -345,7 +345,7 @@ public class PlatformDotNetCacheStore<K, V> implements CacheStore<K, V>, Platfor * @param writer Writer. * @param convertPortable Convert portable flag. */ - protected void write(IgniteObjectRawWriterEx writer, boolean convertPortable) { + protected void write(BinaryRawWriterEx writer, boolean convertPortable) { writer.writeString(typName); writer.writeBoolean(convertPortable); writer.writeMap(props); @@ -378,12 +378,12 @@ public class PlatformDotNetCacheStore<K, V> implements CacheStore<K, V>, Platfor * @return Result. * @throws org.apache.ignite.IgniteCheckedException If failed. */ - protected int doInvoke(IgniteInClosureX<IgniteObjectRawWriterEx> task, @Nullable PlatformCacheStoreCallback cb) + protected int doInvoke(IgniteInClosureX<BinaryRawWriterEx> task, @Nullable PlatformCacheStoreCallback cb) throws IgniteCheckedException{ try (PlatformMemory mem = platformCtx.memory().allocate()) { PlatformOutputStream out = mem.output(); - IgniteObjectRawWriterEx writer = platformCtx.writer(out); + BinaryRawWriterEx writer = platformCtx.writer(out); task.apply(writer); @@ -425,7 +425,7 @@ public class PlatformDotNetCacheStore<K, V> implements CacheStore<K, V>, Platfor /** {@inheritDoc} */ @SuppressWarnings("unchecked") - @Override protected void invoke0(IgniteObjectRawReaderEx reader) { + @Override protected void invoke0(BinaryRawReaderEx reader) { val.set((V)reader.readObjectDetached()); } } @@ -451,7 +451,7 @@ public class PlatformDotNetCacheStore<K, V> implements CacheStore<K, V>, Platfor /** {@inheritDoc} */ @SuppressWarnings("unchecked") - @Override protected void invoke0(IgniteObjectRawReaderEx reader) { + @Override protected void invoke0(BinaryRawReaderEx reader) { loaded.put((K) reader.readObjectDetached(), (V) reader.readObjectDetached()); } } @@ -477,7 +477,7 @@ public class PlatformDotNetCacheStore<K, V> implements CacheStore<K, V>, Platfor /** {@inheritDoc} */ @SuppressWarnings("unchecked") - @Override protected void invoke0(IgniteObjectRawReaderEx reader) { + @Override protected void invoke0(BinaryRawReaderEx reader) { clo.apply((K) reader.readObjectDetached(), (V) reader.readObjectDetached()); } } http://git-wip-us.apache.org/repos/asf/ignite/blob/20f5b9cd/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 eb918cc..c49c337 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 @@ -25,7 +25,7 @@ import org.apache.ignite.internal.MarshallerContextImpl; import org.apache.ignite.internal.portable.GridPortableMarshaller; import org.apache.ignite.internal.portable.PortableContext; import org.apache.ignite.internal.portable.PortableMetaDataHandler; -import org.apache.ignite.internal.portable.IgniteObjectRawWriterEx; +import org.apache.ignite.internal.portable.BinaryRawWriterEx; import org.apache.ignite.internal.processors.platform.PlatformAbstractConfigurationClosure; import org.apache.ignite.internal.processors.platform.lifecycle.PlatformLifecycleBean; import org.apache.ignite.internal.processors.platform.memory.PlatformInputStream; @@ -39,8 +39,8 @@ import org.apache.ignite.marshaller.Marshaller; import org.apache.ignite.platform.dotnet.PlatformDotNetConfiguration; import org.apache.ignite.marshaller.portable.PortableMarshaller; import org.apache.ignite.platform.dotnet.PlatformDotNetLifecycleBean; -import org.apache.ignite.igniteobject.IgniteObjectException; -import org.apache.ignite.igniteobject.IgniteObjectMetadata; +import org.apache.ignite.binary.BinaryObjectException; +import org.apache.ignite.binary.BinaryTypeMetadata; import java.util.ArrayList; import java.util.Collections; @@ -137,7 +137,7 @@ public class PlatformDotNetConfigurationClosure extends PlatformAbstractConfigur try (PlatformMemory inMem = memMgr.allocate()) { PlatformOutputStream out = outMem.output(); - IgniteObjectRawWriterEx writer = marshaller().writer(out); + BinaryRawWriterEx writer = marshaller().writer(out); PlatformUtils.writeDotNetConfiguration(writer, interopCfg.unwrap()); @@ -229,12 +229,12 @@ public class PlatformDotNetConfigurationClosure extends PlatformAbstractConfigur private static GridPortableMarshaller marshaller() { try { PortableContext ctx = new PortableContext(new PortableMetaDataHandler() { - @Override public void addMeta(int typeId, IgniteObjectMetadata meta) - throws IgniteObjectException { + @Override public void addMeta(int typeId, BinaryTypeMetadata meta) + throws BinaryObjectException { // No-op. } - @Override public IgniteObjectMetadata metadata(int typeId) throws IgniteObjectException { + @Override public BinaryTypeMetadata metadata(int typeId) throws BinaryObjectException { return null; } }, new IgniteConfiguration()); http://git-wip-us.apache.org/repos/asf/ignite/blob/20f5b9cd/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 b6618ef..a19f07e 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 @@ -19,7 +19,7 @@ package org.apache.ignite.internal.processors.platform.events; import org.apache.ignite.events.Event; import org.apache.ignite.internal.GridKernalContext; -import org.apache.ignite.internal.portable.IgniteObjectRawWriterEx; +import org.apache.ignite.internal.portable.BinaryRawWriterEx; import org.apache.ignite.internal.processors.platform.PlatformContext; import org.apache.ignite.internal.processors.platform.PlatformEventFilterListener; import org.apache.ignite.internal.processors.platform.memory.PlatformMemory; @@ -125,7 +125,7 @@ public class PlatformEventFilterListenerImpl implements PlatformEventFilterListe try (PlatformMemory mem = ctx.memory().allocate()) { PlatformOutputStream out = mem.output(); - IgniteObjectRawWriterEx writer = ctx.writer(out); + BinaryRawWriterEx writer = ctx.writer(out); ctx.writeEvent(writer, evt); @@ -151,7 +151,7 @@ public class PlatformEventFilterListenerImpl implements PlatformEventFilterListe try (PlatformMemory mem = ctx.memory().allocate()) { PlatformOutputStream out = mem.output(); - IgniteObjectRawWriterEx writer = ctx.writer(out); + BinaryRawWriterEx writer = ctx.writer(out); writer.writeObjectDetached(pred); http://git-wip-us.apache.org/repos/asf/ignite/blob/20f5b9cd/modules/core/src/main/java/org/apache/ignite/internal/processors/platform/events/PlatformEvents.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/platform/events/PlatformEvents.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/platform/events/PlatformEvents.java index 37bfcae..a1af469 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/platform/events/PlatformEvents.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/platform/events/PlatformEvents.java @@ -24,8 +24,8 @@ import org.apache.ignite.IgniteCheckedException; import org.apache.ignite.IgniteEvents; import org.apache.ignite.events.Event; import org.apache.ignite.events.EventAdapter; -import org.apache.ignite.internal.portable.IgniteObjectRawReaderEx; -import org.apache.ignite.internal.portable.IgniteObjectRawWriterEx; +import org.apache.ignite.internal.portable.BinaryRawReaderEx; +import org.apache.ignite.internal.portable.BinaryRawWriterEx; import org.apache.ignite.internal.processors.platform.PlatformAbstractTarget; import org.apache.ignite.internal.processors.platform.PlatformEventFilterListener; import org.apache.ignite.internal.processors.platform.PlatformContext; @@ -137,7 +137,7 @@ public class PlatformEvents extends PlatformAbstractTarget { } /** {@inheritDoc} */ - @Override protected long processInStreamOutLong(int type, IgniteObjectRawReaderEx reader) + @Override protected long processInStreamOutLong(int type, BinaryRawReaderEx reader) throws IgniteCheckedException { switch (type) { case OP_RECORD_LOCAL: @@ -168,7 +168,7 @@ public class PlatformEvents extends PlatformAbstractTarget { /** {@inheritDoc} */ @SuppressWarnings({"IfMayBeConditional", "ConstantConditions", "unchecked"}) - @Override protected void processInStreamOutStream(int type, IgniteObjectRawReaderEx reader, IgniteObjectRawWriterEx writer) + @Override protected void processInStreamOutStream(int type, BinaryRawReaderEx reader, BinaryRawWriterEx writer) throws IgniteCheckedException { switch (type) { case OP_LOCAL_QUERY: { @@ -256,7 +256,7 @@ public class PlatformEvents extends PlatformAbstractTarget { } /** {@inheritDoc} */ - @Override protected void processOutStream(int type, IgniteObjectRawWriterEx writer) throws IgniteCheckedException { + @Override protected void processOutStream(int type, BinaryRawWriterEx writer) throws IgniteCheckedException { switch (type) { case OP_GET_ENABLED_EVENTS: writeEventTypes(events.enabledEvents(), writer); @@ -292,7 +292,7 @@ public class PlatformEvents extends PlatformAbstractTarget { * @param reader Reader * @return Event types, or null. */ - private int[] readEventTypes(IgniteObjectRawReaderEx reader) { + private int[] readEventTypes(BinaryRawReaderEx reader) { return reader.readIntArray(); } @@ -302,7 +302,7 @@ public class PlatformEvents extends PlatformAbstractTarget { * @param writer Writer * @param types Types. */ - private void writeEventTypes(int[] types, IgniteObjectRawWriterEx writer) { + private void writeEventTypes(int[] types, BinaryRawWriterEx writer) { if (types == null) { writer.writeIntArray(null); @@ -349,7 +349,7 @@ public class PlatformEvents extends PlatformAbstractTarget { } /** <inheritDoc /> */ - @Override public void write(IgniteObjectRawWriterEx writer, Object obj, Throwable err) { + @Override public void write(BinaryRawWriterEx writer, Object obj, Throwable err) { platformCtx.writeEvent(writer, (EventAdapter)obj); } @@ -379,7 +379,7 @@ public class PlatformEvents extends PlatformAbstractTarget { /** <inheritDoc /> */ @SuppressWarnings("unchecked") - @Override public void write(IgniteObjectRawWriterEx writer, Object obj, Throwable err) { + @Override public void write(BinaryRawWriterEx writer, Object obj, Throwable err) { Collection<EventAdapter> events = (Collection<EventAdapter>)obj; writer.writeInt(events.size()); http://git-wip-us.apache.org/repos/asf/ignite/blob/20f5b9cd/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 fdc3460..9e1b086 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 @@ -18,7 +18,7 @@ package org.apache.ignite.internal.processors.platform.messaging; import org.apache.ignite.internal.GridKernalContext; -import org.apache.ignite.internal.portable.IgniteObjectRawWriterEx; +import org.apache.ignite.internal.portable.BinaryRawWriterEx; import org.apache.ignite.internal.processors.platform.PlatformAbstractPredicate; import org.apache.ignite.internal.processors.platform.PlatformContext; import org.apache.ignite.internal.processors.platform.memory.PlatformMemory; @@ -62,7 +62,7 @@ public class PlatformMessageFilterImpl extends PlatformAbstractPredicate impleme try (PlatformMemory mem = ctx.memory().allocate()) { PlatformOutputStream out = mem.output(); - IgniteObjectRawWriterEx writer = ctx.writer(out); + BinaryRawWriterEx writer = ctx.writer(out); writer.writeObject(uuid); writer.writeObject(m); @@ -83,7 +83,7 @@ public class PlatformMessageFilterImpl extends PlatformAbstractPredicate impleme try (PlatformMemory mem = ctx.memory().allocate()) { PlatformOutputStream out = mem.output(); - IgniteObjectRawWriterEx writer = ctx.writer(out); + BinaryRawWriterEx writer = ctx.writer(out); writer.writeObject(pred); http://git-wip-us.apache.org/repos/asf/ignite/blob/20f5b9cd/modules/core/src/main/java/org/apache/ignite/internal/processors/platform/messaging/PlatformMessageLocalFilter.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/platform/messaging/PlatformMessageLocalFilter.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/platform/messaging/PlatformMessageLocalFilter.java index 4ee7969..de3f255 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/platform/messaging/PlatformMessageLocalFilter.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/platform/messaging/PlatformMessageLocalFilter.java @@ -18,7 +18,7 @@ package org.apache.ignite.internal.processors.platform.messaging; import org.apache.ignite.internal.GridKernalContext; -import org.apache.ignite.internal.portable.IgniteObjectRawWriterEx; +import org.apache.ignite.internal.portable.BinaryRawWriterEx; import org.apache.ignite.internal.processors.platform.PlatformContext; import org.apache.ignite.internal.processors.platform.memory.PlatformMemory; import org.apache.ignite.internal.processors.platform.memory.PlatformOutputStream; @@ -58,7 +58,7 @@ public class PlatformMessageLocalFilter implements PlatformMessageFilter { try (PlatformMemory mem = platformCtx.memory().allocate()) { PlatformOutputStream out = mem.output(); - IgniteObjectRawWriterEx writer = platformCtx.writer(out); + BinaryRawWriterEx writer = platformCtx.writer(out); writer.writeObject(uuid); writer.writeObject(m); http://git-wip-us.apache.org/repos/asf/ignite/blob/20f5b9cd/modules/core/src/main/java/org/apache/ignite/internal/processors/platform/messaging/PlatformMessaging.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/platform/messaging/PlatformMessaging.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/platform/messaging/PlatformMessaging.java index dbbf5da..603d3db 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/platform/messaging/PlatformMessaging.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/platform/messaging/PlatformMessaging.java @@ -19,8 +19,8 @@ package org.apache.ignite.internal.processors.platform.messaging; import org.apache.ignite.IgniteCheckedException; import org.apache.ignite.IgniteMessaging; -import org.apache.ignite.internal.portable.IgniteObjectRawReaderEx; -import org.apache.ignite.internal.portable.IgniteObjectRawWriterEx; +import org.apache.ignite.internal.portable.BinaryRawReaderEx; +import org.apache.ignite.internal.portable.BinaryRawWriterEx; import org.apache.ignite.internal.processors.platform.PlatformAbstractTarget; import org.apache.ignite.internal.processors.platform.PlatformContext; import org.apache.ignite.internal.processors.platform.message.PlatformMessageFilter; @@ -84,7 +84,7 @@ public class PlatformMessaging extends PlatformAbstractTarget { } /** {@inheritDoc} */ - @Override protected long processInStreamOutLong(int type, IgniteObjectRawReaderEx reader) + @Override protected long processInStreamOutLong(int type, BinaryRawReaderEx reader) throws IgniteCheckedException { switch (type) { case OP_SEND: @@ -135,7 +135,7 @@ public class PlatformMessaging extends PlatformAbstractTarget { /** {@inheritDoc} */ @SuppressWarnings({"IfMayBeConditional", "ConstantConditions", "unchecked"}) - @Override protected void processInStreamOutStream(int type, IgniteObjectRawReaderEx reader, IgniteObjectRawWriterEx writer) + @Override protected void processInStreamOutStream(int type, BinaryRawReaderEx reader, BinaryRawWriterEx writer) throws IgniteCheckedException { switch (type) { case OP_REMOTE_LISTEN:{ http://git-wip-us.apache.org/repos/asf/ignite/blob/20f5b9cd/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 6d6cf06..18ab012 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 @@ -23,8 +23,8 @@ import java.io.ObjectInput; import java.io.ObjectOutput; import org.apache.ignite.Ignite; import org.apache.ignite.IgniteCheckedException; -import org.apache.ignite.internal.portable.IgniteObjectRawReaderEx; -import org.apache.ignite.internal.portable.IgniteObjectRawWriterEx; +import org.apache.ignite.internal.portable.BinaryRawReaderEx; +import org.apache.ignite.internal.portable.BinaryRawWriterEx; import org.apache.ignite.internal.processors.platform.PlatformContext; import org.apache.ignite.internal.processors.platform.memory.PlatformInputStream; import org.apache.ignite.internal.processors.platform.memory.PlatformMemory; @@ -84,7 +84,7 @@ public abstract class PlatformAbstractService implements PlatformService, Extern try (PlatformMemory mem = platformCtx.memory().allocate()) { PlatformOutputStream out = mem.output(); - IgniteObjectRawWriterEx writer = platformCtx.writer(out); + BinaryRawWriterEx writer = platformCtx.writer(out); writer.writeBoolean(srvKeepPortable); writer.writeObject(svc); @@ -108,7 +108,7 @@ public abstract class PlatformAbstractService implements PlatformService, Extern try (PlatformMemory mem = platformCtx.memory().allocate()) { PlatformOutputStream out = mem.output(); - IgniteObjectRawWriterEx writer = platformCtx.writer(out); + BinaryRawWriterEx writer = platformCtx.writer(out); writer.writeBoolean(srvKeepPortable); @@ -131,7 +131,7 @@ public abstract class PlatformAbstractService implements PlatformService, Extern try (PlatformMemory mem = platformCtx.memory().allocate()) { PlatformOutputStream out = mem.output(); - IgniteObjectRawWriterEx writer = platformCtx.writer(out); + BinaryRawWriterEx writer = platformCtx.writer(out); writer.writeBoolean(srvKeepPortable); @@ -152,7 +152,7 @@ public abstract class PlatformAbstractService implements PlatformService, Extern * @param ctx Context. * @param writer Writer. */ - private void writeServiceContext(ServiceContext ctx, IgniteObjectRawWriterEx writer) { + private void writeServiceContext(ServiceContext ctx, BinaryRawWriterEx writer) { writer.writeString(ctx.name()); writer.writeUuid(ctx.executionId()); writer.writeBoolean(ctx.isCancelled()); @@ -175,7 +175,7 @@ public abstract class PlatformAbstractService implements PlatformService, Extern try (PlatformMemory outMem = platformCtx.memory().allocate()) { PlatformOutputStream out = outMem.output(); - IgniteObjectRawWriterEx writer = platformCtx.writer(out); + BinaryRawWriterEx writer = platformCtx.writer(out); writer.writeBoolean(srvKeepPortable); writer.writeString(mthdName); @@ -195,7 +195,7 @@ public abstract class PlatformAbstractService implements PlatformService, Extern try (PlatformMemory inMem = platformCtx.memory().allocate()) { PlatformInputStream in = inMem.input(); - IgniteObjectRawReaderEx reader = platformCtx.reader(in); + BinaryRawReaderEx reader = platformCtx.reader(in); platformCtx.gateway().serviceInvokeMethod(ptr, outMem.pointer(), inMem.pointer()); http://git-wip-us.apache.org/repos/asf/ignite/blob/20f5b9cd/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 b6efb0d..320d5a9 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 @@ -22,8 +22,8 @@ import java.util.Map; import java.util.UUID; import org.apache.ignite.IgniteCheckedException; import org.apache.ignite.IgniteServices; -import org.apache.ignite.internal.portable.IgniteObjectRawReaderEx; -import org.apache.ignite.internal.portable.IgniteObjectRawWriterEx; +import org.apache.ignite.internal.portable.BinaryRawReaderEx; +import org.apache.ignite.internal.portable.BinaryRawWriterEx; import org.apache.ignite.internal.processors.platform.PlatformAbstractTarget; import org.apache.ignite.internal.processors.platform.PlatformContext; import org.apache.ignite.internal.processors.platform.dotnet.PlatformDotNetService; @@ -128,7 +128,7 @@ public class PlatformServices extends PlatformAbstractTarget { } /** {@inheritDoc} */ - @Override protected long processInStreamOutLong(int type, IgniteObjectRawReaderEx reader) + @Override protected long processInStreamOutLong(int type, BinaryRawReaderEx reader) throws IgniteCheckedException { switch (type) { case OP_DOTNET_DEPLOY: { @@ -169,7 +169,7 @@ public class PlatformServices extends PlatformAbstractTarget { } /** {@inheritDoc} */ - @Override protected void processInStreamOutStream(int type, IgniteObjectRawReaderEx reader, IgniteObjectRawWriterEx writer) + @Override protected void processInStreamOutStream(int type, BinaryRawReaderEx reader, BinaryRawWriterEx writer) throws IgniteCheckedException { switch (type) { case OP_DOTNET_SERVICES: { @@ -177,7 +177,7 @@ public class PlatformServices extends PlatformAbstractTarget { PlatformUtils.writeNullableCollection(writer, svcs, new PlatformWriterClosure<Service>() { - @Override public void write(IgniteObjectRawWriterEx writer, Service svc) { + @Override public void write(BinaryRawWriterEx writer, Service svc) { writer.writeLong(((PlatformService) svc).pointer()); } }, @@ -197,8 +197,8 @@ public class PlatformServices extends PlatformAbstractTarget { } /** {@inheritDoc} */ - @Override protected void processInObjectStreamOutStream(int type, Object arg, IgniteObjectRawReaderEx reader, - IgniteObjectRawWriterEx writer) throws IgniteCheckedException { + @Override protected void processInObjectStreamOutStream(int type, Object arg, BinaryRawReaderEx reader, + BinaryRawWriterEx writer) throws IgniteCheckedException { switch (type) { case OP_DOTNET_INVOKE: { assert arg != null; @@ -235,13 +235,13 @@ public class PlatformServices extends PlatformAbstractTarget { } /** {@inheritDoc} */ - @Override protected void processOutStream(int type, IgniteObjectRawWriterEx writer) throws IgniteCheckedException { + @Override protected void processOutStream(int type, BinaryRawWriterEx writer) throws IgniteCheckedException { switch (type) { case OP_DESCRIPTORS: { Collection<ServiceDescriptor> descs = services.serviceDescriptors(); PlatformUtils.writeCollection(writer, descs, new PlatformWriterClosure<ServiceDescriptor>() { - @Override public void write(IgniteObjectRawWriterEx writer, ServiceDescriptor d) { + @Override public void write(BinaryRawWriterEx writer, ServiceDescriptor d) { writer.writeString(d.name()); writer.writeString(d.cacheName()); writer.writeInt(d.maxPerNodeCount()); @@ -252,7 +252,7 @@ public class PlatformServices extends PlatformAbstractTarget { Map<UUID, Integer> top = d.topologySnapshot(); PlatformUtils.writeMap(writer, top, new PlatformWriterBiClosure<UUID, Integer>() { - @Override public void write(IgniteObjectRawWriterEx writer, UUID key, Integer val) { + @Override public void write(BinaryRawWriterEx writer, UUID key, Integer val) { writer.writeUuid(key); writer.writeInt(val); }
