You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@activemq.apache.org by ta...@apache.org on 2016/05/13 18:56:37 UTC
activemq git commit: https://issues.apache.org/jira/browse/AMQ-6292
Repository: activemq
Updated Branches:
refs/heads/master b9334960e -> 15405af2e
https://issues.apache.org/jira/browse/AMQ-6292
allow for batch writes of forwarded acks.
Project: http://git-wip-us.apache.org/repos/asf/activemq/repo
Commit: http://git-wip-us.apache.org/repos/asf/activemq/commit/15405af2
Tree: http://git-wip-us.apache.org/repos/asf/activemq/tree/15405af2
Diff: http://git-wip-us.apache.org/repos/asf/activemq/diff/15405af2
Branch: refs/heads/master
Commit: 15405af2e6c44037ce09e616bdfe79852c19647a
Parents: b933496
Author: Timothy Bish <ta...@gmail.com>
Authored: Fri May 13 14:56:01 2016 -0400
Committer: Timothy Bish <ta...@gmail.com>
Committed: Fri May 13 14:56:01 2016 -0400
----------------------------------------------------------------------
.../org/apache/activemq/store/kahadb/MessageDatabase.java | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/activemq/blob/15405af2/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 92310a8..208a52b 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;
@@ -111,8 +113,6 @@ import org.apache.activemq.util.ThreadPoolUtils;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-import static org.apache.activemq.store.kahadb.disk.journal.Location.NOT_SET;
-
public abstract class MessageDatabase extends ServiceSupport implements BrokerServiceAware {
protected BrokerService brokerService;
@@ -1981,7 +1981,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 = getNextLocationForAckForward(new Location(journalToRead, 0));
@@ -1995,7 +1995,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);
}