[Transform] fix regression of date histogram optimization (#60591)

fixes mix up of input and output field name for date histogram optimization.

minimal fix, more tests to be added with #60469

fixes #60590

Author: Hendrik Muhs

x-pack/plugin/transform/src/main/java/org/elasticsearch/xpack/transform/transforms/pivot/CompositeBucketsChangeCollector.java

@@ -565,7 +565,7 @@ static Map<String, FieldCollector> createFieldCollectors(Map<String, SingleGroup
                             entry.getKey(),
                             entry.getValue().getMissingBucket(),
                             ((DateHistogramGroupSource) entry.getValue()).getRounding(),
-                            entry.getKey().equals(synchronizationField)
+                            entry.getValue().getField().equals(synchronizationField)
                         )
                     );
                     break;

x-pack/plugin/transform/src/test/java/org/elasticsearch/xpack/transform/transforms/pivot/CompositeBucketsChangeCollectorTests.java

@@ -15,12 +15,15 @@
 import org.elasticsearch.common.xcontent.XContentBuilder;
 import org.elasticsearch.common.xcontent.XContentParser;
 import org.elasticsearch.index.query.QueryBuilder;
+import org.elasticsearch.index.query.RangeQueryBuilder;
 import org.elasticsearch.index.query.TermsQueryBuilder;
 import org.elasticsearch.search.aggregations.Aggregations;
 import org.elasticsearch.search.aggregations.bucket.composite.CompositeAggregation;
 import org.elasticsearch.search.aggregations.bucket.composite.CompositeAggregationBuilder;
+import org.elasticsearch.search.aggregations.bucket.histogram.DateHistogramInterval;
 import org.elasticsearch.search.builder.SearchSourceBuilder;
 import org.elasticsearch.test.ESTestCase;
+import org.elasticsearch.xpack.core.transform.transforms.pivot.DateHistogramGroupSource;
 import org.elasticsearch.xpack.core.transform.transforms.pivot.GeoTileGroupSourceTests;
 import org.elasticsearch.xpack.core.transform.transforms.pivot.GroupConfig;
 import org.elasticsearch.xpack.core.transform.transforms.pivot.GroupConfigTests;
@@ -43,6 +46,7 @@
 import static org.elasticsearch.common.xcontent.XContentFactory.jsonBuilder;
 import static org.hamcrest.CoreMatchers.instanceOf;
 import static org.hamcrest.Matchers.containsInAnyOrder;
+import static org.hamcrest.Matchers.equalTo;
 import static org.mockito.Mockito.mock;
 import static org.mockito.Mockito.when;
 
@@ -138,6 +142,60 @@ public void testTermsFieldCollector() throws IOException {
         assertThat(((TermsQueryBuilder) queryBuilder).values(), containsInAnyOrder("id1", "id2", "id3"));
     }
 
+    public void testDateHistogramFieldCollector() throws IOException {
+        Map<String, SingleGroupSource> groups = new LinkedHashMap<>();
+
+        SingleGroupSource groupBy = new DateHistogramGroupSource(
+            "timestamp",
+            null,
+            false,
+            new DateHistogramGroupSource.FixedInterval(DateHistogramInterval.MINUTE),
+            null
+        );
+        groups.put("output_timestamp", groupBy);
+
+        ChangeCollector collector = CompositeBucketsChangeCollector.buildChangeCollector(
+            getCompositeAggregation(groups),
+            groups,
+            "timestamp"
+        );
+
+        QueryBuilder queryBuilder = collector.buildFilterQuery(66_666, 200_222);
+        assertNotNull(queryBuilder);
+        assertThat(queryBuilder, instanceOf(RangeQueryBuilder.class));
+        // rounded down
+        assertThat(((RangeQueryBuilder) queryBuilder).from(), equalTo(Long.valueOf(60_000)));
+        assertTrue(((RangeQueryBuilder) queryBuilder).includeLower());
+        assertThat(((RangeQueryBuilder) queryBuilder).fieldName(), equalTo("timestamp"));
+
+        // timestamp field does not match
+        collector = CompositeBucketsChangeCollector.buildChangeCollector(getCompositeAggregation(groups), groups, "sync_timestamp");
+
+        queryBuilder = collector.buildFilterQuery(66_666, 200_222);
+        assertNull(queryBuilder);
+
+        // field does not match, but output field equals sync field
+        collector = CompositeBucketsChangeCollector.buildChangeCollector(getCompositeAggregation(groups), groups, "output_timestamp");
+
+        queryBuilder = collector.buildFilterQuery(66_666, 200_222);
+        assertNull(queryBuilder);
+
+        // missing bucket disables optimization
+        groupBy = new DateHistogramGroupSource(
+            "timestamp",
+            null,
+            true,
+            new DateHistogramGroupSource.FixedInterval(DateHistogramInterval.MINUTE),
+            null
+        );
+        groups.put("output_timestamp", groupBy);
+
+        collector = CompositeBucketsChangeCollector.buildChangeCollector(getCompositeAggregation(groups), groups, "timestamp");
+
+        queryBuilder = collector.buildFilterQuery(66_666, 200_222);
+        assertNull(queryBuilder);
+    }
+
     private static CompositeAggregationBuilder getCompositeAggregation(Map<String, SingleGroupSource> groups) throws IOException {
         CompositeAggregationBuilder compositeAggregation;
         try (XContentBuilder builder = jsonBuilder()) {