From fe6bf2f7fb72255666af4dd4f3ea4a29b9bfb7f8 Mon Sep 17 00:00:00 2001 From: Robert Godfrey Date: Sun, 15 Mar 2015 15:25:15 +0000 Subject: QPID-6452 : Defer creating filters in default filter map until a consumer is added. Optimize filters which start at the tail of the queue. git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@1666810 13f79535-47bb-0310-9956-ffa450edef68 --- .../apache/qpid/server/protocol/v0_10/ServerSessionDelegate.java | 2 +- .../java/org/apache/qpid/server/protocol/v0_8/AMQChannel.java | 8 +++++++- 2 files changed, 8 insertions(+), 2 deletions(-) (limited to 'qpid/java/broker-plugins') diff --git a/qpid/java/broker-plugins/amqp-0-10-protocol/src/main/java/org/apache/qpid/server/protocol/v0_10/ServerSessionDelegate.java b/qpid/java/broker-plugins/amqp-0-10-protocol/src/main/java/org/apache/qpid/server/protocol/v0_10/ServerSessionDelegate.java index 25ea2430ce..75a67c6c2a 100644 --- a/qpid/java/broker-plugins/amqp-0-10-protocol/src/main/java/org/apache/qpid/server/protocol/v0_10/ServerSessionDelegate.java +++ b/qpid/java/broker-plugins/amqp-0-10-protocol/src/main/java/org/apache/qpid/server/protocol/v0_10/ServerSessionDelegate.java @@ -294,7 +294,7 @@ public class ServerSessionDelegate extends SessionDelegate { filterManager = new FilterManager(); } - MessageFilter filter = new ArrivalTimeFilter(startingFrom); + MessageFilter filter = new ArrivalTimeFilter(startingFrom, period == 0); filterManager.add(filter.getName(), filter); } diff --git a/qpid/java/broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/AMQChannel.java b/qpid/java/broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/AMQChannel.java index 99c9f11b33..87becd955d 100644 --- a/qpid/java/broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/AMQChannel.java +++ b/qpid/java/broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/AMQChannel.java @@ -755,6 +755,12 @@ public class AMQChannel { return message.getConnectionReference() != connectionReference; } + + @Override + public boolean startAtTail() + { + return false; + } }; filterManager.add(filter.getName(), filter); } @@ -788,7 +794,7 @@ public class AMQChannel { filterManager = new FilterManager(); } - MessageFilter filter = new ArrivalTimeFilter(startingFrom); + MessageFilter filter = new ArrivalTimeFilter(startingFrom, period==0); filterManager.add(filter.getName(), filter); } -- cgit v1.2.1