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 6ffb8718571 IGNITE-25090 Get rid of local BinaryWriterEx methods
(#13614)
6ffb8718571 is described below
commit 6ffb8718571d0a470eb6b018e441d4925e572ffd
Author: Nikolay <[email protected]>
AuthorDate: Wed Sep 30 15:06:31 2026 +0300
IGNITE-25090 Get rid of local BinaryWriterEx methods (#13614)
---
.../ignite/internal/binary/BinariesFactory.java | 3 +-
.../ignite/internal/binary/BinaryMarshaller.java | 9 +-
.../ignite/internal/binary/BinaryReaderEx.java | 44 +--
.../apache/ignite/internal/binary/BinaryUtils.java | 156 +++-----
.../ignite/internal/binary/BinaryWriterEx.java | 157 +-------
.../internal/binary/GridBinaryMarshaller.java | 13 +-
.../internal/binary/streams/BinaryStream.java | 2 +-
.../internal/binary/streams/BinaryStreams.java | 27 --
.../binary/streams/BinaryStreamsFactory.java | 21 -
.../processors/odbc/SqlInputStreamWrapper.java | 0
.../internal/binary/BinariesFactoryImpl.java | 15 +-
.../ignite/internal/binary/BinaryImplUtils.java | 200 ----------
.../ignite/internal/binary/BinaryObjectImpl.java | 8 +-
.../internal/binary/BinaryObjectOffheapImpl.java | 6 +-
.../ignite/internal/binary/BinaryReaderExImpl.java | 152 +++++++-
.../internal/binary/BinaryThreadLocalContext.java | 4 +-
.../ignite/internal/binary/BinaryWriterExImpl.java | 430 ++++++++++++++++++---
.../internal/binary/builder/BinaryBuilderEnum.java | 4 +-
.../binary/builder/BinaryBuilderReader.java | 17 +-
.../builder/BinaryBuilderSerializationAware.java | 4 +-
.../binary/builder/BinaryBuilderSerializer.java | 12 +-
.../binary/builder/BinaryEnumArrayLazyValue.java | 4 +-
.../binary/builder/BinaryLazyArrayList.java | 4 +-
.../binary/builder/BinaryLazyLinkedList.java | 4 +-
.../internal/binary/builder/BinaryLazyMap.java | 4 +-
.../internal/binary/builder/BinaryLazySet.java | 4 +-
.../binary/builder/BinaryModifiableLazyValue.java | 4 +-
.../binary/builder/BinaryObjectArrayLazyValue.java | 4 +-
.../binary/builder/BinaryObjectBuilderImpl.java | 12 +-
.../binary/builder/BinaryPlainBinaryObject.java | 4 +-
.../binary/builder/BinaryPlainLazyValue.java | 4 +-
.../binary/builder/BinaryValueWithType.java | 4 +-
.../binary/streams/BinaryHeapOutputStream.java | 2 +-
.../binary/streams/BinaryMemoryAllocator.java | 2 +-
.../binary/streams/BinaryOffheapInputStream.java | 18 +-
.../binary/streams/BinaryStreamsFactoryImpl.java | 15 -
.../ignite/internal/jdbc/thin/JdbcThinTcpIo.java | 6 +-
.../binary/CacheObjectBinaryProcessorImpl.java | 31 +-
.../processors/odbc/ClientListenerNioListener.java | 2 +-
.../internal/processors/odbc/SqlListenerUtils.java | 164 +-------
.../processors/odbc/jdbc/JdbcMessageParser.java | 2 +-
.../internal/processors/odbc/jdbc/JdbcQuery.java | 2 +-
.../odbc/jdbc/JdbcQueryExecuteRequest.java | 2 +-
.../internal/processors/odbc/jdbc/JdbcUtils.java | 25 +-
.../processors/odbc/odbc/OdbcColumnMeta.java | 18 +-
.../processors/odbc/odbc/OdbcMessageParser.java | 12 +-
.../internal/processors/odbc/odbc/OdbcQuery.java | 2 +-
.../processors/odbc/odbc/OdbcRequestHandler.java | 62 +--
.../internal/binary/BinaryMarshallerSelfTest.java | 4 +-
.../BinaryObjectBuilderDefaultMappersSelfTest.java | 7 +-
.../binary/RawBinaryObjectExtractorTest.java | 6 +-
51 files changed, 683 insertions(+), 1035 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 fa422f19dfd..5b3462941be 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
@@ -75,10 +75,9 @@ public interface BinariesFactory {
/**
* @param ctx Context.
* @param failIfUnregistered Flag to fail while writing object of
unregistered type.
- * @param typeId Type id.
* @return Writer instance.
*/
- public BinaryWriterEx writer(BinaryContext ctx, boolean
failIfUnregistered, int typeId);
+ public BinaryWriterEx writer(BinaryContext ctx, boolean
failIfUnregistered);
/**
* @param ctx Context.
diff --git
a/modules/binary/api/src/main/java/org/apache/ignite/internal/binary/BinaryMarshaller.java
b/modules/binary/api/src/main/java/org/apache/ignite/internal/binary/BinaryMarshaller.java
index 7411659d663..c1c35c3e775 100644
---
a/modules/binary/api/src/main/java/org/apache/ignite/internal/binary/BinaryMarshaller.java
+++
b/modules/binary/api/src/main/java/org/apache/ignite/internal/binary/BinaryMarshaller.java
@@ -21,7 +21,6 @@ import java.io.ByteArrayOutputStream;
import java.io.IOException;
import java.io.InputStream;
import java.io.OutputStream;
-import org.apache.ignite.IgniteCheckedException;
import org.apache.ignite.binary.BinaryObjectException;
import org.apache.ignite.internal.util.tostring.GridToStringExclude;
import org.apache.ignite.internal.util.typedef.internal.S;
@@ -77,13 +76,13 @@ public class BinaryMarshaller extends
AbstractNodeNameAwareMarshaller {
}
/** {@inheritDoc} */
- @Override protected byte[] marshal0(@Nullable Object obj) throws
IgniteCheckedException {
+ @Override protected byte[] marshal0(@Nullable Object obj) {
return impl.marshal(obj, false);
}
/** {@inheritDoc} */
- @Override protected void marshal0(@Nullable Object obj, OutputStream out)
throws IgniteCheckedException {
- impl.marshal(obj, out, false);
+ @Override protected void marshal0(@Nullable Object obj, OutputStream out) {
+ impl.marshal(obj, out);
}
/** {@inheritDoc} */
@@ -92,7 +91,7 @@ public class BinaryMarshaller extends
AbstractNodeNameAwareMarshaller {
}
/** {@inheritDoc} */
- @Override protected <T> T unmarshal0(InputStream in, @Nullable ClassLoader
clsLdr) throws IgniteCheckedException {
+ @Override protected <T> T unmarshal0(InputStream in, @Nullable ClassLoader
clsLdr) {
ByteArrayOutputStream buf = new ByteArrayOutputStream();
// we have to fully read the InputStream because GridBinaryMarshaller
requires support of a method that
diff --git
a/modules/binary/api/src/main/java/org/apache/ignite/internal/binary/BinaryReaderEx.java
b/modules/binary/api/src/main/java/org/apache/ignite/internal/binary/BinaryReaderEx.java
index 1b1911297e8..9b6c6688fb3 100644
---
a/modules/binary/api/src/main/java/org/apache/ignite/internal/binary/BinaryReaderEx.java
+++
b/modules/binary/api/src/main/java/org/apache/ignite/internal/binary/BinaryReaderEx.java
@@ -46,13 +46,6 @@ public interface BinaryReaderEx extends BinaryReader,
BinaryRawReader, BinaryRea
*/
public BinaryInputStream in();
- /**
- * @param offset Offset in the array.
- * @return Unmarshalled value.
- * @throws BinaryObjectException In case of error.
- */
- public Object unmarshal(int offset);
-
/**
* @return Deserialized object.
* @throws BinaryObjectException If failed.
@@ -60,36 +53,11 @@ public interface BinaryReaderEx extends BinaryReader,
BinaryRawReader, BinaryRea
public Object deserialize() throws BinaryObjectException;
/**
- * @return Descriptor.
- */
- public BinaryClassDescriptor descriptor();
-
- /**
- * @param fieldName Field name.
- * @return Unmarshalled value.
- * @throws BinaryObjectException In case of error.
- */
- public Object unmarshalField(String fieldName) throws
BinaryObjectException;
-
- /**
- * @param fieldId Field ID.
- * @return Unmarshalled value.
- * @throws BinaryObjectException In case of error.
- */
- public Object unmarshalField(int fieldId) throws BinaryObjectException;
-
- /**
- * Try finding the field by name.
- *
- * @param name Field name.
- * @return Offset.
- */
- public boolean findFieldByName(String name);
-
- /**
- * Get or create object schema.
- *
- * @return Schema.
+ * Unmarshall JDBC supported type.
+ * @param type Type.
+ * @param binObjAllow Allow to read non plaint objects.
+ * @param deserialize {@code True} if object should be deserialized during
reading.
+ * @return Read object.
*/
- public BinarySchema getOrCreateSchema();
+ public Object unmarshallJdbc(byte type, boolean binObjAllow, boolean
deserialize);
}
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 d3585cb869c..2fceaa4d431 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
@@ -37,6 +37,7 @@ import java.math.BigInteger;
import java.nio.charset.StandardCharsets;
import java.sql.Time;
import java.sql.Timestamp;
+import java.sql.Types;
import java.util.ArrayList;
import java.util.Collection;
import java.util.Collections;
@@ -325,6 +326,18 @@ public class BinaryUtils {
return obj;
}
+ /**
+ * Get ODBC type ID for the type.
+ * @param dataType Data type class.
+ * @return Type ID.
+ */
+ public static byte jdbcTypeByClass(Class<?> dataType) {
+ if (dataType.equals(java.sql.Date.class))
+ return GridBinaryMarshaller.DATE;
+
+ return typeByClass(dataType);
+ }
+
/**
* @param cls Class.
* @return Binary field type.
@@ -1510,114 +1523,61 @@ public class BinaryUtils {
}
/**
- * Unmarshall JDBC supported type.
- * @param type Type.
- * @param reader Binary reader.
- * @param binObjAllow Allow to read non plaint objects.
- * @param keepBinary Whether to deserialize objects or keep in binary
format.
- * @return Read object.
+ * Convert {@link java.sql.Types} to binary type constant (See {@link
GridBinaryMarshaller} constants).
+ *
+ * @param sqlType SQL type.
+ * @return Binary type.
*/
- public static Object unmarshallJdbc(byte type, BinaryReaderEx reader,
boolean binObjAllow, boolean keepBinary) {
- switch (type) {
- case GridBinaryMarshaller.NULL:
- return null;
-
- case GridBinaryMarshaller.BOOLEAN:
- return reader.readBoolean();
-
- case GridBinaryMarshaller.BYTE:
- return reader.readByte();
-
- case GridBinaryMarshaller.CHAR:
- return reader.readChar();
-
- case GridBinaryMarshaller.SHORT:
- return reader.readShort();
-
- case GridBinaryMarshaller.INT:
- return reader.readInt();
-
- case GridBinaryMarshaller.LONG:
- return reader.readLong();
-
- case GridBinaryMarshaller.FLOAT:
- return reader.readFloat();
-
- case GridBinaryMarshaller.DOUBLE:
- return reader.readDouble();
-
- case GridBinaryMarshaller.STRING:
- return doReadString(reader.in());
-
- case GridBinaryMarshaller.DECIMAL:
- return doReadDecimal(reader.in());
-
- case GridBinaryMarshaller.UUID:
- return doReadUuid(reader.in());
-
- case GridBinaryMarshaller.TIME:
- return doReadTime(reader.in());
-
- case GridBinaryMarshaller.TIMESTAMP:
- return doReadTimestamp(reader.in());
-
- case GridBinaryMarshaller.DATE:
- return doReadDate(reader.in());
-
- case GridBinaryMarshaller.BOOLEAN_ARR:
- return doReadBooleanArray(reader.in());
-
- case GridBinaryMarshaller.BYTE_ARR:
- return doReadByteArray(reader.in());
+ public static byte sqlTypeToBinary(int sqlType) {
+ switch (sqlType) {
+ case Types.BIGINT:
+ return GridBinaryMarshaller.LONG;
- case GridBinaryMarshaller.CHAR_ARR:
- return doReadCharArray(reader.in());
+ case Types.BOOLEAN:
+ return GridBinaryMarshaller.BOOLEAN;
- case GridBinaryMarshaller.SHORT_ARR:
- return doReadShortArray(reader.in());
+ case Types.DATE:
+ return GridBinaryMarshaller.DATE;
- case GridBinaryMarshaller.INT_ARR:
- return doReadIntArray(reader.in());
+ case Types.DOUBLE:
+ return GridBinaryMarshaller.DOUBLE;
- case GridBinaryMarshaller.LONG_ARR:
- return doReadLongArray(reader.in());
+ case Types.FLOAT:
+ case Types.REAL:
+ return GridBinaryMarshaller.FLOAT;
- case GridBinaryMarshaller.FLOAT_ARR:
- return doReadFloatArray(reader.in());
+ case Types.NUMERIC:
+ case Types.DECIMAL:
+ return GridBinaryMarshaller.DECIMAL;
- case GridBinaryMarshaller.DOUBLE_ARR:
- return doReadDoubleArray(reader.in());
+ case Types.INTEGER:
+ return GridBinaryMarshaller.INT;
- case GridBinaryMarshaller.STRING_ARR:
- return doReadStringArray(reader.in());
+ case Types.SMALLINT:
+ return GridBinaryMarshaller.SHORT;
- case GridBinaryMarshaller.DECIMAL_ARR:
- return doReadDecimalArray(reader.in());
+ case Types.TIME:
+ return GridBinaryMarshaller.TIME;
- case GridBinaryMarshaller.UUID_ARR:
- return doReadUuidArray(reader.in());
+ case Types.TIMESTAMP:
+ return GridBinaryMarshaller.TIMESTAMP;
- case GridBinaryMarshaller.TIME_ARR:
- return doReadTimeArray(reader.in());
+ case Types.TINYINT:
+ return GridBinaryMarshaller.BYTE;
- case GridBinaryMarshaller.TIMESTAMP_ARR:
- return doReadTimestampArray(reader.in());
+ case Types.CHAR:
+ case Types.VARCHAR:
+ case Types.LONGNVARCHAR:
+ return GridBinaryMarshaller.STRING;
- case GridBinaryMarshaller.DATE_ARR:
- return doReadDateArray(reader.in());
+ case Types.NULL:
+ return GridBinaryMarshaller.NULL;
+ case Types.BINARY:
+ case Types.VARBINARY:
+ case Types.LONGVARBINARY:
default:
- reader.in().position(reader.in().position() - 1);
-
- if (binObjAllow) {
- Object res = reader.readObjectDetached();
-
- return !keepBinary && res instanceof BinaryObject
- ? ((BinaryObject)res).deserialize()
- : res;
- }
- else
- throw new BinaryObjectException("Custom objects are not
supported");
+ return GridBinaryMarshaller.BYTE_ARR;
}
}
@@ -2337,16 +2297,6 @@ public class BinaryUtils {
return binariesFactory.reader(ctx, in, ldr, hnds, skipHdrCheck,
forUnmarshal);
}
- /**
- * @param ctx Context.
- * @param failIfUnregistered Flag to fail while writing object of
unregistered type.
- * @param typeId Type id.
- * @return Writer instance.
- */
- public static BinaryWriterEx writer(BinaryContext ctx, boolean
failIfUnregistered, int typeId) {
- return binariesFactory.writer(ctx, failIfUnregistered, typeId);
- }
-
/**
* @param ctx Context.
* @param out Output stream.
diff --git
a/modules/binary/api/src/main/java/org/apache/ignite/internal/binary/BinaryWriterEx.java
b/modules/binary/api/src/main/java/org/apache/ignite/internal/binary/BinaryWriterEx.java
index a382361432b..1ba862a8784 100644
---
a/modules/binary/api/src/main/java/org/apache/ignite/internal/binary/BinaryWriterEx.java
+++
b/modules/binary/api/src/main/java/org/apache/ignite/internal/binary/BinaryWriterEx.java
@@ -17,9 +17,7 @@
package org.apache.ignite.internal.binary;
-import java.io.InputStream;
import java.io.ObjectOutput;
-import java.lang.reflect.Proxy;
import org.apache.ignite.binary.BinaryObjectException;
import org.apache.ignite.binary.BinaryRawWriter;
import org.apache.ignite.binary.BinaryWriter;
@@ -73,52 +71,6 @@ public interface BinaryWriterEx extends BinaryWriter,
BinaryRawWriter, ObjectOut
*/
void marshal(Object obj) throws BinaryObjectException;
- /**
- * @return Array.
- */
- public byte[] array();
-
- /**
- * Perform pre-write. Reserves space for header and writes class name if
needed.
- *
- * @param clsName Class name (optional).
- */
- public void preWrite(@Nullable String clsName);
-
- /**
- * Perform post-write. Fills object header.
- *
- * @param userType User type flag.
- * @param registered Whether type is registered.
- */
- public void postWrite(boolean userType, boolean registered);
-
- /**
- * Perform post-write hash code update if necessary.
- *
- * @param clsName Class name. Always null if class is registered.
- */
- public void postWriteHashCode(@Nullable String clsName);
-
- /**
- * Pop schema.
- */
- public void popSchema();
-
- /**
- * Write field ID.
- * @param fieldId Field ID.
- */
- public void writeFieldId(int fieldId);
-
- /**
- * Create new writer with same context.
- *
- * @param typeId type
- * @return New writer.
- */
- public BinaryWriterEx newWriter(int typeId);
-
/**
* Writes a sub array of bytes.
* @param b the data to be written
@@ -132,123 +84,20 @@ public interface BinaryWriterEx extends BinaryWriter,
BinaryRawWriter, ObjectOut
*/
public int schemaId();
- /**
- * @param schemaId Schema ID.
- */
- public void schemaId(int schemaId);
-
/**
* @return Binary context.
*/
public BinaryContext context();
- /**
- * @param val Value.
- */
- public void writeBooleanFieldPrimitive(boolean val);
-
- /**
- * @param val Value.
- */
- public void writeByteFieldPrimitive(byte val);
-
- /**
- * @param val Value.
- */
- public void writeCharFieldPrimitive(char val);
-
- /**
- * @param val Value.
- */
- public void writeShortFieldPrimitive(short val);
-
- /**
- * @param val Value.
- */
- public void writeIntFieldPrimitive(int val);
-
- /**
- * @param val Value.
- */
- public void writeLongFieldPrimitive(long val);
-
- /**
- * @param val Value.
- */
- public void writeFloatFieldPrimitive(float val);
-
- /**
- * @param val Value.
- */
- public void writeDoubleFieldPrimitive(double val);
-
- /**
- * Write byte array from the InputStream.
- *
- * <p>If {@code limit} > 0 than no more than {@code limit} bytes will be
read and written.
- * If {@code limit} == -1 than it will try to read and write all bytes.
- *
- * <p>In any case if actual number of bytes is greater than {@code
MAX_ARRAY_SIZE}
- * than exception will be thrown.
- *
- * @param in InputStream.
- * @param limit Max length of data to be read from the stream or -1 if all
data should be read.
- * @return Number of bytes written.
- * @throws BinaryObjectException If an I/O error occurs or stream contains
more than {@code MAX_ARRAY_SIZE} bytes.
- */
- public int writeByteArray(InputStream in, int limit) throws
BinaryObjectException;
-
- /**
- * @param po Binary object.
- * @throws org.apache.ignite.binary.BinaryObjectException In case of error.
- */
- public void writeBinaryObject(@Nullable BinaryObjectEx po) throws
BinaryObjectException;
-
- /**
- * Write field.
- *
- * @param obj Object.
- * @param fld Field.
- * @throws BinaryObjectException If failed.
- */
- public void writeField(Object obj, BinaryFieldDescriptor fld) throws
BinaryObjectException;
-
/**
* @return Current writer's schema.
*/
public BinarySchema currentSchema();
/**
- * Attempts to write the object as a handle.
- *
* @param obj Object to write.
- * @return {@code true} if the object has been written as a handle.
- */
- public boolean tryWriteAsHandle(Object obj);
-
- /**
- * @param val Array wrapper.
- * @throws BinaryObjectException In case of error.
- */
- public void writeBinaryArray(BinaryArray val);
-
- /**
- * @param val Array.
- */
- public void doWriteEnumArray(Object[] val);
-
- /**
- * @param val Value.
- */
- public void writeBinaryEnum(BinaryObjectEx val);
-
- /**
- * @param val Class.
- */
- public void writeClass(Class val);
-
- /**
- * @param proxy Proxy.
+ * @param binObjAllow Allow to write non plain objects.
+ * @throws BinaryObjectException On error.
*/
- public void writeProxy(Proxy proxy, Class<?>[] intfs);
+ public void writeJdbcObject(@Nullable Object obj, boolean binObjAllow);
}
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 75e5252f130..8f483d7b7be 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
@@ -252,10 +252,10 @@ public class GridBinaryMarshaller {
if (obj == null)
return new byte[] { NULL };
- try (BinaryWriterEx writer = BinaryUtils.writer(ctx,
failIfUnregistered, UNREGISTERED_TYPE_ID)) {
+ try (BinaryWriterEx writer = BinaryUtils.binariesFactory.writer(ctx,
failIfUnregistered)) {
writer.marshal(obj);
- return writer.array();
+ return writer.out().arrayCopy();
}
}
@@ -264,10 +264,9 @@ public class GridBinaryMarshaller {
*
* @param obj Object to marshal.
* @param out Output stream.
- * @param failIfUnregistered Throw exception if class isn't registered.
* @throws BinaryObjectException In case of error.
*/
- public void marshal(@Nullable Object obj, OutputStream out, boolean
failIfUnregistered) throws BinaryObjectException {
+ public void marshal(@Nullable Object obj, OutputStream out) throws
BinaryObjectException {
try {
if (obj == null) {
out.write(NULL);
@@ -275,7 +274,7 @@ public class GridBinaryMarshaller {
return;
}
- try (BinaryWriterEx writer = BinaryUtils.writer(ctx,
failIfUnregistered, UNREGISTERED_TYPE_ID)) {
+ try (BinaryWriterEx writer =
BinaryUtils.binariesFactory.writer(ctx, false)) {
writer.marshal(obj);
BinaryOutputStream s = writer.out();
@@ -299,7 +298,7 @@ public class GridBinaryMarshaller {
BinaryContext oldCtx = pushContext(ctx);
try {
- return (T)BinaryUtils.unmarshal(BinaryStreams.inputStream(bytes,
0), ctx, clsLdr);
+ return (T)BinaryUtils.unmarshal(BinaryStreams.inputStream(bytes),
ctx, clsLdr);
}
finally {
popContext(oldCtx);
@@ -413,7 +412,7 @@ public class GridBinaryMarshaller {
if (arr[0] == NULL)
return null;
- return deserialize(BinaryStreams.inputStream(arr, 0), ldr, null);
+ return deserialize(BinaryStreams.inputStream(arr), ldr, null);
}
/**
diff --git
a/modules/binary/api/src/main/java/org/apache/ignite/internal/binary/streams/BinaryStream.java
b/modules/binary/api/src/main/java/org/apache/ignite/internal/binary/streams/BinaryStream.java
index 56a905f0592..218efeed975 100644
---
a/modules/binary/api/src/main/java/org/apache/ignite/internal/binary/streams/BinaryStream.java
+++
b/modules/binary/api/src/main/java/org/apache/ignite/internal/binary/streams/BinaryStream.java
@@ -42,7 +42,7 @@ interface BinaryStream {
public byte[] arrayCopy();
/**
- * @return Offheap pointer if stream is offheap based and "forceHeap" flag
is not set; otherwise {@code 0}.
+ * @return Offheap pointer if stream is offheap based; otherwise {@code 0}.
*/
public long offheapPointer();
diff --git
a/modules/binary/api/src/main/java/org/apache/ignite/internal/binary/streams/BinaryStreams.java
b/modules/binary/api/src/main/java/org/apache/ignite/internal/binary/streams/BinaryStreams.java
index 7aa287d2ccb..e8d380bfb20 100644
---
a/modules/binary/api/src/main/java/org/apache/ignite/internal/binary/streams/BinaryStreams.java
+++
b/modules/binary/api/src/main/java/org/apache/ignite/internal/binary/streams/BinaryStreams.java
@@ -78,17 +78,6 @@ public class BinaryStreams {
return factory.inputStream(ptr, cap);
}
- /**
- * @param ptr Pointer.
- * @param cap Capacity.
- * @param forceHeap If {@code true} method {@link
BinaryInputStream#offheapPointer()} returns 0 and unmarshalling will
- * create heap-based objects.
- * @return Stream.
- */
- public static BinaryInputStream inputStream(long ptr, int cap, boolean
forceHeap) {
- return factory.inputStream(ptr, cap, forceHeap);
- }
-
/**
* @param cap Capacity.
* @param disableAutoClose Whether to disable resource release in {@link
BinaryOutputStream#close()} method
@@ -106,20 +95,4 @@ public class BinaryStreams {
public static BinaryOutputStream outputStream(int cap) {
return factory.outputStream(cap);
}
-
- /**
- * @param cap Capacity.
- * @param chunk Memory allocator chunk.
- * @return Binary output stream.
- */
- public static BinaryOutputStream outputStream(int cap,
BinaryMemoryAllocatorChunk chunk) {
- return factory.outputStream(cap, chunk);
- }
-
- /**
- * @return Thread local binary memory allocator.
- */
- public static BinaryMemoryAllocatorChunk threadLocalChunk() {
- return factory.threadLocalChunk();
- }
}
diff --git
a/modules/binary/api/src/main/java/org/apache/ignite/internal/binary/streams/BinaryStreamsFactory.java
b/modules/binary/api/src/main/java/org/apache/ignite/internal/binary/streams/BinaryStreamsFactory.java
index ad4d7df2b26..ceac87e1c42 100644
---
a/modules/binary/api/src/main/java/org/apache/ignite/internal/binary/streams/BinaryStreamsFactory.java
+++
b/modules/binary/api/src/main/java/org/apache/ignite/internal/binary/streams/BinaryStreamsFactory.java
@@ -59,15 +59,6 @@ public interface BinaryStreamsFactory {
*/
public BinaryInputStream inputStream(long ptr, int cap);
- /**
- * @param ptr Pointer.
- * @param cap Capacity.
- * @param forceHeap If {@code true} method {@link
BinaryInputStream#offheapPointer()} returns 0 and unmarshalling will
- * create heap-based objects.
- * @return Stream.
- */
- public BinaryInputStream inputStream(long ptr, int cap, boolean forceHeap);
-
/**
* @param cap Capacity.
* @param disableAutoClose Whether to disable resource release in {@link
BinaryOutputStream#close()} method
@@ -81,16 +72,4 @@ public interface BinaryStreamsFactory {
* @return Binary output stream data.
*/
public BinaryOutputStream outputStream(int cap);
-
- /**
- * @param cap Capacity.
- * @param chunk Memory allocator chunk.
- * @return Binary output stream.
- */
- public BinaryOutputStream outputStream(int cap, BinaryMemoryAllocatorChunk
chunk);
-
- /**
- * @return Thread local binary memory allocator.
- */
- public BinaryMemoryAllocatorChunk threadLocalChunk();
}
diff --git
a/modules/core/src/main/java/org/apache/ignite/internal/processors/odbc/SqlInputStreamWrapper.java
b/modules/binary/api/src/main/java/org/apache/ignite/internal/processors/odbc/SqlInputStreamWrapper.java
similarity index 100%
rename from
modules/core/src/main/java/org/apache/ignite/internal/processors/odbc/SqlInputStreamWrapper.java
rename to
modules/binary/api/src/main/java/org/apache/ignite/internal/processors/odbc/SqlInputStreamWrapper.java
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 35aacbae8a5..0740a3b3436 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,9 +22,9 @@ import java.util.HashMap;
import java.util.Map;
import java.util.function.ToIntFunction;
import org.apache.ignite.binary.BinaryObject;
+import org.apache.ignite.internal.binary.streams.BinaryHeapOutputStream;
import org.apache.ignite.internal.binary.streams.BinaryInputStream;
import org.apache.ignite.internal.binary.streams.BinaryOutputStream;
-import org.apache.ignite.internal.binary.streams.BinaryStreams;
import org.apache.ignite.internal.processors.cache.CacheObjectValueContext;
import org.apache.ignite.internal.util.CommonUtils;
import org.apache.ignite.internal.util.GridUnsafe;
@@ -64,14 +64,18 @@ public class BinariesFactoryImpl implements BinariesFactory
{
}
/** {@inheritDoc} */
- @Override public BinaryWriterEx writer(BinaryContext ctx, boolean
failIfUnregistered, int typeId) {
+ @Override public BinaryWriterEx writer(BinaryContext ctx, boolean
failIfUnregistered) {
+ return newWriter(ctx, failIfUnregistered,
GridBinaryMarshaller.UNREGISTERED_TYPE_ID);
+ }
+
+ /** */
+ public static BinaryWriterExImpl newWriter(BinaryContext ctx, boolean
failIfUnregistered, int typeId) {
BinaryThreadLocalContext locCtx = BinaryThreadLocalContext.get();
return new BinaryWriterExImpl(
ctx,
- BinaryStreams.outputStream((int)CommonUtils.KB, locCtx.chunk()),
+ new BinaryHeapOutputStream((int)CommonUtils.KB, locCtx.chunk()),
locCtx.schemaHolder(),
- null,
failIfUnregistered,
typeId
);
@@ -83,7 +87,6 @@ public class BinariesFactoryImpl implements BinariesFactory {
ctx,
out,
BinaryThreadLocalContext.get().schemaHolder(),
- null,
false,
GridBinaryMarshaller.UNREGISTERED_TYPE_ID
);
@@ -91,7 +94,7 @@ public class BinariesFactoryImpl implements BinariesFactory {
/** {@inheritDoc} */
@Override public BinaryWriterEx writerWithoutSchema(BinaryContext ctx,
BinaryOutputStream out) {
- return new BinaryWriterExImpl(ctx, out, null, null, false,
GridBinaryMarshaller.UNREGISTERED_TYPE_ID);
+ return new BinaryWriterExImpl(ctx, out, null, false,
GridBinaryMarshaller.UNREGISTERED_TYPE_ID);
}
/** {@inheritDoc} */
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 6d59f0519b5..f97c931555f 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,16 +16,9 @@
*/
package org.apache.ignite.internal.binary;
-import java.math.BigDecimal;
-import java.sql.Time;
-import java.sql.Timestamp;
-import java.util.Date;
-import java.util.UUID;
-import org.apache.ignite.internal.binary.streams.BinaryInputStream;
import org.apache.ignite.internal.util.typedef.F;
import org.apache.ignite.lang.IgniteBiTuple;
-import static
org.apache.ignite.internal.binary.BinaryUtils.PLAIN_CLASS_TO_FLAG;
import static org.apache.ignite.internal.binary.BinaryUtils.length;
/**
@@ -307,172 +300,6 @@ public class BinaryImplUtils {
|| type == GridBinaryMarshaller.TIMESTAMP_ARR || type ==
GridBinaryMarshaller.TIME_ARR;
}
- /**
- * Write value with flag. e.g. writePlainObject(writer, (byte)77) will
write two byte: {BYTE, 77}.
- *
- * @param writer W
- * @param val Value.
- */
- public static void writePlainObject(BinaryWriterEx writer, Object val) {
- Byte flag = PLAIN_CLASS_TO_FLAG.get(val.getClass());
-
- if (flag == null)
- throw new IllegalArgumentException("Can't write object with type:
" + val.getClass());
-
- switch (flag) {
- case GridBinaryMarshaller.BYTE:
- writer.writeByte(flag);
- writer.writeByte((Byte)val);
-
- break;
-
- case GridBinaryMarshaller.SHORT:
- writer.writeByte(flag);
- writer.writeShort((Short)val);
-
- break;
-
- case GridBinaryMarshaller.INT:
- writer.writeByte(flag);
- writer.writeInt((Integer)val);
-
- break;
-
- case GridBinaryMarshaller.LONG:
- writer.writeByte(flag);
- writer.writeLong((Long)val);
-
- break;
-
- case GridBinaryMarshaller.FLOAT:
- writer.writeByte(flag);
- writer.writeFloat((Float)val);
-
- break;
-
- case GridBinaryMarshaller.DOUBLE:
- writer.writeByte(flag);
- writer.writeDouble((Double)val);
-
- break;
-
- case GridBinaryMarshaller.CHAR:
- writer.writeByte(flag);
- writer.writeChar((Character)val);
-
- break;
-
- case GridBinaryMarshaller.BOOLEAN:
- writer.writeByte(flag);
- writer.writeBoolean((Boolean)val);
-
- break;
-
- case GridBinaryMarshaller.DECIMAL:
- writer.writeDecimal((BigDecimal)val);
-
- break;
-
- case GridBinaryMarshaller.STRING:
- writer.writeString((String)val);
-
- break;
-
- case GridBinaryMarshaller.UUID:
- writer.writeUuid((UUID)val);
-
- break;
-
- case GridBinaryMarshaller.DATE:
- writer.writeDate((Date)val);
-
- break;
-
- case GridBinaryMarshaller.TIMESTAMP:
- writer.writeTimestamp((Timestamp)val);
-
- break;
-
- case GridBinaryMarshaller.TIME:
- writer.writeTime((Time)val);
-
- break;
-
- case GridBinaryMarshaller.BYTE_ARR:
- writer.writeByteArray((byte[])val);
-
- break;
-
- case GridBinaryMarshaller.SHORT_ARR:
- writer.writeShortArray((short[])val);
-
- break;
-
- case GridBinaryMarshaller.INT_ARR:
- writer.writeIntArray((int[])val);
-
- break;
-
- case GridBinaryMarshaller.LONG_ARR:
- writer.writeLongArray((long[])val);
-
- break;
-
- case GridBinaryMarshaller.FLOAT_ARR:
- writer.writeFloatArray((float[])val);
-
- break;
-
- case GridBinaryMarshaller.DOUBLE_ARR:
- writer.writeDoubleArray((double[])val);
-
- break;
-
- case GridBinaryMarshaller.CHAR_ARR:
- writer.writeCharArray((char[])val);
-
- break;
-
- case GridBinaryMarshaller.BOOLEAN_ARR:
- writer.writeBooleanArray((boolean[])val);
-
- break;
-
- case GridBinaryMarshaller.DECIMAL_ARR:
- writer.writeDecimalArray((BigDecimal[])val);
-
- break;
-
- case GridBinaryMarshaller.STRING_ARR:
- writer.writeStringArray((String[])val);
-
- break;
-
- case GridBinaryMarshaller.UUID_ARR:
- writer.writeUuidArray((UUID[])val);
-
- break;
-
- case GridBinaryMarshaller.DATE_ARR:
- writer.writeDateArray((Date[])val);
-
- break;
-
- case GridBinaryMarshaller.TIMESTAMP_ARR:
- writer.writeTimestampArray((Timestamp[])val);
-
- break;
-
- case GridBinaryMarshaller.TIME_ARR:
- writer.writeTimeArray((Time[])val);
-
- break;
-
- default:
- throw new IllegalArgumentException("Can't write object with
type: " + val.getClass());
- }
- }
-
/**
* @param val Value to check.
* @return {@code True} if {@code val} instance of {@link BinaryEnumArray}.
@@ -481,16 +308,6 @@ public class BinaryImplUtils {
return val instanceof BinaryEnumArray;
}
- /**
- * Gets field by its order.
- *
- * @param reader Reader.
- * @param order Order.
- */
- public static int fieldId(BinaryReaderEx reader, int order) {
- return reader.getOrCreateSchema().fieldId(order);
- }
-
/** */
public static int hashCode(byte[] data, int startPos, int endPos) {
int hash = 1;
@@ -500,21 +317,4 @@ public class BinaryImplUtils {
return hash;
}
-
- /**
- * Creates reader instance.
- *
- * @param ctx Context.
- * @param in Input stream.
- * @param ldr Class loader.
- * @param reader BinaryReaderEx.
- * @param forUnmarshal {@code True} if reader is need to unmarshal object.
- */
- public static BinaryReaderEx reader(BinaryContext ctx,
- BinaryInputStream in,
- ClassLoader ldr,
- BinaryReaderEx reader,
- boolean forUnmarshal) {
- return BinaryUtils.binariesFactory.reader(ctx, in, ldr,
reader.handles(), forUnmarshal);
- }
}
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 d41d6a3160d..4f625babc37 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
@@ -781,7 +781,7 @@ public final class BinaryObjectImpl extends
BinaryObjectExImpl implements Extern
* @return Object.
*/
private Object deserializeValue(@Nullable CacheObjectValueContext coCtx) {
- BinaryReaderEx reader = reader(null, coCtx != null ?
coCtx.classLoader() : ctx.classLoader(), true);
+ BinaryReaderExImpl reader = reader(null, coCtx != null ?
coCtx.classLoader() : ctx.classLoader(), true);
Object obj0 = reader.deserialize();
@@ -811,12 +811,12 @@ public final class BinaryObjectImpl extends
BinaryObjectExImpl implements Extern
* @param forUnmarshal {@code True} if reader is need to unmarshal object.
* @return Reader.
*/
- private BinaryReaderEx reader(@Nullable BinaryReaderHandles rCtx,
@Nullable ClassLoader ldr,
+ private BinaryReaderExImpl reader(@Nullable BinaryReaderHandles rCtx,
@Nullable ClassLoader ldr,
boolean forUnmarshal) {
if (ldr == null)
ldr = ctx.classLoader();
- return BinaryUtils.reader(ctx,
+ return new BinaryReaderExImpl(ctx,
BinaryStreams.inputStream(arr, start),
ldr,
rCtx,
@@ -831,7 +831,7 @@ public final class BinaryObjectImpl extends
BinaryObjectExImpl implements Extern
* @param forUnmarshal {@code True} if reader is need to unmarshal object.
* @return Reader.
*/
- private BinaryReaderEx reader(@Nullable BinaryReaderHandles rCtx, boolean
forUnmarshal) {
+ private BinaryReaderExImpl reader(@Nullable BinaryReaderHandles rCtx,
boolean forUnmarshal) {
return reader(rCtx, null, forUnmarshal);
}
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 9ad6c06a605..dc439b77d11 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
@@ -497,7 +497,7 @@ class BinaryObjectOffheapImpl extends BinaryObjectExImpl
implements Externalizab
* @param forUnmarshal {@code True} if reader is needed to unmarshal
object.
* @return Reader.
*/
- private BinaryReaderEx reader(@Nullable BinaryReaderHandles rCtx, boolean
forUnmarshal) {
+ private BinaryReaderExImpl reader(@Nullable BinaryReaderHandles rCtx,
boolean forUnmarshal) {
return reader(rCtx, ctx.classLoader(), forUnmarshal);
}
@@ -509,13 +509,13 @@ class BinaryObjectOffheapImpl extends BinaryObjectExImpl
implements Externalizab
* @param forUnmarshal {@code True} if reader is needed to unmarshal
object.
* @return Reader.
*/
- private BinaryReaderEx reader(@Nullable BinaryReaderHandles rCtx,
@Nullable ClassLoader ldr,
+ private BinaryReaderExImpl reader(@Nullable BinaryReaderHandles rCtx,
@Nullable ClassLoader ldr,
boolean forUnmarshal) {
BinaryInputStream stream = BinaryStreams.inputStream(ptr, size);
stream.position(start);
- return BinaryUtils.reader(ctx,
+ return new BinaryReaderExImpl(ctx,
stream,
ldr,
rCtx,
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 8b0fe48dbb3..7b49c16aa09 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
@@ -96,7 +96,7 @@ import static
org.apache.ignite.internal.binary.GridBinaryMarshaller.UUID_ARR;
* Binary reader implementation.
*/
@SuppressWarnings("unchecked")
-class BinaryReaderExImpl implements BinaryReaderEx {
+public class BinaryReaderExImpl implements BinaryReaderEx {
/** Binary context. */
private final BinaryContext ctx;
@@ -312,23 +312,31 @@ class BinaryReaderExImpl implements BinaryReaderEx {
return in;
}
- /** {@inheritDoc} */
- @Override public BinaryClassDescriptor descriptor() {
+ /** @return Descriptor. */
+ public BinaryClassDescriptor descriptor() {
if (desc == null)
desc = ctx.descriptorForTypeId(userType, typeId, ldr, false);
return desc;
}
- /** {@inheritDoc} */
- @Override public Object unmarshal(int offset) throws BinaryObjectException
{
+ /**
+ * @param offset Offset in the array.
+ * @return Unmarshalled value.
+ * @throws BinaryObjectException In case of error.
+ */
+ public Object unmarshal(int offset) throws BinaryObjectException {
streamPosition(offset);
return in.position() >= 0 ? BinaryUtils.unmarshal(in, ctx, ldr, this)
: null;
}
- /** {@inheritDoc} */
- @Override public Object unmarshalField(String fieldName) throws
BinaryObjectException {
+ /**
+ * @param fieldName Field name.
+ * @return Unmarshalled value.
+ * @throws BinaryObjectException In case of error.
+ */
+ public Object unmarshalField(String fieldName) throws
BinaryObjectException {
try {
return findFieldByName(fieldName) ? BinaryUtils.unmarshal(in, ctx,
ldr, this) : null;
}
@@ -337,8 +345,12 @@ class BinaryReaderExImpl implements BinaryReaderEx {
}
}
- /** {@inheritDoc} */
- @Override public Object unmarshalField(int fieldId) throws
BinaryObjectException {
+ /**
+ * @param fieldId Field ID.
+ * @return Unmarshalled value.
+ * @throws BinaryObjectException In case of error.
+ */
+ public Object unmarshalField(int fieldId) throws BinaryObjectException {
return findFieldById(fieldId) ? BinaryUtils.unmarshal(in, ctx, ldr,
this) : null;
}
@@ -1981,8 +1993,12 @@ class BinaryReaderExImpl implements BinaryReaderEx {
return mapper.fieldId(typeId, name);
}
- /** {@inheritDoc} */
- @Override public BinarySchema getOrCreateSchema() {
+ /**
+ * Get or create object schema.
+ *
+ * @return Schema.
+ */
+ public BinarySchema getOrCreateSchema() {
BinarySchema schema = ctx.schemaRegistry(typeId).schema(schemaId);
if (schema == null) {
@@ -2032,6 +2048,111 @@ class BinaryReaderExImpl implements BinaryReaderEx {
return schema;
}
+ /** {@inheritDoc} */
+ @Override public Object unmarshallJdbc(byte type, boolean binObjAllow,
boolean deserialize) {
+ switch (type) {
+ case GridBinaryMarshaller.NULL:
+ return null;
+
+ case GridBinaryMarshaller.BOOLEAN:
+ return readBoolean();
+
+ case GridBinaryMarshaller.BYTE:
+ return readByte();
+
+ case GridBinaryMarshaller.CHAR:
+ return readChar();
+
+ case GridBinaryMarshaller.SHORT:
+ return readShort();
+
+ case GridBinaryMarshaller.INT:
+ return readInt();
+
+ case GridBinaryMarshaller.LONG:
+ return readLong();
+
+ case GridBinaryMarshaller.FLOAT:
+ return readFloat();
+
+ case GridBinaryMarshaller.DOUBLE:
+ return readDouble();
+
+ case GridBinaryMarshaller.STRING:
+ return BinaryUtils.doReadString(in());
+
+ case GridBinaryMarshaller.DECIMAL:
+ return BinaryUtils.doReadDecimal(in());
+
+ case GridBinaryMarshaller.UUID:
+ return BinaryUtils.doReadUuid(in());
+
+ case GridBinaryMarshaller.TIME:
+ return BinaryUtils.doReadTime(in());
+
+ case GridBinaryMarshaller.TIMESTAMP:
+ return BinaryUtils.doReadTimestamp(in());
+
+ case GridBinaryMarshaller.DATE:
+ return BinaryUtils.doReadDate(in());
+
+ case GridBinaryMarshaller.BOOLEAN_ARR:
+ return BinaryUtils.doReadBooleanArray(in());
+
+ case GridBinaryMarshaller.BYTE_ARR:
+ return BinaryUtils.doReadByteArray(in());
+
+ case GridBinaryMarshaller.CHAR_ARR:
+ return BinaryUtils.doReadCharArray(in());
+
+ case GridBinaryMarshaller.SHORT_ARR:
+ return BinaryUtils.doReadShortArray(in());
+
+ case GridBinaryMarshaller.INT_ARR:
+ return BinaryUtils.doReadIntArray(in());
+
+ case GridBinaryMarshaller.LONG_ARR:
+ return BinaryUtils.doReadLongArray(in());
+
+ case GridBinaryMarshaller.FLOAT_ARR:
+ return BinaryUtils.doReadFloatArray(in());
+
+ case GridBinaryMarshaller.DOUBLE_ARR:
+ return BinaryUtils.doReadDoubleArray(in());
+
+ case GridBinaryMarshaller.STRING_ARR:
+ return BinaryUtils.doReadStringArray(in());
+
+ case GridBinaryMarshaller.DECIMAL_ARR:
+ return BinaryUtils.doReadDecimalArray(in());
+
+ case GridBinaryMarshaller.UUID_ARR:
+ return BinaryUtils.doReadUuidArray(in());
+
+ case GridBinaryMarshaller.TIME_ARR:
+ return BinaryUtils.doReadTimeArray(in());
+
+ case GridBinaryMarshaller.TIMESTAMP_ARR:
+ return BinaryUtils.doReadTimestampArray(in());
+
+ case GridBinaryMarshaller.DATE_ARR:
+ return BinaryUtils.doReadDateArray(in());
+
+ default:
+ in().position(in().position() - 1);
+
+ if (binObjAllow) {
+ Object res = readObjectDetached();
+
+ return deserialize && res instanceof BinaryObject
+ ? ((BinaryObject)res).deserialize()
+ : res;
+ }
+ else
+ throw new BinaryObjectException("Custom objects are not
supported");
+ }
+ }
+
/**
* Create schema.
*
@@ -2056,8 +2177,13 @@ class BinaryReaderExImpl implements BinaryReaderEx {
return builder.build();
}
- /** {@inheritDoc} */
- @Override public boolean findFieldByName(String name) {
+ /**
+ * Try finding the field by name.
+ *
+ * @param name Field name.
+ * @return Offset.
+ */
+ public boolean findFieldByName(String name) {
if (raw)
throw new BinaryObjectException("Failed to read named field
because reader is in raw mode.");
diff --git
a/modules/binary/impl/src/main/java/org/apache/ignite/internal/binary/BinaryThreadLocalContext.java
b/modules/binary/impl/src/main/java/org/apache/ignite/internal/binary/BinaryThreadLocalContext.java
index 3611d3fc6ab..4462acbf019 100644
---
a/modules/binary/impl/src/main/java/org/apache/ignite/internal/binary/BinaryThreadLocalContext.java
+++
b/modules/binary/impl/src/main/java/org/apache/ignite/internal/binary/BinaryThreadLocalContext.java
@@ -17,8 +17,8 @@
package org.apache.ignite.internal.binary;
+import org.apache.ignite.internal.binary.streams.BinaryMemoryAllocator;
import org.apache.ignite.internal.binary.streams.BinaryMemoryAllocatorChunk;
-import org.apache.ignite.internal.binary.streams.BinaryStreams;
/**
* Contains thread-local data for binary marshalling.
@@ -32,7 +32,7 @@ class BinaryThreadLocalContext {
};
/** Memory chunk. */
- private final BinaryMemoryAllocatorChunk chunk =
BinaryStreams.threadLocalChunk();
+ private final BinaryMemoryAllocatorChunk chunk =
BinaryMemoryAllocator.THREAD_LOCAL.chunk();
/** Schema holder. */
private final BinaryWriterSchemaHolder schema = new
BinaryWriterSchemaHolder();
diff --git
a/modules/binary/impl/src/main/java/org/apache/ignite/internal/binary/BinaryWriterExImpl.java
b/modules/binary/impl/src/main/java/org/apache/ignite/internal/binary/BinaryWriterExImpl.java
index edea8d3699b..1356fe89f2c 100644
---
a/modules/binary/impl/src/main/java/org/apache/ignite/internal/binary/BinaryWriterExImpl.java
+++
b/modules/binary/impl/src/main/java/org/apache/ignite/internal/binary/BinaryWriterExImpl.java
@@ -23,6 +23,8 @@ import java.lang.reflect.InvocationHandler;
import java.lang.reflect.Proxy;
import java.math.BigDecimal;
import java.math.BigInteger;
+import java.sql.Blob;
+import java.sql.SQLException;
import java.sql.Time;
import java.sql.Timestamp;
import java.util.Collection;
@@ -39,6 +41,7 @@ import
org.apache.ignite.internal.UnregisteredBinaryTypeException;
import org.apache.ignite.internal.UnregisteredClassException;
import org.apache.ignite.internal.binary.streams.BinaryOutputStream;
import org.apache.ignite.internal.processors.cache.CacheObject;
+import org.apache.ignite.internal.processors.odbc.SqlInputStreamWrapper;
import org.apache.ignite.internal.util.CommonUtils;
import org.apache.ignite.internal.util.GridUnsafe;
import org.apache.ignite.internal.util.typedef.F;
@@ -49,12 +52,13 @@ import org.jetbrains.annotations.Nullable;
import static org.apache.ignite.IgniteCommonsSystemProperties.DFLT_ZERO_COPY;
import static
org.apache.ignite.IgniteCommonsSystemProperties.IGNITE_BINARY_STRING_ZERO_COPY;
+import static
org.apache.ignite.internal.binary.BinaryUtils.PLAIN_CLASS_TO_FLAG;
import static org.apache.ignite.internal.util.CommonUtils.MAX_ARRAY_SIZE;
/**
* Binary writer implementation.
*/
-class BinaryWriterExImpl implements BinaryWriterEx {
+public class BinaryWriterExImpl implements BinaryWriterEx {
/** Zero-copy serialization enabled flag. */
static final boolean ZERO_COPY =
IgniteCommonsSystemProperties.getBoolean(IGNITE_BINARY_STRING_ZERO_COPY,
DFLT_ZERO_COPY);
@@ -100,7 +104,6 @@ class BinaryWriterExImpl implements BinaryWriterEx {
/**
* @param ctx Context.
* @param out Output stream.
- * @param handles Handles.
* @param failIfUnregistered Flag to fail while writing object of
unregistered type.
* @param typeId Type id.
*/
@@ -108,14 +111,12 @@ class BinaryWriterExImpl implements BinaryWriterEx {
BinaryContext ctx,
BinaryOutputStream out,
@Nullable BinaryWriterSchemaHolder schema,
- BinaryWriterHandles handles,
boolean failIfUnregistered,
int typeId
) {
this.ctx = ctx;
this.out = out;
this.schema = schema;
- this.handles = handles;
this.failIfUnregistered = failIfUnregistered;
this.typeId = typeId;
@@ -219,11 +220,6 @@ class BinaryWriterExImpl implements BinaryWriterEx {
write(obj, desc);
}
- /** {@inheritDoc} */
- @Override public byte[] array() {
- return out.arrayCopy();
- }
-
/**
* @return Stream current position.
*/
@@ -231,16 +227,25 @@ class BinaryWriterExImpl implements BinaryWriterEx {
return out.position();
}
- /** {@inheritDoc} */
- @Override public void preWrite(@Nullable String clsName) {
+ /**
+ * Perform pre-write. Reserves space for header and writes class name if
needed.
+ *
+ * @param clsName Class name (optional).
+ */
+ public void preWrite(@Nullable String clsName) {
out.position(out.position() + GridBinaryMarshaller.DFLT_HDR_LEN);
if (clsName != null)
writeString(clsName);
}
- /** {@inheritDoc} */
- @Override public void postWrite(boolean userType, boolean registered) {
+ /**
+ * Perform post-write. Fills object header.
+ *
+ * @param userType User type flag.
+ * @param registered Whether type is registered.
+ */
+ public void postWrite(boolean userType, boolean registered) {
short flags;
boolean useCompactFooter;
@@ -309,8 +314,12 @@ class BinaryWriterExImpl implements BinaryWriterEx {
out.unsafePosition(retPos);
}
- /** {@inheritDoc} */
- @Override public void postWriteHashCode(@Nullable String clsName) {
+ /**
+ * Perform post-write hash code update if necessary.
+ *
+ * @param clsName Class name. Always null if class is registered.
+ */
+ public void postWriteHashCode(@Nullable String clsName) {
int typeId = clsName == null ? this.typeId : ctx.typeId(clsName);
BinaryIdentityResolver identity = ctx.identity(typeId);
@@ -335,8 +344,10 @@ class BinaryWriterExImpl implements BinaryWriterEx {
}
}
- /** {@inheritDoc} */
- @Override public void popSchema() {
+ /**
+ * Pop schema.
+ */
+ public void popSchema() {
if (fieldCnt > 0)
schema.pop(fieldCnt);
}
@@ -351,8 +362,11 @@ class BinaryWriterExImpl implements BinaryWriterEx {
out.write(val, off, len);
}
- /** {@inheritDoc} */
- @Override public void writeBinaryArray(BinaryArray val) throws
BinaryObjectException {
+ /**
+ * @param val Array wrapper.
+ * @throws BinaryObjectException In case of error.
+ */
+ private void writeBinaryArray(BinaryArray val) {
if (val.array() == null)
out.writeByte(GridBinaryMarshaller.NULL);
else {
@@ -376,8 +390,8 @@ class BinaryWriterExImpl implements BinaryWriterEx {
}
}
- /** {@inheritDoc} */
- @Override public void writeBinaryEnum(BinaryObjectEx val) {
+ /** @param val Value. */
+ private void writeBinaryEnum(BinaryObjectEx val) {
assert val instanceof BinaryEnumObjectImpl;
int typeId = val.typeId();
@@ -401,8 +415,8 @@ class BinaryWriterExImpl implements BinaryWriterEx {
}
}
- /** {@inheritDoc} */
- @Override public void writeProxy(Proxy proxy, Class<?>[] intfs) {
+ /** @param proxy Proxy. */
+ private void writeProxy(Proxy proxy, Class<?>[] intfs) {
if (proxy == null)
out.writeByte(GridBinaryMarshaller.NULL);
else {
@@ -431,8 +445,8 @@ class BinaryWriterExImpl implements BinaryWriterEx {
}
}
- /** {@inheritDoc} */
- @Override public void writeByteFieldPrimitive(byte val) {
+ /** @param val Value. */
+ private void writeByteFieldPrimitive(byte val) {
out.unsafeEnsure(1 + 1);
out.unsafeWriteByte(GridBinaryMarshaller.BYTE);
@@ -449,8 +463,8 @@ class BinaryWriterExImpl implements BinaryWriterEx {
writeByteFieldPrimitive(val);
}
- /** {@inheritDoc} */
- @Override public void writeClass(@Nullable Class val) {
+ /** @param val Class. */
+ private void writeClass(@Nullable Class val) {
if (val == null)
out.writeByte(GridBinaryMarshaller.NULL);
else {
@@ -470,8 +484,8 @@ class BinaryWriterExImpl implements BinaryWriterEx {
}
}
- /** {@inheritDoc} */
- @Override public void writeShortFieldPrimitive(short val) {
+ /** @param val Value. */
+ private void writeShortFieldPrimitive(short val) {
out.unsafeEnsure(1 + 2);
out.unsafeWriteByte(GridBinaryMarshaller.SHORT);
@@ -488,8 +502,8 @@ class BinaryWriterExImpl implements BinaryWriterEx {
writeShortFieldPrimitive(val);
}
- /** {@inheritDoc} */
- @Override public void writeIntFieldPrimitive(int val) {
+ /** @param val Value. */
+ private void writeIntFieldPrimitive(int val) {
out.unsafeEnsure(1 + 4);
out.unsafeWriteByte(GridBinaryMarshaller.INT);
@@ -506,8 +520,8 @@ class BinaryWriterExImpl implements BinaryWriterEx {
writeIntFieldPrimitive(val);
}
- /** {@inheritDoc} */
- @Override public void writeLongFieldPrimitive(long val) {
+ /** @param val Value. */
+ private void writeLongFieldPrimitive(long val) {
out.unsafeEnsure(1 + 8);
out.unsafeWriteByte(GridBinaryMarshaller.LONG);
@@ -524,8 +538,8 @@ class BinaryWriterExImpl implements BinaryWriterEx {
writeLongFieldPrimitive(val);
}
- /** {@inheritDoc} */
- @Override public void writeFloatFieldPrimitive(float val) {
+ /** @param val Value. */
+ private void writeFloatFieldPrimitive(float val) {
out.unsafeEnsure(1 + 4);
out.unsafeWriteByte(GridBinaryMarshaller.FLOAT);
@@ -542,8 +556,8 @@ class BinaryWriterExImpl implements BinaryWriterEx {
writeFloatFieldPrimitive(val);
}
- /** {@inheritDoc} */
- @Override public void writeDoubleFieldPrimitive(double val) {
+ /** @param val Value. */
+ private void writeDoubleFieldPrimitive(double val) {
out.unsafeEnsure(1 + 8);
out.unsafeWriteByte(GridBinaryMarshaller.DOUBLE);
@@ -560,8 +574,8 @@ class BinaryWriterExImpl implements BinaryWriterEx {
writeDoubleFieldPrimitive(val);
}
- /** {@inheritDoc} */
- @Override public void writeCharFieldPrimitive(char val) {
+ /** @param val Value. */
+ private void writeCharFieldPrimitive(char val) {
out.unsafeEnsure(1 + 2);
out.unsafeWriteByte(GridBinaryMarshaller.CHAR);
@@ -578,8 +592,8 @@ class BinaryWriterExImpl implements BinaryWriterEx {
writeCharFieldPrimitive(val);
}
- /** {@inheritDoc} */
- @Override public void writeBooleanFieldPrimitive(boolean val) {
+ /** @param val Value. */
+ private void writeBooleanFieldPrimitive(boolean val) {
out.unsafeEnsure(1 + 1);
out.unsafeWriteByte(GridBinaryMarshaller.BOOLEAN);
@@ -596,8 +610,11 @@ class BinaryWriterExImpl implements BinaryWriterEx {
writeBooleanFieldPrimitive(val);
}
- /** {@inheritDoc} */
- @Override public void writeBinaryObject(@Nullable BinaryObjectEx po)
throws BinaryObjectException {
+ /**
+ * @param po Binary object.
+ * @throws org.apache.ignite.binary.BinaryObjectException In case of error.
+ */
+ public void writeBinaryObject(@Nullable BinaryObjectEx po) throws
BinaryObjectException {
if (po == null)
out.writeByte(GridBinaryMarshaller.NULL);
else {
@@ -1290,8 +1307,8 @@ class BinaryWriterExImpl implements BinaryWriterEx {
doWriteEnumArray(val);
}
- /** {@inheritDoc} */
- @Override public void doWriteEnumArray(@Nullable Object[] val) {
+ /** @param val Array. */
+ private void doWriteEnumArray(@Nullable Object[] val) {
assert val == null || val.getClass().getComponentType().isEnum();
if (val == null)
@@ -1419,8 +1436,11 @@ class BinaryWriterExImpl implements BinaryWriterEx {
writeFieldId(id);
}
- /** {@inheritDoc} */
- @Override public void writeFieldId(int fieldId) {
+ /**
+ * Write field ID.
+ * @param fieldId Field ID.
+ */
+ public void writeFieldId(int fieldId) {
int fieldOff = out.position() - start;
// Advance schema hash.
@@ -1445,8 +1465,21 @@ class BinaryWriterExImpl implements BinaryWriterEx {
fieldCnt++;
}
- /** {@inheritDoc} */
- @Override public int writeByteArray(InputStream in, int limit) throws
BinaryObjectException {
+ /**
+ * Write byte array from the InputStream.
+ *
+ * <p>If {@code limit} > 0 than no more than {@code limit} bytes will be
read and written.
+ * If {@code limit} == -1 than it will try to read and write all bytes.
+ *
+ * <p>In any case if actual number of bytes is greater than {@code
MAX_ARRAY_SIZE}
+ * than exception will be thrown.
+ *
+ * @param in InputStream.
+ * @param limit Max length of data to be read from the stream or -1 if all
data should be read.
+ * @return Number of bytes written.
+ * @throws BinaryObjectException If an I/O error occurs or stream contains
more than {@code MAX_ARRAY_SIZE} bytes.
+ */
+ private int writeByteArray(InputStream in, int limit) throws
BinaryObjectException {
if (limit != -1)
out.unsafeEnsure(1 + 4 + limit);
else
@@ -1491,11 +1524,6 @@ class BinaryWriterExImpl implements BinaryWriterEx {
return written;
}
- /** {@inheritDoc} */
- @Override public void schemaId(int schemaId) {
- this.schemaId = schemaId;
- }
-
/** {@inheritDoc} */
@Override public int schemaId() {
return schemaId;
@@ -1524,8 +1552,13 @@ class BinaryWriterExImpl implements BinaryWriterEx {
return handles;
}
- /** {@inheritDoc} */
- @Override public boolean tryWriteAsHandle(Object obj) {
+ /**
+ * Attempts to write the object as a handle.
+ *
+ * @param obj Object to write.
+ * @return {@code true} if the object has been written as a handle.
+ */
+ private boolean tryWriteAsHandle(Object obj) {
assert obj != null;
int pos = out.position();
@@ -1546,9 +1579,18 @@ class BinaryWriterExImpl implements BinaryWriterEx {
}
}
- /** {@inheritDoc} */
- @Override public BinaryWriterEx newWriter(int typeId) {
- return new BinaryWriterExImpl(ctx, out, schema, handles(),
failIfUnregistered, typeId);
+ /**
+ * Create new writer with same context.
+ *
+ * @param typeId type
+ * @return New writer.
+ */
+ public BinaryWriterExImpl newWriter(int typeId) {
+ BinaryWriterExImpl res = new BinaryWriterExImpl(ctx, out, schema,
failIfUnregistered, typeId);
+
+ res.handles = handles();
+
+ return res;
}
/** {@inheritDoc} */
@@ -1569,8 +1611,14 @@ class BinaryWriterExImpl implements BinaryWriterEx {
this.handles = null;
}
- /** {@inheritDoc} */
- @Override public void writeField(Object obj, BinaryFieldDescriptor fld)
throws BinaryObjectException {
+ /**
+ * Write field.
+ *
+ * @param obj Object.
+ * @param fld Field.
+ * @throws BinaryObjectException If failed.
+ */
+ private void writeField(Object obj, BinaryFieldDescriptor fld) throws
BinaryObjectException {
writeFieldIdNoSchemaUpdate(fld.id);
switch (fld.mode) {
@@ -1852,6 +1900,264 @@ class BinaryWriterExImpl implements BinaryWriterEx {
}
}
+ /** {@inheritDoc} */
+ @Override public void writeJdbcObject(@Nullable Object obj, boolean
binObjAllow) throws BinaryObjectException {
+ if (obj == null) {
+ writeByte(GridBinaryMarshaller.NULL);
+
+ return;
+ }
+
+ Class<?> cls = obj.getClass();
+
+ if (cls == Boolean.class)
+ writeBooleanFieldPrimitive((Boolean)obj);
+ else if (cls == Byte.class)
+ writeByteFieldPrimitive((Byte)obj);
+ else if (cls == Character.class)
+ writeCharFieldPrimitive((Character)obj);
+ else if (cls == Short.class)
+ writeShortFieldPrimitive((Short)obj);
+ else if (cls == Integer.class)
+ writeIntFieldPrimitive((Integer)obj);
+ else if (cls == Long.class)
+ writeLongFieldPrimitive((Long)obj);
+ else if (cls == Float.class)
+ writeFloatFieldPrimitive((Float)obj);
+ else if (cls == Double.class)
+ writeDoubleFieldPrimitive((Double)obj);
+ else if (cls == String.class)
+ writeString((String)obj);
+ else if (cls == BigDecimal.class)
+ writeDecimal((BigDecimal)obj);
+ else if (cls == UUID.class)
+ writeUuid((UUID)obj);
+ else if (cls == Time.class)
+ writeTime((Time)obj);
+ else if (cls == Timestamp.class)
+ writeTimestamp((Timestamp)obj);
+ else if (cls == java.sql.Date.class || cls == java.util.Date.class)
+ writeDate((java.util.Date)obj);
+ else if (cls == boolean[].class)
+ writeBooleanArray((boolean[])obj);
+ else if (cls == byte[].class)
+ writeByteArray((byte[])obj);
+ else if (cls == char[].class)
+ writeCharArray((char[])obj);
+ else if (cls == short[].class)
+ writeShortArray((short[])obj);
+ else if (cls == int[].class)
+ writeIntArray((int[])obj);
+ else if (cls == long[].class)
+ writeLongArray((long[])obj);
+ else if (cls == float[].class)
+ writeFloatArray((float[])obj);
+ else if (cls == double[].class)
+ writeDoubleArray((double[])obj);
+ else if (cls == String[].class)
+ writeStringArray((String[])obj);
+ else if (cls == BigDecimal[].class)
+ writeDecimalArray((BigDecimal[])obj);
+ else if (cls == UUID[].class)
+ writeUuidArray((UUID[])obj);
+ else if (cls == Time[].class)
+ writeTimeArray((Time[])obj);
+ else if (cls == Timestamp[].class)
+ writeTimestampArray((Timestamp[])obj);
+ else if (cls == java.util.Date[].class || cls == java.sql.Date[].class)
+ writeDateArray((java.util.Date[])obj);
+ else if (obj instanceof SqlInputStreamWrapper wrapper) {
+ int written = writeByteArray(wrapper.inputStream(),
wrapper.length());
+
+ if (wrapper.length() != -1 && wrapper.length() != written) {
+ throw new BinaryObjectException("Input stream length mismatch.
[declaredLength=" + wrapper.length() + ", " +
+ "actualLength=" + written + "]");
+ }
+ }
+ else if (obj instanceof Blob blob) {
+ try {
+ int written = writeByteArray(blob.getBinaryStream(),
(int)blob.length());
+
+ if ((int)blob.length() != written) {
+ throw new BinaryObjectException("Blob length mismatch.
[declaredLength=" + (int)blob.length() + ", " +
+ "actualLength=" + written + "]");
+ }
+ }
+ catch (SQLException e) {
+ throw new BinaryObjectException(e);
+ }
+ }
+ else if (binObjAllow)
+ writeObjectDetached(obj);
+ else
+ throw new BinaryObjectException("Custom objects are not
supported");
+ }
+
+ /**
+ * Write value with flag. e.g. writePlainObject(writer, (byte)77) will
write two byte: {BYTE, 77}.
+ *
+ * @param val Value.
+ */
+ public void writePlainObject(Object val) {
+ Byte flag = PLAIN_CLASS_TO_FLAG.get(val.getClass());
+
+ if (flag == null)
+ throw new IllegalArgumentException("Can't write object with type:
" + val.getClass());
+
+ switch (flag) {
+ case GridBinaryMarshaller.BYTE:
+ writeByte(flag);
+ writeByte((Byte)val);
+
+ break;
+
+ case GridBinaryMarshaller.SHORT:
+ writeByte(flag);
+ writeShort((Short)val);
+
+ break;
+
+ case GridBinaryMarshaller.INT:
+ writeByte(flag);
+ writeInt((Integer)val);
+
+ break;
+
+ case GridBinaryMarshaller.LONG:
+ writeByte(flag);
+ writeLong((Long)val);
+
+ break;
+
+ case GridBinaryMarshaller.FLOAT:
+ writeByte(flag);
+ writeFloat((Float)val);
+
+ break;
+
+ case GridBinaryMarshaller.DOUBLE:
+ writeByte(flag);
+ writeDouble((Double)val);
+
+ break;
+
+ case GridBinaryMarshaller.CHAR:
+ writeByte(flag);
+ writeChar((Character)val);
+
+ break;
+
+ case GridBinaryMarshaller.BOOLEAN:
+ writeByte(flag);
+ writeBoolean((Boolean)val);
+
+ break;
+
+ case GridBinaryMarshaller.DECIMAL:
+ writeDecimal((BigDecimal)val);
+
+ break;
+
+ case GridBinaryMarshaller.STRING:
+ writeString((String)val);
+
+ break;
+
+ case GridBinaryMarshaller.UUID:
+ writeUuid((UUID)val);
+
+ break;
+
+ case GridBinaryMarshaller.DATE:
+ writeDate((Date)val);
+
+ break;
+
+ case GridBinaryMarshaller.TIMESTAMP:
+ writeTimestamp((Timestamp)val);
+
+ break;
+
+ case GridBinaryMarshaller.TIME:
+ writeTime((Time)val);
+
+ break;
+
+ case GridBinaryMarshaller.BYTE_ARR:
+ writeByteArray((byte[])val);
+
+ break;
+
+ case GridBinaryMarshaller.SHORT_ARR:
+ writeShortArray((short[])val);
+
+ break;
+
+ case GridBinaryMarshaller.INT_ARR:
+ writeIntArray((int[])val);
+
+ break;
+
+ case GridBinaryMarshaller.LONG_ARR:
+ writeLongArray((long[])val);
+
+ break;
+
+ case GridBinaryMarshaller.FLOAT_ARR:
+ writeFloatArray((float[])val);
+
+ break;
+
+ case GridBinaryMarshaller.DOUBLE_ARR:
+ writeDoubleArray((double[])val);
+
+ break;
+
+ case GridBinaryMarshaller.CHAR_ARR:
+ writeCharArray((char[])val);
+
+ break;
+
+ case GridBinaryMarshaller.BOOLEAN_ARR:
+ writeBooleanArray((boolean[])val);
+
+ break;
+
+ case GridBinaryMarshaller.DECIMAL_ARR:
+ writeDecimalArray((BigDecimal[])val);
+
+ break;
+
+ case GridBinaryMarshaller.STRING_ARR:
+ writeStringArray((String[])val);
+
+ break;
+
+ case GridBinaryMarshaller.UUID_ARR:
+ writeUuidArray((UUID[])val);
+
+ break;
+
+ case GridBinaryMarshaller.DATE_ARR:
+ writeDateArray((Date[])val);
+
+ break;
+
+ case GridBinaryMarshaller.TIMESTAMP_ARR:
+ writeTimestampArray((Timestamp[])val);
+
+ break;
+
+ case GridBinaryMarshaller.TIME_ARR:
+ writeTimeArray((Time[])val);
+
+ break;
+
+ default:
+ throw new IllegalArgumentException("Can't write object with
type: " + val.getClass());
+ }
+ }
+
/**
* @param fld Field.
* @param val Val to get write mode for.
@@ -2150,7 +2456,7 @@ class BinaryWriterExImpl implements BinaryWriterEx {
}
}
- schemaId(desc.stableSchema.schemaId());
+ schemaId = desc.stableSchema.schemaId();
postWrite(desc.userType, desc.registered);
postWriteHashCode(obj, desc);
diff --git
a/modules/binary/impl/src/main/java/org/apache/ignite/internal/binary/builder/BinaryBuilderEnum.java
b/modules/binary/impl/src/main/java/org/apache/ignite/internal/binary/builder/BinaryBuilderEnum.java
index ee60218d0b1..e74f21a524e 100644
---
a/modules/binary/impl/src/main/java/org/apache/ignite/internal/binary/builder/BinaryBuilderEnum.java
+++
b/modules/binary/impl/src/main/java/org/apache/ignite/internal/binary/builder/BinaryBuilderEnum.java
@@ -18,7 +18,7 @@
package org.apache.ignite.internal.binary.builder;
import org.apache.ignite.binary.BinaryInvalidTypeException;
-import org.apache.ignite.internal.binary.BinaryWriterEx;
+import org.apache.ignite.internal.binary.BinaryWriterExImpl;
import org.apache.ignite.internal.binary.GridBinaryMarshaller;
import org.apache.ignite.internal.marshaller.ClassLoaderUtils;
@@ -81,7 +81,7 @@ class BinaryBuilderEnum implements
BinaryBuilderSerializationAware {
}
/** {@inheritDoc} */
- @Override public void writeTo(BinaryWriterEx writer,
BinaryBuilderSerializer ctx) {
+ @Override public void writeTo(BinaryWriterExImpl writer,
BinaryBuilderSerializer ctx) {
writer.writeByte(GridBinaryMarshaller.ENUM);
if (typeId == GridBinaryMarshaller.UNREGISTERED_TYPE_ID) {
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 6f2a505f7b9..c6360be745b 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,14 +24,13 @@ 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.BinaryReaderEx;
+import org.apache.ignite.internal.binary.BinaryReaderExImpl;
import org.apache.ignite.internal.binary.BinaryUtils;
-import org.apache.ignite.internal.binary.BinaryWriterEx;
+import org.apache.ignite.internal.binary.BinaryWriterExImpl;
import org.apache.ignite.internal.binary.GridBinaryMarshaller;
import org.apache.ignite.internal.binary.streams.BinaryInputStream;
import org.apache.ignite.internal.binary.streams.BinaryStreams;
@@ -51,7 +50,7 @@ class BinaryBuilderReader implements BinaryPositionReadable {
private final byte[] arr;
/** */
- private final BinaryReaderEx reader;
+ private final BinaryReaderExImpl reader;
/** */
private final Map<Integer, Object> objMap;
@@ -69,7 +68,7 @@ class BinaryBuilderReader implements BinaryPositionReadable {
arr = objImpl.bytes();
pos = objImpl.start();
- reader = BinaryUtils.reader(ctx,
+ reader = new BinaryReaderExImpl(ctx,
BinaryStreams.inputStream(arr, pos),
ctx.classLoader(),
false);
@@ -88,10 +87,10 @@ class BinaryBuilderReader implements BinaryPositionReadable
{
this.arr = other.arr;
this.pos = start;
- reader = BinaryImplUtils.reader(ctx,
+ reader = new BinaryReaderExImpl(ctx,
BinaryStreams.inputStream(arr, start),
null,
- other.reader,
+ other.reader.handles(),
false);
this.objMap = other.objMap;
@@ -899,7 +898,7 @@ class BinaryBuilderReader implements BinaryPositionReadable
{
/**
* @return Reader.
*/
- BinaryReaderEx reader() {
+ BinaryReaderExImpl reader() {
return reader;
}
@@ -934,7 +933,7 @@ class BinaryBuilderReader implements BinaryPositionReadable
{
}
/** {@inheritDoc} */
- @Override public void writeTo(BinaryWriterEx writer,
BinaryBuilderSerializer ctx) {
+ @Override public void writeTo(BinaryWriterExImpl writer,
BinaryBuilderSerializer ctx) {
ctx.writeValue(writer, wrappedCollection());
}
diff --git
a/modules/binary/impl/src/main/java/org/apache/ignite/internal/binary/builder/BinaryBuilderSerializationAware.java
b/modules/binary/impl/src/main/java/org/apache/ignite/internal/binary/builder/BinaryBuilderSerializationAware.java
index d89651e5507..7710ba3ce9d 100644
---
a/modules/binary/impl/src/main/java/org/apache/ignite/internal/binary/builder/BinaryBuilderSerializationAware.java
+++
b/modules/binary/impl/src/main/java/org/apache/ignite/internal/binary/builder/BinaryBuilderSerializationAware.java
@@ -17,7 +17,7 @@
package org.apache.ignite.internal.binary.builder;
-import org.apache.ignite.internal.binary.BinaryWriterEx;
+import org.apache.ignite.internal.binary.BinaryWriterExImpl;
/**
*
@@ -27,5 +27,5 @@ interface BinaryBuilderSerializationAware {
* @param writer Writer.
* @param ctx Context.
*/
- public void writeTo(BinaryWriterEx writer, BinaryBuilderSerializer ctx);
+ public void writeTo(BinaryWriterExImpl writer, BinaryBuilderSerializer
ctx);
}
diff --git
a/modules/binary/impl/src/main/java/org/apache/ignite/internal/binary/builder/BinaryBuilderSerializer.java
b/modules/binary/impl/src/main/java/org/apache/ignite/internal/binary/builder/BinaryBuilderSerializer.java
index f2e1926a30d..1184e2453c0 100644
---
a/modules/binary/impl/src/main/java/org/apache/ignite/internal/binary/builder/BinaryBuilderSerializer.java
+++
b/modules/binary/impl/src/main/java/org/apache/ignite/internal/binary/builder/BinaryBuilderSerializer.java
@@ -25,7 +25,7 @@ import org.apache.ignite.internal.binary.BinariesFactoryImpl;
import org.apache.ignite.internal.binary.BinaryImplUtils;
import org.apache.ignite.internal.binary.BinaryObjectEx;
import org.apache.ignite.internal.binary.BinaryUtils;
-import org.apache.ignite.internal.binary.BinaryWriterEx;
+import org.apache.ignite.internal.binary.BinaryWriterExImpl;
import org.apache.ignite.internal.binary.GridBinaryMarshaller;
import org.apache.ignite.internal.util.CommonUtils;
@@ -51,7 +51,7 @@ class BinaryBuilderSerializer {
* @param writer Writer.
* @param val Value.
*/
- public void writeValue(BinaryWriterEx writer, Object val) {
+ public void writeValue(BinaryWriterExImpl writer, Object val) {
writeValue(writer, val, false, false);
}
@@ -61,7 +61,7 @@ class BinaryBuilderSerializer {
* @param forceCol Whether to force collection type.
* @param forceMap Whether to force map type.
*/
- public void writeValue(BinaryWriterEx writer, Object val, boolean
forceCol, boolean forceMap) {
+ public void writeValue(BinaryWriterExImpl writer, Object val, boolean
forceCol, boolean forceMap) {
assert !(forceCol && forceMap);
if (val == null) {
@@ -175,7 +175,7 @@ class BinaryBuilderSerializer {
Byte flag = BinaryUtils.PLAIN_CLASS_TO_FLAG.get(val.getClass());
if (flag != null) {
- BinaryImplUtils.writePlainObject(writer, val);
+ writer.writePlainObject(val);
return;
}
@@ -242,7 +242,7 @@ class BinaryBuilderSerializer {
* @param arr The array.
* @param compTypeId Component type ID.
*/
- public void writeArray(BinaryWriterEx writer, byte elementType, Object[]
arr, int compTypeId) {
+ public void writeArray(BinaryWriterExImpl writer, byte elementType,
Object[] arr, int compTypeId) {
writer.writeByte(elementType);
writer.writeInt(compTypeId);
writer.writeInt(arr.length);
@@ -257,7 +257,7 @@ class BinaryBuilderSerializer {
* @param arr The array.
* @param clsName Component class name.
*/
- public void writeArray(BinaryWriterEx writer, byte elementType, Object[]
arr, String clsName) {
+ public void writeArray(BinaryWriterExImpl writer, byte elementType,
Object[] arr, String clsName) {
writer.writeByte(elementType);
writer.writeInt(GridBinaryMarshaller.UNREGISTERED_TYPE_ID);
writer.writeString(clsName);
diff --git
a/modules/binary/impl/src/main/java/org/apache/ignite/internal/binary/builder/BinaryEnumArrayLazyValue.java
b/modules/binary/impl/src/main/java/org/apache/ignite/internal/binary/builder/BinaryEnumArrayLazyValue.java
index 630ca685e80..53de9acfbf5 100644
---
a/modules/binary/impl/src/main/java/org/apache/ignite/internal/binary/builder/BinaryEnumArrayLazyValue.java
+++
b/modules/binary/impl/src/main/java/org/apache/ignite/internal/binary/builder/BinaryEnumArrayLazyValue.java
@@ -19,7 +19,7 @@ package org.apache.ignite.internal.binary.builder;
import org.apache.ignite.binary.BinaryInvalidTypeException;
import org.apache.ignite.binary.BinaryObjectException;
-import org.apache.ignite.internal.binary.BinaryWriterEx;
+import org.apache.ignite.internal.binary.BinaryWriterExImpl;
import org.apache.ignite.internal.binary.GridBinaryMarshaller;
import org.apache.ignite.internal.marshaller.ClassLoaderUtils;
@@ -98,7 +98,7 @@ class BinaryEnumArrayLazyValue extends
BinaryAbstractLazyValue {
}
/** {@inheritDoc} */
- @Override public void writeTo(BinaryWriterEx writer,
BinaryBuilderSerializer ctx) {
+ @Override public void writeTo(BinaryWriterExImpl writer,
BinaryBuilderSerializer ctx) {
if (val != null) {
if (clsName != null)
ctx.writeArray(writer, GridBinaryMarshaller.ENUM_ARR,
(Object[])val, clsName);
diff --git
a/modules/binary/impl/src/main/java/org/apache/ignite/internal/binary/builder/BinaryLazyArrayList.java
b/modules/binary/impl/src/main/java/org/apache/ignite/internal/binary/builder/BinaryLazyArrayList.java
index 1e7cdfe4af3..78815478564 100644
---
a/modules/binary/impl/src/main/java/org/apache/ignite/internal/binary/builder/BinaryLazyArrayList.java
+++
b/modules/binary/impl/src/main/java/org/apache/ignite/internal/binary/builder/BinaryLazyArrayList.java
@@ -21,7 +21,7 @@ import java.util.AbstractList;
import java.util.ArrayList;
import java.util.Collection;
import java.util.List;
-import org.apache.ignite.internal.binary.BinaryWriterEx;
+import org.apache.ignite.internal.binary.BinaryWriterExImpl;
import org.apache.ignite.internal.binary.GridBinaryMarshaller;
import static
org.apache.ignite.internal.binary.builder.BinaryObjectBuildersFactoryImpl.unwrapLazy;
@@ -133,7 +133,7 @@ class BinaryLazyArrayList extends AbstractList<Object>
implements BinaryBuilderS
}
/** {@inheritDoc} */
- @Override public void writeTo(BinaryWriterEx writer,
BinaryBuilderSerializer ctx) {
+ @Override public void writeTo(BinaryWriterExImpl writer,
BinaryBuilderSerializer ctx) {
if (delegate == null) {
int size = reader.readIntPositioned(off + 1);
diff --git
a/modules/binary/impl/src/main/java/org/apache/ignite/internal/binary/builder/BinaryLazyLinkedList.java
b/modules/binary/impl/src/main/java/org/apache/ignite/internal/binary/builder/BinaryLazyLinkedList.java
index c6b4a7f8531..8a1284bbada 100644
---
a/modules/binary/impl/src/main/java/org/apache/ignite/internal/binary/builder/BinaryLazyLinkedList.java
+++
b/modules/binary/impl/src/main/java/org/apache/ignite/internal/binary/builder/BinaryLazyLinkedList.java
@@ -23,7 +23,7 @@ import java.util.Iterator;
import java.util.LinkedList;
import java.util.List;
import java.util.ListIterator;
-import org.apache.ignite.internal.binary.BinaryWriterEx;
+import org.apache.ignite.internal.binary.BinaryWriterExImpl;
import org.apache.ignite.internal.binary.GridBinaryMarshaller;
import static
org.apache.ignite.internal.binary.builder.BinaryObjectBuildersFactoryImpl.unwrapLazy;
@@ -191,7 +191,7 @@ class BinaryLazyLinkedList extends AbstractList<Object>
implements BinaryBuilder
}
/** {@inheritDoc} */
- @Override public void writeTo(BinaryWriterEx writer,
BinaryBuilderSerializer ctx) {
+ @Override public void writeTo(BinaryWriterExImpl writer,
BinaryBuilderSerializer ctx) {
if (delegate == null) {
int size = reader.readIntPositioned(off + 1);
diff --git
a/modules/binary/impl/src/main/java/org/apache/ignite/internal/binary/builder/BinaryLazyMap.java
b/modules/binary/impl/src/main/java/org/apache/ignite/internal/binary/builder/BinaryLazyMap.java
index 4214f10daca..8bfa2e65912 100644
---
a/modules/binary/impl/src/main/java/org/apache/ignite/internal/binary/builder/BinaryLazyMap.java
+++
b/modules/binary/impl/src/main/java/org/apache/ignite/internal/binary/builder/BinaryLazyMap.java
@@ -23,7 +23,7 @@ import java.util.Iterator;
import java.util.LinkedHashMap;
import java.util.Map;
import java.util.Set;
-import org.apache.ignite.internal.binary.BinaryWriterEx;
+import org.apache.ignite.internal.binary.BinaryWriterExImpl;
import org.apache.ignite.internal.binary.GridBinaryMarshaller;
import org.jetbrains.annotations.Nullable;
@@ -87,7 +87,7 @@ class BinaryLazyMap extends AbstractMap<Object, Object>
implements BinaryBuilder
}
/** {@inheritDoc} */
- @Override public void writeTo(BinaryWriterEx writer,
BinaryBuilderSerializer ctx) {
+ @Override public void writeTo(BinaryWriterExImpl writer,
BinaryBuilderSerializer ctx) {
if (delegate == null) {
int size = reader.readIntPositioned(off + 1);
diff --git
a/modules/binary/impl/src/main/java/org/apache/ignite/internal/binary/builder/BinaryLazySet.java
b/modules/binary/impl/src/main/java/org/apache/ignite/internal/binary/builder/BinaryLazySet.java
index d4a1c8c06d9..d497194e3fa 100644
---
a/modules/binary/impl/src/main/java/org/apache/ignite/internal/binary/builder/BinaryLazySet.java
+++
b/modules/binary/impl/src/main/java/org/apache/ignite/internal/binary/builder/BinaryLazySet.java
@@ -19,7 +19,7 @@ package org.apache.ignite.internal.binary.builder;
import java.util.Collection;
import java.util.Set;
-import org.apache.ignite.internal.binary.BinaryWriterEx;
+import org.apache.ignite.internal.binary.BinaryWriterExImpl;
import org.apache.ignite.internal.binary.GridBinaryMarshaller;
import org.apache.ignite.internal.util.CommonUtils;
@@ -48,7 +48,7 @@ class BinaryLazySet extends BinaryAbstractLazyValue {
}
/** {@inheritDoc} */
- @Override public void writeTo(BinaryWriterEx writer,
BinaryBuilderSerializer ctx) {
+ @Override public void writeTo(BinaryWriterExImpl writer,
BinaryBuilderSerializer ctx) {
if (val == null) {
int size = reader.readIntPositioned(off + 1);
diff --git
a/modules/binary/impl/src/main/java/org/apache/ignite/internal/binary/builder/BinaryModifiableLazyValue.java
b/modules/binary/impl/src/main/java/org/apache/ignite/internal/binary/builder/BinaryModifiableLazyValue.java
index 0fac41bb6cc..9eaa65ca5bb 100644
---
a/modules/binary/impl/src/main/java/org/apache/ignite/internal/binary/builder/BinaryModifiableLazyValue.java
+++
b/modules/binary/impl/src/main/java/org/apache/ignite/internal/binary/builder/BinaryModifiableLazyValue.java
@@ -17,7 +17,7 @@
package org.apache.ignite.internal.binary.builder;
-import org.apache.ignite.internal.binary.BinaryWriterEx;
+import org.apache.ignite.internal.binary.BinaryWriterExImpl;
/**
*
@@ -43,7 +43,7 @@ class BinaryModifiableLazyValue extends
BinaryAbstractLazyValue {
}
/** {@inheritDoc} */
- @Override public void writeTo(BinaryWriterEx writer,
BinaryBuilderSerializer ctx) {
+ @Override public void writeTo(BinaryWriterExImpl writer,
BinaryBuilderSerializer ctx) {
if (val == null)
writer.write(reader.array(), valOff, len);
else
diff --git
a/modules/binary/impl/src/main/java/org/apache/ignite/internal/binary/builder/BinaryObjectArrayLazyValue.java
b/modules/binary/impl/src/main/java/org/apache/ignite/internal/binary/builder/BinaryObjectArrayLazyValue.java
index 008face8a81..4a19041de3f 100644
---
a/modules/binary/impl/src/main/java/org/apache/ignite/internal/binary/builder/BinaryObjectArrayLazyValue.java
+++
b/modules/binary/impl/src/main/java/org/apache/ignite/internal/binary/builder/BinaryObjectArrayLazyValue.java
@@ -18,7 +18,7 @@
package org.apache.ignite.internal.binary.builder;
import org.apache.ignite.binary.BinaryInvalidTypeException;
-import org.apache.ignite.internal.binary.BinaryWriterEx;
+import org.apache.ignite.internal.binary.BinaryWriterExImpl;
import org.apache.ignite.internal.binary.GridBinaryMarshaller;
import org.apache.ignite.internal.marshaller.ClassLoaderUtils;
@@ -81,7 +81,7 @@ class BinaryObjectArrayLazyValue extends
BinaryAbstractLazyValue {
}
/** {@inheritDoc} */
- @Override public void writeTo(BinaryWriterEx writer,
BinaryBuilderSerializer ctx) {
+ @Override public void writeTo(BinaryWriterExImpl writer,
BinaryBuilderSerializer ctx) {
if (clsName == null)
ctx.writeArray(writer, GridBinaryMarshaller.OBJ_ARR, lazyValsArr,
compTypeId);
else
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 33d372f3741..3b4451ec861 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
@@ -37,7 +37,7 @@ 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.BinaryUtils;
-import org.apache.ignite.internal.binary.BinaryWriterEx;
+import org.apache.ignite.internal.binary.BinaryWriterExImpl;
import org.apache.ignite.internal.binary.GridBinaryMarshaller;
import org.apache.ignite.internal.marshaller.ClassLoaderUtils;
import org.apache.ignite.internal.util.CommonUtils;
@@ -177,7 +177,7 @@ class BinaryObjectBuilderImpl implements
BinaryObjectBuilderEx {
@Override public BinaryObject build() {
Thread curThread = Thread.currentThread();
- try (BinaryWriterEx writer = BinaryUtils.writer(
+ try (BinaryWriterExImpl writer = BinariesFactoryImpl.newWriter(
ctx,
curThread instanceof IgniteThread &&
((IgniteThread)curThread).isForbiddenToRequestBinaryMetadata(),
typeId)
@@ -188,7 +188,7 @@ class BinaryObjectBuilderImpl implements
BinaryObjectBuilderEx {
serializeTo(writer, serializationCtx);
- byte[] arr = writer.array();
+ byte[] arr = writer.out().arrayCopy();
return new BinaryObjectImpl(ctx, arr, 0);
}
@@ -198,7 +198,7 @@ class BinaryObjectBuilderImpl implements
BinaryObjectBuilderEx {
* @param writer Writer.
* @param serializer Serializer.
*/
- void serializeTo(BinaryWriterEx writer, BinaryBuilderSerializer
serializer) {
+ void serializeTo(BinaryWriterExImpl writer, BinaryBuilderSerializer
serializer) {
try {
writer.preWrite(registeredType ? null : clsNameToWrite);
@@ -249,7 +249,7 @@ class BinaryObjectBuilderImpl implements
BinaryObjectBuilderEx {
int idx = 0;
while (reader.position() < rawPos) {
- int fieldId = BinaryImplUtils.fieldId(reader.reader(),
idx++);
+ int fieldId =
reader.reader().getOrCreateSchema().fieldId(idx++);
int fieldLen =
fieldPositionAndLength(footerPos, footerEnd, rawPos,
fieldIdLen, fieldOffsetLen).get2();
@@ -475,7 +475,7 @@ class BinaryObjectBuilderImpl implements
BinaryObjectBuilderEx {
int idx = 0;
while (footerPos + fieldIdLen < footerEnd) {
- int fieldId = BinaryImplUtils.fieldId(reader.reader(), idx++);
+ int fieldId =
reader.reader().getOrCreateSchema().fieldId(idx++);
IgniteBiTuple<Integer, Integer> posAndLen =
fieldPositionAndLength(footerPos, footerEnd, rawPos,
fieldIdLen, fieldOffsetLen);
diff --git
a/modules/binary/impl/src/main/java/org/apache/ignite/internal/binary/builder/BinaryPlainBinaryObject.java
b/modules/binary/impl/src/main/java/org/apache/ignite/internal/binary/builder/BinaryPlainBinaryObject.java
index 8de3514b872..dcc67496495 100644
---
a/modules/binary/impl/src/main/java/org/apache/ignite/internal/binary/builder/BinaryPlainBinaryObject.java
+++
b/modules/binary/impl/src/main/java/org/apache/ignite/internal/binary/builder/BinaryPlainBinaryObject.java
@@ -20,7 +20,7 @@ package org.apache.ignite.internal.binary.builder;
import org.apache.ignite.binary.BinaryObject;
import org.apache.ignite.internal.binary.BinaryObjectEx;
import org.apache.ignite.internal.binary.BinaryUtils;
-import org.apache.ignite.internal.binary.BinaryWriterEx;
+import org.apache.ignite.internal.binary.BinaryWriterExImpl;
/**
*
@@ -42,7 +42,7 @@ class BinaryPlainBinaryObject implements BinaryLazyValue {
}
/** {@inheritDoc} */
- @Override public void writeTo(BinaryWriterEx writer,
BinaryBuilderSerializer ctx) {
+ @Override public void writeTo(BinaryWriterExImpl writer,
BinaryBuilderSerializer ctx) {
writer.writeBinaryObject((BinaryObjectEx)BinaryUtils.unwrapTemporary(binaryObj));
}
}
diff --git
a/modules/binary/impl/src/main/java/org/apache/ignite/internal/binary/builder/BinaryPlainLazyValue.java
b/modules/binary/impl/src/main/java/org/apache/ignite/internal/binary/builder/BinaryPlainLazyValue.java
index 56cd5bd9c94..84e96d3e9e7 100644
---
a/modules/binary/impl/src/main/java/org/apache/ignite/internal/binary/builder/BinaryPlainLazyValue.java
+++
b/modules/binary/impl/src/main/java/org/apache/ignite/internal/binary/builder/BinaryPlainLazyValue.java
@@ -17,7 +17,7 @@
package org.apache.ignite.internal.binary.builder;
-import org.apache.ignite.internal.binary.BinaryWriterEx;
+import org.apache.ignite.internal.binary.BinaryWriterExImpl;
/**
*
@@ -43,7 +43,7 @@ class BinaryPlainLazyValue extends BinaryAbstractLazyValue {
}
/** {@inheritDoc} */
- @Override public void writeTo(BinaryWriterEx writer,
BinaryBuilderSerializer ctx) {
+ @Override public void writeTo(BinaryWriterExImpl writer,
BinaryBuilderSerializer ctx) {
writer.write(reader.array(), valOff, len);
}
}
diff --git
a/modules/binary/impl/src/main/java/org/apache/ignite/internal/binary/builder/BinaryValueWithType.java
b/modules/binary/impl/src/main/java/org/apache/ignite/internal/binary/builder/BinaryValueWithType.java
index 84364c0b046..c5a3e0ad523 100644
---
a/modules/binary/impl/src/main/java/org/apache/ignite/internal/binary/builder/BinaryValueWithType.java
+++
b/modules/binary/impl/src/main/java/org/apache/ignite/internal/binary/builder/BinaryValueWithType.java
@@ -17,7 +17,7 @@
package org.apache.ignite.internal.binary.builder;
-import org.apache.ignite.internal.binary.BinaryWriterEx;
+import org.apache.ignite.internal.binary.BinaryWriterExImpl;
import org.apache.ignite.internal.binary.GridBinaryMarshaller;
import org.apache.ignite.internal.util.typedef.internal.S;
@@ -41,7 +41,7 @@ class BinaryValueWithType implements BinaryLazyValue {
}
/** {@inheritDoc} */
- @Override public void writeTo(BinaryWriterEx writer,
BinaryBuilderSerializer ctx) {
+ @Override public void writeTo(BinaryWriterExImpl writer,
BinaryBuilderSerializer ctx) {
if (val instanceof BinaryBuilderSerializationAware)
((BinaryBuilderSerializationAware)val).writeTo(writer, ctx);
else
diff --git
a/modules/binary/impl/src/main/java/org/apache/ignite/internal/binary/streams/BinaryHeapOutputStream.java
b/modules/binary/impl/src/main/java/org/apache/ignite/internal/binary/streams/BinaryHeapOutputStream.java
index 3ed5120c50d..f9618618115 100644
---
a/modules/binary/impl/src/main/java/org/apache/ignite/internal/binary/streams/BinaryHeapOutputStream.java
+++
b/modules/binary/impl/src/main/java/org/apache/ignite/internal/binary/streams/BinaryHeapOutputStream.java
@@ -24,7 +24,7 @@ import static
org.apache.ignite.internal.util.GridUnsafe.BIG_ENDIAN;
/**
* Binary heap output stream.
*/
-final class BinaryHeapOutputStream extends BinaryAbstractOutputStream {
+public final class BinaryHeapOutputStream extends BinaryAbstractOutputStream {
/** Allocator. */
private final BinaryMemoryAllocatorChunk chunk;
diff --git
a/modules/binary/impl/src/main/java/org/apache/ignite/internal/binary/streams/BinaryMemoryAllocator.java
b/modules/binary/impl/src/main/java/org/apache/ignite/internal/binary/streams/BinaryMemoryAllocator.java
index f32be3bd9fa..179ee18b3f4 100644
---
a/modules/binary/impl/src/main/java/org/apache/ignite/internal/binary/streams/BinaryMemoryAllocator.java
+++
b/modules/binary/impl/src/main/java/org/apache/ignite/internal/binary/streams/BinaryMemoryAllocator.java
@@ -29,7 +29,7 @@ import static
org.apache.ignite.internal.util.CommonUtils.DFLT_MARSHAL_BUFFERS_R
/**
* On-heap memory allocator.
*/
-abstract class BinaryMemoryAllocator {
+public abstract class BinaryMemoryAllocator {
/** Buffer size re-check frequency. */
private static final Long CHECK_FREQ =
Long.getLong(IGNITE_MARSHAL_BUFFERS_RECHECK, DFLT_MARSHAL_BUFFERS_RECHECK);
diff --git
a/modules/binary/impl/src/main/java/org/apache/ignite/internal/binary/streams/BinaryOffheapInputStream.java
b/modules/binary/impl/src/main/java/org/apache/ignite/internal/binary/streams/BinaryOffheapInputStream.java
index b01f36193ca..341a59c5f11 100644
---
a/modules/binary/impl/src/main/java/org/apache/ignite/internal/binary/streams/BinaryOffheapInputStream.java
+++
b/modules/binary/impl/src/main/java/org/apache/ignite/internal/binary/streams/BinaryOffheapInputStream.java
@@ -31,9 +31,6 @@ class BinaryOffheapInputStream extends
BinaryAbstractInputStream {
/** Capacity. */
private final int cap;
- /** */
- private final boolean forceHeap;
-
/**
* Constructor.
*
@@ -41,21 +38,8 @@ class BinaryOffheapInputStream extends
BinaryAbstractInputStream {
* @param cap Capacity.
*/
public BinaryOffheapInputStream(long ptr, int cap) {
- this(ptr, cap, false);
- }
-
- /**
- * Constructor.
- *
- * @param ptr Pointer.
- * @param cap Capacity.
- * @param forceHeap If {@code true} method {@link #offheapPointer} returns
0 and unmarshalling will
- * create heap-based objects.
- */
- public BinaryOffheapInputStream(long ptr, int cap, boolean forceHeap) {
this.ptr = ptr;
this.cap = cap;
- this.forceHeap = forceHeap;
len = cap;
}
@@ -150,7 +134,7 @@ class BinaryOffheapInputStream extends
BinaryAbstractInputStream {
/** {@inheritDoc} */
@Override public long offheapPointer() {
- return forceHeap ? 0 : ptr;
+ return ptr;
}
/** {@inheritDoc} */
diff --git
a/modules/binary/impl/src/main/java/org/apache/ignite/internal/binary/streams/BinaryStreamsFactoryImpl.java
b/modules/binary/impl/src/main/java/org/apache/ignite/internal/binary/streams/BinaryStreamsFactoryImpl.java
index 40f0b9f1113..5d8937560ea 100644
---
a/modules/binary/impl/src/main/java/org/apache/ignite/internal/binary/streams/BinaryStreamsFactoryImpl.java
+++
b/modules/binary/impl/src/main/java/org/apache/ignite/internal/binary/streams/BinaryStreamsFactoryImpl.java
@@ -45,11 +45,6 @@ public class BinaryStreamsFactoryImpl implements
BinaryStreamsFactory {
return new BinaryOffheapInputStream(ptr, cap);
}
- /** {@inheritDoc} */
- @Override public BinaryInputStream inputStream(long ptr, int cap, boolean
forceHeap) {
- return new BinaryOffheapInputStream(ptr, cap, forceHeap);
- }
-
/** {@inheritDoc} */
@Override public BinaryOutputStream createPooledOutputStream(int cap,
boolean disableAutoClose) {
return new BinaryHeapOutputStream(cap,
BinaryMemoryAllocator.POOLED.chunk(), disableAutoClose);
@@ -59,14 +54,4 @@ public class BinaryStreamsFactoryImpl implements
BinaryStreamsFactory {
@Override public BinaryOutputStream outputStream(int cap) {
return new BinaryHeapOutputStream(cap);
}
-
- /** {@inheritDoc} */
- @Override public BinaryOutputStream outputStream(int cap,
BinaryMemoryAllocatorChunk chunk) {
- return new BinaryHeapOutputStream(cap, chunk);
- }
-
- /** {@inheritDoc} */
- @Override public BinaryMemoryAllocatorChunk threadLocalChunk() {
- return BinaryMemoryAllocator.THREAD_LOCAL.chunk();
- }
}
diff --git
a/modules/core/src/main/java/org/apache/ignite/internal/jdbc/thin/JdbcThinTcpIo.java
b/modules/core/src/main/java/org/apache/ignite/internal/jdbc/thin/JdbcThinTcpIo.java
index faa6d7a5c4c..0a7fc4f2a15 100644
---
a/modules/core/src/main/java/org/apache/ignite/internal/jdbc/thin/JdbcThinTcpIo.java
+++
b/modules/core/src/main/java/org/apache/ignite/internal/jdbc/thin/JdbcThinTcpIo.java
@@ -347,7 +347,7 @@ public class JdbcThinTcpIo {
writer.writeString(connProps.getPassword());
}
- send(writer.array());
+ send(writer.out().arrayCopy());
BinaryReaderEx reader = BinaryUtils.reader(ctx,
BinaryStreams.inputStream(read()), null, false);
@@ -452,7 +452,7 @@ public class JdbcThinTcpIo {
writer.writeBoolean(connProps.isReplicatedOnly());
writer.writeBoolean(connProps.isAutoCloseServerCursor());
- send(writer.array());
+ send(writer.out().arrayCopy());
BinaryReaderEx reader = BinaryUtils.reader(null,
BinaryStreams.inputStream(read()), null, false);
@@ -593,7 +593,7 @@ public class JdbcThinTcpIo {
req.writeBinary(writer, protoCtx);
synchronized (connMux) {
- send(writer.array());
+ send(writer.out().arrayCopy());
}
}
diff --git
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/binary/CacheObjectBinaryProcessorImpl.java
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/binary/CacheObjectBinaryProcessorImpl.java
index 2e44c95fe25..f9ccc8e3eb2 100644
---
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/binary/CacheObjectBinaryProcessorImpl.java
+++
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/binary/CacheObjectBinaryProcessorImpl.java
@@ -62,8 +62,6 @@ import org.apache.ignite.internal.binary.BinaryTypeImpl;
import org.apache.ignite.internal.binary.BinaryUtils;
import org.apache.ignite.internal.binary.GridBinaryMarshaller;
import org.apache.ignite.internal.binary.builder.BinaryObjectBuilders;
-import org.apache.ignite.internal.binary.streams.BinaryInputStream;
-import org.apache.ignite.internal.binary.streams.BinaryStreams;
import org.apache.ignite.internal.processors.GridProcessorAdapter;
import
org.apache.ignite.internal.processors.cache.CacheDefaultBinaryAffinityKeyMapper;
import org.apache.ignite.internal.processors.cache.CacheObject;
@@ -87,7 +85,6 @@ import
org.apache.ignite.internal.processors.datastructures.CollocatedQueueItemK
import
org.apache.ignite.internal.processors.datastructures.CollocatedSetItemKey;
import org.apache.ignite.internal.processors.query.QueryUtils;
import org.apache.ignite.internal.systemview.BinaryMetadataViewWalker;
-import org.apache.ignite.internal.util.GridUnsafe;
import org.apache.ignite.internal.util.MutableSingletonList;
import org.apache.ignite.internal.util.future.GridFutureAdapter;
import org.apache.ignite.internal.util.lang.GridMapEntry;
@@ -264,7 +261,7 @@ public class CacheObjectBinaryProcessorImpl extends
GridProcessorAdapter impleme
transport = new BinaryMetadataTransport(metadataLocCache,
metadataFileStore, binaryCtx, ctx, log);
- binaryMarsh = new GridBinaryMarshaller(binaryCtx);
+ binaryMarsh = marsh.binaryMarshaller();
binaries = new IgniteBinaryImpl(ctx, this);
@@ -384,32 +381,6 @@ public class CacheObjectBinaryProcessorImpl extends
GridProcessorAdapter impleme
return arr;
}
- /**
- * @param ptr Off-heap pointer.
- * @param forceHeap If {@code true} creates heap-based object.
- * @return Object.
- * @throws BinaryObjectException If failed.
- */
- public Object unmarshal(long ptr, boolean forceHeap) throws
BinaryObjectException {
- assert ptr > 0 : ptr;
-
- int size = GridUnsafe.getInt(ptr);
-
- ptr += 4;
-
- byte type = GridUnsafe.getByte(ptr++);
-
- if (type != CacheObject.TYPE_BYTE_ARR) {
- assert size > 0 : size;
-
- BinaryInputStream in = BinaryStreams.inputStream(ptr, size,
forceHeap);
-
- return binaryMarsh.unmarshal(in);
- }
- else
- return GridUnsafe.copyMemory(ptr, size);
- }
-
/** {@inheritDoc} */
@Override public Object marshalToBinary(
@Nullable Object obj,
diff --git
a/modules/core/src/main/java/org/apache/ignite/internal/processors/odbc/ClientListenerNioListener.java
b/modules/core/src/main/java/org/apache/ignite/internal/processors/odbc/ClientListenerNioListener.java
index b72125fad26..7bc2f4cdb15 100644
---
a/modules/core/src/main/java/org/apache/ignite/internal/processors/odbc/ClientListenerNioListener.java
+++
b/modules/core/src/main/java/org/apache/ignite/internal/processors/odbc/ClientListenerNioListener.java
@@ -458,7 +458,7 @@ public class ClientListenerNioListener extends
GridNioServerListenerAdapter<Clie
}
}
- ses.send(new ClientMessage(writer.array()));
+ ses.send(new ClientMessage(writer.out().arrayCopy()));
}
/**
diff --git
a/modules/core/src/main/java/org/apache/ignite/internal/processors/odbc/SqlListenerUtils.java
b/modules/core/src/main/java/org/apache/ignite/internal/processors/odbc/SqlListenerUtils.java
index 86b0697d664..2fdee612fd1 100644
---
a/modules/core/src/main/java/org/apache/ignite/internal/processors/odbc/SqlListenerUtils.java
+++
b/modules/core/src/main/java/org/apache/ignite/internal/processors/odbc/SqlListenerUtils.java
@@ -19,15 +19,12 @@ package org.apache.ignite.internal.processors.odbc;
import java.math.BigDecimal;
import java.sql.Blob;
-import java.sql.SQLException;
import java.sql.Time;
import java.sql.Timestamp;
import java.util.UUID;
import org.apache.ignite.binary.BinaryObjectException;
import org.apache.ignite.cache.query.QueryCancelledException;
import org.apache.ignite.internal.binary.BinaryReaderEx;
-import org.apache.ignite.internal.binary.BinaryUtils;
-import org.apache.ignite.internal.binary.BinaryWriterEx;
import org.apache.ignite.internal.binary.GridBinaryMarshaller;
import org.apache.ignite.internal.jdbc2.JdbcBinaryBuffer;
import org.apache.ignite.internal.processors.cache.query.IgniteQueryErrorCode;
@@ -59,25 +56,10 @@ public abstract class SqlListenerUtils {
*/
@Nullable public static Object readObject(BinaryReaderEx reader, boolean
binObjAllow, boolean keepBinary)
throws BinaryObjectException {
- byte type = reader.readByte();
-
- return readObject(type, reader, binObjAllow, keepBinary);
- }
-
- /**
- * @param type Object type.
- * @param reader Reader.
- * @param binObjAllow Allow to read non plaint objects.
- * @return Read object.
- * @throws BinaryObjectException On error.
- */
- @Nullable public static Object readObject(byte type, BinaryReaderEx
reader, boolean binObjAllow,
- boolean keepBinary) throws
BinaryObjectException {
- return readObject(type, reader, binObjAllow, keepBinary, true);
+ return readObject(reader, binObjAllow, keepBinary, true);
}
/**
- * @param type Object type.
* @param reader Reader.
* @param binObjAllow Allow to read non plaint objects.
* @param keepBinary Whether to deserialize objects or keep in binary
format.
@@ -85,149 +67,21 @@ public abstract class SqlListenerUtils {
* @return Read object.
* @throws BinaryObjectException On error.
*/
- @Nullable public static Object readObject(byte type, BinaryReaderEx
reader, boolean binObjAllow,
+ @Nullable public static Object readObject(BinaryReaderEx reader, boolean
binObjAllow,
boolean keepBinary, boolean createByteArrayCopy) throws
BinaryObjectException {
- if (type == GridBinaryMarshaller.BYTE_ARR && !createByteArrayCopy &&
reader.in().hasArray())
- return readJdbcByteArray(reader);
-
- return BinaryUtils.unmarshallJdbc(type, reader, binObjAllow,
keepBinary);
- }
-
- /**
- * Read byte array using the reader.
- *
- * <p>Returns either (eagerly) new instance of the byte array with all
data materialized,
- * or {@link JdbcBinaryBuffer} which wraps part of the array enclosed in
- * the reader's input stream in a copy-on-write manner.
- *
- * @param reader Reader.
- * @return Either byte[] or {@link JdbcBinaryBuffer}.
- */
- private static Object readJdbcByteArray(BinaryReaderEx reader) {
- int len = reader.in().readInt();
-
- int position = reader.in().position();
-
- reader.in().position(position + len);
-
- return JdbcBinaryBuffer.createReadOnly(reader.in().array(), position,
len);
- }
-
- /**
- * @param writer Writer.
- * @param obj Object to write.
- * @param binObjAllow Allow to write non plain objects.
- * @throws BinaryObjectException On error.
- */
- public static void writeObject(BinaryWriterEx writer, @Nullable Object
obj, boolean binObjAllow)
- throws BinaryObjectException {
- if (obj == null) {
- writer.writeByte(GridBinaryMarshaller.NULL);
+ byte type = reader.readByte();
- return;
- }
+ if (type == GridBinaryMarshaller.BYTE_ARR && !createByteArrayCopy &&
reader.in().hasArray()) {
+ int len = reader.in().readInt();
- Class<?> cls = obj.getClass();
+ int position = reader.in().position();
- if (cls == Boolean.class)
- writer.writeBooleanFieldPrimitive((Boolean)obj);
- else if (cls == Byte.class)
- writer.writeByteFieldPrimitive((Byte)obj);
- else if (cls == Character.class)
- writer.writeCharFieldPrimitive((Character)obj);
- else if (cls == Short.class)
- writer.writeShortFieldPrimitive((Short)obj);
- else if (cls == Integer.class)
- writer.writeIntFieldPrimitive((Integer)obj);
- else if (cls == Long.class)
- writer.writeLongFieldPrimitive((Long)obj);
- else if (cls == Float.class)
- writer.writeFloatFieldPrimitive((Float)obj);
- else if (cls == Double.class)
- writer.writeDoubleFieldPrimitive((Double)obj);
- else if (cls == String.class)
- writer.writeString((String)obj);
- else if (cls == BigDecimal.class)
- writer.writeDecimal((BigDecimal)obj);
- else if (cls == UUID.class)
- writer.writeUuid((UUID)obj);
- else if (cls == Time.class)
- writer.writeTime((Time)obj);
- else if (cls == Timestamp.class)
- writer.writeTimestamp((Timestamp)obj);
- else if (cls == java.sql.Date.class || cls == java.util.Date.class)
- writer.writeDate((java.util.Date)obj);
- else if (cls == boolean[].class)
- writer.writeBooleanArray((boolean[])obj);
- else if (cls == byte[].class)
- writer.writeByteArray((byte[])obj);
- else if (cls == char[].class)
- writer.writeCharArray((char[])obj);
- else if (cls == short[].class)
- writer.writeShortArray((short[])obj);
- else if (cls == int[].class)
- writer.writeIntArray((int[])obj);
- else if (cls == long[].class)
- writer.writeLongArray((long[])obj);
- else if (cls == float[].class)
- writer.writeFloatArray((float[])obj);
- else if (cls == double[].class)
- writer.writeDoubleArray((double[])obj);
- else if (cls == String[].class)
- writer.writeStringArray((String[])obj);
- else if (cls == BigDecimal[].class)
- writer.writeDecimalArray((BigDecimal[])obj);
- else if (cls == UUID[].class)
- writer.writeUuidArray((UUID[])obj);
- else if (cls == Time[].class)
- writer.writeTimeArray((Time[])obj);
- else if (cls == Timestamp[].class)
- writer.writeTimestampArray((Timestamp[])obj);
- else if (cls == java.util.Date[].class || cls == java.sql.Date[].class)
- writer.writeDateArray((java.util.Date[])obj);
- else if (obj instanceof SqlInputStreamWrapper)
- writeByteArray(writer, (SqlInputStreamWrapper)obj);
- else if (obj instanceof Blob)
- writeByteArray(writer, (Blob)obj);
- else if (binObjAllow)
- writer.writeObjectDetached(obj);
- else
- throw new BinaryObjectException("Custom objects are not
supported");
- }
+ reader.in().position(position + len);
- /**
- * Write byte array from the InputStream enclosed in the stream wrapper.
- *
- * @param writer Writer.
- * @param wrapper stream wrapper
- */
- private static void writeByteArray(BinaryWriterEx writer,
SqlInputStreamWrapper wrapper) throws BinaryObjectException {
- int written = writer.writeByteArray(wrapper.inputStream(),
wrapper.length());
-
- if (wrapper.length() != -1 && wrapper.length() != written) {
- throw new BinaryObjectException("Input stream length mismatch.
[declaredLength=" + wrapper.length() + ", " +
- "actualLength=" + written + "]");
+ return JdbcBinaryBuffer.createReadOnly(reader.in().array(),
position, len);
}
- }
- /**
- * Write byte array from the Blob instance.
- *
- * @param writer Writer.
- * @param blob Blob.
- */
- private static void writeByteArray(BinaryWriterEx writer, Blob blob)
throws BinaryObjectException {
- try {
- int written = writer.writeByteArray(blob.getBinaryStream(),
(int)blob.length());
-
- if ((int)blob.length() != written) {
- throw new BinaryObjectException("Blob length mismatch.
[declaredLength=" + (int)blob.length() + ", " +
- "actualLength=" + written + "]");
- }
- }
- catch (SQLException e) {
- throw new BinaryObjectException(e);
- }
+ return reader.unmarshallJdbc(type, binObjAllow, !keepBinary);
}
/**
diff --git
a/modules/core/src/main/java/org/apache/ignite/internal/processors/odbc/jdbc/JdbcMessageParser.java
b/modules/core/src/main/java/org/apache/ignite/internal/processors/odbc/jdbc/JdbcMessageParser.java
index 852fb6997bf..26524a84ee7 100644
---
a/modules/core/src/main/java/org/apache/ignite/internal/processors/odbc/jdbc/JdbcMessageParser.java
+++
b/modules/core/src/main/java/org/apache/ignite/internal/processors/odbc/jdbc/JdbcMessageParser.java
@@ -95,7 +95,7 @@ public class JdbcMessageParser implements
ClientListenerMessageParser {
res.writeBinary(writer, protoCtx);
- return new ClientMessage(writer.array());
+ return new ClientMessage(writer.out().arrayCopy());
}
/** {@inheritDoc} */
diff --git
a/modules/core/src/main/java/org/apache/ignite/internal/processors/odbc/jdbc/JdbcQuery.java
b/modules/core/src/main/java/org/apache/ignite/internal/processors/odbc/jdbc/JdbcQuery.java
index 12688e5517b..af1483ba515 100644
---
a/modules/core/src/main/java/org/apache/ignite/internal/processors/odbc/jdbc/JdbcQuery.java
+++
b/modules/core/src/main/java/org/apache/ignite/internal/processors/odbc/jdbc/JdbcQuery.java
@@ -75,7 +75,7 @@ public class JdbcQuery implements JdbcRawBinarylizable {
writer.writeInt(args.length);
for (Object arg : args)
- SqlListenerUtils.writeObject(writer, arg,
protoCtx.isFeatureSupported(JdbcThinFeature.CUSTOM_OBJECT));
+ writer.writeJdbcObject(arg,
protoCtx.isFeatureSupported(JdbcThinFeature.CUSTOM_OBJECT));
}
}
diff --git
a/modules/core/src/main/java/org/apache/ignite/internal/processors/odbc/jdbc/JdbcQueryExecuteRequest.java
b/modules/core/src/main/java/org/apache/ignite/internal/processors/odbc/jdbc/JdbcQueryExecuteRequest.java
index 99bc5a5c4ef..e845999c7ea 100644
---
a/modules/core/src/main/java/org/apache/ignite/internal/processors/odbc/jdbc/JdbcQueryExecuteRequest.java
+++
b/modules/core/src/main/java/org/apache/ignite/internal/processors/odbc/jdbc/JdbcQueryExecuteRequest.java
@@ -160,7 +160,7 @@ public class JdbcQueryExecuteRequest extends
JdbcClientInfoAwareRequest {
if (args != null) {
for (Object arg : args)
- JdbcUtils.writeObject(writer, arg, protoCtx);
+ writer.writeJdbcObject(arg,
protoCtx.isFeatureSupported(JdbcThinFeature.CUSTOM_OBJECT));
}
if (protoCtx.isAutoCommitSupported())
diff --git
a/modules/core/src/main/java/org/apache/ignite/internal/processors/odbc/jdbc/JdbcUtils.java
b/modules/core/src/main/java/org/apache/ignite/internal/processors/odbc/jdbc/JdbcUtils.java
index d866aaa1b95..05e065eb6f3 100644
---
a/modules/core/src/main/java/org/apache/ignite/internal/processors/odbc/jdbc/JdbcUtils.java
+++
b/modules/core/src/main/java/org/apache/ignite/internal/processors/odbc/jdbc/JdbcUtils.java
@@ -24,7 +24,6 @@ import java.util.List;
import org.apache.ignite.binary.BinaryObjectException;
import org.apache.ignite.internal.binary.BinaryReaderEx;
import org.apache.ignite.internal.binary.BinaryWriterEx;
-import org.apache.ignite.internal.binary.GridBinaryMarshaller;
import org.apache.ignite.internal.processors.odbc.SqlListenerUtils;
import org.jetbrains.annotations.Nullable;
@@ -44,7 +43,7 @@ public class JdbcUtils {
writer.writeInt(row.size());
for (Object obj : row)
- writeObject(writer, obj, protoCtx);
+ writer.writeJdbcObject(obj,
protoCtx.isFeatureSupported(JdbcThinFeature.CUSTOM_OBJECT));
}
}
}
@@ -145,7 +144,7 @@ public class JdbcUtils {
JdbcProtocolContext protoCtx,
boolean createByteArrayCopy
) throws BinaryObjectException {
- return SqlListenerUtils.readObject(reader.readByte(), reader,
+ return SqlListenerUtils.readObject(reader,
protoCtx.isFeatureSupported(JdbcThinFeature.CUSTOM_OBJECT),
protoCtx.keepBinary(), createByteArrayCopy);
}
@@ -161,24 +160,4 @@ public class JdbcUtils {
) throws BinaryObjectException {
return readObject(reader, protoCtx, true);
}
-
- /**
- * @param writer Writer.
- * @param obj Object to write.
- * @param protoCtx Protocol context.
- * @throws BinaryObjectException On error.
- */
- public static void writeObject(
- BinaryWriterEx writer,
- @Nullable Object obj,
- JdbcProtocolContext protoCtx
- ) throws BinaryObjectException {
- if (obj == null) {
- writer.writeByte(GridBinaryMarshaller.NULL);
-
- return;
- }
-
- SqlListenerUtils.writeObject(writer, obj,
protoCtx.isFeatureSupported(JdbcThinFeature.CUSTOM_OBJECT));
- }
}
diff --git
a/modules/core/src/main/java/org/apache/ignite/internal/processors/odbc/odbc/OdbcColumnMeta.java
b/modules/core/src/main/java/org/apache/ignite/internal/processors/odbc/odbc/OdbcColumnMeta.java
index 62212eae647..a8e0a502a4d 100644
---
a/modules/core/src/main/java/org/apache/ignite/internal/processors/odbc/odbc/OdbcColumnMeta.java
+++
b/modules/core/src/main/java/org/apache/ignite/internal/processors/odbc/odbc/OdbcColumnMeta.java
@@ -18,12 +18,12 @@
package org.apache.ignite.internal.processors.odbc.odbc;
import org.apache.ignite.binary.BinaryRawWriter;
-import org.apache.ignite.internal.binary.BinaryUtils;
-import org.apache.ignite.internal.binary.GridBinaryMarshaller;
import
org.apache.ignite.internal.processors.odbc.ClientListenerProtocolVersion;
import org.apache.ignite.internal.processors.query.GridQueryFieldMetadata;
import org.apache.ignite.internal.util.typedef.internal.S;
+import static org.apache.ignite.internal.binary.BinaryUtils.jdbcTypeByClass;
+
/**
* SQL listener column metadata.
*/
@@ -130,7 +130,7 @@ public class OdbcColumnMeta {
writer.writeString(tableName);
writer.writeString(columnName);
- byte typeId = getTypeId(dataType);
+ byte typeId = jdbcTypeByClass(dataType);
writer.writeByte(typeId);
@@ -144,18 +144,6 @@ public class OdbcColumnMeta {
}
}
- /**
- * Get ODBC type ID for the type.
- * @param dataType Data type class.
- * @return Type ID.
- */
- private static byte getTypeId(Class<?> dataType) {
- if (dataType.equals(java.sql.Date.class))
- return GridBinaryMarshaller.DATE;
-
- return BinaryUtils.typeByClass(dataType);
- }
-
/** {@inheritDoc} */
@Override public String toString() {
return S.toString(OdbcColumnMeta.class, this);
diff --git
a/modules/core/src/main/java/org/apache/ignite/internal/processors/odbc/odbc/OdbcMessageParser.java
b/modules/core/src/main/java/org/apache/ignite/internal/processors/odbc/odbc/OdbcMessageParser.java
index 4251bffd5e9..ee82742d4bb 100644
---
a/modules/core/src/main/java/org/apache/ignite/internal/processors/odbc/odbc/OdbcMessageParser.java
+++
b/modules/core/src/main/java/org/apache/ignite/internal/processors/odbc/odbc/OdbcMessageParser.java
@@ -273,13 +273,13 @@ public class OdbcMessageParser implements
ClientListenerMessageParser {
if (msg.status() != ClientListenerResponse.STATUS_SUCCESS) {
writer.writeString(msg.error());
- return new ClientMessage(writer.array());
+ return new ClientMessage(writer.out().arrayCopy());
}
Object res0 = msg.response();
if (res0 == null)
- return new ClientMessage(writer.array());
+ return new ClientMessage(writer.out().arrayCopy());
else if (res0 instanceof OdbcQueryExecuteResult) {
OdbcQueryExecuteResult res = (OdbcQueryExecuteResult)res0;
@@ -338,7 +338,7 @@ public class OdbcMessageParser implements
ClientListenerMessageParser {
writer.writeInt(row.size());
for (Object obj : row)
- SqlListenerUtils.writeObject(writer, obj, true);
+ writer.writeJdbcObject(obj, true);
}
}
}
@@ -365,7 +365,7 @@ public class OdbcMessageParser implements
ClientListenerMessageParser {
writer.writeInt(row.size());
for (Object obj : row)
- SqlListenerUtils.writeObject(writer, obj, true);
+ writer.writeJdbcObject(obj, true);
}
}
}
@@ -401,7 +401,7 @@ public class OdbcMessageParser implements
ClientListenerMessageParser {
byte[] typeIds = res.typeIds();
- SqlListenerUtils.writeObject(writer, typeIds, true);
+ writer.writeJdbcObject(typeIds, true);
}
else if (res0 instanceof OdbcQueryGetResultsetMetaResult) {
OdbcQueryGetResultsetMetaResult res =
(OdbcQueryGetResultsetMetaResult)res0;
@@ -411,7 +411,7 @@ public class OdbcMessageParser implements
ClientListenerMessageParser {
else
assert false : "Should not reach here.";
- return new ClientMessage(writer.array());
+ return new ClientMessage(writer.out().arrayCopy());
}
/**
diff --git
a/modules/core/src/main/java/org/apache/ignite/internal/processors/odbc/odbc/OdbcQuery.java
b/modules/core/src/main/java/org/apache/ignite/internal/processors/odbc/odbc/OdbcQuery.java
index a1c45c00df8..448db7787fe 100644
---
a/modules/core/src/main/java/org/apache/ignite/internal/processors/odbc/odbc/OdbcQuery.java
+++
b/modules/core/src/main/java/org/apache/ignite/internal/processors/odbc/odbc/OdbcQuery.java
@@ -67,7 +67,7 @@ public class OdbcQuery {
writer.writeInt(args.length);
for (Object arg : args)
- SqlListenerUtils.writeObject(writer, arg, false);
+ writer.writeJdbcObject(arg, false);
}
}
diff --git
a/modules/core/src/main/java/org/apache/ignite/internal/processors/odbc/odbc/OdbcRequestHandler.java
b/modules/core/src/main/java/org/apache/ignite/internal/processors/odbc/odbc/OdbcRequestHandler.java
index 168205d1364..70927a99bf2 100644
---
a/modules/core/src/main/java/org/apache/ignite/internal/processors/odbc/odbc/OdbcRequestHandler.java
+++
b/modules/core/src/main/java/org/apache/ignite/internal/processors/odbc/odbc/OdbcRequestHandler.java
@@ -18,7 +18,6 @@
package org.apache.ignite.internal.processors.odbc.odbc;
import java.sql.BatchUpdateException;
-import java.sql.Types;
import java.util.ArrayList;
import java.util.Collection;
import java.util.List;
@@ -35,7 +34,6 @@ import org.apache.ignite.cache.query.SqlFieldsQuery;
import org.apache.ignite.internal.GridKernalContext;
import org.apache.ignite.internal.IgniteInterruptedCheckedException;
import org.apache.ignite.internal.binary.BinaryWriterEx;
-import org.apache.ignite.internal.binary.GridBinaryMarshaller;
import org.apache.ignite.internal.processors.cache.query.IgniteQueryErrorCode;
import org.apache.ignite.internal.processors.cache.query.SqlFieldsQueryEx;
import
org.apache.ignite.internal.processors.odbc.ClientListenerProtocolVersion;
@@ -62,6 +60,7 @@ import org.jetbrains.annotations.Nullable;
import static java.sql.ResultSetMetaData.columnNoNulls;
import static java.sql.ResultSetMetaData.columnNullable;
+import static org.apache.ignite.internal.binary.BinaryUtils.sqlTypeToBinary;
import static
org.apache.ignite.internal.processors.odbc.odbc.OdbcRequest.META_COLS;
import static
org.apache.ignite.internal.processors.odbc.odbc.OdbcRequest.META_PARAMS;
import static
org.apache.ignite.internal.processors.odbc.odbc.OdbcRequest.META_RESULTSET;
@@ -818,65 +817,6 @@ public class OdbcRequestHandler implements
ClientListenerRequestHandler {
qryResults.remove(queryId);
}
- /**
- * Convert {@link java.sql.Types} to binary type constant (See {@link
GridBinaryMarshaller} constants).
- *
- * @param sqlType SQL type.
- * @return Binary type.
- */
- private static byte sqlTypeToBinary(int sqlType) {
- switch (sqlType) {
- case Types.BIGINT:
- return GridBinaryMarshaller.LONG;
-
- case Types.BOOLEAN:
- return GridBinaryMarshaller.BOOLEAN;
-
- case Types.DATE:
- return GridBinaryMarshaller.DATE;
-
- case Types.DOUBLE:
- return GridBinaryMarshaller.DOUBLE;
-
- case Types.FLOAT:
- case Types.REAL:
- return GridBinaryMarshaller.FLOAT;
-
- case Types.NUMERIC:
- case Types.DECIMAL:
- return GridBinaryMarshaller.DECIMAL;
-
- case Types.INTEGER:
- return GridBinaryMarshaller.INT;
-
- case Types.SMALLINT:
- return GridBinaryMarshaller.SHORT;
-
- case Types.TIME:
- return GridBinaryMarshaller.TIME;
-
- case Types.TIMESTAMP:
- return GridBinaryMarshaller.TIMESTAMP;
-
- case Types.TINYINT:
- return GridBinaryMarshaller.BYTE;
-
- case Types.CHAR:
- case Types.VARCHAR:
- case Types.LONGNVARCHAR:
- return GridBinaryMarshaller.STRING;
-
- case Types.NULL:
- return GridBinaryMarshaller.NULL;
-
- case Types.BINARY:
- case Types.VARBINARY:
- case Types.LONGVARBINARY:
- default:
- return GridBinaryMarshaller.BYTE_ARR;
- }
- }
-
/**
* Checks whether string matches table type pattern.
*
diff --git
a/modules/core/src/test/java/org/apache/ignite/internal/binary/BinaryMarshallerSelfTest.java
b/modules/core/src/test/java/org/apache/ignite/internal/binary/BinaryMarshallerSelfTest.java
index cb53073815f..32c4cbc9b51 100644
---
a/modules/core/src/test/java/org/apache/ignite/internal/binary/BinaryMarshallerSelfTest.java
+++
b/modules/core/src/test/java/org/apache/ignite/internal/binary/BinaryMarshallerSelfTest.java
@@ -3042,12 +3042,12 @@ public class BinaryMarshallerSelfTest extends
AbstractBinaryArraysTest {
BinaryMarshaller marsh = binaryMarshaller();
- try (BinaryWriterEx writer = BinaryUtils.writer(binaryContext(marsh),
false, GridBinaryMarshaller.UNREGISTERED_TYPE_ID)) {
+ try (BinaryWriterEx writer =
BinaryUtils.binariesFactory.writer(binaryContext(marsh), false)) {
assertEquals(true, BinaryStreamsTestUtils.threadLocalIsAcquired());
writer.writeString("Thread local test");
- writer.array();
+ writer.out().arrayCopy();
assertEquals(true, BinaryStreamsTestUtils.threadLocalIsAcquired());
}
diff --git
a/modules/core/src/test/java/org/apache/ignite/internal/binary/BinaryObjectBuilderDefaultMappersSelfTest.java
b/modules/core/src/test/java/org/apache/ignite/internal/binary/BinaryObjectBuilderDefaultMappersSelfTest.java
index 5e0aedb6e3b..3eb0ed1620d 100644
---
a/modules/core/src/test/java/org/apache/ignite/internal/binary/BinaryObjectBuilderDefaultMappersSelfTest.java
+++
b/modules/core/src/test/java/org/apache/ignite/internal/binary/BinaryObjectBuilderDefaultMappersSelfTest.java
@@ -39,6 +39,7 @@ import org.apache.ignite.binary.BinaryTypeConfiguration;
import org.apache.ignite.configuration.BinaryConfiguration;
import org.apache.ignite.configuration.IgniteConfiguration;
import org.apache.ignite.internal.binary.mutabletest.GridBinaryTestClasses;
+import org.apache.ignite.internal.binary.streams.BinaryStreams;
import
org.apache.ignite.internal.processors.cache.binary.CacheObjectBinaryProcessorImpl;
import org.apache.ignite.internal.util.GridUnsafe;
import org.apache.ignite.internal.util.typedef.F;
@@ -760,10 +761,8 @@ public class BinaryObjectBuilderDefaultMappersSelfTest
extends AbstractBinaryArr
GridUnsafe.copyHeapOffheap(arr, GridUnsafe.BYTE_ARR_OFF, ptr0 + 4,
arr.length);
- BinaryObject offheapObj = (BinaryObject)
-
((CacheObjectBinaryProcessorImpl)(grid(0)).context().cacheObjects()).unmarshal(ptr,
false);
-
- assertEquals(BinaryObjectOffheapImpl.class, offheapObj.getClass());
+ BinaryObjectOffheapImpl offheapObj =
((CacheObjectBinaryProcessorImpl)(grid(0)).context().cacheObjects()).marshaller().
+ unmarshal(BinaryStreams.inputStream(ptr + 5, len));
assertEquals(expectedHashCode("Class"),
offheapObj.type().typeId());
assertEquals(BinaryArrayIdentityResolver.instance().hashCode(po),
offheapObj.hashCode());
diff --git
a/modules/core/src/test/java/org/apache/ignite/internal/binary/RawBinaryObjectExtractorTest.java
b/modules/core/src/test/java/org/apache/ignite/internal/binary/RawBinaryObjectExtractorTest.java
index 8d3c9f7804b..63f60888384 100644
---
a/modules/core/src/test/java/org/apache/ignite/internal/binary/RawBinaryObjectExtractorTest.java
+++
b/modules/core/src/test/java/org/apache/ignite/internal/binary/RawBinaryObjectExtractorTest.java
@@ -38,8 +38,6 @@ import org.apache.ignite.marshaller.jdk.JdkMarshaller;
import org.apache.ignite.testframework.junits.common.GridCommonAbstractTest;
import org.junit.Test;
-import static
org.apache.ignite.internal.binary.GridBinaryMarshaller.UNREGISTERED_TYPE_ID;
-
/** */
public class RawBinaryObjectExtractorTest extends GridCommonAbstractTest {
/** */
@@ -51,10 +49,10 @@ public class RawBinaryObjectExtractorTest extends
GridCommonAbstractTest {
byte[] serializedTestObjectsBytes;
- try (BinaryWriterEx writer = BinaryUtils.writer(ctx, false,
UNREGISTERED_TYPE_ID)) {
+ try (BinaryWriterEx writer = BinaryUtils.binariesFactory.writer(ctx,
false)) {
testObjects.forEach(writer::writeObject);
- serializedTestObjectsBytes = writer.array();
+ serializedTestObjectsBytes = writer.out().arrayCopy();
}
RawBinaryObjectExtractor rawReader = new
RawBinaryObjectExtractor(BinaryStreams.inputStream(serializedTestObjectsBytes));