Skip to content

Commit 221d2d4

Browse files
alex-spiesalex-spies
committed
Fix some more tests
1 parent 31e8682 commit 221d2d4

File tree

5 files changed

+16
-23
lines changed

5 files changed

+16
-23
lines changed

‎x-pack/plugin/esql/src/test/java/org/elasticsearch/xpack/esql/optimizer/LogicalPlanOptimizerTests.java‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1032,7 +1032,7 @@ public void testPushdownLimitsPastLeftJoin() {
10321032
var rightChild = new LocalRelation(Source.EMPTY, List.of(fieldAttribute()), EmptyLocalSupplier.EMPTY);
10331033
assertNotEquals(leftChild, rightChild);
10341034

1035-
var joinConfig = new JoinConfig(JoinTypes.LEFT, List.of(), List.of(), List.of(), null);
1035+
var joinConfig = new JoinConfig(JoinTypes.LEFT, List.of(), List.of(), null);
10361036
var join = switch (randomIntBetween(0, 2)) {
10371037
case 0 -> new Join(EMPTY, leftChild, rightChild, joinConfig);
10381038
case 1 -> new LookupJoin(EMPTY, leftChild, rightChild, joinConfig, false);
@@ -5819,7 +5819,7 @@ public void testDoubleInlinestatsWithEvalGetsPrunedEntirely() {
58195819
var ref = as(order.child(), FieldAttribute.class);
58205820
assertThat(ref.name(), is("emp_no"));
58215821
var inlineJoin = as(topN.child(), InlineJoin.class);
5822-
assertThat(Expressions.names(inlineJoin.config().matchFields()), is(List.of("salaryK")));
5822+
assertThat(Expressions.names(inlineJoin.config().leftFields()), is(List.of("salaryK")));
58235823
// Left
58245824
var eval = as(inlineJoin.left(), Eval.class);
58255825
assertThat(Expressions.names(eval.fields()), is(List.of("salaryK")));
@@ -5885,7 +5885,7 @@ public void testInlinestatsGetsPrunedPartially() {
58855885
assertThat(Expressions.names(project.projections()), is(List.of("x", "a", "emp_no")));
58865886
var upperLimit = asLimit(project.child(), 1, false);
58875887
var inlineJoin = as(upperLimit.child(), InlineJoin.class);
5888-
assertThat(Expressions.names(inlineJoin.config().matchFields()), is(List.of("emp_no")));
5888+
assertThat(Expressions.names(inlineJoin.config().leftFields()), is(List.of("emp_no")));
58895889
// Left
58905890
var relation = as(inlineJoin.left(), EsRelation.class);
58915891
// Right
@@ -5914,7 +5914,7 @@ public void testTripleInlinestatsGetsPrunedPartially() {
59145914
assertThat(Expressions.names(project.projections()), is(List.of("x", "a", "emp_no")));
59155915
var upperLimit = asLimit(project.child(), 1, false);
59165916
var inlineJoin = as(upperLimit.child(), InlineJoin.class);
5917-
assertThat(Expressions.names(inlineJoin.config().matchFields()), is(List.of("emp_no")));
5917+
assertThat(Expressions.names(inlineJoin.config().leftFields()), is(List.of("emp_no")));
59185918
// Left
59195919
var relation = as(inlineJoin.left(), EsRelation.class);
59205920
// Right
@@ -6214,7 +6214,7 @@ public void testInlinestatsWithLookupJoin() {
62146214
assertThat(order.nullsPosition(), equalTo(Order.NullsPosition.FIRST));
62156215
assertThat(Expressions.name(order.child()), equalTo("abbrev"));
62166216
var join = as(topN.child(), Join.class);
6217-
assertThat(Expressions.names(join.config().matchFields()), is(List.of("scalerank")));
6217+
assertThat(Expressions.names(join.config().leftFields()), is(List.of("scalerank")));
62186218
var left = as(join.left(), EsRelation.class);
62196219
assertThat(left.concreteIndices(), is(Set.of("airports")));
62206220
var right = as(join.right(), EsRelation.class);
@@ -6249,7 +6249,7 @@ public void testInlinestatsWithAvg() {
62496249
assertThat(Expressions.names(esqlProject.projections()), is(List.of("avg", "emp_no", "first_name")));
62506250
var upperLimit = asLimit(esqlProject.child(), 10, false);
62516251
var inlineJoin = as(upperLimit.child(), InlineJoin.class);
6252-
assertThat(Expressions.names(inlineJoin.config().matchFields()), is(List.of("emp_no")));
6252+
assertThat(Expressions.names(inlineJoin.config().leftFields()), is(List.of("emp_no")));
62536253
// Left
62546254
var relation = as(inlineJoin.left(), EsRelation.class);
62556255
// Right
@@ -6840,7 +6840,7 @@ public void testLookupSimple() {
68406840
assertThat(limit.limit().fold(FoldContext.small()), equalTo(1000));
68416841

68426842
assertThat(join.config().type(), equalTo(JoinTypes.LEFT));
6843-
assertThat(join.config().matchFields().stream().map(Object::toString).toList(), matchesList().item(startsWith("int{r}")));
6843+
assertThat(join.config().leftFields().stream().map(Object::toString).toList(), matchesList().item(startsWith("int{r}")));
68446844
assertThat(join.config().leftFields().size(), equalTo(1));
68456845
assertThat(join.config().rightFields().size(), equalTo(1));
68466846
Attribute lhs = join.config().leftFields().get(0);
@@ -6929,7 +6929,7 @@ public void testLookupStats() {
69296929
as(left.child(), EsRelation.class);
69306930

69316931
assertThat(join.config().type(), equalTo(JoinTypes.LEFT));
6932-
assertThat(join.config().matchFields().stream().map(Object::toString).toList(), matchesList().item(startsWith("int{r}")));
6932+
assertThat(join.config().leftFields().stream().map(Object::toString).toList(), matchesList().item(startsWith("int{r}")));
69336933
assertThat(join.config().leftFields().size(), equalTo(1));
69346934
assertThat(join.config().rightFields().size(), equalTo(1));
69356935
Attribute lhs = join.config().leftFields().get(0);

‎x-pack/plugin/esql/src/test/java/org/elasticsearch/xpack/esql/optimizer/PhysicalPlanOptimizerTests.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7602,7 +7602,7 @@ public void testLookupThenTopN() {
76027602
);
76037603
Join join = as(innerTopN.child(), Join.class);
76047604
assertThat(join.config().type(), equalTo(JoinTypes.LEFT));
7605-
assertMap(join.config().matchFields().stream().map(Objects::toString).toList(), matchesList().item(startsWith("int{r}")));
7605+
assertMap(join.config().leftFields().stream().map(Objects::toString).toList(), matchesList().item(startsWith("int{r}")));
76067606

76077607
Project innerProject = as(join.left(), Project.class);
76087608
assertThat(innerProject.projections(), hasSize(10));

‎x-pack/plugin/esql/src/test/java/org/elasticsearch/xpack/esql/optimizer/rules/logical/PushDownAndCombineFiltersTests.java‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -587,7 +587,7 @@ public void testPushDownFilterPastLeftJoinWithComplexMix() {
587587
FieldAttribute g = getFieldAttribute("g");
588588
EsRelation left = relation(List.of(a, getFieldAttribute("b")));
589589
EsRelation right = relation(List.of(c, d, e, f, g));
590-
JoinConfig joinConfig = new JoinConfig(JoinTypes.LEFT, List.of(a), List.of(a), List.of(c), null);
590+
JoinConfig joinConfig = new JoinConfig(JoinTypes.LEFT, List.of(a), List.of(c), null);
591591
Join join = new Join(EMPTY, left, right, joinConfig);
592592

593593
// Predicates
@@ -838,7 +838,7 @@ private Join createLeftJoinOnFields() {
838838
EsRelation left = relation(List.of(a, b));
839839
EsRelation right = relation(List.of(c, b));
840840

841-
JoinConfig joinConfig = new JoinConfig(JoinTypes.LEFT, List.of(b), List.of(a, b), List.of(b, c), null);
841+
JoinConfig joinConfig = new JoinConfig(JoinTypes.LEFT, List.of(a, b), List.of(b, c), null);
842842
return new Join(EMPTY, left, right, joinConfig);
843843
}
844844

@@ -850,7 +850,7 @@ private Join createLeftJoinOnExpression() {
850850
EsRelation left = relation(List.of(a, b1));
851851
EsRelation right = relation(List.of(c, b2));
852852
Expression joinOnCondition = new GreaterThanOrEqual(Source.EMPTY, b1, b2);
853-
JoinConfig joinConfig = new JoinConfig(JoinTypes.LEFT, List.of(b1), List.of(a, b1, b2), List.of(b2, c), joinOnCondition);
853+
JoinConfig joinConfig = new JoinConfig(JoinTypes.LEFT, List.of(a, b1, b2), List.of(b2, c), joinOnCondition);
854854
return new Join(EMPTY, left, right, joinConfig);
855855
}
856856

‎x-pack/plugin/esql/src/test/java/org/elasticsearch/xpack/esql/plan/logical/JoinTests.java‎

Lines changed: 4 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,6 @@ public class JoinTests extends ESTestCase {
2727
public void testExpressionsAndReferences() {
2828
int numMatchFields = between(1, 10);
2929

30-
List<Attribute> matchFields = new ArrayList<>(numMatchFields);
3130
List<Alias> leftFields = new ArrayList<>(numMatchFields);
3231
List<Attribute> leftAttributes = new ArrayList<>(numMatchFields);
3332
List<Alias> rightFields = new ArrayList<>(numMatchFields);
@@ -41,33 +40,29 @@ public void testExpressionsAndReferences() {
4140
leftAttributes.add(left.toAttribute());
4241
rightFields.add(right);
4342
rightAttributes.add(right.toAttribute());
44-
matchFields.add(randomBoolean() ? left.toAttribute() : right.toAttribute());
4543
}
4644

4745
Row left = new Row(Source.EMPTY, leftFields);
4846
Row right = new Row(Source.EMPTY, rightFields);
4947

50-
JoinConfig joinConfig = new JoinConfig(JoinTypes.LEFT, matchFields, leftAttributes, rightAttributes, null);
48+
JoinConfig joinConfig = new JoinConfig(JoinTypes.LEFT, leftAttributes, rightAttributes, null);
5149
Join join = new Join(Source.EMPTY, left, right, joinConfig);
5250

5351
// matchfields are a subset of the left and right fields, so they don't contribute to the size of the references set.
5452
// assertEquals(2 * numMatchFields, join.references().size());
5553

5654
AttributeSet refs = join.references();
57-
assertTrue(refs.containsAll(matchFields));
5855
assertTrue(refs.containsAll(leftAttributes));
5956
assertTrue(refs.containsAll(rightAttributes));
6057

6158
Set<Expression> exprs = Set.copyOf(join.expressions());
62-
assertTrue(exprs.containsAll(matchFields));
6359
assertTrue(exprs.containsAll(leftAttributes));
6460
assertTrue(exprs.containsAll(rightAttributes));
6561
}
6662

6763
public void testTransformExprs() {
6864
int numMatchFields = between(1, 10);
6965

70-
List<Attribute> matchFields = new ArrayList<>(numMatchFields);
7166
List<Alias> leftFields = new ArrayList<>(numMatchFields);
7267
List<Attribute> leftAttributes = new ArrayList<>(numMatchFields);
7368
List<Alias> rightFields = new ArrayList<>(numMatchFields);
@@ -81,18 +76,17 @@ public void testTransformExprs() {
8176
leftAttributes.add(left.toAttribute());
8277
rightFields.add(right);
8378
rightAttributes.add(right.toAttribute());
84-
matchFields.add(randomBoolean() ? left.toAttribute() : right.toAttribute());
8579
}
8680

8781
Row left = new Row(Source.EMPTY, leftFields);
8882
Row right = new Row(Source.EMPTY, rightFields);
8983

90-
JoinConfig joinConfig = new JoinConfig(JoinTypes.LEFT, matchFields, leftAttributes, rightAttributes, null);
84+
JoinConfig joinConfig = new JoinConfig(JoinTypes.LEFT, leftAttributes, rightAttributes, null);
9185
Join join = new Join(Source.EMPTY, left, right, joinConfig);
92-
assertTrue(join.config().matchFields().stream().allMatch(ref -> ref.dataType().equals(DataType.INTEGER)));
86+
assertTrue(join.config().leftFields().stream().allMatch(ref -> ref.dataType().equals(DataType.INTEGER)));
9387

9488
Join transformedJoin = (Join) join.transformExpressionsOnly(Attribute.class, attr -> attr.withDataType(DataType.BOOLEAN));
95-
assertTrue(transformedJoin.config().matchFields().stream().allMatch(ref -> ref.dataType().equals(DataType.BOOLEAN)));
89+
assertTrue(transformedJoin.config().leftFields().stream().allMatch(ref -> ref.dataType().equals(DataType.BOOLEAN)));
9690
}
9791

9892
private static Alias aliasForLiteral(String name) {

‎x-pack/plugin/esql/src/test/java/org/elasticsearch/xpack/esql/tree/EsqlNodeSubclassTests.java‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -515,7 +515,6 @@ public void accept(Page page) {
515515
JoinTypes.LEFT,
516516
List.of(UnresolvedAttributeTests.randomUnresolvedAttribute()),
517517
List.of(UnresolvedAttributeTests.randomUnresolvedAttribute()),
518-
List.of(UnresolvedAttributeTests.randomUnresolvedAttribute()),
519518
randomJoinOnExpression()
520519
);
521520
}

0 commit comments

Comments
 (0)