Apache
/
activemq-artemis
mirror of https://github.com/apache/activemq-artemis.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

This closes #3042

This commit is contained in:
Justin Bertram 2020-03-24 09:32:47 -05:00
parent 489e6b38e0 4b49b3f371
commit 265c8f054d
2 changed files with 14 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
artemis-jdbc-store/src/main/java/org/apache/activemq/artemis/jdbc/store/journal/JDBCJournalImpl.java
View File

@ -232,6 +232,7 @@ public class JDBCJournalImpl extends AbstractJDBCDriver implements Journal {
holder = transactions.get(record.getTxId());
for (RecordInfo info : holder.recordsToDelete) {
deletedRecords.add(record.getId());
deletedRecords.add(info.id);
deleteJournalRecords.setLong(1, info.id);
deleteJournalRecords.addBatch();
}

13
tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/jdbc/store/journal/JDBCJournalTest.java
View File

@ -178,6 +178,19 @@ public class JDBCJournalTest extends ActiveMQTestBase {
assertEquals(0, journal.getNumberOfRecords());
}
@Test
public void testCleanupTxRecords4TransactionalRecords() throws Exception {
// add committed transactional record e.g. paging
journal.appendAddRecordTransactional(152, 154, (byte) 13, new byte[0]);
journal.appendCommitRecord(152, true);
assertEquals(2, journal.getNumberOfRecords());
// delete transactional record in new transaction e.g. depaging
journal.appendDeleteRecordTransactional(236, 154);
journal.appendCommitRecord(236, true);
assertEquals(0, journal.getNumberOfRecords());
}
@Test
public void testCallbacks() throws Exception {
final int noRecords = 10;