alex-plekhanov commented on a change in pull request #7811: URL: https://github.com/apache/ignite/pull/7811#discussion_r427212446
########## File path: modules/core/src/test/java/org/apache/ignite/internal/client/thin/TestTask.java ########## @@ -0,0 +1,58 @@ +/* + * 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.client.thin; + +import org.apache.ignite.Ignite; +import org.apache.ignite.IgniteException; +import org.apache.ignite.cluster.ClusterNode; +import org.apache.ignite.compute.ComputeJob; +import org.apache.ignite.compute.ComputeJobResult; +import org.apache.ignite.compute.ComputeTaskAdapter; +import org.apache.ignite.compute.ComputeTaskName; +import org.apache.ignite.internal.util.typedef.T2; +import org.apache.ignite.resources.IgniteInstanceResource; +import org.jetbrains.annotations.NotNull; +import org.jetbrains.annotations.Nullable; + +import java.util.List; +import java.util.Map; +import java.util.Set; +import java.util.UUID; +import java.util.stream.Collectors; + +/** + * Compute task which returns node id for routing node and list of node ids for each node was affected. + */ +@ComputeTaskName(ComputeTaskTest.TEST_TASK_NAME) +public class TestTask extends ComputeTaskAdapter<Long, T2<UUID, Set<UUID>>> { + /** Ignite. */ + @IgniteInstanceResource + Ignite ignite; + + /** {@inheritDoc} */ + @Override public @NotNull Map<? extends ComputeJob, ClusterNode> map(List<ClusterNode> subgrid, + @Nullable Long arg) throws IgniteException { Review comment: Wrong indent ########## File path: modules/core/src/main/java/org/apache/ignite/internal/MarshallerContextImpl.java ########## @@ -391,34 +411,56 @@ public void onMappingAccepted(final MarshallerMappingItem item) { if (clsName != null) cache.putIfAbsent(typeId, new MappedName(clsName, true)); else - if (clientNode) { - mappedName = cache.get(typeId); - - if (mappedName == null) { - GridFutureAdapter<MappingExchangeResult> fut = transport.requestMapping( - new MarshallerMappingItem(platformId, typeId, null), - cache); - - clsName = fut.get().className(); - } - else - clsName = mappedName.className(); + if (clientNode) { Review comment: `else if` should be in one line (codestyle) ########## File path: modules/core/src/main/java/org/apache/ignite/internal/client/thin/ClientClusterImpl.java ########## @@ -132,7 +132,7 @@ private boolean changeWalState(String cacheName, boolean enable) throws ClientEx private void checkClusterApiSupported(ProtocolContext protocolCtx) throws ClientFeatureNotSupportedByServerException { if (!protocolCtx.isFeatureSupported(ProtocolVersionFeature.CLUSTER_API) && - !protocolCtx.isFeatureSupported(ProtocolBitmaskFeature.CLUSTER_API)) - throw new ClientFeatureNotSupportedByServerException(ProtocolBitmaskFeature.CLUSTER_API); + !protocolCtx.isFeatureSupported(ProtocolBitmaskFeature.CLUSTER_ADDITIONAL_STATES)) + throw new ClientFeatureNotSupportedByServerException(ProtocolBitmaskFeature.CLUSTER_ADDITIONAL_STATES); Review comment: Perhaps it's better to change exception message now to something like 'Cluster API is not supported by the server' ########## File path: modules/core/src/main/java/org/apache/ignite/internal/processors/platform/client/compute/ClientExecuteTaskRequest.java ########## @@ -77,7 +79,15 @@ public ClientExecuteTaskRequest(BinaryRawReader reader) { long taskId = ctx.resources().put(task); try { - task.execute(taskId, taskName, arg, nodeIds, flags, timeout); + Object arg0 = arg; + + // Deserialize as part of process() call - not in constructor - for proper error handling. + // Failure to deserialize binary object should not be treated as a failure to decode request. + if ((flags & ClientComputeTask.KEEP_BINARY_FLAG_MASK) == 0 && arg instanceof BinaryObject) { Review comment: Redundant { } for one line statement (codestyle) ---------------------------------------------------------------- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: [email protected]
