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 85f44fec2dd IGNITE-29044 Move BinaryWriterSchemaHolder to binary-impl
(#13564)
85f44fec2dd is described below
commit 85f44fec2dd70b4093bd12ae0bd9a029cbb8cc1b
Author: Nikolay <[email protected]>
AuthorDate: Wed Sep 9 12:49:28 2026 +0300
IGNITE-29044 Move BinaryWriterSchemaHolder to binary-impl (#13564)
---
.../main/java/org/apache/ignite/internal/binary/BinariesFactory.java | 3 +--
.../src/main/java/org/apache/ignite/internal/binary/BinaryUtils.java | 4 ++--
.../java/org/apache/ignite/internal/binary/BinariesFactoryImpl.java | 4 ++--
.../java/org/apache/ignite/internal/binary/BinaryWriterExImpl.java | 4 ++--
.../org/apache/ignite/internal/binary/BinaryWriterSchemaHolder.java | 0
.../java/org/apache/ignite/internal/jdbc/thin/JdbcThinTcpIo.java | 5 ++---
.../ignite/internal/processors/odbc/ClientListenerNioListener.java | 2 +-
.../apache/ignite/internal/client/thin/events/FakeIgniteServer.java | 2 +-
.../org/apache/ignite/platform/PlatformGetInternalCachesTask.java | 2 +-
.../org/apache/ignite/internal/client/thin/ClientAtomicLongImpl.java | 2 +-
.../ignite/internal/client/thin/ClientCacheAffinityContext.java | 2 +-
.../ignite/internal/client/thin/ClientCacheAffinityMapping.java | 2 +-
.../java/org/apache/ignite/internal/client/thin/ClientUtils.java | 4 ++--
.../java/org/apache/ignite/internal/client/thin/TcpClientCache.java | 2 +-
.../org/apache/ignite/internal/client/thin/TcpClientChannel.java | 2 +-
.../apache/ignite/internal/client/thin/TcpClientTransactions.java | 2 +-
.../java/org/apache/ignite/internal/client/thin/TcpIgniteClient.java | 2 +-
17 files changed, 21 insertions(+), 23 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 3538c2b452f..c06e669ee28 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
@@ -90,10 +90,9 @@ public interface BinariesFactory {
/**
* @param ctx Context.
* @param out Output stream.
- * @param schema Schema holder
* @return Writer instance.
*/
- public BinaryWriterEx writer(BinaryContext ctx, BinaryOutputStream out,
BinaryWriterSchemaHolder schema);
+ public BinaryWriterEx writerWithoutSchema(BinaryContext ctx,
BinaryOutputStream out);
/**
* Create accessor for the field.
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 e10222a6593..45146bb29d2 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
@@ -2897,8 +2897,8 @@ public class BinaryUtils {
* @param out Output stream.
* @return Writer instance.
*/
- public static BinaryWriterEx writer(BinaryContext ctx, BinaryOutputStream
out, BinaryWriterSchemaHolder schema) {
- return binariesFactory.writer(ctx, out, schema);
+ public static BinaryWriterEx writerWithoutSchema(BinaryContext ctx,
BinaryOutputStream out) {
+ return binariesFactory.writerWithoutSchema(ctx, out);
}
/** @return Instance of caching handler. */
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 0064ab7cb6e..211eb67c17e 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
@@ -90,8 +90,8 @@ public class BinariesFactoryImpl implements BinariesFactory {
}
/** {@inheritDoc} */
- @Override public BinaryWriterEx writer(BinaryContext ctx,
BinaryOutputStream out, BinaryWriterSchemaHolder schema) {
- return new BinaryWriterExImpl(ctx, out, schema, null, false,
GridBinaryMarshaller.UNREGISTERED_TYPE_ID);
+ @Override public BinaryWriterEx writerWithoutSchema(BinaryContext ctx,
BinaryOutputStream out) {
+ return new BinaryWriterExImpl(ctx, out, null, null, false,
GridBinaryMarshaller.UNREGISTERED_TYPE_ID);
}
/** {@inheritDoc} */
diff --git
a/modules/binary/impl/src/main/java/org/apache/ignite/internal/binary/BinaryWriterExImpl.java
b/modules/binary/impl/src/main/java/org/apache/ignite/internal/binary/BinaryWriterExImpl.java
index 033be969abc..176a1ec9eb1 100644
---
a/modules/binary/impl/src/main/java/org/apache/ignite/internal/binary/BinaryWriterExImpl.java
+++
b/modules/binary/impl/src/main/java/org/apache/ignite/internal/binary/BinaryWriterExImpl.java
@@ -60,7 +60,7 @@ class BinaryWriterExImpl implements BinaryWriterEx {
private final BinaryOutputStream out;
/** Schema. */
- private final BinaryWriterSchemaHolder schema;
+ private final @Nullable BinaryWriterSchemaHolder schema;
/** */
private int typeId;
@@ -96,7 +96,7 @@ class BinaryWriterExImpl implements BinaryWriterEx {
public BinaryWriterExImpl(
BinaryContext ctx,
BinaryOutputStream out,
- BinaryWriterSchemaHolder schema,
+ @Nullable BinaryWriterSchemaHolder schema,
BinaryWriterHandles handles,
boolean failIfUnregistered,
int typeId
diff --git
a/modules/binary/api/src/main/java/org/apache/ignite/internal/binary/BinaryWriterSchemaHolder.java
b/modules/binary/impl/src/main/java/org/apache/ignite/internal/binary/BinaryWriterSchemaHolder.java
similarity index 100%
rename from
modules/binary/api/src/main/java/org/apache/ignite/internal/binary/BinaryWriterSchemaHolder.java
rename to
modules/binary/impl/src/main/java/org/apache/ignite/internal/binary/BinaryWriterSchemaHolder.java
diff --git
a/modules/core/src/main/java/org/apache/ignite/internal/jdbc/thin/JdbcThinTcpIo.java
b/modules/core/src/main/java/org/apache/ignite/internal/jdbc/thin/JdbcThinTcpIo.java
index 4a3bf02a87c..faa6d7a5c4c 100644
---
a/modules/core/src/main/java/org/apache/ignite/internal/jdbc/thin/JdbcThinTcpIo.java
+++
b/modules/core/src/main/java/org/apache/ignite/internal/jdbc/thin/JdbcThinTcpIo.java
@@ -275,7 +275,7 @@ public class JdbcThinTcpIo {
marsh.setContext(new MarshallerContextImpl(null));
- BinaryWriterEx writer = BinaryUtils.writer(U.binaryContext(marsh),
BinaryStreams.outputStream(HANDSHAKE_MSG_SIZE), null);
+ BinaryWriterEx writer =
BinaryUtils.writerWithoutSchema(U.binaryContext(marsh),
BinaryStreams.outputStream(HANDSHAKE_MSG_SIZE));
writer.writeByte((byte)ClientListenerRequest.HANDSHAKE);
@@ -436,8 +436,7 @@ public class JdbcThinTcpIo {
* @throws SQLException On connection reject.
*/
private HandshakeResult handshake_2_1_0() throws IOException, SQLException
{
- BinaryWriterEx writer = BinaryUtils.writer(null,
BinaryStreams.outputStream(HANDSHAKE_MSG_SIZE),
- null);
+ BinaryWriterEx writer = BinaryUtils.writerWithoutSchema(null,
BinaryStreams.outputStream(HANDSHAKE_MSG_SIZE));
writer.writeByte((byte)ClientListenerRequest.HANDSHAKE);
diff --git
a/modules/core/src/main/java/org/apache/ignite/internal/processors/odbc/ClientListenerNioListener.java
b/modules/core/src/main/java/org/apache/ignite/internal/processors/odbc/ClientListenerNioListener.java
index 2f9382a44fd..b72125fad26 100644
---
a/modules/core/src/main/java/org/apache/ignite/internal/processors/odbc/ClientListenerNioListener.java
+++
b/modules/core/src/main/java/org/apache/ignite/internal/processors/odbc/ClientListenerNioListener.java
@@ -374,7 +374,7 @@ public class ClientListenerNioListener extends
GridNioServerListenerAdapter<Clie
ClientListenerProtocolVersion ver =
ClientListenerProtocolVersion.create(verMajor, verMinor, verMaintenance);
- BinaryWriterEx writer = BinaryUtils.writer(null,
BinaryStreams.outputStream(8), null);
+ BinaryWriterEx writer = BinaryUtils.writerWithoutSchema(null,
BinaryStreams.outputStream(8));
byte clientType = reader.readByte();
diff --git
a/modules/core/src/test/java/org/apache/ignite/internal/client/thin/events/FakeIgniteServer.java
b/modules/core/src/test/java/org/apache/ignite/internal/client/thin/events/FakeIgniteServer.java
index 6288699c7b2..db6b74e69bc 100644
---
a/modules/core/src/test/java/org/apache/ignite/internal/client/thin/events/FakeIgniteServer.java
+++
b/modules/core/src/test/java/org/apache/ignite/internal/client/thin/events/FakeIgniteServer.java
@@ -224,7 +224,7 @@ public class FakeIgniteServer extends JUnitAssertAware
implements GridNioServerL
/** */
private ByteBuffer createMessage(Consumer<BinaryRawWriter> writerAction) {
- try (BinaryWriterEx writer = BinaryUtils.writer(null,
BinaryStreams.outputStream(32), null)) {
+ try (BinaryWriterEx writer = BinaryUtils.writerWithoutSchema(null,
BinaryStreams.outputStream(32))) {
writer.writeInt(0);
writerAction.accept(writer);
diff --git
a/modules/core/src/test/java/org/apache/ignite/platform/PlatformGetInternalCachesTask.java
b/modules/core/src/test/java/org/apache/ignite/platform/PlatformGetInternalCachesTask.java
index ee767453873..af4d47d9296 100644
---
a/modules/core/src/test/java/org/apache/ignite/platform/PlatformGetInternalCachesTask.java
+++
b/modules/core/src/test/java/org/apache/ignite/platform/PlatformGetInternalCachesTask.java
@@ -68,7 +68,7 @@ public class PlatformGetInternalCachesTask extends
ComputeTaskAdapter<Object, by
@Override public byte[] execute() {
IgniteEx ign = (IgniteEx)ignite;
- try (BinaryWriterEx writer =
BinaryUtils.writer(U.binaryContext(null), BinaryStreams.outputStream(512),
null)) {
+ try (BinaryWriterEx writer =
BinaryUtils.writerWithoutSchema(U.binaryContext(null),
BinaryStreams.outputStream(512))) {
Collection<IgniteInternalCache<?, ?>> caches = ign.cachesx();
writer.writeInt(caches.size());
diff --git
a/modules/thin-client/impl/src/main/java/org/apache/ignite/internal/client/thin/ClientAtomicLongImpl.java
b/modules/thin-client/impl/src/main/java/org/apache/ignite/internal/client/thin/ClientAtomicLongImpl.java
index 29055ea3d3f..17e2df80633 100644
---
a/modules/thin-client/impl/src/main/java/org/apache/ignite/internal/client/thin/ClientAtomicLongImpl.java
+++
b/modules/thin-client/impl/src/main/java/org/apache/ignite/internal/client/thin/ClientAtomicLongImpl.java
@@ -134,7 +134,7 @@ public class ClientAtomicLongImpl implements
ClientAtomicLong {
* @param out Output channel.
*/
private void writeName(PayloadOutputChannel out) {
- try (BinaryWriterEx w = BinaryUtils.writer(null, out.out(), null)) {
+ try (BinaryWriterEx w = BinaryUtils.writerWithoutSchema(null,
out.out())) {
w.writeString(name);
w.writeString(groupName);
}
diff --git
a/modules/thin-client/impl/src/main/java/org/apache/ignite/internal/client/thin/ClientCacheAffinityContext.java
b/modules/thin-client/impl/src/main/java/org/apache/ignite/internal/client/thin/ClientCacheAffinityContext.java
index fb3877dbdee..322e6227b96 100644
---
a/modules/thin-client/impl/src/main/java/org/apache/ignite/internal/client/thin/ClientCacheAffinityContext.java
+++
b/modules/thin-client/impl/src/main/java/org/apache/ignite/internal/client/thin/ClientCacheAffinityContext.java
@@ -250,7 +250,7 @@ public class ClientCacheAffinityContext {
* @param ch Payload output channel.
*/
public void writeDataCenterNodesRequest(PayloadOutputChannel ch) {
- try (BinaryWriterEx w = BinaryUtils.writer(null, ch.out(), null)) {
+ try (BinaryWriterEx w = BinaryUtils.writerWithoutSchema(null,
ch.out())) {
w.writeString(dataCenterId);
}
}
diff --git
a/modules/thin-client/impl/src/main/java/org/apache/ignite/internal/client/thin/ClientCacheAffinityMapping.java
b/modules/thin-client/impl/src/main/java/org/apache/ignite/internal/client/thin/ClientCacheAffinityMapping.java
index 1ee7b28fb7e..c967987809a 100644
---
a/modules/thin-client/impl/src/main/java/org/apache/ignite/internal/client/thin/ClientCacheAffinityMapping.java
+++
b/modules/thin-client/impl/src/main/java/org/apache/ignite/internal/client/thin/ClientCacheAffinityMapping.java
@@ -173,7 +173,7 @@ public class ClientCacheAffinityMapping {
out.writeBoolean(customMappingsRequired);
if (ctx.isFeatureSupported(DC_AWARE)) {
- try (BinaryWriterEx w = BinaryUtils.writer(null, out, null)) {
+ try (BinaryWriterEx w = BinaryUtils.writerWithoutSchema(null,
out)) {
w.writeString(dcId);
}
}
diff --git
a/modules/thin-client/impl/src/main/java/org/apache/ignite/internal/client/thin/ClientUtils.java
b/modules/thin-client/impl/src/main/java/org/apache/ignite/internal/client/thin/ClientUtils.java
index 0bf8047dd3a..c6d720c5565 100644
---
a/modules/thin-client/impl/src/main/java/org/apache/ignite/internal/client/thin/ClientUtils.java
+++
b/modules/thin-client/impl/src/main/java/org/apache/ignite/internal/client/thin/ClientUtils.java
@@ -224,7 +224,7 @@ public final class ClientUtils {
/** Serialize binary type metadata to stream. */
void binaryMetadata(BinaryMetadata meta, BinaryOutputStream out) {
- try (BinaryWriterEx w = BinaryUtils.writer(marsh.context(), out,
null)) {
+ try (BinaryWriterEx w =
BinaryUtils.writerWithoutSchema(marsh.context(), out)) {
w.writeInt(meta.typeId());
w.writeString(meta.typeName());
w.writeString(meta.affinityKeyFieldName());
@@ -269,7 +269,7 @@ public final class ClientUtils {
/** Serialize configuration to stream. */
void cacheConfiguration(ClientCacheConfiguration cfg, boolean sql,
BinaryOutputStream out, ProtocolContext protocolCtx) {
- try (BinaryWriterEx writer = BinaryUtils.writer(marsh.context(), out,
null)) {
+ try (BinaryWriterEx writer =
BinaryUtils.writerWithoutSchema(marsh.context(), out)) {
if
(protocolCtx.isFeatureSupported(ProtocolBitmaskFeature.SQL_CACHE_CREATION))
out.writeBoolean(sql);
diff --git
a/modules/thin-client/impl/src/main/java/org/apache/ignite/internal/client/thin/TcpClientCache.java
b/modules/thin-client/impl/src/main/java/org/apache/ignite/internal/client/thin/TcpClientCache.java
index ab574b9cf3e..ad634260e35 100644
---
a/modules/thin-client/impl/src/main/java/org/apache/ignite/internal/client/thin/TcpClientCache.java
+++
b/modules/thin-client/impl/src/main/java/org/apache/ignite/internal/client/thin/TcpClientCache.java
@@ -1300,7 +1300,7 @@ public class TcpClientCache<K, V> implements
ClientCache<K, V> {
BinaryOutputStream out = payloadCh.out();
- try (BinaryWriterEx w = BinaryUtils.writer(marsh.context(), out,
null)) {
+ try (BinaryWriterEx w =
BinaryUtils.writerWithoutSchema(marsh.context(), out)) {
w.writeInt(qry.getPageSize());
w.writeBoolean(qry.isLocal());
w.writeInt(qry.getPartition() == null ? -1 :
qry.getPartition());
diff --git
a/modules/thin-client/impl/src/main/java/org/apache/ignite/internal/client/thin/TcpClientChannel.java
b/modules/thin-client/impl/src/main/java/org/apache/ignite/internal/client/thin/TcpClientChannel.java
index a7109e0e02e..a90fbd3437b 100644
---
a/modules/thin-client/impl/src/main/java/org/apache/ignite/internal/client/thin/TcpClientChannel.java
+++
b/modules/thin-client/impl/src/main/java/org/apache/ignite/internal/client/thin/TcpClientChannel.java
@@ -845,7 +845,7 @@ class TcpClientChannel implements ClientChannel,
ClientMessageHandler, ClientCon
/** Send handshake request. */
private void handshakeReq(ProtocolVersion proposedVer, String user, String
pwd,
Map<String, String> userAttrs) throws ClientConnectionException {
- try (BinaryWriterEx writer =
BinaryUtils.writer(BinaryUtils.binaryContext(null),
BinaryStreams.outputStream(32), null)) {
+ try (BinaryWriterEx writer =
BinaryUtils.writerWithoutSchema(BinaryUtils.binaryContext(null),
BinaryStreams.outputStream(32))) {
ProtocolContext protocolCtx =
protocolContextFromVersion(proposedVer);
writer.writeInt(0); // reserve an integer for the request size
diff --git
a/modules/thin-client/impl/src/main/java/org/apache/ignite/internal/client/thin/TcpClientTransactions.java
b/modules/thin-client/impl/src/main/java/org/apache/ignite/internal/client/thin/TcpClientTransactions.java
index 8dee96182ab..4030782258b 100644
---
a/modules/thin-client/impl/src/main/java/org/apache/ignite/internal/client/thin/TcpClientTransactions.java
+++
b/modules/thin-client/impl/src/main/java/org/apache/ignite/internal/client/thin/TcpClientTransactions.java
@@ -101,7 +101,7 @@ class TcpClientTransactions implements ClientTransactions {
protocolCtx.version(), TRANSACTIONS.verIntroduced()));
}
- try (BinaryWriterEx writer =
BinaryUtils.writer(marsh.context(), req.out(), null)) {
+ try (BinaryWriterEx writer =
BinaryUtils.writerWithoutSchema(marsh.context(), req.out())) {
writer.writeByte((byte)(concurrency == null ?
txCfg.getDefaultTxConcurrency() : concurrency).ordinal());
writer.writeByte((byte)(isolation == null ?
txCfg.getDefaultTxIsolation() : isolation).ordinal());
writer.writeLong(timeout == null ?
txCfg.getDefaultTxTimeout() : timeout);
diff --git
a/modules/thin-client/impl/src/main/java/org/apache/ignite/internal/client/thin/TcpIgniteClient.java
b/modules/thin-client/impl/src/main/java/org/apache/ignite/internal/client/thin/TcpIgniteClient.java
index 2db974818cc..94a49d930a6 100644
---
a/modules/thin-client/impl/src/main/java/org/apache/ignite/internal/client/thin/TcpIgniteClient.java
+++
b/modules/thin-client/impl/src/main/java/org/apache/ignite/internal/client/thin/TcpIgniteClient.java
@@ -555,7 +555,7 @@ public class TcpIgniteClient implements IgniteClient {
/** Serialize string. */
private void writeString(String s, BinaryOutputStream out) {
- try (BinaryWriterEx w = BinaryUtils.writer(marsh.context(), out,
null)) {
+ try (BinaryWriterEx w =
BinaryUtils.writerWithoutSchema(marsh.context(), out)) {
w.writeString(s);
}
}
