fix/jmh conflict unittest (#71)

* (fix) isolate jmh and unit_test #69 * (fix) update maven-compiler-plugin version to 3.8.0 #69 * (fix) update maven-compiler-plugin version to 3.8.0 #69 * (fix) recover jmh code
sofastack · Mar 28, 2019 · f2e9d8b · f2e9d8b
1 parent 802310d
commit f2e9d8b
Show file tree

Hide file tree

Showing 16 changed files with 47 additions and 55 deletions.
diff --git a/jraft-core/pom.xml b/jraft-core/pom.xml
@@ -12,7 +12,6 @@
     <name>jraft-core ${project.version}</name>
 
     <dependencies>
-
         <!-- junit -->
         <dependency>
             <groupId>junit</groupId>
@@ -24,18 +23,15 @@
             <artifactId>junit-dep</artifactId>
             <scope>test</scope>
         </dependency>
-
         <dependency>
             <groupId>com.google.code.findbugs</groupId>
             <artifactId>jsr305</artifactId>
         </dependency>
-
         <!-- rocksdb-->
         <dependency>
             <groupId>org.rocksdb</groupId>
             <artifactId>rocksdbjni</artifactId>
         </dependency>
-
         <!-- mock -->
         <dependency>
             <groupId>org.mockito</groupId>
@@ -47,13 +43,11 @@
             <artifactId>powermock-api-mockito</artifactId>
             <scope>test</scope>
         </dependency>
-
         <dependency>
             <groupId>org.powermock</groupId>
             <artifactId>powermock-module-junit4</artifactId>
             <scope>test</scope>
         </dependency>
-
         <!-- log -->
         <dependency>
             <groupId>org.slf4j</groupId>
@@ -75,7 +69,6 @@
             <groupId>org.apache.logging.log4j</groupId>
             <artifactId>log4j-jcl</artifactId>
         </dependency>
-
         <dependency>
             <groupId>com.lmax</groupId>
             <artifactId>disruptor</artifactId>
@@ -84,7 +77,6 @@
             <groupId>com.google.protobuf</groupId>
             <artifactId>protobuf-java</artifactId>
         </dependency>
-
         <!-- commons -->
         <dependency>
             <groupId>commons-io</groupId>
@@ -94,7 +86,6 @@
             <groupId>commons-lang</groupId>
             <artifactId>commons-lang</artifactId>
         </dependency>
-
         <!-- bolt -->
         <dependency>
             <groupId>com.alipay.sofa</groupId>
@@ -104,11 +95,19 @@
             <groupId>com.alipay.sofa</groupId>
             <artifactId>hessian</artifactId>
         </dependency>
-
         <!-- metrics -->
         <dependency>
             <groupId>io.dropwizard.metrics</groupId>
             <artifactId>metrics-core</artifactId>
         </dependency>
+        <!-- benchmark -->
+        <dependency>
+            <groupId>org.openjdk.jmh</groupId>
+            <artifactId>jmh-core</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.openjdk.jmh</groupId>
+            <artifactId>jmh-generator-annprocess</artifactId>
+        </dependency>
     </dependencies>
 </project>
diff --git a/...benchmark/common/AsciiCodecBenchmark.java → .../sofa/jraft/util/AsciiCodecBenchmark.java b/...benchmark/common/AsciiCodecBenchmark.java → .../sofa/jraft/util/AsciiCodecBenchmark.java
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.alipay.sofa.jraft.benchmark.common;
+package com.alipay.sofa.jraft.util;
 
 import java.util.concurrent.TimeUnit;
 
@@ -30,8 +30,6 @@
 import org.openjdk.jmh.runner.options.OptionsBuilder;
 import org.openjdk.jmh.runner.options.TimeValue;
 
-import com.alipay.sofa.jraft.util.AsciiStringUtil;
-
 /**
  * @author jiachun.fjc
  */

diff --git a/.../benchmark/common/Utf8CodecBenchmark.java → ...y/sofa/jraft/util/Utf8CodecBenchmark.java b/.../benchmark/common/Utf8CodecBenchmark.java → ...y/sofa/jraft/util/Utf8CodecBenchmark.java
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.alipay.sofa.jraft.benchmark.common;
+package com.alipay.sofa.jraft.util;
 
 import java.nio.charset.StandardCharsets;
 import java.util.UUID;
@@ -33,9 +33,6 @@
 import org.openjdk.jmh.runner.options.OptionsBuilder;
 import org.openjdk.jmh.runner.options.TimeValue;
 
-import com.alipay.sofa.jraft.util.BytesUtil;
-import com.alipay.sofa.jraft.util.Utils;
-
 /**
  * @author jiachun.fjc
  */

diff --git a/jraft-example/pom.xml b/jraft-example/pom.xml
@@ -40,15 +40,6 @@
             <artifactId>log4j-jcl</artifactId>
             <version>${log4j.version}</version>
         </dependency>
-        <!-- benchmark -->
-        <dependency>
-            <groupId>org.openjdk.jmh</groupId>
-            <artifactId>jmh-core</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>org.openjdk.jmh</groupId>
-            <artifactId>jmh-generator-annprocess</artifactId>
-        </dependency>
     </dependencies>
 
     <build>

diff --git a/jraft-rheakv/rheakv-core/pom.xml b/jraft-rheakv/rheakv-core/pom.xml
@@ -72,5 +72,14 @@
             <groupId>org.mockito</groupId>
             <artifactId>mockito-all</artifactId>
         </dependency>
+        <!-- benchmark -->
+        <dependency>
+            <groupId>org.openjdk.jmh</groupId>
+            <artifactId>jmh-core</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.openjdk.jmh</groupId>
+            <artifactId>jmh-generator-annprocess</artifactId>
+        </dependency>
     </dependencies>
 </project>
diff --git a/...ofa/jraft/benchmark/kv/BenchmarkUtil.java → ...a/jraft/rhea/benchmark/BenchmarkUtil.java b/...ofa/jraft/benchmark/kv/BenchmarkUtil.java → ...a/jraft/rhea/benchmark/BenchmarkUtil.java
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.alipay.sofa.jraft.benchmark.kv;
+package com.alipay.sofa.jraft.rhea.benchmark;
 
 import java.util.concurrent.ThreadLocalRandom;
 

diff --git a/...nchmark/kv/raw/BaseRawStoreBenchmark.java → .../benchmark/raw/BaseRawStoreBenchmark.java b/...nchmark/kv/raw/BaseRawStoreBenchmark.java → .../benchmark/raw/BaseRawStoreBenchmark.java
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.alipay.sofa.jraft.benchmark.kv.raw;
+package com.alipay.sofa.jraft.rhea.benchmark.raw;
 
 import java.io.File;
 import java.io.IOException;

diff --git a/...ark/kv/raw/RawKVApproximateBenchmark.java → ...chmark/raw/RawKVApproximateBenchmark.java b/...ark/kv/raw/RawKVApproximateBenchmark.java → ...chmark/raw/RawKVApproximateBenchmark.java
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.alipay.sofa.jraft.benchmark.kv.raw;
+package com.alipay.sofa.jraft.rhea.benchmark.raw;
 
 import java.util.concurrent.TimeUnit;
 
@@ -34,8 +34,8 @@
 
 import com.alipay.sofa.jraft.util.BytesUtil;
 
-import static com.alipay.sofa.jraft.benchmark.kv.BenchmarkUtil.CONCURRENCY;
-import static com.alipay.sofa.jraft.benchmark.kv.BenchmarkUtil.VALUE_BYTES;
+import static com.alipay.sofa.jraft.rhea.benchmark.BenchmarkUtil.CONCURRENCY;
+import static com.alipay.sofa.jraft.rhea.benchmark.BenchmarkUtil.VALUE_BYTES;
 
 /**
  * @author jiachun.fjc

diff --git a/...t/benchmark/kv/raw/RawKVGetBenchmark.java → ...rhea/benchmark/raw/RawKVGetBenchmark.java b/...t/benchmark/kv/raw/RawKVGetBenchmark.java → ...rhea/benchmark/raw/RawKVGetBenchmark.java
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.alipay.sofa.jraft.benchmark.kv.raw;
+package com.alipay.sofa.jraft.rhea.benchmark.raw;
 
 import java.util.List;
 import java.util.concurrent.ThreadLocalRandom;
@@ -38,9 +38,9 @@
 import com.alipay.sofa.jraft.rhea.util.Lists;
 import com.alipay.sofa.jraft.util.BytesUtil;
 
-import static com.alipay.sofa.jraft.benchmark.kv.BenchmarkUtil.CONCURRENCY;
-import static com.alipay.sofa.jraft.benchmark.kv.BenchmarkUtil.KEY_COUNT;
-import static com.alipay.sofa.jraft.benchmark.kv.BenchmarkUtil.VALUE_BYTES;
+import static com.alipay.sofa.jraft.rhea.benchmark.BenchmarkUtil.CONCURRENCY;
+import static com.alipay.sofa.jraft.rhea.benchmark.BenchmarkUtil.KEY_COUNT;
+import static com.alipay.sofa.jraft.rhea.benchmark.BenchmarkUtil.VALUE_BYTES;
 
 /**
  * @author jiachun.fjc

diff --git a/...t/benchmark/kv/raw/RawKVPutBenchmark.java → ...rhea/benchmark/raw/RawKVPutBenchmark.java b/...t/benchmark/kv/raw/RawKVPutBenchmark.java → ...rhea/benchmark/raw/RawKVPutBenchmark.java
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.alipay.sofa.jraft.benchmark.kv.raw;
+package com.alipay.sofa.jraft.rhea.benchmark.raw;
 
 import java.util.concurrent.ThreadLocalRandom;
 import java.util.concurrent.TimeUnit;
@@ -35,9 +35,9 @@
 
 import com.alipay.sofa.jraft.util.BytesUtil;
 
-import static com.alipay.sofa.jraft.benchmark.kv.BenchmarkUtil.CONCURRENCY;
-import static com.alipay.sofa.jraft.benchmark.kv.BenchmarkUtil.KEY_COUNT;
-import static com.alipay.sofa.jraft.benchmark.kv.BenchmarkUtil.VALUE_BYTES;
+import static com.alipay.sofa.jraft.rhea.benchmark.BenchmarkUtil.CONCURRENCY;
+import static com.alipay.sofa.jraft.rhea.benchmark.BenchmarkUtil.KEY_COUNT;
+import static com.alipay.sofa.jraft.rhea.benchmark.BenchmarkUtil.VALUE_BYTES;
 
 /**
  * @author jiachun.fjc

diff --git a/...t/benchmark/kv/raw/SnapshotBenchmark.java → ...rhea/benchmark/raw/SnapshotBenchmark.java b/...t/benchmark/kv/raw/SnapshotBenchmark.java → ...rhea/benchmark/raw/SnapshotBenchmark.java
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.alipay.sofa.jraft.benchmark.kv.raw;
+package com.alipay.sofa.jraft.rhea.benchmark.raw;
 
 import java.io.File;
 import java.io.FileOutputStream;
@@ -33,8 +33,8 @@
 import com.alipay.sofa.jraft.rhea.util.ZipUtil;
 import com.alipay.sofa.jraft.util.BytesUtil;
 
-import static com.alipay.sofa.jraft.benchmark.kv.BenchmarkUtil.KEY_COUNT;
-import static com.alipay.sofa.jraft.benchmark.kv.BenchmarkUtil.VALUE_BYTES;
+import static com.alipay.sofa.jraft.rhea.benchmark.BenchmarkUtil.KEY_COUNT;
+import static com.alipay.sofa.jraft.rhea.benchmark.BenchmarkUtil.VALUE_BYTES;
 
 /**
  * @author jiachun.fjc

diff --git a/...nchmark/kv/rhea/RheaBenchmarkCluster.java → .../benchmark/rhea/RheaBenchmarkCluster.java b/...nchmark/kv/rhea/RheaBenchmarkCluster.java → .../benchmark/rhea/RheaBenchmarkCluster.java
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.alipay.sofa.jraft.benchmark.kv.rhea;
+package com.alipay.sofa.jraft.rhea.benchmark.rhea;
 
 import java.io.File;
 import java.io.IOException;

diff --git a/...benchmark/kv/rhea/RheaKVGetBenchmark.java → ...ea/benchmark/rhea/RheaKVGetBenchmark.java b/...benchmark/kv/rhea/RheaKVGetBenchmark.java → ...ea/benchmark/rhea/RheaKVGetBenchmark.java
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.alipay.sofa.jraft.benchmark.kv.rhea;
+package com.alipay.sofa.jraft.rhea.benchmark.rhea;
 
 import java.io.IOException;
 import java.util.List;
@@ -35,14 +35,14 @@
 import org.openjdk.jmh.runner.options.OptionsBuilder;
 import org.openjdk.jmh.runner.options.TimeValue;
 
-import com.alipay.sofa.jraft.benchmark.kv.BenchmarkUtil;
+import com.alipay.sofa.jraft.rhea.benchmark.BenchmarkUtil;
 import com.alipay.sofa.jraft.rhea.client.RheaKVStore;
 import com.alipay.sofa.jraft.rhea.storage.KVEntry;
 import com.alipay.sofa.jraft.rhea.util.Lists;
 import com.alipay.sofa.jraft.util.BytesUtil;
 
-import static com.alipay.sofa.jraft.benchmark.kv.BenchmarkUtil.KEY_COUNT;
-import static com.alipay.sofa.jraft.benchmark.kv.BenchmarkUtil.VALUE_BYTES;
+import static com.alipay.sofa.jraft.rhea.benchmark.BenchmarkUtil.KEY_COUNT;
+import static com.alipay.sofa.jraft.rhea.benchmark.BenchmarkUtil.VALUE_BYTES;
 
 /**
  * @author jiachun.fjc

diff --git a/...benchmark/kv/rhea/RheaKVPutBenchmark.java → ...ea/benchmark/rhea/RheaKVPutBenchmark.java b/...benchmark/kv/rhea/RheaKVPutBenchmark.java → ...ea/benchmark/rhea/RheaKVPutBenchmark.java
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.alipay.sofa.jraft.benchmark.kv.rhea;
+package com.alipay.sofa.jraft.rhea.benchmark.rhea;
 
 import java.io.IOException;
 import java.util.concurrent.ThreadLocalRandom;
@@ -37,9 +37,9 @@
 import com.alipay.sofa.jraft.rhea.client.RheaKVStore;
 import com.alipay.sofa.jraft.util.BytesUtil;
 
-import static com.alipay.sofa.jraft.benchmark.kv.BenchmarkUtil.CONCURRENCY;
-import static com.alipay.sofa.jraft.benchmark.kv.BenchmarkUtil.KEY_COUNT;
-import static com.alipay.sofa.jraft.benchmark.kv.BenchmarkUtil.VALUE_BYTES;
+import static com.alipay.sofa.jraft.rhea.benchmark.BenchmarkUtil.CONCURRENCY;
+import static com.alipay.sofa.jraft.rhea.benchmark.BenchmarkUtil.KEY_COUNT;
+import static com.alipay.sofa.jraft.rhea.benchmark.BenchmarkUtil.VALUE_BYTES;
 
 /**
  * @author jiachun.fjc

diff --git a/...ft/benchmark/common/VarIntsBenchmark.java → ...ofa/jraft/rhea/util/VarIntsBenchmark.java b/...ft/benchmark/common/VarIntsBenchmark.java → ...ofa/jraft/rhea/util/VarIntsBenchmark.java
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.alipay.sofa.jraft.benchmark.common;
+package com.alipay.sofa.jraft.rhea.util;
 
 import java.util.concurrent.TimeUnit;
 
@@ -30,8 +30,6 @@
 import org.openjdk.jmh.runner.options.OptionsBuilder;
 import org.openjdk.jmh.runner.options.TimeValue;
 
-import com.alipay.sofa.jraft.rhea.util.VarInts;
-
 /**
  * @author jiachun.fjc
  */

diff --git a/pom.xml b/pom.xml
@@ -323,7 +323,7 @@
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-compiler-plugin</artifactId>
-                <version>2.3.2</version>
+                <version>3.8.0</version>
                 <configuration>
                     <source>${java_source_version}</source>
                     <target>${java_target_version}</target>