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 2021/05/12 13:52:14 UTC
[activemq-artemis] 02/02: NO-JIRA removing runDirectJournalBlast
This is an automated email from the ASF dual-hosted git repository.
clebertsuconic pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/activemq-artemis.git
commit 67d47274a10a84928f002bd203c036d81088e390
Author: Clebert Suconic <cl...@apache.org>
AuthorDate: Tue May 11 18:53:54 2021 -0400
NO-JIRA removing runDirectJournalBlast
---
.../jdbc/store/journal/JDBCJournalImpl.java | 4 --
.../activemq/artemis/core/journal/Journal.java | 2 -
.../core/journal/impl/FileWrapperJournal.java | 5 --
.../artemis/core/journal/impl/JournalImpl.java | 59 ----------------------
.../core/replication/ReplicatedJournal.java | 5 --
.../core/server/impl/PostOfficeJournalLoader.java | 4 --
.../integration/replication/ReplicationTest.java | 4 --
7 files changed, 83 deletions(-)
diff --git a/artemis-jdbc-store/src/main/java/org/apache/activemq/artemis/jdbc/store/journal/JDBCJournalImpl.java b/artemis-jdbc-store/src/main/java/org/apache/activemq/artemis/jdbc/store/journal/JDBCJournalImpl.java
index 56a260b..c5ef737 100644
--- a/artemis-jdbc-store/src/main/java/org/apache/activemq/artemis/jdbc/store/journal/JDBCJournalImpl.java
+++ b/artemis-jdbc-store/src/main/java/org/apache/activemq/artemis/jdbc/store/journal/JDBCJournalImpl.java
@@ -969,10 +969,6 @@ public class JDBCJournalImpl extends AbstractJDBCDriver implements Journal {
}
@Override
- public void runDirectJournalBlast() throws Exception {
- }
-
- @Override
public Map<Long, JournalFile> createFilesForBackupSync(long[] fileIds) throws Exception {
return null;
}
diff --git a/artemis-journal/src/main/java/org/apache/activemq/artemis/core/journal/Journal.java b/artemis-journal/src/main/java/org/apache/activemq/artemis/core/journal/Journal.java
index 7c652af..0c27cf4 100644
--- a/artemis-journal/src/main/java/org/apache/activemq/artemis/core/journal/Journal.java
+++ b/artemis-journal/src/main/java/org/apache/activemq/artemis/core/journal/Journal.java
@@ -257,8 +257,6 @@ public interface Journal extends ActiveMQComponent {
int getUserVersion();
- void runDirectJournalBlast() throws Exception;
-
/**
* Reserves journal file IDs, creates the necessary files for synchronization, and places
* references to these (reserved for sync) files in the map.
diff --git a/artemis-journal/src/main/java/org/apache/activemq/artemis/core/journal/impl/FileWrapperJournal.java b/artemis-journal/src/main/java/org/apache/activemq/artemis/core/journal/impl/FileWrapperJournal.java
index 536c7e7..0434cf2 100644
--- a/artemis-journal/src/main/java/org/apache/activemq/artemis/core/journal/impl/FileWrapperJournal.java
+++ b/artemis-journal/src/main/java/org/apache/activemq/artemis/core/journal/impl/FileWrapperJournal.java
@@ -323,11 +323,6 @@ public final class FileWrapperJournal extends JournalBase {
}
@Override
- public void runDirectJournalBlast() throws Exception {
- throw new UnsupportedOperationException();
- }
-
- @Override
public JournalLoadInformation loadSyncOnly(JournalState state) throws Exception {
throw new UnsupportedOperationException();
}
diff --git a/artemis-journal/src/main/java/org/apache/activemq/artemis/core/journal/impl/JournalImpl.java b/artemis-journal/src/main/java/org/apache/activemq/artemis/core/journal/impl/JournalImpl.java
index 57120f4..d8e2e84 100644
--- a/artemis-journal/src/main/java/org/apache/activemq/artemis/core/journal/impl/JournalImpl.java
+++ b/artemis-journal/src/main/java/org/apache/activemq/artemis/core/journal/impl/JournalImpl.java
@@ -402,65 +402,6 @@ public class JournalImpl extends JournalBase implements TestableJournal, Journal
}
@Override
- public void runDirectJournalBlast() throws Exception {
- final int numIts = 100000000;
-
- ActiveMQJournalLogger.LOGGER.runningJournalBlast(numIts);
-
- final CountDownLatch latch = new CountDownLatch(numIts * 2);
-
- class MyAIOCallback implements IOCompletion {
-
- @Override
- public void done() {
- latch.countDown();
- }
-
- @Override
- public void onError(final int errorCode, final String errorMessage) {
-
- }
-
- @Override
- public void storeLineUp() {
- }
- }
-
- final MyAIOCallback task = new MyAIOCallback();
-
- final int recordSize = 1024;
-
- final byte[] bytes = new byte[recordSize];
-
- class MyRecord implements EncodingSupport {
-
- @Override
- public void decode(final ActiveMQBuffer buffer) {
- }
-
- @Override
- public void encode(final ActiveMQBuffer buffer) {
- buffer.writeBytes(bytes);
- }
-
- @Override
- public int getEncodeSize() {
- return recordSize;
- }
-
- }
-
- MyRecord record = new MyRecord();
-
- for (int i = 0; i < numIts; i++) {
- appendAddRecord(i, (byte) 1, record, true, task);
- appendDeleteRecord(i, true, task);
- }
-
- latch.await();
- }
-
- @Override
public ConcurrentLongHashMap<JournalRecord> getRecords() {
return records;
}
diff --git a/artemis-server/src/main/java/org/apache/activemq/artemis/core/replication/ReplicatedJournal.java b/artemis-server/src/main/java/org/apache/activemq/artemis/core/replication/ReplicatedJournal.java
index 5a5ffb8..21d7fc1 100644
--- a/artemis-server/src/main/java/org/apache/activemq/artemis/core/replication/ReplicatedJournal.java
+++ b/artemis-server/src/main/java/org/apache/activemq/artemis/core/replication/ReplicatedJournal.java
@@ -567,11 +567,6 @@ public class ReplicatedJournal implements Journal {
}
@Override
- public void runDirectJournalBlast() throws Exception {
- localJournal.runDirectJournalBlast();
- }
-
- @Override
public int getUserVersion() {
return localJournal.getUserVersion();
}
diff --git a/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/impl/PostOfficeJournalLoader.java b/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/impl/PostOfficeJournalLoader.java
index af707d4..4c5865d 100644
--- a/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/impl/PostOfficeJournalLoader.java
+++ b/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/impl/PostOfficeJournalLoader.java
@@ -290,10 +290,6 @@ public class PostOfficeJournalLoader implements JournalLoader {
queue.resume();
}
}
-
- if (System.getProperty("org.apache.activemq.opt.directblast") != null) {
- messageJournal.runDirectJournalBlast();
- }
}
@Override
diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/replication/ReplicationTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/replication/ReplicationTest.java
index 13674bd..9622b46 100644
--- a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/replication/ReplicationTest.java
+++ b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/replication/ReplicationTest.java
@@ -970,10 +970,6 @@ public final class ReplicationTest extends ActiveMQTestBase {
}
@Override
- public void runDirectJournalBlast() throws Exception {
- }
-
- @Override
public int getUserVersion() {
return 0;
}