javeme commented on code in PR #2238:
URL:
https://github.com/apache/incubator-hugegraph/pull/2238#discussion_r1255366658
##########
hugegraph-test/src/test/java/org/apache/hugegraph/benchmark/map/MapRandomGetPutThroughputTest.java:
##########
@@ -45,24 +48,29 @@
@Warmup(iterations = 2, time = 1000, timeUnit = TimeUnit.MILLISECONDS)
@Measurement(iterations = 6, time = 1000, timeUnit = TimeUnit.MILLISECONDS)
@State(Scope.Benchmark)
-@Fork(3)
+@Fork(2)
public class MapRandomGetPutThroughputTest {
- private static final int MAP_CAPACITY = 100000;
- private final ConcurrentHashMap<Integer, Integer> concurrentHashMapNonCap =
- new ConcurrentHashMap<>();
+ @Param(value = {"1600", "10000", "100000", "1000000"})
Review Comment:
1600 => 1000?
##########
hugegraph-test/src/test/java/org/apache/hugegraph/benchmark/map/MapRandomGetPutThroughputTest.java:
##########
@@ -0,0 +1,135 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with this
+ * work for additional information regarding copyright ownership. The ASF
+ * licenses this file to You under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+ * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
+ * License for the specific language governing permissions and limitations
+ * under the License.
+ */
+
+package org.apache.hugegraph.benchmark.map;
+
+import java.util.concurrent.ConcurrentHashMap;
+import java.util.concurrent.TimeUnit;
+
+import org.apache.hugegraph.benchmark.BenchmarkConstants;
+import org.apache.hugegraph.benchmark.SimpleRandom;
+import org.apache.hugegraph.util.collection.IntMap;
+import org.apache.hugegraph.util.collection.IntSet;
+import org.openjdk.jmh.annotations.Benchmark;
+import org.openjdk.jmh.annotations.BenchmarkMode;
+import org.openjdk.jmh.annotations.Fork;
+import org.openjdk.jmh.annotations.Level;
+import org.openjdk.jmh.annotations.Measurement;
+import org.openjdk.jmh.annotations.Mode;
+import org.openjdk.jmh.annotations.OutputTimeUnit;
+import org.openjdk.jmh.annotations.Param;
+import org.openjdk.jmh.annotations.Scope;
+import org.openjdk.jmh.annotations.Setup;
+import org.openjdk.jmh.annotations.State;
+import org.openjdk.jmh.annotations.Threads;
+import org.openjdk.jmh.annotations.Warmup;
+import org.openjdk.jmh.results.format.ResultFormatType;
+import org.openjdk.jmh.runner.Runner;
+import org.openjdk.jmh.runner.RunnerException;
+import org.openjdk.jmh.runner.options.Options;
+import org.openjdk.jmh.runner.options.OptionsBuilder;
+
+@OutputTimeUnit(TimeUnit.MILLISECONDS)
+@BenchmarkMode({Mode.Throughput})
+@Warmup(iterations = 2, time = 1000, timeUnit = TimeUnit.MILLISECONDS)
+@Measurement(iterations = 6, time = 1000, timeUnit = TimeUnit.MILLISECONDS)
+@State(Scope.Benchmark)
+@Fork(2)
+public class MapRandomGetPutThroughputTest {
+
+ @Param(value = {"1600", "10000", "100000", "1000000"})
+ private int MAP_CAPACITY;
+ private ConcurrentHashMap<Integer, Integer> concurrentHashMapNonCap;
+
+ private ConcurrentHashMap<Integer, Integer> concurrentHashMap;
+
+ private IntMap.IntMapBySegments intMapBySegments;
+
+ private IntMap.IntMapByEcSegment intMapByEcSegments;
+
+ private static final int THREAD_COUNT = 8;
+
+ @Setup(Level.Trial)
+ public void prepareMap() {
+ concurrentHashMapNonCap = new ConcurrentHashMap<>();
+ concurrentHashMap = new ConcurrentHashMap<>(MAP_CAPACITY);
+ intMapBySegments = new IntMap.IntMapBySegments(MAP_CAPACITY);
+ intMapByEcSegments = new IntMap.IntMapByEcSegment(IntSet.CPUS * 100);
+ }
+
+ /**
+ * The instantiated @State annotation only supports public classes.
+ */
+ @State(Scope.Thread)
+ public static class ThreadState {
+
+ private final SimpleRandom random = new SimpleRandom();
+
+ int next() {
+ return random.next();
+ }
+ }
+
+ @Benchmark
+ @Threads(THREAD_COUNT)
+ public void randomGetPutOfConcurrentHashMapWithNoneInitCap(ThreadState
state) {
+ int key = state.next() & (MAP_CAPACITY - 1);
+ if (!this.concurrentHashMapNonCap.containsKey(key)) {
+ this.concurrentHashMapNonCap.put(key, state.next());
+ }
+ this.concurrentHashMapNonCap.get(key);
+ }
+
+ @Benchmark
+ @Threads(THREAD_COUNT)
+ public void randomGetPutOfConcurrentHashMapWithInitCap(ThreadState state) {
+ int key = state.next() & (MAP_CAPACITY - 1);
+ if (!this.concurrentHashMap.containsKey(key)) {
+ this.concurrentHashMap.put(key, state.next());
+ }
+ this.concurrentHashMap.get(key);
+ }
+
+ @Benchmark
+ @Threads(THREAD_COUNT)
+ public void randomGetPutOfIntMapBySegments(ThreadState state) {
+ int key = state.next() & (MAP_CAPACITY - 1);
+ if (!this.intMapBySegments.containsKey(key)) {
+ this.intMapBySegments.put(key, state.next());
+ }
+ this.intMapBySegments.get(key);
+ }
+
+ @Benchmark
+ @Threads(THREAD_COUNT)
+ public void randomGetPutOfIntMapByEcSegment(ThreadState state) {
+ int key = state.next() & (MAP_CAPACITY - 1);
+ if (!this.intMapByEcSegments.containsKey(key)) {
+ this.intMapByEcSegments.put(key, state.next());
+ }
+ this.intMapByEcSegments.get(key);
+ }
+
+ public static void main(String[] args) throws RunnerException {
+ Options opt = new OptionsBuilder()
+ .include(MapRandomGetPutThroughputTest.class.getSimpleName())
+ .result(BenchmarkConstants.OUTPUT_PATH +
"random_get_put_result.json")
Review Comment:
define a const var for "random_get_put_result.json" and also add "map_"
prefix
##########
hugegraph-test/src/test/java/org/apache/hugegraph/benchmark/map/MapRandomGetPutThroughputTest.java:
##########
@@ -0,0 +1,135 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with this
+ * work for additional information regarding copyright ownership. The ASF
+ * licenses this file to You under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+ * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
+ * License for the specific language governing permissions and limitations
+ * under the License.
+ */
+
+package org.apache.hugegraph.benchmark.map;
+
+import java.util.concurrent.ConcurrentHashMap;
+import java.util.concurrent.TimeUnit;
+
+import org.apache.hugegraph.benchmark.BenchmarkConstants;
+import org.apache.hugegraph.benchmark.SimpleRandom;
+import org.apache.hugegraph.util.collection.IntMap;
+import org.apache.hugegraph.util.collection.IntSet;
+import org.openjdk.jmh.annotations.Benchmark;
+import org.openjdk.jmh.annotations.BenchmarkMode;
+import org.openjdk.jmh.annotations.Fork;
+import org.openjdk.jmh.annotations.Level;
+import org.openjdk.jmh.annotations.Measurement;
+import org.openjdk.jmh.annotations.Mode;
+import org.openjdk.jmh.annotations.OutputTimeUnit;
+import org.openjdk.jmh.annotations.Param;
+import org.openjdk.jmh.annotations.Scope;
+import org.openjdk.jmh.annotations.Setup;
+import org.openjdk.jmh.annotations.State;
+import org.openjdk.jmh.annotations.Threads;
+import org.openjdk.jmh.annotations.Warmup;
+import org.openjdk.jmh.results.format.ResultFormatType;
+import org.openjdk.jmh.runner.Runner;
+import org.openjdk.jmh.runner.RunnerException;
+import org.openjdk.jmh.runner.options.Options;
+import org.openjdk.jmh.runner.options.OptionsBuilder;
+
+@OutputTimeUnit(TimeUnit.MILLISECONDS)
+@BenchmarkMode({Mode.Throughput})
+@Warmup(iterations = 2, time = 1000, timeUnit = TimeUnit.MILLISECONDS)
+@Measurement(iterations = 6, time = 1000, timeUnit = TimeUnit.MILLISECONDS)
+@State(Scope.Benchmark)
+@Fork(2)
+public class MapRandomGetPutThroughputTest {
+
+ @Param(value = {"1600", "10000", "100000", "1000000"})
+ private int MAP_CAPACITY;
+ private ConcurrentHashMap<Integer, Integer> concurrentHashMapNonCap;
Review Comment:
also add a blank line?
##########
hugegraph-test/src/test/java/org/apache/hugegraph/benchmark/map/MapRandomGetPutThroughputTest.java:
##########
@@ -45,24 +48,29 @@
@Warmup(iterations = 2, time = 1000, timeUnit = TimeUnit.MILLISECONDS)
@Measurement(iterations = 6, time = 1000, timeUnit = TimeUnit.MILLISECONDS)
@State(Scope.Benchmark)
-@Fork(3)
+@Fork(2)
public class MapRandomGetPutThroughputTest {
- private static final int MAP_CAPACITY = 100000;
- private final ConcurrentHashMap<Integer, Integer> concurrentHashMapNonCap =
- new ConcurrentHashMap<>();
+ @Param(value = {"1600", "10000", "100000", "1000000"})
+ private int MAP_CAPACITY;
+ private ConcurrentHashMap<Integer, Integer> concurrentHashMapNonCap;
- private final ConcurrentHashMap<Integer, Integer> concurrentHashMap =
- new ConcurrentHashMap<>(MAP_CAPACITY);
+ private ConcurrentHashMap<Integer, Integer> concurrentHashMap;
- private final IntMap.IntMapBySegments intMapBySegments =
- new IntMap.IntMapBySegments(MAP_CAPACITY);
+ private IntMap.IntMapBySegments intMapBySegments;
- private final IntMap.IntMapByEcSegment intMapByEcSegments =
- new IntMap.IntMapByEcSegment(IntSet.CPUS * 100);
+ private IntMap.IntMapByEcSegment intMapByEcSegments;
private static final int THREAD_COUNT = 8;
+ @Setup(Level.Trial)
+ public void prepareMap() {
+ concurrentHashMapNonCap = new ConcurrentHashMap<>();
Review Comment:
keep this.xx style
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: [email protected]
For queries about this service, please contact Infrastructure at:
[email protected]
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
