Merge pull request #8 from SOLID-Design/concurrency_improvement

Concurrency improvement
RTBHOUSE · Nov 29, 2018 · 588fbc0 · 588fbc0
2 parents a474e43 + 595fed1
commit 588fbc0
Show file tree

Hide file tree

Showing 10 changed files with 196 additions and 103 deletions.
diff --git a/.gitignore b/.gitignore
@@ -3,6 +3,7 @@ target/
 test-output/
 .settings/
 *.iml
+*.swp
 .idea/
 .idea/*
 .project

diff --git a/pom.xml b/pom.xml
@@ -4,7 +4,7 @@
 
     <groupId>com.rtbhouse</groupId>
     <artifactId>avro-fastserde</artifactId>
-    <version>1.0.2</version>
+    <version>1.0.3-SNAPSHOT</version>
     <packaging>jar</packaging>
 
     <name>avro-fastserde</name>
@@ -183,6 +183,13 @@
                     <excludes>
                         <exclude>**/generated/**/*.java</exclude>
                     </excludes>
+        			<annotationProcessorPaths>
+            			<path>
+                			<groupId>org.openjdk.jmh</groupId>
+                			<artifactId>jmh-generator-annprocess</artifactId>
+                			<version>${jmh.version}</version>
+            			</path>
+        			</annotationProcessorPaths>                    
                 </configuration>
             </plugin>
             <plugin>
@@ -287,6 +294,29 @@
                     </execution>
                 </executions>
             </plugin>
+			<plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-assembly-plugin</artifactId>
+                <configuration>
+                    <descriptors>
+                        <descriptor>src/main/assembly/benchmarks.xml</descriptor>
+                    </descriptors>
+                    <archive>
+                        <manifest>
+                            <mainClass>org.openjdk.jmh.Main</mainClass>
+                        </manifest>
+                    </archive>
+                </configuration>
+                <executions>
+                    <execution>
+                        <id>make-assembly</id>
+                        <phase>package</phase>
+                        <goals>
+                            <goal>single</goal>
+                        </goals>
+                    </execution>
+                </executions>
+            </plugin>            
         </plugins>
     </build>
 </project>
diff --git a/src/main/assembly/benchmarks.xml b/src/main/assembly/benchmarks.xml
@@ -0,0 +1,42 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<assembly xmlns="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.0"
+    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+    xsi:schemaLocation="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.0 http://maven.apache.org/xsd/assembly-1.1.0.xsd">
+
+  <id>benchmarks</id>
+  <formats>
+    <format>jar</format>
+  </formats>
+
+ <includeBaseDirectory>false</includeBaseDirectory>
+    <dependencySets>
+        <dependencySet>
+            <outputDirectory>/</outputDirectory>
+            <useProjectArtifact>true</useProjectArtifact>
+            <unpack>true</unpack>
+            <scope>test</scope>
+		      <unpackOptions>
+			    <!--
+			        Shading signed JARs will fail without this.
+			        http://stackoverflow.com/questions/999489/invalid-signature-file-when-attempting-to-run-a-jar
+			    -->
+		      	<excludes>
+		          <exclude>META-INF/*.SF</exclude>
+		          <exclude>META-INF/*.DSA</exclude>
+		          <exclude>META-INF/*.RSA</exclude>      	
+		      	</excludes>
+		      </unpackOptions>
+        </dependencySet>
+    </dependencySets>
+    <fileSets>
+        <fileSet>
+            <directory>${project.build.directory}/test-classes</directory>
+            <outputDirectory>/</outputDirectory>
+            <includes>
+                <include>**/*</include>
+            </includes>
+            <useDefaultExcludes>true</useDefaultExcludes>
+        </fileSet>
+    </fileSets>  
+</assembly>
diff --git a/src/main/java/com/rtbhouse/utils/avro/FastSerdeCache.java b/src/main/java/com/rtbhouse/utils/avro/FastSerdeCache.java
diff --git a/src/test/java/com/rtbhouse/utils/avro/benchmark/LargeAndDeepRecordBenchmark.java b/src/test/java/com/rtbhouse/utils/avro/benchmark/LargeAndDeepRecordBenchmark.java
@@ -7,7 +7,7 @@
 
 import com.rtbhouse.utils.generated.avro.benchmark.LargeAndDeep;
 
-@State(Scope.Thread)
+@State(Scope.Benchmark)
 @Fork(1)
 public class LargeAndDeepRecordBenchmark extends RecordBenchmarkBase<LargeAndDeep> {
 
@@ -34,27 +34,27 @@ public void fastGenericDatumWriter() throws Exception {
 
     @Benchmark
     public void genericDatumWriter() throws Exception {
-       super.genericDatumWriter();
+        super.genericDatumWriter();
     }
 
     @Benchmark
     public void fastSpecificDatumReader() throws Exception {
-       super.fastSpecificDatumReader();
+        super.fastSpecificDatumReader();
     }
 
     @Benchmark
     public void specificDatumReader() throws Exception {
-       super.specificDatumReader();
+        super.specificDatumReader();
     }
 
     @Benchmark
     public void fastSpecificDatumWriter() throws Exception {
-       super.fastSpecificDatumWriter();
+        super.fastSpecificDatumWriter();
     }
 
     @Benchmark
     public void specificDatumWriter() throws Exception {
-       super.specificDatumWriter();
+        super.specificDatumWriter();
     }
 
 }
diff --git a/src/test/java/com/rtbhouse/utils/avro/benchmark/LargeAndFlatRecordBenchmark.java b/src/test/java/com/rtbhouse/utils/avro/benchmark/LargeAndFlatRecordBenchmark.java
@@ -7,7 +7,7 @@
 
 import com.rtbhouse.utils.generated.avro.benchmark.LargeAndFlat;
 
-@State(Scope.Thread)
+@State(Scope.Benchmark)
 @Fork(1)
 public class LargeAndFlatRecordBenchmark extends RecordBenchmarkBase<LargeAndFlat> {
 
@@ -34,27 +34,27 @@ public void fastGenericDatumWriter() throws Exception {
 
     @Benchmark
     public void genericDatumWriter() throws Exception {
-       super.genericDatumWriter();
+        super.genericDatumWriter();
     }
 
     @Benchmark
     public void fastSpecificDatumReader() throws Exception {
-       super.fastSpecificDatumReader();
+        super.fastSpecificDatumReader();
     }
 
     @Benchmark
     public void specificDatumReader() throws Exception {
-       super.specificDatumReader();
+        super.specificDatumReader();
     }
 
     @Benchmark
     public void fastSpecificDatumWriter() throws Exception {
-       super.fastSpecificDatumWriter();
+        super.fastSpecificDatumWriter();
     }
 
     @Benchmark
     public void specificDatumWriter() throws Exception {
-       super.specificDatumWriter();
+        super.specificDatumWriter();
     }
 
 }
diff --git a/src/test/java/com/rtbhouse/utils/avro/benchmark/RecordBenchmarkBase.java b/src/test/java/com/rtbhouse/utils/avro/benchmark/RecordBenchmarkBase.java
@@ -23,13 +23,13 @@
 import com.rtbhouse.utils.avro.FastSpecificDatumWriter;
 
 public abstract class RecordBenchmarkBase<T extends SpecificRecord> {
+    private static final FastSerdeCache cache = new FastSerdeCache(Runnable::run);
 
     protected Schema specificRecordSchema;
 
     private List<GenericData.Record> genericRecords = new ArrayList<>();
     private List<T> specificRecords = new ArrayList<>();
     private List<byte[]> recordBytes = new ArrayList<>();
-    private FastSerdeCache cache;
 
     private FastGenericDatumReader<GenericData.Record> fastGenericDatumReader;
     private FastGenericDatumWriter<GenericData.Record> fastGenericDatumWriter;
@@ -43,8 +43,6 @@ public abstract class RecordBenchmarkBase<T extends SpecificRecord> {
 
     @Setup
     public void init() throws Exception {
-        cache = new FastSerdeCache(Runnable::run);
-
         final GenericDatumWriter<GenericData.Record> datumWriter = new GenericDatumWriter<>(specificRecordSchema);
         for (int i = 0; i < 1000; i++) {
             ByteArrayOutputStream baos = new ByteArrayOutputStream();

diff --git a/src/test/java/com/rtbhouse/utils/avro/benchmark/SmallAndDeepRecordBenchmark.java b/src/test/java/com/rtbhouse/utils/avro/benchmark/SmallAndDeepRecordBenchmark.java
@@ -7,7 +7,7 @@
 
 import com.rtbhouse.utils.generated.avro.benchmark.SmallAndDeep;
 
-@State(Scope.Thread)
+@State(Scope.Benchmark)
 @Fork(1)
 public class SmallAndDeepRecordBenchmark extends RecordBenchmarkBase<SmallAndDeep> {
 
@@ -34,27 +34,27 @@ public void fastGenericDatumWriter() throws Exception {
 
     @Benchmark
     public void genericDatumWriter() throws Exception {
-       super.genericDatumWriter();
+        super.genericDatumWriter();
     }
 
     @Benchmark
     public void fastSpecificDatumReader() throws Exception {
-       super.fastSpecificDatumReader();
+        super.fastSpecificDatumReader();
     }
 
     @Benchmark
     public void specificDatumReader() throws Exception {
-       super.specificDatumReader();
+        super.specificDatumReader();
     }
 
     @Benchmark
     public void fastSpecificDatumWriter() throws Exception {
-       super.fastSpecificDatumWriter();
+        super.fastSpecificDatumWriter();
     }
 
     @Benchmark
     public void specificDatumWriter() throws Exception {
-       super.specificDatumWriter();
+        super.specificDatumWriter();
     }
 
 }
diff --git a/src/test/java/com/rtbhouse/utils/avro/benchmark/SmallAndFlatRecordBenchmark.java b/src/test/java/com/rtbhouse/utils/avro/benchmark/SmallAndFlatRecordBenchmark.java
@@ -7,7 +7,7 @@
 
 import com.rtbhouse.utils.generated.avro.benchmark.SmallAndFlat;
 
-@State(Scope.Thread)
+@State(Scope.Benchmark)
 @Fork(1)
 public class SmallAndFlatRecordBenchmark extends RecordBenchmarkBase<SmallAndFlat> {
 
@@ -34,27 +34,27 @@ public void fastGenericDatumWriter() throws Exception {
 
     @Benchmark
     public void genericDatumWriter() throws Exception {
-       super.genericDatumWriter();
+        super.genericDatumWriter();
     }
 
     @Benchmark
     public void fastSpecificDatumReader() throws Exception {
-       super.fastSpecificDatumReader();
+        super.fastSpecificDatumReader();
     }
 
     @Benchmark
     public void specificDatumReader() throws Exception {
-       super.specificDatumReader();
+        super.specificDatumReader();
     }
 
     @Benchmark
     public void fastSpecificDatumWriter() throws Exception {
-       super.fastSpecificDatumWriter();
+        super.fastSpecificDatumWriter();
     }
 
     @Benchmark
     public void specificDatumWriter() throws Exception {
-       super.specificDatumWriter();
+        super.specificDatumWriter();
     }
 
 }
diff --git a/src/test/java/com/rtbhouse/utils/avro/benchmark/UnionSmallAndDeepRecordBenchmark.java b/src/test/java/com/rtbhouse/utils/avro/benchmark/UnionSmallAndDeepRecordBenchmark.java
@@ -7,7 +7,7 @@
 
 import com.rtbhouse.utils.generated.avro.benchmark.UnionSmallAndDeep;
 
-@State(Scope.Thread)
+@State(Scope.Benchmark)
 @Fork(1)
 public class UnionSmallAndDeepRecordBenchmark extends RecordBenchmarkBase<UnionSmallAndDeep> {
 
@@ -34,27 +34,27 @@ public void fastGenericDatumWriter() throws Exception {
 
     @Benchmark
     public void genericDatumWriter() throws Exception {
-       super.genericDatumWriter();
+        super.genericDatumWriter();
     }
 
     @Benchmark
     public void fastSpecificDatumReader() throws Exception {
-       super.fastSpecificDatumReader();
+        super.fastSpecificDatumReader();
     }
 
     @Benchmark
     public void specificDatumReader() throws Exception {
-       super.specificDatumReader();
+        super.specificDatumReader();
     }
 
     @Benchmark
     public void fastSpecificDatumWriter() throws Exception {
-       super.fastSpecificDatumWriter();
+        super.fastSpecificDatumWriter();
     }
 
     @Benchmark
     public void specificDatumWriter() throws Exception {
-       super.specificDatumWriter();
+        super.specificDatumWriter();
     }
 
 }
-Original file line number
+Diff line change
@@ Expand Up / @@ -3,6 +3,7 @@ target/ @@
     test-output/
     .settings/
     *.iml
+    *.swp
     .idea/
     .idea/*
     .project
@@ Expand Down @@