You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@activemq.apache.org by cl...@apache.org on 2016/07/29 19:35:41 UTC
[5/5] activemq-artemis git commit: Fix
JDBCJournalLoaderCallback.deleteRecord
Fix JDBCJournalLoaderCallback.deleteRecord
Project: http://git-wip-us.apache.org/repos/asf/activemq-artemis/repo
Commit: http://git-wip-us.apache.org/repos/asf/activemq-artemis/commit/af553cce
Tree: http://git-wip-us.apache.org/repos/asf/activemq-artemis/tree/af553cce
Diff: http://git-wip-us.apache.org/repos/asf/activemq-artemis/diff/af553cce
Branch: refs/heads/master
Commit: af553ccec8dd78948badf307d8d575d527d3ab9a
Parents: eb5eca9
Author: Ville Skytt� <vi...@iki.fi>
Authored: Fri Jul 29 19:13:48 2016 +0300
Committer: Clebert Suconic <cl...@apache.org>
Committed: Fri Jul 29 15:35:25 2016 -0400
----------------------------------------------------------------------
.../journal/JDBCJournalLoaderCallback.java | 2 +-
.../journal/JDBCJournalLoaderCallbackTest.java | 49 ++++++++++++++++++++
2 files changed, 50 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/af553cce/artemis-jdbc-store/src/main/java/org/apache/activemq/artemis/jdbc/store/journal/JDBCJournalLoaderCallback.java
----------------------------------------------------------------------
diff --git a/artemis-jdbc-store/src/main/java/org/apache/activemq/artemis/jdbc/store/journal/JDBCJournalLoaderCallback.java b/artemis-jdbc-store/src/main/java/org/apache/activemq/artemis/jdbc/store/journal/JDBCJournalLoaderCallback.java
index 13c11af..eaa5387 100644
--- a/artemis-jdbc-store/src/main/java/org/apache/activemq/artemis/jdbc/store/journal/JDBCJournalLoaderCallback.java
+++ b/artemis-jdbc-store/src/main/java/org/apache/activemq/artemis/jdbc/store/journal/JDBCJournalLoaderCallback.java
@@ -81,7 +81,7 @@ public class JDBCJournalLoaderCallback implements LoaderCallback {
@Override
public synchronized void deleteRecord(final long id) {
- for (Integer i : deleteReferences.get(id)) {
+ for (int i : deleteReferences.get(id)) {
committedRecords.remove(i);
}
}
http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/af553cce/artemis-jdbc-store/src/test/java/org/apache/activemq/artemis/jdbc/store/journal/JDBCJournalLoaderCallbackTest.java
----------------------------------------------------------------------
diff --git a/artemis-jdbc-store/src/test/java/org/apache/activemq/artemis/jdbc/store/journal/JDBCJournalLoaderCallbackTest.java b/artemis-jdbc-store/src/test/java/org/apache/activemq/artemis/jdbc/store/journal/JDBCJournalLoaderCallbackTest.java
new file mode 100644
index 0000000..9369866
--- /dev/null
+++ b/artemis-jdbc-store/src/test/java/org/apache/activemq/artemis/jdbc/store/journal/JDBCJournalLoaderCallbackTest.java
@@ -0,0 +1,49 @@
+/*
+ * 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.artemis.jdbc.store.journal;
+
+import java.util.ArrayList;
+
+import org.apache.activemq.artemis.core.journal.PreparedTransactionInfo;
+import org.apache.activemq.artemis.core.journal.RecordInfo;
+import org.apache.activemq.artemis.core.journal.TransactionFailureCallback;
+import org.junit.Test;
+
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertTrue;
+
+public class JDBCJournalLoaderCallbackTest {
+
+ @Test
+ public void testAddDeleteRecord() throws Exception {
+
+ ArrayList<RecordInfo> committedRecords = new ArrayList<>();
+ ArrayList<PreparedTransactionInfo> preparedTransactions = new ArrayList<>();
+ TransactionFailureCallback failureCallback = null;
+ boolean fixBadTX = false;
+
+ JDBCJournalLoaderCallback cb = new JDBCJournalLoaderCallback(committedRecords, preparedTransactions, failureCallback, fixBadTX);
+
+ RecordInfo record = new RecordInfo(42, (byte) 0, null, false, (short) 0);
+ cb.addRecord(record);
+ assertEquals(1, committedRecords.size());
+ assertTrue(committedRecords.contains(record));
+
+ cb.deleteRecord(record.id);
+ assertTrue(committedRecords.isEmpty());
+ }
+}