diff --git a/docker/pom.xml b/docker/pom.xml index 41a7e7c45..0dd240936 100644 --- a/docker/pom.xml +++ b/docker/pom.xml @@ -19,7 +19,7 @@ joyqueue org.joyqueue - 4.2.7.RC3 + 4.2.8-SNAPSHOT 4.0.0 joyqueue-docker diff --git a/docker/server/pom.xml b/docker/server/pom.xml index e572620af..b2a77c20f 100644 --- a/docker/server/pom.xml +++ b/docker/server/pom.xml @@ -20,7 +20,7 @@ joyqueue-docker org.joyqueue - 4.2.7.RC3 + 4.2.8-SNAPSHOT 4.0.0 docker-server diff --git a/docker/web/pom.xml b/docker/web/pom.xml index bffeaff73..8ace9c7d1 100644 --- a/docker/web/pom.xml +++ b/docker/web/pom.xml @@ -20,7 +20,7 @@ joyqueue-docker org.joyqueue - 4.2.7.RC3 + 4.2.8-SNAPSHOT 4.0.0 docker-web diff --git a/joyqueue-client/joyqueue-client-all-shaded/pom.xml b/joyqueue-client/joyqueue-client-all-shaded/pom.xml index 22192676b..b864575c3 100644 --- a/joyqueue-client/joyqueue-client-all-shaded/pom.xml +++ b/joyqueue-client/joyqueue-client-all-shaded/pom.xml @@ -20,7 +20,7 @@ joyqueue-client org.joyqueue - 4.2.7.RC3 + 4.2.8-SNAPSHOT 4.0.0 diff --git a/joyqueue-client/joyqueue-client-all/pom.xml b/joyqueue-client/joyqueue-client-all/pom.xml index 9213a1544..6df6ea3fb 100644 --- a/joyqueue-client/joyqueue-client-all/pom.xml +++ b/joyqueue-client/joyqueue-client-all/pom.xml @@ -20,7 +20,7 @@ joyqueue-client org.joyqueue - 4.2.7.RC3 + 4.2.8-SNAPSHOT 4.0.0 diff --git a/joyqueue-client/joyqueue-client-core-shaded/pom.xml b/joyqueue-client/joyqueue-client-core-shaded/pom.xml index 591c92567..bc67b783a 100644 --- a/joyqueue-client/joyqueue-client-core-shaded/pom.xml +++ b/joyqueue-client/joyqueue-client-core-shaded/pom.xml @@ -20,7 +20,7 @@ joyqueue-client org.joyqueue - 4.2.7.RC3 + 4.2.8-SNAPSHOT 4.0.0 diff --git a/joyqueue-client/joyqueue-client-core/pom.xml b/joyqueue-client/joyqueue-client-core/pom.xml index 187867b58..41de85b44 100644 --- a/joyqueue-client/joyqueue-client-core/pom.xml +++ b/joyqueue-client/joyqueue-client-core/pom.xml @@ -20,7 +20,7 @@ joyqueue-client org.joyqueue - 4.2.7.RC3 + 4.2.8-SNAPSHOT 4.0.0 diff --git a/joyqueue-client/joyqueue-client-core/src/main/java/org/joyqueue/client/internal/producer/support/AdaptivePartitionSelector.java b/joyqueue-client/joyqueue-client-core/src/main/java/org/joyqueue/client/internal/producer/support/AdaptivePartitionSelector.java index 056834628..4686d1347 100644 --- a/joyqueue-client/joyqueue-client-core/src/main/java/org/joyqueue/client/internal/producer/support/AdaptivePartitionSelector.java +++ b/joyqueue-client/joyqueue-client-core/src/main/java/org/joyqueue/client/internal/producer/support/AdaptivePartitionSelector.java @@ -55,13 +55,14 @@ protected Nodes getTopicNodes(TopicMetadata topicMetadata, List brok Nodes cacheNodes = topicMetadata.getAttachment(NODES_CACHE_KEY); if (cacheNodes == null) { cacheNodes = new Nodes(); + cacheNodes.setAttachment(topicMetadata.getTopic()); Nodes oldNodes = topicMetadata.putIfAbsentAttachment(NODES_CACHE_KEY, cacheNodes); if (oldNodes != null) { cacheNodes = oldNodes; } } - List cacheNodeList = Lists.newArrayListWithCapacity(brokerNodes.size()); + List nodeList = Lists.newArrayListWithCapacity(brokerNodes.size()); for (BrokerNode brokerNode : brokerNodes) { Node node = brokerNode.getAttachment(NODE_CACHE_KEY); if (node == null) { @@ -74,12 +75,13 @@ protected Nodes getTopicNodes(TopicMetadata topicMetadata, List brok node = oldNode; } } - cacheNodeList.add(node); + nodeList.add(node); } Nodes nodes = new Nodes(); nodes.setMetric(cacheNodes.getMetric()); - nodes.setNodes(cacheNodeList); + nodes.setNodes(nodeList); + nodes.setAttachment(cacheNodes.getAttachment()); return nodes; } diff --git a/joyqueue-client/joyqueue-client-kafka/pom.xml b/joyqueue-client/joyqueue-client-kafka/pom.xml index 97888fe32..5c1a144e4 100644 --- a/joyqueue-client/joyqueue-client-kafka/pom.xml +++ b/joyqueue-client/joyqueue-client-kafka/pom.xml @@ -20,7 +20,7 @@ joyqueue-client org.joyqueue - 4.2.7.RC3 + 4.2.8-SNAPSHOT 4.0.0 diff --git a/joyqueue-client/joyqueue-client-loadbalance-adaptive/pom.xml b/joyqueue-client/joyqueue-client-loadbalance-adaptive/pom.xml index 7c3a712ed..36dbe0ccd 100644 --- a/joyqueue-client/joyqueue-client-loadbalance-adaptive/pom.xml +++ b/joyqueue-client/joyqueue-client-loadbalance-adaptive/pom.xml @@ -1,11 +1,9 @@ - + joyqueue-client org.joyqueue - 4.2.7.RC3 + 4.2.8-SNAPSHOT 4.0.0 @@ -17,6 +15,10 @@ io.dropwizard.metrics metrics-core + + com.google.guava + guava + junit diff --git a/joyqueue-client/joyqueue-client-loadbalance-adaptive/src/main/java/org/joyqueue/client/loadbalance/adaptive/AdaptiveLoadBalance.java b/joyqueue-client/joyqueue-client-loadbalance-adaptive/src/main/java/org/joyqueue/client/loadbalance/adaptive/AdaptiveLoadBalance.java index a835632fe..8bf7b17e9 100644 --- a/joyqueue-client/joyqueue-client-loadbalance-adaptive/src/main/java/org/joyqueue/client/loadbalance/adaptive/AdaptiveLoadBalance.java +++ b/joyqueue-client/joyqueue-client-loadbalance-adaptive/src/main/java/org/joyqueue/client/loadbalance/adaptive/AdaptiveLoadBalance.java @@ -1,5 +1,7 @@ package org.joyqueue.client.loadbalance.adaptive; +import com.google.common.cache.Cache; +import com.google.common.cache.CacheBuilder; import org.joyqueue.client.loadbalance.adaptive.config.AdaptiveLoadBalanceConfig; import org.joyqueue.client.loadbalance.adaptive.node.Node; import org.joyqueue.client.loadbalance.adaptive.node.Nodes; @@ -7,6 +9,8 @@ import java.util.ArrayList; import java.util.List; +import java.util.concurrent.ExecutionException; +import java.util.concurrent.TimeUnit; /** * AdaptiveLoadBalance @@ -21,9 +25,14 @@ public class AdaptiveLoadBalance { private WeightLoadBalance weightLoadBalance = new WeightLoadBalance(); private RandomLoadBalance randomLoadBalance = new RandomLoadBalance(); + private Cache selectCache; + public AdaptiveLoadBalance(AdaptiveLoadBalanceConfig config) { this.config = config; this.scoreJudges = getScoreJudges(config); + this.selectCache = CacheBuilder.newBuilder() + .expireAfterWrite(config.getComputeInterval(), TimeUnit.MILLISECONDS) + .build(); } protected List getScoreJudges(AdaptiveLoadBalanceConfig config) { @@ -48,6 +57,17 @@ protected boolean isStartup(Nodes nodes) { } protected Node adaptiveSelect(Nodes nodes) { + String cacheKey = nodes.toString(); + try { + return selectCache.get(cacheKey, () -> { + return doAdaptiveSelect(nodes); + }); + } catch (ExecutionException e) { + return doAdaptiveSelect(nodes); + } + } + + public Node doAdaptiveSelect(Nodes nodes) { List weightNodes = new ArrayList<>(nodes.getNodes().size()); for (Node node : nodes.getNodes()) { double score = 0; diff --git a/joyqueue-client/joyqueue-client-loadbalance-adaptive/src/main/java/org/joyqueue/client/loadbalance/adaptive/config/AdaptiveLoadBalanceConfig.java b/joyqueue-client/joyqueue-client-loadbalance-adaptive/src/main/java/org/joyqueue/client/loadbalance/adaptive/config/AdaptiveLoadBalanceConfig.java index b19edd430..7414b8aa0 100644 --- a/joyqueue-client/joyqueue-client-loadbalance-adaptive/src/main/java/org/joyqueue/client/loadbalance/adaptive/config/AdaptiveLoadBalanceConfig.java +++ b/joyqueue-client/joyqueue-client-loadbalance-adaptive/src/main/java/org/joyqueue/client/loadbalance/adaptive/config/AdaptiveLoadBalanceConfig.java @@ -9,6 +9,7 @@ public class AdaptiveLoadBalanceConfig { private int ssthreshhold = 10; private String[] judges; + private int computeInterval = 1000 * 1; public int getSsthreshhold() { return ssthreshhold; @@ -25,4 +26,12 @@ public String[] getJudges() { public void setJudges(String[] judges) { this.judges = judges; } + + public int getComputeInterval() { + return computeInterval; + } + + public void setComputeInterval(int computeInterval) { + this.computeInterval = computeInterval; + } } \ No newline at end of file diff --git a/joyqueue-client/joyqueue-client-loadbalance-adaptive/src/main/java/org/joyqueue/client/loadbalance/adaptive/node/Node.java b/joyqueue-client/joyqueue-client-loadbalance-adaptive/src/main/java/org/joyqueue/client/loadbalance/adaptive/node/Node.java index a0f9588c3..9a99e907c 100644 --- a/joyqueue-client/joyqueue-client-loadbalance-adaptive/src/main/java/org/joyqueue/client/loadbalance/adaptive/node/Node.java +++ b/joyqueue-client/joyqueue-client-loadbalance-adaptive/src/main/java/org/joyqueue/client/loadbalance/adaptive/node/Node.java @@ -10,6 +10,7 @@ public class Node { private Metric metric = new Metric(); private String url; private boolean nearby; + private Object attachment; public Node() { } @@ -38,4 +39,21 @@ public void setNearby(boolean nearby) { public boolean isNearby() { return nearby; } + + public Object getAttachment() { + return attachment; + } + + public void setAttachment(Object attachment) { + this.attachment = attachment; + } + + @Override + public String toString() { + return "Node{" + + "url='" + url + '\'' + + ", nearby=" + nearby + + ", attachment=" + attachment + + '}'; + } } \ No newline at end of file diff --git a/joyqueue-client/joyqueue-client-loadbalance-adaptive/src/main/java/org/joyqueue/client/loadbalance/adaptive/node/Nodes.java b/joyqueue-client/joyqueue-client-loadbalance-adaptive/src/main/java/org/joyqueue/client/loadbalance/adaptive/node/Nodes.java index 481b1bee7..68388fa57 100644 --- a/joyqueue-client/joyqueue-client-loadbalance-adaptive/src/main/java/org/joyqueue/client/loadbalance/adaptive/node/Nodes.java +++ b/joyqueue-client/joyqueue-client-loadbalance-adaptive/src/main/java/org/joyqueue/client/loadbalance/adaptive/node/Nodes.java @@ -11,6 +11,7 @@ public class Nodes { private Metric metric = new Metric(); private List nodes; + private Object attachment; public Nodes() { } @@ -34,4 +35,20 @@ public void setNodes(List nodes) { public List getNodes() { return nodes; } + + public Object getAttachment() { + return attachment; + } + + public void setAttachment(Object attachment) { + this.attachment = attachment; + } + + @Override + public String toString() { + return "Nodes{" + + "nodes=" + nodes + + ", attachment=" + attachment + + '}'; + } } \ No newline at end of file diff --git a/joyqueue-client/joyqueue-client-samples/joyqueue-client-samples-kafka/pom.xml b/joyqueue-client/joyqueue-client-samples/joyqueue-client-samples-kafka/pom.xml index 0a60c8a8e..b76ec9193 100644 --- a/joyqueue-client/joyqueue-client-samples/joyqueue-client-samples-kafka/pom.xml +++ b/joyqueue-client/joyqueue-client-samples/joyqueue-client-samples-kafka/pom.xml @@ -20,7 +20,7 @@ joyqueue-client-samples org.joyqueue - 4.2.7.RC3 + 4.2.8-SNAPSHOT 4.0.0 diff --git a/joyqueue-client/joyqueue-client-samples/joyqueue-client-samples-openmessaging/pom.xml b/joyqueue-client/joyqueue-client-samples/joyqueue-client-samples-openmessaging/pom.xml index 7d5c2cf19..7097f322c 100644 --- a/joyqueue-client/joyqueue-client-samples/joyqueue-client-samples-openmessaging/pom.xml +++ b/joyqueue-client/joyqueue-client-samples/joyqueue-client-samples-openmessaging/pom.xml @@ -20,7 +20,7 @@ joyqueue-client-samples org.joyqueue - 4.2.7.RC3 + 4.2.8-SNAPSHOT 4.0.0 diff --git a/joyqueue-client/joyqueue-client-samples/joyqueue-client-samples-spring/pom.xml b/joyqueue-client/joyqueue-client-samples/joyqueue-client-samples-spring/pom.xml index 73ad99258..bca2c4ef7 100644 --- a/joyqueue-client/joyqueue-client-samples/joyqueue-client-samples-spring/pom.xml +++ b/joyqueue-client/joyqueue-client-samples/joyqueue-client-samples-spring/pom.xml @@ -20,7 +20,7 @@ joyqueue-client-samples org.joyqueue - 4.2.7.RC3 + 4.2.8-SNAPSHOT 4.0.0 diff --git a/joyqueue-client/joyqueue-client-samples/joyqueue-client-samples-springboot/pom.xml b/joyqueue-client/joyqueue-client-samples/joyqueue-client-samples-springboot/pom.xml index 1f2a7e587..c6e2f2361 100644 --- a/joyqueue-client/joyqueue-client-samples/joyqueue-client-samples-springboot/pom.xml +++ b/joyqueue-client/joyqueue-client-samples/joyqueue-client-samples-springboot/pom.xml @@ -20,7 +20,7 @@ joyqueue-client-samples org.joyqueue - 4.2.7.RC3 + 4.2.8-SNAPSHOT 4.0.0 diff --git a/joyqueue-client/joyqueue-client-samples/pom.xml b/joyqueue-client/joyqueue-client-samples/pom.xml index c6ede4ab1..b3628b75d 100644 --- a/joyqueue-client/joyqueue-client-samples/pom.xml +++ b/joyqueue-client/joyqueue-client-samples/pom.xml @@ -20,7 +20,7 @@ joyqueue-client org.joyqueue - 4.2.7.RC3 + 4.2.8-SNAPSHOT 4.0.0 diff --git a/joyqueue-client/pom.xml b/joyqueue-client/pom.xml index 980617647..19c134ace 100644 --- a/joyqueue-client/pom.xml +++ b/joyqueue-client/pom.xml @@ -20,7 +20,7 @@ joyqueue org.joyqueue - 4.2.7.RC3 + 4.2.8-SNAPSHOT 4.0.0 diff --git a/joyqueue-common/joyqueue-datasource/joyqueue-datasource-api/pom.xml b/joyqueue-common/joyqueue-datasource/joyqueue-datasource-api/pom.xml index 156ec8158..946970b00 100644 --- a/joyqueue-common/joyqueue-datasource/joyqueue-datasource-api/pom.xml +++ b/joyqueue-common/joyqueue-datasource/joyqueue-datasource-api/pom.xml @@ -20,7 +20,7 @@ joyqueue-datasource org.joyqueue - 4.2.7.RC3 + 4.2.8-SNAPSHOT 4.0.0 diff --git a/joyqueue-common/joyqueue-datasource/joyqueue-datasource-hikaricp/pom.xml b/joyqueue-common/joyqueue-datasource/joyqueue-datasource-hikaricp/pom.xml index 075d0f7e1..9b6ba2d5e 100644 --- a/joyqueue-common/joyqueue-datasource/joyqueue-datasource-hikaricp/pom.xml +++ b/joyqueue-common/joyqueue-datasource/joyqueue-datasource-hikaricp/pom.xml @@ -20,7 +20,7 @@ joyqueue-datasource org.joyqueue - 4.2.7.RC3 + 4.2.8-SNAPSHOT 4.0.0 diff --git a/joyqueue-common/joyqueue-datasource/pom.xml b/joyqueue-common/joyqueue-datasource/pom.xml index 9e600eaf8..0723d128f 100644 --- a/joyqueue-common/joyqueue-datasource/pom.xml +++ b/joyqueue-common/joyqueue-datasource/pom.xml @@ -20,7 +20,7 @@ joyqueue-common org.joyqueue - 4.2.7.RC3 + 4.2.8-SNAPSHOT 4.0.0 diff --git a/joyqueue-common/joyqueue-hbase/pom.xml b/joyqueue-common/joyqueue-hbase/pom.xml index 5d9eba9a5..dc9fd3f49 100644 --- a/joyqueue-common/joyqueue-hbase/pom.xml +++ b/joyqueue-common/joyqueue-hbase/pom.xml @@ -20,7 +20,7 @@ joyqueue-common org.joyqueue - 4.2.7.RC3 + 4.2.8-SNAPSHOT 4.0.0 diff --git a/joyqueue-common/joyqueue-model/pom.xml b/joyqueue-common/joyqueue-model/pom.xml index 04158948e..76b06900e 100644 --- a/joyqueue-common/joyqueue-model/pom.xml +++ b/joyqueue-common/joyqueue-model/pom.xml @@ -20,12 +20,12 @@ joyqueue-common org.joyqueue - 4.2.7.RC3 + 4.2.8-SNAPSHOT 4.0.0 joyqueue-model - 4.2.7.RC3 + 4.2.8-SNAPSHOT JoyQueue-Model Domain models diff --git a/joyqueue-common/joyqueue-model/src/main/java/org/joyqueue/domain/TopicConfig.java b/joyqueue-common/joyqueue-model/src/main/java/org/joyqueue/domain/TopicConfig.java index 0576db86e..75e41853c 100644 --- a/joyqueue-common/joyqueue-model/src/main/java/org/joyqueue/domain/TopicConfig.java +++ b/joyqueue-common/joyqueue-model/src/main/java/org/joyqueue/domain/TopicConfig.java @@ -213,7 +213,7 @@ public boolean equals(Object o) { return true; } - return super.equals(((TopicConfig) o).getName()); + return super.equals(o); } @Override diff --git a/joyqueue-common/joyqueue-network/pom.xml b/joyqueue-common/joyqueue-network/pom.xml index e0e27561a..94c167c0a 100644 --- a/joyqueue-common/joyqueue-network/pom.xml +++ b/joyqueue-common/joyqueue-network/pom.xml @@ -19,7 +19,7 @@ joyqueue-common org.joyqueue - 4.2.7.RC3 + 4.2.8-SNAPSHOT 4.0.0 diff --git a/joyqueue-common/joyqueue-security/pom.xml b/joyqueue-common/joyqueue-security/pom.xml index 85ac56a7d..13f49ddc3 100644 --- a/joyqueue-common/joyqueue-security/pom.xml +++ b/joyqueue-common/joyqueue-security/pom.xml @@ -20,7 +20,7 @@ joyqueue-common org.joyqueue - 4.2.7.RC3 + 4.2.8-SNAPSHOT 4.0.0 diff --git a/joyqueue-common/joyqueue-toolkit/pom.xml b/joyqueue-common/joyqueue-toolkit/pom.xml index 014dc6368..b32c0b4db 100644 --- a/joyqueue-common/joyqueue-toolkit/pom.xml +++ b/joyqueue-common/joyqueue-toolkit/pom.xml @@ -20,7 +20,7 @@ joyqueue-common org.joyqueue - 4.2.7.RC3 + 4.2.8-SNAPSHOT 4.0.0 diff --git a/joyqueue-common/pom.xml b/joyqueue-common/pom.xml index 899ad2769..a56eeef25 100644 --- a/joyqueue-common/pom.xml +++ b/joyqueue-common/pom.xml @@ -20,10 +20,10 @@ joyqueue org.joyqueue - 4.2.7.RC3 + 4.2.8-SNAPSHOT 4.0.0 - 4.2.7.RC3 + 4.2.8-SNAPSHOT joyqueue-common JoyQueue-Common diff --git a/joyqueue-console/joyqueue-data/joyqueue-data-model/pom.xml b/joyqueue-console/joyqueue-data/joyqueue-data-model/pom.xml index d95739912..678f04314 100644 --- a/joyqueue-console/joyqueue-data/joyqueue-data-model/pom.xml +++ b/joyqueue-console/joyqueue-data/joyqueue-data-model/pom.xml @@ -20,10 +20,10 @@ joyqueue-data org.joyqueue - 4.2.7.RC3 + 4.2.8-SNAPSHOT 4.0.0 - 4.2.7.RC3 + 4.2.8-SNAPSHOT joyqueue-data-model JoyQueue-Data-Model diff --git a/joyqueue-console/joyqueue-data/joyqueue-data-repository/joyqueue-data-repository-api/pom.xml b/joyqueue-console/joyqueue-data/joyqueue-data-repository/joyqueue-data-repository-api/pom.xml index 35ae2d142..da90443af 100644 --- a/joyqueue-console/joyqueue-data/joyqueue-data-repository/joyqueue-data-repository-api/pom.xml +++ b/joyqueue-console/joyqueue-data/joyqueue-data-repository/joyqueue-data-repository-api/pom.xml @@ -20,10 +20,10 @@ joyqueue-data-repository org.joyqueue - 4.2.7.RC3 + 4.2.8-SNAPSHOT 4.0.0 - 4.2.7.RC3 + 4.2.8-SNAPSHOT joyqueue-data-repository-api JoyQueue-Data-Repository-API diff --git a/joyqueue-console/joyqueue-data/joyqueue-data-repository/joyqueue-data-repository-mybatis/pom.xml b/joyqueue-console/joyqueue-data/joyqueue-data-repository/joyqueue-data-repository-mybatis/pom.xml index de82c40bf..19fb9fc67 100644 --- a/joyqueue-console/joyqueue-data/joyqueue-data-repository/joyqueue-data-repository-mybatis/pom.xml +++ b/joyqueue-console/joyqueue-data/joyqueue-data-repository/joyqueue-data-repository-mybatis/pom.xml @@ -20,7 +20,7 @@ joyqueue-data-repository org.joyqueue - 4.2.7.RC3 + 4.2.8-SNAPSHOT 4.0.0 diff --git a/joyqueue-console/joyqueue-data/joyqueue-data-repository/pom.xml b/joyqueue-console/joyqueue-data/joyqueue-data-repository/pom.xml index 1ae191bb8..83595b8da 100644 --- a/joyqueue-console/joyqueue-data/joyqueue-data-repository/pom.xml +++ b/joyqueue-console/joyqueue-data/joyqueue-data-repository/pom.xml @@ -20,10 +20,10 @@ joyqueue-data org.joyqueue - 4.2.7.RC3 + 4.2.8-SNAPSHOT 4.0.0 - 4.2.7.RC3 + 4.2.8-SNAPSHOT joyqueue-data-repository JoyQueue-Data-Repository diff --git a/joyqueue-console/joyqueue-data/joyqueue-data-service/pom.xml b/joyqueue-console/joyqueue-data/joyqueue-data-service/pom.xml index 5fd5c42ad..18c2b09a8 100644 --- a/joyqueue-console/joyqueue-data/joyqueue-data-service/pom.xml +++ b/joyqueue-console/joyqueue-data/joyqueue-data-service/pom.xml @@ -20,7 +20,7 @@ joyqueue-data org.joyqueue - 4.2.7.RC3 + 4.2.8-SNAPSHOT 4.0.0 diff --git a/joyqueue-console/joyqueue-data/joyqueue-token/joyqueue-token-api/pom.xml b/joyqueue-console/joyqueue-data/joyqueue-token/joyqueue-token-api/pom.xml index 646852b91..b02ccf7f0 100644 --- a/joyqueue-console/joyqueue-data/joyqueue-token/joyqueue-token-api/pom.xml +++ b/joyqueue-console/joyqueue-data/joyqueue-token/joyqueue-token-api/pom.xml @@ -20,10 +20,10 @@ joyqueue-token org.joyqueue - 4.2.7.RC3 + 4.2.8-SNAPSHOT 4.0.0 - 4.2.7.RC3 + 4.2.8-SNAPSHOT joyqueue-token-api JoyQueue-Token-API diff --git a/joyqueue-console/joyqueue-data/joyqueue-token/joyqueue-token-uuid-starter/pom.xml b/joyqueue-console/joyqueue-data/joyqueue-token/joyqueue-token-uuid-starter/pom.xml index 37be60ed3..996707bce 100644 --- a/joyqueue-console/joyqueue-data/joyqueue-token/joyqueue-token-uuid-starter/pom.xml +++ b/joyqueue-console/joyqueue-data/joyqueue-token/joyqueue-token-uuid-starter/pom.xml @@ -20,10 +20,10 @@ joyqueue-token org.joyqueue - 4.2.7.RC3 + 4.2.8-SNAPSHOT 4.0.0 - 4.2.7.RC3 + 4.2.8-SNAPSHOT joyqueue-token-uuid-starter JoyQueue-Token-UUID-Starter diff --git a/joyqueue-console/joyqueue-data/joyqueue-token/joyqueue-token-uuid/pom.xml b/joyqueue-console/joyqueue-data/joyqueue-token/joyqueue-token-uuid/pom.xml index 43a6c3521..92206f1d7 100644 --- a/joyqueue-console/joyqueue-data/joyqueue-token/joyqueue-token-uuid/pom.xml +++ b/joyqueue-console/joyqueue-data/joyqueue-token/joyqueue-token-uuid/pom.xml @@ -20,10 +20,10 @@ joyqueue-token org.joyqueue - 4.2.7.RC3 + 4.2.8-SNAPSHOT 4.0.0 - 4.2.7.RC3 + 4.2.8-SNAPSHOT joyqueue-token-uuid JoyQueue-Token-UUID diff --git a/joyqueue-console/joyqueue-data/joyqueue-token/pom.xml b/joyqueue-console/joyqueue-data/joyqueue-token/pom.xml index 5f4d23271..f5a5b703f 100644 --- a/joyqueue-console/joyqueue-data/joyqueue-token/pom.xml +++ b/joyqueue-console/joyqueue-data/joyqueue-token/pom.xml @@ -20,10 +20,10 @@ joyqueue-data org.joyqueue - 4.2.7.RC3 + 4.2.8-SNAPSHOT 4.0.0 - 4.2.7.RC3 + 4.2.8-SNAPSHOT joyqueue-token JoyQueue-Token diff --git a/joyqueue-console/joyqueue-data/pom.xml b/joyqueue-console/joyqueue-data/pom.xml index 165b6543b..70b3633a1 100644 --- a/joyqueue-console/joyqueue-data/pom.xml +++ b/joyqueue-console/joyqueue-data/pom.xml @@ -20,10 +20,10 @@ joyqueue-console org.joyqueue - 4.2.7.RC3 + 4.2.8-SNAPSHOT 4.0.0 - 4.2.7.RC3 + 4.2.8-SNAPSHOT joyqueue-data JoyQueue-Data diff --git a/joyqueue-console/joyqueue-message-filter/joyqueue-message-filter-api/pom.xml b/joyqueue-console/joyqueue-message-filter/joyqueue-message-filter-api/pom.xml index fe35169c2..7a8a02298 100644 --- a/joyqueue-console/joyqueue-message-filter/joyqueue-message-filter-api/pom.xml +++ b/joyqueue-console/joyqueue-message-filter/joyqueue-message-filter-api/pom.xml @@ -3,7 +3,7 @@ joyqueue-message-filter org.joyqueue - 4.2.7.RC3 + 4.2.8-SNAPSHOT 4.0.0 JoyQueue-Message-Filter-Api diff --git a/joyqueue-console/joyqueue-message-filter/joyqueue-message-filter-s3/pom.xml b/joyqueue-console/joyqueue-message-filter/joyqueue-message-filter-s3/pom.xml index 2da49f249..19486a22d 100644 --- a/joyqueue-console/joyqueue-message-filter/joyqueue-message-filter-s3/pom.xml +++ b/joyqueue-console/joyqueue-message-filter/joyqueue-message-filter-s3/pom.xml @@ -3,7 +3,7 @@ joyqueue-message-filter org.joyqueue - 4.2.7.RC3 + 4.2.8-SNAPSHOT 4.0.0 JoyQueue-Message-Filter-S3 diff --git a/joyqueue-console/joyqueue-message-filter/pom.xml b/joyqueue-console/joyqueue-message-filter/pom.xml index 363e806b6..3ef9cc88b 100644 --- a/joyqueue-console/joyqueue-message-filter/pom.xml +++ b/joyqueue-console/joyqueue-message-filter/pom.xml @@ -3,7 +3,7 @@ joyqueue-console org.joyqueue - 4.2.7.RC3 + 4.2.8-SNAPSHOT 4.0.0 joyqueue-message-filter diff --git a/joyqueue-console/joyqueue-portal/pom.xml b/joyqueue-console/joyqueue-portal/pom.xml index 314c87df6..513efd366 100644 --- a/joyqueue-console/joyqueue-portal/pom.xml +++ b/joyqueue-console/joyqueue-portal/pom.xml @@ -20,7 +20,7 @@ joyqueue-console org.joyqueue - 4.2.7.RC3 + 4.2.8-SNAPSHOT 4.0.0 diff --git a/joyqueue-console/joyqueue-web/joyqueue-web-application/pom.xml b/joyqueue-console/joyqueue-web/joyqueue-web-application/pom.xml index 774afa31d..8fd14d1d7 100644 --- a/joyqueue-console/joyqueue-web/joyqueue-web-application/pom.xml +++ b/joyqueue-console/joyqueue-web/joyqueue-web-application/pom.xml @@ -20,10 +20,10 @@ joyqueue-web org.joyqueue - 4.2.7.RC3 + 4.2.8-SNAPSHOT 4.0.0 - 4.2.7.RC3 + 4.2.8-SNAPSHOT joyqueue-web-application diff --git a/joyqueue-console/joyqueue-web/joyqueue-web-handler/pom.xml b/joyqueue-console/joyqueue-web/joyqueue-web-handler/pom.xml index d83203863..3500ee037 100644 --- a/joyqueue-console/joyqueue-web/joyqueue-web-handler/pom.xml +++ b/joyqueue-console/joyqueue-web/joyqueue-web-handler/pom.xml @@ -20,10 +20,10 @@ joyqueue-web org.joyqueue - 4.2.7.RC3 + 4.2.8-SNAPSHOT 4.0.0 - 4.2.7.RC3 + 4.2.8-SNAPSHOT joyqueue-web-handler JoyQueue-Web-Handler diff --git a/joyqueue-console/joyqueue-web/joyqueue-web-springboot-starter/pom.xml b/joyqueue-console/joyqueue-web/joyqueue-web-springboot-starter/pom.xml index fafbb9de0..3041daceb 100644 --- a/joyqueue-console/joyqueue-web/joyqueue-web-springboot-starter/pom.xml +++ b/joyqueue-console/joyqueue-web/joyqueue-web-springboot-starter/pom.xml @@ -20,10 +20,10 @@ joyqueue-web org.joyqueue - 4.2.7.RC3 + 4.2.8-SNAPSHOT 4.0.0 - 4.2.7.RC3 + 4.2.8-SNAPSHOT joyqueue-web-springboot-starter JoyQueue-Web-SpringBoot-Starter diff --git a/joyqueue-console/joyqueue-web/pom.xml b/joyqueue-console/joyqueue-web/pom.xml index b34adb947..c7abbbbfa 100644 --- a/joyqueue-console/joyqueue-web/pom.xml +++ b/joyqueue-console/joyqueue-web/pom.xml @@ -20,10 +20,10 @@ joyqueue-console org.joyqueue - 4.2.7.RC3 + 4.2.8-SNAPSHOT 4.0.0 - 4.2.7.RC3 + 4.2.8-SNAPSHOT joyqueue-web JoyQueue-Web A Web-based administration console for JoyQueue diff --git a/joyqueue-console/pom.xml b/joyqueue-console/pom.xml index 7d2055fb0..b523a6c07 100644 --- a/joyqueue-console/pom.xml +++ b/joyqueue-console/pom.xml @@ -20,10 +20,10 @@ joyqueue org.joyqueue - 4.2.7.RC3 + 4.2.8-SNAPSHOT 4.0.0 - 4.2.7.RC3 + 4.2.8-SNAPSHOT pom joyqueue-console JoyQueue-Console diff --git a/joyqueue-distribution/joyqueue-distribution-server/pom.xml b/joyqueue-distribution/joyqueue-distribution-server/pom.xml index 745c83cc7..a4449cda5 100644 --- a/joyqueue-distribution/joyqueue-distribution-server/pom.xml +++ b/joyqueue-distribution/joyqueue-distribution-server/pom.xml @@ -20,7 +20,7 @@ joyqueue-distribution org.joyqueue - 4.2.7.RC3 + 4.2.8-SNAPSHOT 4.0.0 diff --git a/joyqueue-distribution/joyqueue-distribution-web/pom.xml b/joyqueue-distribution/joyqueue-distribution-web/pom.xml index bf468c04b..9d4a13c51 100644 --- a/joyqueue-distribution/joyqueue-distribution-web/pom.xml +++ b/joyqueue-distribution/joyqueue-distribution-web/pom.xml @@ -20,7 +20,7 @@ joyqueue-distribution org.joyqueue - 4.2.7.RC3 + 4.2.8-SNAPSHOT 4.0.0 diff --git a/joyqueue-distribution/pom.xml b/joyqueue-distribution/pom.xml index af3b93045..8109f8f14 100644 --- a/joyqueue-distribution/pom.xml +++ b/joyqueue-distribution/pom.xml @@ -20,7 +20,7 @@ joyqueue org.joyqueue - 4.2.7.RC3 + 4.2.8-SNAPSHOT 4.0.0 pom diff --git a/joyqueue-openmessaging/openmessaging-samples/pom.xml b/joyqueue-openmessaging/openmessaging-samples/pom.xml index 7e4ceccdc..bf5890933 100644 --- a/joyqueue-openmessaging/openmessaging-samples/pom.xml +++ b/joyqueue-openmessaging/openmessaging-samples/pom.xml @@ -20,7 +20,7 @@ joyqueue-openmessaging org.joyqueue - 4.2.7.RC3 + 4.2.8-SNAPSHOT 4.0.0 diff --git a/joyqueue-openmessaging/openmessaging-spring-boot/openmessaging-spring-boot-autoconfigure/pom.xml b/joyqueue-openmessaging/openmessaging-spring-boot/openmessaging-spring-boot-autoconfigure/pom.xml index b3bce2a0f..2f61e980c 100644 --- a/joyqueue-openmessaging/openmessaging-spring-boot/openmessaging-spring-boot-autoconfigure/pom.xml +++ b/joyqueue-openmessaging/openmessaging-spring-boot/openmessaging-spring-boot-autoconfigure/pom.xml @@ -20,7 +20,7 @@ openmessaging-spring-boot org.joyqueue - 4.2.7.RC3 + 4.2.8-SNAPSHOT 4.0.0 diff --git a/joyqueue-openmessaging/openmessaging-spring-boot/openmessaging-spring-boot-starter/pom.xml b/joyqueue-openmessaging/openmessaging-spring-boot/openmessaging-spring-boot-starter/pom.xml index c1e5e0e6c..93e85da8b 100644 --- a/joyqueue-openmessaging/openmessaging-spring-boot/openmessaging-spring-boot-starter/pom.xml +++ b/joyqueue-openmessaging/openmessaging-spring-boot/openmessaging-spring-boot-starter/pom.xml @@ -20,7 +20,7 @@ openmessaging-spring-boot org.joyqueue - 4.2.7.RC3 + 4.2.8-SNAPSHOT 4.0.0 diff --git a/joyqueue-openmessaging/openmessaging-spring-boot/pom.xml b/joyqueue-openmessaging/openmessaging-spring-boot/pom.xml index 1ef46ac38..26985d7da 100644 --- a/joyqueue-openmessaging/openmessaging-spring-boot/pom.xml +++ b/joyqueue-openmessaging/openmessaging-spring-boot/pom.xml @@ -20,7 +20,7 @@ joyqueue-openmessaging org.joyqueue - 4.2.7.RC3 + 4.2.8-SNAPSHOT 4.0.0 diff --git a/joyqueue-openmessaging/openmessaging-spring/pom.xml b/joyqueue-openmessaging/openmessaging-spring/pom.xml index c14ec2878..e77d17dfa 100644 --- a/joyqueue-openmessaging/openmessaging-spring/pom.xml +++ b/joyqueue-openmessaging/openmessaging-spring/pom.xml @@ -20,7 +20,7 @@ joyqueue-openmessaging org.joyqueue - 4.2.7.RC3 + 4.2.8-SNAPSHOT 4.0.0 diff --git a/joyqueue-openmessaging/pom.xml b/joyqueue-openmessaging/pom.xml index 997b839ab..df77aa275 100644 --- a/joyqueue-openmessaging/pom.xml +++ b/joyqueue-openmessaging/pom.xml @@ -20,7 +20,7 @@ joyqueue org.joyqueue - 4.2.7.RC3 + 4.2.8-SNAPSHOT 4.0.0 diff --git a/joyqueue-server/joyqueue-archive/joyqueue-archive-api/pom.xml b/joyqueue-server/joyqueue-archive/joyqueue-archive-api/pom.xml index f953030de..3d7ccd71e 100644 --- a/joyqueue-server/joyqueue-archive/joyqueue-archive-api/pom.xml +++ b/joyqueue-server/joyqueue-archive/joyqueue-archive-api/pom.xml @@ -20,7 +20,7 @@ joyqueue-archive org.joyqueue - 4.2.7.RC3 + 4.2.8-SNAPSHOT 4.0.0 diff --git a/joyqueue-server/joyqueue-archive/joyqueue-archive-hbase/pom.xml b/joyqueue-server/joyqueue-archive/joyqueue-archive-hbase/pom.xml index 3792ec4df..dc387f2f3 100644 --- a/joyqueue-server/joyqueue-archive/joyqueue-archive-hbase/pom.xml +++ b/joyqueue-server/joyqueue-archive/joyqueue-archive-hbase/pom.xml @@ -20,7 +20,7 @@ joyqueue-archive org.joyqueue - 4.2.7.RC3 + 4.2.8-SNAPSHOT 4.0.0 diff --git a/joyqueue-server/joyqueue-archive/pom.xml b/joyqueue-server/joyqueue-archive/pom.xml index 53689e64c..49e4f3f31 100644 --- a/joyqueue-server/joyqueue-archive/pom.xml +++ b/joyqueue-server/joyqueue-archive/pom.xml @@ -20,7 +20,7 @@ joyqueue-server org.joyqueue - 4.2.7.RC3 + 4.2.8-SNAPSHOT 4.0.0 diff --git a/joyqueue-server/joyqueue-broker-core/pom.xml b/joyqueue-server/joyqueue-broker-core/pom.xml index 6fb830924..b7ad61cb0 100644 --- a/joyqueue-server/joyqueue-broker-core/pom.xml +++ b/joyqueue-server/joyqueue-broker-core/pom.xml @@ -20,14 +20,14 @@ joyqueue-server org.joyqueue - 4.2.7.RC3 + 4.2.8-SNAPSHOT 4.0.0 joyqueue-broker-core JoyQueue-Broker-Core Broker core library - 4.2.7.RC3 + 4.2.8-SNAPSHOT @@ -106,7 +106,7 @@ org.joyqueue joyqueue-store-core - 4.2.7.RC3 + 4.2.8-SNAPSHOT test diff --git a/joyqueue-server/joyqueue-broker-core/src/main/java/org/joyqueue/broker/limit/config/LimitConfig.java b/joyqueue-server/joyqueue-broker-core/src/main/java/org/joyqueue/broker/limit/config/LimitConfig.java index 1d2045386..2a04414e1 100644 --- a/joyqueue-server/joyqueue-broker-core/src/main/java/org/joyqueue/broker/limit/config/LimitConfig.java +++ b/joyqueue-server/joyqueue-broker-core/src/main/java/org/joyqueue/broker/limit/config/LimitConfig.java @@ -49,6 +49,10 @@ public int getMinDelay() { return propertySupplier.getValue(LimitConfigKey.MIN_DELAY); } + public int getConflictDelay() { + return propertySupplier.getValue(LimitConfigKey.CONFLICT_DELAY); + } + public String getRejectedStrategy() { return propertySupplier.getValue(LimitConfigKey.REJECTED_STRATEGY); } diff --git a/joyqueue-server/joyqueue-broker-core/src/main/java/org/joyqueue/broker/limit/config/LimitConfigKey.java b/joyqueue-server/joyqueue-broker-core/src/main/java/org/joyqueue/broker/limit/config/LimitConfigKey.java index ab5ddc826..d6c2036bc 100644 --- a/joyqueue-server/joyqueue-broker-core/src/main/java/org/joyqueue/broker/limit/config/LimitConfigKey.java +++ b/joyqueue-server/joyqueue-broker-core/src/main/java/org/joyqueue/broker/limit/config/LimitConfigKey.java @@ -36,6 +36,8 @@ public enum LimitConfigKey implements PropertyDef { MAX_DELAY("limit.delay.max", 1000, PropertyDef.Type.INT), // 最小延时 MIN_DELAY("limit.delay.min", 100, PropertyDef.Type.INT), + // 冲突延迟 + CONFLICT_DELAY("limit.conflict.delay", 0, PropertyDef.Type.INT), // 拒绝策略 REJECTED_STRATEGY("limit.rejected.strategy", "delay", PropertyDef.Type.STRING), diff --git a/joyqueue-server/joyqueue-broker-core/src/main/java/org/joyqueue/broker/limit/filter/LimitFilter.java b/joyqueue-server/joyqueue-broker-core/src/main/java/org/joyqueue/broker/limit/filter/LimitFilter.java index 99c1dc021..894e7fcbf 100644 --- a/joyqueue-server/joyqueue-broker-core/src/main/java/org/joyqueue/broker/limit/filter/LimitFilter.java +++ b/joyqueue-server/joyqueue-broker-core/src/main/java/org/joyqueue/broker/limit/filter/LimitFilter.java @@ -96,7 +96,7 @@ protected Command doLimit(Transport transport, Command request, Command response protected int getDelay(Transport transport, Command request, Command response, boolean isRequired) { if (!isRequired) { - return config.getMinDelay(); + return config.getConflictDelay(); } int delay = config.getDelay(); if (delay == LimitConfig.DELAY_DYNAMIC) { diff --git a/joyqueue-server/joyqueue-broker-core/src/main/java/org/joyqueue/broker/limit/support/DefaultRateLimiter.java b/joyqueue-server/joyqueue-broker-core/src/main/java/org/joyqueue/broker/limit/support/DefaultRateLimiter.java index 176056ef5..3416c9d2f 100644 --- a/joyqueue-server/joyqueue-broker-core/src/main/java/org/joyqueue/broker/limit/support/DefaultRateLimiter.java +++ b/joyqueue-server/joyqueue-broker-core/src/main/java/org/joyqueue/broker/limit/support/DefaultRateLimiter.java @@ -77,4 +77,12 @@ public boolean releaseRequire() { semaphore.release(); return true; } + + public int getTps() { + return tps; + } + + public int getTraffic() { + return traffic; + } } \ No newline at end of file diff --git a/joyqueue-server/joyqueue-broker-kafka/pom.xml b/joyqueue-server/joyqueue-broker-kafka/pom.xml index 074a990f7..9d0fc09f5 100644 --- a/joyqueue-server/joyqueue-broker-kafka/pom.xml +++ b/joyqueue-server/joyqueue-broker-kafka/pom.xml @@ -20,7 +20,7 @@ joyqueue-server org.joyqueue - 4.2.7.RC3 + 4.2.8-SNAPSHOT 4.0.0 diff --git a/joyqueue-server/joyqueue-broker-monitor-pth/pom.xml b/joyqueue-server/joyqueue-broker-monitor-pth/pom.xml index eaf7ab08b..50369b768 100644 --- a/joyqueue-server/joyqueue-broker-monitor-pth/pom.xml +++ b/joyqueue-server/joyqueue-broker-monitor-pth/pom.xml @@ -20,7 +20,7 @@ joyqueue-server org.joyqueue - 4.2.7.RC3 + 4.2.8-SNAPSHOT 4.0.0 diff --git a/joyqueue-server/joyqueue-broker-mqtt/pom.xml b/joyqueue-server/joyqueue-broker-mqtt/pom.xml index 55ec8328c..648dcb273 100644 --- a/joyqueue-server/joyqueue-broker-mqtt/pom.xml +++ b/joyqueue-server/joyqueue-broker-mqtt/pom.xml @@ -20,7 +20,7 @@ joyqueue-server org.joyqueue - 4.2.7.RC3 + 4.2.8-SNAPSHOT 4.0.0 diff --git a/joyqueue-server/joyqueue-broker-protocol/pom.xml b/joyqueue-server/joyqueue-broker-protocol/pom.xml index 60de01321..45d367989 100644 --- a/joyqueue-server/joyqueue-broker-protocol/pom.xml +++ b/joyqueue-server/joyqueue-broker-protocol/pom.xml @@ -20,7 +20,7 @@ joyqueue-server org.joyqueue - 4.2.7.RC3 + 4.2.8-SNAPSHOT 4.0.0 @@ -28,7 +28,7 @@ JoyQueue-Broker-Protocol JoyQueue protocol support library - 4.2.7.RC3 + 4.2.8-SNAPSHOT diff --git a/joyqueue-server/joyqueue-nsr/joyqueue-nsr-admin/pom.xml b/joyqueue-server/joyqueue-nsr/joyqueue-nsr-admin/pom.xml index 4c5aac223..f6399dfa5 100644 --- a/joyqueue-server/joyqueue-nsr/joyqueue-nsr-admin/pom.xml +++ b/joyqueue-server/joyqueue-nsr/joyqueue-nsr-admin/pom.xml @@ -21,7 +21,7 @@ joyqueue-nsr org.joyqueue - 4.2.7.RC3 + 4.2.8-SNAPSHOT joyqueue-nsr-admin JoyQueue-NamingService-Admin diff --git a/joyqueue-server/joyqueue-nsr/joyqueue-nsr-composition/pom.xml b/joyqueue-server/joyqueue-nsr/joyqueue-nsr-composition/pom.xml index eb6bb7a3b..77fca1471 100644 --- a/joyqueue-server/joyqueue-nsr/joyqueue-nsr-composition/pom.xml +++ b/joyqueue-server/joyqueue-nsr/joyqueue-nsr-composition/pom.xml @@ -20,7 +20,7 @@ joyqueue-nsr org.joyqueue - 4.2.7.RC3 + 4.2.8-SNAPSHOT 4.0.0 diff --git a/joyqueue-server/joyqueue-nsr/joyqueue-nsr-core/pom.xml b/joyqueue-server/joyqueue-nsr/joyqueue-nsr-core/pom.xml index 8e122cb31..f7734c73c 100644 --- a/joyqueue-server/joyqueue-nsr/joyqueue-nsr-core/pom.xml +++ b/joyqueue-server/joyqueue-nsr/joyqueue-nsr-core/pom.xml @@ -20,7 +20,7 @@ joyqueue-nsr org.joyqueue - 4.2.7.RC3 + 4.2.8-SNAPSHOT 4.0.0 diff --git a/joyqueue-server/joyqueue-nsr/joyqueue-nsr-ignite/pom.xml b/joyqueue-server/joyqueue-nsr/joyqueue-nsr-ignite/pom.xml index d780d503b..c30f2d198 100644 --- a/joyqueue-server/joyqueue-nsr/joyqueue-nsr-ignite/pom.xml +++ b/joyqueue-server/joyqueue-nsr/joyqueue-nsr-ignite/pom.xml @@ -20,7 +20,7 @@ joyqueue-nsr org.joyqueue - 4.2.7.RC3 + 4.2.8-SNAPSHOT 4.0.0 diff --git a/joyqueue-server/joyqueue-nsr/joyqueue-nsr-journalkeeper/pom.xml b/joyqueue-server/joyqueue-nsr/joyqueue-nsr-journalkeeper/pom.xml index 73ada48a7..bb6a7df09 100644 --- a/joyqueue-server/joyqueue-nsr/joyqueue-nsr-journalkeeper/pom.xml +++ b/joyqueue-server/joyqueue-nsr/joyqueue-nsr-journalkeeper/pom.xml @@ -20,7 +20,7 @@ joyqueue-nsr org.joyqueue - 4.2.7.RC3 + 4.2.8-SNAPSHOT 4.0.0 diff --git a/joyqueue-server/joyqueue-nsr/joyqueue-nsr-sql/pom.xml b/joyqueue-server/joyqueue-nsr/joyqueue-nsr-sql/pom.xml index 1542669ec..076992e47 100644 --- a/joyqueue-server/joyqueue-nsr/joyqueue-nsr-sql/pom.xml +++ b/joyqueue-server/joyqueue-nsr/joyqueue-nsr-sql/pom.xml @@ -1,11 +1,9 @@ - + joyqueue-nsr org.joyqueue - 4.2.7.RC3 + 4.2.8-SNAPSHOT 4.0.0 diff --git a/joyqueue-server/joyqueue-nsr/pom.xml b/joyqueue-server/joyqueue-nsr/pom.xml index 221c4512c..bf0545978 100644 --- a/joyqueue-server/joyqueue-nsr/pom.xml +++ b/joyqueue-server/joyqueue-nsr/pom.xml @@ -20,7 +20,7 @@ joyqueue-server org.joyqueue - 4.2.7.RC3 + 4.2.8-SNAPSHOT 4.0.0 diff --git a/joyqueue-server/joyqueue-retry/joyqueue-retry-api/pom.xml b/joyqueue-server/joyqueue-retry/joyqueue-retry-api/pom.xml index d66e7e1e4..574a5b634 100644 --- a/joyqueue-server/joyqueue-retry/joyqueue-retry-api/pom.xml +++ b/joyqueue-server/joyqueue-retry/joyqueue-retry-api/pom.xml @@ -20,7 +20,7 @@ joyqueue-retry org.joyqueue - 4.2.7.RC3 + 4.2.8-SNAPSHOT 4.0.0 diff --git a/joyqueue-server/joyqueue-retry/joyqueue-retry-db-console/pom.xml b/joyqueue-server/joyqueue-retry/joyqueue-retry-db-console/pom.xml index 221984fd4..4b79591c3 100644 --- a/joyqueue-server/joyqueue-retry/joyqueue-retry-db-console/pom.xml +++ b/joyqueue-server/joyqueue-retry/joyqueue-retry-db-console/pom.xml @@ -20,7 +20,7 @@ joyqueue-retry org.joyqueue - 4.2.7.RC3 + 4.2.8-SNAPSHOT 4.0.0 @@ -32,12 +32,12 @@ org.joyqueue joyqueue-retry-api - 4.2.7.RC3 + 4.2.8-SNAPSHOT org.joyqueue joyqueue-retry-db - 4.2.7.RC3 + 4.2.8-SNAPSHOT diff --git a/joyqueue-server/joyqueue-retry/joyqueue-retry-db/pom.xml b/joyqueue-server/joyqueue-retry/joyqueue-retry-db/pom.xml index f275cc4b4..ed8a63652 100644 --- a/joyqueue-server/joyqueue-retry/joyqueue-retry-db/pom.xml +++ b/joyqueue-server/joyqueue-retry/joyqueue-retry-db/pom.xml @@ -20,7 +20,7 @@ joyqueue-retry org.joyqueue - 4.2.7.RC3 + 4.2.8-SNAPSHOT 4.0.0 diff --git a/joyqueue-server/joyqueue-retry/joyqueue-retry-h2/pom.xml b/joyqueue-server/joyqueue-retry/joyqueue-retry-h2/pom.xml index 267f7bd4d..38a1c018b 100644 --- a/joyqueue-server/joyqueue-retry/joyqueue-retry-h2/pom.xml +++ b/joyqueue-server/joyqueue-retry/joyqueue-retry-h2/pom.xml @@ -20,7 +20,7 @@ joyqueue-retry org.joyqueue - 4.2.7.RC3 + 4.2.8-SNAPSHOT 4.0.0 diff --git a/joyqueue-server/joyqueue-retry/joyqueue-retry-remote/pom.xml b/joyqueue-server/joyqueue-retry/joyqueue-retry-remote/pom.xml index 16dd74647..cad6452cb 100644 --- a/joyqueue-server/joyqueue-retry/joyqueue-retry-remote/pom.xml +++ b/joyqueue-server/joyqueue-retry/joyqueue-retry-remote/pom.xml @@ -20,7 +20,7 @@ joyqueue-retry org.joyqueue - 4.2.7.RC3 + 4.2.8-SNAPSHOT 4.0.0 diff --git a/joyqueue-server/joyqueue-retry/pom.xml b/joyqueue-server/joyqueue-retry/pom.xml index b2cc0a511..d22976519 100644 --- a/joyqueue-server/joyqueue-retry/pom.xml +++ b/joyqueue-server/joyqueue-retry/pom.xml @@ -20,7 +20,7 @@ joyqueue-server org.joyqueue - 4.2.7.RC3 + 4.2.8-SNAPSHOT 4.0.0 diff --git a/joyqueue-server/joyqueue-server-runtime/pom.xml b/joyqueue-server/joyqueue-server-runtime/pom.xml index bfb66ca8a..cf3bc61c4 100644 --- a/joyqueue-server/joyqueue-server-runtime/pom.xml +++ b/joyqueue-server/joyqueue-server-runtime/pom.xml @@ -20,7 +20,7 @@ joyqueue-server org.joyqueue - 4.2.7.RC3 + 4.2.8-SNAPSHOT 4.0.0 diff --git a/joyqueue-server/joyqueue-store/joyqueue-store-api/pom.xml b/joyqueue-server/joyqueue-store/joyqueue-store-api/pom.xml index 00c495dea..64c5629a1 100644 --- a/joyqueue-server/joyqueue-store/joyqueue-store-api/pom.xml +++ b/joyqueue-server/joyqueue-store/joyqueue-store-api/pom.xml @@ -20,7 +20,7 @@ joyqueue-store org.joyqueue - 4.2.7.RC3 + 4.2.8-SNAPSHOT 4.0.0 diff --git a/joyqueue-server/joyqueue-store/joyqueue-store-core/pom.xml b/joyqueue-server/joyqueue-store/joyqueue-store-core/pom.xml index a9bebdb46..63e25949b 100644 --- a/joyqueue-server/joyqueue-store/joyqueue-store-core/pom.xml +++ b/joyqueue-server/joyqueue-store/joyqueue-store-core/pom.xml @@ -20,7 +20,7 @@ joyqueue-store org.joyqueue - 4.2.7.RC3 + 4.2.8-SNAPSHOT 4.0.0 diff --git a/joyqueue-server/joyqueue-store/pom.xml b/joyqueue-server/joyqueue-store/pom.xml index c7cf0f8a5..975428b05 100644 --- a/joyqueue-server/joyqueue-store/pom.xml +++ b/joyqueue-server/joyqueue-store/pom.xml @@ -20,7 +20,7 @@ joyqueue-server org.joyqueue - 4.2.7.RC3 + 4.2.8-SNAPSHOT 4.0.0 JoyQueue-Store diff --git a/joyqueue-server/pom.xml b/joyqueue-server/pom.xml index ed3b2fa7c..f77afc3cb 100644 --- a/joyqueue-server/pom.xml +++ b/joyqueue-server/pom.xml @@ -20,7 +20,7 @@ joyqueue org.joyqueue - 4.2.7.RC3 + 4.2.8-SNAPSHOT 4.0.0 diff --git a/pom.xml b/pom.xml index c00747862..ba3546c0a 100644 --- a/pom.xml +++ b/pom.xml @@ -19,7 +19,7 @@ 4.0.0 org.joyqueue - 4.2.7.RC3 + 4.2.8-SNAPSHOT joyqueue pom http://www.joyqueue.org diff --git a/toolkit/doc/pom.xml b/toolkit/doc/pom.xml index 078625559..05c1150b3 100644 --- a/toolkit/doc/pom.xml +++ b/toolkit/doc/pom.xml @@ -20,7 +20,7 @@ toolkit org.joyqueue - 4.2.7.RC3 + 4.2.8-SNAPSHOT 4.0.0 diff --git a/toolkit/pom.xml b/toolkit/pom.xml index 877424c79..2c01363cd 100644 --- a/toolkit/pom.xml +++ b/toolkit/pom.xml @@ -20,7 +20,7 @@ joyqueue org.joyqueue - 4.2.7.RC3 + 4.2.8-SNAPSHOT 4.0.0