From 311fb6a997b1109ad9c12d797e9fba5cedca861d Mon Sep 17 00:00:00 2001 From: Nikolay Izhikov Date: Fri, 7 Aug 2026 18:28:27 +0300 Subject: [PATCH 1/2] [WIP] Check what test control USE_CACHE logic. --- .../java/org/apache/ignite/internal/binary/BinaryArray.java | 2 ++ .../org/apache/ignite/internal/binary/BinaryEnumObjectImpl.java | 2 ++ .../org/apache/ignite/internal/binary/BinaryObjectImpl.java | 2 ++ .../apache/ignite/internal/binary/BinaryObjectOffheapImpl.java | 2 ++ 4 files changed, 8 insertions(+) diff --git a/modules/binary/api/src/main/java/org/apache/ignite/internal/binary/BinaryArray.java b/modules/binary/api/src/main/java/org/apache/ignite/internal/binary/BinaryArray.java index dc8bc639b7401..6ba029e63ca6e 100644 --- a/modules/binary/api/src/main/java/org/apache/ignite/internal/binary/BinaryArray.java +++ b/modules/binary/api/src/main/java/org/apache/ignite/internal/binary/BinaryArray.java @@ -106,8 +106,10 @@ public BinaryArray(BinaryContext ctx, int compTypeId, @Nullable String compClsNa @Override public T deserialize(ClassLoader ldr) throws BinaryObjectException { ClassLoader resolveLdr = ldr == null ? ctx.classLoader() : ldr; +/* if (ldr != null) Marshallers.USE_CACHE.set(Boolean.FALSE); +*/ try { Class compType = BinaryUtils.resolveClass(ctx, compTypeId, compClsName, resolveLdr, false); diff --git a/modules/binary/impl/src/main/java/org/apache/ignite/internal/binary/BinaryEnumObjectImpl.java b/modules/binary/impl/src/main/java/org/apache/ignite/internal/binary/BinaryEnumObjectImpl.java index 2024eef66e521..f4593e6695d5a 100644 --- a/modules/binary/impl/src/main/java/org/apache/ignite/internal/binary/BinaryEnumObjectImpl.java +++ b/modules/binary/impl/src/main/java/org/apache/ignite/internal/binary/BinaryEnumObjectImpl.java @@ -171,8 +171,10 @@ public BinaryEnumObjectImpl(BinaryContext ctx, byte[] arr) { @Override public T deserialize(@Nullable ClassLoader ldr) throws BinaryObjectException { ClassLoader resolveLdr = ldr == null ? ctx.classLoader() : ldr; +/* if (ldr != null) Marshallers.USE_CACHE.set(Boolean.FALSE); +*/ try { Class cls = BinaryUtils.resolveClass(ctx, typeId, clsName, resolveLdr, false); 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 7dd2bebdf86af..aa907af272b45 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 @@ -694,7 +694,9 @@ else if (fieldOffsetLen == BinaryUtils.OFFSET_2) if (ldr == null) return deserialize(); +/* Marshallers.USE_CACHE.set(Boolean.FALSE); +*/ try { return (T)reader(null, ldr, true).deserialize(); 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 e2ac1b89b4e42..fa73f0956c0e6 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 @@ -397,7 +397,9 @@ else if (fieldOffLen == BinaryUtils.OFFSET_2) if (ldr == null) return deserialize(); +/* Marshallers.USE_CACHE.set(Boolean.FALSE); +*/ try { return (T)reader(null, ldr, true).deserialize(); From 7e04c838f09e3c6e504ce2c30e1bd7465c71a536 Mon Sep 17 00:00:00 2001 From: Nikolay Izhikov Date: Fri, 7 Aug 2026 22:13:32 +0300 Subject: [PATCH 2/2] [WIP] Check what test control USE_CACHE logic. --- .../org/apache/ignite/internal/binary/BinaryEnumObjectImpl.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/binary/impl/src/main/java/org/apache/ignite/internal/binary/BinaryEnumObjectImpl.java b/modules/binary/impl/src/main/java/org/apache/ignite/internal/binary/BinaryEnumObjectImpl.java index f4593e6695d5a..66360a3cee55f 100644 --- a/modules/binary/impl/src/main/java/org/apache/ignite/internal/binary/BinaryEnumObjectImpl.java +++ b/modules/binary/impl/src/main/java/org/apache/ignite/internal/binary/BinaryEnumObjectImpl.java @@ -195,7 +195,7 @@ public BinaryEnumObjectImpl(BinaryContext ctx, byte[] arr) { private T uncachedValue(Class cls) throws BinaryObjectException { assert cls != null; - assert !Marshallers.USE_CACHE.get(); + //assert !Marshallers.USE_CACHE.get(); if (ord >= 0) { Object[] vals = cls.getEnumConstants();