-
Notifications
You must be signed in to change notification settings - Fork 521
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge branch 'master' into fix-asf-invalid-notification-scheme
- Loading branch information
Showing
10 changed files
with
282 additions
and
4 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
24 changes: 24 additions & 0 deletions
24
hugegraph-dist/release-docs/licenses/LINCENSE-jopt-simple.txt
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,24 @@ | ||
| /* | ||
| The MIT License | ||
|
|
||
| Copyright (c) 2004-2021 Paul R. Holser, Jr. | ||
|
|
||
| Permission is hereby granted, free of charge, to any person obtaining | ||
| a copy of this software and associated documentation files (the | ||
| "Software"), to deal in the Software without restriction, including | ||
| without limitation the rights to use, copy, modify, merge, publish, | ||
| distribute, sublicense, and/or sell copies of the Software, and to | ||
| permit persons to whom the Software is furnished to do so, subject to | ||
| the following conditions: | ||
|
|
||
| The above copyright notice and this permission notice shall be | ||
| included in all copies or substantial portions of the Software. | ||
|
|
||
| THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, | ||
| EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF | ||
| MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND | ||
| NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE | ||
| LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION | ||
| OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION | ||
| WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. | ||
| */ |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
23 changes: 23 additions & 0 deletions
23
hugegraph-test/src/test/java/org/apache/hugegraph/benchmark/BenchmarkConstants.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,23 @@ | ||
| /* | ||
| * 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; | ||
|
|
||
| public class BenchmarkConstants { | ||
|
|
||
| public static String OUTPUT_PATH = "./hugegraph-test/target/"; | ||
| } |
42 changes: 42 additions & 0 deletions
42
hugegraph-test/src/test/java/org/apache/hugegraph/benchmark/SimpleRandom.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,42 @@ | ||
| /* | ||
| * 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; | ||
|
|
||
| import java.util.concurrent.atomic.AtomicLong; | ||
|
|
||
| /** | ||
| * Fairly fast random numbers | ||
| */ | ||
| public final class SimpleRandom { | ||
|
|
||
| private static final long MULTIPLIER = 0x5DEECE66DL; | ||
| private static final long ADD_END = 0xBL; | ||
| private static final long MASK = (1L << 48) - 1; | ||
| private static final AtomicLong SEG = new AtomicLong(-715159705); | ||
| private long seed; | ||
|
|
||
| public SimpleRandom() { | ||
| this.seed = System.nanoTime() + SEG.getAndAdd(129); | ||
| } | ||
|
|
||
| public int next() { | ||
| long nextSeed = (this.seed * MULTIPLIER + ADD_END) & MASK; | ||
| this.seed = nextSeed; | ||
| return ((int) (nextSeed >>> 17)) & 0x7FFFFFFF; | ||
| } | ||
| } |
137 changes: 137 additions & 0 deletions
137
...-test/src/test/java/org/apache/hugegraph/benchmark/map/MapRandomGetPutThroughputTest.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,137 @@ | ||
| /* | ||
| * 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.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 = {"1000", "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; | ||
|
|
||
| private static final String OUTPUT_FILE_NAME = "map_random_get_put_result.json"; | ||
|
|
||
| @Setup(Level.Trial) | ||
| public void prepareMap() { | ||
| this.concurrentHashMapNonCap = new ConcurrentHashMap<>(); | ||
| this.concurrentHashMap = new ConcurrentHashMap<>(MAP_CAPACITY); | ||
| this.intMapBySegments = new IntMap.IntMapBySegments(MAP_CAPACITY); | ||
| this.intMapByEcSegments = new IntMap.IntMapByEcSegment(); | ||
| } | ||
|
|
||
| /** | ||
| * 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 + OUTPUT_FILE_NAME) | ||
| .resultFormat(ResultFormatType.JSON) | ||
| .build(); | ||
| new Runner(opt).run(); | ||
| } | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters