This is an automated email from the ASF dual-hosted git repository.
nizhikov pushed a commit to branch IGNITE-25928
in repository https://gitbox.apache.org/repos/asf/ignite.git
commit 2b126b8bf0bf345566347e87d622babf5fe0e668
Author: Nikolay Izhikov <nizhi...@apache.org>
AuthorDate: Wed Jul 16 18:21:47 2025 +0300
IGNITE-25928 WIP
---
.../jdbc/thin/JdbcThinConnectionSelfTest.java | 2 +-
.../ignite/internal/binary/BinaryContext.java | 70 ++++++++++++----------
.../client/thin/ClientBinaryMarshaller.java | 2 +-
.../internal/client/thin/TcpClientChannel.java | 3 +-
.../internal/jdbc/thin/JdbcThinConnection.java | 3 +-
.../ignite/internal/jdbc/thin/JdbcThinTcpIo.java | 3 +-
.../binary/CacheObjectBinaryProcessorImpl.java | 11 ++--
.../processors/odbc/ClientListenerNioListener.java | 3 +-
.../processors/platform/utils/PlatformUtils.java | 3 +-
.../binary/BinaryContextPredefinedTypesTest.java | 3 +-
.../binary/BinaryFieldExtractionSelfTest.java | 2 +-
.../binary/BinaryFieldsAbstractSelfTest.java | 2 +-
.../BinaryFooterOffsetsAbstractSelfTest.java | 2 +-
.../internal/binary/BinaryMarshallerSelfTest.java | 4 +-
.../GridBinaryMarshallerCtxDisabledSelfTest.java | 6 +-
.../binary/GridBinaryWildcardsSelfTest.java | 2 +-
.../binary/RawBinaryObjectExtractorTest.java | 3 +-
.../GridBinaryCacheEntryMemorySizeSelfTest.java | 2 +-
.../platform/PlatformGetInternalCachesTask.java | 3 +-
.../session/GridSessionCheckpointSelfTest.java | 2 +-
.../testframework/junits/GridAbstractTest.java | 2 +-
.../junits/GridTestBinaryMarshaller.java | 2 +-
.../ignite/testframework/junits/IgniteMock.java | 2 +-
.../testframework/junits/IgniteTestResources.java | 2 +-
24 files changed, 67 insertions(+), 72 deletions(-)
diff --git
a/modules/clients/src/test/java/org/apache/ignite/jdbc/thin/JdbcThinConnectionSelfTest.java
b/modules/clients/src/test/java/org/apache/ignite/jdbc/thin/JdbcThinConnectionSelfTest.java
index ac955f613a4..6247a4dba1a 100644
---
a/modules/clients/src/test/java/org/apache/ignite/jdbc/thin/JdbcThinConnectionSelfTest.java
+++
b/modules/clients/src/test/java/org/apache/ignite/jdbc/thin/JdbcThinConnectionSelfTest.java
@@ -2233,7 +2233,7 @@ public class JdbcThinConnectionSelfTest extends
JdbcThinAbstractSelfTest {
marsh.setContext(getFakeMarshallerCtx());
- BinaryContext ctx = new BinaryContext(new IgniteConfiguration(), new
NullLogger());
+ BinaryContext ctx = new BinaryContext(null, new NullLogger());
ctx.configure(marsh);
ctx.registerUserTypesSchema();
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 6cebcf0b168..4e6c39a8372 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
@@ -168,7 +168,11 @@ public class BinaryContext {
private MarshallerContext marshCtx;
/** */
- private IgniteConfiguration igniteCfg;
+ private final IgniteConfiguration igniteCfg = null;
+
+ /** TODO: remove me */
+ BinaryConfiguration bcfg = igniteCfg.getBinaryConfiguration();
+
/** Logger. */
private IgniteLogger log;
@@ -183,26 +187,24 @@ public class BinaryContext {
private volatile Map<Integer, BinarySchemaRegistry> schemas;
/**
- * @param igniteCfg Ignite configuration.
+ * @param nodeName Ignite instance name.
* @param log Logger.
*/
- public BinaryContext(IgniteConfiguration igniteCfg, IgniteLogger log) {
- this(BinaryNoopMetadataHandler.instance(), igniteCfg, log);
+ public BinaryContext(@Nullable String nodeName, IgniteLogger log) {
+ this(BinaryNoopMetadataHandler.instance(), nodeName, log);
}
/**
* @param metaHnd Meta data handler.
- * @param igniteCfg Ignite configuration.
+ * @param nodeName Ignite instance name.
* @param log Logger.
*/
- public BinaryContext(BinaryMetadataHandler metaHnd, IgniteConfiguration
igniteCfg, IgniteLogger log) {
+ public BinaryContext(BinaryMetadataHandler metaHnd, @Nullable String
nodeName, IgniteLogger log) {
assert metaHnd != null;
- assert igniteCfg != null;
- MarshallerUtils.setNodeName(optmMarsh,
igniteCfg.getIgniteInstanceName());
+ MarshallerUtils.setNodeName(optmMarsh, nodeName);
this.metaHnd = metaHnd;
- this.igniteCfg = igniteCfg;
this.log = log;
colTypes.put(ArrayList.class, GridBinaryMarshaller.ARR_LIST);
@@ -359,11 +361,19 @@ public class BinaryContext {
optmMarsh.setContext(marshCtx);
+ Map<String, String> affFields = new HashMap<>();
+
+ if (!F.isEmpty(igniteCfg.getCacheKeyConfiguration())) {
+ for (CacheKeyConfiguration keyCfg :
igniteCfg.getCacheKeyConfiguration())
+ affFields.put(keyCfg.getTypeName(),
keyCfg.getAffinityKeyFieldName());
+ }
+
configure(
binaryCfg.getNameMapper(),
binaryCfg.getIdMapper(),
binaryCfg.getSerializer(),
- binaryCfg.getTypeConfigurations()
+ binaryCfg.getTypeConfigurations(),
+ affFields
);
compactFooter = binaryCfg.isCompactFooter();
@@ -379,17 +389,11 @@ public class BinaryContext {
BinaryNameMapper globalNameMapper,
BinaryIdMapper globalIdMapper,
BinarySerializer globalSerializer,
- Collection<BinaryTypeConfiguration> typeCfgs
+ Collection<BinaryTypeConfiguration> typeCfgs,
+ Map<String, String> affFields
) throws BinaryObjectException {
TypeDescriptors descs = new TypeDescriptors();
- Map<String, String> affFields = new HashMap<>();
-
- if (!F.isEmpty(igniteCfg.getCacheKeyConfiguration())) {
- for (CacheKeyConfiguration keyCfg :
igniteCfg.getCacheKeyConfiguration())
- affFields.put(keyCfg.getTypeName(),
keyCfg.getAffinityKeyFieldName());
- }
-
if (typeCfgs != null) {
for (BinaryTypeConfiguration typeCfg : typeCfgs) {
String clsName = typeCfg.getTypeName();
@@ -921,9 +925,7 @@ public class BinaryContext {
* @return Default serializer.
*/
private BinarySerializer defaultSerializer() {
- BinaryConfiguration binCfg = igniteCfg.getBinaryConfiguration();
-
- return binCfg != null ? binCfg.getSerializer() : null;
+ return bcfg != null ? bcfg.getSerializer() : null;
}
/**
@@ -1002,7 +1004,12 @@ public class BinaryContext {
if (mapper != null)
return mapper;
- mapper = resolveMapper(clsName, igniteCfg.getBinaryConfiguration());
+ mapper = bcfg == null ? DFLT_MAPPER : resolveMapper(
+ clsName,
+ bcfg.getIdMapper(),
+ bcfg.getNameMapper(),
+ bcfg.getTypeConfigurations()
+ );
BinaryInternalMapper prevMap = cls2Mappers.putIfAbsent(clsName,
mapper);
@@ -1021,20 +1028,19 @@ public class BinaryContext {
/**
* @param clsName Type name.
- * @param cfg Binary configuration.
+ * @param globalIdMapper Default id mapper.
+ * @param globalNameMapper Default name mapper.
+ * @param typeCfgs Type configurations.
* @return Mapper according to configuration.
*/
- private static BinaryInternalMapper resolveMapper(String clsName,
BinaryConfiguration cfg) {
+ private static BinaryInternalMapper resolveMapper(
+ String clsName,
+ BinaryIdMapper globalIdMapper,
+ BinaryNameMapper globalNameMapper,
+ Collection<BinaryTypeConfiguration> typeCfgs
+ ) {
assert clsName != null;
- if (cfg == null)
- return DFLT_MAPPER;
-
- BinaryIdMapper globalIdMapper = cfg.getIdMapper();
- BinaryNameMapper globalNameMapper = cfg.getNameMapper();
-
- Collection<BinaryTypeConfiguration> typeCfgs =
cfg.getTypeConfigurations();
-
if (typeCfgs != null) {
for (BinaryTypeConfiguration typeCfg : typeCfgs) {
String typeCfgName = typeCfg.getTypeName();
diff --git
a/modules/core/src/main/java/org/apache/ignite/internal/client/thin/ClientBinaryMarshaller.java
b/modules/core/src/main/java/org/apache/ignite/internal/client/thin/ClientBinaryMarshaller.java
index 54fd2c7903e..eeb84946771 100644
---
a/modules/core/src/main/java/org/apache/ignite/internal/client/thin/ClientBinaryMarshaller.java
+++
b/modules/core/src/main/java/org/apache/ignite/internal/client/thin/ClientBinaryMarshaller.java
@@ -107,7 +107,7 @@ class ClientBinaryMarshaller {
igniteCfg.setBinaryConfiguration(binCfg);
- BinaryContext ctx = new BinaryContext(metaHnd, igniteCfg,
NullLogger.INSTANCE);
+ BinaryContext ctx = new BinaryContext(metaHnd, null,
NullLogger.INSTANCE);
BinaryMarshaller marsh = new BinaryMarshaller();
diff --git
a/modules/core/src/main/java/org/apache/ignite/internal/client/thin/TcpClientChannel.java
b/modules/core/src/main/java/org/apache/ignite/internal/client/thin/TcpClientChannel.java
index e964ac13ec1..0d46506dc39 100644
---
a/modules/core/src/main/java/org/apache/ignite/internal/client/thin/TcpClientChannel.java
+++
b/modules/core/src/main/java/org/apache/ignite/internal/client/thin/TcpClientChannel.java
@@ -51,7 +51,6 @@ import
org.apache.ignite.client.ClientFeatureNotSupportedByServerException;
import org.apache.ignite.client.ClientReconnectedException;
import org.apache.ignite.client.events.ConnectionDescription;
import org.apache.ignite.configuration.ClientConfiguration;
-import org.apache.ignite.configuration.IgniteConfiguration;
import org.apache.ignite.internal.binary.BinaryContext;
import org.apache.ignite.internal.binary.BinaryReaderEx;
import org.apache.ignite.internal.binary.BinaryUtils;
@@ -840,7 +839,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 {
- BinaryContext ctx = new
BinaryContext(BinaryUtils.cachingMetadataHandler(), new IgniteConfiguration(),
null);
+ BinaryContext ctx = new
BinaryContext(BinaryUtils.cachingMetadataHandler(), null, null);
try (BinaryWriterEx writer = BinaryUtils.writer(ctx,
BinaryStreams.outputStream(32), null)) {
ProtocolContext protocolCtx =
protocolContextFromVersion(proposedVer);
diff --git
a/modules/core/src/main/java/org/apache/ignite/internal/jdbc/thin/JdbcThinConnection.java
b/modules/core/src/main/java/org/apache/ignite/internal/jdbc/thin/JdbcThinConnection.java
index b2ae2253864..f32303f9cd0 100644
---
a/modules/core/src/main/java/org/apache/ignite/internal/jdbc/thin/JdbcThinConnection.java
+++
b/modules/core/src/main/java/org/apache/ignite/internal/jdbc/thin/JdbcThinConnection.java
@@ -75,7 +75,6 @@ import org.apache.ignite.binary.BinaryObjectException;
import org.apache.ignite.binary.BinaryType;
import org.apache.ignite.client.ClientException;
import org.apache.ignite.configuration.BinaryConfiguration;
-import org.apache.ignite.configuration.IgniteConfiguration;
import org.apache.ignite.internal.MarshallerPlatformIds;
import org.apache.ignite.internal.binary.BinaryContext;
import org.apache.ignite.internal.binary.BinaryMarshaller;
@@ -325,7 +324,7 @@ public class JdbcThinConnection implements Connection {
BinaryConfiguration binCfg = new
BinaryConfiguration().setCompactFooter(true);
- BinaryContext ctx = new BinaryContext(metaHnd, new
IgniteConfiguration(), new NullLogger());
+ BinaryContext ctx = new BinaryContext(metaHnd, null, new NullLogger());
ctx.configure(marsh, binCfg);
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 328f0f5e3f2..223f59bcc46 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
@@ -36,7 +36,6 @@ import java.util.stream.Collectors;
import javax.cache.configuration.Factory;
import org.apache.ignite.IgniteCheckedException;
import org.apache.ignite.cache.query.QueryCancelledException;
-import org.apache.ignite.configuration.IgniteConfiguration;
import org.apache.ignite.internal.MarshallerContextImpl;
import org.apache.ignite.internal.ThinProtocolFeature;
import org.apache.ignite.internal.binary.BinaryContext;
@@ -269,7 +268,7 @@ public class JdbcThinTcpIo {
* @throws SQLException On connection reject.
*/
private HandshakeResult handshake(ClientListenerProtocolVersion ver)
throws IOException, SQLException {
- BinaryContext ctx = new
BinaryContext(BinaryUtils.cachingMetadataHandler(), new IgniteConfiguration(),
null);
+ BinaryContext ctx = new
BinaryContext(BinaryUtils.cachingMetadataHandler(), null, null);
BinaryMarshaller marsh = new BinaryMarshaller();
diff --git
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/binary/CacheObjectBinaryProcessorImpl.java
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/binary/CacheObjectBinaryProcessorImpl.java
index 5374697246d..07fc5541332 100644
---
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/binary/CacheObjectBinaryProcessorImpl.java
+++
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/binary/CacheObjectBinaryProcessorImpl.java
@@ -50,7 +50,6 @@ import org.apache.ignite.cache.affinity.AffinityKeyMapper;
import org.apache.ignite.cluster.ClusterNode;
import org.apache.ignite.configuration.BinaryConfiguration;
import org.apache.ignite.configuration.CacheConfiguration;
-import org.apache.ignite.configuration.IgniteConfiguration;
import org.apache.ignite.internal.GridKernalContext;
import org.apache.ignite.internal.IgniteFutureTimeoutCheckedException;
import org.apache.ignite.internal.IgniteInternalFuture;
@@ -279,8 +278,8 @@ public class CacheObjectBinaryProcessorImpl extends
GridProcessorAdapter impleme
};
binaryCtx = useTestBinaryCtx ?
- new TestBinaryContext(metaHnd, ctx.config(),
ctx.log(BinaryContext.class)) :
- new BinaryContext(metaHnd, ctx.config(),
ctx.log(BinaryContext.class));
+ new TestBinaryContext(metaHnd,
ctx.config().getIgniteInstanceName(), ctx.log(BinaryContext.class)) :
+ new BinaryContext(metaHnd, ctx.config().getIgniteInstanceName(),
ctx.log(BinaryContext.class));
transport = new BinaryMetadataTransport(metadataLocCache,
metadataFileStore, binaryCtx, ctx, log);
@@ -1633,12 +1632,12 @@ public class CacheObjectBinaryProcessorImpl extends
GridProcessorAdapter impleme
/**
* @param metaHnd Meta handler.
- * @param igniteCfg Ignite config.
+ * @param nodeName Ignite instance name.
* @param log Logger.
*/
- public TestBinaryContext(BinaryMetadataHandler metaHnd,
IgniteConfiguration igniteCfg,
+ public TestBinaryContext(BinaryMetadataHandler metaHnd, @Nullable
String nodeName,
IgniteLogger log) {
- super(metaHnd, igniteCfg, log);
+ super(metaHnd, nodeName, log);
}
/** {@inheritDoc} */
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 49497262ac1..2b9b5fd5717 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
@@ -23,7 +23,6 @@ import java.util.function.Predicate;
import org.apache.ignite.IgniteCheckedException;
import org.apache.ignite.IgniteLogger;
import org.apache.ignite.configuration.ClientConnectorConfiguration;
-import org.apache.ignite.configuration.IgniteConfiguration;
import org.apache.ignite.configuration.ThinClientConfiguration;
import org.apache.ignite.failure.FailureContext;
import org.apache.ignite.failure.FailureType;
@@ -357,7 +356,7 @@ public class ClientListenerNioListener extends
GridNioServerListenerAdapter<Clie
* @param msg Message bytes.
*/
private void onHandshake(GridNioSession ses, ClientMessage msg) {
- BinaryContext ctx = new
BinaryContext(BinaryUtils.cachingMetadataHandler(), new IgniteConfiguration(),
null);
+ BinaryContext ctx = new
BinaryContext(BinaryUtils.cachingMetadataHandler(), null, null);
BinaryMarshaller marsh = new BinaryMarshaller();
diff --git
a/modules/core/src/main/java/org/apache/ignite/internal/processors/platform/utils/PlatformUtils.java
b/modules/core/src/main/java/org/apache/ignite/internal/processors/platform/utils/PlatformUtils.java
index 624ef6eb4f4..e11c506dfce 100644
---
a/modules/core/src/main/java/org/apache/ignite/internal/processors/platform/utils/PlatformUtils.java
+++
b/modules/core/src/main/java/org/apache/ignite/internal/processors/platform/utils/PlatformUtils.java
@@ -42,7 +42,6 @@ import org.apache.ignite.binary.BinaryObject;
import org.apache.ignite.binary.BinaryRawReader;
import org.apache.ignite.binary.BinaryRawWriter;
import org.apache.ignite.cache.CachePeekMode;
-import org.apache.ignite.configuration.IgniteConfiguration;
import org.apache.ignite.internal.GridKernalContext;
import org.apache.ignite.internal.IgniteKernal;
import org.apache.ignite.internal.MarshallerContextImpl;
@@ -884,7 +883,7 @@ public class PlatformUtils {
*/
public static GridBinaryMarshaller marshaller() {
BinaryContext ctx =
- new BinaryContext(new IgniteConfiguration(), new NullLogger());
+ new BinaryContext(null, new NullLogger());
BinaryMarshaller marsh = new BinaryMarshaller();
diff --git
a/modules/core/src/test/java/org/apache/ignite/internal/binary/BinaryContextPredefinedTypesTest.java
b/modules/core/src/test/java/org/apache/ignite/internal/binary/BinaryContextPredefinedTypesTest.java
index abe926bdf23..ab8fc8f592d 100644
---
a/modules/core/src/test/java/org/apache/ignite/internal/binary/BinaryContextPredefinedTypesTest.java
+++
b/modules/core/src/test/java/org/apache/ignite/internal/binary/BinaryContextPredefinedTypesTest.java
@@ -17,7 +17,6 @@
package org.apache.ignite.internal.binary;
-import org.apache.ignite.configuration.IgniteConfiguration;
import org.apache.ignite.testframework.junits.common.GridCommonAbstractTest;
import org.junit.Test;
@@ -30,7 +29,7 @@ public class BinaryContextPredefinedTypesTest extends
GridCommonAbstractTest {
*/
@Test
public void testDefaultConstructor() {
- BinaryContext binCtx = new BinaryContext(new IgniteConfiguration(),
log);
+ BinaryContext binCtx = new BinaryContext(null, log);
for (BinaryClassDescriptor desc : binCtx.predefinedTypes()) {
if (!desc.isBinary())
diff --git
a/modules/core/src/test/java/org/apache/ignite/internal/binary/BinaryFieldExtractionSelfTest.java
b/modules/core/src/test/java/org/apache/ignite/internal/binary/BinaryFieldExtractionSelfTest.java
index 43dfa4f1c4b..5d60d50649e 100644
---
a/modules/core/src/test/java/org/apache/ignite/internal/binary/BinaryFieldExtractionSelfTest.java
+++
b/modules/core/src/test/java/org/apache/ignite/internal/binary/BinaryFieldExtractionSelfTest.java
@@ -43,7 +43,7 @@ public class BinaryFieldExtractionSelfTest extends
GridCommonAbstractTest {
* @throws Exception If failed.
*/
protected BinaryMarshaller createMarshaller() throws Exception {
- BinaryContext ctx = new
BinaryContext(BinaryUtils.cachingMetadataHandler(), new IgniteConfiguration(),
+ BinaryContext ctx = new
BinaryContext(BinaryUtils.cachingMetadataHandler(), null,
log());
BinaryMarshaller marsh = new BinaryMarshaller();
diff --git
a/modules/core/src/test/java/org/apache/ignite/internal/binary/BinaryFieldsAbstractSelfTest.java
b/modules/core/src/test/java/org/apache/ignite/internal/binary/BinaryFieldsAbstractSelfTest.java
index eca49bd53c3..22d0dc8889f 100644
---
a/modules/core/src/test/java/org/apache/ignite/internal/binary/BinaryFieldsAbstractSelfTest.java
+++
b/modules/core/src/test/java/org/apache/ignite/internal/binary/BinaryFieldsAbstractSelfTest.java
@@ -48,7 +48,7 @@ public abstract class BinaryFieldsAbstractSelfTest extends
GridCommonAbstractTes
* @throws Exception If failed.
*/
protected BinaryMarshaller createMarshaller() throws Exception {
- BinaryContext ctx = new
BinaryContext(BinaryUtils.cachingMetadataHandler(), new IgniteConfiguration(),
+ BinaryContext ctx = new
BinaryContext(BinaryUtils.cachingMetadataHandler(), null,
new NullLogger());
BinaryMarshaller marsh = new BinaryMarshaller();
diff --git
a/modules/core/src/test/java/org/apache/ignite/internal/binary/BinaryFooterOffsetsAbstractSelfTest.java
b/modules/core/src/test/java/org/apache/ignite/internal/binary/BinaryFooterOffsetsAbstractSelfTest.java
index ebf80d30b28..ed78ddb5b27 100644
---
a/modules/core/src/test/java/org/apache/ignite/internal/binary/BinaryFooterOffsetsAbstractSelfTest.java
+++
b/modules/core/src/test/java/org/apache/ignite/internal/binary/BinaryFooterOffsetsAbstractSelfTest.java
@@ -47,7 +47,7 @@ public abstract class BinaryFooterOffsetsAbstractSelfTest
extends GridCommonAbst
@Override protected void beforeTest() throws Exception {
super.beforeTest();
- ctx = new BinaryContext(BinaryUtils.cachingMetadataHandler(), new
IgniteConfiguration(), new NullLogger());
+ ctx = new BinaryContext(BinaryUtils.cachingMetadataHandler(), null,
new NullLogger());
marsh = new BinaryMarshaller();
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 c969690c889..300f16154af 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
@@ -4166,7 +4166,7 @@ public class BinaryMarshallerSelfTest extends
AbstractBinaryArraysTest {
});
iCfg.setSystemViewExporterSpi(new JmxSystemViewExporterSpi());
- BinaryContext ctx = new
BinaryContext(BinaryUtils.cachingMetadataHandler(), iCfg, new NullLogger());
+ BinaryContext ctx = new
BinaryContext(BinaryUtils.cachingMetadataHandler(),
iCfg.getIgniteInstanceName(), new NullLogger());
BinaryMarshaller marsh = new BinaryMarshaller();
@@ -4227,7 +4227,7 @@ public class BinaryMarshallerSelfTest extends
AbstractBinaryArraysTest {
});
iCfg.setSystemViewExporterSpi(new JmxSystemViewExporterSpi());
- BinaryContext ctx = new
BinaryContext(BinaryUtils.cachingMetadataHandler(), iCfg, new NullLogger());
+ BinaryContext ctx = new
BinaryContext(BinaryUtils.cachingMetadataHandler(),
iCfg.getIgniteInstanceName(), new NullLogger());
BinaryMarshaller marsh = new BinaryMarshaller();
diff --git
a/modules/core/src/test/java/org/apache/ignite/internal/binary/GridBinaryMarshallerCtxDisabledSelfTest.java
b/modules/core/src/test/java/org/apache/ignite/internal/binary/GridBinaryMarshallerCtxDisabledSelfTest.java
index 964d8b8ad2f..9ec41833054 100644
---
a/modules/core/src/test/java/org/apache/ignite/internal/binary/GridBinaryMarshallerCtxDisabledSelfTest.java
+++
b/modules/core/src/test/java/org/apache/ignite/internal/binary/GridBinaryMarshallerCtxDisabledSelfTest.java
@@ -47,11 +47,9 @@ public class GridBinaryMarshallerCtxDisabledSelfTest extends
GridCommonAbstractT
BinaryMarshaller marsh = new BinaryMarshaller();
marsh.setContext(new MarshallerContextWithNoStorage());
- IgniteConfiguration cfg = new IgniteConfiguration();
+ BinaryContext ctx = new
BinaryContext(BinaryUtils.cachingMetadataHandler(), null, new NullLogger());
- BinaryContext ctx = new
BinaryContext(BinaryUtils.cachingMetadataHandler(), cfg, new NullLogger());
-
- marsh.setBinaryContext(ctx, cfg);
+ marsh.setBinaryContext(ctx, new IgniteConfiguration());
SimpleObject simpleObj = new SimpleObject();
diff --git
a/modules/core/src/test/java/org/apache/ignite/internal/binary/GridBinaryWildcardsSelfTest.java
b/modules/core/src/test/java/org/apache/ignite/internal/binary/GridBinaryWildcardsSelfTest.java
index 703c1ee5396..8c043bc422a 100644
---
a/modules/core/src/test/java/org/apache/ignite/internal/binary/GridBinaryWildcardsSelfTest.java
+++
b/modules/core/src/test/java/org/apache/ignite/internal/binary/GridBinaryWildcardsSelfTest.java
@@ -674,7 +674,7 @@ public class GridBinaryWildcardsSelfTest extends
GridCommonAbstractTest {
iCfg.setBinaryConfiguration(bCfg);
- BinaryContext ctx = new BinaryContext(iCfg, new NullLogger());
+ BinaryContext ctx = new BinaryContext(iCfg.getIgniteInstanceName(),
new NullLogger());
BinaryMarshaller marsh = new BinaryMarshaller();
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 d9298b3ff20..fe6e44cebaf 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
@@ -27,7 +27,6 @@ import java.util.HashMap;
import java.util.Map;
import java.util.Objects;
import org.apache.ignite.binary.BinaryObject;
-import org.apache.ignite.configuration.IgniteConfiguration;
import org.apache.ignite.internal.binary.builder.BinaryObjectBuilders;
import
org.apache.ignite.internal.binary.mutabletest.GridBinaryTestClasses.TestObjectAllTypes;
import org.apache.ignite.internal.binary.streams.BinaryStreams;
@@ -78,7 +77,7 @@ public class RawBinaryObjectExtractorTest extends
GridCommonAbstractTest {
/** */
public static BinaryContext createTestBinaryContext() {
- BinaryContext ctx = new
BinaryContext(BinaryUtils.cachingMetadataHandler(), new IgniteConfiguration(),
null);
+ BinaryContext ctx = new
BinaryContext(BinaryUtils.cachingMetadataHandler(), null, null);
BinaryMarshaller marsh = new BinaryMarshaller();
diff --git
a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/binary/GridBinaryCacheEntryMemorySizeSelfTest.java
b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/binary/GridBinaryCacheEntryMemorySizeSelfTest.java
index 460b059debd..6ad44516653 100644
---
a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/binary/GridBinaryCacheEntryMemorySizeSelfTest.java
+++
b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/binary/GridBinaryCacheEntryMemorySizeSelfTest.java
@@ -66,7 +66,7 @@ public class GridBinaryCacheEntryMemorySizeSelfTest extends
GridCacheEntryMemory
marsh.setContext(marshCtx);
- BinaryContext pCtx = new BinaryContext(iCfg, new NullLogger());
+ BinaryContext pCtx = new BinaryContext(iCfg.getIgniteInstanceName(),
new NullLogger());
marsh.setBinaryContext(pCtx, iCfg);
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 33fbe309f28..697b9d1ddfe 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
@@ -27,7 +27,6 @@ import org.apache.ignite.compute.ComputeJob;
import org.apache.ignite.compute.ComputeJobAdapter;
import org.apache.ignite.compute.ComputeJobResult;
import org.apache.ignite.compute.ComputeTaskAdapter;
-import org.apache.ignite.configuration.IgniteConfiguration;
import org.apache.ignite.internal.IgniteEx;
import org.apache.ignite.internal.binary.BinaryContext;
import org.apache.ignite.internal.binary.BinaryUtils;
@@ -69,7 +68,7 @@ public class PlatformGetInternalCachesTask extends
ComputeTaskAdapter<Object, by
@Override public byte[] execute() {
IgniteEx ign = (IgniteEx)ignite;
- BinaryContext ctx = new
BinaryContext(BinaryUtils.cachingMetadataHandler(), new IgniteConfiguration(),
null);
+ BinaryContext ctx = new
BinaryContext(BinaryUtils.cachingMetadataHandler(), null, null);
try (BinaryWriterEx writer
= BinaryUtils.writer(ctx,
BinaryStreams.outputStream(512), null)) {
diff --git
a/modules/core/src/test/java/org/apache/ignite/session/GridSessionCheckpointSelfTest.java
b/modules/core/src/test/java/org/apache/ignite/session/GridSessionCheckpointSelfTest.java
index 90fa43d26b4..e7e0665948a 100644
---
a/modules/core/src/test/java/org/apache/ignite/session/GridSessionCheckpointSelfTest.java
+++
b/modules/core/src/test/java/org/apache/ignite/session/GridSessionCheckpointSelfTest.java
@@ -100,7 +100,7 @@ public class GridSessionCheckpointSelfTest extends
GridSessionCheckpointAbstract
BinaryMarshaller marsh = new BinaryMarshaller();
- BinaryContext ctx = new
BinaryContext(BinaryUtils.cachingMetadataHandler(), cfg, new NullLogger());
+ BinaryContext ctx = new
BinaryContext(BinaryUtils.cachingMetadataHandler(),
cfg.getIgniteInstanceName(), new NullLogger());
marsh.setContext(new MarshallerContextTestImpl(null));
diff --git
a/modules/core/src/test/java/org/apache/ignite/testframework/junits/GridAbstractTest.java
b/modules/core/src/test/java/org/apache/ignite/testframework/junits/GridAbstractTest.java
index 1695538f97d..1f2d793e495 100755
---
a/modules/core/src/test/java/org/apache/ignite/testframework/junits/GridAbstractTest.java
+++
b/modules/core/src/test/java/org/apache/ignite/testframework/junits/GridAbstractTest.java
@@ -2024,7 +2024,7 @@ public abstract class GridAbstractTest extends
JUnitAssertAware {
protected BinaryMarshaller
createStandaloneBinaryMarshaller(IgniteConfiguration cfg) throws
IgniteCheckedException {
BinaryMarshaller marsh = new BinaryMarshaller();
- BinaryContext ctx = new
BinaryContext(BinaryUtils.cachingMetadataHandler(), cfg, new NullLogger());
+ BinaryContext ctx = new
BinaryContext(BinaryUtils.cachingMetadataHandler(),
cfg.getIgniteInstanceName(), new NullLogger());
marsh.setContext(new MarshallerContextTestImpl());
diff --git
a/modules/core/src/test/java/org/apache/ignite/testframework/junits/GridTestBinaryMarshaller.java
b/modules/core/src/test/java/org/apache/ignite/testframework/junits/GridTestBinaryMarshaller.java
index da1d31646a8..3750e4f402e 100644
---
a/modules/core/src/test/java/org/apache/ignite/testframework/junits/GridTestBinaryMarshaller.java
+++
b/modules/core/src/test/java/org/apache/ignite/testframework/junits/GridTestBinaryMarshaller.java
@@ -75,7 +75,7 @@ public class GridTestBinaryMarshaller {
}
});
- BinaryContext ctx = new
BinaryContext(BinaryUtils.cachingMetadataHandler(), iCfg, new NullLogger());
+ BinaryContext ctx = new
BinaryContext(BinaryUtils.cachingMetadataHandler(),
iCfg.getIgniteInstanceName(), new NullLogger());
MarshallerContextTestImpl marshCtx = new MarshallerContextTestImpl();
diff --git
a/modules/core/src/test/java/org/apache/ignite/testframework/junits/IgniteMock.java
b/modules/core/src/test/java/org/apache/ignite/testframework/junits/IgniteMock.java
index 7a87fcd367e..7125191c3ed 100644
---
a/modules/core/src/test/java/org/apache/ignite/testframework/junits/IgniteMock.java
+++
b/modules/core/src/test/java/org/apache/ignite/testframework/junits/IgniteMock.java
@@ -442,7 +442,7 @@ public class IgniteMock implements IgniteEx {
if (ctx == null) {
/** {@inheritDoc} */
- ctx = new BinaryContext(BinaryUtils.cachingMetadataHandler(),
configuration(), new NullLogger()) {
+ ctx = new BinaryContext(BinaryUtils.cachingMetadataHandler(),
configuration().getIgniteInstanceName(), new NullLogger()) {
@Override public int typeId(String typeName) {
return typeName.hashCode();
}
diff --git
a/modules/core/src/test/java/org/apache/ignite/testframework/junits/IgniteTestResources.java
b/modules/core/src/test/java/org/apache/ignite/testframework/junits/IgniteTestResources.java
index f91c062cb87..90960808746 100644
---
a/modules/core/src/test/java/org/apache/ignite/testframework/junits/IgniteTestResources.java
+++
b/modules/core/src/test/java/org/apache/ignite/testframework/junits/IgniteTestResources.java
@@ -251,7 +251,7 @@ public class IgniteTestResources {
marsh.setContext(new MarshallerContextTestImpl());
marsh.setBinaryContext(
- new BinaryContext(BinaryUtils.cachingMetadataHandler(), new
IgniteConfiguration(), new NullLogger()),
+ new BinaryContext(BinaryUtils.cachingMetadataHandler(), null, new
NullLogger()),
new IgniteConfiguration()
);
