fix a couple of tests

not-napoleon · not-napoleon · commit ec5dfd477fa6 · 2025-07-17T12:53:12.000-04:00
diff --git a/x-pack/plugin/esql-core/src/main/java/org/elasticsearch/xpack/esql/core/expression/FieldAttribute.java b/x-pack/plugin/esql-core/src/main/java/org/elasticsearch/xpack/esql/core/expression/FieldAttribute.java
@@ -218,7 +218,7 @@ protected String label() {
 
     @Override
     public boolean isDimension() {
-        return false;
+        return field.getTimeSeriesFieldType() == EsField.TimeSeriesFieldType.DIMENSION;
     }
 
     public EsField field() {
diff --git a/x-pack/plugin/esql/src/test/java/org/elasticsearch/xpack/esql/type/DateEsFieldTests.java b/x-pack/plugin/esql/src/test/java/org/elasticsearch/xpack/esql/type/DateEsFieldTests.java
@@ -37,7 +37,7 @@ protected DateEsField mutate(DateEsField instance) {
             case 0 -> name = randomAlphaOfLength(name.length() + 1);
             case 1 -> properties = randomValueOtherThan(properties, () -> randomProperties(4));
             case 2 -> aggregatable = false == aggregatable;
-            case 3 -> tsType = randomFrom(EsField.TimeSeriesFieldType.values());
+            case 3 -> tsType = randomValueOtherThan(tsType, () -> randomFrom(EsField.TimeSeriesFieldType.values()));
             default -> throw new IllegalArgumentException();
         }
         return DateEsField.dateEsField(name, properties, aggregatable, tsType);

Original file line number	Diff line number	Diff line change
`@@ -218,7 +218,7 @@ protected String label() {`
`218`	`218`
`219`	`219`	`@Override`
`220`	`220`	`public boolean isDimension() {`
`221`		`- return false;`
	`221`	`+ return field.getTimeSeriesFieldType() == EsField.TimeSeriesFieldType.DIMENSION;`
`222`	`222`	`}`
`223`	`223`
`224`	`224`	`public EsField field() {`
Original file line number	Diff line number	Diff line change
`@@ -37,7 +37,7 @@ protected DateEsField mutate(DateEsField instance) {`
`37`	`37`	`case 0 -> name = randomAlphaOfLength(name.length() + 1);`
`38`	`38`	`case 1 -> properties = randomValueOtherThan(properties, () -> randomProperties(4));`
`39`	`39`	`case 2 -> aggregatable = false == aggregatable;`
`40`		`- case 3 -> tsType = randomFrom(EsField.TimeSeriesFieldType.values());`
	`40`	`+ case 3 -> tsType = randomValueOtherThan(tsType, () -> randomFrom(EsField.TimeSeriesFieldType.values()));`
`41`	`41`	`default -> throw new IllegalArgumentException();`
`42`	`42`	`}`
`43`	`43`	`return DateEsField.dateEsField(name, properties, aggregatable, tsType);`