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 12cb12c3a4d IGNITE-22767 Remove MarshallingContext (#11442)
12cb12c3a4d is described below
commit 12cb12c3a4d1badd9289c0833ff4bcd4532b6093
Author: Nikolay <[email protected]>
AuthorDate: Wed Aug 21 10:53:43 2024 +0300
IGNITE-22767 Remove MarshallingContext (#11442)
---
.../query/calcite/message/ErrorMessage.java | 10 ++--
.../query/calcite/message/GenericValueMessage.java | 13 +++--
.../query/calcite/message/MarshalableMessage.java | 9 ++--
.../query/calcite/message/MarshallingContext.java | 58 --------------------
.../query/calcite/message/MessageServiceImpl.java | 61 ++++------------------
.../query/calcite/message/QueryBatchMessage.java | 5 +-
.../query/calcite/message/QueryStartRequest.java | 10 ++--
.../query/calcite/message/QueryStartResponse.java | 10 ++--
.../query/calcite/message/ValueMessage.java | 5 +-
.../query/calcite/metadata/ColocationGroup.java | 6 +--
.../calcite/metadata/FragmentDescription.java | 6 +--
.../query/calcite/metadata/FragmentMapping.java | 6 +--
.../calcite/exec/rel/AbstractExecutionTest.java | 2 +
.../query/calcite/planner/PlannerTest.java | 2 +
.../sorted/inline/InlineTreeFilterClosure.java | 2 +-
.../processors/cache/GridCacheMessage.java | 5 +-
.../GridDistributedTxPrepareRequest.java | 4 +-
17 files changed, 64 insertions(+), 150 deletions(-)
diff --git
a/modules/calcite/src/main/java/org/apache/ignite/internal/processors/query/calcite/message/ErrorMessage.java
b/modules/calcite/src/main/java/org/apache/ignite/internal/processors/query/calcite/message/ErrorMessage.java
index 2ea310f6d3a..4d82ce9893a 100644
---
a/modules/calcite/src/main/java/org/apache/ignite/internal/processors/query/calcite/message/ErrorMessage.java
+++
b/modules/calcite/src/main/java/org/apache/ignite/internal/processors/query/calcite/message/ErrorMessage.java
@@ -21,6 +21,8 @@ import java.nio.ByteBuffer;
import java.util.UUID;
import org.apache.ignite.IgniteCheckedException;
import org.apache.ignite.internal.GridDirectTransient;
+import org.apache.ignite.internal.processors.cache.GridCacheSharedContext;
+import org.apache.ignite.internal.util.typedef.internal.U;
import org.apache.ignite.plugin.extensions.communication.MessageReader;
import org.apache.ignite.plugin.extensions.communication.MessageWriter;
@@ -161,13 +163,13 @@ public class ErrorMessage implements MarshalableMessage {
}
/** {@inheritDoc} */
- @Override public void prepareMarshal(MarshallingContext ctx) throws
IgniteCheckedException {
- errBytes = ctx.marshal(err);
+ @Override public void prepareMarshal(GridCacheSharedContext<?, ?> ctx)
throws IgniteCheckedException {
+ errBytes = U.marshal(ctx, err);
}
/** {@inheritDoc} */
- @Override public void prepareUnmarshal(MarshallingContext ctx) throws
IgniteCheckedException {
+ @Override public void prepareUnmarshal(GridCacheSharedContext<?, ?> ctx)
throws IgniteCheckedException {
if (errBytes != null)
- err = ctx.unmarshal(errBytes);
+ err = U.unmarshal(ctx, errBytes,
U.resolveClassLoader(ctx.gridConfig()));
}
}
diff --git
a/modules/calcite/src/main/java/org/apache/ignite/internal/processors/query/calcite/message/GenericValueMessage.java
b/modules/calcite/src/main/java/org/apache/ignite/internal/processors/query/calcite/message/GenericValueMessage.java
index f4c8d76ec61..ea6f704252b 100644
---
a/modules/calcite/src/main/java/org/apache/ignite/internal/processors/query/calcite/message/GenericValueMessage.java
+++
b/modules/calcite/src/main/java/org/apache/ignite/internal/processors/query/calcite/message/GenericValueMessage.java
@@ -20,6 +20,8 @@ package
org.apache.ignite.internal.processors.query.calcite.message;
import java.nio.ByteBuffer;
import org.apache.ignite.IgniteCheckedException;
import org.apache.ignite.internal.GridDirectTransient;
+import org.apache.ignite.internal.processors.cache.GridCacheSharedContext;
+import org.apache.ignite.internal.util.typedef.internal.U;
import org.apache.ignite.plugin.extensions.communication.MessageReader;
import org.apache.ignite.plugin.extensions.communication.MessageWriter;
@@ -50,15 +52,16 @@ public final class GenericValueMessage implements
ValueMessage {
}
/** {@inheritDoc} */
- @Override public void prepareMarshal(MarshallingContext ctx) throws
IgniteCheckedException {
+ @Override public void prepareMarshal(GridCacheSharedContext<?, ?> ctx)
throws IgniteCheckedException {
if (val != null && serialized == null)
- serialized = ctx.marshal(val);
+ serialized = U.marshal(ctx, val);
}
/** {@inheritDoc} */
- @Override public void prepareUnmarshal(MarshallingContext ctx) throws
IgniteCheckedException {
- if (serialized != null && val == null)
- val = ctx.unmarshal(serialized);
+ @Override public void prepareUnmarshal(GridCacheSharedContext<?, ?> ctx)
throws IgniteCheckedException {
+ if (serialized != null && val == null) {
+ val = U.unmarshal(ctx, serialized,
U.resolveClassLoader(ctx.gridConfig()));
+ }
}
/** {@inheritDoc} */
diff --git
a/modules/calcite/src/main/java/org/apache/ignite/internal/processors/query/calcite/message/MarshalableMessage.java
b/modules/calcite/src/main/java/org/apache/ignite/internal/processors/query/calcite/message/MarshalableMessage.java
index 26db96be294..b039c0b7512 100644
---
a/modules/calcite/src/main/java/org/apache/ignite/internal/processors/query/calcite/message/MarshalableMessage.java
+++
b/modules/calcite/src/main/java/org/apache/ignite/internal/processors/query/calcite/message/MarshalableMessage.java
@@ -18,6 +18,7 @@
package org.apache.ignite.internal.processors.query.calcite.message;
import org.apache.ignite.IgniteCheckedException;
+import org.apache.ignite.internal.processors.cache.GridCacheSharedContext;
/**
*
@@ -26,14 +27,14 @@ public interface MarshalableMessage extends CalciteMessage {
/**
* Prepares the message before sending.
*
- * @param ctx Marshaling context.
+ * @param ctx Cache shared context.
*/
- void prepareMarshal(MarshallingContext ctx) throws IgniteCheckedException;
+ void prepareMarshal(GridCacheSharedContext<?, ?> ctx) throws
IgniteCheckedException;
/**
* Prepares the message before processing.
*
- * @param ctx Marshaling context.
+ * @param ctx Cache shared context.
*/
- void prepareUnmarshal(MarshallingContext ctx) throws
IgniteCheckedException;
+ void prepareUnmarshal(GridCacheSharedContext<?, ?> ctx) throws
IgniteCheckedException;
}
diff --git
a/modules/calcite/src/main/java/org/apache/ignite/internal/processors/query/calcite/message/MarshallingContext.java
b/modules/calcite/src/main/java/org/apache/ignite/internal/processors/query/calcite/message/MarshallingContext.java
deleted file mode 100644
index 1599ea8685f..00000000000
---
a/modules/calcite/src/main/java/org/apache/ignite/internal/processors/query/calcite/message/MarshallingContext.java
+++ /dev/null
@@ -1,58 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.apache.ignite.internal.processors.query.calcite.message;
-
-import org.apache.ignite.IgniteCheckedException;
-import org.apache.ignite.marshaller.Marshaller;
-import org.jetbrains.annotations.Nullable;
-
-/** */
-public interface MarshallingContext {
- /**
- * @return Message marshaller.
- */
- Marshaller marshaller();
-
- /**
- * @return Message class loader.
- */
- ClassLoader classLoader();
-
- /**
- * Unmarshals object from byte array.
- *
- * @param <T> Type of unmarshalled object.
- * @param bytes Byte array.
- * @return Unmarshalled object.
- * @throws IgniteCheckedException If unmarshalling failed.
- */
- default <T> T unmarshal(byte[] bytes) throws IgniteCheckedException {
- return marshaller().unmarshal(bytes, classLoader());
- }
-
- /**
- * Marshals object to byte array.
- *
- * @param obj Object to marshal. {@code null} object will be marshaled to
binary {@code null} representation.
- * @return Byte array.
- * @throws IgniteCheckedException If marshalling failed.
- */
- default byte[] marshal(@Nullable Object obj) throws IgniteCheckedException
{
- return marshaller().marshal(obj);
- }
-}
diff --git
a/modules/calcite/src/main/java/org/apache/ignite/internal/processors/query/calcite/message/MessageServiceImpl.java
b/modules/calcite/src/main/java/org/apache/ignite/internal/processors/query/calcite/message/MessageServiceImpl.java
index e01c1d1d240..3b5b8a1f913 100644
---
a/modules/calcite/src/main/java/org/apache/ignite/internal/processors/query/calcite/message/MessageServiceImpl.java
+++
b/modules/calcite/src/main/java/org/apache/ignite/internal/processors/query/calcite/message/MessageServiceImpl.java
@@ -31,6 +31,7 @@ import
org.apache.ignite.internal.IgniteClientDisconnectedCheckedException;
import org.apache.ignite.internal.managers.communication.GridIoManager;
import org.apache.ignite.internal.managers.communication.GridIoPolicy;
import org.apache.ignite.internal.managers.communication.GridMessageListener;
+import org.apache.ignite.internal.processors.cache.GridCacheSharedContext;
import org.apache.ignite.internal.processors.failure.FailureProcessor;
import
org.apache.ignite.internal.processors.query.calcite.CalciteQueryProcessor;
import
org.apache.ignite.internal.processors.query.calcite.exec.QueryTaskExecutor;
@@ -38,25 +39,23 @@ import
org.apache.ignite.internal.processors.query.calcite.util.AbstractService;
import org.apache.ignite.internal.processors.query.calcite.util.Commons;
import org.apache.ignite.internal.util.typedef.internal.U;
import org.apache.ignite.lang.IgniteUuid;
-import org.apache.ignite.marshaller.Marshaller;
-import org.apache.ignite.marshaller.MarshallerUtils;
import org.apache.ignite.plugin.extensions.communication.Message;
/**
*
*/
-public class MessageServiceImpl extends AbstractService implements
MessageService, MarshallingContext {
+public class MessageServiceImpl extends AbstractService implements
MessageService {
/** */
private final GridMessageListener msgLsnr;
/** */
- private UUID localNodeId;
+ private final GridCacheSharedContext<?, ?> ctx;
/** */
- private GridIoManager ioManager;
+ private UUID localNodeId;
/** */
- private ClassLoader classLoader;
+ private final GridIoManager ioManager;
/** */
private QueryTaskExecutor taskExecutor;
@@ -64,9 +63,6 @@ public class MessageServiceImpl extends AbstractService
implements MessageServic
/** */
private FailureProcessor failureProcessor;
- /** */
- private Marshaller marsh;
-
/** */
private EnumMap<MessageType, MessageListener> lsnrs;
@@ -74,6 +70,8 @@ public class MessageServiceImpl extends AbstractService
implements MessageServic
public MessageServiceImpl(GridKernalContext ctx) {
super(ctx);
+ this.ctx = ctx.cache().context();
+ this.ioManager = ctx.io();
msgLsnr = this::onMessage;
}
@@ -91,13 +89,6 @@ public class MessageServiceImpl extends AbstractService
implements MessageServic
return localNodeId;
}
- /**
- * @param ioManager IO manager.
- */
- public void ioManager(GridIoManager ioManager) {
- this.ioManager = ioManager;
- }
-
/**
* @return IO manager.
*/
@@ -105,18 +96,6 @@ public class MessageServiceImpl extends AbstractService
implements MessageServic
return ioManager;
}
- /**
- * @param classLoader Class loader.
- */
- public void classLoader(ClassLoader classLoader) {
- this.classLoader = classLoader;
- }
-
- /** {@inheritDoc} */
- @Override public ClassLoader classLoader() {
- return classLoader;
- }
-
/**
* @param taskExecutor Task executor.
*/
@@ -131,18 +110,6 @@ public class MessageServiceImpl extends AbstractService
implements MessageServic
return taskExecutor;
}
- /**
- * @param marsh Marshaller.
- */
- public void marshaller(Marshaller marsh) {
- this.marsh = marsh;
- }
-
- /** {@inheritDoc} */
- @Override public Marshaller marshaller() {
- return marsh;
- }
-
/**
* @param failureProcessor Failure processor.
*/
@@ -160,16 +127,6 @@ public class MessageServiceImpl extends AbstractService
implements MessageServic
/** {@inheritDoc} */
@Override public void onStart(GridKernalContext ctx) {
localNodeId(ctx.localNodeId());
- classLoader(U.resolveClassLoader(ctx.config()));
- ioManager(ctx.io());
-
- @SuppressWarnings("deprecation")
- Marshaller marsh0 = ctx.config().getMarshaller();
-
- if (marsh0 == null) // Stubbed context doesn't have a marshaller
- marsh0 = MarshallerUtils.jdkMarshaller(ctx.igniteInstanceName());
-
- marshaller(marsh0);
CalciteQueryProcessor proc =
Objects.requireNonNull(Commons.lookupComponent(ctx,
CalciteQueryProcessor.class));
@@ -225,7 +182,7 @@ public class MessageServiceImpl extends AbstractService
implements MessageServic
protected void prepareMarshal(Message msg) throws IgniteCheckedException {
try {
if (msg instanceof MarshalableMessage)
- ((MarshalableMessage)msg).prepareMarshal(this);
+ ((MarshalableMessage)msg).prepareMarshal(ctx);
}
catch (Exception e) {
failureProcessor().process(new
FailureContext(FailureType.CRITICAL_ERROR, e));
@@ -238,7 +195,7 @@ public class MessageServiceImpl extends AbstractService
implements MessageServic
protected void prepareUnmarshal(Message msg) throws IgniteCheckedException
{
try {
if (msg instanceof MarshalableMessage)
- ((MarshalableMessage)msg).prepareUnmarshal(this);
+ ((MarshalableMessage)msg).prepareUnmarshal(ctx);
}
catch (Exception e) {
failureProcessor().process(new
FailureContext(FailureType.CRITICAL_ERROR, e));
diff --git
a/modules/calcite/src/main/java/org/apache/ignite/internal/processors/query/calcite/message/QueryBatchMessage.java
b/modules/calcite/src/main/java/org/apache/ignite/internal/processors/query/calcite/message/QueryBatchMessage.java
index 7b5c997c743..67191fac721 100644
---
a/modules/calcite/src/main/java/org/apache/ignite/internal/processors/query/calcite/message/QueryBatchMessage.java
+++
b/modules/calcite/src/main/java/org/apache/ignite/internal/processors/query/calcite/message/QueryBatchMessage.java
@@ -24,6 +24,7 @@ import java.util.UUID;
import org.apache.ignite.IgniteCheckedException;
import org.apache.ignite.internal.GridDirectCollection;
import org.apache.ignite.internal.GridDirectTransient;
+import org.apache.ignite.internal.processors.cache.GridCacheSharedContext;
import
org.apache.ignite.plugin.extensions.communication.MessageCollectionItemType;
import org.apache.ignite.plugin.extensions.communication.MessageReader;
import org.apache.ignite.plugin.extensions.communication.MessageWriter;
@@ -108,7 +109,7 @@ public class QueryBatchMessage implements
MarshalableMessage, ExecutionContextAw
}
/** {@inheritDoc} */
- @Override public void prepareMarshal(MarshallingContext ctx) throws
IgniteCheckedException {
+ @Override public void prepareMarshal(GridCacheSharedContext<?, ?> ctx)
throws IgniteCheckedException {
if (mRows != null || rows == null)
return;
@@ -126,7 +127,7 @@ public class QueryBatchMessage implements
MarshalableMessage, ExecutionContextAw
}
/** {@inheritDoc} */
- @Override public void prepareUnmarshal(MarshallingContext ctx) throws
IgniteCheckedException {
+ @Override public void prepareUnmarshal(GridCacheSharedContext<?, ?> ctx)
throws IgniteCheckedException {
if (rows != null || mRows == null)
return;
diff --git
a/modules/calcite/src/main/java/org/apache/ignite/internal/processors/query/calcite/message/QueryStartRequest.java
b/modules/calcite/src/main/java/org/apache/ignite/internal/processors/query/calcite/message/QueryStartRequest.java
index 37a7cd52bac..b8d5eb8f8f3 100644
---
a/modules/calcite/src/main/java/org/apache/ignite/internal/processors/query/calcite/message/QueryStartRequest.java
+++
b/modules/calcite/src/main/java/org/apache/ignite/internal/processors/query/calcite/message/QueryStartRequest.java
@@ -22,7 +22,9 @@ import java.util.UUID;
import org.apache.ignite.IgniteCheckedException;
import org.apache.ignite.internal.GridDirectTransient;
import org.apache.ignite.internal.processors.affinity.AffinityTopologyVersion;
+import org.apache.ignite.internal.processors.cache.GridCacheSharedContext;
import
org.apache.ignite.internal.processors.query.calcite.metadata.FragmentDescription;
+import org.apache.ignite.internal.util.typedef.internal.U;
import org.apache.ignite.plugin.extensions.communication.MessageReader;
import org.apache.ignite.plugin.extensions.communication.MessageWriter;
import org.jetbrains.annotations.Nullable;
@@ -167,17 +169,17 @@ public class QueryStartRequest implements
MarshalableMessage, ExecutionContextAw
}
/** {@inheritDoc} */
- @Override public void prepareMarshal(MarshallingContext ctx) throws
IgniteCheckedException {
+ @Override public void prepareMarshal(GridCacheSharedContext<?, ?> ctx)
throws IgniteCheckedException {
if (paramsBytes == null && params != null)
- paramsBytes = ctx.marshal(params);
+ paramsBytes = U.marshal(ctx, params);
fragmentDesc.prepareMarshal(ctx);
}
/** {@inheritDoc} */
- @Override public void prepareUnmarshal(MarshallingContext ctx) throws
IgniteCheckedException {
+ @Override public void prepareUnmarshal(GridCacheSharedContext<?, ?> ctx)
throws IgniteCheckedException {
if (params == null && paramsBytes != null)
- params = ctx.unmarshal(paramsBytes);
+ params = U.unmarshal(ctx, paramsBytes,
U.resolveClassLoader(ctx.gridConfig()));
fragmentDesc.prepareUnmarshal(ctx);
}
diff --git
a/modules/calcite/src/main/java/org/apache/ignite/internal/processors/query/calcite/message/QueryStartResponse.java
b/modules/calcite/src/main/java/org/apache/ignite/internal/processors/query/calcite/message/QueryStartResponse.java
index 5464f9d58de..785e259cef7 100644
---
a/modules/calcite/src/main/java/org/apache/ignite/internal/processors/query/calcite/message/QueryStartResponse.java
+++
b/modules/calcite/src/main/java/org/apache/ignite/internal/processors/query/calcite/message/QueryStartResponse.java
@@ -21,6 +21,8 @@ import java.nio.ByteBuffer;
import java.util.UUID;
import org.apache.ignite.IgniteCheckedException;
import org.apache.ignite.internal.GridDirectTransient;
+import org.apache.ignite.internal.processors.cache.GridCacheSharedContext;
+import org.apache.ignite.internal.util.typedef.internal.U;
import org.apache.ignite.plugin.extensions.communication.MessageReader;
import org.apache.ignite.plugin.extensions.communication.MessageWriter;
@@ -78,15 +80,15 @@ public class QueryStartResponse implements
MarshalableMessage {
}
/** {@inheritDoc} */
- @Override public void prepareMarshal(MarshallingContext ctx) throws
IgniteCheckedException {
+ @Override public void prepareMarshal(GridCacheSharedContext<?, ?> ctx)
throws IgniteCheckedException {
if (error != null)
- errBytes = ctx.marshal(error);
+ errBytes = U.marshal(ctx, error);
}
/** {@inheritDoc} */
- @Override public void prepareUnmarshal(MarshallingContext ctx) throws
IgniteCheckedException {
+ @Override public void prepareUnmarshal(GridCacheSharedContext<?, ?> ctx)
throws IgniteCheckedException {
if (errBytes != null)
- error = ctx.unmarshal(errBytes);
+ error = U.unmarshal(ctx, errBytes,
U.resolveClassLoader(ctx.gridConfig()));
}
/** {@inheritDoc} */
diff --git
a/modules/calcite/src/main/java/org/apache/ignite/internal/processors/query/calcite/message/ValueMessage.java
b/modules/calcite/src/main/java/org/apache/ignite/internal/processors/query/calcite/message/ValueMessage.java
index 82232b6c0ff..44c3d8d0fb5 100644
---
a/modules/calcite/src/main/java/org/apache/ignite/internal/processors/query/calcite/message/ValueMessage.java
+++
b/modules/calcite/src/main/java/org/apache/ignite/internal/processors/query/calcite/message/ValueMessage.java
@@ -18,6 +18,7 @@
package org.apache.ignite.internal.processors.query.calcite.message;
import org.apache.ignite.IgniteCheckedException;
+import org.apache.ignite.internal.processors.cache.GridCacheSharedContext;
/** */
public interface ValueMessage extends MarshalableMessage {
@@ -27,12 +28,12 @@ public interface ValueMessage extends MarshalableMessage {
Object value();
/** {@inheritDoc} */
- @Override default void prepareMarshal(MarshallingContext ctx) throws
IgniteCheckedException {
+ @Override default void prepareMarshal(GridCacheSharedContext<?, ?> ctx)
throws IgniteCheckedException {
// No-op
}
/** {@inheritDoc} */
- @Override default void prepareUnmarshal(MarshallingContext ctx) throws
IgniteCheckedException {
+ @Override default void prepareUnmarshal(GridCacheSharedContext<?, ?> ctx)
throws IgniteCheckedException {
// No-op
}
}
diff --git
a/modules/calcite/src/main/java/org/apache/ignite/internal/processors/query/calcite/metadata/ColocationGroup.java
b/modules/calcite/src/main/java/org/apache/ignite/internal/processors/query/calcite/metadata/ColocationGroup.java
index 1befc37d4d2..c5e652a00af 100644
---
a/modules/calcite/src/main/java/org/apache/ignite/internal/processors/query/calcite/metadata/ColocationGroup.java
+++
b/modules/calcite/src/main/java/org/apache/ignite/internal/processors/query/calcite/metadata/ColocationGroup.java
@@ -32,9 +32,9 @@ import java.util.stream.Collectors;
import java.util.stream.LongStream;
import org.apache.ignite.internal.GridDirectCollection;
import org.apache.ignite.internal.GridDirectTransient;
+import org.apache.ignite.internal.processors.cache.GridCacheSharedContext;
import
org.apache.ignite.internal.processors.cache.distributed.dht.topology.GridDhtPartitionState;
import
org.apache.ignite.internal.processors.query.calcite.message.MarshalableMessage;
-import
org.apache.ignite.internal.processors.query.calcite.message.MarshallingContext;
import org.apache.ignite.internal.processors.query.calcite.message.MessageType;
import org.apache.ignite.internal.processors.query.calcite.util.Commons;
import org.apache.ignite.internal.util.GridIntIterator;
@@ -358,7 +358,7 @@ public class ColocationGroup implements MarshalableMessage {
}
/** {@inheritDoc} */
- @Override public void prepareMarshal(MarshallingContext ctx) {
+ @Override public void prepareMarshal(GridCacheSharedContext<?, ?> ctx) {
if (assignments != null && marshalledAssignments == null) {
Map<UUID, Integer> nodeIdxs = new HashMap<>();
@@ -386,7 +386,7 @@ public class ColocationGroup implements MarshalableMessage {
}
/** {@inheritDoc} */
- @Override public void prepareUnmarshal(MarshallingContext ctx) {
+ @Override public void prepareUnmarshal(GridCacheSharedContext<?, ?> ctx) {
if (marshalledAssignments != null && assignments == null) {
int bitsPerPart = Integer.SIZE -
Integer.numberOfLeadingZeros(nodeIds.size());
diff --git
a/modules/calcite/src/main/java/org/apache/ignite/internal/processors/query/calcite/metadata/FragmentDescription.java
b/modules/calcite/src/main/java/org/apache/ignite/internal/processors/query/calcite/metadata/FragmentDescription.java
index f610459625d..dfef48e3346 100644
---
a/modules/calcite/src/main/java/org/apache/ignite/internal/processors/query/calcite/metadata/FragmentDescription.java
+++
b/modules/calcite/src/main/java/org/apache/ignite/internal/processors/query/calcite/metadata/FragmentDescription.java
@@ -24,8 +24,8 @@ import java.util.Map;
import java.util.UUID;
import org.apache.ignite.internal.GridDirectMap;
import org.apache.ignite.internal.GridDirectTransient;
+import org.apache.ignite.internal.processors.cache.GridCacheSharedContext;
import
org.apache.ignite.internal.processors.query.calcite.message.MarshalableMessage;
-import
org.apache.ignite.internal.processors.query.calcite.message.MarshallingContext;
import org.apache.ignite.internal.processors.query.calcite.message.MessageType;
import org.apache.ignite.internal.util.UUIDCollectionMessage;
import org.apache.ignite.internal.util.typedef.internal.U;
@@ -188,7 +188,7 @@ public class FragmentDescription implements
MarshalableMessage {
}
/** {@inheritDoc} */
- @Override public void prepareMarshal(MarshallingContext ctx) {
+ @Override public void prepareMarshal(GridCacheSharedContext<?, ?> ctx) {
if (mapping != null)
mapping.prepareMarshal(ctx);
@@ -204,7 +204,7 @@ public class FragmentDescription implements
MarshalableMessage {
}
/** {@inheritDoc} */
- @Override public void prepareUnmarshal(MarshallingContext ctx) {
+ @Override public void prepareUnmarshal(GridCacheSharedContext<?, ?> ctx) {
if (mapping != null)
mapping.prepareUnmarshal(ctx);
diff --git
a/modules/calcite/src/main/java/org/apache/ignite/internal/processors/query/calcite/metadata/FragmentMapping.java
b/modules/calcite/src/main/java/org/apache/ignite/internal/processors/query/calcite/metadata/FragmentMapping.java
index 5f99de31a45..3a69b7efff4 100644
---
a/modules/calcite/src/main/java/org/apache/ignite/internal/processors/query/calcite/metadata/FragmentMapping.java
+++
b/modules/calcite/src/main/java/org/apache/ignite/internal/processors/query/calcite/metadata/FragmentMapping.java
@@ -24,8 +24,8 @@ import java.util.UUID;
import java.util.function.Supplier;
import java.util.stream.Collectors;
import org.apache.ignite.internal.GridDirectCollection;
+import org.apache.ignite.internal.processors.cache.GridCacheSharedContext;
import
org.apache.ignite.internal.processors.query.calcite.message.MarshalableMessage;
-import
org.apache.ignite.internal.processors.query.calcite.message.MarshallingContext;
import org.apache.ignite.internal.processors.query.calcite.message.MessageType;
import org.apache.ignite.internal.processors.query.calcite.util.Commons;
import org.apache.ignite.internal.util.typedef.F;
@@ -168,12 +168,12 @@ public class FragmentMapping implements
MarshalableMessage {
}
/** {@inheritDoc} */
- @Override public void prepareMarshal(MarshallingContext ctx) {
+ @Override public void prepareMarshal(GridCacheSharedContext<?, ?> ctx) {
colocationGroups.forEach(g -> g.prepareMarshal(ctx));
}
/** {@inheritDoc} */
- @Override public void prepareUnmarshal(MarshallingContext ctx) {
+ @Override public void prepareUnmarshal(GridCacheSharedContext<?, ?> ctx) {
colocationGroups.forEach(g -> g.prepareUnmarshal(ctx));
}
diff --git
a/modules/calcite/src/test/java/org/apache/ignite/internal/processors/query/calcite/exec/rel/AbstractExecutionTest.java
b/modules/calcite/src/test/java/org/apache/ignite/internal/processors/query/calcite/exec/rel/AbstractExecutionTest.java
index 1df721c03ae..8a259226bbe 100644
---
a/modules/calcite/src/test/java/org/apache/ignite/internal/processors/query/calcite/exec/rel/AbstractExecutionTest.java
+++
b/modules/calcite/src/test/java/org/apache/ignite/internal/processors/query/calcite/exec/rel/AbstractExecutionTest.java
@@ -39,6 +39,7 @@ import org.apache.calcite.rel.type.RelDataType;
import org.apache.calcite.rel.type.RelDataTypeField;
import org.apache.ignite.internal.GridKernalContext;
import org.apache.ignite.internal.processors.affinity.AffinityTopologyVersion;
+import org.apache.ignite.internal.processors.cache.GridCacheProcessor;
import org.apache.ignite.internal.processors.query.calcite.QueryRegistryImpl;
import
org.apache.ignite.internal.processors.query.calcite.exec.ArrayRowHandler;
import
org.apache.ignite.internal.processors.query.calcite.exec.ExchangeService;
@@ -164,6 +165,7 @@ public class AbstractExecutionTest extends
GridCommonAbstractTest {
kernal.add(new GridTimeoutProcessor(kernal));
kernal.add(new NoOpIgniteSecurityProcessor(kernal));
+ kernal.add(new GridCacheProcessor(kernal));
QueryTaskExecutorImpl taskExecutor = new
QueryTaskExecutorImpl(kernal);
taskExecutor.stripedThreadPoolExecutor(new
IgniteTestStripedThreadPoolExecutor(
diff --git
a/modules/calcite/src/test/java/org/apache/ignite/internal/processors/query/calcite/planner/PlannerTest.java
b/modules/calcite/src/test/java/org/apache/ignite/internal/processors/query/calcite/planner/PlannerTest.java
index 39e956ae9a1..036c6dd10bd 100644
---
a/modules/calcite/src/test/java/org/apache/ignite/internal/processors/query/calcite/planner/PlannerTest.java
+++
b/modules/calcite/src/test/java/org/apache/ignite/internal/processors/query/calcite/planner/PlannerTest.java
@@ -32,6 +32,7 @@ import org.apache.calcite.schema.SchemaPlus;
import org.apache.calcite.util.ImmutableBitSet;
import org.apache.ignite.IgniteCheckedException;
import org.apache.ignite.internal.processors.affinity.AffinityTopologyVersion;
+import org.apache.ignite.internal.processors.cache.GridCacheProcessor;
import org.apache.ignite.internal.processors.query.calcite.QueryRegistryImpl;
import
org.apache.ignite.internal.processors.query.calcite.exec.ArrayRowHandler;
import
org.apache.ignite.internal.processors.query.calcite.exec.ExchangeServiceImpl;
@@ -377,6 +378,7 @@ public class PlannerTest extends AbstractPlannerTest {
) throws IgniteCheckedException {
GridTestKernalContext kernal = newContext();
kernal.add(new NoOpIgniteSecurityProcessor(kernal));
+ kernal.add(new GridCacheProcessor(kernal));
QueryTaskExecutorImpl taskExecutor = new QueryTaskExecutorImpl(kernal);
taskExecutor.stripedThreadPoolExecutor(new
IgniteStripedThreadPoolExecutor(
diff --git
a/modules/core/src/main/java/org/apache/ignite/internal/cache/query/index/sorted/inline/InlineTreeFilterClosure.java
b/modules/core/src/main/java/org/apache/ignite/internal/cache/query/index/sorted/inline/InlineTreeFilterClosure.java
index d862a8f6b3f..b02caa90c22 100644
---
a/modules/core/src/main/java/org/apache/ignite/internal/cache/query/index/sorted/inline/InlineTreeFilterClosure.java
+++
b/modules/core/src/main/java/org/apache/ignite/internal/cache/query/index/sorted/inline/InlineTreeFilterClosure.java
@@ -29,7 +29,7 @@ import
org.apache.ignite.spi.indexing.IndexingQueryCacheFilter;
import static org.apache.ignite.internal.pagemem.PageIdUtils.pageId;
/**
- * Reopresents filter that allow query only primary partitions.
+ * Represents filter that allow query only primary partitions.
*/
public class InlineTreeFilterClosure implements
BPlusTree.TreeRowClosure<IndexRow, IndexRow> {
/** */
diff --git
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheMessage.java
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheMessage.java
index c4fc5981322..d1ab56f8ffd 100644
---
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheMessage.java
+++
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheMessage.java
@@ -435,7 +435,6 @@ public abstract class GridCacheMessage implements Message {
* @throws IgniteCheckedException If failed.
*/
protected final void unmarshalTx(Iterable<IgniteTxEntry> txEntries,
- boolean near,
GridCacheSharedContext ctx,
ClassLoader ldr) throws IgniteCheckedException {
assert ldr != null;
@@ -443,9 +442,9 @@ public abstract class GridCacheMessage implements Message {
if (txEntries != null) {
for (IgniteTxEntry e : txEntries) {
- e.prepareUnmarshal(ctx, topologyVersion(), near);
+ e.prepareUnmarshal(ctx, topologyVersion(), false);
- e.unmarshal(ctx, near, ldr);
+ e.unmarshal(ctx, false, ldr);
}
}
}
diff --git
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/GridDistributedTxPrepareRequest.java
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/GridDistributedTxPrepareRequest.java
index 5e2d7e1194e..73d704e0adb 100644
---
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/GridDistributedTxPrepareRequest.java
+++
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/GridDistributedTxPrepareRequest.java
@@ -402,10 +402,10 @@ public class GridDistributedTxPrepareRequest extends
GridDistributedBaseMessage
super.finishUnmarshal(ctx, ldr);
if (writes != null)
- unmarshalTx(writes, false, ctx, ldr);
+ unmarshalTx(writes, ctx, ldr);
if (reads != null)
- unmarshalTx(reads, false, ctx, ldr);
+ unmarshalTx(reads, ctx, ldr);
if (dhtVerKeys != null && dhtVers == null) {
assert dhtVerVals != null;
