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 97a18290e0e IGNITE-27560 Move BinaryObjectImpl to binary-impl (#12633)
97a18290e0e is described below
commit 97a18290e0e0845b98f79e988c270ff637446123
Author: Nikolay <[email protected]>
AuthorDate: Wed Jan 14 17:40:00 2026 +0300
IGNITE-27560 Move BinaryObjectImpl to binary-impl (#12633)
---
.../ignite/internal/binary/BinariesFactory.java | 25 ++++++++++++
.../ignite/internal/binary/BinaryContext.java | 1 -
.../ignite/internal/binary/BinaryObjectEx.java | 21 ++++++++++
.../apache/ignite/internal/binary/BinaryUtils.java | 47 +++++-----------------
.../internal/binary/BinariesFactoryImpl.java | 27 +++++++++++++
.../ignite/internal/binary/BinaryObjectImpl.java | 28 +++++--------
.../binary/builder/BinaryBuilderReader.java | 6 +--
.../binary/builder/BinaryObjectBuilderImpl.java | 3 +-
.../calcite/exec/exp/ExpressionFactoryImpl.java | 2 +-
.../binary/CacheObjectBinaryProcessorImpl.java | 6 +--
.../snapshot/IgniteClusterSnapshotCheckTest.java | 3 +-
.../junits/GridTestBinaryMarshaller.java | 2 +-
.../processors/query/h2/dml/DmlBatchSender.java | 2 +-
13 files changed, 107 insertions(+), 66 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 1e10c087b0f..dbfd385e324 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
@@ -20,8 +20,10 @@ package org.apache.ignite.internal.binary;
import java.lang.reflect.Field;
import java.util.Map;
import java.util.function.ToIntFunction;
+import org.apache.ignite.binary.BinaryObject;
import org.apache.ignite.internal.binary.streams.BinaryInputStream;
import org.apache.ignite.internal.binary.streams.BinaryOutputStream;
+import org.apache.ignite.internal.processors.cache.CacheObjectValueContext;
import org.jetbrains.annotations.Nullable;
/**
@@ -134,6 +136,11 @@ public interface BinariesFactory {
*/
public Class<?> binaryEnumClass();
+ /**
+ * @return Binary object impl class.
+ */
+ public Class<?> binaryObjectImplClass();
+
/**
* @return Map of predefined types.
*/
@@ -143,4 +150,22 @@ public interface BinariesFactory {
* @return Map of function returning size of the object.
*/
public Map<Class<?>, ToIntFunction<Object>> sizeProviders();
+
+ /**
+ * Compare two objects for DML operation.
+ *
+ * @param first First.
+ * @param second Second.
+ * @return Comparison result which is aligned with the {@link
java.util.Comparator#compare(Object, Object)} contract.
+ */
+ public int compareForDml(Object first, Object second);
+
+ /** Creates new instance of binary object. */
+ public BinaryObjectEx binaryObject(BinaryContext ctx, byte[] arr, int
start);
+
+ /** Creates new instance of binary object. */
+ public BinaryObjectEx binaryObject(BinaryContext ctx, byte[] bytes);
+
+ /** Creates new instance of binary object. */
+ public BinaryObject binaryObject(BinaryContext ctx, byte[] valBytes,
CacheObjectValueContext coCtx);
}
diff --git
a/modules/binary/api/src/main/java/org/apache/ignite/internal/binary/BinaryContext.java
b/modules/binary/api/src/main/java/org/apache/ignite/internal/binary/BinaryContext.java
index dd12931440a..75722f8e7d1 100644
---
a/modules/binary/api/src/main/java/org/apache/ignite/internal/binary/BinaryContext.java
+++
b/modules/binary/api/src/main/java/org/apache/ignite/internal/binary/BinaryContext.java
@@ -257,7 +257,6 @@ public class BinaryContext {
registerPredefinedType(T2.class, 62);
registerPredefinedType(IgniteUuid.class, 63);
- registerPredefinedType(BinaryObjectImpl.class, 0);
registerPredefinedType(BinaryMetadata.class, 0);
registerPredefinedType(BinaryTreeMap.class, 0);
registerPredefinedType(BinaryArray.class, 0);
diff --git
a/modules/binary/api/src/main/java/org/apache/ignite/internal/binary/BinaryObjectEx.java
b/modules/binary/api/src/main/java/org/apache/ignite/internal/binary/BinaryObjectEx.java
index 8fb77c5c61e..aa28a7c9f87 100644
---
a/modules/binary/api/src/main/java/org/apache/ignite/internal/binary/BinaryObjectEx.java
+++
b/modules/binary/api/src/main/java/org/apache/ignite/internal/binary/BinaryObjectEx.java
@@ -111,4 +111,25 @@ public interface BinaryObjectEx extends BinaryObject {
public default BinaryObjectEx heapCopy() {
return this;
}
+
+ /**
+ * @return Detached binary object.
+ */
+ public default BinaryObjectEx detach() {
+ return this;
+ }
+
+ /**
+ * @return Detached binary object.
+ */
+ public default BinaryObjectEx detach(boolean checkCrossObjReferences) {
+ return this;
+ }
+
+ /**
+ * @param detachAllowed Detach allowed flag.
+ */
+ public default void detachAllowed(boolean detachAllowed) {
+ // No-op.
+ }
}
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 72bf15486b4..20fa00718bd 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
@@ -71,7 +71,6 @@ import org.apache.ignite.binary.BinaryType;
import org.apache.ignite.binary.Binarylizable;
import org.apache.ignite.internal.binary.streams.BinaryInputStream;
import org.apache.ignite.internal.binary.streams.BinaryOutputStream;
-import org.apache.ignite.internal.processors.cache.CacheObjectValueContext;
import org.apache.ignite.internal.util.CommonUtils;
import org.apache.ignite.internal.util.MutableSingletonList;
import org.apache.ignite.internal.util.typedef.F;
@@ -1139,7 +1138,7 @@ public class BinaryUtils {
return BinaryWriteMode.OBJECT_ARR;
else if (cls == BinaryEnumArray.class)
return BinaryWriteMode.ENUM_ARR;
- else if (cls == BinaryObjectImpl.class)
+ else if (cls == binariesFactory.binaryObjectImplClass())
return BinaryWriteMode.BINARY_OBJ;
else if (Binarylizable.class.isAssignableFrom(cls))
return BinaryWriteMode.BINARY;
@@ -1512,10 +1511,10 @@ public class BinaryUtils {
byte[] arr = doReadByteArray(in);
int start = in.readInt();
- BinaryObjectImpl binO = new BinaryObjectImpl(ctx, arr, start);
+ BinaryObject binO = binariesFactory.binaryObject(ctx, arr, start);
if (detach)
- return (BinaryObject)detach(binO);
+ return detach(binO);
return binO;
}
@@ -1678,21 +1677,6 @@ public class BinaryUtils {
return binariesFactory.binaryEnum(ctx, type.typeId, type.clsName,
in.readInt());
}
- /** */
- public static BinaryObjectEx binaryObject(BinaryContext ctx, byte[] arr,
int start) {
- return new BinaryObjectImpl(ctx, arr, start);
- }
-
- /** */
- public static BinaryObjectEx binaryObject(BinaryContext ctx, byte[] bytes)
{
- return new BinaryObjectImpl(ctx, bytes);
- }
-
- /** */
- public static BinaryObject binaryObject(BinaryContext ctx, byte[]
valBytes, CacheObjectValueContext coCtx) {
- return new BinaryObjectImpl(ctx, valBytes, coCtx);
- }
-
/**
* Read binary enum array.
*
@@ -1869,7 +1853,7 @@ public class BinaryUtils {
BinaryObjectEx po;
if (detach) {
- BinaryObjectImpl binObj = new BinaryObjectImpl(ctx,
in.array(), start);
+ BinaryObjectEx binObj = binariesFactory.binaryObject(ctx,
in.array(), start);
binObj.detachAllowed(true);
@@ -1877,7 +1861,7 @@ public class BinaryUtils {
}
else {
if (in.offheapPointer() == 0)
- po = new BinaryObjectImpl(ctx, in.array(), start);
+ po = binariesFactory.binaryObject(ctx, in.array(),
start);
else
po = binariesFactory.binaryOffheapObject(ctx,
in.offheapPointer(), start,
in.remaining() + in.position());
@@ -2927,7 +2911,7 @@ public class BinaryUtils {
* @return {@code True} if {@code val} instance of {@link
BinaryObjectImpl}.
*/
public static boolean isBinaryObjectImpl(Object val) {
- return val instanceof BinaryObjectImpl;
+ return (val != null) && val.getClass() ==
binariesFactory.binaryObjectImplClass();
}
/**
@@ -3003,24 +2987,13 @@ public class BinaryUtils {
return Arrays.deepEquals((Object[])a1, (Object[])a2);
}
- /**
- * Compare two objects for DML operation.
- *
- * @param first First.
- * @param second Second.
- * @return Comparison result.
- */
- public static int compareForDml(Object first, Object second) {
- return BinaryObjectImpl.compareForDml(first, second);
- }
-
/**
* @param o Object to detach.
* @return Detached object.
*/
- public static Object detach(Object o) {
- ((BinaryObjectImpl)o).detachAllowed(true);
- return ((BinaryObjectImpl)o).detach();
+ public static BinaryObjectEx detach(Object o) {
+ ((BinaryObjectEx)o).detachAllowed(true);
+ return ((BinaryObjectEx)o).detach();
}
/**
@@ -3028,7 +3001,7 @@ public class BinaryUtils {
*/
public static void detachAllowedIfPossible(Object o) {
if (isBinaryObjectImpl(o))
- ((BinaryObjectImpl)o).detachAllowed(true);
+ ((BinaryObjectEx)o).detachAllowed(true);
}
/**
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 9e1807b0dfe..3464e1699c5 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
@@ -25,6 +25,7 @@ import org.apache.ignite.binary.BinaryObject;
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;
import org.jetbrains.annotations.Nullable;
@@ -167,12 +168,18 @@ public class BinariesFactoryImpl implements
BinariesFactory {
return BinaryEnumObjectImpl.class;
}
+ /** {@inheritDoc} */
+ @Override public Class<?> binaryObjectImplClass() {
+ return BinaryObjectImpl.class;
+ }
+
/** {@inheritDoc} */
@Override public Map<Class<?>, Integer> predefinedTypes() {
Map<Class<?>, Integer> predefinedTypes = new HashMap<>();
predefinedTypes.put(BinaryEnumObjectImpl.class, 0);
predefinedTypes.put(BinaryObjectOffheapImpl.class, 0);
+ predefinedTypes.put(BinaryObjectImpl.class, 0);
return predefinedTypes;
}
@@ -192,6 +199,26 @@ public class BinariesFactoryImpl implements
BinariesFactory {
);
}
+ /** {@inheritDoc} */
+ @Override public int compareForDml(Object first, Object second) {
+ return BinaryObjectImpl.compareForDml(first, second);
+ }
+
+ /** {@inheritDoc} */
+ @Override public BinaryObjectEx binaryObject(BinaryContext ctx, byte[]
arr, int start) {
+ return new BinaryObjectImpl(ctx, arr, start);
+ }
+
+ /** {@inheritDoc} */
+ @Override public BinaryObjectEx binaryObject(BinaryContext ctx, byte[]
bytes) {
+ return new BinaryObjectImpl(ctx, bytes);
+ }
+
+ /** {@inheritDoc} */
+ @Override public BinaryObject binaryObject(BinaryContext ctx, byte[]
valBytes, CacheObjectValueContext coCtx) {
+ return new BinaryObjectImpl(ctx, valBytes, coCtx);
+ }
+
/**
* @param cls Class to check.
* @return {@code True} if {@code val} is assignable to binary Enum object.
diff --git
a/modules/binary/api/src/main/java/org/apache/ignite/internal/binary/BinaryObjectImpl.java
b/modules/binary/impl/src/main/java/org/apache/ignite/internal/binary/BinaryObjectImpl.java
similarity index 97%
rename from
modules/binary/api/src/main/java/org/apache/ignite/internal/binary/BinaryObjectImpl.java
rename to
modules/binary/impl/src/main/java/org/apache/ignite/internal/binary/BinaryObjectImpl.java
index 5b49de598de..50e85ff2308 100644
---
a/modules/binary/api/src/main/java/org/apache/ignite/internal/binary/BinaryObjectImpl.java
+++
b/modules/binary/impl/src/main/java/org/apache/ignite/internal/binary/BinaryObjectImpl.java
@@ -50,7 +50,7 @@ import static
org.apache.ignite.internal.binary.GridBinaryMarshaller.TRANSFORMED
/**
* Binary object implementation.
*/
-final class BinaryObjectImpl extends BinaryObjectExImpl implements
Externalizable, KeyCacheObject {
+public final class BinaryObjectImpl extends BinaryObjectExImpl implements
Externalizable, KeyCacheObject {
/** */
private static final long serialVersionUID = 0L;
@@ -87,7 +87,7 @@ final class BinaryObjectImpl extends BinaryObjectExImpl
implements Externalizabl
* @param arr Array.
* @param start Start.
*/
- BinaryObjectImpl(BinaryContext ctx, byte[] arr, int start) {
+ public BinaryObjectImpl(BinaryContext ctx, byte[] arr, int start) {
assert ctx != null;
assert arr != null;
@@ -218,7 +218,7 @@ final class BinaryObjectImpl extends BinaryObjectExImpl
implements Externalizabl
/** {@inheritDoc} */
@Override public CacheObject prepareForCache(CacheObjectValueContext ctx) {
- BinaryObjectImpl res = detached() ? this : detach();
+ BinaryObjectImpl res = detached() ? this : detach(false);
res.prepareMarshal(ctx);
@@ -266,17 +266,13 @@ final class BinaryObjectImpl extends BinaryObjectExImpl
implements Externalizabl
return BinaryPrimitives.readInt(arr, start +
GridBinaryMarshaller.TOTAL_LEN_POS);
}
- /**
- * @return Detached binary object.
- */
- public BinaryObjectImpl detach() {
+ /** {@inheritDoc} */
+ @Override public BinaryObjectEx detach() {
return detach(false);
}
- /**
- * @return Detached binary object.
- */
- public BinaryObjectImpl detach(boolean checkCrossObjReferences) {
+ /** {@inheritDoc} */
+ @Override public BinaryObjectImpl detach(boolean checkCrossObjReferences) {
if (!detachAllowed || detached())
return this;
@@ -308,10 +304,8 @@ final class BinaryObjectImpl extends BinaryObjectExImpl
implements Externalizabl
return start == 0 && length() == arr.length;
}
- /**
- * @param detachAllowed Detach allowed flag.
- */
- public void detachAllowed(boolean detachAllowed) {
+ /** {@inheritDoc} */
+ @Override public void detachAllowed(boolean detachAllowed) {
this.detachAllowed = detachAllowed;
}
@@ -844,8 +838,8 @@ final class BinaryObjectImpl extends BinaryObjectExImpl
implements Externalizabl
*/
@SuppressWarnings("unchecked")
static int compareForDml(Object first, Object second) {
- boolean firstBinary = BinaryUtils.isBinaryObjectImpl(first);
- boolean secondBinary = BinaryUtils.isBinaryObjectImpl(second);
+ boolean firstBinary = first instanceof BinaryObjectImpl;
+ boolean secondBinary = second instanceof BinaryObjectImpl;
if (firstBinary) {
if (secondBinary)
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 5a9d80e13d7..cc5f6da0a1b 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
@@ -22,10 +22,10 @@ import java.sql.Timestamp;
import java.util.Date;
import java.util.HashMap;
import java.util.Map;
-import org.apache.ignite.binary.BinaryObject;
import org.apache.ignite.binary.BinaryObjectException;
import org.apache.ignite.internal.binary.BinaryContext;
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;
@@ -484,7 +484,7 @@ class BinaryBuilderReader implements BinaryPositionReadable
{
int start = readIntPositioned(pos + 4 + size);
- BinaryObject binaryObj = BinaryUtils.binaryObject(ctx, arr,
pos + 4 + start);
+ BinaryObjectEx binaryObj = new BinaryObjectImpl(ctx, arr, pos
+ 4 + start);
return new BinaryPlainBinaryObject(binaryObj);
}
@@ -836,7 +836,7 @@ class BinaryBuilderReader implements BinaryPositionReadable
{
int start = readInt();
- BinaryObject binaryObj = BinaryUtils.binaryObject(ctx, arr,
pos - 4 - size + start);
+ BinaryObjectEx binaryObj = new BinaryObjectImpl(ctx, arr, pos
- 4 - size + start);
return new BinaryPlainBinaryObject(binaryObj);
}
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 7f5dbc3f32c..4a4fa0f242f 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
@@ -34,6 +34,7 @@ import org.apache.ignite.internal.binary.BinariesFactoryImpl;
import org.apache.ignite.internal.binary.BinaryContext;
import org.apache.ignite.internal.binary.BinaryFieldMetadata;
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.GridBinaryMarshaller;
@@ -188,7 +189,7 @@ class BinaryObjectBuilderImpl implements
BinaryObjectBuilderEx {
byte[] arr = writer.array();
- return BinaryUtils.binaryObject(ctx, arr, 0);
+ return new BinaryObjectImpl(ctx, arr, 0);
}
}
diff --git
a/modules/calcite/src/main/java/org/apache/ignite/internal/processors/query/calcite/exec/exp/ExpressionFactoryImpl.java
b/modules/calcite/src/main/java/org/apache/ignite/internal/processors/query/calcite/exec/exp/ExpressionFactoryImpl.java
index 6ea08427021..8e828f5720d 100644
---
a/modules/calcite/src/main/java/org/apache/ignite/internal/processors/query/calcite/exec/exp/ExpressionFactoryImpl.java
+++
b/modules/calcite/src/main/java/org/apache/ignite/internal/processors/query/calcite/exec/exp/ExpressionFactoryImpl.java
@@ -271,7 +271,7 @@ public class ExpressionFactoryImpl<Row> implements
ExpressionFactory<Row> {
else if (o2 == null)
return -nullComparison;
- return BinaryUtils.compareForDml(o1, o2);
+ return BinaryUtils.binariesFactory.compareForDml(o1, o2);
}
/** {@inheritDoc} */
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 7c52bb2473e..aa5322faac3 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
@@ -1271,8 +1271,8 @@ public class CacheObjectBinaryProcessorImpl extends
GridProcessorAdapter impleme
coctx = fakeCacheObjCtx;
return coctx == null
- ? (CacheObject)BinaryUtils.binaryObject(binaryContext(),
bytes)
- : (CacheObject)BinaryUtils.binaryObject(binaryContext(),
bytes, coctx);
+ ?
(CacheObject)BinaryUtils.binariesFactory.binaryObject(binaryContext(), bytes)
+ :
(CacheObject)BinaryUtils.binariesFactory.binaryObject(binaryContext(), bytes,
coctx);
case CacheObject.TYPE_BINARY_ENUM:
return
(CacheObject)BinaryUtils.binariesFactory.binaryEnum(binaryContext(), bytes);
@@ -1292,7 +1292,7 @@ public class CacheObjectBinaryProcessorImpl extends
GridProcessorAdapter impleme
throws IgniteCheckedException {
switch (type) {
case CacheObject.TYPE_BINARY:
- return
(KeyCacheObject)BinaryUtils.binaryObject(binaryContext(), bytes);
+ return
(KeyCacheObject)BinaryUtils.binariesFactory.binaryObject(binaryContext(),
bytes);
case CacheObject.TYPE_BYTE_ARR:
throw new IllegalArgumentException("Byte arrays cannot be used
as cache keys.");
diff --git
a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/snapshot/IgniteClusterSnapshotCheckTest.java
b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/snapshot/IgniteClusterSnapshotCheckTest.java
index 99ddda2912d..311cf3a79c7 100644
---
a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/snapshot/IgniteClusterSnapshotCheckTest.java
+++
b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/snapshot/IgniteClusterSnapshotCheckTest.java
@@ -435,7 +435,8 @@ public class IgniteClusterSnapshotCheckTest extends
AbstractSnapshotSelfTest {
new Random().nextBytes(bytes);
try {
- BinaryObject newVal = BinaryUtils.binaryObject(binCtx,
binCtx.marshaller().marshal(new Value(bytes)), 0);
+ BinaryObject newVal =
+ BinaryUtils.binariesFactory.binaryObject(binCtx,
binCtx.marshaller().marshal(new Value(bytes)), 0);
boolean success = cached.initialValue(
(CacheObject)newVal,
diff --git
a/modules/core/src/test/java/org/apache/ignite/testframework/junits/GridTestBinaryMarshaller.java
b/modules/core/src/test/java/org/apache/ignite/testframework/junits/GridTestBinaryMarshaller.java
index df2f0d2ef42..ff9af51975f 100644
---
a/modules/core/src/test/java/org/apache/ignite/testframework/junits/GridTestBinaryMarshaller.java
+++
b/modules/core/src/test/java/org/apache/ignite/testframework/junits/GridTestBinaryMarshaller.java
@@ -55,7 +55,7 @@ public class GridTestBinaryMarshaller {
public BinaryObject marshal(Object obj) throws IgniteCheckedException {
byte[] bytes = marsh.marshal(obj);
- return BinaryUtils.binaryObject(U.<GridBinaryMarshaller>field(marsh,
"impl").context(), bytes, 0);
+ return
BinaryUtils.binariesFactory.binaryObject(U.<GridBinaryMarshaller>field(marsh,
"impl").context(), bytes, 0);
}
/**
diff --git
a/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/dml/DmlBatchSender.java
b/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/dml/DmlBatchSender.java
index ecc7185222f..34ebb59a73f 100644
---
a/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/dml/DmlBatchSender.java
+++
b/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/dml/DmlBatchSender.java
@@ -448,7 +448,7 @@ public class DmlBatchSender {
@Override public int compare(Object first, Object second) {
// We assume that only simple types or BinaryObjectImpl are
possible. The latter comes from the fact
// that we use BinaryObjectBuilder which produces only on-heap
binary objects.
- return BinaryUtils.compareForDml(first, second);
+ return BinaryUtils.binariesFactory.compareForDml(first, second);
}
}
}
