Skip to content

GH-3578: Fix JdbcMessageStore.getMessageGroup() #3579

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Jun 10, 2021
Merged

GH-3578: Fix JdbcMessageStore.getMessageGroup() #3579

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions ...-core/src/main/java/org/springframework/integration/endpoint/AbstractPollingEndpoint.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -391,10 +391,10 @@ private Flux<Message<?>> createFluxGenerator() {
fluxSink.complete();
}
})
.limitRequest(
this.maxMessagesPerPoll < 0
.take(this.maxMessagesPerPoll < 0
? Long.MAX_VALUE
: this.maxMessagesPerPoll);
: this.maxMessagesPerPoll,
true);
}
})
.subscribeOn(Schedulers.fromExecutor(this.taskExecutor))
Expand Down
17 changes: 10 additions & 7 deletions ...ration-core/src/main/java/org/springframework/integration/store/MessageGroupMetadata.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
* Copyright 2002-2019 the original author or authors.
* Copyright 2002-2021 the original author or authors.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
Expand Down Expand Up @@ -40,7 +40,7 @@ public class MessageGroupMetadata implements Serializable {

private static final long serialVersionUID = 1L;

private List<UUID> messageIds = new LinkedList<>();
private final List<UUID> messageIds = new LinkedList<>();

private long timestamp;

Expand All @@ -52,8 +52,7 @@ public class MessageGroupMetadata implements Serializable {

private volatile String condition;

private MessageGroupMetadata() {
//For Jackson deserialization
public MessageGroupMetadata() {
}

public MessageGroupMetadata(MessageGroup messageGroup) {
Expand All @@ -79,7 +78,7 @@ boolean add(UUID messageId) {
return !this.messageIds.contains(messageId) && this.messageIds.add(messageId);
}

void setLastModified(long lastModified) {
public void setLastModified(long lastModified) {
this.lastModified = lastModified;
}

Expand Down Expand Up @@ -107,7 +106,7 @@ public List<UUID> getMessageIds() {
return new LinkedList<UUID>(this.messageIds);
}

void complete() {
public void complete() {
this.complete = true;
}

Expand All @@ -123,11 +122,15 @@ public long getTimestamp() {
return this.timestamp;
}

public void setTimestamp(long timestamp) {
this.timestamp = timestamp;
}

public int getLastReleasedMessageSequenceNumber() {
return this.lastReleasedMessageSequenceNumber;
}

void setLastReleasedMessageSequenceNumber(int lastReleasedMessageSequenceNumber) {
public void setLastReleasedMessageSequenceNumber(int lastReleasedMessageSequenceNumber) {
this.lastReleasedMessageSequenceNumber = lastReleasedMessageSequenceNumber;
}

Expand Down
53 changes: 33 additions & 20 deletions ...ation-jdbc/src/main/java/org/springframework/integration/jdbc/store/JdbcMessageStore.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,6 @@
import java.sql.Timestamp;
import java.util.Arrays;
import java.util.Collection;
import java.util.Collections;
import java.util.HashMap;
import java.util.Iterator;
import java.util.List;
Expand All @@ -38,6 +37,7 @@
import org.springframework.dao.IncorrectResultSizeDataAccessException;
import org.springframework.integration.store.AbstractMessageGroupStore;
import org.springframework.integration.store.MessageGroup;
import org.springframework.integration.store.MessageGroupMetadata;
import org.springframework.integration.store.MessageMetadata;
import org.springframework.integration.store.MessageStore;
import org.springframework.integration.store.SimpleMessageGroup;
Expand Down Expand Up @@ -334,11 +334,13 @@ public <T> Message<T> addMessage(final Message<T> message) {
@Override
public void addMessagesToGroup(Object groupId, Message<?>... messages) {
String groupKey = getKey(groupId);
Map<String, Object> groupInfo = getGroupMetadata(groupKey);
MessageGroupMetadata groupMetadata = getGroupMetadata(groupKey);

Timestamp updatedDate = new Timestamp(System.currentTimeMillis());
boolean groupNotExist = groupInfo.isEmpty();
Timestamp createdDate = groupNotExist ? updatedDate : (Timestamp) groupInfo.get("CREATED_DATE");
boolean groupNotExist = groupMetadata == null;
Timestamp createdDate =
groupNotExist
? new Timestamp(System.currentTimeMillis())
: new Timestamp(groupMetadata.getTimestamp());

for (Message<?> message : messages) {
addMessage(message);
Expand Down Expand Up @@ -397,28 +399,39 @@ public int messageGroupSize(Object groupId) {

@Override
public MessageGroup getMessageGroup(Object groupId) {
String key = getKey(groupId);
Map<String, Object> groupInfo = getGroupMetadata(key);

if (groupInfo.isEmpty()) {
MessageGroupMetadata groupMetadata = getGroupMetadata(groupId);
if (groupMetadata != null) {
MessageGroup messageGroup =
getMessageGroupFactory()
.create(this, groupId, groupMetadata.getTimestamp(), groupMetadata.isComplete());
messageGroup.setLastModified(groupMetadata.getLastModified());
messageGroup.setLastReleasedMessageSequenceNumber(groupMetadata.getLastReleasedMessageSequenceNumber());
messageGroup.setCondition(groupMetadata.getCondition());
return messageGroup;
}
else {
return new SimpleMessageGroup(groupId);
}

MessageGroup messageGroup = getMessageGroupFactory()
.create(this, groupId, ((Timestamp) groupInfo.get("CREATED_DATE")).getTime(),
((Long) groupInfo.get("COMPLETE")) > 0);
messageGroup.setLastModified(((Timestamp) groupInfo.get("UPDATED_DATE")).getTime());
messageGroup.setLastReleasedMessageSequenceNumber(((Long) groupInfo.get("LAST_RELEASED_SEQUENCE")).intValue());
messageGroup.setCondition((String) groupInfo.get("CONDITION"));
return messageGroup;
}

private Map<String, Object> getGroupMetadata(String groupKey) {
@Override
public MessageGroupMetadata getGroupMetadata(Object groupId) {
String key = getKey(groupId);
try {
return this.jdbcTemplate.queryForMap(getQuery(Query.GET_GROUP_INFO), groupKey, this.region);
return this.jdbcTemplate.queryForObject(getQuery(Query.GET_GROUP_INFO), (rs, rowNum) -> {
MessageGroupMetadata groupMetadata = new MessageGroupMetadata();
if (rs.getInt("COMPLETE") > 0) {
groupMetadata.complete();
}
groupMetadata.setTimestamp(rs.getTimestamp("CREATED_DATE").getTime());
groupMetadata.setLastModified(rs.getTimestamp("UPDATED_DATE").getTime());
groupMetadata.setLastReleasedMessageSequenceNumber(rs.getInt("LAST_RELEASED_SEQUENCE"));
groupMetadata.setCondition(rs.getString("CONDITION"));
return groupMetadata;
}, key, this.region);
}
catch (IncorrectResultSizeDataAccessException ex) {
return Collections.emptyMap();
return null;
}
}

Expand Down