Merge branch 'master' of https://github.com/chubaostream/joyqueue

jd-opensource · Sep 25, 2020 · afedf81 · afedf81
2 parents 73e1c4f + 2db5fea
commit afedf81
Show file tree

Hide file tree

Showing 91 changed files with 192 additions and 112 deletions.
diff --git a/docker/pom.xml b/docker/pom.xml
@@ -19,7 +19,7 @@
     <parent>
         <artifactId>joyqueue</artifactId>
         <groupId>org.joyqueue</groupId>
-        <version>4.2.7.RC3</version>
+        <version>4.2.8-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <artifactId>joyqueue-docker</artifactId>

diff --git a/docker/server/pom.xml b/docker/server/pom.xml
@@ -20,7 +20,7 @@
     <parent>
         <artifactId>joyqueue-docker</artifactId>
         <groupId>org.joyqueue</groupId>
-        <version>4.2.7.RC3</version>
+        <version>4.2.8-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <artifactId>docker-server</artifactId>

diff --git a/docker/web/pom.xml b/docker/web/pom.xml
@@ -20,7 +20,7 @@
     <parent>
         <artifactId>joyqueue-docker</artifactId>
         <groupId>org.joyqueue</groupId>
-        <version>4.2.7.RC3</version>
+        <version>4.2.8-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <artifactId>docker-web</artifactId>

diff --git a/joyqueue-client/joyqueue-client-all-shaded/pom.xml b/joyqueue-client/joyqueue-client-all-shaded/pom.xml
@@ -20,7 +20,7 @@
     <parent>
         <artifactId>joyqueue-client</artifactId>
         <groupId>org.joyqueue</groupId>
-        <version>4.2.7.RC3</version>
+        <version>4.2.8-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

diff --git a/joyqueue-client/joyqueue-client-all/pom.xml b/joyqueue-client/joyqueue-client-all/pom.xml
@@ -20,7 +20,7 @@
     <parent>
         <artifactId>joyqueue-client</artifactId>
         <groupId>org.joyqueue</groupId>
-        <version>4.2.7.RC3</version>
+        <version>4.2.8-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

diff --git a/joyqueue-client/joyqueue-client-core-shaded/pom.xml b/joyqueue-client/joyqueue-client-core-shaded/pom.xml
@@ -20,7 +20,7 @@
     <parent>
         <artifactId>joyqueue-client</artifactId>
         <groupId>org.joyqueue</groupId>
-        <version>4.2.7.RC3</version>
+        <version>4.2.8-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

diff --git a/joyqueue-client/joyqueue-client-core/pom.xml b/joyqueue-client/joyqueue-client-core/pom.xml
@@ -20,7 +20,7 @@
     <parent>
         <artifactId>joyqueue-client</artifactId>
         <groupId>org.joyqueue</groupId>
-        <version>4.2.7.RC3</version>
+        <version>4.2.8-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

diff --git a/...rc/main/java/org/joyqueue/client/internal/producer/support/AdaptivePartitionSelector.java b/...rc/main/java/org/joyqueue/client/internal/producer/support/AdaptivePartitionSelector.java
@@ -55,13 +55,14 @@ protected Nodes getTopicNodes(TopicMetadata topicMetadata, List<BrokerNode> 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<Node> cacheNodeList = Lists.newArrayListWithCapacity(brokerNodes.size());
+        List<Node> 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<BrokerNode> 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
@@ -20,7 +20,7 @@
     <parent>
         <artifactId>joyqueue-client</artifactId>
         <groupId>org.joyqueue</groupId>
-        <version>4.2.7.RC3</version>
+        <version>4.2.8-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

diff --git a/joyqueue-client/joyqueue-client-loadbalance-adaptive/pom.xml b/joyqueue-client/joyqueue-client-loadbalance-adaptive/pom.xml
@@ -1,11 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0"
-         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
     <parent>
         <artifactId>joyqueue-client</artifactId>
         <groupId>org.joyqueue</groupId>
-        <version>4.2.7.RC3</version>
+        <version>4.2.8-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
@@ -17,6 +15,10 @@
             <groupId>io.dropwizard.metrics</groupId>
             <artifactId>metrics-core</artifactId>
         </dependency>
+        <dependency>
+            <groupId>com.google.guava</groupId>
+            <artifactId>guava</artifactId>
+        </dependency>
 
         <dependency>
             <groupId>junit</groupId>

diff --git a/...-adaptive/src/main/java/org/joyqueue/client/loadbalance/adaptive/AdaptiveLoadBalance.java b/...-adaptive/src/main/java/org/joyqueue/client/loadbalance/adaptive/AdaptiveLoadBalance.java
@@ -1,12 +1,16 @@
 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;
 import org.joyqueue.client.loadbalance.adaptive.node.WeightNode;
 
 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<String, Node> selectCache;
+
     public AdaptiveLoadBalance(AdaptiveLoadBalanceConfig config) {
         this.config = config;
         this.scoreJudges = getScoreJudges(config);
+        this.selectCache = CacheBuilder.newBuilder()
+                .expireAfterWrite(config.getComputeInterval(), TimeUnit.MILLISECONDS)
+                .build();
     }
 
     protected List<ScoreJudge> 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<WeightNode> weightNodes = new ArrayList<>(nodes.getNodes().size());
         for (Node node : nodes.getNodes()) {
             double score = 0;

diff --git a/.../main/java/org/joyqueue/client/loadbalance/adaptive/config/AdaptiveLoadBalanceConfig.java b/.../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;
+    }
 }
diff --git a/...oadbalance-adaptive/src/main/java/org/joyqueue/client/loadbalance/adaptive/node/Node.java b/...oadbalance-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 +
+                '}';
+    }
 }
diff --git a/...adbalance-adaptive/src/main/java/org/joyqueue/client/loadbalance/adaptive/node/Nodes.java b/...adbalance-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<Node> nodes;
+    private Object attachment;
 
     public Nodes() {
     }
@@ -34,4 +35,20 @@ public void setNodes(List<Node> nodes) {
     public List<Node> 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 +
+                '}';
+    }
 }
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
@@ -20,7 +20,7 @@
     <parent>
         <artifactId>joyqueue-client-samples</artifactId>
         <groupId>org.joyqueue</groupId>
-        <version>4.2.7.RC3</version>
+        <version>4.2.8-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

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
@@ -20,7 +20,7 @@
     <parent>
         <artifactId>joyqueue-client-samples</artifactId>
         <groupId>org.joyqueue</groupId>
-        <version>4.2.7.RC3</version>
+        <version>4.2.8-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

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
@@ -20,7 +20,7 @@
     <parent>
         <artifactId>joyqueue-client-samples</artifactId>
         <groupId>org.joyqueue</groupId>
-        <version>4.2.7.RC3</version>
+        <version>4.2.8-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

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
@@ -20,7 +20,7 @@
     <parent>
         <artifactId>joyqueue-client-samples</artifactId>
         <groupId>org.joyqueue</groupId>
-        <version>4.2.7.RC3</version>
+        <version>4.2.8-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

diff --git a/joyqueue-client/joyqueue-client-samples/pom.xml b/joyqueue-client/joyqueue-client-samples/pom.xml
@@ -20,7 +20,7 @@
     <parent>
         <artifactId>joyqueue-client</artifactId>
         <groupId>org.joyqueue</groupId>
-        <version>4.2.7.RC3</version>
+        <version>4.2.8-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

diff --git a/joyqueue-client/pom.xml b/joyqueue-client/pom.xml
@@ -20,7 +20,7 @@
     <parent>
         <artifactId>joyqueue</artifactId>
         <groupId>org.joyqueue</groupId>
-        <version>4.2.7.RC3</version>
+        <version>4.2.8-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

diff --git a/joyqueue-common/joyqueue-datasource/joyqueue-datasource-api/pom.xml b/joyqueue-common/joyqueue-datasource/joyqueue-datasource-api/pom.xml
@@ -20,7 +20,7 @@
     <parent>
         <artifactId>joyqueue-datasource</artifactId>
         <groupId>org.joyqueue</groupId>
-        <version>4.2.7.RC3</version>
+        <version>4.2.8-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

diff --git a/joyqueue-common/joyqueue-datasource/joyqueue-datasource-hikaricp/pom.xml b/joyqueue-common/joyqueue-datasource/joyqueue-datasource-hikaricp/pom.xml
@@ -20,7 +20,7 @@
     <parent>
         <artifactId>joyqueue-datasource</artifactId>
         <groupId>org.joyqueue</groupId>
-        <version>4.2.7.RC3</version>
+        <version>4.2.8-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

diff --git a/joyqueue-common/joyqueue-datasource/pom.xml b/joyqueue-common/joyqueue-datasource/pom.xml
@@ -20,7 +20,7 @@
     <parent>
         <artifactId>joyqueue-common</artifactId>
         <groupId>org.joyqueue</groupId>
-        <version>4.2.7.RC3</version>
+        <version>4.2.8-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

diff --git a/joyqueue-common/joyqueue-hbase/pom.xml b/joyqueue-common/joyqueue-hbase/pom.xml
@@ -20,7 +20,7 @@
     <parent>
         <artifactId>joyqueue-common</artifactId>
         <groupId>org.joyqueue</groupId>
-        <version>4.2.7.RC3</version>
+        <version>4.2.8-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

diff --git a/joyqueue-common/joyqueue-model/pom.xml b/joyqueue-common/joyqueue-model/pom.xml
@@ -20,12 +20,12 @@
     <parent>
         <artifactId>joyqueue-common</artifactId>
         <groupId>org.joyqueue</groupId>
-        <version>4.2.7.RC3</version>
+        <version>4.2.8-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
     <artifactId>joyqueue-model</artifactId>
-    <version>4.2.7.RC3</version>
+    <version>4.2.8-SNAPSHOT</version>
     <name>JoyQueue-Model</name>
     <description>Domain models</description>
     <dependencies>

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
@@ -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
@@ -19,7 +19,7 @@
     <parent>
         <artifactId>joyqueue-common</artifactId>
         <groupId>org.joyqueue</groupId>
-        <version>4.2.7.RC3</version>
+        <version>4.2.8-SNAPSHOT</version>
     </parent>
 
     <modelVersion>4.0.0</modelVersion>

diff --git a/joyqueue-common/joyqueue-security/pom.xml b/joyqueue-common/joyqueue-security/pom.xml
@@ -20,7 +20,7 @@
     <parent>
         <artifactId>joyqueue-common</artifactId>
         <groupId>org.joyqueue</groupId>
-        <version>4.2.7.RC3</version>
+        <version>4.2.8-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>