fix: mvn test errors

zhenglin-charlie-li · Jul 13, 2023 · bbb4e4f · bbb4e4f
1 parent 6bb6c3f
commit bbb4e4f
Show file tree

Hide file tree

Showing 6 changed files with 39 additions and 40 deletions.
diff --git a/src/sqlancer/stonedb/StoneDBOptions.java b/src/sqlancer/stonedb/StoneDBOptions.java
@@ -2,7 +2,6 @@
 
 import java.sql.SQLException;
 import java.util.ArrayList;
-import java.util.Arrays;
 import java.util.List;
 
 import com.beust.jcommander.Parameter;

diff --git a/src/sqlancer/stonedb/oracle/StoneDBQueryPartitioningAggregateTester.java b/src/sqlancer/stonedb/oracle/StoneDBQueryPartitioningAggregateTester.java
@@ -63,17 +63,17 @@ public void check() throws Exception {
 
         if (originalResult == null && metamorphicResult != null
                 || originalResult != null && (!originalResult.contentEquals(metamorphicResult)
-                && !ComparatorHelper.isEqualDouble(originalResult, metamorphicResult))) {
+                        && !ComparatorHelper.isEqualDouble(originalResult, metamorphicResult))) {
             throw new AssertionError("aggregate result mismatch!" + System.lineSeparator() + output);
         }
     }
 
     private String createMetamorphicUnionQuery(StoneDBSelect select,
-                                               NewFunctionNode<StoneDBExpression, StoneDBAggregateFunction> aggregate,
-                                               List<Node<StoneDBExpression>> from) {
+            NewFunctionNode<StoneDBExpression, StoneDBAggregateFunction> aggregate,
+            List<Node<StoneDBExpression>> from) {
         String metamorphicQuery;
         Node<StoneDBExpression> whereClause = gen.generateExpression();
-        ;
+
         Node<StoneDBExpression> negatedClause = new NewUnaryPrefixOperatorNode<>(whereClause,
                 StoneDBUnaryPrefixOperator.NOT);
         Node<StoneDBExpression> notNullClause = new NewUnaryPostfixOperatorNode<>(whereClause,
@@ -117,19 +117,19 @@ private List<Node<StoneDBExpression>> mapped(
 
         StoneDBCastOperation count;
         switch (aggregate.getFunc()) {
-            case COUNT:
-            case MAX:
-            case MIN:
-            case SUM:
-                return aliasArgs(List.of(aggregate));
-            case AVG:
-                NewFunctionNode<StoneDBExpression, StoneDBAggregateFunction> sum = new NewFunctionNode<>(
-                        aggregate.getArgs(), StoneDBAggregateFunction.SUM);
-                count = new StoneDBCastOperation(new NewFunctionNode<>(aggregate.getArgs(), StoneDBAggregateFunction.COUNT),
-                        new StoneDBCompositeDataType(StoneDBDataType.FLOAT, 8).getPrimitiveDataType());
-                return aliasArgs(Arrays.asList(sum, count));
-            default:
-                throw new AssertionError(aggregate.getFunc());
+        case COUNT:
+        case MAX:
+        case MIN:
+        case SUM:
+            return aliasArgs(List.of(aggregate));
+        case AVG:
+            NewFunctionNode<StoneDBExpression, StoneDBAggregateFunction> sum = new NewFunctionNode<>(
+                    aggregate.getArgs(), StoneDBAggregateFunction.SUM);
+            count = new StoneDBCastOperation(new NewFunctionNode<>(aggregate.getArgs(), StoneDBAggregateFunction.COUNT),
+                    new StoneDBCompositeDataType(StoneDBDataType.FLOAT, 8).getPrimitiveDataType());
+            return aliasArgs(Arrays.asList(sum, count));
+        default:
+            throw new AssertionError(aggregate.getFunc());
         }
     }
 
@@ -144,17 +144,17 @@ private List<Node<StoneDBExpression>> aliasArgs(List<Node<StoneDBExpression>> or
 
     private String getOuterAggregateFunction(NewFunctionNode<StoneDBExpression, StoneDBAggregateFunction> aggregate) {
         switch (aggregate.getFunc()) {
-            case AVG:
-                return "SUM(agg0)/SUM(agg1)";
-            case COUNT:
-                return StoneDBAggregateFunction.SUM + "(agg0)";
-            default:
-                return aggregate.getFunc().toString() + "(agg0)";
+        case AVG:
+            return "SUM(agg0)/SUM(agg1)";
+        case COUNT:
+            return StoneDBAggregateFunction.SUM + "(agg0)";
+        default:
+            return aggregate.getFunc().toString() + "(agg0)";
         }
     }
 
     private StoneDBSelect getSelect(List<Node<StoneDBExpression>> aggregates, List<Node<StoneDBExpression>> fromList,
-                                    Node<StoneDBExpression> whereClause, List<Node<StoneDBExpression>> joinList) {
+            Node<StoneDBExpression> whereClause, List<Node<StoneDBExpression>> joinList) {
         StoneDBSelect select = new StoneDBSelect();
         select.setFetchColumns(aggregates);
         select.setFromList(fromList);

diff --git a/src/sqlancer/stonedb/oracle/StoneDBQueryPartitioningBase.java b/src/sqlancer/stonedb/oracle/StoneDBQueryPartitioningBase.java
@@ -1,5 +1,9 @@
 package sqlancer.stonedb.oracle;
 
+import java.util.ArrayList;
+import java.util.List;
+import java.util.stream.Collectors;
+
 import sqlancer.Randomly;
 import sqlancer.common.ast.newast.ColumnReferenceNode;
 import sqlancer.common.ast.newast.Node;
@@ -17,10 +21,6 @@
 import sqlancer.stonedb.ast.StoneDBSelect;
 import sqlancer.stonedb.gen.StoneDBExpressionGenerator;
 
-import java.util.ArrayList;
-import java.util.List;
-import java.util.stream.Collectors;
-
 public class StoneDBQueryPartitioningBase
         extends TernaryLogicPartitioningOracleBase<Node<StoneDBExpression>, StoneDBGlobalState>
         implements TestOracle<StoneDBGlobalState> {

diff --git a/src/sqlancer/stonedb/oracle/StoneDBQueryPartitioningGroupByTester.java b/src/sqlancer/stonedb/oracle/StoneDBQueryPartitioningGroupByTester.java
@@ -1,5 +1,9 @@
 package sqlancer.stonedb.oracle;
 
+import java.util.ArrayList;
+import java.util.List;
+import java.util.stream.Collectors;
+
 import sqlancer.ComparatorHelper;
 import sqlancer.Randomly;
 import sqlancer.common.ast.newast.ColumnReferenceNode;
@@ -9,10 +13,6 @@
 import sqlancer.stonedb.StoneDBToStringVisitor;
 import sqlancer.stonedb.ast.StoneDBExpression;
 
-import java.util.ArrayList;
-import java.util.List;
-import java.util.stream.Collectors;
-
 public class StoneDBQueryPartitioningGroupByTester extends StoneDBQueryPartitioningBase {
     public StoneDBQueryPartitioningGroupByTester(StoneDBGlobalState state) {
         super(state);

diff --git a/src/sqlancer/stonedb/oracle/StoneDBQueryPartitioningHavingTester.java b/src/sqlancer/stonedb/oracle/StoneDBQueryPartitioningHavingTester.java
@@ -1,12 +1,12 @@
 package sqlancer.stonedb.oracle;
 
+import java.util.ArrayList;
+import java.util.List;
+
 import sqlancer.ComparatorHelper;
 import sqlancer.Randomly;
-import sqlancer.stonedb.StoneDBToStringVisitor;
 import sqlancer.stonedb.StoneDBProvider.StoneDBGlobalState;
-
-import java.util.ArrayList;
-import java.util.List;
+import sqlancer.stonedb.StoneDBToStringVisitor;
 
 public class StoneDBQueryPartitioningHavingTester extends StoneDBQueryPartitioningBase {
     public StoneDBQueryPartitioningHavingTester(StoneDBGlobalState state) {

diff --git a/src/sqlancer/stonedb/oracle/StoneDBQueryPartitioningWhereTester.java b/src/sqlancer/stonedb/oracle/StoneDBQueryPartitioningWhereTester.java
@@ -1,13 +1,13 @@
 package sqlancer.stonedb.oracle;
 
+import java.util.ArrayList;
+import java.util.List;
+
 import sqlancer.ComparatorHelper;
 import sqlancer.Randomly;
 import sqlancer.stonedb.StoneDBProvider.StoneDBGlobalState;
 import sqlancer.stonedb.StoneDBToStringVisitor;
 
-import java.util.ArrayList;
-import java.util.List;
-
 public class StoneDBQueryPartitioningWhereTester extends StoneDBQueryPartitioningBase {
     public StoneDBQueryPartitioningWhereTester(StoneDBGlobalState state) {
         super(state);