Repository: activemq Updated Branches: refs/heads/activemq-5.13.x 52d2b1578 -> 405280ecc
https://issues.apache.org/jira/browse/AMQ-6292 allow for batch writes of forwarded acks. (cherry picked from commit 15405af2e6c44037ce09e616bdfe79852c19647a) Project: http://git-wip-us.apache.org/repos/asf/activemq/repo Commit: http://git-wip-us.apache.org/repos/asf/activemq/commit/405280ec Tree: http://git-wip-us.apache.org/repos/asf/activemq/tree/405280ec Diff: http://git-wip-us.apache.org/repos/asf/activemq/diff/405280ec Branch: refs/heads/activemq-5.13.x Commit: 405280ecceb0117788ac14c0ea5c0202f93a0625 Parents: 52d2b15 Author: Timothy Bish <[email protected]> Authored: Fri May 13 14:56:01 2016 -0400 Committer: Timothy Bish <[email protected]> Committed: Fri May 13 14:57:17 2016 -0400 ---------------------------------------------------------------------- .../java/org/apache/activemq/store/kahadb/MessageDatabase.java | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/activemq/blob/405280ec/activemq-kahadb-store/src/main/java/org/apache/activemq/store/kahadb/MessageDatabase.java ---------------------------------------------------------------------- diff --git a/activemq-kahadb-store/src/main/java/org/apache/activemq/store/kahadb/MessageDatabase.java b/activemq-kahadb-store/src/main/java/org/apache/activemq/store/kahadb/MessageDatabase.java index 96b5800..75f1966 100644 --- a/activemq-kahadb-store/src/main/java/org/apache/activemq/store/kahadb/MessageDatabase.java +++ b/activemq-kahadb-store/src/main/java/org/apache/activemq/store/kahadb/MessageDatabase.java @@ -16,6 +16,8 @@ */ package org.apache.activemq.store.kahadb; +import static org.apache.activemq.store.kahadb.disk.journal.Location.NOT_SET; + import java.io.ByteArrayInputStream; import java.io.ByteArrayOutputStream; import java.io.DataInput; @@ -1927,7 +1929,7 @@ public abstract class MessageDatabase extends ServiceSupport implements BrokerSe compactionMarker.setRewriteType(COMPACTED_JOURNAL_FILE); ByteSequence payload = toByteSequence(compactionMarker); - appender.storeItem(payload, Journal.USER_RECORD_TYPE, isEnableJournalDiskSyncs()); + appender.storeItem(payload, Journal.USER_RECORD_TYPE, false); LOG.trace("Marked ack rewrites file as replacing file: {}", journalToRead); Location nextLocation = journal.getNextLocation(new Location(journalToRead, 0)); @@ -1941,7 +1943,7 @@ public abstract class MessageDatabase extends ServiceSupport implements BrokerSe if (command != null && command instanceof KahaRemoveMessageCommand) { payload = toByteSequence(command); - Location location = appender.storeItem(payload, Journal.USER_RECORD_TYPE, isEnableJournalDiskSyncs()); + Location location = appender.storeItem(payload, Journal.USER_RECORD_TYPE, false); updatedAckLocations.put(location.getDataFileId(), journalLogsReferenced); }
