mattrpav commented on code in PR #1377: URL: https://github.com/apache/activemq/pull/1377#discussion_r1946850409
########## activemq-broker/src/main/java/org/apache/activemq/store/MessageRecoveryContext.java: ########## @@ -0,0 +1,174 @@ +/** + * 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.store; + +import java.util.concurrent.atomic.AtomicInteger; +import org.apache.activemq.command.Message; +import org.apache.activemq.command.MessageId; + +public class MessageRecoveryContext implements MessageRecoveryListener { + + public static final int DEFAULT_MAX_MESSAGE_COUNT_RETURNED = 100; + public static final boolean DEFAULT_USE_DEDICATED_CURSOR = true; + + // Config + private boolean useDedicatedCursor; + private int maxMessageCountReturned; + private Long offset = null; + private String startMessageId = null; + private String endMessageId = null; + private final MessageRecoveryListener messageRecoveryListener; + + // State + private Long endSequenceId = Long.MAX_VALUE; + + // Stats + private AtomicInteger recoveredCount = new AtomicInteger(0); + + MessageRecoveryContext(final MessageRecoveryListener messageRecoveryListener, final String startMessageId, final String endMessageId, final Long offset, final Integer maxMessageCountReturned, final Boolean useDedicatedCursor) { + if(maxMessageCountReturned != null && maxMessageCountReturned < 0) { + throw new IllegalArgumentException("maxMessageCountReturned must be a positive integer value"); + } + if(messageRecoveryListener == null) { + throw new IllegalArgumentException("MessageRecoveryListener must be specified"); + } + if(offset != null) { + if(offset < 0L) { + throw new IllegalArgumentException("offset must be a positive integer value"); + } + if(startMessageId != null) { + throw new IllegalArgumentException("Only one of offset and startMessageId may be specified"); + } + } + this.endMessageId = endMessageId; + this.maxMessageCountReturned = (maxMessageCountReturned != null ? maxMessageCountReturned : DEFAULT_MAX_MESSAGE_COUNT_RETURNED); + this.messageRecoveryListener = messageRecoveryListener; + this.offset = offset; + this.startMessageId = startMessageId; + this.useDedicatedCursor = (useDedicatedCursor != null ? useDedicatedCursor : DEFAULT_USE_DEDICATED_CURSOR); + } + + public boolean isUseDedicatedCursor() { + return this.useDedicatedCursor; + } + + public int getMaxMessageCountReturned() { + return this.maxMessageCountReturned; + } + + public Long getOffset() { + return this.offset; + } + + public String getEndMessageId() { + return this.endMessageId; + } + + public String getStartMessageId() { + return this.startMessageId; + } + + public MessageRecoveryListener getMessageRecoveryListener() { + return this.messageRecoveryListener; + } + + // MessageRecoveryContext functions + public void setEndSequenceId(long endSequenceId) { + this.endSequenceId = endSequenceId; + } + + public boolean canRecoveryNextMessage(Long sequenceId) { + if (getRecoveredCount() >= getMaxMessageCountReturned() || + !this.messageRecoveryListener.canRecoveryNextMessage() || + sequenceId >= endSequenceId) { + return false; + } + return true; + } + + // MessageRecoveryListener functions + public boolean recoverMessage(Message message) throws Exception { + boolean tmpReturned = this.messageRecoveryListener.recoverMessage(message); + this.recoveredCount.incrementAndGet(); Review Comment: Good catch ########## activemq-broker/src/main/java/org/apache/activemq/store/MessageRecoveryContext.java: ########## @@ -0,0 +1,174 @@ +/** + * 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.store; + +import java.util.concurrent.atomic.AtomicInteger; +import org.apache.activemq.command.Message; +import org.apache.activemq.command.MessageId; + +public class MessageRecoveryContext implements MessageRecoveryListener { + + public static final int DEFAULT_MAX_MESSAGE_COUNT_RETURNED = 100; + public static final boolean DEFAULT_USE_DEDICATED_CURSOR = true; + + // Config + private boolean useDedicatedCursor; + private int maxMessageCountReturned; + private Long offset = null; + private String startMessageId = null; + private String endMessageId = null; + private final MessageRecoveryListener messageRecoveryListener; + + // State + private Long endSequenceId = Long.MAX_VALUE; + + // Stats + private AtomicInteger recoveredCount = new AtomicInteger(0); + + MessageRecoveryContext(final MessageRecoveryListener messageRecoveryListener, final String startMessageId, final String endMessageId, final Long offset, final Integer maxMessageCountReturned, final Boolean useDedicatedCursor) { + if(maxMessageCountReturned != null && maxMessageCountReturned < 0) { + throw new IllegalArgumentException("maxMessageCountReturned must be a positive integer value"); + } + if(messageRecoveryListener == null) { + throw new IllegalArgumentException("MessageRecoveryListener must be specified"); + } + if(offset != null) { + if(offset < 0L) { + throw new IllegalArgumentException("offset must be a positive integer value"); + } + if(startMessageId != null) { + throw new IllegalArgumentException("Only one of offset and startMessageId may be specified"); + } + } + this.endMessageId = endMessageId; + this.maxMessageCountReturned = (maxMessageCountReturned != null ? maxMessageCountReturned : DEFAULT_MAX_MESSAGE_COUNT_RETURNED); + this.messageRecoveryListener = messageRecoveryListener; + this.offset = offset; + this.startMessageId = startMessageId; + this.useDedicatedCursor = (useDedicatedCursor != null ? useDedicatedCursor : DEFAULT_USE_DEDICATED_CURSOR); + } + + public boolean isUseDedicatedCursor() { + return this.useDedicatedCursor; + } + + public int getMaxMessageCountReturned() { + return this.maxMessageCountReturned; + } + + public Long getOffset() { + return this.offset; + } + + public String getEndMessageId() { + return this.endMessageId; + } + + public String getStartMessageId() { + return this.startMessageId; + } + + public MessageRecoveryListener getMessageRecoveryListener() { + return this.messageRecoveryListener; + } + + // MessageRecoveryContext functions + public void setEndSequenceId(long endSequenceId) { + this.endSequenceId = endSequenceId; + } + + public boolean canRecoveryNextMessage(Long sequenceId) { + if (getRecoveredCount() >= getMaxMessageCountReturned() || + !this.messageRecoveryListener.canRecoveryNextMessage() || + sequenceId >= endSequenceId) { + return false; + } + return true; + } + + // MessageRecoveryListener functions + public boolean recoverMessage(Message message) throws Exception { + boolean tmpReturned = this.messageRecoveryListener.recoverMessage(message); + this.recoveredCount.incrementAndGet(); Review Comment: Good catch. Fixed. -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. To unsubscribe, e-mail: gitbox-unsubscr...@activemq.apache.org For queries about this service, please contact Infrastructure at: us...@infra.apache.org --------------------------------------------------------------------- To unsubscribe, e-mail: gitbox-unsubscr...@activemq.apache.org For additional commands, e-mail: gitbox-h...@activemq.apache.org For further information, visit: https://activemq.apache.org/contact
