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 110886ec1df IGNITE-27177 Remove BinaryWriter#typeId setter (#12534)
110886ec1df is described below
commit 110886ec1df046500a29ff49ec77722779e95a30
Author: Nikolay <[email protected]>
AuthorDate: Thu Nov 27 15:02:56 2025 +0300
IGNITE-27177 Remove BinaryWriter#typeId setter (#12534)
---
.../internal/binary/BinaryClassDescriptor.java | 2 -
.../apache/ignite/internal/binary/BinaryUtils.java | 17 ++++++--
.../ignite/internal/binary/BinaryWriterEx.java | 5 ---
.../ignite/internal/binary/BinaryWriterExImpl.java | 47 +++++++++++-----------
.../internal/binary/GridBinaryMarshaller.java | 2 +-
.../binary/builder/BinaryObjectBuilderImpl.java | 5 +--
.../internal/binary/BinaryMarshallerSelfTest.java | 2 +-
.../binary/RawBinaryObjectExtractorTest.java | 4 +-
8 files changed, 44 insertions(+), 40 deletions(-)
diff --git
a/modules/binary/api/src/main/java/org/apache/ignite/internal/binary/BinaryClassDescriptor.java
b/modules/binary/api/src/main/java/org/apache/ignite/internal/binary/BinaryClassDescriptor.java
index d8f2c428231..a9ca32721a5 100644
---
a/modules/binary/api/src/main/java/org/apache/ignite/internal/binary/BinaryClassDescriptor.java
+++
b/modules/binary/api/src/main/java/org/apache/ignite/internal/binary/BinaryClassDescriptor.java
@@ -608,8 +608,6 @@ class BinaryClassDescriptor {
assert writer != null;
assert mode != BinaryWriteMode.OPTIMIZED : "OptimizedMarshaller
should not be used here: " + cls.getName();
- writer.typeId(typeId);
-
switch (mode) {
case P_BYTE:
case BYTE:
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 4ce858fca0e..6b0a71f81a0 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
@@ -2922,9 +2922,10 @@ public class BinaryUtils {
/**
* @param ctx Context.
* @param failIfUnregistered Flag to fail while writing object of
unregistered type.
+ * @param typeId Type id.
* @return Writer instance.
*/
- public static BinaryWriterEx writer(BinaryContext ctx, boolean
failIfUnregistered) {
+ public static BinaryWriterEx writer(BinaryContext ctx, boolean
failIfUnregistered, int typeId) {
BinaryThreadLocalContext locCtx = BinaryThreadLocalContext.get();
return new BinaryWriterExImpl(
@@ -2932,7 +2933,8 @@ public class BinaryUtils {
BinaryStreams.outputStream((int)CommonUtils.KB, locCtx.chunk()),
locCtx.schemaHolder(),
null,
- failIfUnregistered
+ failIfUnregistered,
+ typeId
);
}
@@ -2942,7 +2944,14 @@ public class BinaryUtils {
* @return Writer instance.
*/
public static BinaryWriterEx writer(BinaryContext ctx, BinaryOutputStream
out) {
- return new BinaryWriterExImpl(ctx, out,
BinaryThreadLocalContext.get().schemaHolder(), null, false);
+ return new BinaryWriterExImpl(
+ ctx,
+ out,
+ BinaryThreadLocalContext.get().schemaHolder(),
+ null,
+ false,
+ GridBinaryMarshaller.UNREGISTERED_TYPE_ID
+ );
}
/**
@@ -2951,7 +2960,7 @@ public class BinaryUtils {
* @return Writer instance.
*/
public static BinaryWriterEx writer(BinaryContext ctx, BinaryOutputStream
out, BinaryWriterSchemaHolder schema) {
- return new BinaryWriterExImpl(ctx, out, schema, null, false);
+ return new BinaryWriterExImpl(ctx, out, schema, null, false,
GridBinaryMarshaller.UNREGISTERED_TYPE_ID);
}
/** @return Instance of caching handler. */
diff --git
a/modules/binary/api/src/main/java/org/apache/ignite/internal/binary/BinaryWriterEx.java
b/modules/binary/api/src/main/java/org/apache/ignite/internal/binary/BinaryWriterEx.java
index 5c73676c6bf..3327753c4b4 100644
---
a/modules/binary/api/src/main/java/org/apache/ignite/internal/binary/BinaryWriterEx.java
+++
b/modules/binary/api/src/main/java/org/apache/ignite/internal/binary/BinaryWriterEx.java
@@ -72,11 +72,6 @@ public interface BinaryWriterEx extends BinaryWriter,
BinaryRawWriter, ObjectOut
*/
void marshal(Object obj) throws BinaryObjectException;
- /**
- * @param typeId Type ID.
- */
- public void typeId(int typeId);
-
/**
* @return Array.
*/
diff --git
a/modules/binary/api/src/main/java/org/apache/ignite/internal/binary/BinaryWriterExImpl.java
b/modules/binary/api/src/main/java/org/apache/ignite/internal/binary/BinaryWriterExImpl.java
index ed1b092e9ad..6ac56295577 100644
---
a/modules/binary/api/src/main/java/org/apache/ignite/internal/binary/BinaryWriterExImpl.java
+++
b/modules/binary/api/src/main/java/org/apache/ignite/internal/binary/BinaryWriterExImpl.java
@@ -90,19 +90,22 @@ class BinaryWriterExImpl implements BinaryWriterEx {
* @param out Output stream.
* @param handles Handles.
* @param failIfUnregistered Flag to fail while writing object of
unregistered type.
+ * @param typeId Type id.
*/
public BinaryWriterExImpl(
BinaryContext ctx,
BinaryOutputStream out,
BinaryWriterSchemaHolder schema,
BinaryWriterHandles handles,
- boolean failIfUnregistered
+ boolean failIfUnregistered,
+ int typeId
) {
this.ctx = ctx;
this.out = out;
this.schema = schema;
this.handles = handles;
this.failIfUnregistered = failIfUnregistered;
+ this.typeId = typeId;
start = out.position();
}
@@ -112,11 +115,6 @@ class BinaryWriterExImpl implements BinaryWriterEx {
return failIfUnregistered;
}
- /** {@inheritDoc} */
- @Override public void typeId(int typeId) {
- this.typeId = typeId;
- }
-
/** {@inheritDoc} */
@Override public void close() {
out.close();
@@ -132,7 +130,7 @@ class BinaryWriterExImpl implements BinaryWriterEx {
* @param enableReplace Object replacing enabled flag.
* @throws org.apache.ignite.binary.BinaryObjectException In case of error.
*/
- void marshal(Object obj, boolean enableReplace) throws
BinaryObjectException {
+ private void marshal(Object obj, boolean enableReplace) throws
BinaryObjectException {
String newName = ctx.igniteInstanceName();
String oldName = CommonUtils.setCurrentIgniteName(newName);
@@ -204,6 +202,8 @@ class BinaryWriterExImpl implements BinaryWriterEx {
return;
}
+ this.typeId = desc.typeId();
+
desc.write(obj, this);
}
@@ -219,15 +219,6 @@ class BinaryWriterExImpl implements BinaryWriterEx {
return out.position();
}
- /**
- * Sets new position.
- *
- * @param pos Position.
- */
- void position(int pos) {
- out.position(pos);
- }
-
/** {@inheritDoc} */
@Override public void preWrite(@Nullable String clsName) {
out.position(out.position() + GridBinaryMarshaller.DFLT_HDR_LEN);
@@ -847,7 +838,14 @@ class BinaryWriterExImpl implements BinaryWriterEx {
if (obj == null)
out.writeByte(GridBinaryMarshaller.NULL);
else {
- BinaryWriterExImpl writer = new BinaryWriterExImpl(ctx, out,
schema, handles(), failIfUnregistered);
+ BinaryWriterExImpl writer = new BinaryWriterExImpl(
+ ctx,
+ out,
+ schema,
+ handles(),
+ failIfUnregistered,
+ GridBinaryMarshaller.UNREGISTERED_TYPE_ID
+ );
writer.marshal(obj);
}
@@ -858,7 +856,14 @@ class BinaryWriterExImpl implements BinaryWriterEx {
if (obj == null)
out.writeByte(GridBinaryMarshaller.NULL);
else {
- BinaryWriterExImpl writer = new BinaryWriterExImpl(ctx, out,
schema, null, failIfUnregistered);
+ BinaryWriterExImpl writer = new BinaryWriterExImpl(
+ ctx,
+ out,
+ schema,
+ null,
+ failIfUnregistered,
+ GridBinaryMarshaller.UNREGISTERED_TYPE_ID
+ );
writer.marshal(obj);
}
@@ -1537,11 +1542,7 @@ class BinaryWriterExImpl implements BinaryWriterEx {
/** {@inheritDoc} */
@Override public BinaryWriterEx newWriter(int typeId) {
- BinaryWriterExImpl res = new BinaryWriterExImpl(ctx, out, schema,
handles(), failIfUnregistered);
-
- res.typeId(typeId);
-
- return res;
+ return new BinaryWriterExImpl(ctx, out, schema, handles(),
failIfUnregistered, typeId);
}
/** {@inheritDoc} */
diff --git
a/modules/binary/api/src/main/java/org/apache/ignite/internal/binary/GridBinaryMarshaller.java
b/modules/binary/api/src/main/java/org/apache/ignite/internal/binary/GridBinaryMarshaller.java
index eed925e070d..b416597d763 100644
---
a/modules/binary/api/src/main/java/org/apache/ignite/internal/binary/GridBinaryMarshaller.java
+++
b/modules/binary/api/src/main/java/org/apache/ignite/internal/binary/GridBinaryMarshaller.java
@@ -250,7 +250,7 @@ public class GridBinaryMarshaller {
if (obj == null)
return new byte[] { NULL };
- try (BinaryWriterEx writer = BinaryUtils.writer(ctx,
failIfUnregistered)) {
+ try (BinaryWriterEx writer = BinaryUtils.writer(ctx,
failIfUnregistered, UNREGISTERED_TYPE_ID)) {
writer.marshal(obj);
return writer.array();
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 3eca70ca1f6..fd43af92bd3 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
@@ -176,10 +176,9 @@ class BinaryObjectBuilderImpl implements
BinaryObjectBuilderEx {
try (BinaryWriterEx writer = BinaryUtils.writer(
ctx,
- curThread instanceof IgniteThread &&
((IgniteThread)curThread).isForbiddenToRequestBinaryMetadata())
+ curThread instanceof IgniteThread &&
((IgniteThread)curThread).isForbiddenToRequestBinaryMetadata(),
+ typeId)
) {
- writer.typeId(typeId);
-
BinaryBuilderSerializer serializationCtx = new
BinaryBuilderSerializer();
serializationCtx.registerObjectWriting(this, 0);
diff --git
a/modules/core/src/test/java/org/apache/ignite/internal/binary/BinaryMarshallerSelfTest.java
b/modules/core/src/test/java/org/apache/ignite/internal/binary/BinaryMarshallerSelfTest.java
index 955826b8f3f..dcc49c013e4 100644
---
a/modules/core/src/test/java/org/apache/ignite/internal/binary/BinaryMarshallerSelfTest.java
+++
b/modules/core/src/test/java/org/apache/ignite/internal/binary/BinaryMarshallerSelfTest.java
@@ -3019,7 +3019,7 @@ public class BinaryMarshallerSelfTest extends
AbstractBinaryArraysTest {
BinaryMarshaller marsh = binaryMarshaller();
- try (BinaryWriterEx writer = BinaryUtils.writer(binaryContext(marsh),
false)) {
+ try (BinaryWriterEx writer = BinaryUtils.writer(binaryContext(marsh),
false, GridBinaryMarshaller.UNREGISTERED_TYPE_ID)) {
assertEquals(true, BinaryStreamsTestUtils.threadLocalIsAcquired());
writer.writeString("Thread local test");
diff --git
a/modules/core/src/test/java/org/apache/ignite/internal/binary/RawBinaryObjectExtractorTest.java
b/modules/core/src/test/java/org/apache/ignite/internal/binary/RawBinaryObjectExtractorTest.java
index 3cf2d7b570f..364dbdc43dd 100644
---
a/modules/core/src/test/java/org/apache/ignite/internal/binary/RawBinaryObjectExtractorTest.java
+++
b/modules/core/src/test/java/org/apache/ignite/internal/binary/RawBinaryObjectExtractorTest.java
@@ -38,6 +38,8 @@ import org.apache.ignite.marshaller.jdk.JdkMarshaller;
import org.apache.ignite.testframework.junits.common.GridCommonAbstractTest;
import org.junit.Test;
+import static
org.apache.ignite.internal.binary.GridBinaryMarshaller.UNREGISTERED_TYPE_ID;
+
/** */
public class RawBinaryObjectExtractorTest extends GridCommonAbstractTest {
/** */
@@ -49,7 +51,7 @@ public class RawBinaryObjectExtractorTest extends
GridCommonAbstractTest {
byte[] serializedTestObjectsBytes;
- try (BinaryWriterEx writer = BinaryUtils.writer(ctx, false)) {
+ try (BinaryWriterEx writer = BinaryUtils.writer(ctx, false,
UNREGISTERED_TYPE_ID)) {
testObjects.forEach(writer::writeObject);
serializedTestObjectsBytes = writer.array();
