Fix the reporting of the issued queries count when using the composite test oracle

mrigger · mrigger · commit 6639739615e8 · 2020-08-02T23:21:01.000+02:00
diff --git a/src/sqlancer/CompositeTestOracle.java b/src/sqlancer/CompositeTestOracle.java
@@ -6,16 +6,22 @@
 public class CompositeTestOracle implements TestOracle {
 
     private final TestOracle[] oracles;
+    private final GlobalState<?, ?> globalState;
     private int i;
 
-    public CompositeTestOracle(List<TestOracle> oracles) {
+    public CompositeTestOracle(List<TestOracle> oracles, GlobalState<?, ?> globalState) {
+        this.globalState = globalState;
         this.oracles = oracles.toArray(new TestOracle[oracles.size()]);
     }
 
     @Override
     public void check() throws SQLException {
         try {
             oracles[i].check();
+            boolean lastOracleIndex = i == oracles.length - 1;
+            if (!lastOracleIndex) {
+                globalState.getManager().incrementSelectQueryCount();
+            }
         } finally {
             i = (i + 1) % oracles.length;
         }
diff --git a/src/sqlancer/clickhouse/ClickHouseProvider.java b/src/sqlancer/clickhouse/ClickHouseProvider.java
@@ -111,7 +111,7 @@ protected TestOracle getTestOracle(ClickHouseGlobalState globalState) throws SQL
                 throw new AssertionError(e1);
             }
         }).collect(Collectors.toList());
-        return new CompositeTestOracle(oracles);
+        return new CompositeTestOracle(oracles, globalState);
     }
 
     @Override
diff --git a/src/sqlancer/cockroachdb/CockroachDBOptions.java b/src/sqlancer/cockroachdb/CockroachDBOptions.java
@@ -86,7 +86,7 @@ public TestOracle create(CockroachDBGlobalState globalState) throws SQLException
                 oracles.add(new CockroachDBTLPGroupByOracle(globalState));
                 oracles.add(new CockroachDBTLPExtendedWhereOracle(globalState));
                 oracles.add(new CockroachDBTLPDistinctOracle(globalState));
-                return new CompositeTestOracle(oracles);
+                return new CompositeTestOracle(oracles, globalState);
             }
         };
 
diff --git a/src/sqlancer/duckdb/DuckDBOptions.java b/src/sqlancer/duckdb/DuckDBOptions.java
@@ -140,7 +140,7 @@ public TestOracle create(DuckDBGlobalState globalState) throws SQLException {
                 oracles.add(new DuckDBQueryPartitioningAggregateTester(globalState));
                 oracles.add(new DuckDBQueryPartitioningDistinctTester(globalState));
                 oracles.add(new DuckDBQueryPartitioningGroupByTester(globalState));
-                return new CompositeTestOracle(oracles);
+                return new CompositeTestOracle(oracles, globalState);
             }
         };
 
diff --git a/src/sqlancer/duckdb/DuckDBProvider.java b/src/sqlancer/duckdb/DuckDBProvider.java
@@ -127,7 +127,7 @@ protected TestOracle getTestOracle(DuckDBGlobalState globalState) throws SQLExce
             } catch (SQLException e1) {
                 throw new AssertionError(e1);
             }
-        }).collect(Collectors.toList()));
+        }).collect(Collectors.toList()), globalState);
     }
 
     @Override
diff --git a/src/sqlancer/postgres/PostgresOptions.java b/src/sqlancer/postgres/PostgresOptions.java
@@ -59,7 +59,7 @@ public TestOracle create(PostgresGlobalState globalState) throws SQLException {
                 oracles.add(new PostgresTLPWhereOracle(globalState));
                 oracles.add(new PostgresTLPHavingOracle(globalState));
                 oracles.add(new PostgresTLPAggregateOracle(globalState));
-                return new CompositeTestOracle(oracles);
+                return new CompositeTestOracle(oracles, globalState);
             }
         };
 
diff --git a/src/sqlancer/postgres/PostgresProvider.java b/src/sqlancer/postgres/PostgresProvider.java
@@ -215,7 +215,7 @@ protected TestOracle getTestOracle(PostgresGlobalState globalState) throws SQLEx
                 throw new AssertionError(e1);
             }
         }).collect(Collectors.toList());
-        return new CompositeTestOracle(oracles);
+        return new CompositeTestOracle(oracles, globalState);
     }
 
     @Override
diff --git a/src/sqlancer/sqlite3/SQLite3Options.java b/src/sqlancer/sqlite3/SQLite3Options.java
@@ -146,7 +146,7 @@ public TestOracle create(SQLite3GlobalState globalState) throws SQLException {
                 oracles.add(new SQLite3TLPGroupByOracle(globalState));
                 oracles.add(new SQLite3TLPHavingOracle(globalState));
                 oracles.add(new SQLite3TLPAggregateOracle(globalState));
-                return new CompositeTestOracle(oracles);
+                return new CompositeTestOracle(oracles, globalState);
             }
         };
 
diff --git a/src/sqlancer/tidb/TiDBOptions.java b/src/sqlancer/tidb/TiDBOptions.java
@@ -39,7 +39,7 @@ public TestOracle create(TiDBGlobalState globalState) throws SQLException {
                 List<TestOracle> oracles = new ArrayList<>();
                 oracles.add(new TiDBTLPWhereOracle(globalState));
                 oracles.add(new TiDBTLPHavingOracle(globalState));
-                return new CompositeTestOracle(oracles);
+                return new CompositeTestOracle(oracles, globalState);
             }
         };
 
diff --git a/src/sqlancer/tidb/TiDBProvider.java b/src/sqlancer/tidb/TiDBProvider.java
@@ -144,7 +144,7 @@ protected TestOracle getTestOracle(TiDBGlobalState globalState) throws SQLExcept
                 throw new AssertionError(e1);
             }
         }).collect(Collectors.toList());
-        return new CompositeTestOracle(oracles);
+        return new CompositeTestOracle(oracles, globalState);
     }
 
     @Override

Original file line number	Diff line number	Diff line change
`@@ -111,7 +111,7 @@ protected TestOracle getTestOracle(ClickHouseGlobalState globalState) throws SQL`
`111`	`111`	`throw new AssertionError(e1);`
`112`	`112`	`}`
`113`	`113`	`}).collect(Collectors.toList());`
`114`		`- return new CompositeTestOracle(oracles);`
	`114`	`+ return new CompositeTestOracle(oracles, globalState);`
`115`	`115`	`}`
`116`	`116`
`117`	`117`	`@Override`
Original file line number	Diff line number	Diff line change
`@@ -86,7 +86,7 @@ public TestOracle create(CockroachDBGlobalState globalState) throws SQLException`
`86`	`86`	`oracles.add(new CockroachDBTLPGroupByOracle(globalState));`
`87`	`87`	`oracles.add(new CockroachDBTLPExtendedWhereOracle(globalState));`
`88`	`88`	`oracles.add(new CockroachDBTLPDistinctOracle(globalState));`
`89`		`- return new CompositeTestOracle(oracles);`
	`89`	`+ return new CompositeTestOracle(oracles, globalState);`
`90`	`90`	`}`
`91`	`91`	`};`
`92`	`92`
Original file line number	Diff line number	Diff line change
`@@ -140,7 +140,7 @@ public TestOracle create(DuckDBGlobalState globalState) throws SQLException {`
`140`	`140`	`oracles.add(new DuckDBQueryPartitioningAggregateTester(globalState));`
`141`	`141`	`oracles.add(new DuckDBQueryPartitioningDistinctTester(globalState));`
`142`	`142`	`oracles.add(new DuckDBQueryPartitioningGroupByTester(globalState));`
`143`		`- return new CompositeTestOracle(oracles);`
	`143`	`+ return new CompositeTestOracle(oracles, globalState);`
`144`	`144`	`}`
`145`	`145`	`};`
`146`	`146`
Original file line number	Diff line number	Diff line change
`@@ -127,7 +127,7 @@ protected TestOracle getTestOracle(DuckDBGlobalState globalState) throws SQLExce`
`127`	`127`	`} catch (SQLException e1) {`
`128`	`128`	`throw new AssertionError(e1);`
`129`	`129`	`}`
`130`		`- }).collect(Collectors.toList()));`
	`130`	`+ }).collect(Collectors.toList()), globalState);`
`131`	`131`	`}`
`132`	`132`
`133`	`133`	`@Override`
Original file line number	Diff line number	Diff line change
`@@ -59,7 +59,7 @@ public TestOracle create(PostgresGlobalState globalState) throws SQLException {`
`59`	`59`	`oracles.add(new PostgresTLPWhereOracle(globalState));`
`60`	`60`	`oracles.add(new PostgresTLPHavingOracle(globalState));`
`61`	`61`	`oracles.add(new PostgresTLPAggregateOracle(globalState));`
`62`		`- return new CompositeTestOracle(oracles);`
	`62`	`+ return new CompositeTestOracle(oracles, globalState);`
`63`	`63`	`}`
`64`	`64`	`};`
`65`	`65`
Original file line number	Diff line number	Diff line change
`@@ -215,7 +215,7 @@ protected TestOracle getTestOracle(PostgresGlobalState globalState) throws SQLEx`
`215`	`215`	`throw new AssertionError(e1);`
`216`	`216`	`}`
`217`	`217`	`}).collect(Collectors.toList());`
`218`		`- return new CompositeTestOracle(oracles);`
	`218`	`+ return new CompositeTestOracle(oracles, globalState);`
`219`	`219`	`}`
`220`	`220`
`221`	`221`	`@Override`
Original file line number	Diff line number	Diff line change
`@@ -146,7 +146,7 @@ public TestOracle create(SQLite3GlobalState globalState) throws SQLException {`
`146`	`146`	`oracles.add(new SQLite3TLPGroupByOracle(globalState));`
`147`	`147`	`oracles.add(new SQLite3TLPHavingOracle(globalState));`
`148`	`148`	`oracles.add(new SQLite3TLPAggregateOracle(globalState));`
`149`		`- return new CompositeTestOracle(oracles);`
	`149`	`+ return new CompositeTestOracle(oracles, globalState);`
`150`	`150`	`}`
`151`	`151`	`};`
`152`	`152`
Original file line number	Diff line number	Diff line change
`@@ -39,7 +39,7 @@ public TestOracle create(TiDBGlobalState globalState) throws SQLException {`
`39`	`39`	`List<TestOracle> oracles = new ArrayList<>();`
`40`	`40`	`oracles.add(new TiDBTLPWhereOracle(globalState));`
`41`	`41`	`oracles.add(new TiDBTLPHavingOracle(globalState));`
`42`		`- return new CompositeTestOracle(oracles);`
	`42`	`+ return new CompositeTestOracle(oracles, globalState);`
`43`	`43`	`}`
`44`	`44`	`};`
`45`	`45`
Original file line number	Diff line number	Diff line change
`@@ -144,7 +144,7 @@ protected TestOracle getTestOracle(TiDBGlobalState globalState) throws SQLExcept`
`144`	`144`	`throw new AssertionError(e1);`
`145`	`145`	`}`
`146`	`146`	`}).collect(Collectors.toList());`
`147`		`- return new CompositeTestOracle(oracles);`
	`147`	`+ return new CompositeTestOracle(oracles, globalState);`
`148`	`148`	`}`
`149`	`149`
`150`	`150`	`@Override`