diff --git a/broker/src/main/java/org/apache/rocketmq/broker/transaction/TransactionMetrics$Metric.class b/broker/src/main/java/org/apache/rocketmq/broker/transaction/TransactionMetrics$Metric.class new file mode 100644 index 00000000000..d33f84837d2 Binary files /dev/null and b/broker/src/main/java/org/apache/rocketmq/broker/transaction/TransactionMetrics$Metric.class differ diff --git a/broker/src/main/java/org/apache/rocketmq/broker/transaction/TransactionMetrics$TransactionMetricsSerializeWrapper.class b/broker/src/main/java/org/apache/rocketmq/broker/transaction/TransactionMetrics$TransactionMetricsSerializeWrapper.class new file mode 100644 index 00000000000..243a4b5e869 Binary files /dev/null and b/broker/src/main/java/org/apache/rocketmq/broker/transaction/TransactionMetrics$TransactionMetricsSerializeWrapper.class differ diff --git a/broker/src/main/java/org/apache/rocketmq/broker/transaction/TransactionMetrics.class b/broker/src/main/java/org/apache/rocketmq/broker/transaction/TransactionMetrics.class new file mode 100644 index 00000000000..b9eff4f9e4e Binary files /dev/null and b/broker/src/main/java/org/apache/rocketmq/broker/transaction/TransactionMetrics.class differ diff --git a/broker/src/test/java/org/apache/rocketmq/broker/config/v2/ConsumerOffsetManagerV2Test.java b/broker/src/test/java/org/apache/rocketmq/broker/config/v2/ConsumerOffsetManagerV2Test.java index 6d4ed04ce35..132bd5c1a56 100644 --- a/broker/src/test/java/org/apache/rocketmq/broker/config/v2/ConsumerOffsetManagerV2Test.java +++ b/broker/src/test/java/org/apache/rocketmq/broker/config/v2/ConsumerOffsetManagerV2Test.java @@ -26,7 +26,6 @@ import org.apache.rocketmq.store.config.MessageStoreConfig; import org.junit.After; import org.junit.Assert; -import org.junit.Assume; import org.junit.Before; import org.junit.Rule; import org.junit.Test; @@ -60,7 +59,6 @@ public void cleanUp() { @Before public void setUp() throws IOException { - Assume.assumeFalse(MixAll.isMac()); BrokerConfig brokerConfig = new BrokerConfig(); Mockito.doReturn(brokerConfig).when(controller).getBrokerConfig(); @@ -77,7 +75,6 @@ public void setUp() throws IOException { */ @Test public void testCommitOffset_Standard() { - Assume.assumeFalse(MixAll.isMac()); Assert.assertTrue(consumerOffsetManagerV2.load()); String clientHost = "localhost"; @@ -104,7 +101,6 @@ public void testCommitOffset_Standard() { */ @Test public void testCommitOffset_LMQ() { - Assume.assumeFalse(MixAll.isMac()); Assert.assertTrue(consumerOffsetManagerV2.load()); String clientHost = "localhost"; @@ -130,7 +126,6 @@ public void testCommitOffset_LMQ() { */ @Test public void testCommitPullOffset_LMQ() { - Assume.assumeFalse(MixAll.isMac()); Assert.assertTrue(consumerOffsetManagerV2.load()); String clientHost = "localhost"; @@ -155,7 +150,6 @@ public void testCommitPullOffset_LMQ() { */ @Test public void testRemoveByTopicAtGroup() { - Assume.assumeFalse(MixAll.isMac()); Assert.assertTrue(consumerOffsetManagerV2.load()); String clientHost = "localhost"; @@ -188,7 +182,6 @@ public void testRemoveByTopicAtGroup() { */ @Test public void testRemoveByGroup() { - Assume.assumeFalse(MixAll.isMac()); Assert.assertTrue(consumerOffsetManagerV2.load()); String clientHost = "localhost"; diff --git a/broker/src/test/java/org/apache/rocketmq/broker/config/v2/SubscriptionGroupManagerV2Test.java b/broker/src/test/java/org/apache/rocketmq/broker/config/v2/SubscriptionGroupManagerV2Test.java index 6f49cbe801b..4ff8a81e60a 100644 --- a/broker/src/test/java/org/apache/rocketmq/broker/config/v2/SubscriptionGroupManagerV2Test.java +++ b/broker/src/test/java/org/apache/rocketmq/broker/config/v2/SubscriptionGroupManagerV2Test.java @@ -21,7 +21,6 @@ import java.io.IOException; import org.apache.rocketmq.broker.BrokerController; import org.apache.rocketmq.common.BrokerConfig; -import org.apache.rocketmq.common.MixAll; import org.apache.rocketmq.remoting.protocol.subscription.GroupRetryPolicy; import org.apache.rocketmq.remoting.protocol.subscription.GroupRetryPolicyType; import org.apache.rocketmq.remoting.protocol.subscription.SubscriptionGroupConfig; @@ -29,7 +28,6 @@ import org.apache.rocketmq.store.config.MessageStoreConfig; import org.junit.After; import org.junit.Assert; -import org.junit.Assume; import org.junit.Before; import org.junit.Rule; import org.junit.Test; @@ -66,7 +64,6 @@ public void cleanUp() { @Before public void setUp() throws IOException { - Assume.assumeFalse(MixAll.isMac()); BrokerConfig brokerConfig = new BrokerConfig(); brokerConfig.setAutoCreateSubscriptionGroup(false); Mockito.doReturn(brokerConfig).when(controller).getBrokerConfig(); @@ -85,7 +82,6 @@ public void setUp() throws IOException { @Test public void testUpdateSubscriptionGroupConfig() { - Assume.assumeFalse(MixAll.isMac()); SubscriptionGroupConfig subscriptionGroupConfig = new SubscriptionGroupConfig(); subscriptionGroupConfig.setGroupName("G1"); subscriptionGroupConfig.setConsumeEnable(true); @@ -120,7 +116,6 @@ public void testUpdateSubscriptionGroupConfig() { @Test public void testDeleteSubscriptionGroupConfig() { - Assume.assumeFalse(MixAll.isMac()); SubscriptionGroupConfig subscriptionGroupConfig = new SubscriptionGroupConfig(); subscriptionGroupConfig.setGroupName("G1"); subscriptionGroupConfig.setConsumeEnable(true); diff --git a/broker/src/test/java/org/apache/rocketmq/broker/config/v2/TopicConfigManagerV2Test.java b/broker/src/test/java/org/apache/rocketmq/broker/config/v2/TopicConfigManagerV2Test.java index b0bb18776b9..731a1f538fb 100644 --- a/broker/src/test/java/org/apache/rocketmq/broker/config/v2/TopicConfigManagerV2Test.java +++ b/broker/src/test/java/org/apache/rocketmq/broker/config/v2/TopicConfigManagerV2Test.java @@ -22,13 +22,11 @@ import org.apache.rocketmq.broker.BrokerController; import org.apache.rocketmq.common.BrokerConfig; -import org.apache.rocketmq.common.MixAll; import org.apache.rocketmq.common.TopicConfig; import org.apache.rocketmq.store.MessageStore; import org.apache.rocketmq.store.config.MessageStoreConfig; import org.junit.After; import org.junit.Assert; -import org.junit.Assume; import org.junit.Before; import org.junit.Rule; import org.junit.Test; @@ -63,7 +61,6 @@ public void cleanUp() { @Before public void setUp() throws IOException { - Assume.assumeFalse(MixAll.isMac()); BrokerConfig brokerConfig = new BrokerConfig(); Mockito.doReturn(brokerConfig).when(controller).getBrokerConfig(); @@ -80,7 +77,6 @@ public void setUp() throws IOException { @Test public void testUpdateTopicConfig() { - Assume.assumeFalse(MixAll.isMac()); TopicConfigManagerV2 topicConfigManagerV2 = new TopicConfigManagerV2(controller, configStorage); topicConfigManagerV2.load(); @@ -117,7 +113,6 @@ public void testUpdateTopicConfig() { @Test public void testRemoveTopicConfig() { - Assume.assumeFalse(MixAll.isMac()); TopicConfig topicConfig = new TopicConfig(); String topicName = "T1"; topicConfig.setTopicName(topicName); diff --git a/broker/src/test/java/org/apache/rocketmq/broker/offset/RocksDBLmqConsumerOffsetManagerTest.java b/broker/src/test/java/org/apache/rocketmq/broker/offset/RocksDBLmqConsumerOffsetManagerTest.java index 219ccfcd78e..aa5003fc103 100644 --- a/broker/src/test/java/org/apache/rocketmq/broker/offset/RocksDBLmqConsumerOffsetManagerTest.java +++ b/broker/src/test/java/org/apache/rocketmq/broker/offset/RocksDBLmqConsumerOffsetManagerTest.java @@ -49,9 +49,6 @@ public class RocksDBLmqConsumerOffsetManagerTest { @Before public void setUp() { - if (MixAll.isMac()) { - return; - } brokerController = Mockito.mock(BrokerController.class); when(brokerController.getMessageStoreConfig()).thenReturn(Mockito.mock(MessageStoreConfig.class)); when(brokerController.getBrokerConfig()).thenReturn(new BrokerConfig()); @@ -61,9 +58,6 @@ public void setUp() { @Test public void testQueryOffsetForNonLmq() { - if (MixAll.isMac()) { - return; - } long actualOffset = offsetManager.queryOffset(NON_LMQ_GROUP, NON_LMQ_TOPIC, QUEUE_ID); // Verify assertEquals("Offset should not be null.", -1, actualOffset); @@ -72,9 +66,6 @@ public void testQueryOffsetForNonLmq() { @Test public void testQueryOffsetForLmqGroupWithExistingOffset() { - if (MixAll.isMac()) { - return; - } offsetManager.commitOffset("127.0.0.1",LMQ_GROUP, LMQ_TOPIC, QUEUE_ID, OFFSET); // Act @@ -88,9 +79,6 @@ public void testQueryOffsetForLmqGroupWithExistingOffset() { @Test public void testQueryOffsetForLmqGroupWithoutExistingOffset() { - if (MixAll.isMac()) { - return; - } // Act Map actualOffsets = offsetManager.queryOffset(LMQ_GROUP, "nonExistingTopic"); // Assert @@ -99,9 +87,6 @@ public void testQueryOffsetForLmqGroupWithoutExistingOffset() { @Test public void testQueryOffsetForNonLmqGroup() { - if (MixAll.isMac()) { - return; - } // Arrange Map mockOffsets = new HashMap<>(); mockOffsets.put(QUEUE_ID, OFFSET); @@ -118,9 +103,6 @@ public void testQueryOffsetForNonLmqGroup() { @Test public void testCommitOffsetForLmq() { - if (MixAll.isMac()) { - return; - } // Execute offsetManager.commitOffset("clientHost", LMQ_GROUP, LMQ_TOPIC, QUEUE_ID, OFFSET); // Verify diff --git a/broker/src/test/java/org/apache/rocketmq/broker/offset/RocksDBOffsetSerializeWrapperTest.java b/broker/src/test/java/org/apache/rocketmq/broker/offset/RocksDBOffsetSerializeWrapperTest.java index 13d9e42b69d..c01e63f31f7 100644 --- a/broker/src/test/java/org/apache/rocketmq/broker/offset/RocksDBOffsetSerializeWrapperTest.java +++ b/broker/src/test/java/org/apache/rocketmq/broker/offset/RocksDBOffsetSerializeWrapperTest.java @@ -22,7 +22,6 @@ import java.util.concurrent.ConcurrentMap; import org.apache.rocketmq.broker.config.v1.RocksDBOffsetSerializeWrapper; -import org.apache.rocketmq.common.MixAll; import org.junit.Before; import org.junit.Test; @@ -35,26 +34,17 @@ public class RocksDBOffsetSerializeWrapperTest { @Before public void setUp() { - if (MixAll.isMac()) { - return; - } wrapper = new RocksDBOffsetSerializeWrapper(); } @Test public void testGetOffsetTable_ShouldReturnConcurrentHashMap() { - if (MixAll.isMac()) { - return; - } ConcurrentMap offsetTable = wrapper.getOffsetTable(); assertNotNull("The offsetTable should not be null", offsetTable); } @Test public void testSetOffsetTable_ShouldSetTheOffsetTableCorrectly() { - if (MixAll.isMac()) { - return; - } ConcurrentMap newOffsetTable = new ConcurrentHashMap<>(); wrapper.setOffsetTable(newOffsetTable); ConcurrentMap offsetTable = wrapper.getOffsetTable(); diff --git a/broker/src/test/java/org/apache/rocketmq/broker/pop/PopConsumerCacheTest.java b/broker/src/test/java/org/apache/rocketmq/broker/pop/PopConsumerCacheTest.java index 4e8f6235bd7..28045ca26e7 100644 --- a/broker/src/test/java/org/apache/rocketmq/broker/pop/PopConsumerCacheTest.java +++ b/broker/src/test/java/org/apache/rocketmq/broker/pop/PopConsumerCacheTest.java @@ -24,10 +24,8 @@ import org.apache.rocketmq.broker.BrokerController; import org.apache.rocketmq.broker.offset.ConsumerOffsetManager; import org.apache.rocketmq.common.BrokerConfig; -import org.apache.rocketmq.common.MixAll; import org.awaitility.Awaitility; import org.junit.Assert; -import org.junit.Assume; import org.junit.Test; import org.mockito.Mockito; @@ -42,7 +40,6 @@ public class PopConsumerCacheTest { @Test public void consumerRecordsTest() { - Assume.assumeFalse(MixAll.isMac()); BrokerConfig brokerConfig = new BrokerConfig(); brokerConfig.setPopConsumerKVServiceLog(true); PopConsumerCache.ConsumerRecords consumerRecords = @@ -74,7 +71,6 @@ public void consumerRecordsTest() { @Test public void consumerOffsetTest() throws IllegalAccessException { - Assume.assumeFalse(MixAll.isMac()); BrokerController brokerController = Mockito.mock(BrokerController.class); PopConsumerKVStore consumerKVStore = Mockito.mock(PopConsumerRocksdbStore.class); PopConsumerLockService consumerLockService = Mockito.mock(PopConsumerLockService.class); @@ -98,7 +94,6 @@ public void consumerOffsetTest() throws IllegalAccessException { @Test public void consumerCacheTest() { - Assume.assumeFalse(MixAll.isMac()); BrokerController brokerController = Mockito.mock(BrokerController.class); PopConsumerKVStore consumerKVStore = Mockito.mock(PopConsumerRocksdbStore.class); PopConsumerLockService consumerLockService = Mockito.mock(PopConsumerLockService.class); diff --git a/broker/src/test/java/org/apache/rocketmq/broker/pop/PopConsumerRocksdbStoreTest.java b/broker/src/test/java/org/apache/rocketmq/broker/pop/PopConsumerRocksdbStoreTest.java index 02626ae276a..3c2b190d1cd 100644 --- a/broker/src/test/java/org/apache/rocketmq/broker/pop/PopConsumerRocksdbStoreTest.java +++ b/broker/src/test/java/org/apache/rocketmq/broker/pop/PopConsumerRocksdbStoreTest.java @@ -28,12 +28,10 @@ import java.util.stream.Collectors; import java.util.stream.IntStream; import org.apache.commons.io.FileUtils; -import org.apache.rocketmq.common.MixAll; import org.apache.rocketmq.common.config.AbstractRocksDBStorage; import org.apache.rocketmq.common.constant.LoggerName; import org.apache.rocketmq.tieredstore.util.MessageStoreUtil; import org.junit.Assert; -import org.junit.Assume; import org.junit.Ignore; import org.junit.Test; import org.rocksdb.RocksDB; @@ -66,7 +64,6 @@ public static PopConsumerRecord getConsumerRecord() { @Test public void rocksdbStoreWriteDeleteTest() { - Assume.assumeFalse(MixAll.isMac()); String filePath = getRandomStorePath(); PopConsumerKVStore consumerStore = new PopConsumerRocksdbStore(filePath); Assert.assertEquals(filePath, consumerStore.getFilePath()); @@ -130,7 +127,6 @@ private long getDirectorySizeRecursive(File directory) { @Ignore @SuppressWarnings("ConstantValue") public void tombstoneDeletionTest() throws IllegalAccessException, NoSuchFieldException { - Assume.assumeFalse(MixAll.isMac()); PopConsumerRocksdbStore rocksdbStore = new PopConsumerRocksdbStore(getRandomStorePath()); rocksdbStore.start(); diff --git a/common/src/main/java/org/apache/rocketmq/common/ConfigManager.class b/common/src/main/java/org/apache/rocketmq/common/ConfigManager.class new file mode 100644 index 00000000000..a043eb180bd Binary files /dev/null and b/common/src/main/java/org/apache/rocketmq/common/ConfigManager.class differ diff --git a/common/src/main/java/org/apache/rocketmq/common/MixAll.class b/common/src/main/java/org/apache/rocketmq/common/MixAll.class new file mode 100644 index 00000000000..723dbca4e82 Binary files /dev/null and b/common/src/main/java/org/apache/rocketmq/common/MixAll.class differ diff --git a/common/src/test/java/org/apache/rocketmq/common/attribute/CQTypeTest.java b/common/src/test/java/org/apache/rocketmq/common/attribute/CQTypeTest.java index a9c4d9408fc..41aa98ba864 100644 --- a/common/src/test/java/org/apache/rocketmq/common/attribute/CQTypeTest.java +++ b/common/src/test/java/org/apache/rocketmq/common/attribute/CQTypeTest.java @@ -16,8 +16,6 @@ */ package org.apache.rocketmq.common.attribute; -import org.apache.rocketmq.common.MixAll; -import org.junit.Assume; import org.junit.Test; import static org.junit.Assert.assertEquals; @@ -26,7 +24,6 @@ public class CQTypeTest { @Test public void testValues() { - Assume.assumeFalse(MixAll.isMac()); CQType[] values = CQType.values(); assertEquals(3, values.length); assertEquals(CQType.SimpleCQ, values[0]); @@ -36,7 +33,6 @@ public void testValues() { @Test public void testValueOf() { - Assume.assumeFalse(MixAll.isMac()); assertEquals(CQType.SimpleCQ, CQType.valueOf("SimpleCQ")); assertEquals(CQType.BatchCQ, CQType.valueOf("BatchCQ")); assertEquals(CQType.RocksDBCQ, CQType.valueOf("RocksDBCQ")); @@ -44,7 +40,6 @@ public void testValueOf() { @Test(expected = IllegalArgumentException.class) public void testValueOf_InvalidName() { - Assume.assumeFalse(MixAll.isMac()); CQType.valueOf("InvalidCQ"); } } diff --git a/remoting/src/test/java/org/apache/rocketmq/remoting/protocol/header/ExportRocksDBConfigToJsonRequestHeaderTest.java b/remoting/src/test/java/org/apache/rocketmq/remoting/protocol/header/ExportRocksDBConfigToJsonRequestHeaderTest.java index 6d94caeb04f..bbe625a42af 100644 --- a/remoting/src/test/java/org/apache/rocketmq/remoting/protocol/header/ExportRocksDBConfigToJsonRequestHeaderTest.java +++ b/remoting/src/test/java/org/apache/rocketmq/remoting/protocol/header/ExportRocksDBConfigToJsonRequestHeaderTest.java @@ -18,16 +18,12 @@ import java.util.ArrayList; import java.util.List; -import org.apache.rocketmq.common.MixAll; import org.junit.Assert; import org.junit.Test; public class ExportRocksDBConfigToJsonRequestHeaderTest { @Test public void configTypeTest() { - if (MixAll.isMac()) { - return; - } List configTypes = new ArrayList<>(); configTypes.add(ExportRocksDBConfigToJsonRequestHeader.ConfigType.TOPICS); configTypes.add(ExportRocksDBConfigToJsonRequestHeader.ConfigType.SUBSCRIPTION_GROUPS); diff --git a/store/src/main/java/org/apache/rocketmq/store/timer/TimerMetrics$1.class b/store/src/main/java/org/apache/rocketmq/store/timer/TimerMetrics$1.class new file mode 100644 index 00000000000..1d8759ac662 Binary files /dev/null and b/store/src/main/java/org/apache/rocketmq/store/timer/TimerMetrics$1.class differ diff --git a/store/src/main/java/org/apache/rocketmq/store/timer/TimerMetrics$Metric.class b/store/src/main/java/org/apache/rocketmq/store/timer/TimerMetrics$Metric.class new file mode 100644 index 00000000000..336bd75bbd9 Binary files /dev/null and b/store/src/main/java/org/apache/rocketmq/store/timer/TimerMetrics$Metric.class differ diff --git a/store/src/main/java/org/apache/rocketmq/store/timer/TimerMetrics$TimerMetricsSerializeWrapper.class b/store/src/main/java/org/apache/rocketmq/store/timer/TimerMetrics$TimerMetricsSerializeWrapper.class new file mode 100644 index 00000000000..730b72abbaf Binary files /dev/null and b/store/src/main/java/org/apache/rocketmq/store/timer/TimerMetrics$TimerMetricsSerializeWrapper.class differ diff --git a/store/src/main/java/org/apache/rocketmq/store/timer/TimerMetrics.class b/store/src/main/java/org/apache/rocketmq/store/timer/TimerMetrics.class new file mode 100644 index 00000000000..766915f2bd5 Binary files /dev/null and b/store/src/main/java/org/apache/rocketmq/store/timer/TimerMetrics.class differ diff --git a/store/src/test/java/org/apache/rocketmq/store/ha/HAServerTest.java b/store/src/test/java/org/apache/rocketmq/store/ha/HAServerTest.java index 6e1642eddc6..fa8f41dbf84 100644 --- a/store/src/test/java/org/apache/rocketmq/store/ha/HAServerTest.java +++ b/store/src/test/java/org/apache/rocketmq/store/ha/HAServerTest.java @@ -26,7 +26,6 @@ import java.util.concurrent.ExecutionException; import java.util.concurrent.TimeoutException; import org.apache.rocketmq.common.BrokerConfig; -import org.apache.rocketmq.common.MixAll; import org.apache.rocketmq.common.SystemClock; import org.apache.rocketmq.store.CommitLog; import org.apache.rocketmq.store.DefaultMessageStore; @@ -55,9 +54,6 @@ public class HAServerTest { @Before public void setUp() throws Exception { - if (MixAll.isMac()) { - return; - } this.storeConfig = new MessageStoreConfig(); this.storeConfig.setHaListenPort(9000 + random.nextInt(1000)); this.storeConfig.setHaSendHeartbeatInterval(10); @@ -70,9 +66,6 @@ public void setUp() throws Exception { @After public void tearDown() { - if (MixAll.isMac()) { - return; - } tearDownAllHAClient(); await().atMost(Duration.ofMinutes(1)).until(new Callable() { @@ -87,9 +80,6 @@ public Boolean call() throws Exception { @Test public void testConnectionList_OneHAClient() throws IOException { - if (MixAll.isMac()) { - return; - } setUpOneHAClient(); await().atMost(Duration.ofMinutes(1)).until(new Callable() { @@ -102,9 +92,6 @@ public Boolean call() { @Test public void testConnectionList_MultipleHAClient() throws IOException { - if (MixAll.isMac()) { - return; - } setUpOneHAClient(); setUpOneHAClient(); setUpOneHAClient(); @@ -128,9 +115,6 @@ public Boolean call() { @Test public void inSyncReplicasNums() throws IOException, RocksDBException { - if (MixAll.isMac()) { - return; - } DefaultMessageStore messageStore = mockMessageStore(); doReturn(123L).when(messageStore).getMaxPhyOffset(); doReturn(123L).when(messageStore).getMasterFlushedOffset(); @@ -167,9 +151,6 @@ public Boolean call() throws Exception { @Test public void isSlaveOK() throws IOException, RocksDBException { - if (MixAll.isMac()) { - return; - } DefaultMessageStore messageStore = mockMessageStore(); doReturn(123L).when(messageStore).getMaxPhyOffset(); doReturn(123L).when(messageStore).getMasterFlushedOffset(); @@ -196,9 +177,6 @@ public Boolean call() throws Exception { @Test public void putRequest_SingleAck() throws IOException, ExecutionException, InterruptedException, TimeoutException, RocksDBException { - if (MixAll.isMac()) { - return; - } CommitLog.GroupCommitRequest request = new CommitLog.GroupCommitRequest(124, 4000, 1); this.haService.putRequest(request); @@ -217,9 +195,6 @@ public void putRequest_SingleAck() @Test public void putRequest_MultipleAckAndRequests() throws IOException, ExecutionException, InterruptedException, RocksDBException { - if (MixAll.isMac()) { - return; - } CommitLog.GroupCommitRequest oneAck = new CommitLog.GroupCommitRequest(124, 4000, 2); this.haService.putRequest(oneAck); @@ -246,9 +221,6 @@ public void putRequest_MultipleAckAndRequests() @Test public void getPush2SlaveMaxOffset() throws IOException, RocksDBException { - if (MixAll.isMac()) { - return; - } DefaultMessageStore messageStore = mockMessageStore(); doReturn(123L).when(messageStore).getMaxPhyOffset(); doReturn(123L).when(messageStore).getMasterFlushedOffset(); diff --git a/store/src/test/java/org/apache/rocketmq/store/queue/CombineConsumeQueueStoreTest.java b/store/src/test/java/org/apache/rocketmq/store/queue/CombineConsumeQueueStoreTest.java index c261bb9882a..2ca21b265ef 100644 --- a/store/src/test/java/org/apache/rocketmq/store/queue/CombineConsumeQueueStoreTest.java +++ b/store/src/test/java/org/apache/rocketmq/store/queue/CombineConsumeQueueStoreTest.java @@ -24,7 +24,6 @@ import java.util.concurrent.ConcurrentMap; import java.util.concurrent.TimeUnit; import org.apache.commons.io.FileUtils; -import org.apache.rocketmq.common.MixAll; import org.apache.rocketmq.common.TopicConfig; import org.apache.rocketmq.common.UtilAll; import org.apache.rocketmq.common.attribute.CQType; @@ -36,7 +35,6 @@ import org.apache.rocketmq.store.config.MessageStoreConfig; import org.junit.After; import org.junit.Assert; -import org.junit.Assume; import org.junit.Before; import org.junit.Test; import org.junit.runner.RunWith; @@ -61,18 +59,12 @@ public class CombineConsumeQueueStoreTest extends QueueTestBase { @Before public void init() throws Exception { - if (MixAll.isMac()) { - return; - } this.topicConfigTableMap = new ConcurrentHashMap<>(); messageStoreConfig = new MessageStoreConfig(); } @After public void destroy() { - if (MixAll.isMac()) { - return; - } if (!messageStore.isShutdown()) { messageStore.shutdown(); } @@ -84,7 +76,6 @@ public void destroy() { @Test(expected = IllegalArgumentException.class) public void CombineConsumeQueueStore_EmptyLoadingCQTypes_ThrowsException() throws Exception { - Assume.assumeFalse(MixAll.isMac()); messageStore = (DefaultMessageStore) createMessageStore(null, false, topicConfigTableMap, messageStoreConfig); messageStoreConfig.setCombineCQLoadingCQTypes(""); @@ -93,9 +84,6 @@ public void CombineConsumeQueueStore_EmptyLoadingCQTypes_ThrowsException() throw @Test public void CombineConsumeQueueStore_InitializesConsumeQueueStore() throws Exception { - if (MixAll.isMac()) { - return; - } messageStore = (DefaultMessageStore) createMessageStore(null, false, topicConfigTableMap, messageStoreConfig); { messageStoreConfig.setCombineCQLoadingCQTypes("default"); @@ -135,9 +123,6 @@ public void CombineConsumeQueueStore_InitializesConsumeQueueStore() throws Excep @Test public void testIterator() throws Exception { - if (MixAll.isMac()) { - return; - } messageStoreConfig.setRocksdbCQDoubleWriteEnable(true); messageStore = (DefaultMessageStore) createMessageStore(null, false, topicConfigTableMap, messageStoreConfig); messageStore.load(); @@ -218,9 +203,6 @@ private void checkCQ(ConsumeQueueInterface consumeQueue, int msgNum, @Test public void testInitializeWithOffset() throws Exception { - if (MixAll.isMac()) { - return; - } final String path = createBaseDir(); FileUtils.deleteDirectory(new File(path)); topicConfigTableMap.put(topic, new TopicConfig(topic, 1, 1, PermName.PERM_WRITE | PermName.PERM_READ)); @@ -313,9 +295,6 @@ public void testInitializeWithOffset() throws Exception { @Test public void testVerifyAndInitOffsetForAllStore() throws Exception { - if (MixAll.isMac()) { - return; - } final String path = createBaseDir(); topicConfigTableMap.put(topic, new TopicConfig(topic, 1, 1, PermName.PERM_WRITE | PermName.PERM_READ)); diff --git a/store/src/test/java/org/apache/rocketmq/store/queue/RocksDBConsumeQueueOffsetTableTest.java b/store/src/test/java/org/apache/rocketmq/store/queue/RocksDBConsumeQueueOffsetTableTest.java index 0693aec647d..b1e12d49468 100644 --- a/store/src/test/java/org/apache/rocketmq/store/queue/RocksDBConsumeQueueOffsetTableTest.java +++ b/store/src/test/java/org/apache/rocketmq/store/queue/RocksDBConsumeQueueOffsetTableTest.java @@ -22,7 +22,6 @@ import java.nio.ByteBuffer; import java.nio.charset.StandardCharsets; import java.util.concurrent.atomic.AtomicBoolean; -import org.apache.rocketmq.common.MixAll; import org.apache.rocketmq.store.DefaultMessageStore; import org.apache.rocketmq.store.queue.offset.OffsetEntryType; import org.apache.rocketmq.store.rocksdb.ConsumeQueueRocksDBStorage; @@ -65,9 +64,6 @@ public class RocksDBConsumeQueueOffsetTableTest { @BeforeClass public static void initDB() throws IOException, RocksDBException { - if (MixAll.isMac()) { - return; - } TemporaryFolder tempFolder = new TemporaryFolder(); tempFolder.create(); dbPath = tempFolder.newFolder(); @@ -102,18 +98,12 @@ public static void initDB() throws IOException, RocksDBException { @AfterClass public static void tearDownDB() throws RocksDBException { - if (MixAll.isMac()) { - return; - } db.closeE(); RocksDB.destroyDB(dbPath.getAbsolutePath(), new Options()); } @Before public void setUp() { - if (MixAll.isMac()) { - return; - } RocksIterator iterator = db.newIterator(); Mockito.doReturn(iterator).when(rocksDBStorage).seekOffsetCF(); offsetTable = new RocksDBConsumeQueueOffsetTable(consumeQueueTable, rocksDBStorage, messageStore); @@ -126,9 +116,6 @@ public void setUp() { */ @Test public void testForEach() throws RocksDBException { - if (MixAll.isMac()) { - return; - } AtomicBoolean called = new AtomicBoolean(false); offsetTable.forEach(entry -> true, entry -> { called.set(true); diff --git a/store/src/test/java/org/apache/rocketmq/store/rocksdb/RocksDBOptionsFactoryTest.java b/store/src/test/java/org/apache/rocketmq/store/rocksdb/RocksDBOptionsFactoryTest.java index 46563077d18..1d7273968f6 100644 --- a/store/src/test/java/org/apache/rocketmq/store/rocksdb/RocksDBOptionsFactoryTest.java +++ b/store/src/test/java/org/apache/rocketmq/store/rocksdb/RocksDBOptionsFactoryTest.java @@ -17,7 +17,6 @@ package org.apache.rocketmq.store.rocksdb; -import org.apache.rocketmq.common.MixAll; import org.apache.rocketmq.store.config.MessageStoreConfig; import org.junit.Assert; import org.junit.Test; @@ -27,9 +26,6 @@ public class RocksDBOptionsFactoryTest { @Test public void testBottomMostCompressionType() { - if (MixAll.isMac()) { - return; - } MessageStoreConfig config = new MessageStoreConfig(); Assert.assertEquals(CompressionType.ZSTD_COMPRESSION, CompressionType.getCompressionType(config.getBottomMostCompressionTypeForConsumeQueueStore())); diff --git a/tools/src/test/java/org/apache/rocketmq/tools/command/metadata/ExportMetadataInRocksDBCommandTest.java b/tools/src/test/java/org/apache/rocketmq/tools/command/metadata/ExportMetadataInRocksDBCommandTest.java index 52ede8a2741..2b938c90fb8 100644 --- a/tools/src/test/java/org/apache/rocketmq/tools/command/metadata/ExportMetadataInRocksDBCommandTest.java +++ b/tools/src/test/java/org/apache/rocketmq/tools/command/metadata/ExportMetadataInRocksDBCommandTest.java @@ -19,7 +19,6 @@ import org.apache.commons.cli.CommandLine; import org.apache.commons.cli.DefaultParser; import org.apache.commons.cli.Options; -import org.apache.rocketmq.common.MixAll; import org.apache.rocketmq.srvutil.ServerUtil; import org.apache.rocketmq.tools.command.SubCommandException; import org.apache.rocketmq.tools.command.export.ExportMetadataInRocksDBCommand; @@ -34,9 +33,6 @@ public class ExportMetadataInRocksDBCommandTest { @Test public void testExecute() throws SubCommandException { - if (MixAll.isMac()) { - return; - } { String[][] cases = new String[][] { {"topics", "false"},