Remove sampled benchmarks

Parth-Brahmbhatt · May 29, 2014 · 8711a29 · 8711a29
1 parent b5ae25f
commit 8711a29
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 49 deletions.
diff --git a/presto-benchmark/src/main/java/com/facebook/presto/benchmark/BenchmarkSuite.java b/presto-benchmark/src/main/java/com/facebook/presto/benchmark/BenchmarkSuite.java
@@ -26,14 +26,13 @@
 import java.util.Map;
 
 import static com.facebook.presto.benchmark.BenchmarkQueryRunner.createLocalQueryRunner;
-import static com.facebook.presto.benchmark.BenchmarkQueryRunner.createLocalSampledQueryRunner;
 import static com.google.common.base.Preconditions.checkNotNull;
 
 public class BenchmarkSuite
 {
  private static final Logger LOGGER = Logger.get(BenchmarkSuite.class);
 
- public static List<AbstractBenchmark> createBenchmarks(LocalQueryRunner localQueryRunner, LocalQueryRunner localSampledQueryRunner)
+ public static List<AbstractBenchmark> createBenchmarks(LocalQueryRunner localQueryRunner)
  {
  return ImmutableList.<AbstractBenchmark>of(
  // hand built benchmarks
@@ -73,12 +72,6 @@ public static List<AbstractBenchmark> createBenchmarks(LocalQueryRunner localQue
  new SqlApproximatePercentileBenchmark(localQueryRunner),
  new SqlBetweenBenchmark(localQueryRunner),
 
- // Sampled sql benchmarks
- new RenamingBenchmark("sampled_", new GroupBySumWithArithmeticSqlBenchmark(localSampledQueryRunner)),
- new RenamingBenchmark("sampled_", new CountAggregationSqlBenchmark(localSampledQueryRunner)),
- new RenamingBenchmark("sampled_", new SqlJoinWithPredicateBenchmark(localSampledQueryRunner)),
- new RenamingBenchmark("sampled_", new SqlDoubleSumAggregationBenchmark(localSampledQueryRunner)),
-
  // statistics benchmarks
  new StatisticsBenchmark.LongVarianceBenchmark(localQueryRunner),
  new StatisticsBenchmark.LongVariancePopBenchmark(localQueryRunner),
@@ -113,9 +106,8 @@ private File createOutputFile(String fileName)
  public void runAllBenchmarks()
  throws IOException
  {
- try (LocalQueryRunner localQueryRunner = createLocalQueryRunner();
- LocalQueryRunner localSampledQueryRunner = createLocalSampledQueryRunner()) {
- List<AbstractBenchmark> benchmarks = createBenchmarks(localQueryRunner, localSampledQueryRunner);
+ try (LocalQueryRunner localQueryRunner = createLocalQueryRunner()) {
+ List<AbstractBenchmark> benchmarks = createBenchmarks(localQueryRunner);
 
  LOGGER.info("=== Pre-running all benchmarks for JVM warmup ===");
  for (AbstractBenchmark benchmark : benchmarks) {

diff --git a/presto-benchmark/src/main/java/com/facebook/presto/benchmark/RenamingBenchmark.java b/presto-benchmark/src/main/java/com/facebook/presto/benchmark/RenamingBenchmark.java
diff --git a/presto-benchmark/src/test/java/com/facebook/presto/benchmark/TestBenchmarks.java b/presto-benchmark/src/test/java/com/facebook/presto/benchmark/TestBenchmarks.java
@@ -17,7 +17,6 @@
 import org.testng.annotations.Test;
 
 import static com.facebook.presto.benchmark.BenchmarkQueryRunner.createLocalQueryRunner;
-import static com.facebook.presto.benchmark.BenchmarkQueryRunner.createLocalSampledQueryRunner;
 import static com.facebook.presto.benchmark.BenchmarkSuite.createBenchmarks;
 
 public class TestBenchmarks
@@ -26,9 +25,8 @@ public class TestBenchmarks
  public void smokeTest()
  throws Exception
  {
- try (LocalQueryRunner localQueryRunner = createLocalQueryRunner();
- LocalQueryRunner localSampledQueryRunner = createLocalSampledQueryRunner()) {
- for (AbstractBenchmark benchmark : createBenchmarks(localQueryRunner, localSampledQueryRunner)) {
+ try (LocalQueryRunner localQueryRunner = createLocalQueryRunner()) {
+ for (AbstractBenchmark benchmark : createBenchmarks(localQueryRunner)) {
  try {
  benchmark.runOnce();
  }