Merge pull request #984 from malwaregarry/tlp-h2

mrigger · web-flow · commit e5a8226b9589 · 2024-09-11T23:10:29.000+08:00
[H2] Use common TLP where oracle
diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
@@ -294,7 +294,7 @@ jobs:
       - name: Build SQLancer
         run: mvn -B package -DskipTests=true
       - name: Run Tests
-        run: H2_AVAILABLE=true mvn -Dtest=TestH2 test
+        run: mvn -Dtest=TestH2 test
 
   hsqldb:
     name: DBMS Tests (HSQLB)
diff --git a/src/sqlancer/h2/H2ExpressionGenerator.java b/src/sqlancer/h2/H2ExpressionGenerator.java
@@ -1,12 +1,18 @@
 package sqlancer.h2;
 
+import java.util.List;
+import java.util.stream.Collectors;
+
 import sqlancer.Randomly;
 import sqlancer.common.ast.BinaryOperatorNode.Operator;
+import sqlancer.common.gen.TLPWhereGenerator;
 import sqlancer.common.gen.UntypedExpressionGenerator;
+import sqlancer.common.schema.AbstractTables;
 import sqlancer.h2.H2Provider.H2GlobalState;
 import sqlancer.h2.H2Schema.H2Column;
 import sqlancer.h2.H2Schema.H2CompositeDataType;
 import sqlancer.h2.H2Schema.H2DataType;
+import sqlancer.h2.H2Schema.H2Table;
 import sqlancer.h2.ast.H2BetweenOperation;
 import sqlancer.h2.ast.H2BinaryOperation;
 import sqlancer.h2.ast.H2CaseOperation;
@@ -15,12 +21,17 @@
 import sqlancer.h2.ast.H2Constant;
 import sqlancer.h2.ast.H2Expression;
 import sqlancer.h2.ast.H2InOperation;
+import sqlancer.h2.ast.H2Join;
+import sqlancer.h2.ast.H2Select;
+import sqlancer.h2.ast.H2TableReference;
 import sqlancer.h2.ast.H2UnaryPostfixOperation;
 import sqlancer.h2.ast.H2UnaryPrefixOperation;
 
-public class H2ExpressionGenerator extends UntypedExpressionGenerator<H2Expression, H2Column> {
+public class H2ExpressionGenerator extends UntypedExpressionGenerator<H2Expression, H2Column>
+        implements TLPWhereGenerator<H2Select, H2Join, H2Expression, H2Table, H2Column> {
 
     private final H2GlobalState globalState;
+    private List<H2Table> tables;
 
     public H2ExpressionGenerator(H2GlobalState globalState) {
         this.globalState = globalState;
@@ -336,4 +347,45 @@ public H2Expression isNull(H2Expression expr) {
         return new H2UnaryPostfixOperation(expr, H2UnaryPostfixOperator.IS_NULL);
     }
 
+    @Override
+    public TLPWhereGenerator<H2Select, H2Join, H2Expression, H2Table, H2Column> setTablesAndColumns(
+            AbstractTables<H2Table, H2Column> tables) {
+        this.columns = tables.getColumns();
+        this.tables = tables.getTables();
+
+        return this;
+    }
+
+    @Override
+    public H2Expression generateBooleanExpression() {
+        return generateExpression();
+    }
+
+    @Override
+    public H2Select generateSelect() {
+        return new H2Select();
+    }
+
+    @Override
+    public List<H2Join> getRandomJoinClauses() {
+        List<H2TableReference> tableList = tables.stream().map(t -> new H2TableReference(t))
+                .collect(Collectors.toList());
+        List<H2Join> joins = H2Join.getJoins(tableList, globalState);
+        tables = tableList.stream().map(t -> t.getTable()).collect(Collectors.toList());
+        return joins;
+    }
+
+    @Override
+    public List<H2Expression> getTableRefs() {
+        return tables.stream().map(t -> new H2TableReference(t)).collect(Collectors.toList());
+    }
+
+    @Override
+    public List<H2Expression> generateFetchColumns(boolean shouldCreateDummy) {
+        if (shouldCreateDummy && Randomly.getBoolean()) {
+            return List.of(new H2ColumnReference(new H2Column("*", null)));
+        }
+        return Randomly.nonEmptySubset(this.columns).stream().map(c -> new H2ColumnReference(c))
+                .collect(Collectors.toList());
+    }
 }
diff --git a/src/sqlancer/h2/H2QueryPartitioningBase.java b/src/sqlancer/h2/H2QueryPartitioningBase.java
diff --git a/src/sqlancer/h2/H2QueryPartitioningWhereTester.java b/src/sqlancer/h2/H2QueryPartitioningWhereTester.java
@@ -1,42 +1,35 @@
 package sqlancer.h2;
 
 import java.sql.SQLException;
-import java.util.ArrayList;
-import java.util.List;
 
-import sqlancer.ComparatorHelper;
-import sqlancer.Randomly;
+import sqlancer.common.oracle.TLPWhereOracle;
+import sqlancer.common.oracle.TestOracle;
+import sqlancer.common.query.ExpectedErrors;
 import sqlancer.h2.H2Provider.H2GlobalState;
+import sqlancer.h2.H2Schema.H2Column;
+import sqlancer.h2.H2Schema.H2Table;
+import sqlancer.h2.ast.H2Expression;
+import sqlancer.h2.ast.H2Join;
+import sqlancer.h2.ast.H2Select;
 
-public class H2QueryPartitioningWhereTester extends H2QueryPartitioningBase {
+public class H2QueryPartitioningWhereTester implements TestOracle<H2GlobalState> {
+
+    private final TLPWhereOracle<H2Select, H2Join, H2Expression, H2Schema, H2Table, H2Column, H2GlobalState> oracle;
 
     public H2QueryPartitioningWhereTester(H2GlobalState state) {
-        super(state);
+        H2ExpressionGenerator gen = new H2ExpressionGenerator(state);
+        ExpectedErrors expectedErrors = ExpectedErrors.newErrors().with(H2Errors.getExpressionErrors()).build();
+
+        this.oracle = new TLPWhereOracle<>(state, gen, expectedErrors);
     }
 
     @Override
     public void check() throws SQLException {
-        super.check();
-        select.setWhereClause(null);
-        String originalQueryString = H2ToStringVisitor.asString(select);
-
-        List<String> resultSet = ComparatorHelper.getResultSetFirstColumnAsString(originalQueryString, errors, state);
-
-        boolean orderBy = Randomly.getBooleanWithRatherLowProbability();
-        if (orderBy) {
-            select.setOrderByClauses(gen.generateOrderBys());
-        }
-        select.setWhereClause(predicate);
-        String firstQueryString = H2ToStringVisitor.asString(select);
-        select.setWhereClause(negatedPredicate);
-        String secondQueryString = H2ToStringVisitor.asString(select);
-        select.setWhereClause(isNullPredicate);
-        String thirdQueryString = H2ToStringVisitor.asString(select);
-        List<String> combinedString = new ArrayList<>();
-        List<String> secondResultSet = ComparatorHelper.getCombinedResultSet(firstQueryString, secondQueryString,
-                thirdQueryString, combinedString, !orderBy, state, errors);
-        ComparatorHelper.assumeResultSetsAreEqual(resultSet, secondResultSet, originalQueryString, combinedString,
-                state);
+        oracle.check();
     }
 
+    @Override
+    public String getLastQueryString() {
+        return oracle.getLastQueryString();
+    }
 }
diff --git a/src/sqlancer/h2/H2RandomQuerySynthesizer.java b/src/sqlancer/h2/H2RandomQuerySynthesizer.java
@@ -32,7 +32,7 @@ public static H2Select generateSelect(H2GlobalState globalState, int nrColumns)
         List<H2Table> tables = targetTables.getTables();
         List<H2TableReference> tableList = tables.stream().map(t -> new H2TableReference(t))
                 .collect(Collectors.toList());
-        List<H2Expression> joins = H2Join.getJoins(tableList, globalState);
+        List<H2Join> joins = H2Join.getJoins(tableList, globalState);
         select.setJoinList(joins.stream().collect(Collectors.toList()));
         select.setFromList(tableList.stream().collect(Collectors.toList()));
         if (Randomly.getBoolean()) {
diff --git a/src/sqlancer/h2/ast/H2Expression.java b/src/sqlancer/h2/ast/H2Expression.java
@@ -1,5 +1,8 @@
 package sqlancer.h2.ast;
 
-public interface H2Expression {
+import sqlancer.common.ast.newast.Expression;
+import sqlancer.h2.H2Schema.H2Column;
+
+public interface H2Expression extends Expression<H2Column> {
 
 }
diff --git a/src/sqlancer/h2/ast/H2Join.java b/src/sqlancer/h2/ast/H2Join.java
@@ -4,16 +4,18 @@
 import java.util.List;
 
 import sqlancer.Randomly;
+import sqlancer.common.ast.newast.Join;
 import sqlancer.h2.H2ExpressionGenerator;
 import sqlancer.h2.H2Provider.H2GlobalState;
 import sqlancer.h2.H2Schema.H2Column;
+import sqlancer.h2.H2Schema.H2Table;
 
-public class H2Join implements H2Expression {
+public class H2Join implements H2Expression, Join<H2Expression, H2Table, H2Column> {
 
     private final H2TableReference leftTable;
     private final H2TableReference rightTable;
     private final JoinType joinType;
-    private final H2Expression onCondition;
+    private H2Expression onCondition;
 
     public enum JoinType {
         INNER, CROSS, NATURAL, LEFT, RIGHT;
@@ -47,8 +49,8 @@ public H2Expression getOnCondition() {
         return onCondition;
     }
 
-    public static List<H2Expression> getJoins(List<H2TableReference> tableList, H2GlobalState globalState) {
-        List<H2Expression> joinExpressions = new ArrayList<>();
+    public static List<H2Join> getJoins(List<H2TableReference> tableList, H2GlobalState globalState) {
+        List<H2Join> joinExpressions = new ArrayList<>();
         while (tableList.size() >= 2 && Randomly.getBooleanWithRatherLowProbability()) {
             H2TableReference leftTable = tableList.remove(0);
             H2TableReference rightTable = tableList.remove(0);
@@ -91,8 +93,13 @@ public static H2Join createInnerJoin(H2TableReference left, H2TableReference rig
         return new H2Join(left, right, JoinType.INNER, predicate);
     }
 
-    public static H2Expression createNaturalJoin(H2TableReference left, H2TableReference right) {
+    public static H2Join createNaturalJoin(H2TableReference left, H2TableReference right) {
         return new H2Join(left, right, JoinType.NATURAL, null);
     }
 
+    @Override
+    public void setOnClause(H2Expression onClause) {
+        onCondition = onClause;
+    }
+
 }
diff --git a/src/sqlancer/h2/ast/H2Select.java b/src/sqlancer/h2/ast/H2Select.java
@@ -1,7 +1,31 @@
 package sqlancer.h2.ast;
 
+import java.util.List;
+import java.util.stream.Collectors;
+
 import sqlancer.common.ast.SelectBase;
+import sqlancer.common.ast.newast.Select;
+import sqlancer.h2.H2Schema.H2Column;
+import sqlancer.h2.H2Schema.H2Table;
+import sqlancer.h2.H2ToStringVisitor;
+
+public class H2Select extends SelectBase<H2Expression>
+        implements H2Expression, Select<H2Join, H2Expression, H2Table, H2Column> {
+
+    @Override
+    public void setJoinClauses(List<H2Join> joinStatements) {
+        List<H2Expression> expressions = joinStatements.stream().map(e -> (H2Expression) e)
+                .collect(Collectors.toList());
+        setJoinList(expressions);
+    }
 
-public class H2Select extends SelectBase<H2Expression> implements H2Expression {
+    @Override
+    public List<H2Join> getJoinClauses() {
+        return getJoinList().stream().map(e -> (H2Join) e).collect(Collectors.toList());
+    }
 
+    @Override
+    public String asString() {
+        return H2ToStringVisitor.asString(this);
+    }
 }
diff --git a/test/sqlancer/dbms/TestH2.java b/test/sqlancer/dbms/TestH2.java
@@ -1,7 +1,6 @@
 package sqlancer.dbms;
 
 import static org.junit.jupiter.api.Assertions.assertEquals;
-import static org.junit.jupiter.api.Assumptions.assumeTrue;
 
 import org.junit.jupiter.api.Test;
 
@@ -11,9 +10,6 @@ public class TestH2 {
 
     @Test
     public void testH2DB() {
-        String h2Available = System.getenv("H2_AVAILABLE");
-        boolean h2DBIsAvailable = h2Available != null && h2Available.equalsIgnoreCase("true");
-        assumeTrue(h2DBIsAvailable);
         assertEquals(0, Main.executeMain(new String[] { "--random-seed", "0", "--timeout-seconds", TestConfig.SECONDS,
                 "--num-threads", "4", "--num-queries", TestConfig.NUM_QUERIES, "h2" }));
 

Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,8 @@`
`1`	`1`	`package sqlancer.h2.ast;`
`2`	`2`
`3`		`-public interface H2Expression {`
	`3`	`+import sqlancer.common.ast.newast.Expression;`
	`4`	`+import sqlancer.h2.H2Schema.H2Column;`
	`5`	`+`
	`6`	`+public interface H2Expression extends Expression<H2Column> {`
`4`	`7`
`5`	`8`	`}`