Skip to content

Commit bf2082f

Browse files
mriggermrigger
committed
Simplify and refactor some code
1 parent bc417bd commit bf2082f

9 files changed

Lines changed: 23 additions & 31 deletions

File tree

‎src/sqlancer/DatabaseProvider.java‎

Lines changed: 12 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,9 +17,19 @@ public interface DatabaseProvider<G extends GlobalState<O>, O> {
1717

1818
Connection createDatabase(String databaseName, StateToReproduce state) throws SQLException;
1919

20-
String getLogFileSubdirectoryName();
20+
21+
/**
22+
* The DBMS name is used to name the log directory and command to test the respective DBMS.
23+
*
24+
* @return
25+
*/
26+
String getDBMSName();
2127

22-
void printDatabaseSpecificState(FileWriter writer, StateToReproduce state);
28+
29+
// TODO: remove this
30+
default void printDatabaseSpecificState(FileWriter writer, StateToReproduce state) {
31+
32+
}
2333

2434
StateToReproduce getStateToReproduce(String databaseName);
2535

‎src/sqlancer/Main.java‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -76,7 +76,7 @@ public void write(String str) throws IOException {
7676

7777
public StateLogger(String databaseName, DatabaseProvider<?, ?> provider, MainOptions options) {
7878
this.provider = provider;
79-
File dir = new File(LOG_DIRECTORY, provider.getLogFileSubdirectoryName());
79+
File dir = new File(LOG_DIRECTORY, provider.getDBMSName());
8080
if (dir.exists() && !dir.isDirectory()) {
8181
throw new AssertionError(dir);
8282
}
@@ -90,7 +90,7 @@ public StateLogger(String databaseName, DatabaseProvider<?, ?> provider, MainOpt
9090
}
9191

9292
private synchronized void ensureExistsAndIsEmpty(File dir, DatabaseProvider<?, ?> provider) {
93-
if (initializedProvidersNames.contains(provider.getLogFileSubdirectoryName())) {
93+
if (initializedProvidersNames.contains(provider.getDBMSName())) {
9494
return;
9595
}
9696
if (!dir.exists()) {
@@ -105,7 +105,7 @@ private synchronized void ensureExistsAndIsEmpty(File dir, DatabaseProvider<?, ?
105105
file.delete();
106106
}
107107
}
108-
initializedProvidersNames.add(provider.getLogFileSubdirectoryName());
108+
initializedProvidersNames.add(provider.getDBMSName());
109109
}
110110

111111
private FileWriter getLogFileWriter() {
@@ -300,7 +300,7 @@ public static void main(String[] args) {
300300
Builder commandBuilder = JCommander.newBuilder()
301301
.addObject(options);
302302
for (DatabaseProvider<?, ?> provider : providers) {
303-
String name = provider.getLogFileSubdirectoryName();
303+
String name = provider.getDBMSName();
304304
Object command = provider.getCommand();
305305
if (command == null) {
306306
throw new IllegalStateException();

‎src/sqlancer/cockroachdb/CockroachDBProvider.java‎

Lines changed: 1 addition & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -306,16 +306,10 @@ public Connection createDatabase(String databaseName, StateToReproduce state) th
306306
}
307307

308308
@Override
309-
public String getLogFileSubdirectoryName() {
309+
public String getDBMSName() {
310310
return "cockroachdb";
311311
}
312312

313-
@Override
314-
public void printDatabaseSpecificState(FileWriter writer, StateToReproduce state) {
315-
// TODO Auto-generated method stub
316-
317-
}
318-
319313
@Override
320314
public StateToReproduce getStateToReproduce(String databaseName) {
321315
return new CockroachDBStateToReproduce(databaseName);

‎src/sqlancer/mariadb/MariaDBProvider.java‎

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
package sqlancer.mariadb;
22

3-
import java.io.FileWriter;
43
import java.sql.Connection;
54
import java.sql.DriverManager;
65
import java.sql.SQLException;
@@ -275,7 +274,7 @@ public Connection createDatabase(String databaseName, StateToReproduce state) th
275274
}
276275

277276
@Override
278-
public String getLogFileSubdirectoryName() {
277+
public String getDBMSName() {
279278
return "mariadb";
280279
}
281280

@@ -284,10 +283,6 @@ public String toString() {
284283
return String.format("MariaDBProvider [database: %s]", databaseName);
285284
}
286285

287-
@Override
288-
public void printDatabaseSpecificState(FileWriter writer, StateToReproduce state) {
289-
}
290-
291286
@Override
292287
public StateToReproduce getStateToReproduce(String databaseName) {
293288
return new MariaDBStateToReproduce(databaseName);

‎src/sqlancer/mysql/MySQLProvider.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -253,7 +253,7 @@ public Connection createDatabase(String databaseName, StateToReproduce state) th
253253
}
254254

255255
@Override
256-
public String getLogFileSubdirectoryName() {
256+
public String getDBMSName() {
257257
return "mysql";
258258
}
259259

‎src/sqlancer/postgres/PostgresProvider.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -313,7 +313,7 @@ private String getCreateDatabaseCommand(String databaseName, Connection con) {
313313
}
314314

315315
@Override
316-
public String getLogFileSubdirectoryName() {
316+
public String getDBMSName() {
317317
return "postgres";
318318
}
319319

‎src/sqlancer/sqlite3/SQLite3Provider.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -422,7 +422,7 @@ public Connection createDatabase(String databaseName, StateToReproduce state) th
422422
}
423423

424424
@Override
425-
public String getLogFileSubdirectoryName() {
425+
public String getDBMSName() {
426426
return "sqlite3";
427427
}
428428

‎src/sqlancer/tdengine/TDEngineProvider.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -268,7 +268,7 @@ private Query createDatabase(String databaseName) {
268268
}
269269

270270
@Override
271-
public String getLogFileSubdirectoryName() {
271+
public String getDBMSName() {
272272
return "tdengine";
273273
}
274274

‎src/sqlancer/tidb/TiDBProvider.java‎

Lines changed: 1 addition & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
package sqlancer.tidb;
22

3-
import java.io.FileWriter;
43
import java.io.IOException;
54
import java.sql.Connection;
65
import java.sql.DriverManager;
@@ -192,16 +191,10 @@ public Connection createDatabase(String databaseName, StateToReproduce state) th
192191
}
193192

194193
@Override
195-
public String getLogFileSubdirectoryName() {
194+
public String getDBMSName() {
196195
return "TiDB";
197196
}
198197

199-
@Override
200-
public void printDatabaseSpecificState(FileWriter writer, StateToReproduce state) {
201-
// TODO Auto-generated method stub
202-
203-
}
204-
205198
@Override
206199
public StateToReproduce getStateToReproduce(String databaseName) {
207200
return new MySQLStateToReproduce(databaseName);

0 commit comments

Comments
 (0)