Skip to content

Commit 0c736fa

Browse files
mriggermrigger
committed
Introduce a sqlancer.common.oracle package
1 parent cb1ba25 commit 0c736fa

48 files changed

Lines changed: 75 additions & 65 deletions

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎src/sqlancer/OracleFactory.java‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,8 @@
22

33
import java.sql.SQLException;
44

5+
import sqlancer.common.oracle.TestOracle;
6+
57
public interface OracleFactory<G extends GlobalState<?, ?>> {
68

79
TestOracle create(G globalState) throws SQLException;

‎src/sqlancer/ProviderAdapter.java‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,8 @@
66
import java.util.stream.Collectors;
77

88
import sqlancer.StateToReproduce.OracleRunReproductionState;
9+
import sqlancer.common.oracle.CompositeTestOracle;
10+
import sqlancer.common.oracle.TestOracle;
911

1012
public abstract class ProviderAdapter<G extends GlobalState<O, ?>, O extends DBMSSpecificOptions<? extends OracleFactory<G>>>
1113
implements DatabaseProvider<G, O> {

‎src/sqlancer/citus/CitusOptions.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,13 +7,13 @@
77

88
import com.beust.jcommander.Parameter;
99

10-
import sqlancer.CompositeTestOracle;
1110
import sqlancer.OracleFactory;
12-
import sqlancer.TestOracle;
1311
import sqlancer.citus.oracle.CitusNoRECOracle;
1412
import sqlancer.citus.oracle.tlp.CitusTLPAggregateOracle;
1513
import sqlancer.citus.oracle.tlp.CitusTLPHavingOracle;
1614
import sqlancer.citus.oracle.tlp.CitusTLPWhereOracle;
15+
import sqlancer.common.oracle.CompositeTestOracle;
16+
import sqlancer.common.oracle.TestOracle;
1717
import sqlancer.postgres.PostgresGlobalState;
1818
import sqlancer.postgres.PostgresOptions;
1919
import sqlancer.postgres.oracle.PostgresPivotedQuerySynthesisOracle;

‎src/sqlancer/citus/CitusProvider.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,6 @@
1212
import java.util.stream.Collectors;
1313

1414
import sqlancer.AbstractAction;
15-
import sqlancer.CompositeTestOracle;
1615
import sqlancer.ExpectedErrors;
1716
import sqlancer.IgnoreMeException;
1817
import sqlancer.Query;
@@ -21,7 +20,6 @@
2120
import sqlancer.Randomly;
2221
import sqlancer.SQLancerResultSet;
2322
import sqlancer.StatementExecutor;
24-
import sqlancer.TestOracle;
2523
import sqlancer.citus.gen.CitusAlterTableGenerator;
2624
import sqlancer.citus.gen.CitusCommon;
2725
import sqlancer.citus.gen.CitusDeleteGenerator;
@@ -30,6 +28,8 @@
3028
import sqlancer.citus.gen.CitusSetGenerator;
3129
import sqlancer.citus.gen.CitusUpdateGenerator;
3230
import sqlancer.citus.gen.CitusViewGenerator;
31+
import sqlancer.common.oracle.CompositeTestOracle;
32+
import sqlancer.common.oracle.TestOracle;
3333
import sqlancer.postgres.PostgresGlobalState;
3434
import sqlancer.postgres.PostgresOptions;
3535
import sqlancer.postgres.PostgresProvider;

‎src/sqlancer/clickhouse/ClickHouseOptions.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,14 +9,14 @@
99

1010
import sqlancer.DBMSSpecificOptions;
1111
import sqlancer.OracleFactory;
12-
import sqlancer.TestOracle;
1312
import sqlancer.clickhouse.ClickHouseOptions.ClickHouseOracleFactory;
1413
import sqlancer.clickhouse.ClickHouseProvider.ClickHouseGlobalState;
1514
import sqlancer.clickhouse.oracle.tlp.ClickHouseTLPAggregateOracle;
1615
import sqlancer.clickhouse.oracle.tlp.ClickHouseTLPDistinctOracle;
1716
import sqlancer.clickhouse.oracle.tlp.ClickHouseTLPGroupByOracle;
1817
import sqlancer.clickhouse.oracle.tlp.ClickHouseTLPHavingOracle;
1918
import sqlancer.clickhouse.oracle.tlp.ClickHouseTLPWhereOracle;
19+
import sqlancer.common.oracle.TestOracle;
2020

2121
@Parameters(separators = "=", commandDescription = "ClickHouse")
2222
public class ClickHouseOptions implements DBMSSpecificOptions<ClickHouseOracleFactory> {

‎src/sqlancer/clickhouse/gen/ClickHouseInsertGenerator.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,8 +10,8 @@
1010
import sqlancer.clickhouse.ClickHouseProvider.ClickHouseGlobalState;
1111
import sqlancer.clickhouse.ClickHouseSchema.ClickHouseColumn;
1212
import sqlancer.clickhouse.ClickHouseSchema.ClickHouseTable;
13-
import sqlancer.common.gen.AbstractInsertGenerator;
1413
import sqlancer.clickhouse.ClickHouseToStringVisitor;
14+
import sqlancer.common.gen.AbstractInsertGenerator;
1515

1616
public class ClickHouseInsertGenerator extends AbstractInsertGenerator<ClickHouseColumn> {
1717

‎src/sqlancer/clickhouse/oracle/tlp/ClickHouseTLPAggregateOracle.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,6 @@
1010
import sqlancer.QueryAdapter;
1111
import sqlancer.Randomly;
1212
import sqlancer.SQLancerResultSet;
13-
import sqlancer.TestOracle;
1413
import sqlancer.clickhouse.ClickHouseProvider;
1514
import sqlancer.clickhouse.ClickHouseSchema;
1615
import sqlancer.clickhouse.ClickHouseVisitor;
@@ -21,6 +20,7 @@
2120
import sqlancer.clickhouse.ast.ClickHouseUnaryPrefixOperation;
2221
import sqlancer.clickhouse.gen.ClickHouseCommon;
2322
import sqlancer.clickhouse.gen.ClickHouseExpressionGenerator;
23+
import sqlancer.common.oracle.TestOracle;
2424

2525
public class ClickHouseTLPAggregateOracle implements TestOracle {
2626

‎src/sqlancer/clickhouse/oracle/tlp/ClickHouseTLPBase.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,6 @@
66
import java.util.stream.Collectors;
77

88
import sqlancer.Randomly;
9-
import sqlancer.TernaryLogicPartitioningOracleBase;
10-
import sqlancer.TestOracle;
119
import sqlancer.clickhouse.ClickHouseErrors;
1210
import sqlancer.clickhouse.ClickHouseProvider.ClickHouseGlobalState;
1311
import sqlancer.clickhouse.ClickHouseSchema;
@@ -20,6 +18,8 @@
2018
import sqlancer.clickhouse.gen.ClickHouseCommon;
2119
import sqlancer.clickhouse.gen.ClickHouseExpressionGenerator;
2220
import sqlancer.common.gen.ExpressionGenerator;
21+
import sqlancer.common.oracle.TernaryLogicPartitioningOracleBase;
22+
import sqlancer.common.oracle.TestOracle;
2323

2424
public class ClickHouseTLPBase extends TernaryLogicPartitioningOracleBase<ClickHouseExpression, ClickHouseGlobalState>
2525
implements TestOracle {

‎src/sqlancer/cockroachdb/CockroachDBOptions.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,10 +8,8 @@
88
import com.beust.jcommander.Parameter;
99
import com.beust.jcommander.Parameters;
1010

11-
import sqlancer.CompositeTestOracle;
1211
import sqlancer.DBMSSpecificOptions;
1312
import sqlancer.OracleFactory;
14-
import sqlancer.TestOracle;
1513
import sqlancer.cockroachdb.CockroachDBOptions.CockroachDBOracleFactory;
1614
import sqlancer.cockroachdb.CockroachDBProvider.CockroachDBGlobalState;
1715
import sqlancer.cockroachdb.oracle.CockroachDBNoRECOracle;
@@ -22,6 +20,8 @@
2220
import sqlancer.cockroachdb.oracle.tlp.CockroachDBTLPHavingOracle;
2321
import sqlancer.cockroachdb.oracle.tlp.CockroachDBTLPJoinOracle;
2422
import sqlancer.cockroachdb.oracle.tlp.CockroachDBTLPWhereOracle;
23+
import sqlancer.common.oracle.CompositeTestOracle;
24+
import sqlancer.common.oracle.TestOracle;
2525

2626
@Parameters(separators = "=", commandDescription = "Test CockroachDB")
2727
public class CockroachDBOptions implements DBMSSpecificOptions<CockroachDBOracleFactory> {

‎src/sqlancer/cockroachdb/ast/CockroachDBUnaryArithmeticOperation.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,8 @@
22

33
import sqlancer.Randomly;
44
import sqlancer.cockroachdb.ast.CockroachDBUnaryArithmeticOperation.CockroachDBUnaryAritmeticOperator;
5-
import sqlancer.common.ast.UnaryOperatorNode;
65
import sqlancer.common.ast.BinaryOperatorNode.Operator;
6+
import sqlancer.common.ast.UnaryOperatorNode;
77

88
public class CockroachDBUnaryArithmeticOperation extends
99
UnaryOperatorNode<CockroachDBExpression, CockroachDBUnaryAritmeticOperator> implements CockroachDBExpression {

0 commit comments

Comments
 (0)