Skip to content

Commit 31dc92e

Browse files
alex-spiesalex-spies
committed
Fix tests
1 parent e013501 commit 31dc92e

File tree

2 files changed

+24
-28
lines changed

2 files changed

+24
-28
lines changed

‎x-pack/plugin/esql/qa/testFixtures/src/main/java/org/elasticsearch/xpack/esql/EsqlTestUtils.java‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -50,6 +50,7 @@
5050
import org.elasticsearch.xpack.esql.action.EsqlQueryResponse;
5151
import org.elasticsearch.xpack.esql.analysis.EnrichResolution;
5252
import org.elasticsearch.xpack.esql.analysis.Verifier;
53+
import org.elasticsearch.xpack.esql.core.expression.Alias;
5354
import org.elasticsearch.xpack.esql.core.expression.Attribute;
5455
import org.elasticsearch.xpack.esql.core.expression.Expression;
5556
import org.elasticsearch.xpack.esql.core.expression.FieldAttribute;

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

Lines changed: 23 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,6 @@
2020

2121
import static org.elasticsearch.xpack.esql.EsqlTestUtils.alias;
2222
import static org.elasticsearch.xpack.esql.EsqlTestUtils.as;
23-
import static org.elasticsearch.xpack.esql.EsqlTestUtils.assertEqualsIgnoringIds;
2423
import static org.elasticsearch.xpack.esql.EsqlTestUtils.findFieldAttribute;
2524
import static org.elasticsearch.xpack.esql.EsqlTestUtils.mul;
2625
import static org.elasticsearch.xpack.esql.EsqlTestUtils.of;
@@ -62,7 +61,7 @@ public void testSimple() {
6261
List<Expression> expectedEvalFields = new ArrayList<>();
6362
expectedEvalFields.add(salary2);
6463
expectedEvalFields.add(salary3);
65-
assertEqualsIgnoringIds(expectedEvalFields, eval.fields());
64+
assertEquals(expectedEvalFields, eval.fields());
6665

6766
List<Expression> expectedProjections = new ArrayList<>();
6867
expectedProjections.add(empNo);
@@ -71,7 +70,7 @@ public void testSimple() {
7170
expectedProjections.add(salary2.toAttribute());
7271
expectedProjections.add(alias("emp_no3", empNo));
7372
expectedProjections.add(salary3.toAttribute());
74-
assertEqualsIgnoringIds(expectedProjections, project.projections());
73+
assertEquals(expectedProjections, project.projections());
7574
}
7675

7776
/**
@@ -108,9 +107,7 @@ public void testSimpleFieldFromLookup() {
108107
List<Expression> expectedEvalFields = new ArrayList<>();
109108
expectedEvalFields.add(salary2);
110109
expectedEvalFields.add(salary3);
111-
assertEqualsIgnoringIds(expectedEvalFields, eval.fields());
112-
// assert using id to ensure we're pointing to the right salary
113-
assertEquals(eval.fields().get(0).child(), mul(salary, of(2)));
110+
assertEquals(expectedEvalFields, eval.fields());
114111

115112
List<Expression> expectedProjections = new ArrayList<>();
116113
expectedProjections.add(empNo);
@@ -119,10 +116,7 @@ public void testSimpleFieldFromLookup() {
119116
expectedProjections.add(salary2.toAttribute());
120117
expectedProjections.add(alias("emp_no3", empNo));
121118
expectedProjections.add(salary3.toAttribute());
122-
assertEqualsIgnoringIds(expectedProjections, project.projections());
123-
// assert using id to ensure we're pointing to the right emp_no and salary
124-
assertEquals(project.projections().get(0), empNo);
125-
assertEquals(project.projections().get(1), salary);
119+
assertEquals(expectedProjections, project.projections());
126120
}
127121

128122
/**
@@ -155,7 +149,7 @@ public void testOnlyAliases() {
155149
expectedProjections.add(alias("salary", empNo));
156150
expectedProjections.add(alias("salary3", salary));
157151
expectedProjections.add(alias("emp_no", salary));
158-
assertEqualsIgnoringIds(expectedProjections, project.projections());
152+
assertEquals(expectedProjections, project.projections());
159153
}
160154

161155
/**
@@ -165,6 +159,7 @@ public void testOnlyAliases() {
165159
* \_EsRelation[test][_meta_field{f}#32, emp_no{f}#26, first_name{f}#27, ..]
166160
* }</pre>
167161
*/
162+
@AwaitsFix(bugUrl = "https://github.com/elastic/elasticsearch/issues/131509")
168163
public void testAliasLoopTwoVars() {
169164
// Rule only kicks in if there's a Project or Aggregate above, so we add a KEEP *
170165
var plan = plan("""
@@ -183,7 +178,7 @@ public void testAliasLoopTwoVars() {
183178
List<Expression> expectedProjections = new ArrayList<>();
184179
expectedProjections.add(alias("b", empNo));
185180
expectedProjections.add(alias("a", empNo));
186-
assertEqualsIgnoringIds(expectedProjections, project.projections());
181+
assertEquals(expectedProjections, project.projections());
187182
}
188183

189184
/**
@@ -212,7 +207,7 @@ public void testAliasLoopThreeVars() {
212207
expectedProjections.add(alias("b", empNo));
213208
expectedProjections.add(alias("c", empNo));
214209
expectedProjections.add(alias("a", empNo));
215-
assertEqualsIgnoringIds(expectedProjections, project.projections());
210+
assertEquals(expectedProjections, project.projections());
216211
}
217212

218213
/**
@@ -246,15 +241,15 @@ public void testNonAliasShadowingAliasedAttribute() {
246241
assertEquals(mul(salary, of(2)), empNoTempName.child());
247242

248243
var salary3 = alias("salary3", mul(empNoTempName.toAttribute(), of(2)));
249-
assertEqualsIgnoringIds(salary3, eval.fields().get(1));
244+
assertEquals(salary3, eval.fields().get(1));
250245

251246
List<Expression> expectedProjections = new ArrayList<>();
252247
expectedProjections.add(salary);
253248
expectedProjections.add(alias("emp_no2", empNo));
254249
expectedProjections.add(alias("emp_no", empNoTempName.toAttribute()));
255250
expectedProjections.add(alias("emp_no3", empNo));
256251
expectedProjections.add(salary3.toAttribute());
257-
assertEqualsIgnoringIds(expectedProjections, project.projections());
252+
assertEquals(expectedProjections, project.projections());
258253
}
259254

260255
/**
@@ -290,15 +285,15 @@ public void testNonAliasShadowingAliasedAttributeWithAgg() {
290285
assertEquals(mul(salary, of(2)), empNoTempName.child());
291286

292287
var salary3 = alias("salary3", mul(empNoTempName.toAttribute(), of(2)));
293-
assertEqualsIgnoringIds(salary3, eval.fields().get(1));
288+
assertEquals(salary3, eval.fields().get(1));
294289

295290
List<Expression> expectedAggregates = new ArrayList<>();
296291
expectedAggregates.add(alias("emp_no", empNoTempName.toAttribute()));
297292
expectedAggregates.add(alias("emp_no2", empNo));
298293
expectedAggregates.add(alias("emp_no3", empNo));
299294
expectedAggregates.add(salary);
300295
expectedAggregates.add(salary3.toAttribute());
301-
assertEqualsIgnoringIds(expectedAggregates, agg.aggregates());
296+
assertEquals(expectedAggregates, agg.aggregates());
302297
}
303298

304299
/**
@@ -336,15 +331,15 @@ public void testNonAliasShadowingAliasedAttributeWithRename() {
336331
assertEquals(mul(salary, of(2)), idTempName.child());
337332

338333
var salary3 = alias("salary3", mul(idTempName.toAttribute(), of(2)));
339-
assertEqualsIgnoringIds(salary3, eval.fields().get(1));
334+
assertEquals(salary3, eval.fields().get(1));
340335

341336
List<Expression> expectedProjections = new ArrayList<>();
342337
expectedProjections.add(salary);
343338
expectedProjections.add(alias("emp_no2", empNo));
344339
expectedProjections.add(alias("emp_no", idTempName.toAttribute()));
345340
expectedProjections.add(alias("emp_no3", empNo));
346341
expectedProjections.add(salary3.toAttribute());
347-
assertEqualsIgnoringIds(expectedProjections, project.projections());
342+
assertEquals(expectedProjections, project.projections());
348343
}
349344

350345
/**
@@ -372,15 +367,15 @@ public void testNonAliasShadowingAliasOfAliasedAttribute() {
372367

373368
var empNo2 = alias("emp_no2", mul(salary, of(2)));
374369
var salary3 = alias("salary3", mul(empNo2.toAttribute(), of(3)));
375-
assertEqualsIgnoringIds(List.of(empNo2, salary3), eval.fields());
370+
assertEquals(List.of(empNo2, salary3), eval.fields());
376371

377372
List<Expression> expectedProjections = new ArrayList<>();
378373
expectedProjections.add(empNo);
379374
expectedProjections.add(salary);
380375
expectedProjections.add(alias("emp_no3", empNo));
381376
expectedProjections.add(empNo2.toAttribute());
382377
expectedProjections.add(salary3.toAttribute());
383-
assertEqualsIgnoringIds(expectedProjections, project.projections());
378+
assertEquals(expectedProjections, project.projections());
384379
}
385380

386381
/**
@@ -412,7 +407,7 @@ public void testAliasShadowingOtherAlias() {
412407
expectedProjections.add(alias("salary3", salary));
413408
expectedProjections.add(alias("emp_no2", salary));
414409
expectedProjections.add(alias("salary2", empNo));
415-
assertEqualsIgnoringIds(expectedProjections, project.projections());
410+
assertEquals(expectedProjections, project.projections());
416411
}
417412

418413
/**
@@ -439,15 +434,15 @@ public void testAliasForNonAlias() {
439434

440435
var salary2 = alias("salary2", mul(salary, of(2)));
441436
var salary3 = alias("salary3", mul(salary2.toAttribute(), of(3)));
442-
assertEqualsIgnoringIds(List.of(salary2, salary3), eval.fields());
437+
assertEquals(List.of(salary2, salary3), eval.fields());
443438

444439
List<Expression> expectedProjections = new ArrayList<>();
445440
expectedProjections.add(salary);
446441
expectedProjections.add(salary2.toAttribute());
447442
expectedProjections.add(alias("aliased_salary2", salary2.toAttribute()));
448443
expectedProjections.add(salary3.toAttribute());
449444
expectedProjections.add(alias("twice_aliased_salary2", salary2.toAttribute()));
450-
assertEqualsIgnoringIds(expectedProjections, project.projections());
445+
assertEquals(expectedProjections, project.projections());
451446
}
452447

453448
/**
@@ -476,19 +471,19 @@ public void testAliasForShadowedNonAlias() {
476471

477472
assertEquals(3, eval.fields().size());
478473
var salary2 = alias("salary2", mul(salary, of(2)));
479-
assertEqualsIgnoringIds(salary2, eval.fields().get(0));
474+
assertEquals(salary2, eval.fields().get(0));
480475
var salary2TempName = eval.fields().get(1);
481476
assertThat(salary2TempName.name(), startsWith("$$salary2$temp_name$"));
482-
assertEqualsIgnoringIds(mul(salary2.toAttribute(), of(3)), salary2TempName.child());
477+
assertEquals(mul(salary2.toAttribute(), of(3)), salary2TempName.child());
483478
var salary3 = alias("salary3", mul(salary2TempName.toAttribute(), of(4)));
484-
assertEqualsIgnoringIds(salary3, eval.fields().get(2));
479+
assertEquals(salary3, eval.fields().get(2));
485480

486481
List<Expression> expectedProjections = new ArrayList<>();
487482
expectedProjections.add(salary);
488483
expectedProjections.add(alias("aliased_salary2", salary2.toAttribute()));
489484
expectedProjections.add(alias("salary2", salary2TempName.toAttribute()));
490485
expectedProjections.add(salary3.toAttribute());
491486
expectedProjections.add(alias("salary4", salary3.toAttribute()));
492-
assertEqualsIgnoringIds(expectedProjections, project.projections());
487+
assertEquals(expectedProjections, project.projections());
493488
}
494489
}

0 commit comments

Comments
 (0)