Skip to content

Commit 76c40cd

Browse files
mriggermrigger
committed
[MySQL] rename classes
1 parent a6b0e16 commit 76c40cd

9 files changed

Lines changed: 41 additions & 41 deletions

‎src/sqlancer/mysql/MySQLExpectedValueVisitor.java‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
import sqlancer.mysql.ast.MySQLBinaryLogicalOperation;
77
import sqlancer.mysql.ast.MySQLBinaryOperation;
88
import sqlancer.mysql.ast.MySQLCastOperation;
9-
import sqlancer.mysql.ast.MySQLColumnValue;
9+
import sqlancer.mysql.ast.MySQLColumnReference;
1010
import sqlancer.mysql.ast.MySQLComputableFunction;
1111
import sqlancer.mysql.ast.MySQLConstant;
1212
import sqlancer.mysql.ast.MySQLExists;
@@ -17,7 +17,7 @@
1717
import sqlancer.mysql.ast.MySQLSelect;
1818
import sqlancer.mysql.ast.MySQLStringExpression;
1919
import sqlancer.mysql.ast.MySQLTableReference;
20-
import sqlancer.mysql.ast.MySQLUnaryPostfixOperator;
20+
import sqlancer.mysql.ast.MySQLUnaryPostfixOperation;
2121
import sqlancer.mysql.ast.MySQLUnaryPrefixOperation;
2222

2323
public class MySQLExpectedValueVisitor extends MySQLVisitor {
@@ -53,7 +53,7 @@ public void visit(MySQLConstant constant) {
5353
}
5454

5555
@Override
56-
public void visit(MySQLColumnValue column) {
56+
public void visit(MySQLColumnReference column) {
5757
print(column);
5858
}
5959

@@ -64,7 +64,7 @@ public void visit(MySQLUnaryPrefixOperation op) {
6464
}
6565

6666
@Override
67-
public void visit(MySQLUnaryPostfixOperator op) {
67+
public void visit(MySQLUnaryPostfixOperation op) {
6868
print(op);
6969
visit(op.getExpression());
7070
}

‎src/sqlancer/mysql/MySQLQueryGenerator.java‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -20,15 +20,15 @@
2020
import sqlancer.mysql.MySQLSchema.MySQLRowValue;
2121
import sqlancer.mysql.MySQLSchema.MySQLTable;
2222
import sqlancer.mysql.MySQLSchema.MySQLTables;
23-
import sqlancer.mysql.ast.MySQLColumnValue;
23+
import sqlancer.mysql.ast.MySQLColumnReference;
2424
import sqlancer.mysql.ast.MySQLConstant;
2525
import sqlancer.mysql.ast.MySQLExpression;
2626
import sqlancer.mysql.ast.MySQLOrderByTerm;
2727
import sqlancer.mysql.ast.MySQLOrderByTerm.MySQLOrder;
2828
import sqlancer.mysql.ast.MySQLSelect;
2929
import sqlancer.mysql.ast.MySQLTableReference;
30-
import sqlancer.mysql.ast.MySQLUnaryPostfixOperator;
31-
import sqlancer.mysql.ast.MySQLUnaryPostfixOperator.UnaryPostfixOperator;
30+
import sqlancer.mysql.ast.MySQLUnaryPostfixOperation;
31+
import sqlancer.mysql.ast.MySQLUnaryPostfixOperation.UnaryPostfixOperator;
3232
import sqlancer.mysql.ast.MySQLUnaryPrefixOperation;
3333
import sqlancer.mysql.ast.MySQLUnaryPrefixOperation.MySQLUnaryPrefixOperator;
3434
import sqlancer.mysql.gen.MySQLRandomExpressionGenerator;
@@ -105,7 +105,7 @@ public String getQueryThatContainsAtLeastOneRow(MySQLStateToReproduce state) thr
105105
// selectStatement.setJoinClauses(joinStatements);
106106
selectStatement.setFromList(tables.stream().map(t -> new MySQLTableReference(t)).collect(Collectors.toList()));
107107

108-
fetchColumns = columns.stream().map(c -> new MySQLColumnValue(c, null)).collect(Collectors.toList());
108+
fetchColumns = columns.stream().map(c -> new MySQLColumnReference(c, null)).collect(Collectors.toList());
109109
selectStatement.setFetchColumns(fetchColumns);
110110
state.queryTargetedColumnsString = columns.stream().map(c -> c.getFullQualifiedName())
111111
.collect(Collectors.joining(", "));
@@ -156,7 +156,7 @@ public String getQueryThatContainsAtLeastOneRow(MySQLStateToReproduce state) thr
156156

157157
private List<MySQLExpression> generateGroupByClause(List<MySQLColumn> columns, MySQLRowValue rw) {
158158
if (Randomly.getBoolean()) {
159-
return columns.stream().map(c -> MySQLColumnValue.create(c, rw.getValues().get(c)))
159+
return columns.stream().map(c -> MySQLColumnReference.create(c, rw.getValues().get(c)))
160160
.collect(Collectors.toList());
161161
} else {
162162
return Collections.emptyList();
@@ -166,7 +166,7 @@ private List<MySQLExpression> generateGroupByClause(List<MySQLColumn> columns, M
166166
public List<MySQLExpression> generateOrderBy(List<MySQLColumn> columns) {
167167
List<MySQLExpression> orderBys = new ArrayList<>();
168168
for (int i = 0; i < Randomly.smallNumber(); i++) {
169-
orderBys.add(new MySQLOrderByTerm(MySQLColumnValue.create(Randomly.fromList(columns), null),
169+
orderBys.add(new MySQLOrderByTerm(MySQLColumnReference.create(Randomly.fromList(columns), null),
170170
MySQLOrder.getRandomOrder()));
171171
}
172172
return orderBys;
@@ -193,7 +193,7 @@ private MySQLExpression generateWhereClauseThatContainsRowValue(List<MySQLColumn
193193
MySQLExpression expression = MySQLRandomExpressionGenerator.generateRandomExpression(columns, rw, r);
194194
MySQLConstant expectedValue = expression.getExpectedValue();
195195
if (expectedValue.isNull()) {
196-
return new MySQLUnaryPostfixOperator(expression, UnaryPostfixOperator.IS_NULL, false);
196+
return new MySQLUnaryPostfixOperation(expression, UnaryPostfixOperator.IS_NULL, false);
197197
} else if (expectedValue.asBooleanNotNull()) {
198198
return expression;
199199
} else {

‎src/sqlancer/mysql/MySQLToStringVisitor.java‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
import sqlancer.mysql.ast.MySQLBinaryLogicalOperation;
1010
import sqlancer.mysql.ast.MySQLBinaryOperation;
1111
import sqlancer.mysql.ast.MySQLCastOperation;
12-
import sqlancer.mysql.ast.MySQLColumnValue;
12+
import sqlancer.mysql.ast.MySQLColumnReference;
1313
import sqlancer.mysql.ast.MySQLComputableFunction;
1414
import sqlancer.mysql.ast.MySQLConstant;
1515
import sqlancer.mysql.ast.MySQLExists;
@@ -21,7 +21,7 @@
2121
import sqlancer.mysql.ast.MySQLSelect;
2222
import sqlancer.mysql.ast.MySQLStringExpression;
2323
import sqlancer.mysql.ast.MySQLTableReference;
24-
import sqlancer.mysql.ast.MySQLUnaryPostfixOperator;
24+
import sqlancer.mysql.ast.MySQLUnaryPostfixOperation;
2525
import sqlancer.mysql.ast.MySQLUnaryPrefixOperation;
2626

2727
public class MySQLToStringVisitor extends MySQLVisitor {
@@ -121,7 +121,7 @@ public String get() {
121121
}
122122

123123
@Override
124-
public void visit(MySQLColumnValue column) {
124+
public void visit(MySQLColumnReference column) {
125125
sb.append(column.getColumn().getFullQualifiedName());
126126
}
127127

@@ -134,7 +134,7 @@ public void visit(MySQLUnaryPrefixOperation column) {
134134
}
135135

136136
@Override
137-
public void visit(MySQLUnaryPostfixOperator op) {
137+
public void visit(MySQLUnaryPostfixOperation op) {
138138
sb.append("(");
139139
visit(op.getExpression());
140140
sb.append(")");

‎src/sqlancer/mysql/MySQLVisitor.java‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
import sqlancer.mysql.ast.MySQLBinaryLogicalOperation;
66
import sqlancer.mysql.ast.MySQLBinaryOperation;
77
import sqlancer.mysql.ast.MySQLCastOperation;
8-
import sqlancer.mysql.ast.MySQLColumnValue;
8+
import sqlancer.mysql.ast.MySQLColumnReference;
99
import sqlancer.mysql.ast.MySQLComputableFunction;
1010
import sqlancer.mysql.ast.MySQLConstant;
1111
import sqlancer.mysql.ast.MySQLExists;
@@ -15,7 +15,7 @@
1515
import sqlancer.mysql.ast.MySQLSelect;
1616
import sqlancer.mysql.ast.MySQLStringExpression;
1717
import sqlancer.mysql.ast.MySQLTableReference;
18-
import sqlancer.mysql.ast.MySQLUnaryPostfixOperator;
18+
import sqlancer.mysql.ast.MySQLUnaryPostfixOperation;
1919
import sqlancer.mysql.ast.MySQLUnaryPrefixOperation;
2020

2121
public abstract class MySQLVisitor {
@@ -24,11 +24,11 @@ public abstract class MySQLVisitor {
2424

2525
public abstract void visit(MySQLConstant constant);
2626

27-
public abstract void visit(MySQLColumnValue column);
27+
public abstract void visit(MySQLColumnReference column);
2828

2929
public abstract void visit(MySQLUnaryPrefixOperation column);
3030

31-
public abstract void visit(MySQLUnaryPostfixOperator column);
31+
public abstract void visit(MySQLUnaryPostfixOperation column);
3232

3333
public abstract void visit(MySQLComputableFunction f);
3434

@@ -55,12 +55,12 @@ public abstract class MySQLVisitor {
5555
public void visit(MySQLExpression expr) {
5656
if (expr instanceof MySQLConstant) {
5757
visit((MySQLConstant) expr);
58-
} else if (expr instanceof MySQLColumnValue) {
59-
visit((MySQLColumnValue) expr);
58+
} else if (expr instanceof MySQLColumnReference) {
59+
visit((MySQLColumnReference) expr);
6060
} else if (expr instanceof MySQLUnaryPrefixOperation) {
6161
visit((MySQLUnaryPrefixOperation) expr);
62-
} else if (expr instanceof MySQLUnaryPostfixOperator) {
63-
visit((MySQLUnaryPostfixOperator) expr);
62+
} else if (expr instanceof MySQLUnaryPostfixOperation) {
63+
visit((MySQLUnaryPostfixOperation) expr);
6464
} else if (expr instanceof MySQLComputableFunction) {
6565
visit((MySQLComputableFunction) expr);
6666
} else if (expr instanceof MySQLBinaryLogicalOperation) {

src/sqlancer/mysql/ast/MySQLColumnValue.java renamed to src/sqlancer/mysql/ast/MySQLColumnReference.java

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2,18 +2,18 @@
22

33
import sqlancer.mysql.MySQLSchema.MySQLColumn;
44

5-
public class MySQLColumnValue implements MySQLExpression {
5+
public class MySQLColumnReference implements MySQLExpression {
66

77
private final MySQLColumn column;
88
private final MySQLConstant value;
99

10-
public MySQLColumnValue(MySQLColumn column, MySQLConstant value) {
10+
public MySQLColumnReference(MySQLColumn column, MySQLConstant value) {
1111
this.column = column;
1212
this.value = value;
1313
}
1414

15-
public static MySQLColumnValue create(MySQLColumn column, MySQLConstant value) {
16-
return new MySQLColumnValue(column, value);
15+
public static MySQLColumnReference create(MySQLColumn column, MySQLConstant value) {
16+
return new MySQLColumnReference(column, value);
1717
}
1818

1919
public MySQLColumn getColumn() {

‎src/sqlancer/mysql/ast/MySQLComputableFunction.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -232,8 +232,8 @@ public static MySQLDataType getMostGeneralType(MySQLExpression... expressions) {
232232
MySQLDataType type = null;
233233
for (MySQLExpression expr : expressions) {
234234
MySQLDataType exprType;
235-
if (expr instanceof MySQLColumnValue) {
236-
exprType = ((MySQLColumnValue) expr).getColumn().getType();
235+
if (expr instanceof MySQLColumnReference) {
236+
exprType = ((MySQLColumnReference) expr).getColumn().getType();
237237
} else {
238238
exprType = expr.getExpectedValue().getType();
239239
}

src/sqlancer/mysql/ast/MySQLUnaryPostfixOperator.java renamed to src/sqlancer/mysql/ast/MySQLUnaryPostfixOperation.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
import sqlancer.mysql.ast.MySQLConstant.MySQLIntConstant;
44

5-
public class MySQLUnaryPostfixOperator implements MySQLExpression {
5+
public class MySQLUnaryPostfixOperation implements MySQLExpression {
66

77
private final MySQLExpression expression;
88
private final UnaryPostfixOperator operator;
@@ -12,7 +12,7 @@ public enum UnaryPostfixOperator {
1212
IS_NULL, IS_TRUE, IS_FALSE;
1313
}
1414

15-
public MySQLUnaryPostfixOperator(MySQLExpression expr, UnaryPostfixOperator op, boolean negate) {
15+
public MySQLUnaryPostfixOperation(MySQLExpression expr, UnaryPostfixOperator op, boolean negate) {
1616
this.expression = expr;
1717
this.operator = op;
1818
this.setNegate(negate);

‎src/sqlancer/mysql/gen/MySQLRandomExpressionGenerator.java‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -14,15 +14,15 @@
1414
import sqlancer.mysql.ast.MySQLBinaryLogicalOperation;
1515
import sqlancer.mysql.ast.MySQLBinaryLogicalOperation.MySQLBinaryLogicalOperator;
1616
import sqlancer.mysql.ast.MySQLCastOperation;
17-
import sqlancer.mysql.ast.MySQLColumnValue;
17+
import sqlancer.mysql.ast.MySQLColumnReference;
1818
import sqlancer.mysql.ast.MySQLComputableFunction;
1919
import sqlancer.mysql.ast.MySQLComputableFunction.MySQLFunction;
2020
import sqlancer.mysql.ast.MySQLConstant;
2121
import sqlancer.mysql.ast.MySQLExists;
2222
import sqlancer.mysql.ast.MySQLExpression;
2323
import sqlancer.mysql.ast.MySQLInOperation;
2424
import sqlancer.mysql.ast.MySQLStringExpression;
25-
import sqlancer.mysql.ast.MySQLUnaryPostfixOperator;
25+
import sqlancer.mysql.ast.MySQLUnaryPostfixOperation;
2626
import sqlancer.mysql.ast.MySQLUnaryPrefixOperation;
2727
import sqlancer.mysql.ast.MySQLUnaryPrefixOperation.MySQLUnaryPrefixOperator;
2828

@@ -74,8 +74,8 @@ public static MySQLExpression gen(List<MySQLColumn> columns, MySQLRowValue rowVa
7474
}
7575
return new MySQLUnaryPrefixOperation(notSubExpr, MySQLUnaryPrefixOperator.getRandom());
7676
case UNARY_POSTFIX:
77-
return new MySQLUnaryPostfixOperator(gen(columns, rowVal, depth + 1, r),
78-
Randomly.fromOptions(MySQLUnaryPostfixOperator.UnaryPostfixOperator.values()),
77+
return new MySQLUnaryPostfixOperation(gen(columns, rowVal, depth + 1, r),
78+
Randomly.fromOptions(MySQLUnaryPostfixOperation.UnaryPostfixOperator.values()),
7979
Randomly.getBoolean());
8080
case FUNCTION:
8181
return getFunction(columns, rowVal, depth + 1, r);
@@ -154,7 +154,7 @@ private static MySQLExpression generateColumn(List<MySQLColumn> columns, MySQLRo
154154
} else {
155155
val = rowVal.getValues().get(c);
156156
}
157-
return MySQLColumnValue.create(c, val);
157+
return MySQLColumnReference.create(c, val);
158158
}
159159

160160
public static String generateRandomExpressionString(List<MySQLColumn> columns, Object object, Randomly r) {

‎src/sqlancer/mysql/test/MySQLQueryPartitioningBase.java‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -12,11 +12,11 @@
1212
import sqlancer.mysql.MySQLSchema;
1313
import sqlancer.mysql.MySQLSchema.MySQLTable;
1414
import sqlancer.mysql.MySQLSchema.MySQLTables;
15-
import sqlancer.mysql.ast.MySQLColumnValue;
15+
import sqlancer.mysql.ast.MySQLColumnReference;
1616
import sqlancer.mysql.ast.MySQLExpression;
1717
import sqlancer.mysql.ast.MySQLSelect;
1818
import sqlancer.mysql.ast.MySQLTableReference;
19-
import sqlancer.mysql.ast.MySQLUnaryPostfixOperator;
19+
import sqlancer.mysql.ast.MySQLUnaryPostfixOperation;
2020
import sqlancer.mysql.ast.MySQLUnaryPrefixOperation;
2121
import sqlancer.mysql.ast.MySQLUnaryPrefixOperation.MySQLUnaryPrefixOperator;
2222
import sqlancer.mysql.gen.MySQLRandomExpressionGenerator;
@@ -54,12 +54,12 @@ public void check() throws SQLException {
5454
// select.setJoins(joins);
5555
predicate = generatePredicate();
5656
negatedPredicate = new MySQLUnaryPrefixOperation(predicate, MySQLUnaryPrefixOperator.NOT);
57-
isNullPredicate = new MySQLUnaryPostfixOperator(predicate,
58-
MySQLUnaryPostfixOperator.UnaryPostfixOperator.IS_NULL, false);
57+
isNullPredicate = new MySQLUnaryPostfixOperation(predicate,
58+
MySQLUnaryPostfixOperation.UnaryPostfixOperator.IS_NULL, false);
5959
}
6060

6161
List<MySQLExpression> generateFetchColumns() {
62-
return Arrays.asList(MySQLColumnValue.create(targetTables.getColumns().get(0), null));
62+
return Arrays.asList(MySQLColumnReference.create(targetTables.getColumns().get(0), null));
6363
}
6464

6565
MySQLExpression generatePredicate() {

0 commit comments

Comments
 (0)