From 9b98148282a5cfa52d2391bbdc379a5a2416b74a Mon Sep 17 00:00:00 2001 From: Liran Funaro Date: Wed, 5 Jan 2022 15:14:43 +0200 Subject: [PATCH] Remove "offheap" IncrementalIndex from Benchmarks --- .../apache/druid/benchmark/FilteredAggregatorBenchmark.java | 4 ++-- .../druid/benchmark/IncrementalIndexRowTypeBenchmark.java | 2 +- .../benchmark/indexing/IncrementalIndexReadBenchmark.java | 2 +- .../druid/benchmark/indexing/IndexIngestionBenchmark.java | 2 +- .../druid/benchmark/indexing/IndexPersistBenchmark.java | 2 +- .../org/apache/druid/benchmark/query/GroupByBenchmark.java | 2 +- .../java/org/apache/druid/benchmark/query/ScanBenchmark.java | 2 +- .../org/apache/druid/benchmark/query/SearchBenchmark.java | 2 +- .../org/apache/druid/benchmark/query/TimeseriesBenchmark.java | 2 +- .../java/org/apache/druid/benchmark/query/TopNBenchmark.java | 2 +- 10 files changed, 11 insertions(+), 11 deletions(-) diff --git a/benchmarks/src/test/java/org/apache/druid/benchmark/FilteredAggregatorBenchmark.java b/benchmarks/src/test/java/org/apache/druid/benchmark/FilteredAggregatorBenchmark.java index 9c42bca4e44d..8675ce291ef7 100644 --- a/benchmarks/src/test/java/org/apache/druid/benchmark/FilteredAggregatorBenchmark.java +++ b/benchmarks/src/test/java/org/apache/druid/benchmark/FilteredAggregatorBenchmark.java @@ -204,7 +204,7 @@ public void setup() @State(Scope.Benchmark) public static class IncrementalIndexState { - @Param({"onheap", "offheap"}) + @Param({"onheap"}) private String indexType; IncrementalIndex incIndex; @@ -234,7 +234,7 @@ public void tearDown() @State(Scope.Benchmark) public static class IncrementalIndexIngestState { - @Param({"onheap", "offheap"}) + @Param({"onheap"}) private String indexType; IncrementalIndex incIndex; diff --git a/benchmarks/src/test/java/org/apache/druid/benchmark/IncrementalIndexRowTypeBenchmark.java b/benchmarks/src/test/java/org/apache/druid/benchmark/IncrementalIndexRowTypeBenchmark.java index 9687a888d91c..9d9cb400e454 100644 --- a/benchmarks/src/test/java/org/apache/druid/benchmark/IncrementalIndexRowTypeBenchmark.java +++ b/benchmarks/src/test/java/org/apache/druid/benchmark/IncrementalIndexRowTypeBenchmark.java @@ -59,7 +59,7 @@ public class IncrementalIndexRowTypeBenchmark @Param({"250000"}) private int rowsPerSegment; - @Param({"onheap", "offheap"}) + @Param({"onheap"}) private String indexType; private AppendableIndexSpec appendableIndexSpec; diff --git a/benchmarks/src/test/java/org/apache/druid/benchmark/indexing/IncrementalIndexReadBenchmark.java b/benchmarks/src/test/java/org/apache/druid/benchmark/indexing/IncrementalIndexReadBenchmark.java index bfc3c2975260..4c34ffba6ba6 100644 --- a/benchmarks/src/test/java/org/apache/druid/benchmark/indexing/IncrementalIndexReadBenchmark.java +++ b/benchmarks/src/test/java/org/apache/druid/benchmark/indexing/IncrementalIndexReadBenchmark.java @@ -84,7 +84,7 @@ public class IncrementalIndexReadBenchmark @Param({"true", "false"}) private boolean rollup; - @Param({"onheap", "offheap"}) + @Param({"onheap"}) private String indexType; private static final Logger log = new Logger(IncrementalIndexReadBenchmark.class); diff --git a/benchmarks/src/test/java/org/apache/druid/benchmark/indexing/IndexIngestionBenchmark.java b/benchmarks/src/test/java/org/apache/druid/benchmark/indexing/IndexIngestionBenchmark.java index 310f155432d7..0b647fb41aaa 100644 --- a/benchmarks/src/test/java/org/apache/druid/benchmark/indexing/IndexIngestionBenchmark.java +++ b/benchmarks/src/test/java/org/apache/druid/benchmark/indexing/IndexIngestionBenchmark.java @@ -68,7 +68,7 @@ public class IndexIngestionBenchmark @Param({"none", "moderate", "high"}) private String rollupOpportunity; - @Param({"onheap", "offheap"}) + @Param({"onheap"}) private String indexType; private static final Logger log = new Logger(IndexIngestionBenchmark.class); diff --git a/benchmarks/src/test/java/org/apache/druid/benchmark/indexing/IndexPersistBenchmark.java b/benchmarks/src/test/java/org/apache/druid/benchmark/indexing/IndexPersistBenchmark.java index 9b91a70293e5..825875bcfb05 100644 --- a/benchmarks/src/test/java/org/apache/druid/benchmark/indexing/IndexPersistBenchmark.java +++ b/benchmarks/src/test/java/org/apache/druid/benchmark/indexing/IndexPersistBenchmark.java @@ -93,7 +93,7 @@ public class IndexPersistBenchmark @Param({"none", "moderate", "high"}) private String rollupOpportunity; - @Param({"onheap", "offheap"}) + @Param({"onheap"}) private String indexType; private AppendableIndexSpec appendableIndexSpec; diff --git a/benchmarks/src/test/java/org/apache/druid/benchmark/query/GroupByBenchmark.java b/benchmarks/src/test/java/org/apache/druid/benchmark/query/GroupByBenchmark.java index 6310dd499dbd..1524c6c9b25d 100644 --- a/benchmarks/src/test/java/org/apache/druid/benchmark/query/GroupByBenchmark.java +++ b/benchmarks/src/test/java/org/apache/druid/benchmark/query/GroupByBenchmark.java @@ -532,7 +532,7 @@ public String getFormatString() @State(Scope.Benchmark) public static class IncrementalIndexState { - @Param({"onheap", "offheap"}) + @Param({"onheap"}) private String indexType; IncrementalIndex incIndex; diff --git a/benchmarks/src/test/java/org/apache/druid/benchmark/query/ScanBenchmark.java b/benchmarks/src/test/java/org/apache/druid/benchmark/query/ScanBenchmark.java index b9ae2a40f662..ac2cfccb553f 100644 --- a/benchmarks/src/test/java/org/apache/druid/benchmark/query/ScanBenchmark.java +++ b/benchmarks/src/test/java/org/apache/druid/benchmark/query/ScanBenchmark.java @@ -281,7 +281,7 @@ public void setup() @State(Scope.Benchmark) public static class IncrementalIndexState { - @Param({"onheap", "offheap"}) + @Param({"onheap"}) private String indexType; IncrementalIndex incIndex; diff --git a/benchmarks/src/test/java/org/apache/druid/benchmark/query/SearchBenchmark.java b/benchmarks/src/test/java/org/apache/druid/benchmark/query/SearchBenchmark.java index a3de820c0682..6c2be93ea91a 100644 --- a/benchmarks/src/test/java/org/apache/druid/benchmark/query/SearchBenchmark.java +++ b/benchmarks/src/test/java/org/apache/druid/benchmark/query/SearchBenchmark.java @@ -351,7 +351,7 @@ public void setup() @State(Scope.Benchmark) public static class IncrementalIndexState { - @Param({"onheap", "offheap"}) + @Param({"onheap"}) private String indexType; IncrementalIndex incIndex; diff --git a/benchmarks/src/test/java/org/apache/druid/benchmark/query/TimeseriesBenchmark.java b/benchmarks/src/test/java/org/apache/druid/benchmark/query/TimeseriesBenchmark.java index 1f271e22274c..b9d6b335aabf 100644 --- a/benchmarks/src/test/java/org/apache/druid/benchmark/query/TimeseriesBenchmark.java +++ b/benchmarks/src/test/java/org/apache/druid/benchmark/query/TimeseriesBenchmark.java @@ -276,7 +276,7 @@ public void setup() @State(Scope.Benchmark) public static class IncrementalIndexState { - @Param({"onheap", "offheap"}) + @Param({"onheap"}) private String indexType; IncrementalIndex incIndex; diff --git a/benchmarks/src/test/java/org/apache/druid/benchmark/query/TopNBenchmark.java b/benchmarks/src/test/java/org/apache/druid/benchmark/query/TopNBenchmark.java index 3eaf7dc85f48..169b15a08c50 100644 --- a/benchmarks/src/test/java/org/apache/druid/benchmark/query/TopNBenchmark.java +++ b/benchmarks/src/test/java/org/apache/druid/benchmark/query/TopNBenchmark.java @@ -254,7 +254,7 @@ public void setup() @State(Scope.Benchmark) public static class IncrementalIndexState { - @Param({"onheap", "offheap"}) + @Param({"onheap"}) private String indexType; IncrementalIndex incIndex;