Skip to content

Commit 3f8b547

Browse files
committed
address comments
1 parent 57d7841 commit 3f8b547

File tree

7 files changed

+1
-34
lines changed

7 files changed

+1
-34
lines changed

fdb-relational-core/src/main/antlr/RelationalParser.g4

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -913,10 +913,6 @@ expressionOrDefault
913913
: expression | DEFAULT
914914
;
915915

916-
expressionWithName
917-
: expression AS uid
918-
;
919-
920916
expressionWithOptionalName
921917
: expression (AS uid)?
922918
;

fdb-relational-core/src/main/java/com/apple/foundationdb/relational/recordlayer/ddl/RecordLayerCatalogQueryFactory.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -65,7 +65,7 @@ public Type getResultSetMetadata() {
6565
public RelationalResultSet executeAction(Transaction txn) throws RelationalException {
6666
final Schema schema = catalog.loadSchema(txn, dbId, schemaId);
6767

68-
final List<String> tableNames = schema.getTables().stream().map(Metadata::getName).map(DataTypeUtils::toProtoBufCompliantName)
68+
final List<String> tableNames = schema.getTables().stream().map(Metadata::getName).map(DataTypeUtils::toUserIdentifier)
6969
.collect(Collectors.toList());
7070

7171
final List<String> indexNames = schema.getTables().stream().flatMap(t -> t.getIndexes().stream()).map(Metadata::getName)

fdb-relational-core/src/main/java/com/apple/foundationdb/relational/recordlayer/query/Identifier.java

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -74,11 +74,6 @@ public static Identifier of(@Nonnull String name, @Nonnull Iterable<String> qual
7474
return new Identifier(name, qualifier);
7575
}
7676

77-
@Nonnull
78-
public Identifier withName(@Nonnull String name) {
79-
return Identifier.of(name, qualifier);
80-
}
81-
8277
@Nonnull
8378
public Identifier withQualifier(@Nonnull Collection<String> qualifier) {
8479
if (qualifier.isEmpty()) {

fdb-relational-core/src/main/java/com/apple/foundationdb/relational/recordlayer/query/visitors/BaseVisitor.java

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1341,12 +1341,6 @@ public Object visitExpressionOrDefault(@Nonnull RelationalParser.ExpressionOrDef
13411341
return visitChildren(ctx);
13421342
}
13431343

1344-
@Nonnull
1345-
@Override
1346-
public Expression visitExpressionWithName(@Nonnull RelationalParser.ExpressionWithNameContext ctx) {
1347-
return expressionVisitor.visitExpressionWithName(ctx);
1348-
}
1349-
13501344
@Nonnull
13511345
@Override
13521346
public Expression visitExpressionWithOptionalName(@Nonnull RelationalParser.ExpressionWithOptionalNameContext ctx) {

fdb-relational-core/src/main/java/com/apple/foundationdb/relational/recordlayer/query/visitors/DelegatingVisitor.java

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1189,12 +1189,6 @@ public Object visitExpressionOrDefault(@Nonnull RelationalParser.ExpressionOrDef
11891189
return getDelegate().visitExpressionOrDefault(ctx);
11901190
}
11911191

1192-
@Nonnull
1193-
@Override
1194-
public Expression visitExpressionWithName(@Nonnull RelationalParser.ExpressionWithNameContext ctx) {
1195-
return getDelegate().visitExpressionWithName(ctx);
1196-
}
1197-
11981192
@Nonnull
11991193
@Override
12001194
public Expression visitExpressionWithOptionalName(@Nonnull RelationalParser.ExpressionWithOptionalNameContext ctx) {

fdb-relational-core/src/main/java/com/apple/foundationdb/relational/recordlayer/query/visitors/ExpressionVisitor.java

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -625,14 +625,6 @@ public Expression visitMathExpressionAtom(@Nonnull RelationalParser.MathExpressi
625625
return getDelegate().resolveFunction(ctx.mathOperator().getText(), left, right);
626626
}
627627

628-
@Nonnull
629-
@Override
630-
public Expression visitExpressionWithName(@Nonnull RelationalParser.ExpressionWithNameContext ctx) {
631-
final var expression = Assert.castUnchecked(ctx.expression().accept(this), Expression.class);
632-
final var name = Identifier.toProtobufCompliant(visitUid(ctx.uid()));
633-
return expression.withName(name);
634-
}
635-
636628
@Nonnull
637629
@Override
638630
public Expression visitExpressionWithOptionalName(@Nonnull RelationalParser.ExpressionWithOptionalNameContext ctx) {

fdb-relational-core/src/main/java/com/apple/foundationdb/relational/recordlayer/query/visitors/TypedVisitor.java

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -742,10 +742,6 @@ public interface TypedVisitor extends RelationalParserVisitor<Object> {
742742
@Override
743743
Object visitExpressionOrDefault(@Nonnull RelationalParser.ExpressionOrDefaultContext ctx);
744744

745-
@Nonnull
746-
@Override
747-
Expression visitExpressionWithName(@Nonnull RelationalParser.ExpressionWithNameContext ctx);
748-
749745
@Nonnull
750746
@Override
751747
Expression visitExpressionWithOptionalName(@Nonnull RelationalParser.ExpressionWithOptionalNameContext ctx);

0 commit comments

Comments
 (0)