Skip to content

Commit 8077d13

Browse files
authored
Fix fieldName in FieldAttribute (#129427) (#129430)
I believe we missed the if/else here in #128910; without it, we won't maintain backward compatibility with pre-8.15. This is no longer necessary in main since it doesn't interact with pre-8.15 nodes. I'll open a follow-up to remove it from main, but it's required in 8.19 and 8.18 because mixed cluster tests are failing without it. Relates #128910 Closes #129412 Closes #129411 Closes #129375 Closes #129374 Closes #129373 Closes #129340 Closes #129339 Closes #129304 Closes #129303 Closes #129410 Closes #129409 Closes #129408 Closes #129407 Closes #129379 Closes #129378 Closes #129377 Closes #129376 Closes #129307 Closes #129306 Closes #129305
1 parent a8dadbc commit 8077d13

File tree

1 file changed

+2
-1
lines changed
  • x-pack/plugin/esql-core/src/main/java/org/elasticsearch/xpack/esql/core/expression

1 file changed

+2
-1
lines changed

x-pack/plugin/esql-core/src/main/java/org/elasticsearch/xpack/esql/core/expression/FieldAttribute.java

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -204,8 +204,9 @@ public FieldName fieldName() {
204204
// name starting with `$$`.
205205
if ((synthetic() || name().startsWith(SYNTHETIC_ATTRIBUTE_NAME_PREFIX)) == false) {
206206
lazyFieldName = new FieldName(name());
207+
} else {
208+
lazyFieldName = new FieldName(Strings.hasText(parentName) ? parentName + "." + field.getName() : field.getName());
207209
}
208-
lazyFieldName = new FieldName(Strings.hasText(parentName) ? parentName + "." + field.getName() : field.getName());
209210
}
210211
return lazyFieldName;
211212
}

0 commit comments

Comments
 (0)