From bbb4e4f5ee38a58d122150be0536abf5aa670874 Mon Sep 17 00:00:00 2001 From: zhenglinli <1125806272@qq.com> Date: Tue, 11 Jul 2023 14:30:48 +0800 Subject: [PATCH] fix: mvn test errors --- src/sqlancer/stonedb/StoneDBOptions.java | 1 - ...oneDBQueryPartitioningAggregateTester.java | 48 +++++++++---------- .../oracle/StoneDBQueryPartitioningBase.java | 8 ++-- ...StoneDBQueryPartitioningGroupByTester.java | 8 ++-- .../StoneDBQueryPartitioningHavingTester.java | 8 ++-- .../StoneDBQueryPartitioningWhereTester.java | 6 +-- 6 files changed, 39 insertions(+), 40 deletions(-) diff --git a/src/sqlancer/stonedb/StoneDBOptions.java b/src/sqlancer/stonedb/StoneDBOptions.java index 280193e79..647864849 100644 --- 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 index 1e17540b4..7322411ce 100644 --- 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 aggregate, - List> from) { + NewFunctionNode aggregate, + List> from) { String metamorphicQuery; Node whereClause = gen.generateExpression(); - ; + Node negatedClause = new NewUnaryPrefixOperatorNode<>(whereClause, StoneDBUnaryPrefixOperator.NOT); Node notNullClause = new NewUnaryPostfixOperatorNode<>(whereClause, @@ -117,19 +117,19 @@ private List> mapped( StoneDBCastOperation count; switch (aggregate.getFunc()) { - case COUNT: - case MAX: - case MIN: - case SUM: - return aliasArgs(List.of(aggregate)); - case AVG: - NewFunctionNode 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 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> aliasArgs(List> or private String getOuterAggregateFunction(NewFunctionNode 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> aggregates, List> fromList, - Node whereClause, List> joinList) { + Node whereClause, List> 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 index 654faf6e3..84d9f794f 100644 --- 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, StoneDBGlobalState> implements TestOracle { diff --git a/src/sqlancer/stonedb/oracle/StoneDBQueryPartitioningGroupByTester.java b/src/sqlancer/stonedb/oracle/StoneDBQueryPartitioningGroupByTester.java index 49caa2a2f..d7674a71c 100644 --- 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 index 27a75db1d..ea611241b 100644 --- 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 index c05780945..2a8f2b4d4 100644 --- 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);