Add interface to return queries by oracles (sqlancer#648)

bajinsheng · mrigger · web-flow · commit b5eb2153dfd0 · 2022-12-17T08:59:34.000Z
Co-authored-by: Manuel Rigger &lt;rigger@nus.edu.sg&gt;
diff --git a/src/sqlancer/cockroachdb/oracle/CockroachDBNoRECOracle.java b/src/sqlancer/cockroachdb/oracle/CockroachDBNoRECOracle.java
@@ -150,4 +150,9 @@ private int getCount(SQLGlobalState<?, ?> globalState, SQLQueryAdapter q) throws
         return count;
     }
 
+    @Override
+    public String getLastQueryString() {
+        return optimizedQueryString;
+    }
+
 }
diff --git a/src/sqlancer/cockroachdb/oracle/tlp/CockroachDBTLPAggregateOracle.java b/src/sqlancer/cockroachdb/oracle/tlp/CockroachDBTLPAggregateOracle.java
@@ -195,4 +195,9 @@ private CockroachDBSelect getSelect(List<CockroachDBExpression> aggregates, List
         return leftSelect;
     }
 
+    @Override
+    public String getLastQueryString() {
+        return originalQuery;
+    }
+
 }
diff --git a/src/sqlancer/cockroachdb/oracle/tlp/CockroachDBTLPDistinctOracle.java b/src/sqlancer/cockroachdb/oracle/tlp/CockroachDBTLPDistinctOracle.java
@@ -15,6 +15,8 @@
 
 public class CockroachDBTLPDistinctOracle extends CockroachDBTLPBase {
 
+    private String generatedQueryString;
+
     public CockroachDBTLPDistinctOracle(CockroachDBGlobalState state) {
         super(state);
         errors.add("GROUP BY term out of range");
@@ -25,7 +27,7 @@ public void check() throws SQLException {
         super.check();
         select.setDistinct(true);
         String originalQueryString = CockroachDBVisitor.asString(select);
-
+        generatedQueryString = originalQueryString;
         List<String> resultSet = ComparatorHelper.getResultSetFirstColumnAsString(originalQueryString, errors, state);
         select.setDistinct(false);
         CockroachDBExpression predicate = gen.generateExpression(CockroachDBDataType.BOOL.get());
@@ -41,4 +43,9 @@ public void check() throws SQLException {
         ComparatorHelper.assumeResultSetsAreEqual(resultSet, secondResultSet, originalQueryString, combinedString,
                 state);
     }
+
+    @Override
+    public String getLastQueryString() {
+        return generatedQueryString;
+    }
 }
diff --git a/src/sqlancer/cockroachdb/oracle/tlp/CockroachDBTLPExtendedWhereOracle.java b/src/sqlancer/cockroachdb/oracle/tlp/CockroachDBTLPExtendedWhereOracle.java
@@ -19,6 +19,7 @@
 public class CockroachDBTLPExtendedWhereOracle extends CockroachDBTLPBase {
 
     private CockroachDBExpression originalPredicate;
+    private String generatedQueryString;
 
     public CockroachDBTLPExtendedWhereOracle(CockroachDBGlobalState state) {
         super(state);
@@ -32,6 +33,7 @@ public void check() throws SQLException {
         originalPredicate = generatePredicate();
         select.setWhereClause(originalPredicate);
         String originalQueryString = CockroachDBVisitor.asString(select);
+        generatedQueryString = originalQueryString;
         List<String> resultSet = ComparatorHelper.getResultSetFirstColumnAsString(originalQueryString, errors, state);
 
         boolean allowOrderBy = Randomly.getBoolean();
@@ -56,4 +58,9 @@ public CockroachDBExpression combinePredicate(CockroachDBExpression expr) {
         return new CockroachDBBinaryLogicalOperation(originalPredicate, expr, CockroachDBBinaryLogicalOperator.AND);
 
     }
+
+    @Override
+    public String getLastQueryString() {
+        return generatedQueryString;
+    }
 }
diff --git a/src/sqlancer/cockroachdb/oracle/tlp/CockroachDBTLPGroupByOracle.java b/src/sqlancer/cockroachdb/oracle/tlp/CockroachDBTLPGroupByOracle.java
@@ -14,6 +14,8 @@
 
 public class CockroachDBTLPGroupByOracle extends CockroachDBTLPBase {
 
+    private String generatedQueryString;
+
     public CockroachDBTLPGroupByOracle(CockroachDBGlobalState state) {
         super(state);
     }
@@ -24,7 +26,7 @@ public void check() throws SQLException {
         select.setGroupByExpressions(select.getFetchColumns());
         select.setWhereClause(null);
         String originalQueryString = CockroachDBVisitor.asString(select);
-
+        generatedQueryString = originalQueryString;
         List<String> resultSet = ComparatorHelper.getResultSetFirstColumnAsString(originalQueryString, errors, state);
 
         select.setWhereClause(predicate);
@@ -46,4 +48,9 @@ List<CockroachDBExpression> generateFetchColumns() {
                 .collect(Collectors.toList()));
     }
 
+    @Override
+    public String getLastQueryString() {
+        return generatedQueryString;
+    }
+
 }
diff --git a/src/sqlancer/cockroachdb/oracle/tlp/CockroachDBTLPHavingOracle.java b/src/sqlancer/cockroachdb/oracle/tlp/CockroachDBTLPHavingOracle.java
@@ -13,6 +13,8 @@
 
 public class CockroachDBTLPHavingOracle extends CockroachDBTLPBase {
 
+    private String generatedQueryString;
+
     public CockroachDBTLPHavingOracle(CockroachDBGlobalState state) {
         super(state);
         errors.add("GROUP BY term out of range");
@@ -31,6 +33,7 @@ public void check() throws SQLException {
         select.setGroupByExpressions(gen.generateExpressions(Randomly.smallNumber() + 1));
         select.setHavingClause(null);
         String originalQueryString = CockroachDBVisitor.asString(select);
+        generatedQueryString = originalQueryString;
         List<String> resultSet = ComparatorHelper.getResultSetFirstColumnAsString(originalQueryString, errors, state);
 
         CockroachDBExpression predicate = gen.generateExpression(CockroachDBDataType.BOOL.get());
@@ -52,4 +55,9 @@ protected CockroachDBExpression generatePredicate() {
         return gen.generateHavingClause();
     }
 
+    @Override
+    public String getLastQueryString() {
+        return generatedQueryString;
+    }
+
 }
diff --git a/src/sqlancer/cockroachdb/oracle/tlp/CockroachDBTLPWhereOracle.java b/src/sqlancer/cockroachdb/oracle/tlp/CockroachDBTLPWhereOracle.java
@@ -16,6 +16,8 @@
 
 public class CockroachDBTLPWhereOracle extends CockroachDBTLPBase {
 
+    private String generatedQueryString;
+
     public CockroachDBTLPWhereOracle(CockroachDBGlobalState state) {
         super(state);
         errors.add("GROUP BY term out of range");
@@ -25,7 +27,7 @@ public CockroachDBTLPWhereOracle(CockroachDBGlobalState state) {
     public void check() throws SQLException {
         super.check();
         String originalQueryString = CockroachDBVisitor.asString(select);
-
+        generatedQueryString = originalQueryString;
         List<String> resultSet = ComparatorHelper.getResultSetFirstColumnAsString(originalQueryString, errors, state);
 
         boolean allowOrderBy = Randomly.getBoolean();
@@ -45,4 +47,9 @@ public void check() throws SQLException {
         ComparatorHelper.assumeResultSetsAreEqual(resultSet, secondResultSet, originalQueryString, combinedString,
                 state);
     }
+
+    @Override
+    public String getLastQueryString() {
+        return generatedQueryString;
+    }
 }
diff --git a/src/sqlancer/common/oracle/CompositeTestOracle.java b/src/sqlancer/common/oracle/CompositeTestOracle.java
@@ -9,6 +9,7 @@ public class CompositeTestOracle<G extends GlobalState<?, ?, ?>> implements Test
     private final List<TestOracle<G>> oracles;
     private final G globalState;
     private int i;
+    private int iLast;
 
     public CompositeTestOracle(List<TestOracle<G>> oracles, G globalState) {
         this.globalState = globalState;
@@ -19,6 +20,7 @@ public CompositeTestOracle(List<TestOracle<G>> oracles, G globalState) {
     public void check() throws Exception {
         try {
             oracles.get(i).check();
+            iLast = i;
             boolean lastOracleIndex = i == oracles.size() - 1;
             if (!lastOracleIndex) {
                 globalState.getManager().incrementSelectQueryCount();
@@ -27,4 +29,9 @@ public void check() throws Exception {
             i = (i + 1) % oracles.size();
         }
     }
+
+    @Override
+    public String getLastQueryString() {
+        return oracles.get(iLast).getLastQueryString();
+    }
 }
diff --git a/src/sqlancer/common/oracle/TestOracle.java b/src/sqlancer/common/oracle/TestOracle.java
@@ -10,4 +10,8 @@ public interface TestOracle<G extends GlobalState<?, ?, ?>> {
     default Reproducer<G> getLastReproducer() {
         return null;
     }
+
+    default String getLastQueryString() {
+        throw new AssertionError("Not supported!");
+    }
 }
diff --git a/src/sqlancer/sqlite3/oracle/SQLite3NoRECOracle.java b/src/sqlancer/sqlite3/oracle/SQLite3NoRECOracle.java
@@ -102,6 +102,11 @@ public Reproducer<SQLite3GlobalState> getLastReproducer() {
         return reproducer;
     }
 
+    @Override
+    public String getLastQueryString() {
+        return optimizedQueryString;
+    }
+
     private Function<SQLite3GlobalState, Integer> getUnoptimizedQuery(SQLite3Select select,
             SQLite3Expression randomWhereCondition) throws SQLException {
         SQLite3PostfixUnaryOperation isTrue = new SQLite3PostfixUnaryOperation(PostfixUnaryOperator.IS_TRUE,
diff --git a/src/sqlancer/sqlite3/oracle/tlp/SQLite3TLPAggregateOracle.java b/src/sqlancer/sqlite3/oracle/tlp/SQLite3TLPAggregateOracle.java
@@ -33,6 +33,7 @@ public class SQLite3TLPAggregateOracle implements TestOracle<SQLite3GlobalState>
     private final SQLite3GlobalState state;
     private final ExpectedErrors errors = new ExpectedErrors();
     private SQLite3ExpressionGenerator gen;
+    private String generatedQueryString;
 
     public SQLite3TLPAggregateOracle(SQLite3GlobalState state) {
         this.state = state;
@@ -56,7 +57,7 @@ public void check() throws SQLException {
             select.setOrderByExpressions(gen.generateOrderBys());
         }
         String originalQuery = SQLite3Visitor.asString(select);
-
+        generatedQueryString = originalQuery;
         SQLite3Expression whereClause = gen.generateExpression();
         SQLite3UnaryOperation negatedClause = new SQLite3UnaryOperation(UnaryOperator.NOT, whereClause);
         SQLite3PostfixUnaryOperation notNullClause = new SQLite3PostfixUnaryOperation(PostfixUnaryOperator.ISNULL,
@@ -122,4 +123,9 @@ private SQLite3Select getSelect(SQLite3Aggregate aggregate, List<SQLite3Expressi
         return leftSelect;
     }
 
+    @Override
+    public String getLastQueryString() {
+        return generatedQueryString;
+    }
+
 }
diff --git a/src/sqlancer/sqlite3/oracle/tlp/SQLite3TLPDistinctOracle.java b/src/sqlancer/sqlite3/oracle/tlp/SQLite3TLPDistinctOracle.java
@@ -11,6 +11,8 @@
 
 public class SQLite3TLPDistinctOracle extends SQLite3TLPBase {
 
+    private String generatedQueryString;
+
     public SQLite3TLPDistinctOracle(SQLite3GlobalState state) {
         super(state);
     }
@@ -21,7 +23,7 @@ public void check() throws SQLException {
         select.setSelectType(SelectType.DISTINCT);
         select.setWhereClause(null);
         String originalQueryString = SQLite3Visitor.asString(select);
-
+        generatedQueryString = originalQueryString;
         List<String> resultSet = ComparatorHelper.getResultSetFirstColumnAsString(originalQueryString, errors, state);
 
         select.setWhereClause(predicate);
@@ -37,4 +39,9 @@ public void check() throws SQLException {
                 state);
     }
 
+    @Override
+    public String getLastQueryString() {
+        return generatedQueryString;
+    }
+
 }
diff --git a/src/sqlancer/sqlite3/oracle/tlp/SQLite3TLPGroupByOracle.java b/src/sqlancer/sqlite3/oracle/tlp/SQLite3TLPGroupByOracle.java
@@ -14,6 +14,8 @@
 
 public class SQLite3TLPGroupByOracle extends SQLite3TLPBase {
 
+    private String generatedQueryString;
+
     public SQLite3TLPGroupByOracle(SQLite3GlobalState state) {
         super(state);
     }
@@ -24,7 +26,7 @@ public void check() throws SQLException {
         select.setGroupByClause(select.getFetchColumns());
         select.setWhereClause(null);
         String originalQueryString = SQLite3Visitor.asString(select);
-
+        generatedQueryString = originalQueryString;
         List<String> resultSet = ComparatorHelper.getResultSetFirstColumnAsString(originalQueryString, errors, state);
 
         select.setWhereClause(predicate);
@@ -46,4 +48,9 @@ List<SQLite3Expression> generateFetchColumns() {
                 .collect(Collectors.toList());
     }
 
+    @Override
+    public String getLastQueryString() {
+        return generatedQueryString;
+    }
+
 }
diff --git a/src/sqlancer/sqlite3/oracle/tlp/SQLite3TLPHavingOracle.java b/src/sqlancer/sqlite3/oracle/tlp/SQLite3TLPHavingOracle.java
@@ -33,6 +33,7 @@ public class SQLite3TLPHavingOracle implements TestOracle<SQLite3GlobalState> {
 
     private final SQLite3GlobalState state;
     private final ExpectedErrors errors = new ExpectedErrors();
+    private String generatedQueryString;
 
     public SQLite3TLPHavingOracle(SQLite3GlobalState state) {
         this.state = state;
@@ -61,7 +62,7 @@ public void check() throws SQLException {
         select.setGroupByClause(groupByColumns);
         select.setHavingClause(null);
         String originalQueryString = SQLite3Visitor.asString(select);
-
+        generatedQueryString = originalQueryString;
         List<String> resultSet = ComparatorHelper.getResultSetFirstColumnAsString(originalQueryString, errors, state);
 
         SQLite3Expression predicate = gen.getHavingClause();
@@ -84,4 +85,9 @@ public void check() throws SQLException {
             throw new AssertionError(originalQueryString + ";\n" + combinedString + ";");
         }
     }
+
+    @Override
+    public String getLastQueryString() {
+        return generatedQueryString;
+    }
 }
diff --git a/src/sqlancer/sqlite3/oracle/tlp/SQLite3TLPWhereOracle.java b/src/sqlancer/sqlite3/oracle/tlp/SQLite3TLPWhereOracle.java
@@ -11,6 +11,8 @@
 
 public class SQLite3TLPWhereOracle extends SQLite3TLPBase {
 
+    private String generatedQueryString;
+
     public SQLite3TLPWhereOracle(SQLite3GlobalState state) {
         super(state);
     }
@@ -20,7 +22,7 @@ public void check() throws SQLException {
         super.check();
         select.setWhereClause(null);
         String originalQueryString = SQLite3Visitor.asString(select);
-
+        generatedQueryString = originalQueryString;
         List<String> resultSet = ComparatorHelper.getResultSetFirstColumnAsString(originalQueryString, errors, state);
 
         boolean orderBy = Randomly.getBooleanWithSmallProbability();
@@ -40,4 +42,9 @@ public void check() throws SQLException {
                 state);
     }
 
+    @Override
+    public String getLastQueryString() {
+        return generatedQueryString;
+    }
+
 }
diff --git a/src/sqlancer/tidb/oracle/TiDBTLPHavingOracle.java b/src/sqlancer/tidb/oracle/TiDBTLPHavingOracle.java
@@ -14,6 +14,8 @@
 
 public class TiDBTLPHavingOracle extends TiDBTLPBase implements TestOracle<TiDBGlobalState> {
 
+    private String generatedQueryString;
+
     public TiDBTLPHavingOracle(TiDBGlobalState state) {
         super(state);
         TiDBErrors.addExpressionHavingErrors(errors);
@@ -32,6 +34,7 @@ public void check() throws SQLException {
         select.setGroupByExpressions(gen.generateExpressions(Randomly.smallNumber() + 1));
         select.setHavingClause(null);
         String originalQueryString = TiDBVisitor.asString(select);
+        generatedQueryString = originalQueryString;
         List<String> resultSet = ComparatorHelper.getResultSetFirstColumnAsString(originalQueryString, errors, state);
 
         select.setHavingClause(predicate);
@@ -51,4 +54,9 @@ public void check() throws SQLException {
     protected TiDBExpression generatePredicate() {
         return gen.generateHavingClause();
     }
+
+    @Override
+    public String getLastQueryString() {
+        return generatedQueryString;
+    }
 }
diff --git a/src/sqlancer/tidb/oracle/TiDBTLPWhereOracle.java b/src/sqlancer/tidb/oracle/TiDBTLPWhereOracle.java
@@ -12,6 +12,8 @@
 
 public class TiDBTLPWhereOracle extends TiDBTLPBase {
 
+    private String generatedQueryString;
+
     public TiDBTLPWhereOracle(TiDBGlobalState state) {
         super(state);
         TiDBErrors.addExpressionErrors(errors);
@@ -22,7 +24,7 @@ public void check() throws SQLException {
         super.check();
         select.setWhereClause(null);
         String originalQueryString = TiDBVisitor.asString(select);
-
+        generatedQueryString = originalQueryString;
         List<String> resultSet = ComparatorHelper.getResultSetFirstColumnAsString(originalQueryString, errors, state);
 
         boolean orderBy = Randomly.getBooleanWithRatherLowProbability();
@@ -42,4 +44,9 @@ public void check() throws SQLException {
                 state);
     }
 
+    @Override
+    public String getLastQueryString() {
+        return generatedQueryString;
+    }
+
 }

Original file line number	Diff line number	Diff line change
`@@ -150,4 +150,9 @@ private int getCount(SQLGlobalState<?, ?> globalState, SQLQueryAdapter q) throws`
`150`	`150`	`return count;`
`151`	`151`	`}`
`152`	`152`
	`153`	`+ @Override`
	`154`	`+ public String getLastQueryString() {`
	`155`	`+ return optimizedQueryString;`
	`156`	`+ }`
	`157`	`+`
`153`	`158`	`}`
Original file line number	Diff line number	Diff line change
`@@ -195,4 +195,9 @@ private CockroachDBSelect getSelect(List<CockroachDBExpression> aggregates, List`
`195`	`195`	`return leftSelect;`
`196`	`196`	`}`
`197`	`197`
	`198`	`+ @Override`
	`199`	`+ public String getLastQueryString() {`
	`200`	`+ return originalQuery;`
	`201`	`+ }`
	`202`	`+`
`198`	`203`	`}`
Original file line number	Diff line number	Diff line change
`@@ -10,4 +10,8 @@ public interface TestOracle<G extends GlobalState<?, ?, ?>> {`
`10`	`10`	`default Reproducer<G> getLastReproducer() {`
`11`	`11`	`return null;`
`12`	`12`	`}`
	`13`	`+`
	`14`	`+ default String getLastQueryString() {`
	`15`	`+ throw new AssertionError("Not supported!");`
	`16`	`+ }`
`13`	`17`	`}`