AMashenkov commented on a change in pull request #84: URL: https://github.com/apache/ignite-3/pull/84#discussion_r607773125
########## File path: modules/network/src/main/java/org/apache/ignite/network/scalecube/ScaleCubeMessagingService.java ########## @@ -0,0 +1,154 @@ +/* + * 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.network.scalecube; + +import java.time.Duration; +import java.util.Map; +import java.util.UUID; +import java.util.concurrent.CompletableFuture; +import java.util.concurrent.ConcurrentHashMap; +import io.scalecube.cluster.Cluster; +import io.scalecube.cluster.transport.api.Message; +import io.scalecube.net.Address; +import org.apache.ignite.network.AbstractMessagingService; +import org.apache.ignite.network.MessagingService; +import org.apache.ignite.network.NetworkMember; +import org.apache.ignite.network.NetworkMessageHandler; +import org.apache.ignite.network.message.NetworkMessage; + +import static org.apache.ignite.network.scalecube.ScaleCubeMessageCodec.HEADER_MESSAGE_TYPE; + +/** + * Implementation of {@link MessagingService} based on ScaleCube. + */ +final class ScaleCubeMessagingService extends AbstractMessagingService { + /** + * Inner representation ScaleCube cluster. + */ + private Cluster cluster; + + /** + * Resolver for ScaleCube-specific member. + */ + private final ScaleCubeMemberResolver memberResolver; + + /** + * Utility map for recognizing member for its address (ScaleCube doesn't provide such information in input + * message). + */ + private final Map<Address, NetworkMember> addressMemberMap = new ConcurrentHashMap<>(); + + /** + * + */ + ScaleCubeMessagingService(ScaleCubeMemberResolver memberResolver) { + this.memberResolver = memberResolver; + } + + /** + * Sets the ScaleCube's {@link Cluster}. Needed for cyclic dependency injection. + */ + void setCluster(Cluster cluster) { + this.cluster = cluster; + } + + /** + * Delegates the received message to the registered message handlers. + */ + void fireEvent(Message message) { + NetworkMessage msg = message.data(); + NetworkMember sender = memberForAddress(message.sender()); + String correlationId = message.correlationId(); + for (NetworkMessageHandler handler : getMessageHandlers()) + handler.onReceived(msg, sender, correlationId); + } + + /** + * {@inheritDoc} + */ Review comment: ```suggestion /** {@inheritDoc} */ ``` ########## File path: modules/network/src/main/java/org/apache/ignite/network/scalecube/ScaleCubeMessagingService.java ########## @@ -0,0 +1,154 @@ +/* + * 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.network.scalecube; + +import java.time.Duration; +import java.util.Map; +import java.util.UUID; +import java.util.concurrent.CompletableFuture; +import java.util.concurrent.ConcurrentHashMap; +import io.scalecube.cluster.Cluster; +import io.scalecube.cluster.transport.api.Message; +import io.scalecube.net.Address; +import org.apache.ignite.network.AbstractMessagingService; +import org.apache.ignite.network.MessagingService; +import org.apache.ignite.network.NetworkMember; +import org.apache.ignite.network.NetworkMessageHandler; +import org.apache.ignite.network.message.NetworkMessage; + +import static org.apache.ignite.network.scalecube.ScaleCubeMessageCodec.HEADER_MESSAGE_TYPE; + +/** + * Implementation of {@link MessagingService} based on ScaleCube. + */ +final class ScaleCubeMessagingService extends AbstractMessagingService { + /** + * Inner representation ScaleCube cluster. + */ + private Cluster cluster; + + /** + * Resolver for ScaleCube-specific member. + */ + private final ScaleCubeMemberResolver memberResolver; + + /** + * Utility map for recognizing member for its address (ScaleCube doesn't provide such information in input + * message). + */ + private final Map<Address, NetworkMember> addressMemberMap = new ConcurrentHashMap<>(); + + /** + * + */ + ScaleCubeMessagingService(ScaleCubeMemberResolver memberResolver) { + this.memberResolver = memberResolver; + } + + /** + * Sets the ScaleCube's {@link Cluster}. Needed for cyclic dependency injection. + */ + void setCluster(Cluster cluster) { + this.cluster = cluster; + } + + /** + * Delegates the received message to the registered message handlers. + */ + void fireEvent(Message message) { + NetworkMessage msg = message.data(); + NetworkMember sender = memberForAddress(message.sender()); + String correlationId = message.correlationId(); + for (NetworkMessageHandler handler : getMessageHandlers()) + handler.onReceived(msg, sender, correlationId); + } + + /** + * {@inheritDoc} + */ + @Override public void weakSend(NetworkMember recipient, NetworkMessage msg) { + cluster + .send(memberResolver.resolveMember(recipient), fromNetworkMessage(msg).build()) + .subscribe(); + } + + /** + * {@inheritDoc} + */ + @Override public CompletableFuture<Void> send(NetworkMember recipient, NetworkMessage msg) { + return cluster + .send(memberResolver.resolveMember(recipient), fromNetworkMessage(msg).build()) + .toFuture(); + } + + /** + * {@inheritDoc} + */ Review comment: ```suggestion /** {@inheritDoc} */ ``` ########## File path: modules/network/src/main/java/org/apache/ignite/network/scalecube/ScaleCubeMessagingService.java ########## @@ -0,0 +1,154 @@ +/* + * 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.network.scalecube; + +import java.time.Duration; +import java.util.Map; +import java.util.UUID; +import java.util.concurrent.CompletableFuture; +import java.util.concurrent.ConcurrentHashMap; +import io.scalecube.cluster.Cluster; +import io.scalecube.cluster.transport.api.Message; +import io.scalecube.net.Address; +import org.apache.ignite.network.AbstractMessagingService; +import org.apache.ignite.network.MessagingService; +import org.apache.ignite.network.NetworkMember; +import org.apache.ignite.network.NetworkMessageHandler; +import org.apache.ignite.network.message.NetworkMessage; + +import static org.apache.ignite.network.scalecube.ScaleCubeMessageCodec.HEADER_MESSAGE_TYPE; + +/** + * Implementation of {@link MessagingService} based on ScaleCube. + */ +final class ScaleCubeMessagingService extends AbstractMessagingService { + /** + * Inner representation ScaleCube cluster. + */ + private Cluster cluster; + + /** + * Resolver for ScaleCube-specific member. + */ + private final ScaleCubeMemberResolver memberResolver; + + /** + * Utility map for recognizing member for its address (ScaleCube doesn't provide such information in input + * message). + */ + private final Map<Address, NetworkMember> addressMemberMap = new ConcurrentHashMap<>(); + + /** + * + */ + ScaleCubeMessagingService(ScaleCubeMemberResolver memberResolver) { + this.memberResolver = memberResolver; + } + + /** + * Sets the ScaleCube's {@link Cluster}. Needed for cyclic dependency injection. + */ + void setCluster(Cluster cluster) { + this.cluster = cluster; + } + + /** + * Delegates the received message to the registered message handlers. + */ + void fireEvent(Message message) { + NetworkMessage msg = message.data(); + NetworkMember sender = memberForAddress(message.sender()); + String correlationId = message.correlationId(); + for (NetworkMessageHandler handler : getMessageHandlers()) + handler.onReceived(msg, sender, correlationId); + } + + /** + * {@inheritDoc} + */ + @Override public void weakSend(NetworkMember recipient, NetworkMessage msg) { + cluster + .send(memberResolver.resolveMember(recipient), fromNetworkMessage(msg).build()) + .subscribe(); + } + + /** + * {@inheritDoc} + */ Review comment: ```suggestion /** {@inheritDoc} */ ``` ########## File path: modules/network/src/main/java/org/apache/ignite/network/scalecube/ScaleCubeMessagingService.java ########## @@ -0,0 +1,154 @@ +/* + * 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.network.scalecube; + +import java.time.Duration; +import java.util.Map; +import java.util.UUID; +import java.util.concurrent.CompletableFuture; +import java.util.concurrent.ConcurrentHashMap; +import io.scalecube.cluster.Cluster; +import io.scalecube.cluster.transport.api.Message; +import io.scalecube.net.Address; +import org.apache.ignite.network.AbstractMessagingService; +import org.apache.ignite.network.MessagingService; +import org.apache.ignite.network.NetworkMember; +import org.apache.ignite.network.NetworkMessageHandler; +import org.apache.ignite.network.message.NetworkMessage; + +import static org.apache.ignite.network.scalecube.ScaleCubeMessageCodec.HEADER_MESSAGE_TYPE; + +/** + * Implementation of {@link MessagingService} based on ScaleCube. + */ +final class ScaleCubeMessagingService extends AbstractMessagingService { + /** + * Inner representation ScaleCube cluster. + */ + private Cluster cluster; + + /** + * Resolver for ScaleCube-specific member. + */ + private final ScaleCubeMemberResolver memberResolver; + + /** + * Utility map for recognizing member for its address (ScaleCube doesn't provide such information in input + * message). + */ + private final Map<Address, NetworkMember> addressMemberMap = new ConcurrentHashMap<>(); + + /** + * + */ + ScaleCubeMessagingService(ScaleCubeMemberResolver memberResolver) { + this.memberResolver = memberResolver; + } + + /** + * Sets the ScaleCube's {@link Cluster}. Needed for cyclic dependency injection. + */ + void setCluster(Cluster cluster) { + this.cluster = cluster; + } + + /** + * Delegates the received message to the registered message handlers. + */ + void fireEvent(Message message) { + NetworkMessage msg = message.data(); + NetworkMember sender = memberForAddress(message.sender()); + String correlationId = message.correlationId(); + for (NetworkMessageHandler handler : getMessageHandlers()) + handler.onReceived(msg, sender, correlationId); + } + + /** + * {@inheritDoc} + */ + @Override public void weakSend(NetworkMember recipient, NetworkMessage msg) { + cluster + .send(memberResolver.resolveMember(recipient), fromNetworkMessage(msg).build()) + .subscribe(); + } + + /** + * {@inheritDoc} + */ + @Override public CompletableFuture<Void> send(NetworkMember recipient, NetworkMessage msg) { + return cluster + .send(memberResolver.resolveMember(recipient), fromNetworkMessage(msg).build()) + .toFuture(); + } + + /** + * {@inheritDoc} + */ + @Override public CompletableFuture<Void> send(NetworkMember recipient, NetworkMessage msg, String correlationId) { + var message = fromNetworkMessage(msg) + .correlationId(correlationId) + .build(); + return cluster + .send(memberResolver.resolveMember(recipient), message) + .toFuture(); + } + + /** + * {@inheritDoc} + */ + @Override public CompletableFuture<NetworkMessage> invoke(NetworkMember member, NetworkMessage msg, long timeout) { Review comment: ```suggestion /** {@inheritDoc} */ ``` -- 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]
