Refactor builders to use a builder pool instead of ThreadLocal to red…

…uce GC pressure.
atomix · Jul 22, 2015 · f8342ef · f8342ef
1 parent 76bce26
commit f8342ef
Show file tree

Hide file tree

Showing 59 changed files with 777 additions and 436 deletions.
diff --git a/atomic/src/main/java/net/kuujo/copycat/atomic/AsyncReference.java b/atomic/src/main/java/net/kuujo/copycat/atomic/AsyncReference.java
@@ -20,8 +20,9 @@
 import net.kuujo.alleycat.SerializeWith;
 import net.kuujo.alleycat.io.BufferInput;
 import net.kuujo.alleycat.io.BufferOutput;
-import net.kuujo.copycat.Resource;
+import net.kuujo.copycat.BuilderPool;
 import net.kuujo.copycat.Mode;
+import net.kuujo.copycat.Resource;
 import net.kuujo.copycat.Stateful;
 import net.kuujo.copycat.log.Compaction;
 import net.kuujo.copycat.raft.*;
@@ -417,7 +418,10 @@ public void readObject(BufferInput buffer, Alleycat alleycat) {
     /**
      * Base reference command builder.
      */
-    public static abstract class Builder<T extends Builder<T, U>, U extends ReferenceCommand<?>> extends Command.Builder<T, U> {
+    public static abstract class Builder<T extends Builder<T, U, V>, U extends ReferenceCommand<V>, V> extends Command.Builder<T, U, V> {
+      protected Builder(BuilderPool<T, U> pool) {
+        super(pool);
+      }
 
       /**
        * Sets the persistence mode.
@@ -484,7 +488,10 @@ public void readObject(BufferInput buffer, Alleycat alleycat) {
     /**
      * Base reference query builder.
      */
-    public static abstract class Builder<T extends Builder<T, U>, U extends ReferenceQuery<?>> extends Query.Builder<T, U> {
+    public static abstract class Builder<T extends Builder<T, U, V>, U extends ReferenceQuery<V>, V> extends Query.Builder<T, U, V> {
+      protected Builder(BuilderPool<T, U> pool) {
+        super(pool);
+      }
 
       /**
        * Sets the query consistency level.
@@ -515,13 +522,17 @@ public static class Get<T> extends ReferenceQuery<T> {
      */
     @SuppressWarnings("unchecked")
     public static <T> Builder<T> builder() {
-      return Operation.builder(Builder.class);
+      return Operation.builder(Builder.class, Builder::new);
     }
 
     /**
      * Get query builder.
      */
-    public static class Builder<T> extends ReferenceQuery.Builder<Builder<T>, Get<T>> {
+    public static class Builder<T> extends ReferenceQuery.Builder<Builder<T>, Get<T>, T> {
+      public Builder(BuilderPool<Builder<T>, Get<T>> pool) {
+        super(pool);
+      }
+
       @Override
       protected Get<T> create() {
         return new Get<>();
@@ -541,7 +552,7 @@ public static class Set extends ReferenceCommand<Void> {
      * @return A new set command builder.
      */
     public static Builder builder() {
-      return Operation.builder(Builder.class);
+      return Operation.builder(Builder.class, Builder::new);
     }
 
     private Object value;
@@ -573,7 +584,11 @@ public String toString() {
     /**
      * Put command builder.
      */
-    public static class Builder extends ReferenceCommand.Builder<Builder, Set> {
+    public static class Builder extends ReferenceCommand.Builder<Builder, Set, Void> {
+      public Builder(BuilderPool<Builder, Set> pool) {
+        super(pool);
+      }
+
       @Override
       protected Set create() {
         return new Set();
@@ -604,7 +619,7 @@ public static class CompareAndSet extends ReferenceCommand<Boolean> {
      * @return A new compare and set command builder.
      */
     public static Builder builder() {
-      return Operation.builder(Builder.class);
+      return Operation.builder(Builder.class, Builder::new);
     }
 
     private Object expect;
@@ -648,7 +663,11 @@ public String toString() {
     /**
      * Compare and set command builder.
      */
-    public static class Builder extends ReferenceCommand.Builder<Builder, CompareAndSet> {
+    public static class Builder extends ReferenceCommand.Builder<Builder, CompareAndSet, Boolean> {
+      public Builder(BuilderPool<Builder, CompareAndSet> pool) {
+        super(pool);
+      }
+
       @Override
       protected CompareAndSet create() {
         return new CompareAndSet();
@@ -691,7 +710,7 @@ public static class GetAndSet<T> extends ReferenceCommand<T> {
      */
     @SuppressWarnings("unchecked")
     public static <T> Builder<T> builder() {
-      return Operation.builder(Builder.class);
+      return Operation.builder(Builder.class, Builder::new);
     }
 
     private Object value;
@@ -723,7 +742,11 @@ public String toString() {
     /**
      * Put command builder.
      */
-    public static class Builder<T> extends ReferenceCommand.Builder<Builder<T>, GetAndSet<T>> {
+    public static class Builder<T> extends ReferenceCommand.Builder<Builder<T>, GetAndSet<T>, T> {
+      public Builder(BuilderPool<Builder<T>, GetAndSet<T>> pool) {
+        super(pool);
+      }
+
       @Override
       protected GetAndSet<T> create() {
         return new GetAndSet<>();

diff --git a/client/src/main/java/net/kuujo/copycat/raft/client/RaftClient.java b/client/src/main/java/net/kuujo/copycat/raft/client/RaftClient.java
@@ -137,7 +137,7 @@ public CompletableFuture<Void> delete() {
   /**
    * Raft client builder.
    */
-  public static class Builder implements Raft.Builder<Builder, RaftClient> {
+  public static class Builder extends Raft.Builder<Builder, RaftClient> {
     private Transport transport;
     private Alleycat serializer;
     private long keepAliveInterval = 1000;
@@ -146,6 +146,14 @@ public static class Builder implements Raft.Builder<Builder, RaftClient> {
     private Builder() {
     }
 
+    @Override
+    protected void reset() {
+      transport = null;
+      serializer = null;
+      keepAliveInterval = 1000;
+      members = null;
+    }
+
     @Override
     public Builder withTransport(Transport transport) {
       this.transport = transport;