diff --git a/client/rest-high-level/src/test/java/org/elasticsearch/client/dataframe/transforms/hlrc/DataFrameIndexerTransformStatsTests.java b/client/rest-high-level/src/test/java/org/elasticsearch/client/dataframe/transforms/hlrc/DataFrameIndexerTransformStatsTests.java index a2626d357b499..e42aaa97b2258 100644 --- a/client/rest-high-level/src/test/java/org/elasticsearch/client/dataframe/transforms/hlrc/DataFrameIndexerTransformStatsTests.java +++ b/client/rest-high-level/src/test/java/org/elasticsearch/client/dataframe/transforms/hlrc/DataFrameIndexerTransformStatsTests.java @@ -31,7 +31,7 @@ public class DataFrameIndexerTransformStatsTests extends AbstractHlrcXContentTes public static DataFrameIndexerTransformStats fromHlrc( org.elasticsearch.client.dataframe.transforms.DataFrameIndexerTransformStats instance) { - return DataFrameIndexerTransformStats.withDefaultTransformId(instance.getNumPages(), instance.getNumDocuments(), + return new DataFrameIndexerTransformStats(instance.getNumPages(), instance.getNumDocuments(), instance.getOutputDocuments(), instance.getNumInvocations(), instance.getIndexTime(), instance.getSearchTime(), instance.getIndexTotal(), instance.getSearchTotal(), instance.getIndexFailures(), instance.getSearchFailures()); } @@ -48,8 +48,8 @@ public DataFrameIndexerTransformStats convertHlrcToInternal( return fromHlrc(instance); } - public static DataFrameIndexerTransformStats randomStats(String transformId) { - return new DataFrameIndexerTransformStats(transformId, randomLongBetween(10L, 10000L), + public static DataFrameIndexerTransformStats randomStats() { + return new DataFrameIndexerTransformStats(randomLongBetween(10L, 10000L), randomLongBetween(0L, 10000L), randomLongBetween(0L, 10000L), randomLongBetween(0L, 10000L), randomLongBetween(0L, 10000L), randomLongBetween(0L, 10000L), randomLongBetween(0L, 10000L), randomLongBetween(0L, 10000L), randomLongBetween(0L, 10000L), randomLongBetween(0L, 10000L)); @@ -57,7 +57,7 @@ public static DataFrameIndexerTransformStats randomStats(String transformId) { @Override protected DataFrameIndexerTransformStats createTestInstance() { - return randomStats(DataFrameIndexerTransformStats.DEFAULT_TRANSFORM_ID); + return randomStats(); } @Override diff --git a/client/rest-high-level/src/test/java/org/elasticsearch/client/dataframe/transforms/hlrc/DataFrameTransformStatsTests.java b/client/rest-high-level/src/test/java/org/elasticsearch/client/dataframe/transforms/hlrc/DataFrameTransformStatsTests.java index 19ddb8be1abbf..e5dd37fcd9d5d 100644 --- a/client/rest-high-level/src/test/java/org/elasticsearch/client/dataframe/transforms/hlrc/DataFrameTransformStatsTests.java +++ b/client/rest-high-level/src/test/java/org/elasticsearch/client/dataframe/transforms/hlrc/DataFrameTransformStatsTests.java @@ -79,8 +79,7 @@ public static DataFrameTransformStats randomDataFrameTransformStats() { randomFrom(DataFrameTransformTaskState.values()), randomBoolean() ? null : randomAlphaOfLength(100), randomBoolean() ? null : randomNodeAttributes(), - // TODO: remove this ID field from the server side as it's no longer needed - randomStats("_all"), + randomStats(), DataFrameTransformCheckpointingInfoTests.randomDataFrameTransformCheckpointingInfo()); } @@ -132,8 +131,8 @@ public static NodeAttributes randomNodeAttributes() { attributes); } - public static DataFrameIndexerTransformStats randomStats(String transformId) { - return new DataFrameIndexerTransformStats(transformId, randomLongBetween(10L, 10000L), + public static DataFrameIndexerTransformStats randomStats() { + return new DataFrameIndexerTransformStats(randomLongBetween(10L, 10000L), randomLongBetween(0L, 10000L), randomLongBetween(0L, 10000L), randomLongBetween(0L, 10000L), randomLongBetween(0L, 10000L), randomLongBetween(0L, 10000L), randomLongBetween(0L, 10000L), randomLongBetween(0L, 10000L), randomLongBetween(0L, 10000L), randomLongBetween(0L, 10000L)); diff --git a/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/dataframe/transforms/DataFrameIndexerTransformStats.java b/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/dataframe/transforms/DataFrameIndexerTransformStats.java index 2926a88768625..1fc8c2b826350 100644 --- a/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/dataframe/transforms/DataFrameIndexerTransformStats.java +++ b/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/dataframe/transforms/DataFrameIndexerTransformStats.java @@ -6,24 +6,23 @@ package org.elasticsearch.xpack.core.dataframe.transforms; -import org.elasticsearch.common.Nullable; +import org.elasticsearch.Version; import org.elasticsearch.common.ParseField; import org.elasticsearch.common.io.stream.StreamInput; import org.elasticsearch.common.io.stream.StreamOutput; import org.elasticsearch.common.xcontent.ConstructingObjectParser; import org.elasticsearch.common.xcontent.XContentBuilder; import org.elasticsearch.common.xcontent.XContentParser; -import org.elasticsearch.xpack.core.dataframe.DataFrameField; import org.elasticsearch.xpack.core.indexing.IndexerJobStats; import java.io.IOException; import java.util.Objects; import static org.elasticsearch.common.xcontent.ConstructingObjectParser.constructorArg; -import static org.elasticsearch.common.xcontent.ConstructingObjectParser.optionalConstructorArg; public class DataFrameIndexerTransformStats extends IndexerJobStats { - public static final String DEFAULT_TRANSFORM_ID = "_all"; + + private static final String DEFAULT_TRANSFORM_ID = "_all"; // TODO remove when no longer needed for wire BWC public static final String NAME = "data_frame_indexer_transform_stats"; public static ParseField NUM_PAGES = new ParseField("pages_processed"); @@ -39,12 +38,11 @@ public class DataFrameIndexerTransformStats extends IndexerJobStats { private static final ConstructingObjectParser LENIENT_PARSER = new ConstructingObjectParser<>( NAME, true, - args -> new DataFrameIndexerTransformStats(args[0] != null ? (String) args[0] : DEFAULT_TRANSFORM_ID, - (long) args[1], (long) args[2], (long) args[3], (long) args[4], (long) args[5], (long) args[6], (long) args[7], - (long) args[8], (long) args[9], (long) args[10])); + args -> new DataFrameIndexerTransformStats( + (long) args[0], (long) args[1], (long) args[2], (long) args[3], (long) args[4], (long) args[5], (long) args[6], + (long) args[7], (long) args[8], (long) args[9])); static { - LENIENT_PARSER.declareString(optionalConstructorArg(), DataFrameField.ID); LENIENT_PARSER.declareLong(constructorArg(), NUM_PAGES); LENIENT_PARSER.declareLong(constructorArg(), NUM_INPUT_DOCUMENTS); LENIENT_PARSER.declareLong(constructorArg(), NUM_OUTPUT_DOCUMENTS); @@ -57,60 +55,38 @@ public class DataFrameIndexerTransformStats extends IndexerJobStats { LENIENT_PARSER.declareLong(constructorArg(), SEARCH_FAILURES); } - private final String transformId; - /** - * Certain situations call for a default transform ID, e.g. when merging many different transforms for statistics gather. - * - * The returned stats object cannot be stored in the index as the transformId does not refer to a real transform configuration - * - * @return new DataFrameIndexerTransformStats with empty stats and a default transform ID + * Create with all stats set to zero */ - public static DataFrameIndexerTransformStats withDefaultTransformId() { - return new DataFrameIndexerTransformStats(DEFAULT_TRANSFORM_ID); - } - - public static DataFrameIndexerTransformStats withDefaultTransformId(long numPages, long numInputDocuments, long numOutputDocuments, - long numInvocations, long indexTime, long searchTime, - long indexTotal, long searchTotal, long indexFailures, - long searchFailures) { - return new DataFrameIndexerTransformStats(DEFAULT_TRANSFORM_ID, numPages, numInputDocuments, - numOutputDocuments, numInvocations, indexTime, searchTime, indexTotal, searchTotal, - indexFailures, searchFailures); - } - - public DataFrameIndexerTransformStats(String transformId) { + public DataFrameIndexerTransformStats() { super(); - this.transformId = Objects.requireNonNull(transformId, "parameter transformId must not be null"); } - public DataFrameIndexerTransformStats(String transformId, long numPages, long numInputDocuments, long numOutputDocuments, + public DataFrameIndexerTransformStats(long numPages, long numInputDocuments, long numOutputDocuments, long numInvocations, long indexTime, long searchTime, long indexTotal, long searchTotal, long indexFailures, long searchFailures) { super(numPages, numInputDocuments, numOutputDocuments, numInvocations, indexTime, searchTime, indexTotal, searchTotal, indexFailures, searchFailures); - this.transformId = Objects.requireNonNull(transformId, "parameter transformId must not be null"); } public DataFrameIndexerTransformStats(DataFrameIndexerTransformStats other) { - this(other.transformId, other.numPages, other.numInputDocuments, other.numOuputDocuments, other.numInvocations, + this(other.numPages, other.numInputDocuments, other.numOuputDocuments, other.numInvocations, other.indexTime, other.searchTime, other.indexTotal, other.searchTotal, other.indexFailures, other.searchFailures); } public DataFrameIndexerTransformStats(StreamInput in) throws IOException { super(in); - transformId = in.readString(); + if (in.getVersion().before(Version.V_8_0_0)) { // TODO change to 7.4.0 after backport + in.readString(); // was transformId + } } @Override public void writeTo(StreamOutput out) throws IOException { super.writeTo(out); - out.writeString(transformId); - } - - @Nullable - public String getTransformId() { - return transformId; + if (out.getVersion().before(Version.V_8_0_0)) { // TODO change to 7.4.0 after backport + out.writeString(DEFAULT_TRANSFORM_ID); + } } @Override @@ -126,21 +102,11 @@ public XContentBuilder toXContent(XContentBuilder builder, Params params) throws builder.field(SEARCH_TIME_IN_MS.getPreferredName(), searchTime); builder.field(SEARCH_TOTAL.getPreferredName(), searchTotal); builder.field(SEARCH_FAILURES.getPreferredName(), searchFailures); - if (params.paramAsBoolean(DataFrameField.FOR_INTERNAL_STORAGE, false)) { - // If we are storing something, it should have a valid transform ID. - if (transformId.equals(DEFAULT_TRANSFORM_ID)) { - throw new IllegalArgumentException("when storing transform statistics, a valid transform id must be provided"); - } - builder.field(DataFrameField.ID.getPreferredName(), transformId); - } builder.endObject(); return builder; } public DataFrameIndexerTransformStats merge(DataFrameIndexerTransformStats other) { - // We should probably not merge two sets of stats unless one is an accumulation object (i.e. with the default transform id) - // or the stats are referencing the same transform - assert transformId.equals(DEFAULT_TRANSFORM_ID) || this.transformId.equals(other.transformId); numPages += other.numPages; numInputDocuments += other.numInputDocuments; numOuputDocuments += other.numOuputDocuments; @@ -167,8 +133,7 @@ public boolean equals(Object other) { DataFrameIndexerTransformStats that = (DataFrameIndexerTransformStats) other; - return Objects.equals(this.transformId, that.transformId) - && Objects.equals(this.numPages, that.numPages) + return Objects.equals(this.numPages, that.numPages) && Objects.equals(this.numInputDocuments, that.numInputDocuments) && Objects.equals(this.numOuputDocuments, that.numOuputDocuments) && Objects.equals(this.numInvocations, that.numInvocations) @@ -182,7 +147,7 @@ public boolean equals(Object other) { @Override public int hashCode() { - return Objects.hash(transformId, numPages, numInputDocuments, numOuputDocuments, numInvocations, + return Objects.hash(numPages, numInputDocuments, numOuputDocuments, numInvocations, indexTime, searchTime, indexFailures, searchFailures, indexTotal, searchTotal); } diff --git a/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/dataframe/transforms/DataFrameTransformStats.java b/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/dataframe/transforms/DataFrameTransformStats.java index 535b730aa0f26..865bc07931d86 100644 --- a/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/dataframe/transforms/DataFrameTransformStats.java +++ b/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/dataframe/transforms/DataFrameTransformStats.java @@ -75,7 +75,7 @@ public static DataFrameTransformStats fromXContent(XContentParser parser) throws } public static DataFrameTransformStats initialStats(String id) { - return stoppedStats(id, new DataFrameIndexerTransformStats(id)); + return stoppedStats(id, new DataFrameIndexerTransformStats()); } public static DataFrameTransformStats stoppedStats(String id, DataFrameIndexerTransformStats indexerTransformStats) { diff --git a/x-pack/plugin/core/src/test/java/org/elasticsearch/xpack/core/dataframe/transforms/DataFrameIndexerTransformStatsTests.java b/x-pack/plugin/core/src/test/java/org/elasticsearch/xpack/core/dataframe/transforms/DataFrameIndexerTransformStatsTests.java index 54fc5d5d45dc5..057e41e235420 100644 --- a/x-pack/plugin/core/src/test/java/org/elasticsearch/xpack/core/dataframe/transforms/DataFrameIndexerTransformStatsTests.java +++ b/x-pack/plugin/core/src/test/java/org/elasticsearch/xpack/core/dataframe/transforms/DataFrameIndexerTransformStatsTests.java @@ -7,19 +7,13 @@ package org.elasticsearch.xpack.core.dataframe.transforms; import org.elasticsearch.common.io.stream.Writeable; -import org.elasticsearch.common.xcontent.ToXContent; import org.elasticsearch.common.xcontent.XContentParser; import org.elasticsearch.test.AbstractSerializingTestCase; -import org.elasticsearch.xpack.core.dataframe.DataFrameField; import java.io.IOException; -import java.util.Collections; public class DataFrameIndexerTransformStatsTests extends AbstractSerializingTestCase { - protected static ToXContent.Params TO_XCONTENT_PARAMS = new ToXContent.MapParams( - Collections.singletonMap(DataFrameField.FOR_INTERNAL_STORAGE, "true")); - @Override protected DataFrameIndexerTransformStats createTestInstance() { return randomStats(); @@ -36,36 +30,26 @@ protected DataFrameIndexerTransformStats doParseInstance(XContentParser parser) } public static DataFrameIndexerTransformStats randomStats() { - return randomStats(randomAlphaOfLength(10)); - } - - public static DataFrameIndexerTransformStats randomStats(String transformId) { - return new DataFrameIndexerTransformStats(transformId, randomLongBetween(10L, 10000L), + return new DataFrameIndexerTransformStats(randomLongBetween(10L, 10000L), randomLongBetween(0L, 10000L), randomLongBetween(0L, 10000L), randomLongBetween(0L, 10000L), randomLongBetween(0L, 10000L), randomLongBetween(0L, 10000L), randomLongBetween(0L, 10000L), randomLongBetween(0L, 10000L), randomLongBetween(0L, 10000L), randomLongBetween(0L, 10000L)); } - @Override - protected ToXContent.Params getToXContentParams() { - return TO_XCONTENT_PARAMS; - } - public void testMerge() throws IOException { - String transformId = randomAlphaOfLength(10); - DataFrameIndexerTransformStats emptyStats = new DataFrameIndexerTransformStats(transformId); - DataFrameIndexerTransformStats randomStats = randomStats(transformId); + DataFrameIndexerTransformStats emptyStats = new DataFrameIndexerTransformStats(); + DataFrameIndexerTransformStats randomStats = randomStats(); assertEquals(randomStats, emptyStats.merge(randomStats)); assertEquals(randomStats, randomStats.merge(emptyStats)); DataFrameIndexerTransformStats randomStatsClone = copyInstance(randomStats); - DataFrameIndexerTransformStats trippleRandomStats = new DataFrameIndexerTransformStats(transformId, 3 * randomStats.getNumPages(), + DataFrameIndexerTransformStats tripleRandomStats = new DataFrameIndexerTransformStats(3 * randomStats.getNumPages(), 3 * randomStats.getNumDocuments(), 3 * randomStats.getOutputDocuments(), 3 * randomStats.getNumInvocations(), 3 * randomStats.getIndexTime(), 3 * randomStats.getSearchTime(), 3 * randomStats.getIndexTotal(), 3 * randomStats.getSearchTotal(), 3 * randomStats.getIndexFailures(), 3 * randomStats.getSearchFailures()); - assertEquals(trippleRandomStats, randomStats.merge(randomStatsClone).merge(randomStatsClone)); + assertEquals(tripleRandomStats, randomStats.merge(randomStatsClone).merge(randomStatsClone)); } } diff --git a/x-pack/plugin/core/src/test/java/org/elasticsearch/xpack/core/dataframe/transforms/DataFrameTransformStatsTests.java b/x-pack/plugin/core/src/test/java/org/elasticsearch/xpack/core/dataframe/transforms/DataFrameTransformStatsTests.java index 8c708e67eacab..d9409bcec45e6 100644 --- a/x-pack/plugin/core/src/test/java/org/elasticsearch/xpack/core/dataframe/transforms/DataFrameTransformStatsTests.java +++ b/x-pack/plugin/core/src/test/java/org/elasticsearch/xpack/core/dataframe/transforms/DataFrameTransformStatsTests.java @@ -20,7 +20,7 @@ public static DataFrameTransformStats randomDataFrameTransformStats() { randomFrom(DataFrameTransformTaskState.values()), randomBoolean() ? null : randomAlphaOfLength(100), randomBoolean() ? null : NodeAttributeTests.randomNodeAttributes(), - DataFrameIndexerTransformStatsTests.randomStats(DataFrameIndexerTransformStats.DEFAULT_TRANSFORM_ID), + DataFrameIndexerTransformStatsTests.randomStats(), DataFrameTransformCheckpointingInfoTests.randomDataFrameTransformCheckpointingInfo()); } diff --git a/x-pack/plugin/core/src/test/java/org/elasticsearch/xpack/core/dataframe/transforms/DataFrameTransformStoredDocTests.java b/x-pack/plugin/core/src/test/java/org/elasticsearch/xpack/core/dataframe/transforms/DataFrameTransformStoredDocTests.java index 4998295a14b05..3466adf51a19b 100644 --- a/x-pack/plugin/core/src/test/java/org/elasticsearch/xpack/core/dataframe/transforms/DataFrameTransformStoredDocTests.java +++ b/x-pack/plugin/core/src/test/java/org/elasticsearch/xpack/core/dataframe/transforms/DataFrameTransformStoredDocTests.java @@ -22,7 +22,7 @@ public class DataFrameTransformStoredDocTests extends AbstractSerializingDataFra public static DataFrameTransformStoredDoc randomDataFrameTransformStoredDoc(String id) { return new DataFrameTransformStoredDoc(id, DataFrameTransformStateTests.randomDataFrameTransformState(), - DataFrameIndexerTransformStatsTests.randomStats(id)); + DataFrameIndexerTransformStatsTests.randomStats()); } public static DataFrameTransformStoredDoc randomDataFrameTransformStoredDoc() { diff --git a/x-pack/plugin/data-frame/src/main/java/org/elasticsearch/xpack/dataframe/DataFrameInfoTransportAction.java b/x-pack/plugin/data-frame/src/main/java/org/elasticsearch/xpack/dataframe/DataFrameInfoTransportAction.java index 31d5fd860e446..dc0e4eefd0a5f 100644 --- a/x-pack/plugin/data-frame/src/main/java/org/elasticsearch/xpack/dataframe/DataFrameInfoTransportAction.java +++ b/x-pack/plugin/data-frame/src/main/java/org/elasticsearch/xpack/dataframe/DataFrameInfoTransportAction.java @@ -93,7 +93,7 @@ static DataFrameIndexerTransformStats parseSearchAggs(SearchResponse searchRespo statisticsList.add(0L); } } - return DataFrameIndexerTransformStats.withDefaultTransformId(statisticsList.get(0), // numPages + return new DataFrameIndexerTransformStats(statisticsList.get(0), // numPages statisticsList.get(1), // numInputDocuments statisticsList.get(2), // numOutputDocuments statisticsList.get(3), // numInvocations @@ -130,7 +130,7 @@ static void getStatisticSummations(Client client, ActionListener { if (failure instanceof ResourceNotFoundException) { - statsListener.onResponse(DataFrameIndexerTransformStats.withDefaultTransformId()); + statsListener.onResponse(new DataFrameIndexerTransformStats()); } else { statsListener.onFailure(failure); } diff --git a/x-pack/plugin/data-frame/src/main/java/org/elasticsearch/xpack/dataframe/DataFrameUsageTransportAction.java b/x-pack/plugin/data-frame/src/main/java/org/elasticsearch/xpack/dataframe/DataFrameUsageTransportAction.java index 01e729e71bfcf..13482cc9190fe 100644 --- a/x-pack/plugin/data-frame/src/main/java/org/elasticsearch/xpack/dataframe/DataFrameUsageTransportAction.java +++ b/x-pack/plugin/data-frame/src/main/java/org/elasticsearch/xpack/dataframe/DataFrameUsageTransportAction.java @@ -65,8 +65,7 @@ protected void masterOperation(Task task, XPackUsageRequest request, ClusterStat ActionListener listener) { boolean available = licenseState.isDataFrameAllowed(); if (enabled == false) { - var usage = new DataFrameFeatureSetUsage(available, enabled, Collections.emptyMap(), - DataFrameIndexerTransformStats.withDefaultTransformId()); + var usage = new DataFrameFeatureSetUsage(available, enabled, Collections.emptyMap(), new DataFrameIndexerTransformStats()); listener.onResponse(new XPackUsageFeatureResponse(usage)); return; } @@ -99,7 +98,7 @@ protected void masterOperation(Task task, XPackUsageRequest request, ClusterStat long totalTransforms = transformCountSuccess.getHits().getTotalHits().value; if (totalTransforms == 0) { var usage = new DataFrameFeatureSetUsage(available, enabled, transformsCountByState, - DataFrameIndexerTransformStats.withDefaultTransformId()); + new DataFrameIndexerTransformStats()); listener.onResponse(new XPackUsageFeatureResponse(usage)); return; } diff --git a/x-pack/plugin/data-frame/src/main/java/org/elasticsearch/xpack/dataframe/action/TransportPreviewDataFrameTransformAction.java b/x-pack/plugin/data-frame/src/main/java/org/elasticsearch/xpack/dataframe/action/TransportPreviewDataFrameTransformAction.java index efc9534cb2e33..0b7fb74155974 100644 --- a/x-pack/plugin/data-frame/src/main/java/org/elasticsearch/xpack/dataframe/action/TransportPreviewDataFrameTransformAction.java +++ b/x-pack/plugin/data-frame/src/main/java/org/elasticsearch/xpack/dataframe/action/TransportPreviewDataFrameTransformAction.java @@ -143,7 +143,7 @@ private void getPreview(Pivot pivot, r -> { try { final CompositeAggregation agg = r.getAggregations().get(COMPOSITE_AGGREGATION_NAME); - DataFrameIndexerTransformStats stats = DataFrameIndexerTransformStats.withDefaultTransformId(); + DataFrameIndexerTransformStats stats = new DataFrameIndexerTransformStats(); // remove all internal fields if (pipeline == null) { diff --git a/x-pack/plugin/data-frame/src/main/java/org/elasticsearch/xpack/dataframe/transforms/DataFrameTransformTask.java b/x-pack/plugin/data-frame/src/main/java/org/elasticsearch/xpack/dataframe/transforms/DataFrameTransformTask.java index 5c20c1faab8f1..f007045807d77 100644 --- a/x-pack/plugin/data-frame/src/main/java/org/elasticsearch/xpack/dataframe/transforms/DataFrameTransformTask.java +++ b/x-pack/plugin/data-frame/src/main/java/org/elasticsearch/xpack/dataframe/transforms/DataFrameTransformTask.java @@ -166,7 +166,7 @@ public DataFrameTransformState getState() { public DataFrameIndexerTransformStats getStats() { if (getIndexer() == null) { - return new DataFrameIndexerTransformStats(getTransformId()); + return new DataFrameIndexerTransformStats(); } else { return getIndexer().getStats(); } @@ -425,7 +425,7 @@ static class ClientDataFrameIndexerBuilder { ClientDataFrameIndexerBuilder(String transformId) { this.transformId = transformId; - this.initialStats = new DataFrameIndexerTransformStats(transformId); + this.initialStats = new DataFrameIndexerTransformStats(); } ClientDataFrameIndexer build(DataFrameTransformTask parentTask) { @@ -551,7 +551,7 @@ static class ClientDataFrameIndexer extends DataFrameIndexer { fieldMappings, ExceptionsHelper.requireNonNull(initialState, "initialState"), initialPosition, - initialStats == null ? new DataFrameIndexerTransformStats(transformId) : initialStats, + initialStats == null ? new DataFrameIndexerTransformStats() : initialStats, transformProgress, lastCheckpoint, nextCheckpoint); diff --git a/x-pack/plugin/data-frame/src/test/java/org/elasticsearch/xpack/dataframe/DataFrameInfoTransportActionTests.java b/x-pack/plugin/data-frame/src/test/java/org/elasticsearch/xpack/dataframe/DataFrameInfoTransportActionTests.java index 8695b774a35d8..886a6760f5019 100644 --- a/x-pack/plugin/data-frame/src/test/java/org/elasticsearch/xpack/dataframe/DataFrameInfoTransportActionTests.java +++ b/x-pack/plugin/data-frame/src/test/java/org/elasticsearch/xpack/dataframe/DataFrameInfoTransportActionTests.java @@ -78,9 +78,9 @@ public void testParseSearchAggs() { when(withEmptyAggs.getAggregations()).thenReturn(emptyAggs); assertThat(DataFrameInfoTransportAction.parseSearchAggs(withEmptyAggs), - equalTo(DataFrameIndexerTransformStats.withDefaultTransformId())); + equalTo(new DataFrameIndexerTransformStats())); - DataFrameIndexerTransformStats expectedStats = new DataFrameIndexerTransformStats("_all", + DataFrameIndexerTransformStats expectedStats = new DataFrameIndexerTransformStats( 1, // numPages 2, // numInputDocuments 3, // numOutputDocuments diff --git a/x-pack/plugin/data-frame/src/test/java/org/elasticsearch/xpack/dataframe/transforms/DataFrameIndexerTests.java b/x-pack/plugin/data-frame/src/test/java/org/elasticsearch/xpack/dataframe/transforms/DataFrameIndexerTests.java index 154588443cb2f..241a173d23250 100644 --- a/x-pack/plugin/data-frame/src/test/java/org/elasticsearch/xpack/dataframe/transforms/DataFrameIndexerTests.java +++ b/x-pack/plugin/data-frame/src/test/java/org/elasticsearch/xpack/dataframe/transforms/DataFrameIndexerTests.java @@ -213,7 +213,7 @@ public void testPageSizeAdapt() throws InterruptedException { DataFrameAuditor auditor = new DataFrameAuditor(client, "node_1"); MockedDataFrameIndexer indexer = new MockedDataFrameIndexer(executor, config, Collections.emptyMap(), auditor, state, null, - new DataFrameIndexerTransformStats(config.getId()), searchFunction, bulkFunction, failureConsumer); + new DataFrameIndexerTransformStats(), searchFunction, bulkFunction, failureConsumer); final CountDownLatch latch = indexer.newLatch(1); indexer.start(); assertThat(indexer.getState(), equalTo(IndexerState.STARTED)); diff --git a/x-pack/plugin/data-frame/src/test/java/org/elasticsearch/xpack/dataframe/transforms/pivot/AggregationResultUtilsTests.java b/x-pack/plugin/data-frame/src/test/java/org/elasticsearch/xpack/dataframe/transforms/pivot/AggregationResultUtilsTests.java index 34a4b0d80b4e4..2135570dc5cd6 100644 --- a/x-pack/plugin/data-frame/src/test/java/org/elasticsearch/xpack/dataframe/transforms/pivot/AggregationResultUtilsTests.java +++ b/x-pack/plugin/data-frame/src/test/java/org/elasticsearch/xpack/dataframe/transforms/pivot/AggregationResultUtilsTests.java @@ -706,7 +706,7 @@ aggTypedName, asMap( "value", 122.55), DOC_COUNT, 44) )); - DataFrameIndexerTransformStats stats = DataFrameIndexerTransformStats.withDefaultTransformId(); + DataFrameIndexerTransformStats stats = new DataFrameIndexerTransformStats(); Map fieldTypeMap = asStringMap( aggName, "double", @@ -789,7 +789,7 @@ private void executeTest(GroupConfig groups, Map fieldTypeMap, List> expected, long expectedDocCounts) throws IOException { - DataFrameIndexerTransformStats stats = DataFrameIndexerTransformStats.withDefaultTransformId(); + DataFrameIndexerTransformStats stats = new DataFrameIndexerTransformStats(); XContentBuilder builder = XContentFactory.contentBuilder(randomFrom(XContentType.values())); builder.map(input);