Skip to content

Commit 31a9088

Browse files
author
krooswu
committed
Update alias
1 parent 16bea1c commit 31a9088

File tree

1 file changed

+8
-13
lines changed

1 file changed

+8
-13
lines changed

core/src/main/java/org/apache/calcite/rel/rel2sql/RelToSqlConverter.java

Lines changed: 8 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -157,8 +157,7 @@ protected Result dispatch(RelNode e) {
157157
return dispatcher.invoke(e);
158158
}
159159

160-
@Override
161-
public Result visitInput(RelNode parent, int i, boolean anon,
160+
@Override public Result visitInput(RelNode parent, int i, boolean anon,
162161
boolean ignoreClauses, Set<Clause> expectedClauses) {
163162
try {
164163
final RelNode e = parent.getInput(i);
@@ -169,14 +168,12 @@ public Result visitInput(RelNode parent, int i, boolean anon,
169168
}
170169
}
171170

172-
@Override
173-
protected boolean isAnon() {
171+
@Override protected boolean isAnon() {
174172
Frame peek = stack.peek();
175173
return peek == null || peek.anon;
176174
}
177175

178-
@Override
179-
protected Result result(SqlNode node, Collection<Clause> clauses,
176+
@Override protected Result result(SqlNode node, Collection<Clause> clauses,
180177
@Nullable String neededAlias, @Nullable RelDataType neededType,
181178
Map<String, RelDataType> aliases) {
182179
final Frame frame = requireNonNull(stack.peek());
@@ -212,8 +209,7 @@ private static class AliasReplacementShuttle extends SqlShuttle {
212209
this.replaceSource = replaceSource;
213210
}
214211

215-
@Override
216-
public SqlNode visit(SqlIdentifier id) {
212+
@Override public SqlNode visit(SqlIdentifier id) {
217213
SqlNodeList source = requireNonNull(replaceSource, "replaceSource");
218214
SqlNode firstItem = source.get(0);
219215
if (firstItem instanceof SqlIdentifier && ((SqlIdentifier) firstItem).isStar()) {
@@ -328,8 +324,8 @@ public Result visit(Join e) {
328324
usedNames.add(rightResult.neededAlias);
329325
}
330326

331-
String safeAlias = SqlValidatorUtil.uniquify(
332-
"t", usedNames, SqlValidatorUtil.EXPR_SUGGESTER);
327+
String safeAlias =
328+
SqlValidatorUtil.uniquify("t", usedNames, SqlValidatorUtil.EXPR_SUGGESTER);
333329

334330
rightResult = wrapNestedJoin(rightResult, e.getRight(), safeAlias);
335331
}
@@ -499,7 +495,7 @@ private boolean isCommaJoin(Join join) {
499495
// the FROM clause.
500496
final List<Join> flatJoins = new ArrayList<>();
501497
flatJoins.add(topJoin);
502-
for (int i = 0; i < flatJoins.size(); ) {
498+
for (int i = 0; i < flatJoins.size();) {
503499
final Join j2 = flatJoins.get(i++);
504500
if (j2.getLeft() instanceof Join) {
505501
flatJoins.add((Join) j2.getLeft());
@@ -1558,8 +1554,7 @@ public List<SqlNode> createAsFullOperands(RelDataType rowType, SqlNode leftOpera
15581554
return result;
15591555
}
15601556

1561-
@Override
1562-
public void addSelect(List<SqlNode> selectList, SqlNode node,
1557+
@Override public void addSelect(List<SqlNode> selectList, SqlNode node,
15631558
RelDataType rowType) {
15641559
String name = rowType.getFieldNames().get(selectList.size());
15651560
@Nullable String alias = SqlValidatorUtil.alias(node);

0 commit comments

Comments
 (0)