(ignite) branch master updated: IGNITE-26077 Remove QueryUtils usage from BinaryContext (#12232)

[nizhikov]

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 d3fc842a5fb IGNITE-26077 Remove QueryUtils usage from BinaryContext 
(#12232)
d3fc842a5fb is described below

commit d3fc842a5fbccf128f20f9d80dd204b825a8002e
Author: Nikolay <nizhi...@apache.org>
AuthorDate: Thu Jul 31 09:51:25 2025 +0300

    IGNITE-26077 Remove QueryUtils usage from BinaryContext (#12232)
---
 .../main/java/org/apache/ignite/internal/binary/BinaryContext.java    | 4 +---
 .../java/org/apache/ignite/internal/processors/query/QueryUtils.java  | 4 ++--
 2 files changed, 3 insertions(+), 5 deletions(-)

diff --git 
a/modules/core/src/main/java/org/apache/ignite/internal/binary/BinaryContext.java
 
b/modules/core/src/main/java/org/apache/ignite/internal/binary/BinaryContext.java
index 7cd5864b8c1..33133a9d434 100644
--- 
a/modules/core/src/main/java/org/apache/ignite/internal/binary/BinaryContext.java
+++ 
b/modules/core/src/main/java/org/apache/ignite/internal/binary/BinaryContext.java
@@ -74,7 +74,6 @@ import 
org.apache.ignite.internal.processors.datastructures.CollocatedSetItemKey
 import 
org.apache.ignite.internal.processors.platform.PlatformJavaObjectFactoryProxy;
 import 
org.apache.ignite.internal.processors.platform.websession.PlatformDotNetSessionData;
 import 
org.apache.ignite.internal.processors.platform.websession.PlatformDotNetSessionLockResult;
-import org.apache.ignite.internal.processors.query.QueryUtils;
 import org.apache.ignite.internal.util.IgniteUtils;
 import org.apache.ignite.internal.util.lang.GridMapEntry;
 import org.apache.ignite.internal.util.typedef.F;
@@ -349,8 +348,7 @@ public class BinaryContext {
             if (cls == TreeMap.class || cls == TreeSet.class)
                 return false;
 
-            return marshCtx.isSystemType(cls.getName()) || 
serializerForClass(cls) == null ||
-                QueryUtils.isGeometryClass(cls);
+            return marshCtx.isSystemType(cls.getName()) || 
serializerForClass(cls) == null;
         }
         else
             return desc.useOptimizedMarshaller();
diff --git 
a/modules/core/src/main/java/org/apache/ignite/internal/processors/query/QueryUtils.java
 
b/modules/core/src/main/java/org/apache/ignite/internal/processors/query/QueryUtils.java
index ac81f0ee933..fe3e7848b94 100644
--- 
a/modules/core/src/main/java/org/apache/ignite/internal/processors/query/QueryUtils.java
+++ 
b/modules/core/src/main/java/org/apache/ignite/internal/processors/query/QueryUtils.java
@@ -508,12 +508,12 @@ public class QueryUtils {
 
         if (!keyOrValMustDeserialize) {
             // Safe to check null.
-            if (SQL_TYPES.contains(valCls))
+            if (valCls != null && isSqlType(valCls))
                 desc.valueClass(valCls);
             else
                 desc.valueClass(Object.class);
 
-            if (SQL_TYPES.contains(keyCls))
+            if (isSqlType(keyCls))
                 desc.keyClass(keyCls);
             else
                 desc.keyClass(Object.class);