Skip to content

Commit 84aa7ce

Browse files
author
Marcelo Vanzin
committed
Rename handler to the correct name.
It's been too long since the electronics class in college, I guess.
1 parent 432f3bd commit 84aa7ce

File tree

3 files changed

+6
-6
lines changed

3 files changed

+6
-6
lines changed

network/common/src/main/java/org/apache/spark/network/TransportContext.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -30,8 +30,8 @@
3030
import org.apache.spark.network.client.TransportClientFactory;
3131
import org.apache.spark.network.client.TransportResponseHandler;
3232
import org.apache.spark.network.protocol.MessageDecoder;
33-
import org.apache.spark.network.protocol.MessageDemux;
3433
import org.apache.spark.network.protocol.MessageEncoder;
34+
import org.apache.spark.network.protocol.MessageMuxer;
3535
import org.apache.spark.network.server.RpcHandler;
3636
import org.apache.spark.network.server.TransportChannelHandler;
3737
import org.apache.spark.network.server.TransportRequestHandler;
@@ -104,7 +104,7 @@ public TransportChannelHandler initializePipeline(SocketChannel channel) {
104104
try {
105105
TransportChannelHandler channelHandler = createChannelHandler(channel);
106106
channel.pipeline()
107-
.addLast("demux", new MessageDemux())
107+
.addLast("muxer", new MessageMuxer())
108108
.addLast("encoder", encoder)
109109
.addLast("frameDecoder", NettyUtils.createFrameDecoder())
110110
.addLast("decoder", decoder)

network/common/src/main/java/org/apache/spark/network/protocol/MessageDemux.java renamed to network/common/src/main/java/org/apache/spark/network/protocol/MessageMuxer.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@
3030
* processed by the pipeline stages properly, by being passed down as a list of buffers until
3131
* the very last handler (this one).
3232
*/
33-
public final class MessageDemux extends ChannelOutboundHandlerAdapter {
33+
public final class MessageMuxer extends ChannelOutboundHandlerAdapter {
3434

3535
private final Object lock = new Object();
3636

network/common/src/test/java/org/apache/spark/network/ProtocolSuite.java

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@
2323
import static org.junit.Assert.assertEquals;
2424

2525
import org.apache.spark.network.protocol.Message;
26-
import org.apache.spark.network.protocol.MessageDemux;
26+
import org.apache.spark.network.protocol.MessageMuxer;
2727
import org.apache.spark.network.protocol.StreamChunkId;
2828
import org.apache.spark.network.protocol.ChunkFetchRequest;
2929
import org.apache.spark.network.protocol.ChunkFetchFailure;
@@ -37,7 +37,7 @@
3737

3838
public class ProtocolSuite {
3939
private void testServerToClient(Message msg) {
40-
EmbeddedChannel serverChannel = new EmbeddedChannel(new MessageDemux(), new MessageEncoder());
40+
EmbeddedChannel serverChannel = new EmbeddedChannel(new MessageMuxer(), new MessageEncoder());
4141
serverChannel.writeOutbound(msg);
4242

4343
EmbeddedChannel clientChannel = new EmbeddedChannel(
@@ -52,7 +52,7 @@ private void testServerToClient(Message msg) {
5252
}
5353

5454
private void testClientToServer(Message msg) {
55-
EmbeddedChannel clientChannel = new EmbeddedChannel(new MessageDemux(), new MessageEncoder());
55+
EmbeddedChannel clientChannel = new EmbeddedChannel(new MessageMuxer(), new MessageEncoder());
5656
clientChannel.writeOutbound(msg);
5757

5858
EmbeddedChannel serverChannel = new EmbeddedChannel(

0 commit comments

Comments
 (0)