Skip to content

Commit 6ab4ce3

Browse files
Fixed issue where read annotations were not inherited
1 parent 6eed1e4 commit 6ab4ce3

File tree

4 files changed

+21
-21
lines changed

4 files changed

+21
-21
lines changed

src/main/scala/com/github/plume/oss/benchmarking/GraphReadBenchmark.scala

+2-19
Original file line numberDiff line numberDiff line change
@@ -1,33 +1,16 @@
11
package com.github.plume.oss.benchmarking
22

33
import com.github.plume.oss
4-
import com.github.plume.oss.{Benchmark, JimpleAst2Database, PlumeConfig, TinkerGraphConfig}
54
import com.github.plume.oss.drivers.{IDriver, TinkerGraphDriver}
5+
import com.github.plume.oss.{Benchmark, JimpleAst2Database, PlumeConfig, TinkerGraphConfig}
66
import io.joern.jimple2cpg.Config
77
import io.shiftleft.codepropertygraph.generated.{NodeTypes, PropertyNames}
8-
import org.openjdk.jmh.annotations.{
9-
Benchmark,
10-
Level,
11-
Measurement,
12-
OutputTimeUnit,
13-
Param,
14-
Scope,
15-
Setup,
16-
State,
17-
TearDown,
18-
Timeout,
19-
Warmup
20-
}
8+
import org.openjdk.jmh.annotations.*
219
import org.openjdk.jmh.infra.{BenchmarkParams, Blackhole}
2210

2311
import java.util.concurrent.TimeUnit
2412
import scala.compiletime.uninitialized
2513

26-
@State(Scope.Benchmark)
27-
@Timeout(5, TimeUnit.MINUTES)
28-
@OutputTimeUnit(TimeUnit.MILLISECONDS)
29-
@Measurement(iterations = 3, time = 5, timeUnit = TimeUnit.SECONDS)
30-
@Warmup(iterations = 1, time = 1, timeUnit = TimeUnit.SECONDS)
3114
trait GraphReadBenchmark {
3215

3316
@Param(Array(""))

src/main/scala/com/github/plume/oss/benchmarking/Neo4jEmbedReadBenchmark.scala

+6-1
Original file line numberDiff line numberDiff line change
@@ -5,16 +5,21 @@ import io.shiftleft.codepropertygraph.generated.EdgeTypes.AST
55
import io.shiftleft.codepropertygraph.generated.NodeTypes.{CALL, METHOD}
66
import io.shiftleft.codepropertygraph.generated.PropertyNames.{FULL_NAME, ORDER}
77
import org.neo4j.graphdb.GraphDatabaseService
8-
import org.openjdk.jmh.annotations.{Benchmark, Scope, Setup, State}
8+
import org.openjdk.jmh.annotations.{Benchmark, Measurement, OutputTimeUnit, Scope, Setup, State, Timeout, Warmup}
99
import org.openjdk.jmh.infra.{BenchmarkParams, Blackhole}
1010
import overflowdb.traversal.*
1111

1212
import java.util
13+
import java.util.concurrent.TimeUnit
1314
import scala.compiletime.uninitialized
1415
import scala.jdk.CollectionConverters.*
1516
import scala.util.{Random, Using}
1617

1718
@State(Scope.Benchmark)
19+
@Timeout(5, TimeUnit.MINUTES)
20+
@OutputTimeUnit(TimeUnit.MILLISECONDS)
21+
@Measurement(iterations = 3, time = 5, timeUnit = TimeUnit.SECONDS)
22+
@Warmup(iterations = 1, time = 1, timeUnit = TimeUnit.SECONDS)
1823
class Neo4jEmbedReadBenchmark extends GraphReadBenchmark {
1924

2025
private var g: GraphDatabaseService = uninitialized

src/main/scala/com/github/plume/oss/benchmarking/OverflowDbReadBenchmark.scala

+8-1
Original file line numberDiff line numberDiff line change
@@ -6,15 +6,22 @@ import io.shiftleft.codepropertygraph.generated.Cpg
66
import io.shiftleft.codepropertygraph.generated.EdgeTypes.AST
77
import io.shiftleft.codepropertygraph.generated.PropertyNames.ORDER
88
import io.shiftleft.codepropertygraph.generated.nodes.{Call, StoredNode}
9-
import org.openjdk.jmh.annotations.{Benchmark, Scope, Setup, State}
9+
import org.openjdk.jmh.annotations.{Benchmark, Measurement, OutputTimeUnit, Scope, Setup, State, Timeout, Warmup}
1010
import org.openjdk.jmh.infra.{BenchmarkParams, Blackhole}
1111
import overflowdb.PropertyKey
1212
import overflowdb.traversal.*
13+
1314
import scala.compiletime.uninitialized
1415
import scala.util.Random
1516
import io.shiftleft.semanticcpg.language.*
1617

18+
import java.util.concurrent.TimeUnit
19+
1720
@State(Scope.Benchmark)
21+
@Timeout(5, TimeUnit.MINUTES)
22+
@OutputTimeUnit(TimeUnit.MILLISECONDS)
23+
@Measurement(iterations = 3, time = 5, timeUnit = TimeUnit.SECONDS)
24+
@Warmup(iterations = 1, time = 1, timeUnit = TimeUnit.SECONDS)
1825
class OverflowDbReadBenchmark extends GraphReadBenchmark {
1926

2027
private var cpg: Cpg = uninitialized

src/main/scala/com/github/plume/oss/benchmarking/TinkerGraphReadBenchmark.scala

+5
Original file line numberDiff line numberDiff line change
@@ -10,11 +10,16 @@ import org.openjdk.jmh.annotations.*
1010
import org.openjdk.jmh.infra.{BenchmarkParams, Blackhole}
1111
import overflowdb.traversal.*
1212

13+
import java.util.concurrent.TimeUnit
1314
import scala.compiletime.uninitialized
1415
import scala.jdk.CollectionConverters.*
1516
import scala.util.Random
1617

1718
@State(Scope.Benchmark)
19+
@Timeout(5, TimeUnit.MINUTES)
20+
@OutputTimeUnit(TimeUnit.MILLISECONDS)
21+
@Measurement(iterations = 3, time = 5, timeUnit = TimeUnit.SECONDS)
22+
@Warmup(iterations = 1, time = 1, timeUnit = TimeUnit.SECONDS)
1823
class TinkerGraphReadBenchmark extends GraphReadBenchmark {
1924

2025
private var g: () => GraphTraversalSource = uninitialized

0 commit comments

Comments
 (0)