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 a0b097671e1 IGNITE-27535 Move BinarySerializedFieldComparator to test
(#12625)
a0b097671e1 is described below
commit a0b097671e1d59a9ab0e6a7baa465cf63f9d14b8
Author: Nikolay <[email protected]>
AuthorDate: Mon Jan 12 14:14:59 2026 +0300
IGNITE-27535 Move BinarySerializedFieldComparator to test (#12625)
---
.../ignite/internal/binary/BinaryObjectExImpl.java | 7 ------
.../ignite/internal/binary/BinaryObjectImpl.java | 15 ------------
.../internal/binary/BinaryObjectOffheapImpl.java | 15 ------------
.../BinarySerialiedFieldComparatorSelfTest.java | 28 ++++++++++++++++++++--
.../binary/BinarySerializedFieldComparator.java | 4 ++--
5 files changed, 28 insertions(+), 41 deletions(-)
diff --git
a/modules/binary/api/src/main/java/org/apache/ignite/internal/binary/BinaryObjectExImpl.java
b/modules/binary/api/src/main/java/org/apache/ignite/internal/binary/BinaryObjectExImpl.java
index e8a5dbb9e2a..60eabf13710 100644
---
a/modules/binary/api/src/main/java/org/apache/ignite/internal/binary/BinaryObjectExImpl.java
+++
b/modules/binary/api/src/main/java/org/apache/ignite/internal/binary/BinaryObjectExImpl.java
@@ -93,13 +93,6 @@ abstract class BinaryObjectExImpl implements BinaryObjectEx {
*/
@Nullable public abstract <F> F fieldByOrder(int order);
- /**
- * Create field comparator.
- *
- * @return Comparator.
- */
- public abstract BinarySerializedFieldComparator createFieldComparator();
-
/**
* Writes field value defined by the given field offset to the given byte
buffer.
*
diff --git
a/modules/binary/api/src/main/java/org/apache/ignite/internal/binary/BinaryObjectImpl.java
b/modules/binary/api/src/main/java/org/apache/ignite/internal/binary/BinaryObjectImpl.java
index aef10000644..07e68aef38b 100644
---
a/modules/binary/api/src/main/java/org/apache/ignite/internal/binary/BinaryObjectImpl.java
+++
b/modules/binary/api/src/main/java/org/apache/ignite/internal/binary/BinaryObjectImpl.java
@@ -394,21 +394,6 @@ final class BinaryObjectImpl extends BinaryObjectExImpl
implements Externalizabl
return (F)reader(null, false).unmarshalField(fieldId);
}
- /** {@inheritDoc} */
- @Override public BinarySerializedFieldComparator createFieldComparator() {
- int schemaOff = BinaryPrimitives.readInt(arr, start +
GridBinaryMarshaller.SCHEMA_OR_RAW_OFF_POS);
-
- short flags = BinaryPrimitives.readShort(arr, start +
GridBinaryMarshaller.FLAGS_POS);
-
- int fieldIdLen = BinaryUtils.isCompactFooter(flags) ? 0 :
BinaryUtils.FIELD_ID_LEN;
- int fieldOffLen = BinaryUtils.fieldOffsetLength(flags);
-
- int orderBase = start + schemaOff + fieldIdLen;
- int orderMultiplier = fieldIdLen + fieldOffLen;
-
- return new BinarySerializedFieldComparator(this, arr, 0L, start,
orderBase, orderMultiplier, fieldOffLen);
- }
-
/** {@inheritDoc} */
@Override public int dataStartOffset() {
int typeId = BinaryPrimitives.readInt(arr, start +
GridBinaryMarshaller.TYPE_ID_POS);
diff --git
a/modules/binary/api/src/main/java/org/apache/ignite/internal/binary/BinaryObjectOffheapImpl.java
b/modules/binary/api/src/main/java/org/apache/ignite/internal/binary/BinaryObjectOffheapImpl.java
index 57e3d9c8eba..1d1318f8b02 100644
---
a/modules/binary/api/src/main/java/org/apache/ignite/internal/binary/BinaryObjectOffheapImpl.java
+++
b/modules/binary/api/src/main/java/org/apache/ignite/internal/binary/BinaryObjectOffheapImpl.java
@@ -200,21 +200,6 @@ class BinaryObjectOffheapImpl extends BinaryObjectExImpl
implements Externalizab
return (F)reader(null, false).unmarshalField(fieldId);
}
- /** {@inheritDoc} */
- @Override public BinarySerializedFieldComparator createFieldComparator() {
- int schemaOff = BinaryPrimitives.readInt(ptr, start +
GridBinaryMarshaller.SCHEMA_OR_RAW_OFF_POS);
-
- short flags = BinaryPrimitives.readShort(ptr, start +
GridBinaryMarshaller.FLAGS_POS);
-
- int fieldIdLen = BinaryUtils.isCompactFooter(flags) ? 0 :
BinaryUtils.FIELD_ID_LEN;
- int fieldOffLen = BinaryUtils.fieldOffsetLength(flags);
-
- int orderBase = start + schemaOff + fieldIdLen;
- int orderMultiplier = fieldIdLen + fieldOffLen;
-
- return new BinarySerializedFieldComparator(this, null, ptr, start,
orderBase, orderMultiplier, fieldOffLen);
- }
-
/** {@inheritDoc} */
@Override public int dataStartOffset() {
int typeId = BinaryPrimitives.readInt(ptr, start +
GridBinaryMarshaller.TYPE_ID_POS);
diff --git
a/modules/core/src/test/java/org/apache/ignite/internal/binary/BinarySerialiedFieldComparatorSelfTest.java
b/modules/core/src/test/java/org/apache/ignite/internal/binary/BinarySerialiedFieldComparatorSelfTest.java
index 736129dd90e..bacc6fb1e34 100644
---
a/modules/core/src/test/java/org/apache/ignite/internal/binary/BinarySerialiedFieldComparatorSelfTest.java
+++
b/modules/core/src/test/java/org/apache/ignite/internal/binary/BinarySerialiedFieldComparatorSelfTest.java
@@ -478,8 +478,8 @@ public class BinarySerialiedFieldComparatorSelfTest extends
GridCommonAbstractTe
* @param expRes Expected result.
*/
private void compareSingle(BinaryObjectExImpl first, BinaryObjectExImpl
second, boolean expRes) {
- BinarySerializedFieldComparator firstComp =
first.createFieldComparator();
- BinarySerializedFieldComparator secondComp =
second.createFieldComparator();
+ BinarySerializedFieldComparator firstComp = comparator(first);
+ BinarySerializedFieldComparator secondComp = comparator(second);
// Compare expected result.
firstComp.findField(singleFieldOrder(first));
@@ -488,6 +488,30 @@ public class BinarySerialiedFieldComparatorSelfTest
extends GridCommonAbstractTe
assertEquals(expRes, BinarySerializedFieldComparator.equals(firstComp,
secondComp));
}
+ /** */
+ private BinarySerializedFieldComparator comparator(BinaryObjectExImpl obj)
{
+ byte[] arr = obj.bytes();
+ long ptr = obj.offheapAddress();
+
+ int start = obj.start();
+
+ int schemaOff = (obj instanceof BinaryObjectOffheapImpl)
+ ? BinaryPrimitives.readInt(ptr, start +
GridBinaryMarshaller.SCHEMA_OR_RAW_OFF_POS)
+ : BinaryPrimitives.readInt(arr, start +
GridBinaryMarshaller.SCHEMA_OR_RAW_OFF_POS);
+
+ short flags = (obj instanceof BinaryObjectOffheapImpl)
+ ? BinaryPrimitives.readShort(ptr, start +
GridBinaryMarshaller.FLAGS_POS)
+ : BinaryPrimitives.readShort(arr, start +
GridBinaryMarshaller.FLAGS_POS);
+
+ int fieldIdLen = BinaryUtils.isCompactFooter(flags) ? 0 :
BinaryUtils.FIELD_ID_LEN;
+ int fieldOffLen = BinaryUtils.fieldOffsetLength(flags);
+
+ int orderBase = start + schemaOff + fieldIdLen;
+ int orderMultiplier = fieldIdLen + fieldOffLen;
+
+ return new BinarySerializedFieldComparator(obj, arr, ptr, start,
orderBase, orderMultiplier, fieldOffLen);
+ }
+
/**
* Get single field order.
*
diff --git
a/modules/binary/api/src/main/java/org/apache/ignite/internal/binary/BinarySerializedFieldComparator.java
b/modules/core/src/test/java/org/apache/ignite/internal/binary/BinarySerializedFieldComparator.java
similarity index 98%
rename from
modules/binary/api/src/main/java/org/apache/ignite/internal/binary/BinarySerializedFieldComparator.java
rename to
modules/core/src/test/java/org/apache/ignite/internal/binary/BinarySerializedFieldComparator.java
index ee5a7b6c150..150c1475bda 100644
---
a/modules/binary/api/src/main/java/org/apache/ignite/internal/binary/BinarySerializedFieldComparator.java
+++
b/modules/core/src/test/java/org/apache/ignite/internal/binary/BinarySerializedFieldComparator.java
@@ -24,7 +24,7 @@ import org.apache.ignite.internal.util.typedef.F;
import static org.apache.ignite.internal.binary.BinaryUtils.arrayEq;
/**
- * Compares fiels in serialized form when possible.
+ * Compares fields in serialized form when possible.
*/
class BinarySerializedFieldComparator {
/** Position: not found. */
@@ -68,7 +68,7 @@ class BinarySerializedFieldComparator {
* @param orderMultiplier Order multiplier.
* @param fieldOffLen Field offset length.
*/
- public BinarySerializedFieldComparator(BinaryObjectExImpl obj, byte[] arr,
long ptr, int startOff, int orderBase,
+ BinarySerializedFieldComparator(BinaryObjectExImpl obj, byte[] arr, long
ptr, int startOff, int orderBase,
int orderMultiplier, int fieldOffLen) {
assert arr != null && ptr == 0L || arr == null && ptr != 0L;
