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 1c76679814d IGNITE-29158 Move BinaryArray and BinaryEnumArray to 
ignite-binary-impl (#13699)
1c76679814d is described below

commit 1c76679814d16cd4bcb59c4d0ff7ee98e1049180
Author: Nikolay <[email protected]>
AuthorDate: Mon Oct 19 09:53:50 2026 +0300

    IGNITE-29158 Move BinaryArray and BinaryEnumArray to ignite-binary-impl 
(#13699)
---
 .../ignite/internal/binary/BinariesFactory.java    | 18 ++++++++++
 .../ignite/internal/binary/BinaryContext.java      | 31 -----------------
 .../ignite/internal/binary/BinaryObjectEx.java     |  5 +++
 .../apache/ignite/internal/binary/BinaryUtils.java | 20 +++++------
 .../internal/binary/BinariesFactoryImpl.java       | 40 ++++++++++++++++++++++
 .../apache/ignite/internal/binary/BinaryArray.java |  5 +++
 .../ignite/internal/binary/BinaryEnumArray.java    |  0
 .../binary/CacheObjectBinaryProcessorImpl.java     |  2 +-
 .../internal/binary/BinaryArraySerializer.java     |  6 ++--
 .../ignite/internal/binary/BinarySerializers.java  |  2 +-
 10 files changed, 83 insertions(+), 46 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 c64fae56ccf..616dbebe532 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
@@ -142,6 +142,14 @@ public interface BinariesFactory {
      */
     public BinaryObjectEx binaryOffheapObject(BinaryContext ctx, long ptr, int 
start, int size);
 
+    /**
+     * @param ctx Context
+     * @param compCls Component class.
+     * @param arr Data.
+     * @return Binary array instance.
+     */
+    public BinaryObjectEx binaryArray(BinaryContext ctx, Class<?> compCls, 
Object[] arr);
+
     /**
      * @return Binary enum class.
      */
@@ -152,6 +160,16 @@ public interface BinariesFactory {
      */
     public Class<?> binaryObjectImplClass();
 
+    /**
+     * @return Binary array class.
+     */
+    public Class<?> binaryArrayClass();
+
+    /**
+     * @return Binary enum array class.
+     */
+    public Class<?> binaryEnumArrayClass();
+
     /**
      * @return Map of predefined types.
      */
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 64450ca2b21..5b8c565fb39 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
@@ -54,7 +54,6 @@ import org.apache.ignite.binary.BinaryField;
 import org.apache.ignite.binary.BinaryIdMapper;
 import org.apache.ignite.binary.BinaryInvalidTypeException;
 import org.apache.ignite.binary.BinaryNameMapper;
-import org.apache.ignite.binary.BinaryObject;
 import org.apache.ignite.binary.BinaryObjectException;
 import org.apache.ignite.binary.BinaryReflectiveSerializer;
 import org.apache.ignite.binary.BinarySerializer;
@@ -260,8 +259,6 @@ public class BinaryContext {
 
         registerPredefinedType(BinaryMetadata.class, 0);
         registerPredefinedType(BinaryTreeMap.class, 0);
-        registerPredefinedType(BinaryArray.class, 0);
-        registerPredefinedType(BinaryEnumArray.class, 0);
 
         
BinaryUtils.binariesFactory.predefinedTypes().forEach(this::registerPredefinedType);
 
@@ -1512,34 +1509,6 @@ public class BinaryContext {
         return Collections.unmodifiableCollection(predefinedTypes.values());
     }
 
-    /** Creates instance of {@link BinaryArray}. */
-    public BinaryObject createBinaryArray(Class<?> compCls, Object[] pArr) {
-        boolean isBinaryArr = BinaryObject.class.isAssignableFrom(compCls);
-
-        String compClsName = isBinaryArr ? Object.class.getName() : 
compCls.getName();
-
-        // In case of interface or multidimensional array rely on class name.
-        // Interfaces and array not registered as binary types.
-        BinaryClassDescriptor desc = descriptorForClass(compCls);
-
-        if (compCls.isEnum() || compCls == 
BinaryUtils.binariesFactory.binaryEnumClass()) {
-            return new BinaryEnumArray(
-                this,
-                desc.registered() ? desc.typeId() : 
GridBinaryMarshaller.UNREGISTERED_TYPE_ID,
-                compClsName,
-                pArr
-            );
-        }
-        else {
-            return new BinaryArray(
-                this,
-                desc.registered() ? desc.typeId() : 
GridBinaryMarshaller.UNREGISTERED_TYPE_ID,
-                compClsName,
-                pArr
-            );
-        }
-    }
-
     /**
      * Type descriptors.
      */
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 f5d8d61d62e..6dc99ed91b0 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
@@ -68,6 +68,11 @@ public interface BinaryObjectEx extends BinaryObject {
         throw new UnsupportedOperationException("Not array");
     }
 
+    /** @return {@code true} if binary object stores array. */
+    public default boolean isArray() {
+        return false;
+    }
+
     /**
      * @return Enum class name.
      */
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 ca5c300d781..79bfe6f1f05 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
@@ -347,10 +347,10 @@ public class BinaryUtils {
             return cls.getComponentType().isEnum() || cls.getComponentType() 
== Enum.class ?
                 GridBinaryMarshaller.ENUM_ARR : GridBinaryMarshaller.OBJ_ARR;
 
-        if (cls == BinaryArray.class)
+        if (cls == binariesFactory.binaryArrayClass())
             return GridBinaryMarshaller.OBJ_ARR;
 
-        if (cls == BinaryEnumArray.class)
+        if (cls == binariesFactory.binaryEnumArrayClass())
             return GridBinaryMarshaller.ENUM_ARR;
 
         if (isSpecialCollection(cls))
@@ -692,9 +692,9 @@ public class BinaryUtils {
             return BinaryWriteMode.TIME_ARR;
         else if (cls.isArray())
             return cls.getComponentType().isEnum() ? BinaryWriteMode.ENUM_ARR 
: BinaryWriteMode.OBJECT_ARR;
-        else if (cls == BinaryArray.class)
+        else if (cls == binariesFactory.binaryArrayClass())
             return BinaryWriteMode.OBJECT_ARR;
-        else if (cls == BinaryEnumArray.class)
+        else if (cls == binariesFactory.binaryEnumArrayClass())
             return BinaryWriteMode.ENUM_ARR;
         else if (cls == binariesFactory.binaryObjectImplClass())
             return BinaryWriteMode.BINARY_OBJ;
@@ -1249,7 +1249,7 @@ public class BinaryUtils {
     }
 
     /**
-     * @param obj {@link BinaryArray} or {@code Object[]}.
+     * @param obj {@code BinaryArray} or {@code Object[]}.
      * @return Objects array.
      */
     public static Object[] rawArrayFromBinary(Object obj) {
@@ -1264,7 +1264,7 @@ public class BinaryUtils {
 
     /** */
     public static boolean isObjectArray(Class<?> cls) {
-        return Object[].class == cls || BinaryArray.class == cls || 
BinaryEnumArray.class == cls;
+        return Object[].class == cls || binariesFactory.binaryArrayClass() == 
cls || binariesFactory.binaryEnumArrayClass() == cls;
     }
 
     /** @return Type name of the specified object. If {@link BinaryObject} was 
specified its type will be returned. */
@@ -1312,8 +1312,8 @@ public class BinaryUtils {
      */
     public static Map<Class<?>, Function<Object, Object>> 
unwrapFuncForSizeCalc() {
         return Map.of(
-            BinaryArray.class, bo -> ((BinaryArray)bo).array(),
-            BinaryEnumArray.class, bo -> ((BinaryArray)bo).array()
+            binariesFactory.binaryArrayClass(), bo -> 
((BinaryObjectEx)bo).array(),
+            binariesFactory.binaryEnumArrayClass(), bo -> 
((BinaryObjectEx)bo).array()
         );
     }
 
@@ -1436,10 +1436,10 @@ public class BinaryUtils {
 
     /**
      * @param val Value to check.
-     * @return {@code True} if {@code val} instance of {@link BinaryArray}.
+     * @return {@code True} if {@code val} instance of {@code BinaryArray}.
      */
     public static boolean isBinaryArray(Object val) {
-        return val instanceof BinaryArray;
+        return val instanceof BinaryObjectEx && 
((BinaryObjectEx)val).isArray();
     }
 
     /** @return {@code True} if typed arrays should be used, {@code false} 
otherwise. */
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 ee0aab71442..ef45ddb2d7f 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
@@ -173,6 +173,34 @@ public class BinariesFactoryImpl implements 
BinariesFactory {
         return new BinaryObjectOffheapImpl(ctx, ptr, start, size);
     }
 
+    /** {@inheritDoc} */
+    @Override public BinaryObjectEx binaryArray(BinaryContext ctx, Class<?> 
compCls, Object[] arr) {
+        boolean isBinaryArr = BinaryObject.class.isAssignableFrom(compCls);
+
+        String compClsName = isBinaryArr ? Object.class.getName() : 
compCls.getName();
+
+        // In case of interface or multidimensional array rely on class name.
+        // Interfaces and array not registered as binary types.
+        BinaryClassDescriptor desc = ctx.descriptorForClass(compCls);
+
+        if (compCls.isEnum() || compCls == 
BinaryUtils.binariesFactory.binaryEnumClass()) {
+            return new BinaryEnumArray(
+                ctx,
+                desc.registered() ? desc.typeId() : 
GridBinaryMarshaller.UNREGISTERED_TYPE_ID,
+                compClsName,
+                arr
+            );
+        }
+        else {
+            return new BinaryArray(
+                ctx,
+                desc.registered() ? desc.typeId() : 
GridBinaryMarshaller.UNREGISTERED_TYPE_ID,
+                compClsName,
+                arr
+            );
+        }
+    }
+
     /** {@inheritDoc} */
     @Override public Class<?> binaryEnumClass() {
         return BinaryEnumObjectImpl.class;
@@ -183,6 +211,16 @@ public class BinariesFactoryImpl implements 
BinariesFactory {
         return BinaryObjectImpl.class;
     }
 
+    /** {@inheritDoc} */
+    @Override public Class<?> binaryArrayClass() {
+        return BinaryArray.class;
+    }
+
+    /** {@inheritDoc} */
+    @Override public Class<?> binaryEnumArrayClass() {
+        return BinaryEnumArray.class;
+    }
+
     /** {@inheritDoc} */
     @Override public Map<Class<?>, Integer> predefinedTypes() {
         Map<Class<?>, Integer> predefinedTypes = new HashMap<>();
@@ -190,6 +228,8 @@ public class BinariesFactoryImpl implements BinariesFactory 
{
         predefinedTypes.put(BinaryEnumObjectImpl.class, 0);
         predefinedTypes.put(BinaryObjectOffheapImpl.class, 0);
         predefinedTypes.put(BinaryObjectImpl.class, 0);
+        predefinedTypes.put(BinaryArray.class, 0);
+        predefinedTypes.put(BinaryEnumArray.class, 0);
 
         return predefinedTypes;
     }
diff --git 
a/modules/binary/api/src/main/java/org/apache/ignite/internal/binary/BinaryArray.java
 
b/modules/binary/impl/src/main/java/org/apache/ignite/internal/binary/BinaryArray.java
similarity index 98%
rename from 
modules/binary/api/src/main/java/org/apache/ignite/internal/binary/BinaryArray.java
rename to 
modules/binary/impl/src/main/java/org/apache/ignite/internal/binary/BinaryArray.java
index b998a31d0cd..38fc69fe1a4 100644
--- 
a/modules/binary/api/src/main/java/org/apache/ignite/internal/binary/BinaryArray.java
+++ 
b/modules/binary/impl/src/main/java/org/apache/ignite/internal/binary/BinaryArray.java
@@ -138,6 +138,11 @@ class BinaryArray implements BinaryObjectEx, 
Externalizable, Comparable<BinaryAr
         return arr;
     }
 
+    /** {@inheritDoc} */
+    @Override public boolean isArray() {
+        return true;
+    }
+
     /** {@inheritDoc} */
     @Override public int componentTypeId() {
         // This can happen when binary type was not registered in time of 
binary array creation.
diff --git 
a/modules/binary/api/src/main/java/org/apache/ignite/internal/binary/BinaryEnumArray.java
 
b/modules/binary/impl/src/main/java/org/apache/ignite/internal/binary/BinaryEnumArray.java
similarity index 100%
rename from 
modules/binary/api/src/main/java/org/apache/ignite/internal/binary/BinaryEnumArray.java
rename to 
modules/binary/impl/src/main/java/org/apache/ignite/internal/binary/BinaryEnumArray.java
diff --git 
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/binary/CacheObjectBinaryProcessorImpl.java
 
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/binary/CacheObjectBinaryProcessorImpl.java
index f9ccc8e3eb2..1d2dd384531 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
@@ -403,7 +403,7 @@ public class CacheObjectBinaryProcessorImpl extends 
GridProcessorAdapter impleme
             if (!BinaryUtils.useBinaryArrays())
                 return pArr;
 
-            return 
binaryCtx.createBinaryArray(obj.getClass().getComponentType(), pArr);
+            return BinaryUtils.binariesFactory.binaryArray(binaryCtx, 
obj.getClass().getComponentType(), pArr);
         }
 
         if (obj instanceof IgniteBiTuple) {
diff --git 
a/modules/json/src/main/java/org/apache/ignite/internal/binary/BinaryArraySerializer.java
 
b/modules/json/src/main/java/org/apache/ignite/internal/binary/BinaryArraySerializer.java
index 114e8aab4a6..f06c99e3dfb 100644
--- 
a/modules/json/src/main/java/org/apache/ignite/internal/binary/BinaryArraySerializer.java
+++ 
b/modules/json/src/main/java/org/apache/ignite/internal/binary/BinaryArraySerializer.java
@@ -23,11 +23,11 @@ import com.fasterxml.jackson.databind.JsonSerializer;
 import com.fasterxml.jackson.databind.SerializerProvider;
 
 /**
- * Custom serializer for {@link BinaryArray}.
+ * Custom serializer for binary arrays.
  */
-class BinaryArraySerializer extends JsonSerializer<BinaryArray> {
+class BinaryArraySerializer extends JsonSerializer<BinaryObjectEx> {
     /** {@inheritDoc} */
-    @Override public void serialize(BinaryArray val, JsonGenerator gen, 
SerializerProvider serializers) throws IOException {
+    @Override public void serialize(BinaryObjectEx val, JsonGenerator gen, 
SerializerProvider serializers) throws IOException {
         gen.writeStartArray();
 
         for (Object o : val.array())
diff --git 
a/modules/json/src/main/java/org/apache/ignite/internal/binary/BinarySerializers.java
 
b/modules/json/src/main/java/org/apache/ignite/internal/binary/BinarySerializers.java
index 0ebbd14c88e..701d9270e8d 100644
--- 
a/modules/json/src/main/java/org/apache/ignite/internal/binary/BinarySerializers.java
+++ 
b/modules/json/src/main/java/org/apache/ignite/internal/binary/BinarySerializers.java
@@ -26,6 +26,6 @@ public class BinarySerializers {
     /** Adds binary serializers to module. */
     public static void init(SimpleModule module) {
         
module.addSerializer((Class<BinaryObjectEx>)BinaryUtils.binariesFactory.binaryObjectImplClass(),
 new BinaryObjectImplSerializer());
-        module.addSerializer(BinaryArray.class, new BinaryArraySerializer());
+        
module.addSerializer((Class<BinaryObjectEx>)BinaryUtils.binariesFactory.binaryArrayClass(),
 new BinaryArraySerializer());
     }
 }

Reply via email to