activemq-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From jbert...@apache.org
Subject [4/4] activemq-artemis git commit: ARTEMIS-1056 Removing PartialPooledByteBufAllocator
Date Thu, 23 Mar 2017 23:20:16 GMT
ARTEMIS-1056 Removing PartialPooledByteBufAllocator


Project: http://git-wip-us.apache.org/repos/asf/activemq-artemis/repo
Commit: http://git-wip-us.apache.org/repos/asf/activemq-artemis/commit/2c9b0280
Tree: http://git-wip-us.apache.org/repos/asf/activemq-artemis/tree/2c9b0280
Diff: http://git-wip-us.apache.org/repos/asf/activemq-artemis/diff/2c9b0280

Branch: refs/heads/master
Commit: 2c9b02806ddc48a03f9c7dc8b3e00c97b1cf8fb0
Parents: 356a710
Author: Clebert Suconic <clebertsuconic@apache.org>
Authored: Thu Mar 23 10:31:24 2017 -0400
Committer: Justin Bertram <jbertram@apache.org>
Committed: Thu Mar 23 18:16:48 2017 -0500

----------------------------------------------------------------------
 .../remoting/impl/netty/NettyConnection.java    |   3 +-
 .../remoting/impl/netty/NettyConnector.java     |   1 -
 .../netty/PartialPooledByteBufAllocator.java    | 138 -------------------
 .../artemis/core/protocol/ProtocolHandler.java  |   5 -
 .../core/remoting/impl/netty/NettyAcceptor.java |   1 -
 .../client/transport/NettyTcpTransport.java     |   1 -
 .../amqp/client/transport/NettyWSTransport.java |   1 -
 .../PartialPooledByteBufAllocator.java          | 138 -------------------
 .../NettyConnectorWithHTTPUpgradeTest.java      |   3 -
 9 files changed, 2 insertions(+), 289 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/2c9b0280/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/remoting/impl/netty/NettyConnection.java
----------------------------------------------------------------------
diff --git a/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/remoting/impl/netty/NettyConnection.java
b/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/remoting/impl/netty/NettyConnection.java
index 33dbf4b..c3a71c5 100644
--- a/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/remoting/impl/netty/NettyConnection.java
+++ b/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/remoting/impl/netty/NettyConnection.java
@@ -23,6 +23,7 @@ import java.util.Map;
 import java.util.concurrent.Semaphore;
 
 import io.netty.buffer.ByteBuf;
+import io.netty.buffer.PooledByteBufAllocator;
 import io.netty.channel.Channel;
 import io.netty.channel.ChannelFuture;
 import io.netty.channel.ChannelFutureListener;
@@ -215,7 +216,7 @@ public class NettyConnection implements Connection {
 
    @Override
    public ActiveMQBuffer createTransportBuffer(final int size, boolean pooled) {
-      return new ChannelBufferWrapper(PartialPooledByteBufAllocator.INSTANCE.directBuffer(size),
true);
+      return new ChannelBufferWrapper(PooledByteBufAllocator.DEFAULT.directBuffer(size),
true);
    }
 
    @Override

http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/2c9b0280/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/remoting/impl/netty/NettyConnector.java
----------------------------------------------------------------------
diff --git a/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/remoting/impl/netty/NettyConnector.java
b/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/remoting/impl/netty/NettyConnector.java
index 38fb326..4a5e9e6 100644
--- a/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/remoting/impl/netty/NettyConnector.java
+++ b/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/remoting/impl/netty/NettyConnector.java
@@ -407,7 +407,6 @@ public class NettyConnector extends AbstractConnector {
       }
       bootstrap.option(ChannelOption.SO_KEEPALIVE, true);
       bootstrap.option(ChannelOption.SO_REUSEADDR, true);
-      bootstrap.option(ChannelOption.ALLOCATOR, PartialPooledByteBufAllocator.INSTANCE);
       channelGroup = new DefaultChannelGroup("activemq-connector", GlobalEventExecutor.INSTANCE);
 
       final SSLContext context;

http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/2c9b0280/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/remoting/impl/netty/PartialPooledByteBufAllocator.java
----------------------------------------------------------------------
diff --git a/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/remoting/impl/netty/PartialPooledByteBufAllocator.java
b/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/remoting/impl/netty/PartialPooledByteBufAllocator.java
deleted file mode 100644
index 3a192e8..0000000
--- a/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/remoting/impl/netty/PartialPooledByteBufAllocator.java
+++ /dev/null
@@ -1,138 +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.activemq.artemis.core.remoting.impl.netty;
-
-import io.netty.buffer.ByteBuf;
-import io.netty.buffer.ByteBufAllocator;
-import io.netty.buffer.CompositeByteBuf;
-import io.netty.buffer.PooledByteBufAllocator;
-import io.netty.buffer.UnpooledByteBufAllocator;
-
-/**
- * A {@link ByteBufAllocator} which is partial pooled. Which means only direct {@link ByteBuf}s
are pooled. The rest
- * is unpooled.
- */
-public class PartialPooledByteBufAllocator implements ByteBufAllocator {
-
-   private static final ByteBufAllocator POOLED = PooledByteBufAllocator.DEFAULT;
-   private static final ByteBufAllocator UNPOOLED = new UnpooledByteBufAllocator(false);
-
-   public static final PartialPooledByteBufAllocator INSTANCE = new PartialPooledByteBufAllocator();
-
-   private PartialPooledByteBufAllocator() {
-   }
-
-   @Override
-   public ByteBuf buffer() {
-      return UNPOOLED.heapBuffer();
-   }
-
-   @Override
-   public ByteBuf buffer(int initialCapacity) {
-      return UNPOOLED.heapBuffer(initialCapacity);
-   }
-
-   @Override
-   public ByteBuf buffer(int initialCapacity, int maxCapacity) {
-      return UNPOOLED.heapBuffer(initialCapacity, maxCapacity);
-   }
-
-   @Override
-   public ByteBuf ioBuffer() {
-      return POOLED.directBuffer();
-   }
-
-   @Override
-   public ByteBuf ioBuffer(int initialCapacity) {
-      return POOLED.directBuffer(initialCapacity);
-   }
-
-   @Override
-   public ByteBuf ioBuffer(int initialCapacity, int maxCapacity) {
-      return POOLED.directBuffer(initialCapacity, maxCapacity);
-   }
-
-   @Override
-   public ByteBuf heapBuffer() {
-      return UNPOOLED.heapBuffer();
-   }
-
-   @Override
-   public ByteBuf heapBuffer(int initialCapacity) {
-      return UNPOOLED.heapBuffer(initialCapacity);
-   }
-
-   @Override
-   public ByteBuf heapBuffer(int initialCapacity, int maxCapacity) {
-      return UNPOOLED.heapBuffer(initialCapacity, maxCapacity);
-   }
-
-   @Override
-   public ByteBuf directBuffer() {
-      return POOLED.directBuffer();
-   }
-
-   @Override
-   public ByteBuf directBuffer(int initialCapacity) {
-      return POOLED.directBuffer(initialCapacity);
-   }
-
-   @Override
-   public ByteBuf directBuffer(int initialCapacity, int maxCapacity) {
-      return POOLED.directBuffer(initialCapacity, maxCapacity);
-   }
-
-   @Override
-   public CompositeByteBuf compositeBuffer() {
-      return UNPOOLED.compositeHeapBuffer();
-   }
-
-   @Override
-   public CompositeByteBuf compositeBuffer(int maxNumComponents) {
-      return UNPOOLED.compositeHeapBuffer(maxNumComponents);
-   }
-
-   @Override
-   public CompositeByteBuf compositeHeapBuffer() {
-      return UNPOOLED.compositeHeapBuffer();
-   }
-
-   @Override
-   public CompositeByteBuf compositeHeapBuffer(int maxNumComponents) {
-      return UNPOOLED.compositeHeapBuffer(maxNumComponents);
-   }
-
-   @Override
-   public CompositeByteBuf compositeDirectBuffer() {
-      return POOLED.compositeDirectBuffer();
-   }
-
-   @Override
-   public CompositeByteBuf compositeDirectBuffer(int maxNumComponents) {
-      return POOLED.compositeDirectBuffer();
-   }
-
-   @Override
-   public boolean isDirectBufferPooled() {
-      return true;
-   }
-
-   @Override
-   public int calculateNewCapacity(int minNewCapacity, int maxCapacity) {
-      return UNPOOLED.calculateNewCapacity(minNewCapacity, maxCapacity);
-   }
-}

http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/2c9b0280/artemis-server/src/main/java/org/apache/activemq/artemis/core/protocol/ProtocolHandler.java
----------------------------------------------------------------------
diff --git a/artemis-server/src/main/java/org/apache/activemq/artemis/core/protocol/ProtocolHandler.java
b/artemis-server/src/main/java/org/apache/activemq/artemis/core/protocol/ProtocolHandler.java
index 340861b..ca78f29 100644
--- a/artemis-server/src/main/java/org/apache/activemq/artemis/core/protocol/ProtocolHandler.java
+++ b/artemis-server/src/main/java/org/apache/activemq/artemis/core/protocol/ProtocolHandler.java
@@ -44,7 +44,6 @@ import org.apache.activemq.artemis.core.remoting.impl.netty.HttpKeepAliveRunnabl
 import org.apache.activemq.artemis.core.remoting.impl.netty.NettyAcceptor;
 import org.apache.activemq.artemis.core.remoting.impl.netty.NettyConnector;
 import org.apache.activemq.artemis.core.remoting.impl.netty.NettyServerConnection;
-import org.apache.activemq.artemis.core.remoting.impl.netty.PartialPooledByteBufAllocator;
 import org.apache.activemq.artemis.core.remoting.impl.netty.TransportConstants;
 import org.apache.activemq.artemis.core.server.protocol.websocket.WebSocketServerHandler;
 import org.apache.activemq.artemis.spi.core.protocol.ProtocolManager;
@@ -185,10 +184,6 @@ public class ProtocolHandler {
          protocolManagerToUse.handshake(connection, new ChannelBufferWrapper(in));
          pipeline.remove(this);
 
-         // https://issues.apache.org/jira/browse/ARTEMIS-392
-         // Application servers or other components may upgrade a regular socket to Netty
-         // We need to be able to work normally as with anything else on Artemis
-         ctx.channel().config().setAllocator(PartialPooledByteBufAllocator.INSTANCE);
          ctx.flush();
       }
 

http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/2c9b0280/artemis-server/src/main/java/org/apache/activemq/artemis/core/remoting/impl/netty/NettyAcceptor.java
----------------------------------------------------------------------
diff --git a/artemis-server/src/main/java/org/apache/activemq/artemis/core/remoting/impl/netty/NettyAcceptor.java
b/artemis-server/src/main/java/org/apache/activemq/artemis/core/remoting/impl/netty/NettyAcceptor.java
index aaae108..a46684d 100644
--- a/artemis-server/src/main/java/org/apache/activemq/artemis/core/remoting/impl/netty/NettyAcceptor.java
+++ b/artemis-server/src/main/java/org/apache/activemq/artemis/core/remoting/impl/netty/NettyAcceptor.java
@@ -319,7 +319,6 @@ public class NettyAcceptor extends AbstractAcceptor {
       bootstrap.option(ChannelOption.SO_REUSEADDR, true);
       bootstrap.childOption(ChannelOption.SO_REUSEADDR, true);
       bootstrap.childOption(ChannelOption.SO_KEEPALIVE, true);
-      bootstrap.childOption(ChannelOption.ALLOCATOR, PartialPooledByteBufAllocator.INSTANCE);
       channelGroup = new DefaultChannelGroup("activemq-accepted-channels", GlobalEventExecutor.INSTANCE);
 
       serverChannelGroup = new DefaultChannelGroup("activemq-acceptor-channels", GlobalEventExecutor.INSTANCE);

http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/2c9b0280/tests/artemis-test-support/src/main/java/org/apache/activemq/transport/amqp/client/transport/NettyTcpTransport.java
----------------------------------------------------------------------
diff --git a/tests/artemis-test-support/src/main/java/org/apache/activemq/transport/amqp/client/transport/NettyTcpTransport.java
b/tests/artemis-test-support/src/main/java/org/apache/activemq/transport/amqp/client/transport/NettyTcpTransport.java
index d4b9f54..29963a0 100644
--- a/tests/artemis-test-support/src/main/java/org/apache/activemq/transport/amqp/client/transport/NettyTcpTransport.java
+++ b/tests/artemis-test-support/src/main/java/org/apache/activemq/transport/amqp/client/transport/NettyTcpTransport.java
@@ -268,7 +268,6 @@ public class NettyTcpTransport implements NettyTransport {
       bootstrap.option(ChannelOption.CONNECT_TIMEOUT_MILLIS, options.getConnectTimeout());
       bootstrap.option(ChannelOption.SO_KEEPALIVE, options.isTcpKeepAlive());
       bootstrap.option(ChannelOption.SO_LINGER, options.getSoLinger());
-      bootstrap.option(ChannelOption.ALLOCATOR, PartialPooledByteBufAllocator.INSTANCE);
 
       if (options.getSendBufferSize() != -1) {
          bootstrap.option(ChannelOption.SO_SNDBUF, options.getSendBufferSize());

http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/2c9b0280/tests/artemis-test-support/src/main/java/org/apache/activemq/transport/amqp/client/transport/NettyWSTransport.java
----------------------------------------------------------------------
diff --git a/tests/artemis-test-support/src/main/java/org/apache/activemq/transport/amqp/client/transport/NettyWSTransport.java
b/tests/artemis-test-support/src/main/java/org/apache/activemq/transport/amqp/client/transport/NettyWSTransport.java
index 8a34a4b..f75a52e 100644
--- a/tests/artemis-test-support/src/main/java/org/apache/activemq/transport/amqp/client/transport/NettyWSTransport.java
+++ b/tests/artemis-test-support/src/main/java/org/apache/activemq/transport/amqp/client/transport/NettyWSTransport.java
@@ -285,7 +285,6 @@ public class NettyWSTransport implements NettyTransport {
       bootstrap.option(ChannelOption.CONNECT_TIMEOUT_MILLIS, options.getConnectTimeout());
       bootstrap.option(ChannelOption.SO_KEEPALIVE, options.isTcpKeepAlive());
       bootstrap.option(ChannelOption.SO_LINGER, options.getSoLinger());
-      bootstrap.option(ChannelOption.ALLOCATOR, PartialPooledByteBufAllocator.INSTANCE);
 
       if (options.getSendBufferSize() != -1) {
          bootstrap.option(ChannelOption.SO_SNDBUF, options.getSendBufferSize());

http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/2c9b0280/tests/artemis-test-support/src/main/java/org/apache/activemq/transport/amqp/client/transport/PartialPooledByteBufAllocator.java
----------------------------------------------------------------------
diff --git a/tests/artemis-test-support/src/main/java/org/apache/activemq/transport/amqp/client/transport/PartialPooledByteBufAllocator.java
b/tests/artemis-test-support/src/main/java/org/apache/activemq/transport/amqp/client/transport/PartialPooledByteBufAllocator.java
deleted file mode 100644
index 17f601a..0000000
--- a/tests/artemis-test-support/src/main/java/org/apache/activemq/transport/amqp/client/transport/PartialPooledByteBufAllocator.java
+++ /dev/null
@@ -1,138 +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.activemq.transport.amqp.client.transport;
-
-import io.netty.buffer.ByteBuf;
-import io.netty.buffer.ByteBufAllocator;
-import io.netty.buffer.CompositeByteBuf;
-import io.netty.buffer.PooledByteBufAllocator;
-import io.netty.buffer.UnpooledByteBufAllocator;
-
-/**
- * A {@link ByteBufAllocator} which is partial pooled. Which means only direct
- * {@link ByteBuf}s are pooled. The rest is unpooled.
- */
-public class PartialPooledByteBufAllocator implements ByteBufAllocator {
-
-   private static final ByteBufAllocator POOLED = PooledByteBufAllocator.DEFAULT;
-   private static final ByteBufAllocator UNPOOLED = new UnpooledByteBufAllocator(false);
-
-   public static final PartialPooledByteBufAllocator INSTANCE = new PartialPooledByteBufAllocator();
-
-   private PartialPooledByteBufAllocator() {
-   }
-
-   @Override
-   public int calculateNewCapacity(int minNewCapacity, int maxCapacity) {
-      return POOLED.calculateNewCapacity(minNewCapacity, maxCapacity);
-   }
-
-   @Override
-   public ByteBuf buffer() {
-      return UNPOOLED.heapBuffer();
-   }
-
-   @Override
-   public ByteBuf buffer(int initialCapacity) {
-      return UNPOOLED.heapBuffer(initialCapacity);
-   }
-
-   @Override
-   public ByteBuf buffer(int initialCapacity, int maxCapacity) {
-      return UNPOOLED.heapBuffer(initialCapacity, maxCapacity);
-   }
-
-   @Override
-   public ByteBuf ioBuffer() {
-      return UNPOOLED.heapBuffer();
-   }
-
-   @Override
-   public ByteBuf ioBuffer(int initialCapacity) {
-      return UNPOOLED.heapBuffer(initialCapacity);
-   }
-
-   @Override
-   public ByteBuf ioBuffer(int initialCapacity, int maxCapacity) {
-      return UNPOOLED.heapBuffer(initialCapacity, maxCapacity);
-   }
-
-   @Override
-   public ByteBuf heapBuffer() {
-      return UNPOOLED.heapBuffer();
-   }
-
-   @Override
-   public ByteBuf heapBuffer(int initialCapacity) {
-      return UNPOOLED.heapBuffer(initialCapacity);
-   }
-
-   @Override
-   public ByteBuf heapBuffer(int initialCapacity, int maxCapacity) {
-      return UNPOOLED.heapBuffer(initialCapacity, maxCapacity);
-   }
-
-   @Override
-   public ByteBuf directBuffer() {
-      return POOLED.directBuffer();
-   }
-
-   @Override
-   public ByteBuf directBuffer(int initialCapacity) {
-      return POOLED.directBuffer(initialCapacity);
-   }
-
-   @Override
-   public ByteBuf directBuffer(int initialCapacity, int maxCapacity) {
-      return POOLED.directBuffer(initialCapacity, maxCapacity);
-   }
-
-   @Override
-   public CompositeByteBuf compositeBuffer() {
-      return UNPOOLED.compositeHeapBuffer();
-   }
-
-   @Override
-   public CompositeByteBuf compositeBuffer(int maxNumComponents) {
-      return UNPOOLED.compositeHeapBuffer(maxNumComponents);
-   }
-
-   @Override
-   public CompositeByteBuf compositeHeapBuffer() {
-      return UNPOOLED.compositeHeapBuffer();
-   }
-
-   @Override
-   public CompositeByteBuf compositeHeapBuffer(int maxNumComponents) {
-      return UNPOOLED.compositeHeapBuffer(maxNumComponents);
-   }
-
-   @Override
-   public CompositeByteBuf compositeDirectBuffer() {
-      return POOLED.compositeDirectBuffer();
-   }
-
-   @Override
-   public CompositeByteBuf compositeDirectBuffer(int maxNumComponents) {
-      return POOLED.compositeDirectBuffer();
-   }
-
-   @Override
-   public boolean isDirectBufferPooled() {
-      return true;
-   }
-}

http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/2c9b0280/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/transports/netty/NettyConnectorWithHTTPUpgradeTest.java
----------------------------------------------------------------------
diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/transports/netty/NettyConnectorWithHTTPUpgradeTest.java
b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/transports/netty/NettyConnectorWithHTTPUpgradeTest.java
index 0afd30c..0f08ecd 100644
--- a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/transports/netty/NettyConnectorWithHTTPUpgradeTest.java
+++ b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/transports/netty/NettyConnectorWithHTTPUpgradeTest.java
@@ -26,7 +26,6 @@ import java.util.Map;
 import io.netty.bootstrap.ServerBootstrap;
 import io.netty.channel.ChannelHandlerContext;
 import io.netty.channel.ChannelInitializer;
-import io.netty.channel.ChannelOption;
 import io.netty.channel.ChannelPipeline;
 import io.netty.channel.SimpleChannelInboundHandler;
 import io.netty.channel.nio.NioEventLoopGroup;
@@ -52,7 +51,6 @@ import org.apache.activemq.artemis.api.core.client.ClientSessionFactory;
 import org.apache.activemq.artemis.api.core.client.ServerLocator;
 import org.apache.activemq.artemis.core.config.Configuration;
 import org.apache.activemq.artemis.core.remoting.impl.netty.NettyAcceptor;
-import org.apache.activemq.artemis.core.remoting.impl.netty.PartialPooledByteBufAllocator;
 import org.apache.activemq.artemis.core.remoting.impl.netty.TransportConstants;
 import org.apache.activemq.artemis.core.remoting.impl.ssl.SSLSupport;
 import org.apache.activemq.artemis.core.server.ActiveMQServer;
@@ -216,7 +214,6 @@ public class NettyConnectorWithHTTPUpgradeTest extends ActiveMQTestBase
{
       } else {
          context = null;
       }
-      b.childOption(ChannelOption.ALLOCATOR, PartialPooledByteBufAllocator.INSTANCE);
       b.group(bossGroup, workerGroup).channel(NioServerSocketChannel.class).childHandler(new
ChannelInitializer<SocketChannel>() {
          @Override
          protected void initChannel(SocketChannel ch) throws Exception {


Mime
View raw message