This is an automated email from the ASF dual-hosted git repository.
nizhikov pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/ignite.git
The following commit(s) were added to refs/heads/master by this push:
new e98a5714723 IGNITE-29153 Move BinaryUtils read helpers to
BinaryReaderExImpl (#13695)
e98a5714723 is described below
commit e98a5714723ad696f272b038cb4f654e87971cd9
Author: Nikolay <[email protected]>
AuthorDate: Fri Oct 16 11:17:56 2026 +0300
IGNITE-29153 Move BinaryUtils read helpers to BinaryReaderExImpl (#13695)
---
.../ignite/internal/binary/BinariesFactory.java | 13 +
.../apache/ignite/internal/binary/BinaryUtils.java | 947 +-----------------
.../internal/binary/GridBinaryMarshaller.java | 4 +-
.../internal/binary/BinariesFactoryImpl.java | 7 +
.../ignite/internal/binary/BinaryImplUtils.java | 64 +-
.../ignite/internal/binary/BinaryObjectImpl.java | 2 +-
.../internal/binary/BinaryObjectOffheapImpl.java | 4 +-
.../ignite/internal/binary/BinaryReaderExImpl.java | 1049 ++++++++++++++++++--
.../binary/CrossObjectReferenceResolver.java | 2 +-
.../ignite/internal/binary/ObjectDetachHelper.java | 2 +-
.../internal/binary/RawBinaryObjectExtractor.java | 2 +-
.../binary/builder/BinaryBuilderReader.java | 6 +-
.../binary/builder/BinaryObjectBuilderImpl.java | 4 +-
13 files changed, 1065 insertions(+), 1041 deletions(-)
diff --git
a/modules/binary/api/src/main/java/org/apache/ignite/internal/binary/BinariesFactory.java
b/modules/binary/api/src/main/java/org/apache/ignite/internal/binary/BinariesFactory.java
index 5b3462941be..c64fae56ccf 100644
---
a/modules/binary/api/src/main/java/org/apache/ignite/internal/binary/BinariesFactory.java
+++
b/modules/binary/api/src/main/java/org/apache/ignite/internal/binary/BinariesFactory.java
@@ -21,6 +21,7 @@ import java.lang.reflect.Field;
import java.util.Map;
import java.util.function.ToIntFunction;
import org.apache.ignite.binary.BinaryObject;
+import org.apache.ignite.binary.BinaryObjectException;
import org.apache.ignite.internal.binary.streams.BinaryInputStream;
import org.apache.ignite.internal.binary.streams.BinaryOutputStream;
import org.apache.ignite.internal.processors.cache.CacheObjectValueContext;
@@ -72,6 +73,18 @@ public interface BinariesFactory {
boolean skipHdrCheck,
boolean forUnmarshal);
+ /**
+ * Unmarshals object from the input stream without deserialization of user
types.
+ *
+ * @param in Input stream.
+ * @param ctx Context.
+ * @param ldr Class loader.
+ * @return Unmarshalled object.
+ * @throws BinaryObjectException In case of error.
+ */
+ @Nullable public Object unmarshal(BinaryInputStream in, BinaryContext ctx,
@Nullable ClassLoader ldr)
+ throws BinaryObjectException;
+
/**
* @param ctx Context.
* @param failIfUnregistered Flag to fail while writing object of
unregistered type.
diff --git
a/modules/binary/api/src/main/java/org/apache/ignite/internal/binary/BinaryUtils.java
b/modules/binary/api/src/main/java/org/apache/ignite/internal/binary/BinaryUtils.java
index 274d8addced..ca5c300d781 100644
---
a/modules/binary/api/src/main/java/org/apache/ignite/internal/binary/BinaryUtils.java
+++
b/modules/binary/api/src/main/java/org/apache/ignite/internal/binary/BinaryUtils.java
@@ -18,7 +18,6 @@
package org.apache.ignite.internal.binary;
import java.io.BufferedReader;
-import java.io.ByteArrayInputStream;
import java.io.Externalizable;
import java.io.File;
import java.io.FileInputStream;
@@ -26,14 +25,11 @@ import java.io.IOException;
import java.io.InputStreamReader;
import java.io.ObjectInputStream;
import java.io.ObjectOutputStream;
-import java.lang.reflect.Array;
import java.lang.reflect.Field;
-import java.lang.reflect.InvocationHandler;
import java.lang.reflect.Method;
import java.lang.reflect.Modifier;
import java.lang.reflect.Proxy;
import java.math.BigDecimal;
-import java.math.BigInteger;
import java.nio.charset.StandardCharsets;
import java.sql.Time;
import java.sql.Timestamp;
@@ -60,14 +56,11 @@ import java.util.concurrent.ConcurrentSkipListSet;
import java.util.function.Function;
import java.util.function.IntFunction;
import java.util.stream.Collectors;
-import org.apache.ignite.IgniteCheckedException;
import org.apache.ignite.IgniteCommonsSystemProperties;
import org.apache.ignite.IgniteException;
import org.apache.ignite.IgniteLogger;
-import org.apache.ignite.binary.BinaryCollectionFactory;
import org.apache.ignite.binary.BinaryIdMapper;
import org.apache.ignite.binary.BinaryInvalidTypeException;
-import org.apache.ignite.binary.BinaryMapFactory;
import org.apache.ignite.binary.BinaryNameMapper;
import org.apache.ignite.binary.BinaryObject;
import org.apache.ignite.binary.BinaryObjectException;
@@ -88,7 +81,6 @@ import org.apache.ignite.internal.util.typedef.T2;
import org.apache.ignite.internal.util.typedef.internal.A;
import org.apache.ignite.lang.IgniteUuid;
import org.apache.ignite.logger.NullLogger;
-import org.apache.ignite.marshaller.Marshallers;
import org.apache.ignite.platform.PlatformType;
import org.jetbrains.annotations.Nullable;
@@ -489,27 +481,6 @@ public class BinaryUtils {
return null;
}
- /**
- * Check protocol version.
- *
- * @param protoVer Protocol version.
- */
- public static void checkProtocolVersion(byte protoVer) {
- if (GridBinaryMarshaller.PROTO_VER != protoVer)
- throw new BinaryObjectException("Unsupported protocol version: " +
protoVer);
- }
-
- /**
- * Get binary object length.
- *
- * @param in Input stream.
- * @param start Start position.
- * @return Length.
- */
- public static int length(BinaryPositionReadable in, int start) {
- return in.readIntPositioned(start +
GridBinaryMarshaller.TOTAL_LEN_POS);
- }
-
/**
* Merge old and new metas.
*
@@ -775,89 +746,6 @@ public class BinaryUtils {
return in.readByteArray(len);
}
- /**
- * @return Value.
- */
- static boolean[] doReadBooleanArray(BinaryInputStream in) {
- int len = in.readInt();
-
- return in.readBooleanArray(len);
- }
-
- /**
- * @return Value.
- */
- static short[] doReadShortArray(BinaryInputStream in) {
- int len = in.readInt();
-
- return in.readShortArray(len);
- }
-
- /**
- * @return Value.
- */
- static char[] doReadCharArray(BinaryInputStream in) {
- int len = in.readInt();
-
- return in.readCharArray(len);
- }
-
- /**
- * @return Value.
- */
- static int[] doReadIntArray(BinaryInputStream in) {
- int len = in.readInt();
-
- return in.readIntArray(len);
- }
-
- /**
- * @return Value.
- */
- static long[] doReadLongArray(BinaryInputStream in) {
- int len = in.readInt();
-
- return in.readLongArray(len);
- }
-
- /**
- * @return Value.
- */
- static float[] doReadFloatArray(BinaryInputStream in) {
- int len = in.readInt();
-
- return in.readFloatArray(len);
- }
-
- /**
- * @return Value.
- */
- static double[] doReadDoubleArray(BinaryInputStream in) {
- int len = in.readInt();
-
- return in.readDoubleArray(len);
- }
-
- /**
- * @return Value.
- */
- static BigDecimal doReadDecimal(BinaryInputStream in) {
- int scale = in.readInt();
- byte[] mag = doReadByteArray(in);
-
- boolean negative = mag[0] < 0;
-
- if (negative)
- mag[0] &= 0x7F;
-
- BigInteger intVal = new BigInteger(mag);
-
- if (negative)
- intVal = intVal.negate();
-
- return new BigDecimal(intVal, scale);
- }
-
/**
* @return Value.
*/
@@ -890,70 +778,6 @@ public class BinaryUtils {
return res;
}
- /**
- * @return Value.
- */
- static UUID doReadUuid(BinaryInputStream in) {
- return new UUID(in.readLong(), in.readLong());
- }
-
- /**
- * @return Value.
- */
- static Date doReadDate(BinaryInputStream in) {
- long time = in.readLong();
-
- return new Date(time);
- }
-
- /**
- * @return Value.
- */
- static Timestamp doReadTimestamp(BinaryInputStream in) {
- long time = in.readLong();
- int nanos = in.readInt();
-
- Timestamp ts = new Timestamp(time);
-
- ts.setNanos(ts.getNanos() + nanos);
-
- return ts;
- }
-
- /**
- * @return Value.
- */
- static Time doReadTime(BinaryInputStream in) {
- long time = in.readLong();
-
- return new Time(time);
- }
-
- /**
- * @return Value.
- * @throws BinaryObjectException In case of error.
- */
- static BigDecimal[] doReadDecimalArray(BinaryInputStream in) throws
BinaryObjectException {
- int len = in.readInt();
-
- BigDecimal[] arr = new BigDecimal[len];
-
- for (int i = 0; i < len; i++) {
- byte flag = in.readByte();
-
- if (flag == GridBinaryMarshaller.NULL)
- arr[i] = null;
- else {
- if (flag != GridBinaryMarshaller.DECIMAL)
- throw new BinaryObjectException("Invalid flag value: " +
flag);
-
- arr[i] = doReadDecimal(in);
- }
- }
-
- return arr;
- }
-
/**
* @return Value.
* @throws BinaryObjectException In case of error.
@@ -968,257 +792,15 @@ public class BinaryUtils {
if (flag == GridBinaryMarshaller.NULL)
arr[i] = null;
- else {
- if (flag != GridBinaryMarshaller.STRING)
- throw new BinaryObjectException("Invalid flag value: " +
flag);
-
- arr[i] = doReadString(in);
- }
- }
-
- return arr;
- }
-
- /**
- * @return Value.
- * @throws BinaryObjectException In case of error.
- */
- static UUID[] doReadUuidArray(BinaryInputStream in) throws
BinaryObjectException {
- int len = in.readInt();
-
- UUID[] arr = new UUID[len];
-
- for (int i = 0; i < len; i++) {
- byte flag = in.readByte();
-
- if (flag == GridBinaryMarshaller.NULL)
- arr[i] = null;
- else {
- if (flag != GridBinaryMarshaller.UUID)
- throw new BinaryObjectException("Invalid flag value: " +
flag);
-
- arr[i] = doReadUuid(in);
- }
- }
-
- return arr;
- }
-
- /**
- * @return Value.
- * @throws BinaryObjectException In case of error.
- */
- static Date[] doReadDateArray(BinaryInputStream in) throws
BinaryObjectException {
- int len = in.readInt();
-
- Date[] arr = new Date[len];
-
- for (int i = 0; i < len; i++) {
- byte flag = in.readByte();
-
- if (flag == GridBinaryMarshaller.NULL)
- arr[i] = null;
- else {
- if (flag != GridBinaryMarshaller.DATE)
- throw new BinaryObjectException("Invalid flag value: " +
flag);
-
- arr[i] = doReadDate(in);
- }
- }
-
- return arr;
- }
-
- /**
- * @return Value.
- * @throws BinaryObjectException In case of error.
- */
- static Timestamp[] doReadTimestampArray(BinaryInputStream in) throws
BinaryObjectException {
- int len = in.readInt();
-
- Timestamp[] arr = new Timestamp[len];
-
- for (int i = 0; i < len; i++) {
- byte flag = in.readByte();
-
- if (flag == GridBinaryMarshaller.NULL)
- arr[i] = null;
- else {
- if (flag != GridBinaryMarshaller.TIMESTAMP)
- throw new BinaryObjectException("Invalid flag value: " +
flag);
-
- arr[i] = doReadTimestamp(in);
- }
- }
-
- return arr;
- }
-
- /**
- * @return Value.
- * @throws BinaryObjectException In case of error.
- */
- static Time[] doReadTimeArray(BinaryInputStream in) throws
BinaryObjectException {
- int len = in.readInt();
-
- Time[] arr = new Time[len];
-
- for (int i = 0; i < len; i++) {
- byte flag = in.readByte();
-
- if (flag == GridBinaryMarshaller.NULL)
- arr[i] = null;
- else {
- if (flag != GridBinaryMarshaller.TIME)
- throw new BinaryObjectException("Invalid flag value: " +
flag);
-
- arr[i] = doReadTime(in);
- }
- }
-
- return arr;
- }
-
- /**
- * @return Value.
- */
- static BinaryObject doReadBinaryObject(BinaryInputStream in, BinaryContext
ctx, boolean detach) {
- if (in.offheapPointer() > 0) {
- int len = in.readInt();
-
- int pos = in.position();
-
- in.position(in.position() + len);
-
- int start = in.readInt();
-
- return binariesFactory.binaryOffheapObject(ctx,
in.offheapPointer() + pos, start, len);
- }
- else {
- byte[] arr = doReadByteArray(in);
- int start = in.readInt();
-
- BinaryObject binO = binariesFactory.binaryObject(ctx, arr, start);
-
- if (detach)
- return detach(binO);
-
- return binO;
- }
- }
-
- /**
- * @param in Binary input stream.
- * @param ctx Binary context.
- * @param ldr Class loader.
- * @return Class object specified at the input stream.
- * @throws BinaryObjectException If failed.
- */
- static Class doReadClass(BinaryInputStream in, BinaryContext ctx,
ClassLoader ldr)
- throws BinaryObjectException {
- return doReadClass(in, ctx, ldr, true);
- }
-
- /**
- * @param in Binary input stream.
- * @param ctx Binary context.
- * @param ldr Class loader.
- * @param deserialize Doesn't load the class when the flag is {@code
false}. Class information is skipped.
- * @return Class object specified at the input stream if {@code
deserialize == true}. Otherwise returns {@code null}
- * @throws BinaryObjectException If failed.
- */
- private static Class doReadClass(BinaryInputStream in, BinaryContext ctx,
ClassLoader ldr, boolean deserialize)
- throws BinaryObjectException {
- int typeId = in.readInt();
-
- if (!deserialize) {
- // Skip class name at the stream.
- if (typeId == GridBinaryMarshaller.UNREGISTERED_TYPE_ID)
- doReadClassName(in);
-
- return null;
- }
-
- return doReadClass(in, ctx, ldr, typeId);
- }
-
- /**
- * @return Value.
- */
- @SuppressWarnings("ConstantConditions")
- static Object doReadProxy(BinaryInputStream in, BinaryContext ctx,
ClassLoader ldr,
- BinaryReaderHandlesHolder handles) {
- Class<?>[] intfs = new Class<?>[in.readInt()];
-
- for (int i = 0; i < intfs.length; i++)
- intfs[i] = doReadClass(in, ctx, ldr);
-
- InvocationHandler ih = (InvocationHandler)doReadObject(in, ctx, ldr,
handles);
-
- return Proxy.newProxyInstance(ldr != null ? ldr :
CommonUtils.gridClassLoader(), intfs, ih);
- }
-
- /**
- * Read plain type.
- *
- * @param in Input stream.
- * @return Plain type.
- */
- static EnumType doReadEnumType(BinaryInputStream in) {
- int typeId = in.readInt();
-
- if (typeId != GridBinaryMarshaller.UNREGISTERED_TYPE_ID)
- return new EnumType(typeId, null);
- else {
- String clsName = doReadClassName(in);
-
- return new EnumType(GridBinaryMarshaller.UNREGISTERED_TYPE_ID,
clsName);
- }
- }
-
- /**
- * @param in Input stream.
- * @return Class name.
- */
- static String doReadClassName(BinaryInputStream in) {
- byte flag = in.readByte();
-
- if (flag != GridBinaryMarshaller.STRING)
- throw new BinaryObjectException("Failed to read class name
[position=" + (in.position() - 1) + ']');
-
- return doReadString(in);
- }
-
- /**
- * @param in Binary input stream.
- * @param ctx Binary context.
- * @param ldr Class loader.
- * @param typeId Type id.
- * @return Class object specified at the input stream.
- * @throws BinaryObjectException If failed.
- */
- static Class doReadClass(BinaryInputStream in, BinaryContext ctx,
ClassLoader ldr, int typeId)
- throws BinaryObjectException {
- Class cls;
-
- if (typeId != GridBinaryMarshaller.UNREGISTERED_TYPE_ID)
- cls = ctx.descriptorForTypeId(true, typeId, ldr,
false).describedClass();
- else {
- String clsName = doReadClassName(in);
-
- try {
- cls = ClassLoaderUtils.forName(clsName, ldr);
- }
- catch (ClassNotFoundException e) {
- throw new BinaryInvalidTypeException("Failed to load the
class: " + clsName, e);
- }
+ else {
+ if (flag != GridBinaryMarshaller.STRING)
+ throw new BinaryObjectException("Invalid flag value: " +
flag);
- // forces registering of class by type id, at least locally
- if (Marshallers.USE_CACHE.get())
- ctx.registerType(cls, false, false);
+ arr[i] = doReadString(in);
+ }
}
- return cls;
+ return arr;
}
/**
@@ -1253,278 +835,6 @@ public class BinaryUtils {
return cls;
}
- /**
- * Read binary enum.
- *
- * @param in Input stream.
- * @param ctx Binary context.
- * @param type Plain type.
- * @return Enum.
- */
- static BinaryObjectEx doReadBinaryEnum(BinaryInputStream in, BinaryContext
ctx,
- EnumType type) {
- return binariesFactory.binaryEnum(ctx, type.typeId, type.clsName,
in.readInt());
- }
-
- /**
- * Read binary enum array.
- *
- * @param in Input stream.
- * @param ctx Binary context.
- * @return Enum array.
- */
- private static Object[] doReadBinaryEnumArray(BinaryInputStream in,
BinaryContext ctx) {
- int len = in.readInt();
-
- Object[] arr =
(Object[])Array.newInstance(binariesFactory.binaryEnumClass(), len);
-
- for (int i = 0; i < len; i++) {
- byte flag = in.readByte();
-
- if (flag == GridBinaryMarshaller.NULL)
- arr[i] = null;
- else
- arr[i] = doReadBinaryEnum(in, ctx, doReadEnumType(in));
- }
-
- return arr;
- }
-
- /**
- * Read object serialized using optimized marshaller.
- *
- * @return Result.
- */
- public static Object doReadOptimized(BinaryInputStream in, BinaryContext
ctx, @Nullable ClassLoader clsLdr) {
- int len = in.readInt();
-
- ByteArrayInputStream input = new ByteArrayInputStream(in.array(),
in.position(), len);
-
- try {
- return ctx.optimizedMarsh().unmarshal(input,
CommonUtils.resolveClassLoader(clsLdr, ctx.classLoader()));
- }
- catch (IgniteCheckedException e) {
- throw new BinaryObjectException("Failed to unmarshal object with
optimized marshaller", e);
- }
- finally {
- in.position(in.position() + len);
- }
- }
-
- /**
- * @return Object.
- * @throws BinaryObjectException In case of error.
- */
- @Nullable static Object doReadObject(BinaryInputStream in, BinaryContext
ctx, ClassLoader ldr,
- BinaryReaderHandlesHolder handles) throws BinaryObjectException {
- return reader(ctx, in, ldr, handles.handles(), false,
true).deserialize();
- }
-
- /**
- * @return Unmarshalled value.
- * @throws BinaryObjectException In case of error.
- */
- @Nullable static Object unmarshal(BinaryInputStream in, BinaryContext ctx,
ClassLoader ldr)
- throws BinaryObjectException {
- return unmarshal(in, ctx, ldr, new BinaryReaderHandlesHolderImpl());
- }
-
- /**
- * @return Unmarshalled value.
- * @throws BinaryObjectException In case of error.
- */
- @Nullable static Object unmarshal(BinaryInputStream in, BinaryContext ctx,
ClassLoader ldr,
- BinaryReaderHandlesHolder handles) throws BinaryObjectException {
- return unmarshal(in, ctx, ldr, handles, false, false);
- }
-
- /**
- * @return Unmarshalled value.
- * @throws BinaryObjectException In case of error.
- */
- @Nullable static Object unmarshal(BinaryInputStream in, BinaryContext ctx,
ClassLoader ldr,
- BinaryReaderHandlesHolder handles, boolean detach, boolean
deserialize) throws BinaryObjectException {
- int start = in.position();
-
- byte flag = in.readByte();
-
- switch (flag) {
- case GridBinaryMarshaller.NULL:
- return null;
-
- case GridBinaryMarshaller.HANDLE: {
- int handlePos = start - in.readInt();
-
- Object obj = handles.getHandle(handlePos);
-
- if (obj == null) {
- int retPos = in.position();
-
- in.position(handlePos);
-
- obj = unmarshal(in, ctx, ldr, handles, detach,
deserialize);
-
- in.position(retPos);
- }
-
- return obj;
- }
-
- case GridBinaryMarshaller.OBJ: {
- checkProtocolVersion(in.readByte());
-
- int len = length(in, start);
-
- BinaryObjectEx po;
-
- if (detach) {
- BinaryObjectEx binObj = binariesFactory.binaryObject(ctx,
in.array(), start);
-
- binObj.detachAllowed(true);
-
- po = binObj.detach(!handles.isEmpty());
- }
- else {
- if (in.offheapPointer() == 0)
- po = binariesFactory.binaryObject(ctx, in.array(),
start);
- else
- po = binariesFactory.binaryOffheapObject(ctx,
in.offheapPointer(), start,
- in.remaining() + in.position());
- }
-
- in.position(start + len);
-
- handles.setHandle(po, start);
-
- return po;
- }
-
- case GridBinaryMarshaller.BYTE:
- return in.readByte();
-
- case GridBinaryMarshaller.SHORT:
- return in.readShort();
-
- case GridBinaryMarshaller.INT:
- return in.readInt();
-
- case GridBinaryMarshaller.LONG:
- return in.readLong();
-
- case GridBinaryMarshaller.FLOAT:
- return in.readFloat();
-
- case GridBinaryMarshaller.DOUBLE:
- return in.readDouble();
-
- case GridBinaryMarshaller.CHAR:
- return in.readChar();
-
- case GridBinaryMarshaller.BOOLEAN:
- return in.readBoolean();
-
- case GridBinaryMarshaller.DECIMAL:
- return doReadDecimal(in);
-
- case GridBinaryMarshaller.STRING:
- return doReadString(in);
-
- case GridBinaryMarshaller.UUID:
- return doReadUuid(in);
-
- case GridBinaryMarshaller.DATE:
- return doReadDate(in);
-
- case GridBinaryMarshaller.TIMESTAMP:
- return doReadTimestamp(in);
-
- case GridBinaryMarshaller.TIME:
- return doReadTime(in);
-
- case GridBinaryMarshaller.BYTE_ARR:
- return doReadByteArray(in);
-
- case GridBinaryMarshaller.SHORT_ARR:
- return doReadShortArray(in);
-
- case GridBinaryMarshaller.INT_ARR:
- return doReadIntArray(in);
-
- case GridBinaryMarshaller.LONG_ARR:
- return doReadLongArray(in);
-
- case GridBinaryMarshaller.FLOAT_ARR:
- return doReadFloatArray(in);
-
- case GridBinaryMarshaller.DOUBLE_ARR:
- return doReadDoubleArray(in);
-
- case GridBinaryMarshaller.CHAR_ARR:
- return doReadCharArray(in);
-
- case GridBinaryMarshaller.BOOLEAN_ARR:
- return doReadBooleanArray(in);
-
- case GridBinaryMarshaller.DECIMAL_ARR:
- return doReadDecimalArray(in);
-
- case GridBinaryMarshaller.STRING_ARR:
- return doReadStringArray(in);
-
- case GridBinaryMarshaller.UUID_ARR:
- return doReadUuidArray(in);
-
- case GridBinaryMarshaller.DATE_ARR:
- return doReadDateArray(in);
-
- case GridBinaryMarshaller.TIMESTAMP_ARR:
- return doReadTimestampArray(in);
-
- case GridBinaryMarshaller.TIME_ARR:
- return doReadTimeArray(in);
-
- case GridBinaryMarshaller.OBJ_ARR:
- if (useBinaryArrays() && !deserialize)
- return doReadBinaryArray(in, ctx, ldr, handles, detach,
deserialize, false);
- else
- return doReadObjectArray(in, ctx, ldr, handles, detach,
deserialize);
-
- case GridBinaryMarshaller.COL:
- return doReadCollection(in, ctx, ldr, handles, detach,
deserialize, null);
-
- case GridBinaryMarshaller.MAP:
- return doReadMap(in, ctx, ldr, handles, detach, deserialize,
null);
-
- case GridBinaryMarshaller.BINARY_OBJ:
- return doReadBinaryObject(in, ctx, detach);
-
- case GridBinaryMarshaller.ENUM:
- case GridBinaryMarshaller.BINARY_ENUM:
- return doReadBinaryEnum(in, ctx, doReadEnumType(in));
-
- case GridBinaryMarshaller.ENUM_ARR:
- if (useBinaryArrays() && !deserialize)
- return doReadBinaryArray(in, ctx, ldr, handles, detach,
deserialize, true);
- else {
- doReadEnumType(in); // Simply skip this part as we do not
need it.
-
- return doReadBinaryEnumArray(in, ctx);
- }
-
- case GridBinaryMarshaller.CLASS:
- return doReadClass(in, ctx, ldr);
-
- case GridBinaryMarshaller.PROXY:
- return doReadProxy(in, ctx, ldr, handles);
-
- case GridBinaryMarshaller.OPTM_MARSH:
- return doReadOptimized(in, ctx, ldr);
-
- default:
- throw new BinaryObjectException("Invalid flag value: " + flag);
- }
- }
-
/**
* Convert {@link java.sql.Types} to binary type constant (See {@link
GridBinaryMarshaller} constants).
*
@@ -1584,226 +894,6 @@ public class BinaryUtils {
}
}
- /**
- * @param in Binary input stream.
- * @param ctx Binary context.
- * @param ldr Class loader.
- * @param handles Holder for handles.
- * @param detach Detach flag.
- * @param deserialize Deep flag.
- * @return Value.
- * @throws BinaryObjectException In case of error.
- */
- static Object[] doReadObjectArray(BinaryInputStream in, BinaryContext ctx,
ClassLoader ldr,
- BinaryReaderHandlesHolder handles, boolean detach, boolean
deserialize) throws BinaryObjectException {
- int hPos = positionForHandle(in);
-
- Class compType = doReadClass(in, ctx, ldr, deserialize);
-
- int len = in.readInt();
-
- Object[] arr = (deserialize &&
!BinaryObject.class.isAssignableFrom(compType))
- ? (Object[])Array.newInstance(compType, len)
- : new Object[len];
-
- handles.setHandle(arr, hPos);
-
- for (int i = 0; i < len; i++) {
- Object res = deserializeOrUnmarshal(in, ctx, ldr, handles, detach,
deserialize);
-
- if (deserialize && useBinaryArrays() && res instanceof
BinaryObject)
- arr[i] = ((BinaryObject)res).deserialize(ldr);
- else
- arr[i] = res;
- }
-
- return arr;
- }
-
- /**
- * @param in Binary input stream.
- * @param ctx Binary context.
- * @param ldr Class loader.
- * @param handles Holder for handles.
- * @param detach Detach flag.
- * @param deserialize Deep flag.
- * @return Value.
- * @throws BinaryObjectException In case of error.
- */
- private static BinaryArray doReadBinaryArray(BinaryInputStream in,
BinaryContext ctx, ClassLoader ldr,
- BinaryReaderHandlesHolder handles, boolean detach, boolean
deserialize, boolean isEnumArray) {
- int hPos = positionForHandle(in);
-
- int compTypeId = in.readInt();
- String compClsName = null;
-
- if (compTypeId == GridBinaryMarshaller.UNREGISTERED_TYPE_ID)
- compClsName = doReadClassName(in);
-
- int len = in.readInt();
-
- Object[] arr = new Object[len];
-
- BinaryArray res = isEnumArray
- ? new BinaryEnumArray(ctx, compTypeId, compClsName, arr)
- : new BinaryArray(ctx, compTypeId, compClsName, arr);
-
- handles.setHandle(res, hPos);
-
- for (int i = 0; i < len; i++)
- arr[i] = deserializeOrUnmarshal(in, ctx, ldr, handles, detach,
deserialize);
-
- return res;
- }
-
- /**
- * @param deserialize Deep flag.
- * @param factory Collection factory.
- * @return Value.
- * @throws BinaryObjectException In case of error.
- */
- @SuppressWarnings("unchecked")
- static Collection<?> doReadCollection(BinaryInputStream in, BinaryContext
ctx, ClassLoader ldr,
- BinaryReaderHandlesHolder handles, boolean detach, boolean
deserialize, BinaryCollectionFactory factory)
- throws BinaryObjectException {
- int hPos = positionForHandle(in);
-
- int size = in.readInt();
-
- assert size >= 0;
-
- byte colType = in.readByte();
-
- Collection<Object> col;
-
- if (factory != null)
- col = factory.create(size);
- else {
- switch (colType) {
- case GridBinaryMarshaller.ARR_LIST:
- col = new ArrayList<>(size);
-
- break;
-
- case GridBinaryMarshaller.LINKED_LIST:
- col = new LinkedList<>();
-
- break;
-
- case GridBinaryMarshaller.SINGLETON_LIST:
- col = new MutableSingletonList<>();
-
- break;
-
- case GridBinaryMarshaller.HASH_SET:
- col = CommonUtils.newHashSet(size);
-
- break;
-
- case GridBinaryMarshaller.LINKED_HASH_SET:
- col = CommonUtils.newLinkedHashSet(size);
-
- break;
-
- case GridBinaryMarshaller.USER_SET:
- col = CommonUtils.newHashSet(size);
-
- break;
-
- case GridBinaryMarshaller.USER_COL:
- col = new ArrayList<>(size);
-
- break;
-
- default:
- throw new BinaryObjectException("Invalid collection type:
" + colType);
- }
- }
-
- handles.setHandle(col, hPos);
-
- for (int i = 0; i < size; i++)
- col.add(deserializeOrUnmarshal(in, ctx, ldr, handles, detach,
deserialize));
-
- return colType == GridBinaryMarshaller.SINGLETON_LIST ?
CommonUtils.convertToSingletonList(col) : col;
- }
-
- /**
- * @param deserialize Deep flag.
- * @param factory Map factory.
- * @return Value.
- * @throws BinaryObjectException In case of error.
- */
- @SuppressWarnings("unchecked")
- static Map<?, ?> doReadMap(BinaryInputStream in, BinaryContext ctx,
ClassLoader ldr,
- BinaryReaderHandlesHolder handles, boolean detach, boolean
deserialize, BinaryMapFactory factory)
- throws BinaryObjectException {
- int hPos = positionForHandle(in);
-
- int size = in.readInt();
-
- assert size >= 0;
-
- byte mapType = in.readByte();
-
- Map<Object, Object> map;
-
- if (factory != null)
- map = factory.create(size);
- else {
- switch (mapType) {
- case GridBinaryMarshaller.HASH_MAP:
- map = CommonUtils.newHashMap(size);
-
- break;
-
- case GridBinaryMarshaller.LINKED_HASH_MAP:
- map = CommonUtils.newLinkedHashMap(size);
-
- break;
-
- case GridBinaryMarshaller.USER_COL:
- map = CommonUtils.newHashMap(size);
-
- break;
-
- default:
- throw new BinaryObjectException("Invalid map type: " +
mapType);
- }
- }
-
- handles.setHandle(map, hPos);
-
- for (int i = 0; i < size; i++) {
- Object key = deserializeOrUnmarshal(in, ctx, ldr, handles, detach,
deserialize);
- Object val = deserializeOrUnmarshal(in, ctx, ldr, handles, detach,
deserialize);
-
- map.put(key, val);
- }
-
- return map;
- }
-
- /**
- * Deserialize or unmarshal the object.
- *
- * @param deserialize Deserialize.
- * @return Result.
- */
- private static Object deserializeOrUnmarshal(BinaryInputStream in,
BinaryContext ctx, ClassLoader ldr,
- BinaryReaderHandlesHolder handles, boolean detach, boolean
deserialize) {
- return deserialize ? doReadObject(in, ctx, ldr, handles) :
unmarshal(in, ctx, ldr, handles, detach, deserialize);
- }
-
- /**
- * Get position to be used for handle. We assume here that the hdr byte
was read, hence subtract -1.
- *
- * @return Position for handle.
- */
- static int positionForHandle(BinaryInputStream in) {
- return in.position() - 1;
- }
-
/**
* Check if class is binarylizable.
*
@@ -2438,31 +1528,6 @@ public class BinaryUtils {
return new BinaryMetadata(typeId, typeName, fields, affKeyFieldName,
schemas, isEnum, enumMap);
}
- /**
- * Enum type.
- */
- private static class EnumType {
- /** Type ID. */
- private final int typeId;
-
- /** Class name. */
- private final String clsName;
-
- /**
- * Constructor.
- *
- * @param typeId Type ID.
- * @param clsName Class name.
- */
- public EnumType(int typeId, @Nullable String clsName) {
- assert typeId != GridBinaryMarshaller.UNREGISTERED_TYPE_ID &&
clsName == null ||
- typeId == GridBinaryMarshaller.UNREGISTERED_TYPE_ID && clsName
!= null;
-
- this.typeId = typeId;
- this.clsName = clsName;
- }
- }
-
/**
* @param cls Class to get affinity field for.
* @return Affinity field name or {@code null} if field name was not found.
diff --git
a/modules/binary/api/src/main/java/org/apache/ignite/internal/binary/GridBinaryMarshaller.java
b/modules/binary/api/src/main/java/org/apache/ignite/internal/binary/GridBinaryMarshaller.java
index 119fd1a771a..1489a11c1d5 100644
---
a/modules/binary/api/src/main/java/org/apache/ignite/internal/binary/GridBinaryMarshaller.java
+++
b/modules/binary/api/src/main/java/org/apache/ignite/internal/binary/GridBinaryMarshaller.java
@@ -321,7 +321,7 @@ public class GridBinaryMarshaller {
BinaryContext oldCtx = pushContext(ctx);
try {
- return (T)BinaryUtils.unmarshal(BinaryStreams.inputStream(bytes),
ctx, clsLdr);
+ return
(T)BinaryUtils.binariesFactory.unmarshal(BinaryStreams.inputStream(bytes), ctx,
clsLdr);
}
finally {
popContext(oldCtx);
@@ -337,7 +337,7 @@ public class GridBinaryMarshaller {
BinaryContext oldCtx = pushContext(ctx);
try {
- return (T)BinaryUtils.unmarshal(in, ctx, null);
+ return (T)BinaryUtils.binariesFactory.unmarshal(in, ctx, null);
}
finally {
popContext(oldCtx);
diff --git
a/modules/binary/impl/src/main/java/org/apache/ignite/internal/binary/BinariesFactoryImpl.java
b/modules/binary/impl/src/main/java/org/apache/ignite/internal/binary/BinariesFactoryImpl.java
index 0740a3b3436..ee0aab71442 100644
---
a/modules/binary/impl/src/main/java/org/apache/ignite/internal/binary/BinariesFactoryImpl.java
+++
b/modules/binary/impl/src/main/java/org/apache/ignite/internal/binary/BinariesFactoryImpl.java
@@ -22,6 +22,7 @@ import java.util.HashMap;
import java.util.Map;
import java.util.function.ToIntFunction;
import org.apache.ignite.binary.BinaryObject;
+import org.apache.ignite.binary.BinaryObjectException;
import org.apache.ignite.internal.binary.streams.BinaryHeapOutputStream;
import org.apache.ignite.internal.binary.streams.BinaryInputStream;
import org.apache.ignite.internal.binary.streams.BinaryOutputStream;
@@ -63,6 +64,12 @@ public class BinariesFactoryImpl implements BinariesFactory {
return new BinaryReaderExImpl(ctx, in, ldr, hnds, skipHdrCheck,
forUnmarshal);
}
+ /** {@inheritDoc} */
+ @Override public @Nullable Object unmarshal(BinaryInputStream in,
BinaryContext ctx, @Nullable ClassLoader ldr)
+ throws BinaryObjectException {
+ return BinaryReaderExImpl.unmarshal(in, ctx, ldr);
+ }
+
/** {@inheritDoc} */
@Override public BinaryWriterEx writer(BinaryContext ctx, boolean
failIfUnregistered) {
return newWriter(ctx, failIfUnregistered,
GridBinaryMarshaller.UNREGISTERED_TYPE_ID);
diff --git
a/modules/binary/impl/src/main/java/org/apache/ignite/internal/binary/BinaryImplUtils.java
b/modules/binary/impl/src/main/java/org/apache/ignite/internal/binary/BinaryImplUtils.java
index f97c931555f..5771f05ba23 100644
---
a/modules/binary/impl/src/main/java/org/apache/ignite/internal/binary/BinaryImplUtils.java
+++
b/modules/binary/impl/src/main/java/org/apache/ignite/internal/binary/BinaryImplUtils.java
@@ -16,10 +16,15 @@
*/
package org.apache.ignite.internal.binary;
+import java.io.ByteArrayInputStream;
+
+import org.apache.ignite.IgniteCheckedException;
+import org.apache.ignite.binary.BinaryObjectException;
+import org.apache.ignite.internal.binary.streams.BinaryInputStream;
+import org.apache.ignite.internal.util.CommonUtils;
import org.apache.ignite.internal.util.typedef.F;
import org.apache.ignite.lang.IgniteBiTuple;
-
-import static org.apache.ignite.internal.binary.BinaryUtils.length;
+import org.jetbrains.annotations.Nullable;
/**
* Binary utils used only in implementation.
@@ -317,4 +322,59 @@ public class BinaryImplUtils {
return hash;
}
+
+ /**
+ * Check protocol version.
+ *
+ * @param protoVer Protocol version.
+ */
+ public static void checkProtocolVersion(byte protoVer) {
+ if (GridBinaryMarshaller.PROTO_VER != protoVer)
+ throw new BinaryObjectException("Unsupported protocol version: " +
protoVer);
+ }
+
+ /**
+ * Get binary object length.
+ *
+ * @param in Input stream.
+ * @param start Start position.
+ * @return Length.
+ */
+ public static int length(BinaryPositionReadable in, int start) {
+ return in.readIntPositioned(start +
GridBinaryMarshaller.TOTAL_LEN_POS);
+ }
+
+ /**
+ * @param in Input stream.
+ * @return Class name.
+ */
+ static String doReadClassName(BinaryInputStream in) {
+ byte flag = in.readByte();
+
+ if (flag != GridBinaryMarshaller.STRING)
+ throw new BinaryObjectException("Failed to read class name
[position=" + (in.position() - 1) + ']');
+
+ return BinaryUtils.doReadString(in);
+ }
+
+ /**
+ * Read object serialized using optimized marshaller.
+ *
+ * @return Result.
+ */
+ public static Object doReadOptimized(BinaryInputStream in, BinaryContext
ctx, @Nullable ClassLoader clsLdr) {
+ int len = in.readInt();
+
+ ByteArrayInputStream input = new ByteArrayInputStream(in.array(),
in.position(), len);
+
+ try {
+ return ctx.optimizedMarsh().unmarshal(input,
CommonUtils.resolveClassLoader(clsLdr, ctx.classLoader()));
+ }
+ catch (IgniteCheckedException e) {
+ throw new BinaryObjectException("Failed to unmarshal object with
optimized marshaller", e);
+ }
+ finally {
+ in.position(in.position() + len);
+ }
+ }
}
diff --git
a/modules/binary/impl/src/main/java/org/apache/ignite/internal/binary/BinaryObjectImpl.java
b/modules/binary/impl/src/main/java/org/apache/ignite/internal/binary/BinaryObjectImpl.java
index 3359c73459d..f3c8501c110 100644
---
a/modules/binary/impl/src/main/java/org/apache/ignite/internal/binary/BinaryObjectImpl.java
+++
b/modules/binary/impl/src/main/java/org/apache/ignite/internal/binary/BinaryObjectImpl.java
@@ -565,7 +565,7 @@ public final class BinaryObjectImpl extends
BinaryObjectExImpl implements Extern
break;
default:
- val = BinaryUtils.unmarshal(BinaryStreams.inputStream(arr,
fieldPos), ctx, null);
+ val =
BinaryReaderExImpl.unmarshal(BinaryStreams.inputStream(arr, fieldPos), ctx,
null);
break;
}
diff --git
a/modules/binary/impl/src/main/java/org/apache/ignite/internal/binary/BinaryObjectOffheapImpl.java
b/modules/binary/impl/src/main/java/org/apache/ignite/internal/binary/BinaryObjectOffheapImpl.java
index dc439b77d11..3c3f2289b17 100644
---
a/modules/binary/impl/src/main/java/org/apache/ignite/internal/binary/BinaryObjectOffheapImpl.java
+++
b/modules/binary/impl/src/main/java/org/apache/ignite/internal/binary/BinaryObjectOffheapImpl.java
@@ -96,7 +96,7 @@ class BinaryObjectOffheapImpl extends BinaryObjectExImpl
implements Externalizab
if (typeId == GridBinaryMarshaller.UNREGISTERED_TYPE_ID) {
int off = start + GridBinaryMarshaller.DFLT_HDR_LEN;
- String clsName =
BinaryUtils.doReadClassName(BinaryStreams.inputStream(ptr + off, size));
+ String clsName =
BinaryImplUtils.doReadClassName(BinaryStreams.inputStream(ptr + off, size));
typeId = ctx.typeId(clsName);
}
@@ -375,7 +375,7 @@ class BinaryObjectOffheapImpl extends BinaryObjectExImpl
implements Externalizab
stream.position(fieldPos);
- val = BinaryUtils.unmarshal(stream, ctx, null);
+ val = BinaryReaderExImpl.unmarshal(stream, ctx, null);
break;
}
diff --git
a/modules/binary/impl/src/main/java/org/apache/ignite/internal/binary/BinaryReaderExImpl.java
b/modules/binary/impl/src/main/java/org/apache/ignite/internal/binary/BinaryReaderExImpl.java
index 7b49c16aa09..a705c0ca9ed 100644
---
a/modules/binary/impl/src/main/java/org/apache/ignite/internal/binary/BinaryReaderExImpl.java
+++
b/modules/binary/impl/src/main/java/org/apache/ignite/internal/binary/BinaryReaderExImpl.java
@@ -21,16 +21,21 @@ import java.io.EOFException;
import java.io.IOException;
import java.lang.reflect.Array;
import java.lang.reflect.Constructor;
+import java.lang.reflect.InvocationHandler;
import java.lang.reflect.InvocationTargetException;
+import java.lang.reflect.Proxy;
import java.math.BigDecimal;
+import java.math.BigInteger;
import java.sql.Time;
import java.sql.Timestamp;
import java.util.ArrayList;
import java.util.Collection;
import java.util.Date;
+import java.util.LinkedList;
import java.util.List;
import java.util.Map;
import java.util.UUID;
+
import org.apache.ignite.binary.BinaryCollectionFactory;
import org.apache.ignite.binary.BinaryInvalidTypeException;
import org.apache.ignite.binary.BinaryMapFactory;
@@ -39,8 +44,10 @@ import org.apache.ignite.binary.BinaryObjectException;
import org.apache.ignite.binary.BinaryRawReader;
import org.apache.ignite.binary.Binarylizable;
import org.apache.ignite.internal.binary.streams.BinaryInputStream;
+import org.apache.ignite.internal.marshaller.ClassLoaderUtils;
import org.apache.ignite.internal.util.CommonUtils;
import org.apache.ignite.internal.util.GridUnsafe;
+import org.apache.ignite.internal.util.MutableSingletonList;
import org.apache.ignite.internal.util.typedef.F;
import org.apache.ignite.internal.util.typedef.internal.S;
import org.apache.ignite.internal.util.typedef.internal.SB;
@@ -222,7 +229,7 @@ public class BinaryReaderExImpl implements BinaryReaderEx {
// Perform full header parsing in case of binary object.
if (!skipHdrCheck && (in.readByte() == GridBinaryMarshaller.OBJ)) {
// Ensure protocol is fine.
- BinaryUtils.checkProtocolVersion(in.readByte());
+ BinaryImplUtils.checkProtocolVersion(in.readByte());
// Read header content.
short flags = in.readShort();
@@ -270,12 +277,12 @@ public class BinaryReaderExImpl implements BinaryReaderEx
{
if (forUnmarshal) {
// Registers class by type ID, at least locally if the
cache is not ready yet.
- desc = ctx.registerClass(BinaryUtils.doReadClass(in, ctx,
ldr, typeId0), true, false);
+ desc = ctx.registerClass(doReadClass(in, ctx, ldr,
typeId0), true, false);
typeId = desc.typeId();
}
else
- typeId = ctx.typeId(BinaryUtils.doReadClassName(in));
+ typeId = ctx.typeId(BinaryImplUtils.doReadClassName(in));
int clsNameLen = in.position() - off;
@@ -328,7 +335,7 @@ public class BinaryReaderExImpl implements BinaryReaderEx {
public Object unmarshal(int offset) throws BinaryObjectException {
streamPosition(offset);
- return in.position() >= 0 ? BinaryUtils.unmarshal(in, ctx, ldr, this)
: null;
+ return in.position() >= 0 ? unmarshal(in, ctx, ldr, this) : null;
}
/**
@@ -338,7 +345,7 @@ public class BinaryReaderExImpl implements BinaryReaderEx {
*/
public Object unmarshalField(String fieldName) throws
BinaryObjectException {
try {
- return findFieldByName(fieldName) ? BinaryUtils.unmarshal(in, ctx,
ldr, this) : null;
+ return findFieldByName(fieldName) ? unmarshal(in, ctx, ldr, this)
: null;
}
catch (Exception ex) {
throw wrapFieldException(fieldName, ex);
@@ -351,7 +358,7 @@ public class BinaryReaderExImpl implements BinaryReaderEx {
* @throws BinaryObjectException In case of error.
*/
public Object unmarshalField(int fieldId) throws BinaryObjectException {
- return findFieldById(fieldId) ? BinaryUtils.unmarshal(in, ctx, ldr,
this) : null;
+ return findFieldById(fieldId) ? unmarshal(in, ctx, ldr, this) : null;
}
/**
@@ -380,7 +387,7 @@ public class BinaryReaderExImpl implements BinaryReaderEx {
if (checkFlag(CLASS) == Flag.NULL)
return null;
- return BinaryUtils.doReadClass(in, ctx, ldr);
+ return doReadClass(in, ctx, ldr);
}
return null;
@@ -411,7 +418,7 @@ public class BinaryReaderExImpl implements BinaryReaderEx {
* @return Field.
*/
private <T> T readHandleField() {
- int handlePos = BinaryUtils.positionForHandle(in) - in.readInt();
+ int handlePos = positionForHandle(in) - in.readInt();
Object obj = getHandle(handlePos);
@@ -420,7 +427,7 @@ public class BinaryReaderExImpl implements BinaryReaderEx {
streamPosition(handlePos);
- obj = BinaryUtils.doReadObject(in, ctx, ldr, this);
+ obj = doReadObject(in, ctx, ldr, this);
streamPosition(retPos);
}
@@ -564,7 +571,7 @@ public class BinaryReaderExImpl implements BinaryReaderEx {
@Nullable @Override public boolean[] readBooleanArray() throws
BinaryObjectException {
switch (checkFlag(BOOLEAN_ARR)) {
case NORMAL:
- return BinaryUtils.doReadBooleanArray(in);
+ return doReadBooleanArray(in);
case HANDLE:
return readHandleField();
@@ -630,7 +637,7 @@ public class BinaryReaderExImpl implements BinaryReaderEx {
@Nullable @Override public short[] readShortArray() throws
BinaryObjectException {
switch (checkFlag(SHORT_ARR)) {
case NORMAL:
- return BinaryUtils.doReadShortArray(in);
+ return doReadShortArray(in);
case HANDLE:
return readHandleField();
@@ -696,7 +703,7 @@ public class BinaryReaderExImpl implements BinaryReaderEx {
@Nullable @Override public char[] readCharArray() throws
BinaryObjectException {
switch (checkFlag(CHAR_ARR)) {
case NORMAL:
- return BinaryUtils.doReadCharArray(in);
+ return doReadCharArray(in);
case HANDLE:
return readHandleField();
@@ -762,7 +769,7 @@ public class BinaryReaderExImpl implements BinaryReaderEx {
@Nullable @Override public int[] readIntArray() throws
BinaryObjectException {
switch (checkFlag(INT_ARR)) {
case NORMAL:
- return BinaryUtils.doReadIntArray(in);
+ return doReadIntArray(in);
case HANDLE:
return readHandleField();
@@ -828,7 +835,7 @@ public class BinaryReaderExImpl implements BinaryReaderEx {
@Nullable @Override public long[] readLongArray() throws
BinaryObjectException {
switch (checkFlag(LONG_ARR)) {
case NORMAL:
- return BinaryUtils.doReadLongArray(in);
+ return doReadLongArray(in);
case HANDLE:
return readHandleField();
@@ -894,7 +901,7 @@ public class BinaryReaderExImpl implements BinaryReaderEx {
@Nullable @Override public float[] readFloatArray() throws
BinaryObjectException {
switch (checkFlag(FLOAT_ARR)) {
case NORMAL:
- return BinaryUtils.doReadFloatArray(in);
+ return doReadFloatArray(in);
case HANDLE:
return readHandleField();
@@ -960,7 +967,7 @@ public class BinaryReaderExImpl implements BinaryReaderEx {
@Nullable @Override public double[] readDoubleArray() throws
BinaryObjectException {
switch (checkFlag(DOUBLE_ARR)) {
case NORMAL:
- return BinaryUtils.doReadDoubleArray(in);
+ return doReadDoubleArray(in);
case HANDLE:
return readHandleField();
@@ -991,7 +998,7 @@ public class BinaryReaderExImpl implements BinaryReaderEx {
/** {@inheritDoc} */
@Override @Nullable public BigDecimal readDecimal() throws
BinaryObjectException {
- return checkFlagNoHandles(DECIMAL) == Flag.NORMAL ?
BinaryUtils.doReadDecimal(in) : null;
+ return checkFlagNoHandles(DECIMAL) == Flag.NORMAL ? doReadDecimal(in)
: null;
}
/** {@inheritDoc} */
@@ -1017,7 +1024,7 @@ public class BinaryReaderExImpl implements BinaryReaderEx
{
@Override @Nullable public BigDecimal[] readDecimalArray() throws
BinaryObjectException {
switch (checkFlag(DECIMAL_ARR)) {
case NORMAL:
- return BinaryUtils.doReadDecimalArray(in);
+ return doReadDecimalArray(in);
case HANDLE:
return readHandleField();
@@ -1105,7 +1112,7 @@ public class BinaryReaderExImpl implements BinaryReaderEx
{
/** {@inheritDoc} */
@Override @Nullable public UUID readUuid() throws BinaryObjectException {
- return checkFlagNoHandles(UUID) == Flag.NORMAL ?
BinaryUtils.doReadUuid(in) : null;
+ return checkFlagNoHandles(UUID) == Flag.NORMAL ? doReadUuid(in) : null;
}
/** {@inheritDoc} */
@@ -1131,7 +1138,7 @@ public class BinaryReaderExImpl implements BinaryReaderEx
{
@Override @Nullable public UUID[] readUuidArray() throws
BinaryObjectException {
switch (checkFlag(UUID_ARR)) {
case NORMAL:
- return BinaryUtils.doReadUuidArray(in);
+ return doReadUuidArray(in);
case HANDLE:
return readHandleField();
@@ -1162,7 +1169,7 @@ public class BinaryReaderExImpl implements BinaryReaderEx
{
/** {@inheritDoc} */
@Override @Nullable public Date readDate() throws BinaryObjectException {
- return checkFlagNoHandles(DATE) == Flag.NORMAL ?
BinaryUtils.doReadDate(in) : null;
+ return checkFlagNoHandles(DATE) == Flag.NORMAL ? doReadDate(in) : null;
}
/** {@inheritDoc} */
@@ -1188,7 +1195,7 @@ public class BinaryReaderExImpl implements BinaryReaderEx
{
@Override @Nullable public Date[] readDateArray() throws
BinaryObjectException {
switch (checkFlag(DATE_ARR)) {
case NORMAL:
- return BinaryUtils.doReadDateArray(in);
+ return doReadDateArray(in);
case HANDLE:
return readHandleField();
@@ -1219,7 +1226,7 @@ public class BinaryReaderExImpl implements BinaryReaderEx
{
/** {@inheritDoc} */
@Override @Nullable public Timestamp readTimestamp() throws
BinaryObjectException {
- return checkFlagNoHandles(TIMESTAMP) == Flag.NORMAL ?
BinaryUtils.doReadTimestamp(in) : null;
+ return checkFlagNoHandles(TIMESTAMP) == Flag.NORMAL ?
doReadTimestamp(in) : null;
}
/** {@inheritDoc} */
@@ -1245,7 +1252,7 @@ public class BinaryReaderExImpl implements BinaryReaderEx
{
@Override @Nullable public Timestamp[] readTimestampArray() throws
BinaryObjectException {
switch (checkFlag(TIMESTAMP_ARR)) {
case NORMAL:
- return BinaryUtils.doReadTimestampArray(in);
+ return doReadTimestampArray(in);
case HANDLE:
return readHandleField();
@@ -1262,7 +1269,7 @@ public class BinaryReaderExImpl implements BinaryReaderEx
{
/** {@inheritDoc} */
@Override @Nullable public Time readTime() throws BinaryObjectException {
- return checkFlagNoHandles(TIME) == Flag.NORMAL ?
BinaryUtils.doReadTime(in) : null;
+ return checkFlagNoHandles(TIME) == Flag.NORMAL ? doReadTime(in) : null;
}
/** {@inheritDoc} */
@@ -1292,7 +1299,7 @@ public class BinaryReaderExImpl implements BinaryReaderEx
{
@Override @Nullable public Time[] readTimeArray() throws
BinaryObjectException {
switch (checkFlag(TIME_ARR)) {
case NORMAL:
- return BinaryUtils.doReadTimeArray(in);
+ return doReadTimeArray(in);
case HANDLE:
return readHandleField();
default:
@@ -1303,7 +1310,7 @@ public class BinaryReaderExImpl implements BinaryReaderEx
{
/** {@inheritDoc} */
@Nullable @Override public <T> T readObject(String fieldName) throws
BinaryObjectException {
try {
- return findFieldByName(fieldName) ?
(T)BinaryUtils.doReadObject(in, ctx, ldr, this) : null;
+ return findFieldByName(fieldName) ? (T)doReadObject(in, ctx, ldr,
this) : null;
}
catch (Exception ex) {
throw wrapFieldException(fieldName, ex);
@@ -1316,12 +1323,12 @@ public class BinaryReaderExImpl implements
BinaryReaderEx {
* @throws BinaryObjectException In case of error.
*/
@Nullable Object readObject(int fieldId) throws BinaryObjectException {
- return findFieldById(fieldId) ? BinaryUtils.doReadObject(in, ctx, ldr,
this) : null;
+ return findFieldById(fieldId) ? doReadObject(in, ctx, ldr, this) :
null;
}
/** {@inheritDoc} */
@Override public Object readObject() throws BinaryObjectException {
- return BinaryUtils.doReadObject(in, ctx, ldr, this);
+ return doReadObject(in, ctx, ldr, this);
}
/** {@inheritDoc} */
@@ -1331,7 +1338,7 @@ public class BinaryReaderExImpl implements BinaryReaderEx
{
/** {@inheritDoc} */
@Nullable @Override public Object readObjectDetached(boolean deserialize)
throws BinaryObjectException {
- return BinaryUtils.unmarshal(in, ctx, ldr, new
BinaryReaderHandlesHolderImpl(), true, deserialize);
+ return unmarshal(in, ctx, ldr, new BinaryReaderHandlesHolderImpl(),
true, deserialize);
}
/** {@inheritDoc} */
@@ -1357,7 +1364,7 @@ public class BinaryReaderExImpl implements BinaryReaderEx
{
@Nullable @Override public Object[] readObjectArray() throws
BinaryObjectException {
switch (checkFlag(OBJ_ARR)) {
case NORMAL:
- return BinaryUtils.doReadObjectArray(in, ctx, ldr, this,
false, true);
+ return doReadObjectArray(in, ctx, ldr, this, false, true);
case HANDLE:
Object arr = readHandleField();
@@ -1407,7 +1414,7 @@ public class BinaryReaderExImpl implements BinaryReaderEx
{
private Enum<?> readEnum0(@Nullable Class<?> cls) throws
BinaryObjectException {
if (checkFlagNoHandles(ENUM) == Flag.NORMAL) {
// Read class even if we know it in advance to set correct stream
position.
- Class<?> cls0 = BinaryUtils.doReadClass(in, ctx, ldr);
+ Class<?> cls0 = doReadClass(in, ctx, ldr);
if (cls == null)
cls = cls0;
@@ -1465,7 +1472,7 @@ public class BinaryReaderExImpl implements BinaryReaderEx
{
switch (checkFlag(ENUM_ARR)) {
case NORMAL:
// Read class even if we know it in advance to set correct
stream position.
- Class<?> cls0 = BinaryUtils.doReadClass(in, ctx, ldr);
+ Class<?> cls0 = doReadClass(in, ctx, ldr);
if (cls == null)
cls = cls0;
@@ -1540,10 +1547,10 @@ public class BinaryReaderExImpl implements
BinaryReaderEx {
throws BinaryObjectException {
switch (checkFlag(COL)) {
case NORMAL:
- return (Collection)BinaryUtils.doReadCollection(in, ctx, ldr,
this, false, true, factory);
+ return (Collection)doReadCollection(in, ctx, ldr, this, false,
true, factory);
case HANDLE: {
- int handlePos = BinaryUtils.positionForHandle(in) -
in.readInt();
+ int handlePos = positionForHandle(in) - in.readInt();
Object obj = getHandle(handlePos);
@@ -1618,10 +1625,10 @@ public class BinaryReaderExImpl implements
BinaryReaderEx {
private Map readMap0(@Nullable BinaryMapFactory factory) throws
BinaryObjectException {
switch (checkFlag(MAP)) {
case NORMAL:
- return (Map)BinaryUtils.doReadMap(in, ctx, ldr, this, false,
true, factory);
+ return (Map)doReadMap(in, ctx, ldr, this, false, true,
factory);
case HANDLE: {
- int handlePos = BinaryUtils.positionForHandle(in) -
in.readInt();
+ int handlePos = positionForHandle(in) - in.readInt();
Object obj = getHandle(handlePos);
@@ -1660,7 +1667,7 @@ public class BinaryReaderExImpl implements BinaryReaderEx
{
else if (flag == HANDLE)
return Flag.HANDLE;
- int pos = BinaryUtils.positionForHandle(in);
+ int pos = positionForHandle(in);
throw new BinaryObjectException("Unexpected field type [pos=" + pos +
", expected=" + fieldFlagName(expFlag) +
", actual=" + fieldFlagName(flag) + ']');
@@ -1681,7 +1688,7 @@ public class BinaryReaderExImpl implements BinaryReaderEx
{
else if (flag == NULL)
return Flag.NULL;
- int pos = BinaryUtils.positionForHandle(in);
+ int pos = positionForHandle(in);
throw new BinaryObjectException("Unexpected field type [pos=" + pos +
", expected=" + fieldFlagName(expFlag) +
", actual=" + fieldFlagName(flag) + ']');
@@ -1750,7 +1757,7 @@ public class BinaryReaderExImpl implements BinaryReaderEx
{
streamPosition(handlePos);
- obj = BinaryUtils.doReadObject(in, ctx, ldr, this);
+ obj = doReadObject(in, ctx, ldr, this);
streamPosition(retPos);
}
@@ -1813,7 +1820,7 @@ public class BinaryReaderExImpl implements BinaryReaderEx
{
break;
case DECIMAL:
- obj = BinaryUtils.doReadDecimal(in);
+ obj = doReadDecimal(in);
break;
@@ -1823,22 +1830,22 @@ public class BinaryReaderExImpl implements
BinaryReaderEx {
break;
case UUID:
- obj = BinaryUtils.doReadUuid(in);
+ obj = doReadUuid(in);
break;
case DATE:
- obj = BinaryUtils.doReadDate(in);
+ obj = doReadDate(in);
break;
case TIMESTAMP:
- obj = BinaryUtils.doReadTimestamp(in);
+ obj = doReadTimestamp(in);
break;
case TIME:
- obj = BinaryUtils.doReadTime(in);
+ obj = doReadTime(in);
break;
@@ -1848,42 +1855,42 @@ public class BinaryReaderExImpl implements
BinaryReaderEx {
break;
case SHORT_ARR:
- obj = BinaryUtils.doReadShortArray(in);
+ obj = doReadShortArray(in);
break;
case INT_ARR:
- obj = BinaryUtils.doReadIntArray(in);
+ obj = doReadIntArray(in);
break;
case LONG_ARR:
- obj = BinaryUtils.doReadLongArray(in);
+ obj = doReadLongArray(in);
break;
case FLOAT_ARR:
- obj = BinaryUtils.doReadFloatArray(in);
+ obj = doReadFloatArray(in);
break;
case DOUBLE_ARR:
- obj = BinaryUtils.doReadDoubleArray(in);
+ obj = doReadDoubleArray(in);
break;
case CHAR_ARR:
- obj = BinaryUtils.doReadCharArray(in);
+ obj = doReadCharArray(in);
break;
case BOOLEAN_ARR:
- obj = BinaryUtils.doReadBooleanArray(in);
+ obj = doReadBooleanArray(in);
break;
case DECIMAL_ARR:
- obj = BinaryUtils.doReadDecimalArray(in);
+ obj = doReadDecimalArray(in);
break;
@@ -1893,54 +1900,54 @@ public class BinaryReaderExImpl implements
BinaryReaderEx {
break;
case UUID_ARR:
- obj = BinaryUtils.doReadUuidArray(in);
+ obj = doReadUuidArray(in);
break;
case DATE_ARR:
- obj = BinaryUtils.doReadDateArray(in);
+ obj = doReadDateArray(in);
break;
case TIMESTAMP_ARR:
- obj = BinaryUtils.doReadTimestampArray(in);
+ obj = doReadTimestampArray(in);
break;
case TIME_ARR:
- obj = BinaryUtils.doReadTimeArray(in);
+ obj = doReadTimeArray(in);
break;
case OBJ_ARR:
- obj = BinaryUtils.doReadObjectArray(in, ctx, ldr, this, false,
true);
+ obj = doReadObjectArray(in, ctx, ldr, this, false, true);
break;
case COL:
- obj = BinaryUtils.doReadCollection(in, ctx, ldr, this, false,
true, null);
+ obj = doReadCollection(in, ctx, ldr, this, false, true, null);
break;
case MAP:
- obj = BinaryUtils.doReadMap(in, ctx, ldr, this, false, true,
null);
+ obj = doReadMap(in, ctx, ldr, this, false, true, null);
break;
case BINARY_OBJ:
- obj = BinaryUtils.doReadBinaryObject(in, ctx, false);
+ obj = doReadBinaryObject(in, ctx, false);
((BinaryObjectImpl)obj).context(ctx);
break;
case ENUM:
- obj = doReadEnum(in, BinaryUtils.doReadClass(in, ctx, ldr));
+ obj = doReadEnum(in, doReadClass(in, ctx, ldr));
break;
case ENUM_ARR:
- obj = doReadEnumArray(in, ctx, ldr,
BinaryUtils.doReadClass(in, ctx, ldr));
+ obj = doReadEnumArray(in, ctx, ldr, doReadClass(in, ctx, ldr));
break;
@@ -1950,17 +1957,17 @@ public class BinaryReaderExImpl implements
BinaryReaderEx {
break;
case CLASS:
- obj = BinaryUtils.doReadClass(in, ctx, ldr);
+ obj = doReadClass(in, ctx, ldr);
break;
case PROXY:
- obj = BinaryUtils.doReadProxy(in, ctx, ldr, this);
+ obj = doReadProxy(in, ctx, ldr, this);
break;
case OPTM_MARSH:
- obj = BinaryUtils.doReadOptimized(in, ctx, ldr);
+ obj = BinaryImplUtils.doReadOptimized(in, ctx, ldr);
break;
@@ -2082,61 +2089,61 @@ public class BinaryReaderExImpl implements
BinaryReaderEx {
return BinaryUtils.doReadString(in());
case GridBinaryMarshaller.DECIMAL:
- return BinaryUtils.doReadDecimal(in());
+ return doReadDecimal(in());
case GridBinaryMarshaller.UUID:
- return BinaryUtils.doReadUuid(in());
+ return doReadUuid(in());
case GridBinaryMarshaller.TIME:
- return BinaryUtils.doReadTime(in());
+ return doReadTime(in());
case GridBinaryMarshaller.TIMESTAMP:
- return BinaryUtils.doReadTimestamp(in());
+ return doReadTimestamp(in());
case GridBinaryMarshaller.DATE:
- return BinaryUtils.doReadDate(in());
+ return doReadDate(in());
case GridBinaryMarshaller.BOOLEAN_ARR:
- return BinaryUtils.doReadBooleanArray(in());
+ return doReadBooleanArray(in());
case GridBinaryMarshaller.BYTE_ARR:
return BinaryUtils.doReadByteArray(in());
case GridBinaryMarshaller.CHAR_ARR:
- return BinaryUtils.doReadCharArray(in());
+ return doReadCharArray(in());
case GridBinaryMarshaller.SHORT_ARR:
- return BinaryUtils.doReadShortArray(in());
+ return doReadShortArray(in());
case GridBinaryMarshaller.INT_ARR:
- return BinaryUtils.doReadIntArray(in());
+ return doReadIntArray(in());
case GridBinaryMarshaller.LONG_ARR:
- return BinaryUtils.doReadLongArray(in());
+ return doReadLongArray(in());
case GridBinaryMarshaller.FLOAT_ARR:
- return BinaryUtils.doReadFloatArray(in());
+ return doReadFloatArray(in());
case GridBinaryMarshaller.DOUBLE_ARR:
- return BinaryUtils.doReadDoubleArray(in());
+ return doReadDoubleArray(in());
case GridBinaryMarshaller.STRING_ARR:
return BinaryUtils.doReadStringArray(in());
case GridBinaryMarshaller.DECIMAL_ARR:
- return BinaryUtils.doReadDecimalArray(in());
+ return doReadDecimalArray(in());
case GridBinaryMarshaller.UUID_ARR:
- return BinaryUtils.doReadUuidArray(in());
+ return doReadUuidArray(in());
case GridBinaryMarshaller.TIME_ARR:
- return BinaryUtils.doReadTimeArray(in());
+ return doReadTimeArray(in());
case GridBinaryMarshaller.TIMESTAMP_ARR:
- return BinaryUtils.doReadTimestampArray(in());
+ return doReadTimestampArray(in());
case GridBinaryMarshaller.DATE_ARR:
- return BinaryUtils.doReadDateArray(in());
+ return doReadDateArray(in());
default:
in().position(in().position() - 1);
@@ -2869,7 +2876,7 @@ public class BinaryReaderExImpl implements BinaryReaderEx
{
* @return Enum.
*/
private static BinaryObjectEx doReadBinaryEnum(BinaryInputStream in,
BinaryContext ctx) {
- return BinaryUtils.doReadBinaryEnum(in, ctx,
BinaryUtils.doReadEnumType(in));
+ return doReadBinaryEnum(in, ctx, doReadEnumType(in));
}
/**
@@ -2888,7 +2895,7 @@ public class BinaryReaderExImpl implements BinaryReaderEx
{
if (flag == GridBinaryMarshaller.NULL)
arr[i] = null;
else
- arr[i] = doReadEnum(in, BinaryUtils.doReadClass(in, ctx, ldr));
+ arr[i] = doReadEnum(in, doReadClass(in, ctx, ldr));
}
return arr;
@@ -2963,4 +2970,876 @@ public class BinaryReaderExImpl implements
BinaryReaderEx {
/** Null. */
NULL
}
+
+ /**
+ * @return Value.
+ */
+ private static boolean[] doReadBooleanArray(BinaryInputStream in) {
+ int len = in.readInt();
+
+ return in.readBooleanArray(len);
+ }
+
+ /**
+ * @return Value.
+ */
+ private static short[] doReadShortArray(BinaryInputStream in) {
+ int len = in.readInt();
+
+ return in.readShortArray(len);
+ }
+
+ /**
+ * @return Value.
+ */
+ private static char[] doReadCharArray(BinaryInputStream in) {
+ int len = in.readInt();
+
+ return in.readCharArray(len);
+ }
+
+ /**
+ * @return Value.
+ */
+ private static int[] doReadIntArray(BinaryInputStream in) {
+ int len = in.readInt();
+
+ return in.readIntArray(len);
+ }
+
+ /**
+ * @return Value.
+ */
+ private static long[] doReadLongArray(BinaryInputStream in) {
+ int len = in.readInt();
+
+ return in.readLongArray(len);
+ }
+
+ /**
+ * @return Value.
+ */
+ private static float[] doReadFloatArray(BinaryInputStream in) {
+ int len = in.readInt();
+
+ return in.readFloatArray(len);
+ }
+
+ /**
+ * @return Value.
+ */
+ private static double[] doReadDoubleArray(BinaryInputStream in) {
+ int len = in.readInt();
+
+ return in.readDoubleArray(len);
+ }
+
+ /**
+ * @return Value.
+ */
+ private static BigDecimal doReadDecimal(BinaryInputStream in) {
+ int scale = in.readInt();
+ byte[] mag = BinaryUtils.doReadByteArray(in);
+
+ boolean negative = mag[0] < 0;
+
+ if (negative)
+ mag[0] &= 0x7F;
+
+ BigInteger intVal = new BigInteger(mag);
+
+ if (negative)
+ intVal = intVal.negate();
+
+ return new BigDecimal(intVal, scale);
+ }
+
+ /**
+ * @return Value.
+ */
+ private static UUID doReadUuid(BinaryInputStream in) {
+ return new UUID(in.readLong(), in.readLong());
+ }
+
+ /**
+ * @return Value.
+ */
+ private static Date doReadDate(BinaryInputStream in) {
+ long time = in.readLong();
+
+ return new Date(time);
+ }
+
+ /**
+ * @return Value.
+ */
+ private static Timestamp doReadTimestamp(BinaryInputStream in) {
+ long time = in.readLong();
+ int nanos = in.readInt();
+
+ Timestamp ts = new Timestamp(time);
+
+ ts.setNanos(ts.getNanos() + nanos);
+
+ return ts;
+ }
+
+ /**
+ * @return Value.
+ */
+ private static Time doReadTime(BinaryInputStream in) {
+ long time = in.readLong();
+
+ return new Time(time);
+ }
+
+ /**
+ * @return Value.
+ * @throws BinaryObjectException In case of error.
+ */
+ private static BigDecimal[] doReadDecimalArray(BinaryInputStream in)
throws BinaryObjectException {
+ int len = in.readInt();
+
+ BigDecimal[] arr = new BigDecimal[len];
+
+ for (int i = 0; i < len; i++) {
+ byte flag = in.readByte();
+
+ if (flag == GridBinaryMarshaller.NULL)
+ arr[i] = null;
+ else {
+ if (flag != GridBinaryMarshaller.DECIMAL)
+ throw new BinaryObjectException("Invalid flag value: " +
flag);
+
+ arr[i] = doReadDecimal(in);
+ }
+ }
+
+ return arr;
+ }
+
+ /**
+ * @return Value.
+ * @throws BinaryObjectException In case of error.
+ */
+ private static UUID[] doReadUuidArray(BinaryInputStream in) throws
BinaryObjectException {
+ int len = in.readInt();
+
+ UUID[] arr = new UUID[len];
+
+ for (int i = 0; i < len; i++) {
+ byte flag = in.readByte();
+
+ if (flag == GridBinaryMarshaller.NULL)
+ arr[i] = null;
+ else {
+ if (flag != GridBinaryMarshaller.UUID)
+ throw new BinaryObjectException("Invalid flag value: " +
flag);
+
+ arr[i] = doReadUuid(in);
+ }
+ }
+
+ return arr;
+ }
+
+ /**
+ * @return Value.
+ * @throws BinaryObjectException In case of error.
+ */
+ private static Date[] doReadDateArray(BinaryInputStream in) throws
BinaryObjectException {
+ int len = in.readInt();
+
+ Date[] arr = new Date[len];
+
+ for (int i = 0; i < len; i++) {
+ byte flag = in.readByte();
+
+ if (flag == GridBinaryMarshaller.NULL)
+ arr[i] = null;
+ else {
+ if (flag != GridBinaryMarshaller.DATE)
+ throw new BinaryObjectException("Invalid flag value: " +
flag);
+
+ arr[i] = doReadDate(in);
+ }
+ }
+
+ return arr;
+ }
+
+ /**
+ * @return Value.
+ * @throws BinaryObjectException In case of error.
+ */
+ private static Timestamp[] doReadTimestampArray(BinaryInputStream in)
throws BinaryObjectException {
+ int len = in.readInt();
+
+ Timestamp[] arr = new Timestamp[len];
+
+ for (int i = 0; i < len; i++) {
+ byte flag = in.readByte();
+
+ if (flag == GridBinaryMarshaller.NULL)
+ arr[i] = null;
+ else {
+ if (flag != GridBinaryMarshaller.TIMESTAMP)
+ throw new BinaryObjectException("Invalid flag value: " +
flag);
+
+ arr[i] = doReadTimestamp(in);
+ }
+ }
+
+ return arr;
+ }
+
+ /**
+ * @return Value.
+ * @throws BinaryObjectException In case of error.
+ */
+ private static Time[] doReadTimeArray(BinaryInputStream in) throws
BinaryObjectException {
+ int len = in.readInt();
+
+ Time[] arr = new Time[len];
+
+ for (int i = 0; i < len; i++) {
+ byte flag = in.readByte();
+
+ if (flag == GridBinaryMarshaller.NULL)
+ arr[i] = null;
+ else {
+ if (flag != GridBinaryMarshaller.TIME)
+ throw new BinaryObjectException("Invalid flag value: " +
flag);
+
+ arr[i] = doReadTime(in);
+ }
+ }
+
+ return arr;
+ }
+
+ /**
+ * @return Value.
+ */
+ private static BinaryObject doReadBinaryObject(BinaryInputStream in,
BinaryContext ctx, boolean detach) {
+ if (in.offheapPointer() > 0) {
+ int len = in.readInt();
+
+ int pos = in.position();
+
+ in.position(in.position() + len);
+
+ int start = in.readInt();
+
+ return BinaryUtils.binariesFactory.binaryOffheapObject(ctx,
in.offheapPointer() + pos, start, len);
+ }
+ else {
+ byte[] arr = BinaryUtils.doReadByteArray(in);
+ int start = in.readInt();
+
+ BinaryObject binO = BinaryUtils.binariesFactory.binaryObject(ctx,
arr, start);
+
+ if (detach)
+ return BinaryUtils.detach(binO);
+
+ return binO;
+ }
+ }
+
+ /**
+ * @param in Binary input stream.
+ * @param ctx Binary context.
+ * @param ldr Class loader.
+ * @return Class object specified at the input stream.
+ * @throws BinaryObjectException If failed.
+ */
+ private static Class doReadClass(BinaryInputStream in, BinaryContext ctx,
ClassLoader ldr)
+ throws BinaryObjectException {
+ return doReadClass(in, ctx, ldr, true);
+ }
+
+ /**
+ * @param in Binary input stream.
+ * @param ctx Binary context.
+ * @param ldr Class loader.
+ * @param deserialize Doesn't load the class when the flag is {@code
false}. Class information is skipped.
+ * @return Class object specified at the input stream if {@code
deserialize == true}. Otherwise returns {@code null}
+ * @throws BinaryObjectException If failed.
+ */
+ private static Class doReadClass(BinaryInputStream in, BinaryContext ctx,
ClassLoader ldr, boolean deserialize)
+ throws BinaryObjectException {
+ int typeId = in.readInt();
+
+ if (!deserialize) {
+ // Skip class name at the stream.
+ if (typeId == GridBinaryMarshaller.UNREGISTERED_TYPE_ID)
+ BinaryImplUtils.doReadClassName(in);
+
+ return null;
+ }
+
+ return doReadClass(in, ctx, ldr, typeId);
+ }
+
+ /**
+ * @return Value.
+ */
+ @SuppressWarnings("ConstantConditions")
+ private static Object doReadProxy(BinaryInputStream in, BinaryContext ctx,
ClassLoader ldr,
+ BinaryReaderHandlesHolder handles) {
+ Class<?>[] intfs = new Class<?>[in.readInt()];
+
+ for (int i = 0; i < intfs.length; i++)
+ intfs[i] = doReadClass(in, ctx, ldr);
+
+ InvocationHandler ih = (InvocationHandler)doReadObject(in, ctx, ldr,
handles);
+
+ return Proxy.newProxyInstance(ldr != null ? ldr :
CommonUtils.gridClassLoader(), intfs, ih);
+ }
+
+ /**
+ * Read plain type.
+ *
+ * @param in Input stream.
+ * @return Plain type.
+ */
+ private static EnumType doReadEnumType(BinaryInputStream in) {
+ int typeId = in.readInt();
+
+ if (typeId != GridBinaryMarshaller.UNREGISTERED_TYPE_ID)
+ return new EnumType(typeId, null);
+ else {
+ String clsName = BinaryImplUtils.doReadClassName(in);
+
+ return new EnumType(GridBinaryMarshaller.UNREGISTERED_TYPE_ID,
clsName);
+ }
+ }
+
+ /**
+ * @param in Binary input stream.
+ * @param ctx Binary context.
+ * @param ldr Class loader.
+ * @param typeId Type id.
+ * @return Class object specified at the input stream.
+ * @throws BinaryObjectException If failed.
+ */
+ private static Class doReadClass(BinaryInputStream in, BinaryContext ctx,
ClassLoader ldr, int typeId)
+ throws BinaryObjectException {
+ Class cls;
+
+ if (typeId != GridBinaryMarshaller.UNREGISTERED_TYPE_ID)
+ cls = ctx.descriptorForTypeId(true, typeId, ldr,
false).describedClass();
+ else {
+ String clsName = BinaryImplUtils.doReadClassName(in);
+
+ try {
+ cls = ClassLoaderUtils.forName(clsName, ldr);
+ }
+ catch (ClassNotFoundException e) {
+ throw new BinaryInvalidTypeException("Failed to load the
class: " + clsName, e);
+ }
+
+ // forces registering of class by type id, at least locally
+ if (Marshallers.USE_CACHE.get())
+ ctx.registerType(cls, false, false);
+ }
+
+ return cls;
+ }
+
+ /**
+ * Read binary enum.
+ *
+ * @param in Input stream.
+ * @param ctx Binary context.
+ * @param type Plain type.
+ * @return Enum.
+ */
+ private static BinaryObjectEx doReadBinaryEnum(BinaryInputStream in,
BinaryContext ctx,
+ EnumType type) {
+ return BinaryUtils.binariesFactory.binaryEnum(ctx, type.typeId,
type.clsName, in.readInt());
+ }
+
+ /**
+ * Read binary enum array.
+ *
+ * @param in Input stream.
+ * @param ctx Binary context.
+ * @return Enum array.
+ */
+ private static Object[] doReadBinaryEnumArray(BinaryInputStream in,
BinaryContext ctx) {
+ int len = in.readInt();
+
+ Object[] arr =
(Object[])Array.newInstance(BinaryUtils.binariesFactory.binaryEnumClass(), len);
+
+ for (int i = 0; i < len; i++) {
+ byte flag = in.readByte();
+
+ if (flag == GridBinaryMarshaller.NULL)
+ arr[i] = null;
+ else
+ arr[i] = doReadBinaryEnum(in, ctx, doReadEnumType(in));
+ }
+
+ return arr;
+ }
+
+ /**
+ * @return Object.
+ * @throws BinaryObjectException In case of error.
+ */
+ @Nullable private static Object doReadObject(BinaryInputStream in,
BinaryContext ctx, ClassLoader ldr,
+ BinaryReaderHandlesHolder handles) throws BinaryObjectException {
+ return BinaryUtils.reader(ctx, in, ldr, handles.handles(), false,
true).deserialize();
+ }
+
+ /**
+ * @return Unmarshalled value.
+ * @throws BinaryObjectException In case of error.
+ */
+ @Nullable static Object unmarshal(BinaryInputStream in, BinaryContext ctx,
ClassLoader ldr)
+ throws BinaryObjectException {
+ return unmarshal(in, ctx, ldr, new BinaryReaderHandlesHolderImpl());
+ }
+
+ /**
+ * @return Unmarshalled value.
+ * @throws BinaryObjectException In case of error.
+ */
+ @Nullable private static Object unmarshal(BinaryInputStream in,
BinaryContext ctx, ClassLoader ldr,
+ BinaryReaderHandlesHolder handles) throws BinaryObjectException {
+ return unmarshal(in, ctx, ldr, handles, false, false);
+ }
+
+ /**
+ * @return Unmarshalled value.
+ * @throws BinaryObjectException In case of error.
+ */
+ @Nullable private static Object unmarshal(BinaryInputStream in,
BinaryContext ctx, ClassLoader ldr,
+ BinaryReaderHandlesHolder handles, boolean detach, boolean
deserialize) throws BinaryObjectException {
+ int start = in.position();
+
+ byte flag = in.readByte();
+
+ switch (flag) {
+ case GridBinaryMarshaller.NULL:
+ return null;
+
+ case GridBinaryMarshaller.HANDLE: {
+ int handlePos = start - in.readInt();
+
+ Object obj = handles.getHandle(handlePos);
+
+ if (obj == null) {
+ int retPos = in.position();
+
+ in.position(handlePos);
+
+ obj = unmarshal(in, ctx, ldr, handles, detach,
deserialize);
+
+ in.position(retPos);
+ }
+
+ return obj;
+ }
+
+ case GridBinaryMarshaller.OBJ: {
+ BinaryImplUtils.checkProtocolVersion(in.readByte());
+
+ int len = BinaryImplUtils.length(in, start);
+
+ BinaryObjectEx po;
+
+ if (detach) {
+ BinaryObjectEx binObj =
BinaryUtils.binariesFactory.binaryObject(ctx, in.array(), start);
+
+ binObj.detachAllowed(true);
+
+ po = binObj.detach(!handles.isEmpty());
+ }
+ else {
+ if (in.offheapPointer() == 0)
+ po = BinaryUtils.binariesFactory.binaryObject(ctx,
in.array(), start);
+ else
+ po =
BinaryUtils.binariesFactory.binaryOffheapObject(ctx, in.offheapPointer(), start,
+ in.remaining() + in.position());
+ }
+
+ in.position(start + len);
+
+ handles.setHandle(po, start);
+
+ return po;
+ }
+
+ case GridBinaryMarshaller.BYTE:
+ return in.readByte();
+
+ case GridBinaryMarshaller.SHORT:
+ return in.readShort();
+
+ case GridBinaryMarshaller.INT:
+ return in.readInt();
+
+ case GridBinaryMarshaller.LONG:
+ return in.readLong();
+
+ case GridBinaryMarshaller.FLOAT:
+ return in.readFloat();
+
+ case GridBinaryMarshaller.DOUBLE:
+ return in.readDouble();
+
+ case GridBinaryMarshaller.CHAR:
+ return in.readChar();
+
+ case GridBinaryMarshaller.BOOLEAN:
+ return in.readBoolean();
+
+ case GridBinaryMarshaller.DECIMAL:
+ return doReadDecimal(in);
+
+ case GridBinaryMarshaller.STRING:
+ return BinaryUtils.doReadString(in);
+
+ case GridBinaryMarshaller.UUID:
+ return doReadUuid(in);
+
+ case GridBinaryMarshaller.DATE:
+ return doReadDate(in);
+
+ case GridBinaryMarshaller.TIMESTAMP:
+ return doReadTimestamp(in);
+
+ case GridBinaryMarshaller.TIME:
+ return doReadTime(in);
+
+ case GridBinaryMarshaller.BYTE_ARR:
+ return BinaryUtils.doReadByteArray(in);
+
+ case GridBinaryMarshaller.SHORT_ARR:
+ return doReadShortArray(in);
+
+ case GridBinaryMarshaller.INT_ARR:
+ return doReadIntArray(in);
+
+ case GridBinaryMarshaller.LONG_ARR:
+ return doReadLongArray(in);
+
+ case GridBinaryMarshaller.FLOAT_ARR:
+ return doReadFloatArray(in);
+
+ case GridBinaryMarshaller.DOUBLE_ARR:
+ return doReadDoubleArray(in);
+
+ case GridBinaryMarshaller.CHAR_ARR:
+ return doReadCharArray(in);
+
+ case GridBinaryMarshaller.BOOLEAN_ARR:
+ return doReadBooleanArray(in);
+
+ case GridBinaryMarshaller.DECIMAL_ARR:
+ return doReadDecimalArray(in);
+
+ case GridBinaryMarshaller.STRING_ARR:
+ return BinaryUtils.doReadStringArray(in);
+
+ case GridBinaryMarshaller.UUID_ARR:
+ return doReadUuidArray(in);
+
+ case GridBinaryMarshaller.DATE_ARR:
+ return doReadDateArray(in);
+
+ case GridBinaryMarshaller.TIMESTAMP_ARR:
+ return doReadTimestampArray(in);
+
+ case GridBinaryMarshaller.TIME_ARR:
+ return doReadTimeArray(in);
+
+ case GridBinaryMarshaller.OBJ_ARR:
+ if (BinaryUtils.useBinaryArrays() && !deserialize)
+ return doReadBinaryArray(in, ctx, ldr, handles, detach,
deserialize, false);
+ else
+ return doReadObjectArray(in, ctx, ldr, handles, detach,
deserialize);
+
+ case GridBinaryMarshaller.COL:
+ return doReadCollection(in, ctx, ldr, handles, detach,
deserialize, null);
+
+ case GridBinaryMarshaller.MAP:
+ return doReadMap(in, ctx, ldr, handles, detach, deserialize,
null);
+
+ case GridBinaryMarshaller.BINARY_OBJ:
+ return doReadBinaryObject(in, ctx, detach);
+
+ case GridBinaryMarshaller.ENUM:
+ case GridBinaryMarshaller.BINARY_ENUM:
+ return doReadBinaryEnum(in, ctx, doReadEnumType(in));
+
+ case GridBinaryMarshaller.ENUM_ARR:
+ if (BinaryUtils.useBinaryArrays() && !deserialize)
+ return doReadBinaryArray(in, ctx, ldr, handles, detach,
deserialize, true);
+ else {
+ doReadEnumType(in); // Simply skip this part as we do not
need it.
+
+ return doReadBinaryEnumArray(in, ctx);
+ }
+
+ case GridBinaryMarshaller.CLASS:
+ return doReadClass(in, ctx, ldr);
+
+ case GridBinaryMarshaller.PROXY:
+ return doReadProxy(in, ctx, ldr, handles);
+
+ case GridBinaryMarshaller.OPTM_MARSH:
+ return BinaryImplUtils.doReadOptimized(in, ctx, ldr);
+
+ default:
+ throw new BinaryObjectException("Invalid flag value: " + flag);
+ }
+ }
+
+ /**
+ * @param in Binary input stream.
+ * @param ctx Binary context.
+ * @param ldr Class loader.
+ * @param handles Holder for handles.
+ * @param detach Detach flag.
+ * @param deserialize Deep flag.
+ * @return Value.
+ * @throws BinaryObjectException In case of error.
+ */
+ private static Object[] doReadObjectArray(BinaryInputStream in,
BinaryContext ctx, ClassLoader ldr,
+ BinaryReaderHandlesHolder handles, boolean detach, boolean
deserialize) throws BinaryObjectException {
+ int hPos = positionForHandle(in);
+
+ Class compType = doReadClass(in, ctx, ldr, deserialize);
+
+ int len = in.readInt();
+
+ Object[] arr = (deserialize &&
!BinaryObject.class.isAssignableFrom(compType))
+ ? (Object[])Array.newInstance(compType, len)
+ : new Object[len];
+
+ handles.setHandle(arr, hPos);
+
+ for (int i = 0; i < len; i++) {
+ Object res = deserializeOrUnmarshal(in, ctx, ldr, handles, detach,
deserialize);
+
+ if (deserialize && BinaryUtils.useBinaryArrays() && res instanceof
BinaryObject)
+ arr[i] = ((BinaryObject)res).deserialize(ldr);
+ else
+ arr[i] = res;
+ }
+
+ return arr;
+ }
+
+ /**
+ * @param in Binary input stream.
+ * @param ctx Binary context.
+ * @param ldr Class loader.
+ * @param handles Holder for handles.
+ * @param detach Detach flag.
+ * @param deserialize Deep flag.
+ * @return Value.
+ * @throws BinaryObjectException In case of error.
+ */
+ private static BinaryArray doReadBinaryArray(BinaryInputStream in,
BinaryContext ctx, ClassLoader ldr,
+ BinaryReaderHandlesHolder handles, boolean detach, boolean
deserialize, boolean isEnumArray) {
+ int hPos = positionForHandle(in);
+
+ int compTypeId = in.readInt();
+ String compClsName = null;
+
+ if (compTypeId == GridBinaryMarshaller.UNREGISTERED_TYPE_ID)
+ compClsName = BinaryImplUtils.doReadClassName(in);
+
+ int len = in.readInt();
+
+ Object[] arr = new Object[len];
+
+ BinaryArray res = isEnumArray
+ ? new BinaryEnumArray(ctx, compTypeId, compClsName, arr)
+ : new BinaryArray(ctx, compTypeId, compClsName, arr);
+
+ handles.setHandle(res, hPos);
+
+ for (int i = 0; i < len; i++)
+ arr[i] = deserializeOrUnmarshal(in, ctx, ldr, handles, detach,
deserialize);
+
+ return res;
+ }
+
+ /**
+ * @param deserialize Deep flag.
+ * @param factory Collection factory.
+ * @return Value.
+ * @throws BinaryObjectException In case of error.
+ */
+ @SuppressWarnings("unchecked")
+ private static Collection<?> doReadCollection(BinaryInputStream in,
BinaryContext ctx, ClassLoader ldr,
+ BinaryReaderHandlesHolder handles, boolean detach, boolean
deserialize, BinaryCollectionFactory factory)
+ throws BinaryObjectException {
+ int hPos = positionForHandle(in);
+
+ int size = in.readInt();
+
+ assert size >= 0;
+
+ byte colType = in.readByte();
+
+ Collection<Object> col;
+
+ if (factory != null)
+ col = factory.create(size);
+ else {
+ switch (colType) {
+ case GridBinaryMarshaller.ARR_LIST:
+ col = new ArrayList<>(size);
+
+ break;
+
+ case GridBinaryMarshaller.LINKED_LIST:
+ col = new LinkedList<>();
+
+ break;
+
+ case GridBinaryMarshaller.SINGLETON_LIST:
+ col = new MutableSingletonList<>();
+
+ break;
+
+ case GridBinaryMarshaller.HASH_SET:
+ col = CommonUtils.newHashSet(size);
+
+ break;
+
+ case GridBinaryMarshaller.LINKED_HASH_SET:
+ col = CommonUtils.newLinkedHashSet(size);
+
+ break;
+
+ case GridBinaryMarshaller.USER_SET:
+ col = CommonUtils.newHashSet(size);
+
+ break;
+
+ case GridBinaryMarshaller.USER_COL:
+ col = new ArrayList<>(size);
+
+ break;
+
+ default:
+ throw new BinaryObjectException("Invalid collection type:
" + colType);
+ }
+ }
+
+ handles.setHandle(col, hPos);
+
+ for (int i = 0; i < size; i++)
+ col.add(deserializeOrUnmarshal(in, ctx, ldr, handles, detach,
deserialize));
+
+ return colType == GridBinaryMarshaller.SINGLETON_LIST ?
CommonUtils.convertToSingletonList(col) : col;
+ }
+
+ /**
+ * @param deserialize Deep flag.
+ * @param factory Map factory.
+ * @return Value.
+ * @throws BinaryObjectException In case of error.
+ */
+ @SuppressWarnings("unchecked")
+ private static Map<?, ?> doReadMap(BinaryInputStream in, BinaryContext
ctx, ClassLoader ldr,
+ BinaryReaderHandlesHolder handles, boolean detach, boolean
deserialize, BinaryMapFactory factory)
+ throws BinaryObjectException {
+ int hPos = positionForHandle(in);
+
+ int size = in.readInt();
+
+ assert size >= 0;
+
+ byte mapType = in.readByte();
+
+ Map<Object, Object> map;
+
+ if (factory != null)
+ map = factory.create(size);
+ else {
+ switch (mapType) {
+ case GridBinaryMarshaller.HASH_MAP:
+ map = CommonUtils.newHashMap(size);
+
+ break;
+
+ case GridBinaryMarshaller.LINKED_HASH_MAP:
+ map = CommonUtils.newLinkedHashMap(size);
+
+ break;
+
+ case GridBinaryMarshaller.USER_COL:
+ map = CommonUtils.newHashMap(size);
+
+ break;
+
+ default:
+ throw new BinaryObjectException("Invalid map type: " +
mapType);
+ }
+ }
+
+ handles.setHandle(map, hPos);
+
+ for (int i = 0; i < size; i++) {
+ Object key = deserializeOrUnmarshal(in, ctx, ldr, handles, detach,
deserialize);
+ Object val = deserializeOrUnmarshal(in, ctx, ldr, handles, detach,
deserialize);
+
+ map.put(key, val);
+ }
+
+ return map;
+ }
+
+ /**
+ * Deserialize or unmarshal the object.
+ *
+ * @param deserialize Deserialize.
+ * @return Result.
+ */
+ private static Object deserializeOrUnmarshal(BinaryInputStream in,
BinaryContext ctx, ClassLoader ldr,
+ BinaryReaderHandlesHolder handles, boolean detach, boolean
deserialize) {
+ return deserialize ? doReadObject(in, ctx, ldr, handles) :
unmarshal(in, ctx, ldr, handles, detach, deserialize);
+ }
+
+ /**
+ * Get position to be used for handle. We assume here that the hdr byte
was read, hence subtract -1.
+ *
+ * @return Position for handle.
+ */
+ private static int positionForHandle(BinaryInputStream in) {
+ return in.position() - 1;
+ }
+
+ /**
+ * Enum type.
+ */
+ private static class EnumType {
+ /** Type ID. */
+ private final int typeId;
+
+ /** Class name. */
+ private final String clsName;
+
+ /**
+ * Constructor.
+ *
+ * @param typeId Type ID.
+ * @param clsName Class name.
+ */
+ public EnumType(int typeId, @Nullable String clsName) {
+ assert typeId != GridBinaryMarshaller.UNREGISTERED_TYPE_ID &&
clsName == null ||
+ typeId == GridBinaryMarshaller.UNREGISTERED_TYPE_ID && clsName
!= null;
+
+ this.typeId = typeId;
+ this.clsName = clsName;
+ }
+ }
}
diff --git
a/modules/binary/impl/src/main/java/org/apache/ignite/internal/binary/CrossObjectReferenceResolver.java
b/modules/binary/impl/src/main/java/org/apache/ignite/internal/binary/CrossObjectReferenceResolver.java
index d5c06d7032e..5e55c55de90 100644
---
a/modules/binary/impl/src/main/java/org/apache/ignite/internal/binary/CrossObjectReferenceResolver.java
+++
b/modules/binary/impl/src/main/java/org/apache/ignite/internal/binary/CrossObjectReferenceResolver.java
@@ -31,8 +31,8 @@ import static
org.apache.ignite.internal.binary.BinaryImplUtils.footerStartAbsol
import static org.apache.ignite.internal.binary.BinaryImplUtils.hasRaw;
import static org.apache.ignite.internal.binary.BinaryImplUtils.hasSchema;
import static
org.apache.ignite.internal.binary.BinaryImplUtils.isCompactFooter;
+import static org.apache.ignite.internal.binary.BinaryImplUtils.length;
import static
org.apache.ignite.internal.binary.BinaryImplUtils.rawOffsetAbsolute;
-import static org.apache.ignite.internal.binary.BinaryUtils.length;
import static
org.apache.ignite.internal.binary.GridBinaryMarshaller.DFLT_HDR_LEN;
import static org.apache.ignite.internal.binary.GridBinaryMarshaller.FLAGS_POS;
import static
org.apache.ignite.internal.binary.GridBinaryMarshaller.HASH_CODE_POS;
diff --git
a/modules/binary/impl/src/main/java/org/apache/ignite/internal/binary/ObjectDetachHelper.java
b/modules/binary/impl/src/main/java/org/apache/ignite/internal/binary/ObjectDetachHelper.java
index d5e40860186..75f925b28d5 100644
---
a/modules/binary/impl/src/main/java/org/apache/ignite/internal/binary/ObjectDetachHelper.java
+++
b/modules/binary/impl/src/main/java/org/apache/ignite/internal/binary/ObjectDetachHelper.java
@@ -22,8 +22,8 @@ import
org.apache.ignite.internal.binary.streams.BinaryOutputStream;
import org.apache.ignite.internal.binary.streams.BinaryStreams;
import static
org.apache.ignite.internal.binary.BinaryImplUtils.dataStartRelative;
+import static org.apache.ignite.internal.binary.BinaryImplUtils.length;
import static
org.apache.ignite.internal.binary.BinaryImplUtils.rawOffsetAbsolute;
-import static org.apache.ignite.internal.binary.BinaryUtils.length;
/** */
class ObjectDetachHelper {
diff --git
a/modules/binary/impl/src/main/java/org/apache/ignite/internal/binary/RawBinaryObjectExtractor.java
b/modules/binary/impl/src/main/java/org/apache/ignite/internal/binary/RawBinaryObjectExtractor.java
index b75f6a53d9c..d8d4fb92317 100644
---
a/modules/binary/impl/src/main/java/org/apache/ignite/internal/binary/RawBinaryObjectExtractor.java
+++
b/modules/binary/impl/src/main/java/org/apache/ignite/internal/binary/RawBinaryObjectExtractor.java
@@ -90,7 +90,7 @@ class RawBinaryObjectExtractor implements
BinaryPositionReadable {
break;
case GridBinaryMarshaller.OBJ:
- skipBytes(BinaryUtils.length(in, objStartPos) - /** Object
type. */ Byte.BYTES);
+ skipBytes(BinaryImplUtils.length(in, objStartPos) - /** Object
type. */ Byte.BYTES);
break;
diff --git
a/modules/binary/impl/src/main/java/org/apache/ignite/internal/binary/builder/BinaryBuilderReader.java
b/modules/binary/impl/src/main/java/org/apache/ignite/internal/binary/builder/BinaryBuilderReader.java
index c6360be745b..f88972bffa3 100644
---
a/modules/binary/impl/src/main/java/org/apache/ignite/internal/binary/builder/BinaryBuilderReader.java
+++
b/modules/binary/impl/src/main/java/org/apache/ignite/internal/binary/builder/BinaryBuilderReader.java
@@ -24,12 +24,12 @@ import java.util.HashMap;
import java.util.Map;
import org.apache.ignite.binary.BinaryObjectException;
import org.apache.ignite.internal.binary.BinaryContext;
+import org.apache.ignite.internal.binary.BinaryImplUtils;
import org.apache.ignite.internal.binary.BinaryObjectEx;
import org.apache.ignite.internal.binary.BinaryObjectImpl;
import org.apache.ignite.internal.binary.BinaryPositionReadable;
import org.apache.ignite.internal.binary.BinaryPrimitives;
import org.apache.ignite.internal.binary.BinaryReaderExImpl;
-import org.apache.ignite.internal.binary.BinaryUtils;
import org.apache.ignite.internal.binary.BinaryWriterExImpl;
import org.apache.ignite.internal.binary.GridBinaryMarshaller;
import org.apache.ignite.internal.binary.streams.BinaryInputStream;
@@ -492,7 +492,7 @@ class BinaryBuilderReader implements BinaryPositionReadable
{
case GridBinaryMarshaller.OPTM_MARSH: {
final BinaryInputStream bin = BinaryStreams.inputStream(arr,
pos + 1);
- final Object obj = BinaryUtils.doReadOptimized(bin, ctx,
CommonUtils.resolveClassLoader(null, ctx.classLoader()));
+ final Object obj = BinaryImplUtils.doReadOptimized(bin, ctx,
CommonUtils.resolveClassLoader(null, ctx.classLoader()));
return obj;
}
@@ -844,7 +844,7 @@ class BinaryBuilderReader implements BinaryPositionReadable
{
case GridBinaryMarshaller.OPTM_MARSH: {
final BinaryInputStream bin = BinaryStreams.inputStream(arr,
pos);
- final Object obj = BinaryUtils.doReadOptimized(bin, ctx,
CommonUtils.resolveClassLoader(null, ctx.classLoader()));
+ final Object obj = BinaryImplUtils.doReadOptimized(bin, ctx,
CommonUtils.resolveClassLoader(null, ctx.classLoader()));
pos = bin.position();
diff --git
a/modules/binary/impl/src/main/java/org/apache/ignite/internal/binary/builder/BinaryObjectBuilderImpl.java
b/modules/binary/impl/src/main/java/org/apache/ignite/internal/binary/builder/BinaryObjectBuilderImpl.java
index 3b4451ec861..c0a66261d5b 100644
---
a/modules/binary/impl/src/main/java/org/apache/ignite/internal/binary/builder/BinaryObjectBuilderImpl.java
+++
b/modules/binary/impl/src/main/java/org/apache/ignite/internal/binary/builder/BinaryObjectBuilderImpl.java
@@ -138,7 +138,7 @@ class BinaryObjectBuilderImpl implements
BinaryObjectBuilderEx {
byte ver = reader.readBytePositioned(start +
GridBinaryMarshaller.PROTO_VER_POS);
- BinaryUtils.checkProtocolVersion(ver);
+ BinaryImplUtils.checkProtocolVersion(ver);
int typeId = reader.readIntPositioned(start +
GridBinaryMarshaller.TYPE_ID_POS);
ctx = reader.binaryContext();
@@ -333,7 +333,7 @@ class BinaryObjectBuilderImpl implements
BinaryObjectBuilderEx {
}
// Shift reader to the end of the object.
- reader.position(start + BinaryUtils.length(reader, start));
+ reader.position(start + BinaryImplUtils.length(reader, start));
}
writer.postWrite(true, registeredType);