Add a method to get the test oracle factories from the DBMS-specific options

mrigger · mrigger · commit 38bf58c7d18d · 2020-08-12T21:42:12.000+02:00
diff --git a/src/sqlancer/DBMSSpecificOptions.java b/src/sqlancer/DBMSSpecificOptions.java
@@ -1,5 +1,9 @@
 package sqlancer;
 
-public interface DBMSSpecificOptions {
+import java.util.List;
+
+public interface DBMSSpecificOptions<F extends OracleFactory<? extends GlobalState<?, ?>>> {
+
+    List<F> getTestOracleFactory();
 
 }
diff --git a/src/sqlancer/DatabaseProvider.java b/src/sqlancer/DatabaseProvider.java
@@ -4,7 +4,7 @@
 import java.sql.Connection;
 import java.sql.SQLException;
 
-public interface DatabaseProvider<G extends GlobalState<O, ?>, O extends DBMSSpecificOptions> {
+public interface DatabaseProvider<G extends GlobalState<O, ?>, O extends DBMSSpecificOptions<?>> {
 
     /**
      * Gets the the {@link GlobalState} class.
diff --git a/src/sqlancer/GlobalState.java b/src/sqlancer/GlobalState.java
@@ -12,7 +12,7 @@
  * @param <O>
  *            the option parameter.
  */
-public abstract class GlobalState<O extends DBMSSpecificOptions, S> {
+public abstract class GlobalState<O extends DBMSSpecificOptions<?>, S> {
 
     private Connection con;
     private Randomly r;
diff --git a/src/sqlancer/Main.java b/src/sqlancer/Main.java
@@ -288,7 +288,7 @@ public static void main(String[] args) {
         System.exit(executeMain(args));
     }
 
-    public static class DBMSExecutor<G extends GlobalState<O, ?>, O extends DBMSSpecificOptions> {
+    public static class DBMSExecutor<G extends GlobalState<O, ?>, O extends DBMSSpecificOptions<?>> {
 
         private final DatabaseProvider<G, O> provider;
         private final MainOptions options;
@@ -363,7 +363,7 @@ public StateToReproduce getStateToReproduce() {
         }
     }
 
-    public static class DBMSExecutorFactory<G extends GlobalState<O, ?>, O extends DBMSSpecificOptions> {
+    public static class DBMSExecutorFactory<G extends GlobalState<O, ?>, O extends DBMSSpecificOptions<?>> {
 
         private final DatabaseProvider<G, O> provider;
         private final MainOptions options;
diff --git a/src/sqlancer/ProviderAdapter.java b/src/sqlancer/ProviderAdapter.java
@@ -5,7 +5,7 @@
 
 import sqlancer.StateToReproduce.OracleRunReproductionState;
 
-public abstract class ProviderAdapter<G extends GlobalState<O, ?>, O extends DBMSSpecificOptions>
+public abstract class ProviderAdapter<G extends GlobalState<O, ?>, O extends DBMSSpecificOptions<?>>
         implements DatabaseProvider<G, O> {
 
     private final Class<G> globalClass;
diff --git a/src/sqlancer/clickhouse/ClickHouseOptions.java b/src/sqlancer/clickhouse/ClickHouseOptions.java
@@ -10,6 +10,7 @@
 import sqlancer.DBMSSpecificOptions;
 import sqlancer.OracleFactory;
 import sqlancer.TestOracle;
+import sqlancer.clickhouse.ClickHouseOptions.ClickHouseOracleFactory;
 import sqlancer.clickhouse.ClickHouseProvider.ClickHouseGlobalState;
 import sqlancer.clickhouse.oracle.tlp.ClickHouseTLPAggregateOracle;
 import sqlancer.clickhouse.oracle.tlp.ClickHouseTLPDistinctOracle;
@@ -18,7 +19,7 @@
 import sqlancer.clickhouse.oracle.tlp.ClickHouseTLPWhereOracle;
 
 @Parameters(separators = "=", commandDescription = "ClickHouse")
-public class ClickHouseOptions implements DBMSSpecificOptions {
+public class ClickHouseOptions implements DBMSSpecificOptions<ClickHouseOracleFactory> {
 
     @Parameter(names = "--oracle")
     public List<ClickHouseOracleFactory> oracle = Arrays.asList(ClickHouseOracleFactory.TLPWhere);
@@ -59,4 +60,9 @@ public TestOracle create(ClickHouseProvider.ClickHouseGlobalState globalState) t
         };
 
     }
+
+    @Override
+    public List<ClickHouseOracleFactory> getTestOracleFactory() {
+        return oracle;
+    }
 }
diff --git a/src/sqlancer/cockroachdb/CockroachDBOptions.java b/src/sqlancer/cockroachdb/CockroachDBOptions.java
@@ -2,6 +2,7 @@
 
 import java.sql.SQLException;
 import java.util.ArrayList;
+import java.util.Arrays;
 import java.util.List;
 
 import com.beust.jcommander.Parameter;
@@ -11,6 +12,7 @@
 import sqlancer.DBMSSpecificOptions;
 import sqlancer.OracleFactory;
 import sqlancer.TestOracle;
+import sqlancer.cockroachdb.CockroachDBOptions.CockroachDBOracleFactory;
 import sqlancer.cockroachdb.CockroachDBProvider.CockroachDBGlobalState;
 import sqlancer.cockroachdb.oracle.CockroachDBNoRECOracle;
 import sqlancer.cockroachdb.oracle.tlp.CockroachDBTLPAggregateOracle;
@@ -22,7 +24,7 @@
 import sqlancer.cockroachdb.oracle.tlp.CockroachDBTLPWhereOracle;
 
 @Parameters(separators = "=", commandDescription = "Test CockroachDB")
-public class CockroachDBOptions implements DBMSSpecificOptions {
+public class CockroachDBOptions implements DBMSSpecificOptions<CockroachDBOracleFactory> {
 
     @Parameter(names = "--oracle")
     public CockroachDBOracleFactory oracle = CockroachDBOracleFactory.NOREC;
@@ -105,4 +107,9 @@ public TestOracle create(CockroachDBGlobalState globalState) throws SQLException
             "--increased-vectorization" }, description = "Generate VECTORIZE=on with a higher probability (which found a number of bugs in the past)")
     public boolean makeVectorizationMoreLikely = true;
 
+    @Override
+    public List<CockroachDBOracleFactory> getTestOracleFactory() {
+        return Arrays.asList(oracle);
+    }
+
 }
diff --git a/src/sqlancer/duckdb/DuckDBOptions.java b/src/sqlancer/duckdb/DuckDBOptions.java
@@ -12,6 +12,7 @@
 import sqlancer.DBMSSpecificOptions;
 import sqlancer.OracleFactory;
 import sqlancer.TestOracle;
+import sqlancer.duckdb.DuckDBOptions.DuckDBOracleFactory;
 import sqlancer.duckdb.DuckDBProvider.DuckDBGlobalState;
 import sqlancer.duckdb.test.DuckDBNoRECOracle;
 import sqlancer.duckdb.test.DuckDBQueryPartitioningAggregateTester;
@@ -21,7 +22,7 @@
 import sqlancer.duckdb.test.DuckDBQueryPartitioningWhereTester;
 
 @Parameters
-public class DuckDBOptions implements DBMSSpecificOptions {
+public class DuckDBOptions implements DBMSSpecificOptions<DuckDBOracleFactory> {
 
     @Parameter(names = "--test-collate", arity = 1)
     public boolean testCollate = true;
@@ -90,7 +91,7 @@ public class DuckDBOptions implements DBMSSpecificOptions {
     public int maxNumUpdates = 5;
 
     @Parameter(names = "--oracle")
-    public List<DuckDBOracleFactory> oracle = Arrays.asList(DuckDBOracleFactory.QUERY_PARTITIONING);
+    public List<DuckDBOracleFactory> oracles = Arrays.asList(DuckDBOracleFactory.QUERY_PARTITIONING);
 
     public enum DuckDBOracleFactory implements OracleFactory<DuckDBGlobalState> {
         NOREC {
@@ -148,4 +149,9 @@ public TestOracle create(DuckDBGlobalState globalState) throws SQLException {
 
     }
 
+    @Override
+    public List<DuckDBOracleFactory> getTestOracleFactory() {
+        return oracles;
+    }
+
 }
diff --git a/src/sqlancer/duckdb/DuckDBProvider.java b/src/sqlancer/duckdb/DuckDBProvider.java
@@ -120,7 +120,7 @@ public void generateDatabase(DuckDBGlobalState globalState) throws SQLException
 
     @Override
     protected TestOracle getTestOracle(DuckDBGlobalState globalState) throws SQLException {
-        return new CompositeTestOracle(globalState.getDmbsSpecificOptions().oracle.stream().map(o -> {
+        return new CompositeTestOracle(globalState.getDmbsSpecificOptions().oracles.stream().map(o -> {
             try {
                 return o.create(globalState);
             } catch (SQLException e1) {
diff --git a/src/sqlancer/mariadb/MariaDBOptions.java b/src/sqlancer/mariadb/MariaDBOptions.java
@@ -1,10 +1,40 @@
 package sqlancer.mariadb;
 
+import java.sql.SQLException;
+import java.util.Arrays;
+import java.util.List;
+
+import com.beust.jcommander.Parameter;
 import com.beust.jcommander.Parameters;
 
 import sqlancer.DBMSSpecificOptions;
+import sqlancer.OracleFactory;
+import sqlancer.TestOracle;
+import sqlancer.mariadb.MariaDBOptions.MariaDBOracleFactory;
+import sqlancer.mariadb.MariaDBProvider.MariaDBGlobalState;
+import sqlancer.mariadb.oracle.MariaDBNoRECOracle;
 
 @Parameters
-public class MariaDBOptions implements DBMSSpecificOptions {
+public class MariaDBOptions implements DBMSSpecificOptions<MariaDBOracleFactory> {
+
+    @Parameter(names = "--oracle")
+    public List<MariaDBOracleFactory> oracles = Arrays.asList(MariaDBOracleFactory.NOREC);
+
+    public enum MariaDBOracleFactory implements OracleFactory<MariaDBGlobalState> {
+
+        NOREC {
+
+            @Override
+            public TestOracle create(MariaDBGlobalState globalState) throws SQLException {
+                return new MariaDBNoRECOracle(globalState);
+            }
+
+        }
+    }
+
+    @Override
+    public List<MariaDBOracleFactory> getTestOracleFactory() {
+        return oracles;
+    }
 
 }
diff --git a/src/sqlancer/mysql/MySQLOptions.java b/src/sqlancer/mysql/MySQLOptions.java
@@ -1,10 +1,39 @@
 package sqlancer.mysql;
 
+import java.sql.SQLException;
+import java.util.Arrays;
+import java.util.List;
+
+import com.beust.jcommander.Parameter;
 import com.beust.jcommander.Parameters;
 
 import sqlancer.DBMSSpecificOptions;
+import sqlancer.OracleFactory;
+import sqlancer.TestOracle;
+import sqlancer.mysql.MySQLOptions.MySQLOracleFactory;
+import sqlancer.mysql.oracle.MySQLTLPWhereOracle;
 
 @Parameters
-public class MySQLOptions implements DBMSSpecificOptions {
+public class MySQLOptions implements DBMSSpecificOptions<MySQLOracleFactory> {
+
+    @Parameter(names = "--oracle")
+    public List<MySQLOracleFactory> oracles = Arrays.asList(MySQLOracleFactory.TLP_WHERE);
+
+    public enum MySQLOracleFactory implements OracleFactory<MySQLGlobalState> {
+
+        TLP_WHERE {
+
+            @Override
+            public TestOracle create(MySQLGlobalState globalState) throws SQLException {
+                return new MySQLTLPWhereOracle(globalState);
+            }
+
+        }
+    }
+
+    @Override
+    public List<MySQLOracleFactory> getTestOracleFactory() {
+        return oracles;
+    }
 
 }
diff --git a/src/sqlancer/postgres/PostgresOptions.java b/src/sqlancer/postgres/PostgresOptions.java
@@ -12,14 +12,15 @@
 import sqlancer.DBMSSpecificOptions;
 import sqlancer.OracleFactory;
 import sqlancer.TestOracle;
+import sqlancer.postgres.PostgresOptions.PostgresOracleFactory;
 import sqlancer.postgres.oracle.PostgresNoRECOracle;
 import sqlancer.postgres.oracle.PostgresPivotedQuerySynthesisOracle;
 import sqlancer.postgres.oracle.tlp.PostgresTLPAggregateOracle;
 import sqlancer.postgres.oracle.tlp.PostgresTLPHavingOracle;
 import sqlancer.postgres.oracle.tlp.PostgresTLPWhereOracle;
 
 @Parameters
-public class PostgresOptions implements DBMSSpecificOptions {
+public class PostgresOptions implements DBMSSpecificOptions<PostgresOracleFactory> {
 
     @Parameter(names = "--bulk-insert")
     public boolean allowBulkInsert;
@@ -67,4 +68,9 @@ public TestOracle create(PostgresGlobalState globalState) throws SQLException {
 
     }
 
+    @Override
+    public List<PostgresOracleFactory> getTestOracleFactory() {
+        return oracle;
+    }
+
 }
diff --git a/src/sqlancer/sqlite3/SQLite3Options.java b/src/sqlancer/sqlite3/SQLite3Options.java
@@ -2,6 +2,7 @@
 
 import java.sql.SQLException;
 import java.util.ArrayList;
+import java.util.Arrays;
 import java.util.List;
 
 import com.beust.jcommander.Parameter;
@@ -11,6 +12,7 @@
 import sqlancer.DBMSSpecificOptions;
 import sqlancer.OracleFactory;
 import sqlancer.TestOracle;
+import sqlancer.sqlite3.SQLite3Options.SQLite3OracleFactory;
 import sqlancer.sqlite3.SQLite3Provider.SQLite3GlobalState;
 import sqlancer.sqlite3.oracle.SQLite3Fuzzer;
 import sqlancer.sqlite3.oracle.SQLite3NoRECOracle;
@@ -22,7 +24,7 @@
 import sqlancer.sqlite3.oracle.tlp.SQLite3TLPWhereOracle;
 
 @Parameters(separators = "=", commandDescription = "SQLite3")
-public class SQLite3Options implements DBMSSpecificOptions {
+public class SQLite3Options implements DBMSSpecificOptions<SQLite3OracleFactory> {
 
     @Parameter(names = { "--test-fts" }, description = "Test the FTS extensions", arity = 1)
     public boolean testFts = true;
@@ -72,7 +74,7 @@ public class SQLite3Options implements DBMSSpecificOptions {
     public boolean testDistinctInView;
 
     @Parameter(names = "--oracle")
-    public SQLite3OracleFactory oracle = SQLite3OracleFactory.NoREC;
+    public SQLite3OracleFactory oracles = SQLite3OracleFactory.NoREC;
 
     @Parameter(names = {
             "--delete-existing-databases" }, description = "Delete a database file if it already exists", arity = 1)
@@ -154,4 +156,9 @@ public TestOracle create(SQLite3GlobalState globalState) throws SQLException {
 
     }
 
+    @Override
+    public List<SQLite3OracleFactory> getTestOracleFactory() {
+        return Arrays.asList(oracles);
+    }
+
 }
diff --git a/src/sqlancer/sqlite3/SQLite3Provider.java b/src/sqlancer/sqlite3/SQLite3Provider.java
@@ -282,7 +282,7 @@ public void generateDatabase(SQLite3GlobalState globalState) throws SQLException
 
     @Override
     protected TestOracle getTestOracle(SQLite3GlobalState globalState) throws SQLException {
-        TestOracle oracle = globalState.getDmbsSpecificOptions().oracle.create(globalState);
+        TestOracle oracle = globalState.getDmbsSpecificOptions().oracles.create(globalState);
         if (oracle.onlyWorksForNonEmptyTables()) {
             for (SQLite3Table table : globalState.getSchema().getDatabaseTables()) {
                 int nrRows = SQLite3Schema.getNrRows(globalState, table.getName());
diff --git a/src/sqlancer/tidb/TiDBOptions.java b/src/sqlancer/tidb/TiDBOptions.java
@@ -12,12 +12,13 @@
 import sqlancer.DBMSSpecificOptions;
 import sqlancer.OracleFactory;
 import sqlancer.TestOracle;
+import sqlancer.tidb.TiDBOptions.TiDBOracleFactory;
 import sqlancer.tidb.TiDBProvider.TiDBGlobalState;
 import sqlancer.tidb.oracle.TiDBTLPHavingOracle;
 import sqlancer.tidb.oracle.TiDBTLPWhereOracle;
 
 @Parameters
-public class TiDBOptions implements DBMSSpecificOptions {
+public class TiDBOptions implements DBMSSpecificOptions<TiDBOracleFactory> {
 
     @Parameter(names = "--oracle")
     public List<TiDBOracleFactory> oracle = Arrays.asList(TiDBOracleFactory.QUERY_PARTITIONING);
@@ -47,4 +48,9 @@ public TestOracle create(TiDBGlobalState globalState) throws SQLException {
 
     }
 
+    @Override
+    public List<TiDBOracleFactory> getTestOracleFactory() {
+        return oracle;
+    }
+
 }

Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,9 @@`
`1`	`1`	`package sqlancer;`
`2`	`2`
`3`		`-public interface DBMSSpecificOptions {`
	`3`	`+import java.util.List;`
	`4`	`+`
	`5`	`+public interface DBMSSpecificOptions<F extends OracleFactory<? extends GlobalState<?, ?>>> {`
	`6`	`+`
	`7`	`+ List<F> getTestOracleFactory();`
`4`	`8`
`5`	`9`	`}`
Original file line number	Diff line number	Diff line change
`@@ -288,7 +288,7 @@ public static void main(String[] args) {`
`288`	`288`	`System.exit(executeMain(args));`
`289`	`289`	`}`
`290`	`290`
`291`		`- public static class DBMSExecutor<G extends GlobalState<O, ?>, O extends DBMSSpecificOptions> {`
	`291`	`+ public static class DBMSExecutor<G extends GlobalState<O, ?>, O extends DBMSSpecificOptions<?>> {`
`292`	`292`
`293`	`293`	`private final DatabaseProvider<G, O> provider;`
`294`	`294`	`private final MainOptions options;`
`@@ -363,7 +363,7 @@ public StateToReproduce getStateToReproduce() {`
`363`	`363`	`}`
`364`	`364`	`}`
`365`	`365`
`366`		`- public static class DBMSExecutorFactory<G extends GlobalState<O, ?>, O extends DBMSSpecificOptions> {`
	`366`	`+ public static class DBMSExecutorFactory<G extends GlobalState<O, ?>, O extends DBMSSpecificOptions<?>> {`
`367`	`367`
`368`	`368`	`private final DatabaseProvider<G, O> provider;`
`369`	`369`	`private final MainOptions options;`