Skip to content

Commit 0e5be03

Browse files
2010YOUY012010YOUY01
committed
linter
1 parent 9c590b3 commit 0e5be03

File tree

7 files changed

+667
-657
lines changed

7 files changed

+667
-657
lines changed

‎src/sqlancer/datafusion/DataFusionSchema.java

Lines changed: 33 additions & 33 deletions
Original file line numberDiff line numberDiff line change
@@ -103,7 +103,7 @@ public static DataFusionDataType getRandomWithoutNull() {
103103
}
104104

105105
public boolean isNumeric() {
106-
return (this == BIGINT) || (this == DOUBLE);
106+
return this == BIGINT || this == DOUBLE;
107107
}
108108

109109
// How to parse type in DataFusion's catalog to `DataFusionDataType`
@@ -112,16 +112,16 @@ public boolean isNumeric() {
112112
// select table_name, column_name, data_type from information_schema.columns;
113113
public static DataFusionDataType parseFromDataFusionCatalog(String typeString) {
114114
switch (typeString) {
115-
case "Int64":
116-
return DataFusionDataType.BIGINT;
117-
case "Float64":
118-
return DataFusionDataType.DOUBLE;
119-
case "Boolean":
120-
return DataFusionDataType.BOOLEAN;
121-
case "Utf8":
122-
return DataFusionDataType.STRING;
123-
default:
124-
dfAssert(false, "Unreachable. All branches should be eovered");
115+
case "Int64":
116+
return DataFusionDataType.BIGINT;
117+
case "Float64":
118+
return DataFusionDataType.DOUBLE;
119+
case "Boolean":
120+
return DataFusionDataType.BOOLEAN;
121+
case "Utf8":
122+
return DataFusionDataType.STRING;
123+
default:
124+
dfAssert(false, "Unreachable. All branches should be eovered");
125125
}
126126

127127
dfAssert(false, "Unreachable. All branches should be eovered");
@@ -134,31 +134,31 @@ public Node<DataFusionExpression> getRandomConstant(DataFusionGlobalState state)
134134
return DataFusionConstant.createNullConstant();
135135
}
136136
switch (this) {
137-
case BIGINT:
138-
long randInt = Randomly.getBoolean() ? state.getRandomly().getInteger()
139-
: state.getRandomly().getInteger(-5, 5);
140-
return DataFusionConstant.createIntConstant(randInt);
141-
case BOOLEAN:
142-
return new DataFusionConstant.DataFusionBooleanConstant(Randomly.getBoolean());
143-
case DOUBLE:
144-
if (Randomly.getBoolean()) {
137+
case BIGINT:
138+
long randInt = Randomly.getBoolean() ? state.getRandomly().getInteger()
139+
: state.getRandomly().getInteger(-5, 5);
140+
return DataFusionConstant.createIntConstant(randInt);
141+
case BOOLEAN:
142+
return new DataFusionConstant.DataFusionBooleanConstant(Randomly.getBoolean());
143+
case DOUBLE:
145144
if (Randomly.getBoolean()) {
146-
Double randomDouble = state.getRandomly().getDouble(); // [0.0, 1.0);
147-
Double scaledDouble = (randomDouble - 0.5) * 2 * Double.MAX_VALUE;
148-
return new DataFusionConstant.DataFusionDoubleConstant(scaledDouble);
145+
if (Randomly.getBoolean()) {
146+
Double randomDouble = state.getRandomly().getDouble(); // [0.0, 1.0);
147+
Double scaledDouble = (randomDouble - 0.5) * 2 * Double.MAX_VALUE;
148+
return new DataFusionConstant.DataFusionDoubleConstant(scaledDouble);
149+
}
150+
String doubleStr = Randomly.fromOptions("'NaN'::Double", "'+Inf'::Double", "'-Inf'::Double", "-0.0",
151+
"+0.0");
152+
return new DataFusionConstant.DataFusionDoubleConstant(doubleStr);
149153
}
150-
String doubleStr = Randomly.fromOptions("'NaN'::Double", "'+Inf'::Double", "'-Inf'::Double", "-0.0",
151-
"+0.0");
152-
return new DataFusionConstant.DataFusionDoubleConstant(doubleStr);
153-
}
154154

155-
return new DataFusionConstant.DataFusionDoubleConstant(state.getRandomly().getDouble());
156-
case NULL:
157-
return DataFusionConstant.createNullConstant();
158-
case STRING:
159-
return new DataFusionConstant.DataFusionStringConstant(state.getRandomly().getString());
160-
default:
161-
dfAssert(false, "Unreachable. All branches should be eovered");
155+
return new DataFusionConstant.DataFusionDoubleConstant(state.getRandomly().getDouble());
156+
case NULL:
157+
return DataFusionConstant.createNullConstant();
158+
case STRING:
159+
return new DataFusionConstant.DataFusionStringConstant(state.getRandomly().getString());
160+
default:
161+
dfAssert(false, "Unreachable. All branches should be eovered");
162162
}
163163

164164
dfAssert(false, "Unreachable. All branches should be eovered");

‎src/sqlancer/datafusion/DataFusionToStringVisitor.java

Lines changed: 21 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -55,26 +55,26 @@ private void visit(DataFusionFrom from) {
5555
visit(from.tableList.get(0));
5656
for (int i = 0; i < from.joinConditionList.size(); i++) {
5757
switch (from.joinTypeList.get(i)) {
58-
case INNER:
59-
sb.append(Randomly.fromOptions(" JOIN ", " INNER JOIN "));
60-
break;
61-
case LEFT:
62-
sb.append(Randomly.fromOptions(" LEFT JOIN ", " LEFT OUTER JOIN "));
63-
break;
64-
case RIGHT:
65-
sb.append(Randomly.fromOptions(" RIGHT JOIN ", " RIGHT OUTER JOIN "));
66-
break;
67-
case FULL:
68-
sb.append(Randomly.fromOptions(" FULL JOIN ", " FULL OUTER JOIN "));
69-
break;
70-
case CROSS:
71-
sb.append(" CROSS JOIN ");
72-
break;
73-
case NATURAL:
74-
sb.append(" NATURAL JOIN ");
75-
break;
76-
default:
77-
dfAssert(false, "Unreachable");
58+
case INNER:
59+
sb.append(Randomly.fromOptions(" JOIN ", " INNER JOIN "));
60+
break;
61+
case LEFT:
62+
sb.append(Randomly.fromOptions(" LEFT JOIN ", " LEFT OUTER JOIN "));
63+
break;
64+
case RIGHT:
65+
sb.append(Randomly.fromOptions(" RIGHT JOIN ", " RIGHT OUTER JOIN "));
66+
break;
67+
case FULL:
68+
sb.append(Randomly.fromOptions(" FULL JOIN ", " FULL OUTER JOIN "));
69+
break;
70+
case CROSS:
71+
sb.append(" CROSS JOIN ");
72+
break;
73+
case NATURAL:
74+
sb.append(" NATURAL JOIN ");
75+
break;
76+
default:
77+
dfAssert(false, "Unreachable");
7878
}
7979

8080
visit(from.tableList.get(i + 1)); // ti
@@ -95,7 +95,7 @@ private void visit(DataFusionConstant constant) {
9595

9696
private void visit(DataFusionSelect select) {
9797
sb.append("SELECT ");
98-
if (select.all && (!select.distinct)) {
98+
if (select.all && !select.distinct) {
9999
sb.append("ALL ");
100100
}
101101
if (select.distinct) {

‎src/sqlancer/datafusion/ast/DataFusionConstant.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -97,6 +97,8 @@ public String toString() {
9797
}
9898

9999
public static class DataFusionStringConstant extends DataFusionConstant {
100+
private final String value;
101+
100102
public static String cleanString(String input) {
101103
StringBuilder sb = new StringBuilder();
102104
for (int i = 0; i < input.length(); i++) {
@@ -117,8 +119,6 @@ public static String cleanString(String input) {
117119
return sb.toString();
118120
}
119121

120-
private final String value;
121-
122122
public DataFusionStringConstant(String value) {
123123
// cleanup invalid Utf8
124124
this.value = cleanString(value.replace("'", "''"));

‎src/sqlancer/datafusion/ast/DataFusionSelect.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,8 +19,8 @@
1919
import sqlancer.datafusion.gen.DataFusionExpressionGenerator;
2020

2121
public class DataFusionSelect extends SelectBase<Node<DataFusionExpression>> implements Node<DataFusionExpression> {
22-
public boolean all = false; // SELECT ALL
23-
public boolean distinct = false; // SELECT DISTINCT
22+
public boolean all; // SELECT ALL
23+
public boolean distinct; // SELECT DISTINCT
2424
public Optional<String> fetchColumnsString = Optional.empty(); // When available, override `fetchColumns` in base
2525
// class's `Node` representation (for display)
2626

0 commit comments

Comments
 (0)