Address some spotbugs issues

mrigger · mrigger · commit 6b8c3439f5e8 · 2020-05-26T23:19:07.000+02:00
diff --git a/src/sqlancer/mariadb/MariaDBSchema.java b/src/sqlancer/mariadb/MariaDBSchema.java
@@ -14,7 +14,6 @@
 
 import sqlancer.Randomly;
 import sqlancer.mariadb.MariaDBSchema.MariaDBTable.MariaDBEngine;
-import sqlancer.sqlite3.schema.SQLite3Schema.SQLite3Column;
 
 public class MariaDBSchema {
 
@@ -59,7 +58,7 @@ public int hashCode() {
 
 		@Override
 		public boolean equals(Object obj) {
-			if (!(obj instanceof SQLite3Column)) {
+			if (!(obj instanceof MariaDBColumn)) {
 				return false;
 			} else {
 				MariaDBColumn c = (MariaDBColumn) obj;
diff --git a/src/sqlancer/mysql/MySQLProvider.java b/src/sqlancer/mysql/MySQLProvider.java
@@ -125,6 +125,7 @@ private static int mapActions(MySQLGlobalState globalState, Action a) {
 		case CHECK_TABLE:
 		case ANALYZE_TABLE:
 			nrPerformed = r.getInteger(0, 2);
+			break;
 		case ALTER_TABLE:
 			nrPerformed = r.getInteger(0, 5);
 			break;
@@ -133,6 +134,7 @@ private static int mapActions(MySQLGlobalState globalState, Action a) {
 			break;
 		case SELECT_INFO:
 			nrPerformed = r.getInteger(0, 10);
+			break;
 		case DELETE:
 			nrPerformed = r.getInteger(0, 10);
 			break;
diff --git a/src/sqlancer/postgres/PostgresProvider.java b/src/sqlancer/postgres/PostgresProvider.java
@@ -205,8 +205,8 @@ public void generateAndTestDatabase(PostgresGlobalState globalState) throws SQLE
 		while (globalState.getSchema().getDatabaseTables().size() < 1) {
 			try {
 				String tableName = SQLite3Common.createTableName(globalState.getSchema().getDatabaseTables().size());
-				Query createTable = PostgresTableGenerator.generate(tableName, globalState.getRandomly(),
-						globalState.getSchema(), GENERATE_ONLY_KNOWN, globalState);
+				Query createTable = PostgresTableGenerator.generate(tableName, globalState.getSchema(),
+						GENERATE_ONLY_KNOWN, globalState);
 				if (options.logEachSelect()) {
 					logger.writeCurrent(createTable.getQueryString());
 				}
diff --git a/src/sqlancer/postgres/gen/PostgresTableGenerator.java b/src/sqlancer/postgres/gen/PostgresTableGenerator.java
@@ -32,7 +32,7 @@ public class PostgresTableGenerator {
 	private boolean generateOnlyKnown;
 	private PostgresGlobalState globalState;
 
-	public PostgresTableGenerator(String tableName, Randomly r, PostgresSchema newSchema, boolean generateOnlyKnown,
+	public PostgresTableGenerator(String tableName, PostgresSchema newSchema, boolean generateOnlyKnown,
 			PostgresGlobalState globalState) {
 		this.tableName = tableName;
 		this.newSchema = newSchema;
@@ -57,9 +57,9 @@ public PostgresTableGenerator(String tableName, Randomly r, PostgresSchema newSc
 		PostgresCommon.addCommonTableErrors(errors);
 	}
 
-	public static Query generate(String tableName, Randomly r, PostgresSchema newSchema, boolean generateOnlyKnown,
+	public static Query generate(String tableName, PostgresSchema newSchema, boolean generateOnlyKnown,
 			PostgresGlobalState globalState) {
-		return new PostgresTableGenerator(tableName, r, newSchema, generateOnlyKnown, globalState).generate();
+		return new PostgresTableGenerator(tableName, newSchema, generateOnlyKnown, globalState).generate();
 	}
 
 	private Query generate() {
diff --git a/src/sqlancer/sqlite3/schema/SQLite3Schema.java b/src/sqlancer/sqlite3/schema/SQLite3Schema.java
@@ -206,7 +206,7 @@ public SQLite3RowValue getRandomRowValue(Connection con, SQLite3StateToReproduce
 					SQLite3Constant constant = getConstant(randomRowValues, columnIndex, valueType);
 					values.put(column, constant);
 				}
-				assert (!randomRowValues.next());
+				assert !randomRowValues.next();
 				state.randomRowValues = values;
 				return new SQLite3RowValue(this, values);
 			}

Original file line number	Diff line number	Diff line change
`@@ -206,7 +206,7 @@ public SQLite3RowValue getRandomRowValue(Connection con, SQLite3StateToReproduce`
`206`	`206`	`SQLite3Constant constant = getConstant(randomRowValues, columnIndex, valueType);`
`207`	`207`	`values.put(column, constant);`
`208`	`208`	`}`
`209`		`- assert (!randomRowValues.next());`
	`209`	`+ assert !randomRowValues.next();`
`210`	`210`	`state.randomRowValues = values;`
`211`	`211`	`return new SQLite3RowValue(this, values);`
`212`	`212`	`}`