Address various new PMD issues

mrigger · mrigger · commit c8e8b9e56b96 · 2020-12-08T23:28:35.000+01:00
diff --git a/configs/pmd-rules.xml b/configs/pmd-rules.xml
@@ -17,12 +17,13 @@
 		<exclude name="AvoidStringBufferField" />
 		<exclude name="PreserveStackTrace" /> <!-- TODO -->
 		<exclude name="WhileLoopWithLiteralBoolean" />
-		<exclude name="PositionLiteralsFirstInComparisons" />
+		<exclude name="LiteralsFirstInComparisons" />
 		<exclude name="ForLoopCanBeForeach" />
 		<exclude name="CheckResultSet" />
 		<exclude name="UseTryWithResources" />
 		<exclude name="AvoidReassigningLoopVariables" />
 		<exclude name="AbstractClassWithoutAbstractMethod" />
+		<exclude name="UnusedAssignment" />
 		<priority>2</priority>
 	</rule>
 
diff --git a/src/sqlancer/cockroachdb/oracle/tlp/CockroachDBTLPAggregateOracle.java b/src/sqlancer/cockroachdb/oracle/tlp/CockroachDBTLPAggregateOracle.java
@@ -107,7 +107,7 @@ private String createMetamorphicUnionQuery(CockroachDBSelect select, CockroachDB
         CockroachDBSelect leftSelect = getSelect(mappedAggregate, from, whereClause, select.getJoinList());
         CockroachDBSelect middleSelect = getSelect(mappedAggregate, from, negatedClause, select.getJoinList());
         CockroachDBSelect rightSelect = getSelect(mappedAggregate, from, notNullClause, select.getJoinList());
-        metamorphicQuery = "SELECT " + getOuterAggregateFunction(aggregate).toString() + " FROM (";
+        metamorphicQuery = "SELECT " + getOuterAggregateFunction(aggregate) + " FROM (";
         metamorphicQuery += CockroachDBVisitor.asString(leftSelect) + " UNION ALL "
                 + CockroachDBVisitor.asString(middleSelect) + " UNION ALL " + CockroachDBVisitor.asString(rightSelect);
         metamorphicQuery += ")";
diff --git a/src/sqlancer/cockroachdb/oracle/tlp/CockroachDBTLPGroupByOracle.java b/src/sqlancer/cockroachdb/oracle/tlp/CockroachDBTLPGroupByOracle.java
@@ -42,10 +42,8 @@ public void check() throws SQLException {
 
     @Override
     List<CockroachDBExpression> generateFetchColumns() {
-        List<CockroachDBExpression> columns = new ArrayList<>();
-        columns = Randomly.nonEmptySubset(targetTables.getColumns().stream().map(c -> new CockroachDBColumnReference(c))
+        return Randomly.nonEmptySubset(targetTables.getColumns().stream().map(c -> new CockroachDBColumnReference(c))
                 .collect(Collectors.toList()));
-        return columns;
     }
 
 }
diff --git a/src/sqlancer/common/query/SQLQueryAdapter.java b/src/sqlancer/common/query/SQLQueryAdapter.java
@@ -113,7 +113,7 @@ public void checkException(Exception e) throws AssertionError {
         } else {
             s = globalState.getConnection().createStatement();
         }
-        ResultSet result = null;
+        ResultSet result;
         try {
             if (fills.length > 0) {
                 result = ((PreparedStatement) s).executeQuery();
diff --git a/src/sqlancer/duckdb/DuckDBProvider.java b/src/sqlancer/duckdb/DuckDBProvider.java
@@ -96,7 +96,7 @@ protected DuckDBSchema readSchema() throws SQLException {
     @Override
     public void generateDatabase(DuckDBGlobalState globalState) throws Exception {
         for (int i = 0; i < Randomly.fromOptions(1, 2); i++) {
-            boolean success = false;
+            boolean success;
             do {
                 SQLQueryAdapter qt = new DuckDBTableGenerator().getQuery(globalState);
                 success = globalState.executeStatement(qt);
diff --git a/src/sqlancer/duckdb/test/DuckDBQueryPartitioningAggregateTester.java b/src/sqlancer/duckdb/test/DuckDBQueryPartitioningAggregateTester.java
@@ -89,7 +89,7 @@ private String createMetamorphicUnionQuery(DuckDBSelect select,
         DuckDBSelect leftSelect = getSelect(mappedAggregate, from, whereClause, select.getJoinList());
         DuckDBSelect middleSelect = getSelect(mappedAggregate, from, negatedClause, select.getJoinList());
         DuckDBSelect rightSelect = getSelect(mappedAggregate, from, notNullClause, select.getJoinList());
-        metamorphicQuery = "SELECT " + getOuterAggregateFunction(aggregate).toString() + " FROM (";
+        metamorphicQuery = "SELECT " + getOuterAggregateFunction(aggregate) + " FROM (";
         metamorphicQuery += DuckDBToStringVisitor.asString(leftSelect) + " UNION ALL "
                 + DuckDBToStringVisitor.asString(middleSelect) + " UNION ALL "
                 + DuckDBToStringVisitor.asString(rightSelect);
diff --git a/src/sqlancer/duckdb/test/DuckDBQueryPartitioningGroupByTester.java b/src/sqlancer/duckdb/test/DuckDBQueryPartitioningGroupByTester.java
@@ -46,10 +46,8 @@ public void check() throws SQLException {
 
     @Override
     List<Node<DuckDBExpression>> generateFetchColumns() {
-        List<Node<DuckDBExpression>> columns = new ArrayList<>();
-        columns = Randomly.nonEmptySubset(targetTables.getColumns()).stream()
+        return Randomly.nonEmptySubset(targetTables.getColumns()).stream()
                 .map(c -> new ColumnReferenceNode<DuckDBExpression, DuckDBColumn>(c)).collect(Collectors.toList());
-        return columns;
     }
 
 }
diff --git a/src/sqlancer/h2/H2Provider.java b/src/sqlancer/h2/H2Provider.java
@@ -77,7 +77,7 @@ public void generateDatabase(H2GlobalState globalState) throws Exception {
         if (Randomly.getBoolean()) {
             H2SetGenerator.getQuery(globalState).execute(globalState);
         }
-        boolean success = false;
+        boolean success;
         for (int i = 0; i < Randomly.fromOptions(1, 2, 3); i++) {
             do {
                 SQLQueryAdapter qt = new H2TableGenerator().getQuery(globalState);
diff --git a/src/sqlancer/h2/H2TableGenerator.java b/src/sqlancer/h2/H2TableGenerator.java
@@ -18,7 +18,9 @@ public class H2TableGenerator {
     public SQLQueryAdapter getQuery(H2GlobalState globalState) {
         ExpectedErrors errors = new ExpectedErrors();
         errors.add("already exists");
-        StringBuilder sb = new StringBuilder("CREATE TABLE " + globalState.getSchema().getFreeTableName() + "(");
+        StringBuilder sb = new StringBuilder("CREATE TABLE ");
+        sb.append(globalState.getSchema().getFreeTableName());
+        sb.append("(");
         List<String> columnNames = new ArrayList<>();
         for (int i = 0; i < Randomly.fromOptions(1, 2, 3); i++) {
             columnNames.add("c" + i);
diff --git a/src/sqlancer/mariadb/oracle/MariaDBNoRECOracle.java b/src/sqlancer/mariadb/oracle/MariaDBNoRECOracle.java
@@ -106,7 +106,7 @@ private int getOptimizedQuery(MariaDBTable randomTable, MariaDBExpression random
         select.setFromTables(Arrays.asList(randomTable));
         select.setWhereClause(randomWhereCondition);
         select.setSelectType(MariaDBSelectType.ALL);
-        int firstCount = 0;
+        int firstCount;
         optimizedQueryString = MariaDBVisitor.asString(select);
         SQLQueryAdapter q = new SQLQueryAdapter(optimizedQueryString, errors);
         try (SQLancerResultSet rs = q.executeAndGet(state)) {
diff --git a/src/sqlancer/postgres/oracle/tlp/PostgresTLPAggregateOracle.java b/src/sqlancer/postgres/oracle/tlp/PostgresTLPAggregateOracle.java
@@ -94,7 +94,7 @@ private String createMetamorphicUnionQuery(PostgresSelect select, PostgresAggreg
         PostgresSelect leftSelect = getSelect(mappedAggregate, from, whereClause, select.getJoinClauses());
         PostgresSelect middleSelect = getSelect(mappedAggregate, from, negatedClause, select.getJoinClauses());
         PostgresSelect rightSelect = getSelect(mappedAggregate, from, notNullClause, select.getJoinClauses());
-        metamorphicQuery = "SELECT " + getOuterAggregateFunction(aggregate).toString() + " FROM (";
+        metamorphicQuery = "SELECT " + getOuterAggregateFunction(aggregate) + " FROM (";
         metamorphicQuery += PostgresVisitor.asString(leftSelect) + " UNION ALL "
                 + PostgresVisitor.asString(middleSelect) + " UNION ALL " + PostgresVisitor.asString(rightSelect);
         metamorphicQuery += ") as asdf";
diff --git a/src/sqlancer/sqlite3/gen/ddl/SQLite3TableGenerator.java b/src/sqlancer/sqlite3/gen/ddl/SQLite3TableGenerator.java
@@ -152,7 +152,7 @@ private void addColumnConstraints(String s) {
      */
     private void addForeignKey() {
         assert globalState.getDmbsSpecificOptions().testForeignKeys;
-        List<String> foreignKeyColumns = new ArrayList<>();
+        List<String> foreignKeyColumns;
         if (Randomly.getBoolean()) {
             foreignKeyColumns = Arrays.asList(Randomly.fromList(columnNames));
         } else {
diff --git a/src/sqlancer/sqlite3/oracle/tlp/SQLite3TLPGroupByOracle.java b/src/sqlancer/sqlite3/oracle/tlp/SQLite3TLPGroupByOracle.java
@@ -42,10 +42,8 @@ public void check() throws SQLException {
 
     @Override
     List<SQLite3Expression> generateFetchColumns() {
-        List<SQLite3Expression> columns = new ArrayList<>();
-        columns = Randomly.nonEmptySubset(targetTables.getColumns()).stream().map(c -> new SQLite3ColumnName(c, null))
+        return Randomly.nonEmptySubset(targetTables.getColumns()).stream().map(c -> new SQLite3ColumnName(c, null))
                 .collect(Collectors.toList());
-        return columns;
     }
 
 }
diff --git a/src/sqlancer/sqlite3/schema/SQLite3Schema.java b/src/sqlancer/sqlite3/schema/SQLite3Schema.java
@@ -290,7 +290,6 @@ public static SQLite3Schema fromConnection(SQLite3GlobalState globalState) throw
                             || tableName.endsWith("_config") || tableName.endsWith("_segdir")
                             || tableName.endsWith("_stat") || tableName.endsWith("_segments")
                             || tableName.contains("_")) {
-                        isReadOnly = true;
                         continue; // TODO
                     } else if (sqlString.contains("using dbstat")) {
                         isReadOnly = true;
diff --git a/src/sqlancer/tidb/TiDBProvider.java b/src/sqlancer/tidb/TiDBProvider.java
@@ -105,7 +105,7 @@ private static int mapActions(TiDBGlobalState globalState, Action a) {
     @Override
     public void generateDatabase(TiDBGlobalState globalState) throws Exception {
         for (int i = 0; i < Randomly.fromOptions(1, 2); i++) {
-            boolean success = false;
+            boolean success;
             do {
                 SQLQueryAdapter qt = new TiDBTableGenerator().getQuery(globalState);
                 success = globalState.executeStatement(qt);

Original file line number	Diff line number	Diff line change
`@@ -42,10 +42,8 @@ public void check() throws SQLException {`
`42`	`42`
`43`	`43`	`@Override`
`44`	`44`	`List<CockroachDBExpression> generateFetchColumns() {`
`45`		`- List<CockroachDBExpression> columns = new ArrayList<>();`
`46`		`- columns = Randomly.nonEmptySubset(targetTables.getColumns().stream().map(c -> new CockroachDBColumnReference(c))`
	`45`	`+ return Randomly.nonEmptySubset(targetTables.getColumns().stream().map(c -> new CockroachDBColumnReference(c))`
`47`	`46`	`.collect(Collectors.toList()));`
`48`		`- return columns;`
`49`	`47`	`}`
`50`	`48`
`51`	`49`	`}`
Original file line number	Diff line number	Diff line change
`@@ -113,7 +113,7 @@ public void checkException(Exception e) throws AssertionError {`
`113`	`113`	`} else {`
`114`	`114`	`s = globalState.getConnection().createStatement();`
`115`	`115`	`}`
`116`		`- ResultSet result = null;`
	`116`	`+ ResultSet result;`
`117`	`117`	`try {`
`118`	`118`	`if (fills.length > 0) {`
`119`	`119`	`result = ((PreparedStatement) s).executeQuery();`
Original file line number	Diff line number	Diff line change
`@@ -46,10 +46,8 @@ public void check() throws SQLException {`
`46`	`46`
`47`	`47`	`@Override`
`48`	`48`	`List<Node<DuckDBExpression>> generateFetchColumns() {`
`49`		`- List<Node<DuckDBExpression>> columns = new ArrayList<>();`
`50`		`- columns = Randomly.nonEmptySubset(targetTables.getColumns()).stream()`
	`49`	`+ return Randomly.nonEmptySubset(targetTables.getColumns()).stream()`
`51`	`50`	`.map(c -> new ColumnReferenceNode<DuckDBExpression, DuckDBColumn>(c)).collect(Collectors.toList());`
`52`		`- return columns;`
`53`	`51`	`}`
`54`	`52`
`55`	`53`	`}`
Original file line number	Diff line number	Diff line change
`@@ -77,7 +77,7 @@ public void generateDatabase(H2GlobalState globalState) throws Exception {`
`77`	`77`	`if (Randomly.getBoolean()) {`
`78`	`78`	`H2SetGenerator.getQuery(globalState).execute(globalState);`
`79`	`79`	`}`
`80`		`- boolean success = false;`
	`80`	`+ boolean success;`
`81`	`81`	`for (int i = 0; i < Randomly.fromOptions(1, 2, 3); i++) {`
`82`	`82`	`do {`
`83`	`83`	`SQLQueryAdapter qt = new H2TableGenerator().getQuery(globalState);`