Rename downsampling to downsampling rounds

Author: gmarouli

modules/data-streams/src/test/java/org/elasticsearch/datastreams/MetadataIndexTemplateServiceTests.java

@@ -157,7 +157,7 @@ public void testLifecycleComposition() {
             // Defaults to true
             assertThat(result.enabled(), equalTo(true));
             assertThat(result.dataRetention(), equalTo(lifecycle.dataRetention().get()));
-            assertThat(result.downsampling(), equalTo(lifecycle.downsampling().get()));
+            assertThat(result.downsamplingRounds(), equalTo(lifecycle.downsamplingRounds().get()));
         }
         // If the last lifecycle is missing a property (apart from enabled) we keep the latest from the previous ones
         // Enabled is always true unless it's explicitly set to false
@@ -171,7 +171,7 @@ public void testLifecycleComposition() {
             DataStreamLifecycle result = composeDataLifecycles(lifecycles).build();
             assertThat(result.enabled(), equalTo(true));
             assertThat(result.dataRetention(), equalTo(lifecycle.dataRetention().get()));
-            assertThat(result.downsampling(), equalTo(lifecycle.downsampling().get()));
+            assertThat(result.downsamplingRounds(), equalTo(lifecycle.downsamplingRounds().get()));
         }
         // If both lifecycle have all properties, then the latest one overwrites all the others
         {
@@ -189,7 +189,7 @@ public void testLifecycleComposition() {
             DataStreamLifecycle result = composeDataLifecycles(lifecycles).build();
             assertThat(result.enabled(), equalTo(lifecycle2.enabled()));
             assertThat(result.dataRetention(), equalTo(lifecycle2.dataRetention().get()));
-            assertThat(result.downsampling(), equalTo(lifecycle2.downsampling().get()));
+            assertThat(result.downsamplingRounds(), equalTo(lifecycle2.downsamplingRounds().get()));
         }
     }
 

modules/data-streams/src/test/java/org/elasticsearch/datastreams/lifecycle/DataStreamLifecycleServiceTests.java

@@ -1228,7 +1228,7 @@ public void testDownsampling() throws Exception {
                 .put(IndexSettings.MODE.getKey(), IndexMode.TIME_SERIES)
                 .put("index.routing_path", "@timestamp"),
             DataStreamLifecycle.dataLifecycleBuilder()
-                .downsampling(List.of(new DownsamplingRound(TimeValue.timeValueMillis(0), new DateHistogramInterval("5m"))))
+                .downsamplingRounds(List.of(new DownsamplingRound(TimeValue.timeValueMillis(0), new DateHistogramInterval("5m"))))
                 .dataRetention(TimeValue.MAX_VALUE)
                 .build(),
             now
@@ -1375,7 +1375,7 @@ public void testDownsamplingWhenTargetIndexNameClashYieldsException() throws Exc
                 .put(IndexSettings.MODE.getKey(), IndexMode.TIME_SERIES)
                 .put("index.routing_path", "@timestamp"),
             DataStreamLifecycle.dataLifecycleBuilder()
-                .downsampling(List.of(new DownsamplingRound(TimeValue.timeValueMillis(0), new DateHistogramInterval("5m"))))
+                .downsamplingRounds(List.of(new DownsamplingRound(TimeValue.timeValueMillis(0), new DateHistogramInterval("5m"))))
                 .dataRetention(TimeValue.MAX_VALUE)
                 .build(),
             now
@@ -1658,7 +1658,7 @@ private ClusterState downsampleSetup(ProjectId projectId, String dataStreamName,
             settings(IndexVersion.current()).put(IndexSettings.MODE.getKey(), IndexMode.TIME_SERIES)
                 .put("index.routing_path", "@timestamp"),
             DataStreamLifecycle.dataLifecycleBuilder()
-                .downsampling(List.of(new DownsamplingRound(TimeValue.timeValueMillis(0), new DateHistogramInterval("5m"))))
+                .downsamplingRounds(List.of(new DownsamplingRound(TimeValue.timeValueMillis(0), new DateHistogramInterval("5m"))))
                 .dataRetention(TimeValue.timeValueMillis(1))
                 .build(),
             now

server/src/main/java/org/elasticsearch/action/datastreams/lifecycle/PutDataStreamLifecycleAction.java

@@ -145,14 +145,14 @@ public Request(
             String[] names,
             @Nullable TimeValue dataRetention,
             @Nullable Boolean enabled,
-            @Nullable List<DataStreamLifecycle.DownsamplingRound> downsampling
+            @Nullable List<DataStreamLifecycle.DownsamplingRound> downsamplingRounds
         ) {
             super(masterNodeTimeout, ackTimeout);
             this.names = names;
             this.lifecycle = DataStreamLifecycle.dataLifecycleBuilder()
                 .dataRetention(dataRetention)
                 .enabled(enabled == null || enabled)
-                .downsampling(downsampling)
+                .downsamplingRounds(downsamplingRounds)
                 .build();
         }
 

server/src/main/java/org/elasticsearch/cluster/metadata/DataStream.java

@@ -1247,7 +1247,7 @@ public List<DownsamplingRound> getDownsamplingRoundsFor(
         LongSupplier nowSupplier
     ) {
         assert backingIndices.indices.contains(index) : "the provided index must be a backing index for this datastream";
-        if (lifecycle == null || lifecycle.downsampling() == null) {
+        if (lifecycle == null || lifecycle.downsamplingRounds() == null) {
             return List.of();
         }
 
@@ -1260,8 +1260,8 @@ public List<DownsamplingRound> getDownsamplingRoundsFor(
         if (indexGenerationTime != null) {
             long nowMillis = nowSupplier.getAsLong();
             long indexGenerationTimeMillis = indexGenerationTime.millis();
-            List<DownsamplingRound> orderedRoundsForIndex = new ArrayList<>(lifecycle.downsampling().size());
-            for (DownsamplingRound round : lifecycle.downsampling()) {
+            List<DownsamplingRound> orderedRoundsForIndex = new ArrayList<>(lifecycle.downsamplingRounds().size());
+            for (DownsamplingRound round : lifecycle.downsamplingRounds()) {
                 if (nowMillis >= indexGenerationTimeMillis + round.after().getMillis()) {
                     orderedRoundsForIndex.add(round);
                 }

server/src/main/java/org/elasticsearch/cluster/metadata/DataStreamLifecycle.java

@@ -143,7 +143,7 @@ public static boolean isDataStreamsLifecycleOnlyMode(final Settings settings) {
     @Nullable
     private final TimeValue dataRetention;
     @Nullable
-    private final List<DownsamplingRound> downsampling;
+    private final List<DownsamplingRound> downsamplingRounds;
 
     /**
      * This constructor is visible for testing, please use {@link DataStreamLifecycle#createDataLifecycle(Boolean, TimeValue, List)} or
@@ -153,16 +153,16 @@ public static boolean isDataStreamsLifecycleOnlyMode(final Settings settings) {
         LifecycleType lifecycleType,
         @Nullable Boolean enabled,
         @Nullable TimeValue dataRetention,
-        @Nullable List<DownsamplingRound> downsampling
+        @Nullable List<DownsamplingRound> downsamplingRounds
     ) {
         this.lifecycleType = lifecycleType;
         this.enabled = enabled == null || enabled;
         this.dataRetention = dataRetention;
-        if (lifecycleType == LifecycleType.FAILURES && downsampling != null) {
+        if (lifecycleType == LifecycleType.FAILURES && downsamplingRounds != null) {
             throw new IllegalArgumentException(DOWNSAMPLING_NOT_SUPPORTED_ERROR_MESSAGE);
         }
-        DownsamplingRound.validateRounds(downsampling);
-        this.downsampling = downsampling;
+        DownsamplingRound.validateRounds(downsamplingRounds);
+        this.downsamplingRounds = downsamplingRounds;
     }
 
     /**
@@ -308,8 +308,8 @@ public void addWarningHeaderIfDataRetentionNotEffective(
      * not configured then it returns null.
      */
     @Nullable
-    public List<DownsamplingRound> downsampling() {
-        return downsampling;
+    public List<DownsamplingRound> downsamplingRounds() {
+        return downsamplingRounds;
     }
 
     @Override
@@ -320,13 +320,13 @@ public boolean equals(Object o) {
         final DataStreamLifecycle that = (DataStreamLifecycle) o;
         return lifecycleType == that.lifecycleType
             && Objects.equals(dataRetention, that.dataRetention)
-            && Objects.equals(downsampling, that.downsampling)
+            && Objects.equals(downsamplingRounds, that.downsamplingRounds)
             && enabled == that.enabled;
     }
 
     @Override
     public int hashCode() {
-        return Objects.hash(lifecycleType, enabled, dataRetention, downsampling);
+        return Objects.hash(lifecycleType, enabled, dataRetention, downsamplingRounds);
     }
 
     @Override
@@ -341,9 +341,9 @@ public void writeTo(StreamOutput out) throws IOException {
         }
         if (out.getTransportVersion().onOrAfter(ADDED_ENABLED_FLAG_VERSION)) {
             if (out.getTransportVersion().supports(INTRODUCE_LIFECYCLE_TEMPLATE)) {
-                out.writeOptionalCollection(downsampling);
+                out.writeOptionalCollection(downsamplingRounds);
             } else {
-                writeLegacyOptionalValue(downsampling, out, StreamOutput::writeCollection);
+                writeLegacyOptionalValue(downsamplingRounds, out, StreamOutput::writeCollection);
             }
             out.writeBoolean(enabled());
         }
@@ -364,13 +364,13 @@ public DataStreamLifecycle(StreamInput in) throws IOException {
         }
         if (in.getTransportVersion().onOrAfter(ADDED_ENABLED_FLAG_VERSION)) {
             if (in.getTransportVersion().supports(INTRODUCE_LIFECYCLE_TEMPLATE)) {
-                downsampling = in.readOptionalCollectionAsList(DownsamplingRound::read);
+                downsamplingRounds = in.readOptionalCollectionAsList(DownsamplingRound::read);
             } else {
-                downsampling = readLegacyOptionalValue(in, is -> is.readCollectionAsList(DownsamplingRound::read));
+                downsamplingRounds = readLegacyOptionalValue(in, is -> is.readCollectionAsList(DownsamplingRound::read));
             }
             enabled = in.readBoolean();
         } else {
-            downsampling = null;
+            downsamplingRounds = null;
             enabled = true;
         }
         lifecycleType = in.getTransportVersion().supports(INTRODUCE_FAILURES_LIFECYCLE) ? LifecycleType.read(in) : LifecycleType.DATA;
@@ -426,8 +426,8 @@ public String toString() {
             + enabled
             + ", dataRetention="
             + dataRetention
-            + ", downsampling="
-            + downsampling
+            + ", downsamplingRounds="
+            + downsamplingRounds
             + '}';
     }
 
@@ -466,8 +466,8 @@ public XContentBuilder toXContent(
             }
         }
 
-        if (downsampling != null) {
-            builder.field(DOWNSAMPLING_FIELD.getPreferredName(), downsampling);
+        if (downsamplingRounds != null) {
+            builder.field(DOWNSAMPLING_FIELD.getPreferredName(), downsamplingRounds);
         }
         if (rolloverConfiguration != null) {
             builder.field(ROLLOVER_FIELD.getPreferredName());
@@ -667,7 +667,7 @@ public record Template(
         LifecycleType lifecycleType,
         boolean enabled,
         ResettableValue<TimeValue> dataRetention,
-        ResettableValue<List<DataStreamLifecycle.DownsamplingRound>> downsampling
+        ResettableValue<List<DataStreamLifecycle.DownsamplingRound>> downsamplingRounds
     ) implements ToXContentObject, Writeable {
 
         Template(
@@ -680,11 +680,11 @@ public record Template(
         }
 
         public Template {
-            if (lifecycleType == LifecycleType.FAILURES && downsampling.get() != null) {
+            if (lifecycleType == LifecycleType.FAILURES && downsamplingRounds.get() != null) {
                 throw new IllegalArgumentException(DOWNSAMPLING_NOT_SUPPORTED_ERROR_MESSAGE);
             }
-            if (downsampling.isDefined() && downsampling.get() != null) {
-                DownsamplingRound.validateRounds(downsampling.get());
+            if (downsamplingRounds.isDefined() && downsamplingRounds.get() != null) {
+                DownsamplingRound.validateRounds(downsamplingRounds.get());
             }
         }
 
@@ -736,9 +736,9 @@ public void writeTo(StreamOutput out) throws IOException {
             }
             if (out.getTransportVersion().onOrAfter(ADDED_ENABLED_FLAG_VERSION)) {
                 if (out.getTransportVersion().supports(INTRODUCE_LIFECYCLE_TEMPLATE)) {
-                    ResettableValue.write(out, downsampling, StreamOutput::writeCollection);
+                    ResettableValue.write(out, downsamplingRounds, StreamOutput::writeCollection);
                 } else {
-                    writeLegacyValue(out, downsampling, StreamOutput::writeCollection);
+                    writeLegacyValue(out, downsamplingRounds, StreamOutput::writeCollection);
                 }
                 out.writeBoolean(enabled);
             }
@@ -839,7 +839,7 @@ public XContentBuilder toXContent(
             builder.startObject();
             builder.field(ENABLED_FIELD.getPreferredName(), enabled);
             dataRetention.toXContent(builder, params, DATA_RETENTION_FIELD.getPreferredName(), TimeValue::getStringRep);
-            downsampling.toXContent(builder, params, DOWNSAMPLING_FIELD.getPreferredName());
+            downsamplingRounds.toXContent(builder, params, DOWNSAMPLING_FIELD.getPreferredName());
             if (rolloverConfiguration != null) {
                 builder.field(ROLLOVER_FIELD.getPreferredName());
                 rolloverConfiguration.evaluateAndConvertToXContent(
@@ -853,7 +853,7 @@ public XContentBuilder toXContent(
         }
 
         public DataStreamLifecycle toDataStreamLifecycle() {
-            return new DataStreamLifecycle(lifecycleType, enabled, dataRetention.get(), downsampling.get());
+            return new DataStreamLifecycle(lifecycleType, enabled, dataRetention.get(), downsamplingRounds.get());
         }
     }
 
@@ -890,7 +890,7 @@ public static class Builder {
         @Nullable
         private TimeValue dataRetention = null;
         @Nullable
-        private List<DownsamplingRound> downsampling = null;
+        private List<DownsamplingRound> downsamplingRounds = null;
 
         private Builder(LifecycleType lifecycleType) {
             this.lifecycleType = lifecycleType;
@@ -900,21 +900,21 @@ private Builder(DataStreamLifecycle.Template template) {
             lifecycleType = template.lifecycleType();
             enabled = template.enabled();
             dataRetention = template.dataRetention().get();
-            downsampling = template.downsampling().get();
+            downsamplingRounds = template.downsamplingRounds().get();
         }
 
         private Builder(DataStreamLifecycle lifecycle) {
             lifecycleType = lifecycle.lifecycleType;
             enabled = lifecycle.enabled();
             dataRetention = lifecycle.dataRetention();
-            downsampling = lifecycle.downsampling();
+            downsamplingRounds = lifecycle.downsamplingRounds();
         }
 
         public Builder composeTemplate(DataStreamLifecycle.Template template) {
             assert lifecycleType == template.lifecycleType() : "Trying to compose templates with different lifecycle types";
             enabled(template.enabled());
             dataRetention(template.dataRetention());
-            downsampling(template.downsampling());
+            downsamplingRounds(template.downsamplingRounds());
             return this;
         }
 
@@ -935,24 +935,24 @@ public Builder dataRetention(@Nullable TimeValue dataRetention) {
             return this;
         }
 
-        public Builder downsampling(ResettableValue<List<DownsamplingRound>> downsampling) {
+        public Builder downsamplingRounds(ResettableValue<List<DownsamplingRound>> downsampling) {
             if (downsampling.isDefined()) {
-                this.downsampling = downsampling.get();
+                this.downsamplingRounds = downsampling.get();
             }
             return this;
         }
 
-        public Builder downsampling(@Nullable List<DownsamplingRound> downsampling) {
-            this.downsampling = downsampling;
+        public Builder downsamplingRounds(@Nullable List<DownsamplingRound> downsampling) {
+            this.downsamplingRounds = downsampling;
             return this;
         }
 
         public DataStreamLifecycle build() {
-            return new DataStreamLifecycle(lifecycleType, enabled, dataRetention, downsampling);
+            return new DataStreamLifecycle(lifecycleType, enabled, dataRetention, downsamplingRounds);
         }
 
         public Template buildTemplate() {
-            return new Template(lifecycleType, enabled, dataRetention, downsampling);
+            return new Template(lifecycleType, enabled, dataRetention, downsamplingRounds);
         }
     }
 

server/src/test/java/org/elasticsearch/cluster/metadata/DataStreamFailureStoreTemplateTests.java

@@ -146,7 +146,7 @@ private static DataStreamFailureStore.Template normalise(DataStreamFailureStore.
                         template.lifecycleType(),
                         template.enabled(),
                         template.dataRetention().get(),
-                        template.downsampling().get()
+                        template.downsamplingRounds().get()
                     )
                 )
         );