Skip to content

Commit 921fb5c

Browse files
committed
address TeamScale test gabs.
1 parent dd030c1 commit 921fb5c

File tree

4 files changed

+342
-229
lines changed

4 files changed

+342
-229
lines changed

fdb-record-layer-core/src/main/java/com/apple/foundationdb/record/query/plan/cascades/values/Value.java

Lines changed: 0 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -309,31 +309,6 @@ default Value translateCorrelations(@Nonnull final TranslationMap translationMap
309309
}, false).orElseThrow(() -> new RecordCoreException("unable to map tree"));
310310
}
311311

312-
@Nonnull
313-
@SuppressWarnings("PMD.CompareObjectsWithEquals")
314-
default Value translateCorrelationsRecursively(@Nonnull final TranslationMap translationMap) {
315-
if (translationMap.definesOnlyIdentities()) {
316-
return this;
317-
}
318-
return replaceLeavesMaybe(value -> {
319-
if (value instanceof LeafValue) {
320-
final var leafValue = (LeafValue)value;
321-
final var correlatedTo = value.getCorrelatedTo();
322-
if (correlatedTo.isEmpty()) {
323-
return leafValue;
324-
}
325-
326-
Verify.verify(correlatedTo.size() == 1);
327-
final var sourceAlias = Iterables.getOnlyElement(correlatedTo);
328-
return translationMap.containsSourceAlias(sourceAlias)
329-
? translationMap.applyTranslationFunction(sourceAlias, leafValue)
330-
: leafValue;
331-
}
332-
Verify.verify(value.getCorrelatedTo().isEmpty());
333-
return value;
334-
}, true).orElseThrow(() -> new RecordCoreException("unable to map tree"));
335-
}
336-
337312
@Nonnull
338313
default <V extends Value> V narrow(@Nonnull Class<V> narrowedClass) {
339314
return narrowedClass.cast(this);

fdb-relational-core/src/main/java/com/apple/foundationdb/relational/recordlayer/metadata/RecordLayerIndex.java

Lines changed: 0 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -123,17 +123,6 @@ public Map<String, String> getOptions() {
123123
return options;
124124
}
125125

126-
@Nonnull
127-
public Builder toBuilder() {
128-
return newBuilder().setName(getName())
129-
.setIndexType(getIndexType())
130-
.setTableName(getTableName())
131-
.setUnique(isUnique())
132-
.setKeyExpression(getKeyExpression())
133-
.setPredicate(getPredicate())
134-
.setOptions(getOptions());
135-
}
136-
137126
@Nonnull
138127
public static RecordLayerIndex from(@Nonnull final String tableName, @Nonnull String tableStorageName, @Nonnull final com.apple.foundationdb.record.metadata.Index index) {
139128
final var indexProto = index.toProto();

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

Lines changed: 0 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -419,24 +419,6 @@ public RecordLayerIndex visitVectorIndexDefinition(final RelationalParser.Vector
419419
return ddlVisitor.visitVectorIndexDefinition(ctx);
420420
}
421421

422-
@Nonnull
423-
@Override
424-
public Object visitIndexColumnList(@Nonnull RelationalParser.IndexColumnListContext ctx) {
425-
return ddlVisitor.visitIndexColumnList(ctx);
426-
}
427-
428-
@Nonnull
429-
@Override
430-
public Object visitIndexColumnSpec(@Nonnull RelationalParser.IndexColumnSpecContext ctx) {
431-
return ddlVisitor.visitIndexColumnSpec(ctx);
432-
}
433-
434-
@Nonnull
435-
@Override
436-
public Object visitIncludeClause(@Nonnull RelationalParser.IncludeClauseContext ctx) {
437-
return ddlVisitor.visitIncludeClause(ctx);
438-
}
439-
440422
@Override
441423
public Object visitIndexAttributes(RelationalParser.IndexAttributesContext ctx) {
442424
return visitChildren(ctx);
@@ -1721,9 +1703,4 @@ public DdlQueryFactory getDdlQueryFactory() {
17211703
public URI getDbUri() {
17221704
return dbUri;
17231705
}
1724-
1725-
@Override
1726-
public Object visitOrderClause(@Nonnull RelationalParser.OrderClauseContext ctx) {
1727-
return visitChildren(ctx);
1728-
}
17291706
}

0 commit comments

Comments
 (0)