support storing Retained messages of single tenant cross multiple ranges

Author: popduke

bifromq-dist/bifromq-dist-rpc-definition/src/main/java/com/baidu/bifromq/dist/entity/EntityUtil.java

@@ -13,14 +13,14 @@
 
 package com.baidu.bifromq.dist.entity;
 
-import static com.baidu.bifromq.dist.util.TopicUtil.escape;
-import static com.baidu.bifromq.dist.util.TopicUtil.isNormalTopicFilter;
-import static com.baidu.bifromq.dist.util.TopicUtil.unescape;
+import static com.baidu.bifromq.util.TopicUtil.escape;
+import static com.baidu.bifromq.util.TopicUtil.unescape;
 import static com.baidu.bifromq.util.TopicConst.DELIMITER_CHAR;
 import static com.baidu.bifromq.util.TopicConst.NUL;
 import static com.baidu.bifromq.util.TopicConst.NUL_CHAR;
 import static com.baidu.bifromq.util.TopicConst.ORDERED_SHARE;
 import static com.baidu.bifromq.util.TopicConst.UNORDERED_SHARE;
+import static com.baidu.bifromq.util.TopicUtil.isNormalTopicFilter;
 import static com.google.protobuf.ByteString.copyFromUtf8;
 
 import com.baidu.bifromq.dist.rpc.proto.GroupMatchRecord;

bifromq-dist/bifromq-dist-rpc-definition/src/main/java/com/baidu/bifromq/dist/entity/GroupMatching.java

@@ -16,7 +16,7 @@
 import static com.baidu.bifromq.util.TopicConst.DELIMITER_CHAR;
 import static com.baidu.bifromq.util.TopicConst.ORDERED_SHARE;
 import static com.baidu.bifromq.util.TopicConst.UNORDERED_SHARE;
-import static com.baidu.bifromq.dist.util.TopicUtil.unescape;
+import static com.baidu.bifromq.util.TopicUtil.unescape;
 
 import com.google.common.collect.Sets;
 import com.google.protobuf.ByteString;

bifromq-dist/bifromq-dist-rpc-definition/src/main/java/com/baidu/bifromq/dist/entity/NormalMatching.java

@@ -14,7 +14,7 @@
 package com.baidu.bifromq.dist.entity;
 
 
-import static com.baidu.bifromq.dist.util.TopicUtil.unescape;
+import static com.baidu.bifromq.util.TopicUtil.unescape;
 import static com.baidu.bifromq.util.TopicConst.NUL;
 
 import com.baidu.bifromq.type.MatchInfo;

bifromq-dist/bifromq-dist-rpc-definition/src/main/java/com/baidu/bifromq/dist/util/TopicUtil.java

@@ -13,8 +13,8 @@
 
 package com.baidu.bifromq.dist;
 
-import static com.baidu.bifromq.dist.util.TopicUtil.fastJoin;
-import static com.baidu.bifromq.dist.util.TopicUtil.parse;
+import static com.baidu.bifromq.util.TopicUtil.fastJoin;
+import static com.baidu.bifromq.util.TopicUtil.parse;
 import static com.baidu.bifromq.util.TopicConst.DELIMITER;
 import static com.baidu.bifromq.util.TopicConst.MULTI_WILDCARD;
 import static com.baidu.bifromq.util.TopicConst.NUL;

bifromq-dist/bifromq-dist-rpc-definition/src/test/java/com/baidu/bifromq/dist/TestUtil.java

@@ -19,7 +19,7 @@
 import static com.baidu.bifromq.util.TopicConst.SINGLE_WILDCARD;
 import static com.baidu.bifromq.util.TopicConst.SYS_PREFIX;
 
-import com.baidu.bifromq.dist.util.TopicUtil;
+import com.baidu.bifromq.util.TopicUtil;
 import java.util.List;
 import java.util.Optional;
 

bifromq-dist/bifromq-dist-rpc-definition/src/test/java/com/baidu/bifromq/dist/TopicMatcher.java

@@ -13,7 +13,7 @@
 
 package com.baidu.bifromq.dist;
 
-import static com.baidu.bifromq.dist.util.TopicUtil.escape;
+import static com.baidu.bifromq.util.TopicUtil.escape;
 import static org.testng.Assert.assertEquals;
 import static org.testng.Assert.assertFalse;
 import static org.testng.Assert.assertTrue;

bifromq-dist/bifromq-dist-rpc-definition/src/test/java/com/baidu/bifromq/dist/TopicMatcherTest.java

@@ -17,7 +17,7 @@
 import static com.baidu.bifromq.dist.entity.EntityUtil.parseTopicFilter;
 import static com.baidu.bifromq.dist.entity.EntityUtil.toMatchRecordKey;
 import static com.baidu.bifromq.dist.entity.EntityUtil.toQInboxId;
-import static com.baidu.bifromq.dist.util.TopicUtil.escape;
+import static com.baidu.bifromq.util.TopicUtil.escape;
 import static org.testng.Assert.assertEquals;
 import static org.testng.Assert.assertTrue;
 

bifromq-dist/bifromq-dist-rpc-definition/src/test/java/com/baidu/bifromq/dist/entity/EntityUtilTest.java

@@ -15,15 +15,15 @@
 
 import static com.baidu.bifromq.dist.TestUtil.randomTopic;
 import static com.baidu.bifromq.dist.TestUtil.randomTopicFilter;
-import static com.baidu.bifromq.dist.util.TopicUtil.escape;
-import static com.baidu.bifromq.dist.util.TopicUtil.fastJoin;
-import static com.baidu.bifromq.dist.util.TopicUtil.parse;
+import static com.baidu.bifromq.util.TopicUtil.escape;
+import static com.baidu.bifromq.util.TopicUtil.fastJoin;
+import static com.baidu.bifromq.util.TopicUtil.parse;
 import static com.baidu.bifromq.util.TopicConst.NUL;
 import static org.testng.Assert.assertEquals;
 import static org.testng.Assert.assertTrue;
 
 import com.baidu.bifromq.dist.TestUtil;
-import com.baidu.bifromq.dist.util.TopicUtil;
+import com.baidu.bifromq.util.TopicUtil;
 import com.baidu.bifromq.util.TopicConst;
 import java.util.ArrayList;
 import java.util.HashSet;

bifromq-dist/bifromq-dist-rpc-definition/src/test/java/com/baidu/bifromq/dist/trie/TopicFilterIteratorTest.java

@@ -15,7 +15,7 @@
 
 import com.baidu.bifromq.dist.trie.TopicTrieNode;
 import com.baidu.bifromq.dist.TestUtil;
-import com.baidu.bifromq.dist.util.TopicUtil;
+import com.baidu.bifromq.util.TopicUtil;
 import java.util.List;
 import lombok.extern.slf4j.Slf4j;
 import org.openjdk.jmh.annotations.Level;