Merge remote-tracking branch 'upstream/geoshape-doc-values' into tl-d…

…v-geoshape

client/rest-high-level/src/main/java/org/elasticsearch/client/dataframe/transforms/DataFrameTransformCheckpointStats.java

@@ -0,0 +1,93 @@
+/*
+ * Licensed to Elasticsearch under one or more contributor
+ * license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright
+ * ownership. Elasticsearch licenses this file to you under
+ * the Apache License, Version 2.0 (the "License"); you may
+ * not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *    http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+package org.elasticsearch.client.dataframe.transforms;
+
+import org.elasticsearch.common.ParseField;
+import org.elasticsearch.common.io.stream.StreamInput;
+import org.elasticsearch.common.xcontent.ConstructingObjectParser;
+import org.elasticsearch.common.xcontent.XContentParser;
+
+import java.io.IOException;
+import java.util.Objects;
+
+public class DataFrameTransformCheckpointStats {
+    public static final ParseField TIMESTAMP_MILLIS = new ParseField("timestamp_millis");
+    public static final ParseField TIME_UPPER_BOUND_MILLIS = new ParseField("time_upper_bound_millis");
+
+    public static DataFrameTransformCheckpointStats EMPTY = new DataFrameTransformCheckpointStats(0L, 0L);
+
+    private final long timestampMillis;
+    private final long timeUpperBoundMillis;
+
+    public static final ConstructingObjectParser<DataFrameTransformCheckpointStats, Void> LENIENT_PARSER = new ConstructingObjectParser<>(
+            "data_frame_transform_checkpoint_stats", true, args -> {
+                long timestamp = args[0] == null ? 0L : (Long) args[0];
+                long timeUpperBound = args[1] == null ? 0L : (Long) args[1];
+
+                return new DataFrameTransformCheckpointStats(timestamp, timeUpperBound);
+            });
+
+    static {
+        LENIENT_PARSER.declareLong(ConstructingObjectParser.optionalConstructorArg(), TIMESTAMP_MILLIS);
+        LENIENT_PARSER.declareLong(ConstructingObjectParser.optionalConstructorArg(), TIME_UPPER_BOUND_MILLIS);
+    }
+
+    public static DataFrameTransformCheckpointStats fromXContent(XContentParser parser) throws IOException {
+        return LENIENT_PARSER.parse(parser, null);
+    }
+
+    public DataFrameTransformCheckpointStats(final long timestampMillis, final long timeUpperBoundMillis) {
+        this.timestampMillis = timestampMillis;
+        this.timeUpperBoundMillis = timeUpperBoundMillis;
+    }
+
+    public DataFrameTransformCheckpointStats(StreamInput in) throws IOException {
+        this.timestampMillis = in.readLong();
+        this.timeUpperBoundMillis = in.readLong();
+    }
+
+    public long getTimestampMillis() {
+        return timestampMillis;
+    }
+
+    public long getTimeUpperBoundMillis() {
+        return timeUpperBoundMillis;
+    }
+
+    @Override
+    public int hashCode() {
+        return Objects.hash(timestampMillis, timeUpperBoundMillis);
+    }
+
+    @Override
+    public boolean equals(Object other) {
+        if (this == other) {
+            return true;
+        }
+
+        if (other == null || getClass() != other.getClass()) {
+            return false;
+        }
+
+        DataFrameTransformCheckpointStats that = (DataFrameTransformCheckpointStats) other;
+
+        return this.timestampMillis == that.timestampMillis && this.timeUpperBoundMillis == that.timeUpperBoundMillis;
+    }
+}

client/rest-high-level/src/main/java/org/elasticsearch/client/dataframe/transforms/DataFrameTransformCheckpointingInfo.java

@@ -0,0 +1,102 @@
+/*
+ * Licensed to Elasticsearch under one or more contributor
+ * license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright
+ * ownership. Elasticsearch licenses this file to you under
+ * the Apache License, Version 2.0 (the "License"); you may
+ * not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *    http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+package org.elasticsearch.client.dataframe.transforms;
+
+import org.elasticsearch.common.ParseField;
+import org.elasticsearch.common.xcontent.ConstructingObjectParser;
+import org.elasticsearch.common.xcontent.XContentParser;
+
+import java.util.Objects;
+
+public class DataFrameTransformCheckpointingInfo {
+
+    public static final ParseField CURRENT_CHECKPOINT = new ParseField("current");
+    public static final ParseField IN_PROGRESS_CHECKPOINT = new ParseField("in_progress");
+    public static final ParseField OPERATIONS_BEHIND = new ParseField("operations_behind");
+
+    private final DataFrameTransformCheckpointStats current;
+    private final DataFrameTransformCheckpointStats inProgress;
+    private final long operationsBehind;
+
+
+    private static final ConstructingObjectParser<DataFrameTransformCheckpointingInfo, Void> LENIENT_PARSER =
+            new ConstructingObjectParser<>(
+                    "data_frame_transform_checkpointing_info", true, a -> {
+                        long behind = a[2] == null ? 0L : (Long) a[2];
+
+                        return new DataFrameTransformCheckpointingInfo(
+                                a[0] == null ? DataFrameTransformCheckpointStats.EMPTY : (DataFrameTransformCheckpointStats) a[0],
+                                a[1] == null ? DataFrameTransformCheckpointStats.EMPTY : (DataFrameTransformCheckpointStats) a[1], behind);
+                    });
+
+    static {
+        LENIENT_PARSER.declareObject(ConstructingObjectParser.optionalConstructorArg(),
+                (p, c) -> DataFrameTransformCheckpointStats.fromXContent(p), CURRENT_CHECKPOINT);
+        LENIENT_PARSER.declareObject(ConstructingObjectParser.optionalConstructorArg(),
+                (p, c) -> DataFrameTransformCheckpointStats.fromXContent(p), IN_PROGRESS_CHECKPOINT);
+        LENIENT_PARSER.declareLong(ConstructingObjectParser.optionalConstructorArg(), OPERATIONS_BEHIND);
+    }
+
+    public DataFrameTransformCheckpointingInfo(DataFrameTransformCheckpointStats current, DataFrameTransformCheckpointStats inProgress,
+            long operationsBehind) {
+        this.current = Objects.requireNonNull(current);
+        this.inProgress = Objects.requireNonNull(inProgress);
+        this.operationsBehind = operationsBehind;
+    }
+
+    public DataFrameTransformCheckpointStats getCurrent() {
+        return current;
+    }
+
+    public DataFrameTransformCheckpointStats getInProgress() {
+        return inProgress;
+    }
+
+    public long getOperationsBehind() {
+        return operationsBehind;
+    }
+
+    public static DataFrameTransformCheckpointingInfo fromXContent(XContentParser p) {
+        return LENIENT_PARSER.apply(p, null);
+    }
+
+    @Override
+    public int hashCode() {
+        return Objects.hash(current, inProgress, operationsBehind);
+    }
+
+    @Override
+    public boolean equals(Object other) {
+        if (this == other) {
+            return true;
+        }
+
+        if (other == null || getClass() != other.getClass()) {
+            return false;
+        }
+
+        DataFrameTransformCheckpointingInfo that = (DataFrameTransformCheckpointingInfo) other;
+
+        return Objects.equals(this.current, that.current) &&
+                Objects.equals(this.inProgress, that.inProgress) &&
+                this.operationsBehind == that.operationsBehind;
+    }
+
+}

client/rest-high-level/src/main/java/org/elasticsearch/client/dataframe/transforms/DataFrameTransformState.java

@@ -42,7 +42,7 @@ public class DataFrameTransformState {
     private static final ParseField INDEXER_STATE = new ParseField("indexer_state");
     private static final ParseField TASK_STATE = new ParseField("task_state");
     private static final ParseField CURRENT_POSITION = new ParseField("current_position");
-    private static final ParseField GENERATION = new ParseField("generation");
+    private static final ParseField CHECKPOINT = new ParseField("checkpoint");
     private static final ParseField REASON = new ParseField("reason");
 
     @SuppressWarnings("unchecked")
@@ -69,7 +69,7 @@ public class DataFrameTransformState {
             }
             throw new IllegalArgumentException("Unsupported token [" + p.currentToken() + "]");
         }, CURRENT_POSITION, ObjectParser.ValueType.VALUE_OBJECT_ARRAY);
-        PARSER.declareLong(ConstructingObjectParser.optionalConstructorArg(), GENERATION);
+        PARSER.declareLong(ConstructingObjectParser.optionalConstructorArg(), CHECKPOINT);
         PARSER.declareString(ConstructingObjectParser.optionalConstructorArg(), REASON);
     }
 
@@ -79,19 +79,19 @@ public static DataFrameTransformState fromXContent(XContentParser parser) throws
 
     private final DataFrameTransformTaskState taskState;
     private final IndexerState indexerState;
-    private final long generation;
+    private final long checkpoint;
     private final SortedMap<String, Object> currentPosition;
     private final String reason;
 
     public DataFrameTransformState(DataFrameTransformTaskState taskState,
                                    IndexerState indexerState,
                                    @Nullable Map<String, Object> position,
-                                   long generation,
+                                   long checkpoint,
                                    @Nullable String reason) {
         this.taskState = taskState;
         this.indexerState = indexerState;
         this.currentPosition = position == null ? null : Collections.unmodifiableSortedMap(new TreeMap<>(position));
-        this.generation = generation;
+        this.checkpoint = checkpoint;
         this.reason = reason;
     }
 
@@ -108,8 +108,8 @@ public Map<String, Object> getPosition() {
         return currentPosition;
     }
 
-    public long getGeneration() {
-        return generation;
+    public long getCheckpoint() {
+        return checkpoint;
     }
 
     @Nullable
@@ -132,13 +132,13 @@ public boolean equals(Object other) {
         return Objects.equals(this.taskState, that.taskState) &&
             Objects.equals(this.indexerState, that.indexerState) &&
             Objects.equals(this.currentPosition, that.currentPosition) &&
-            this.generation == that.generation &&
+            this.checkpoint == that.checkpoint &&
             Objects.equals(this.reason, that.reason);
     }
 
     @Override
     public int hashCode() {
-        return Objects.hash(taskState, indexerState, currentPosition, generation, reason);
+        return Objects.hash(taskState, indexerState, currentPosition, checkpoint, reason);
     }
 
 }

client/rest-high-level/src/main/java/org/elasticsearch/client/dataframe/transforms/DataFrameTransformStateAndStats.java

@@ -31,16 +31,20 @@ public class DataFrameTransformStateAndStats {
     public static final ParseField ID = new ParseField("id");
     public static final ParseField STATE_FIELD = new ParseField("state");
     public static final ParseField STATS_FIELD = new ParseField("stats");
+    public static final ParseField CHECKPOINTING_INFO_FIELD = new ParseField("checkpointing");
 
     public static final ConstructingObjectParser<DataFrameTransformStateAndStats, Void> PARSER = new ConstructingObjectParser<>(
             "data_frame_transform_state_and_stats", true,
-            a -> new DataFrameTransformStateAndStats((String) a[0], (DataFrameTransformState) a[1], (DataFrameIndexerTransformStats) a[2]));
+            a -> new DataFrameTransformStateAndStats((String) a[0], (DataFrameTransformState) a[1], (DataFrameIndexerTransformStats) a[2],
+                    (DataFrameTransformCheckpointingInfo) a[3]));
 
     static {
         PARSER.declareString(ConstructingObjectParser.constructorArg(), ID);
         PARSER.declareObject(ConstructingObjectParser.constructorArg(), DataFrameTransformState.PARSER::apply, STATE_FIELD);
         PARSER.declareObject(ConstructingObjectParser.constructorArg(), (p, c) -> DataFrameIndexerTransformStats.fromXContent(p),
                 STATS_FIELD);
+        PARSER.declareObject(ConstructingObjectParser.optionalConstructorArg(),
+                (p, c) -> DataFrameTransformCheckpointingInfo.fromXContent(p), CHECKPOINTING_INFO_FIELD);
     }
 
     public static DataFrameTransformStateAndStats fromXContent(XContentParser parser) throws IOException {
@@ -50,11 +54,14 @@ public static DataFrameTransformStateAndStats fromXContent(XContentParser parser
     private final String id;
     private final DataFrameTransformState transformState;
     private final DataFrameIndexerTransformStats transformStats;
+    private final DataFrameTransformCheckpointingInfo checkpointingInfo;
 
-    public DataFrameTransformStateAndStats(String id, DataFrameTransformState state, DataFrameIndexerTransformStats stats) {
+    public DataFrameTransformStateAndStats(String id, DataFrameTransformState state, DataFrameIndexerTransformStats stats,
+            DataFrameTransformCheckpointingInfo checkpointingInfo) {
         this.id = id;
         this.transformState = state;
         this.transformStats = stats;
+        this.checkpointingInfo = checkpointingInfo;
     }
 
     public String getId() {
@@ -69,9 +76,13 @@ public DataFrameTransformState getTransformState() {
         return transformState;
     }
 
+    public DataFrameTransformCheckpointingInfo getCheckpointingInfo() {
+        return checkpointingInfo;
+    }
+
     @Override
     public int hashCode() {
-        return Objects.hash(id, transformState, transformStats);
+        return Objects.hash(id, transformState, transformStats, checkpointingInfo);
     }
 
     @Override
@@ -87,6 +98,7 @@ public boolean equals(Object other) {
         DataFrameTransformStateAndStats that = (DataFrameTransformStateAndStats) other;
 
         return Objects.equals(this.id, that.id) && Objects.equals(this.transformState, that.transformState)
-                && Objects.equals(this.transformStats, that.transformStats);
+                && Objects.equals(this.transformStats, that.transformStats)
+                && Objects.equals(this.checkpointingInfo, that.checkpointingInfo);
     }
 }

x-pack/plugin/core/src/test/java/org/elasticsearch/protocol/AbstractHlrcStreamableXContentTestCase.java → client/rest-high-level/src/test/java/org/elasticsearch/client/AbstractHlrcStreamableXContentTestCase.java

@@ -1,9 +1,22 @@
 /*
- * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
- * or more contributor license agreements. Licensed under the Elastic License;
- * you may not use this file except in compliance with the Elastic License.
+ * Licensed to Elasticsearch under one or more contributor
+ * license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright
+ * ownership. Elasticsearch licenses this file to you under
+ * the Apache License, Version 2.0 (the "License"); you may
+ * not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *    http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
-package org.elasticsearch.protocol;
+package org.elasticsearch.client;
 
 import org.elasticsearch.common.io.stream.Streamable;
 import org.elasticsearch.common.xcontent.ToXContent;
@@ -14,6 +27,11 @@
 
 import static org.elasticsearch.test.AbstractXContentTestCase.xContentTester;
 
+/**
+ * @deprecated Use {@link AbstractResponseTestCase} instead of this class.
+ */
+// TODO: Remove and change subclasses to use AbstractResponseTestCase instead
+@Deprecated
 public abstract class AbstractHlrcStreamableXContentTestCase<T extends ToXContent & Streamable, H>
         extends AbstractStreamableXContentTestCase<T> {