Skip to content

Commit 8faf6bd

Browse files
mriggermrigger
committed
Make the naming of the test oracles consistent
1 parent 20011f3 commit 8faf6bd

42 files changed

Lines changed: 188 additions & 208 deletions

Some content is hidden

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

‎.checkstyle‎

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
<?xml version="1.0" encoding="UTF-8"?>
2+
3+
<fileset-config file-format-version="1.2.0" simple-config="true" sync-formatter="false">
4+
<fileset name="all" enabled="true" check-config-name="Google Checks" local="false">
5+
<file-match-pattern match-pattern=".*" include-pattern="true"/>
6+
</fileset>
7+
</fileset-config>

‎src/sqlancer/clickhouse/ClickhouseProvider.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@
2121
import sqlancer.clickhouse.ClickhouseProvider.ClickhouseGlobalState;
2222
import sqlancer.clickhouse.gen.ClickhouseInsertGenerator;
2323
import sqlancer.clickhouse.gen.ClickhouseTableGenerator;
24-
import sqlancer.clickhouse.oracle.ClickhouseQueryPartitioningWhereTester;
24+
import sqlancer.clickhouse.oracle.ClickhouseTLPWhereOracle;
2525

2626
public class ClickhouseProvider implements DatabaseProvider<ClickhouseGlobalState, ClickhouseOptions> {
2727

@@ -102,7 +102,7 @@ public void generateAndTestDatabase(ClickhouseGlobalState globalState) throws SQ
102102
se.executeStatements();
103103
manager.incrementCreateDatabase();
104104

105-
ClickhouseQueryPartitioningWhereTester oracle = new ClickhouseQueryPartitioningWhereTester(globalState);
105+
ClickhouseTLPWhereOracle oracle = new ClickhouseTLPWhereOracle(globalState);
106106

107107
for (int i = 0; i < globalState.getOptions().getNrQueries(); i++) {
108108
try {

src/sqlancer/clickhouse/oracle/ClickhouseQueryPartitioningWhereTester.java renamed to src/sqlancer/clickhouse/oracle/ClickhouseTLPWhereOracle.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,9 +10,9 @@
1010
import sqlancer.clickhouse.ClickhouseProvider.ClickhouseGlobalState;
1111
import sqlancer.clickhouse.ClickhouseToStringVisitor;
1212

13-
public class ClickhouseQueryPartitioningWhereTester extends ClickhouseQueryPartitioningBase {
13+
public class ClickhouseTLPWhereOracle extends ClickhouseQueryPartitioningBase {
1414

15-
public ClickhouseQueryPartitioningWhereTester(ClickhouseGlobalState state) {
15+
public ClickhouseTLPWhereOracle(ClickhouseGlobalState state) {
1616
super(state);
1717
}
1818

‎src/sqlancer/cockroachdb/CockroachDBOptions.java‎

Lines changed: 20 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -8,16 +8,16 @@
88
import sqlancer.MainOptions.DBMSConverter;
99
import sqlancer.TestOracle;
1010
import sqlancer.cockroachdb.CockroachDBProvider.CockroachDBGlobalState;
11-
import sqlancer.cockroachdb.oracle.CockroachDBNoRECTester;
12-
import sqlancer.cockroachdb.oracle.CockroachDBNoTableTester;
13-
import sqlancer.cockroachdb.oracle.CockroachDBQueryPartitioningAggregateTester;
14-
import sqlancer.cockroachdb.oracle.CockroachDBQueryPartitioningDistinctTester;
15-
import sqlancer.cockroachdb.oracle.CockroachDBQueryPartitioningExtendedWhereTester;
16-
import sqlancer.cockroachdb.oracle.CockroachDBQueryPartitioningGroupByTester;
17-
import sqlancer.cockroachdb.oracle.CockroachDBQueryPartitioningHavingTester;
18-
import sqlancer.cockroachdb.oracle.CockroachDBQueryPartitioningJoinTester;
19-
import sqlancer.cockroachdb.oracle.CockroachDBQueryPartitioningTester;
20-
import sqlancer.cockroachdb.oracle.CockroachDBQueryPartitioningWhereTester;
11+
import sqlancer.cockroachdb.oracle.CockroachDBNoRECOracle;
12+
import sqlancer.cockroachdb.oracle.CockroachDBNoTableOracle;
13+
import sqlancer.cockroachdb.oracle.tlp.CockroachDBTLPAggregateOracle;
14+
import sqlancer.cockroachdb.oracle.tlp.CockroachDBTLPDistinctOracle;
15+
import sqlancer.cockroachdb.oracle.tlp.CockroachDBTLPExtendedWhereOracle;
16+
import sqlancer.cockroachdb.oracle.tlp.CockroachDBTLPGroupByOracle;
17+
import sqlancer.cockroachdb.oracle.tlp.CockroachDBTLPHavingOracle;
18+
import sqlancer.cockroachdb.oracle.tlp.CockroachDBTLPJoinOracle;
19+
import sqlancer.cockroachdb.oracle.tlp.CockroachDBTLPOracle;
20+
import sqlancer.cockroachdb.oracle.tlp.CockroachDBTLPWhereOracle;
2121

2222
@Parameters(separators = "=", commandDescription = "Test CockroachDB")
2323
public class CockroachDBOptions {
@@ -29,63 +29,63 @@ public enum CockroachDBOracle {
2929
NOREC {
3030
@Override
3131
public TestOracle create(CockroachDBGlobalState globalState) throws SQLException {
32-
return new CockroachDBNoRECTester(globalState);
32+
return new CockroachDBNoRECOracle(globalState);
3333
}
3434
},
3535
AGGREGATE {
3636

3737
@Override
3838
public TestOracle create(CockroachDBGlobalState globalState) throws SQLException {
39-
return new CockroachDBQueryPartitioningAggregateTester(globalState);
39+
return new CockroachDBTLPAggregateOracle(globalState);
4040
}
4141

4242
},
4343
NOTABLE {
4444
@Override
4545
public TestOracle create(CockroachDBGlobalState globalState) throws SQLException {
46-
return new CockroachDBNoTableTester(globalState);
46+
return new CockroachDBNoTableOracle(globalState);
4747
}
4848
},
4949
GROUP_BY {
5050
@Override
5151
public TestOracle create(CockroachDBGlobalState globalState) throws SQLException {
52-
return new CockroachDBQueryPartitioningGroupByTester(globalState);
52+
return new CockroachDBTLPGroupByOracle(globalState);
5353
}
5454
},
5555
HAVING {
5656
@Override
5757
public TestOracle create(CockroachDBGlobalState globalState) throws SQLException {
58-
return new CockroachDBQueryPartitioningHavingTester(globalState);
58+
return new CockroachDBTLPHavingOracle(globalState);
5959
}
6060
},
6161
WHERE {
6262
@Override
6363
public TestOracle create(CockroachDBGlobalState globalState) throws SQLException {
64-
return new CockroachDBQueryPartitioningWhereTester(globalState);
64+
return new CockroachDBTLPWhereOracle(globalState);
6565
}
6666
},
6767
DISTINCT {
6868
@Override
6969
public TestOracle create(CockroachDBGlobalState globalState) throws SQLException {
70-
return new CockroachDBQueryPartitioningDistinctTester(globalState);
70+
return new CockroachDBTLPDistinctOracle(globalState);
7171
}
7272
},
7373
EXTENDED_WHERE {
7474
@Override
7575
public TestOracle create(CockroachDBGlobalState globalState) throws SQLException {
76-
return new CockroachDBQueryPartitioningExtendedWhereTester(globalState);
76+
return new CockroachDBTLPExtendedWhereOracle(globalState);
7777
}
7878
},
7979
JOIN {
8080
@Override
8181
public TestOracle create(CockroachDBGlobalState globalState) throws SQLException {
82-
return new CockroachDBQueryPartitioningJoinTester(globalState);
82+
return new CockroachDBTLPJoinOracle(globalState);
8383
}
8484
},
8585
QUERY_PARTITIONING {
8686
@Override
8787
public TestOracle create(CockroachDBGlobalState globalState) throws SQLException {
88-
return new CockroachDBQueryPartitioningTester(globalState);
88+
return new CockroachDBTLPOracle(globalState);
8989
}
9090
};
9191

‎src/sqlancer/cockroachdb/gen/CockroachDBRandomQuerySynthesizer.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
import sqlancer.cockroachdb.ast.CockroachDBExpression;
1616
import sqlancer.cockroachdb.ast.CockroachDBSelect;
1717
import sqlancer.cockroachdb.ast.CockroachDBTableReference;
18-
import sqlancer.cockroachdb.oracle.CockroachDBNoRECTester;
18+
import sqlancer.cockroachdb.oracle.CockroachDBNoRECOracle;
1919

2020
public final class CockroachDBRandomQuerySynthesizer {
2121

@@ -50,7 +50,7 @@ public static CockroachDBSelect generateSelect(CockroachDBGlobalState globalStat
5050
.map(t -> new CockroachDBTableReference(t)).collect(Collectors.toList());
5151
List<CockroachDBExpression> updatedTableList = CockroachDBCommon.getTableReferences(tableList);
5252
if (Randomly.getBoolean()) {
53-
select.setJoinList(CockroachDBNoRECTester.getJoins(updatedTableList, globalState));
53+
select.setJoinList(CockroachDBNoRECOracle.getJoins(updatedTableList, globalState));
5454
}
5555
select.setFromList(updatedTableList);
5656
if (Randomly.getBoolean()) {

src/sqlancer/cockroachdb/oracle/CockroachDBNoRECTester.java renamed to src/sqlancer/cockroachdb/oracle/CockroachDBNoRECOracle.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -30,15 +30,15 @@
3030
import sqlancer.cockroachdb.ast.CockroachDBTableReference;
3131
import sqlancer.cockroachdb.gen.CockroachDBExpressionGenerator;
3232

33-
public class CockroachDBNoRECTester implements TestOracle {
33+
public class CockroachDBNoRECOracle implements TestOracle {
3434

3535
private final CockroachDBGlobalState globalState;
3636
private final Set<String> errors = new HashSet<>();
3737
private String optimizableQueryString;
3838
private String unoptimizedQuery;
3939
private CockroachDBExpressionGenerator gen;
4040

41-
public CockroachDBNoRECTester(CockroachDBGlobalState globalState) {
41+
public CockroachDBNoRECOracle(CockroachDBGlobalState globalState) {
4242
this.globalState = globalState;
4343
CockroachDBErrors.addExpressionErrors(errors);
4444
CockroachDBErrors.addTransactionErrors(errors);

src/sqlancer/cockroachdb/oracle/CockroachDBNoTableTester.java renamed to src/sqlancer/cockroachdb/oracle/CockroachDBNoTableOracle.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,12 +22,12 @@
2222
import sqlancer.cockroachdb.ast.CockroachDBTableReference;
2323
import sqlancer.cockroachdb.gen.CockroachDBRandomQuerySynthesizer;
2424

25-
public class CockroachDBNoTableTester implements TestOracle {
25+
public class CockroachDBNoTableOracle implements TestOracle {
2626

2727
private final CockroachDBGlobalState state;
2828
private final Set<String> errors = new HashSet<>();
2929

30-
public CockroachDBNoTableTester(CockroachDBGlobalState state) {
30+
public CockroachDBNoTableOracle(CockroachDBGlobalState state) {
3131
this.state = state;
3232
CockroachDBErrors.addExpressionErrors(errors);
3333

‎src/sqlancer/cockroachdb/oracle/CockroachDBQueryPartitioningTester.java‎

Lines changed: 0 additions & 32 deletions
This file was deleted.

src/sqlancer/cockroachdb/oracle/CockroachDBQueryPartitioningAggregateTester.java renamed to src/sqlancer/cockroachdb/oracle/tlp/CockroachDBTLPAggregateOracle.java

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package sqlancer.cockroachdb.oracle;
1+
package sqlancer.cockroachdb.oracle.tlp;
22

33
import java.sql.ResultSet;
44
import java.sql.SQLException;
@@ -34,8 +34,9 @@
3434
import sqlancer.cockroachdb.ast.CockroachDBUnaryPostfixOperation;
3535
import sqlancer.cockroachdb.ast.CockroachDBUnaryPostfixOperation.CockroachDBUnaryPostfixOperator;
3636
import sqlancer.cockroachdb.gen.CockroachDBExpressionGenerator;
37+
import sqlancer.cockroachdb.oracle.CockroachDBNoRECOracle;
3738

38-
public class CockroachDBQueryPartitioningAggregateTester implements TestOracle {
39+
public class CockroachDBTLPAggregateOracle implements TestOracle {
3940

4041
private final CockroachDBGlobalState state;
4142
private final Set<String> errors = new HashSet<>();
@@ -45,7 +46,7 @@ public class CockroachDBQueryPartitioningAggregateTester implements TestOracle {
4546
private String originalQuery;
4647
private String metamorphicQuery;
4748

48-
public CockroachDBQueryPartitioningAggregateTester(CockroachDBGlobalState state) {
49+
public CockroachDBTLPAggregateOracle(CockroachDBGlobalState state) {
4950
this.state = state;
5051
CockroachDBErrors.addExpressionErrors(errors);
5152
errors.add("interface conversion: coldata.column");
@@ -72,7 +73,7 @@ public void check() throws SQLException {
7273
.map(t -> new CockroachDBTableReference(t)).collect(Collectors.toList());
7374
List<CockroachDBExpression> from = CockroachDBCommon.getTableReferences(tableList);
7475
if (Randomly.getBooleanWithRatherLowProbability()) {
75-
select.setJoinList(CockroachDBNoRECTester.getJoins(from, state));
76+
select.setJoinList(CockroachDBNoRECOracle.getJoins(from, state));
7677
}
7778
select.setFromList(from);
7879
if (Randomly.getBooleanWithRatherLowProbability()) {

src/sqlancer/cockroachdb/oracle/CockroachDBQueryPartitioningBase.java renamed to src/sqlancer/cockroachdb/oracle/tlp/CockroachDBTLPBase.java

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package sqlancer.cockroachdb.oracle;
1+
package sqlancer.cockroachdb.oracle.tlp;
22

33
import java.sql.SQLException;
44
import java.util.ArrayList;
@@ -24,8 +24,9 @@
2424
import sqlancer.cockroachdb.ast.CockroachDBUnaryPostfixOperation;
2525
import sqlancer.cockroachdb.ast.CockroachDBUnaryPostfixOperation.CockroachDBUnaryPostfixOperator;
2626
import sqlancer.cockroachdb.gen.CockroachDBExpressionGenerator;
27+
import sqlancer.cockroachdb.oracle.CockroachDBNoRECOracle;
2728

28-
public class CockroachDBQueryPartitioningBase implements TestOracle {
29+
public class CockroachDBTLPBase implements TestOracle {
2930

3031
final CockroachDBGlobalState state;
3132
final Set<String> errors = new HashSet<>();
@@ -38,7 +39,7 @@ public class CockroachDBQueryPartitioningBase implements TestOracle {
3839
CockroachDBExpression negatedPredicate;
3940
CockroachDBExpression isNullPredicate;
4041

41-
public CockroachDBQueryPartitioningBase(CockroachDBGlobalState state) {
42+
public CockroachDBTLPBase(CockroachDBGlobalState state) {
4243
this.state = state;
4344
CockroachDBErrors.addExpressionErrors(errors);
4445
}
@@ -53,7 +54,7 @@ public void check() throws SQLException {
5354
List<CockroachDBTable> tables = targetTables.getTables();
5455
List<CockroachDBExpression> tableList = tables.stream().map(t -> new CockroachDBTableReference(t))
5556
.collect(Collectors.toList());
56-
List<CockroachDBExpression> joins = CockroachDBNoRECTester.getJoins(tableList, state);
57+
List<CockroachDBExpression> joins = CockroachDBNoRECOracle.getJoins(tableList, state);
5758
select.setJoinList(joins);
5859
select.setFromList(tableList);
5960
select.setWhereClause(null);

0 commit comments

Comments
 (0)