Author: timfox Date: 2009-11-27 16:15:05 -0500 (Fri, 27 Nov 2009) New Revision: 8432 Added: trunk/tests/src/org/hornetq/tests/integration/paging/NettyPagingSendTest.java trunk/tests/src/org/hornetq/tests/integration/paging/PagingSendTest.java Log: merge of 20-optimisation branch Added: trunk/tests/src/org/hornetq/tests/integration/paging/NettyPagingSendTest.java =================================================================== --- trunk/tests/src/org/hornetq/tests/integration/paging/NettyPagingSendTest.java (rev 0) +++ trunk/tests/src/org/hornetq/tests/integration/paging/NettyPagingSendTest.java 2009-11-27 21:15:05 UTC (rev 8432) @@ -0,0 +1,29 @@ +/* + * Copyright 2009 Red Hat, Inc. + * Red Hat 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.hornetq.tests.integration.paging; + +/** + * A NettyPagingSendTest + * + * @author tim + * + * + */ +public class NettyPagingSendTest extends PagingSendTest +{ + protected boolean isNetty() + { + return true; + } +} Added: trunk/tests/src/org/hornetq/tests/integration/paging/PagingSendTest.java =================================================================== --- trunk/tests/src/org/hornetq/tests/integration/paging/PagingSendTest.java (rev 0) +++ trunk/tests/src/org/hornetq/tests/integration/paging/PagingSendTest.java 2009-11-27 21:15:05 UTC (rev 8432) @@ -0,0 +1,170 @@ +/* + * Copyright 2009 Red Hat, Inc. + * Red Hat 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.hornetq.tests.integration.paging; + +import org.hornetq.core.client.ClientConsumer; +import org.hornetq.core.client.ClientMessage; +import org.hornetq.core.client.ClientProducer; +import org.hornetq.core.client.ClientSession; +import org.hornetq.core.client.ClientSessionFactory; +import org.hornetq.core.server.HornetQServer; +import org.hornetq.core.settings.impl.AddressSettings; +import org.hornetq.tests.util.ServiceTestBase; +import org.hornetq.utils.SimpleString; + +/** + * A SendTest + * + * @author <mailto:clebert.suconic@jboss.org">Clebert Suconic</a> + * + * + */ +public class PagingSendTest extends ServiceTestBase +{ + + // Constants ----------------------------------------------------- + + // Attributes ---------------------------------------------------- + + public static final SimpleString ADDRESS = new SimpleString("SimpleAddress"); + + // Static -------------------------------------------------------- + + // Constructors -------------------------------------------------- + + // Public -------------------------------------------------------- + + protected boolean isNetty() + { + return false; + } + + private HornetQServer newHornetQServer() + { + HornetQServer server = super.createServer(true, isNetty()); + + AddressSettings defaultSetting = new AddressSettings(); + defaultSetting.setPageSizeBytes(10 * 1024); + defaultSetting.setMaxSizeBytes(100 * 1024); + + server.getAddressSettingsRepository().addMatch("#", defaultSetting); + + return server; + } + + public void testSameMessageOverAndOverBlocking() throws Exception + { + dotestSameMessageOverAndOver(true); + } + + public void testSameMessageOverAndOverNonBlocking() throws Exception + { + dotestSameMessageOverAndOver(false); + } + + public void dotestSameMessageOverAndOver(final boolean blocking) throws Exception + { + HornetQServer server = newHornetQServer(); + + server.start(); + + try + { + ClientSessionFactory sf; + + if (isNetty()) + { + sf = createNettyFactory(); + } + else + { + sf = createInVMFactory(); + } + + // Making it synchronous, just because we want to stop sending messages as soon as the page-store becomes in + // page mode + // and we could only guarantee that by setting it to synchronous + sf.setBlockOnNonPersistentSend(blocking); + sf.setBlockOnPersistentSend(blocking); + sf.setBlockOnAcknowledge(blocking); + + ClientSession session = sf.createSession(null, null, false, true, true, false, 0); + + session.createQueue(ADDRESS, ADDRESS, null, true); + + ClientProducer producer = session.createProducer(ADDRESS); + + ClientMessage message = null; + + message = session.createClientMessage(true); + message.getBodyBuffer().writeBytes(new byte[1024]); + + for (int i = 0; i < 200; i++) + { + System.out.println("Sent " + i); + producer.send(message); + } + + session.close(); + + assertTrue(server.getPostOffice().getPagingManager().getTotalMemory() > 0); + + session = sf.createSession(null, null, false, true, true, false, 0); + + ClientConsumer consumer = session.createConsumer(ADDRESS); + + session.start(); + + for (int i = 0; i < 200; i++) + { + ClientMessage message2 = consumer.receive(10000); + + assertNotNull(message2); + + if (i == 100) + { + session.commit(); + } + + message2.acknowledge(); + } + + consumer.close(); + + session.close(); + + assertEquals(0, server.getPostOffice().getPagingManager().getTotalMemory()); + + } + finally + { + try + { + server.stop(); + } + catch (Throwable ignored) + { + } + } + } + + // Package protected --------------------------------------------- + + // Protected ----------------------------------------------------- + + // Private ------------------------------------------------------- + + // Inner classes ------------------------------------------------- + +} \ No newline at end of file