address Amit's comments and address compiler failure

kaituo · kaituo · commit df66d4484250 · 2023-08-03T16:11:03.000-07:00
Signed-off-by: Kaituo Li &lt;kaituo@amazon.com&gt;
diff --git a/src/main/java/org/opensearch/ad/cluster/HashRing.java b/src/main/java/org/opensearch/ad/cluster/HashRing.java
@@ -46,8 +46,8 @@
 import org.opensearch.cluster.routing.Murmur3HashFunction;
 import org.opensearch.cluster.service.ClusterService;
 import org.opensearch.common.settings.Settings;
-import org.opensearch.common.transport.TransportAddress;
 import org.opensearch.common.unit.TimeValue;
+import org.opensearch.core.common.transport.TransportAddress;
 import org.opensearch.plugins.PluginInfo;
 import org.opensearch.timeseries.common.exception.TimeSeriesException;
 import org.opensearch.timeseries.constant.CommonName;
diff --git a/src/main/java/org/opensearch/ad/model/ADTask.java b/src/main/java/org/opensearch/ad/model/ADTask.java
@@ -399,9 +399,4 @@ public DateRange getDetectionDateRange() {
     public void setDetectionDateRange(DateRange detectionDateRange) {
         this.detectionDateRange = detectionDateRange;
     }
-
-    @Override
-    public String getEntityModelId() {
-        return entity == null ? null : entity.getModelId(getConfigId()).orElse(null);
-    }
 }
diff --git a/src/main/java/org/opensearch/ad/task/ADBatchTaskCache.java b/src/main/java/org/opensearch/ad/task/ADBatchTaskCache.java
@@ -57,7 +57,7 @@ public class ADBatchTaskCache {
     protected ADBatchTaskCache(ADTask adTask) {
         this.detectorId = adTask.getConfigId();
         this.taskId = adTask.getTaskId();
-        this.detectorTaskId = adTask.getDetectorLevelTaskId();
+        this.detectorTaskId = adTask.getConfigLevelTaskId();
         this.entity = adTask.getEntity();
 
         AnomalyDetector detector = adTask.getDetector();
diff --git a/src/main/java/org/opensearch/ad/task/ADBatchTaskRunner.java b/src/main/java/org/opensearch/ad/task/ADBatchTaskRunner.java
@@ -798,7 +798,7 @@ public void startADBatchTaskOnWorkerNode(
 
     private ActionListener<String> internalBatchTaskListener(ADTask adTask, TransportService transportService) {
         String taskId = adTask.getTaskId();
-        String detectorTaskId = adTask.getDetectorLevelTaskId();
+        String detectorTaskId = adTask.getConfigLevelTaskId();
         String detectorId = adTask.getConfigId();
         ActionListener<String> listener = ActionListener.wrap(response -> {
             // If batch task finished normally, remove task from cache and decrease executing task count by 1.
@@ -1101,7 +1101,7 @@ private void detectAnomaly(
                     : "No data in current detection window";
                 AnomalyResult anomalyResult = new AnomalyResult(
                     adTask.getConfigId(),
-                    adTask.getDetectorLevelTaskId(),
+                    adTask.getConfigLevelTaskId(),
                     featureData,
                     Instant.ofEpochMilli(intervalEndTime - interval),
                     Instant.ofEpochMilli(intervalEndTime),
@@ -1128,7 +1128,7 @@ private void detectAnomaly(
                     .fromRawTRCFResult(
                         adTask.getConfigId(),
                         adTask.getDetector().getIntervalInMilliseconds(),
-                        adTask.getDetectorLevelTaskId(),
+                        adTask.getConfigLevelTaskId(),
                         score,
                         descriptor.getAnomalyGrade(),
                         descriptor.getDataConfidence(),
@@ -1249,7 +1249,7 @@ private void runNextPiece(
     ) {
         String taskId = adTask.getTaskId();
         String detectorId = adTask.getConfigId();
-        String detectorTaskId = adTask.getDetectorLevelTaskId();
+        String detectorTaskId = adTask.getConfigLevelTaskId();
         float initProgress = calculateInitProgress(taskId);
         String taskState = initProgress >= 1.0f ? TaskState.RUNNING.name() : TaskState.INIT.name();
         logger.debug("Init progress: {}, taskState:{}, task id: {}", initProgress, taskState, taskId);
@@ -1362,7 +1362,7 @@ private float calculateInitProgress(String taskId) {
     private void checkIfADTaskCancelledAndCleanupCache(ADTask adTask) {
         String taskId = adTask.getTaskId();
         String detectorId = adTask.getConfigId();
-        String detectorTaskId = adTask.getDetectorLevelTaskId();
+        String detectorTaskId = adTask.getConfigLevelTaskId();
         // refresh latest HC task run time
         adTaskCacheManager.refreshLatestHCTaskRunTime(detectorId);
         if (adTask.getDetector().isHighCardinality()
diff --git a/src/main/java/org/opensearch/ad/task/ADTaskCacheManager.java b/src/main/java/org/opensearch/ad/task/ADTaskCacheManager.java
@@ -189,7 +189,7 @@ public synchronized void add(ADTask adTask) {
         taskCache.getCacheMemorySize().set(neededCacheSize);
         batchTaskCaches.put(taskId, taskCache);
         if (adTask.isEntityTask()) {
-            ADHCBatchTaskRunState hcBatchTaskRunState = getHCBatchTaskRunState(detectorId, adTask.getDetectorLevelTaskId());
+            ADHCBatchTaskRunState hcBatchTaskRunState = getHCBatchTaskRunState(detectorId, adTask.getConfigLevelTaskId());
             if (hcBatchTaskRunState != null) {
                 hcBatchTaskRunState.setLastTaskRunTimeInMillis(Instant.now().toEpochMilli());
             }
diff --git a/src/main/java/org/opensearch/ad/task/ADTaskManager.java b/src/main/java/org/opensearch/ad/task/ADTaskManager.java
@@ -2292,7 +2292,7 @@ public boolean isRetryableError(String error) {
     public void setHCDetectorTaskDone(ADTask adTask, TaskState state, ActionListener<AnomalyDetectorJobResponse> listener) {
         String detectorId = adTask.getConfigId();
         String taskId = adTask.isEntityTask() ? adTask.getParentTaskId() : adTask.getTaskId();
-        String detectorTaskId = adTask.getDetectorLevelTaskId();
+        String detectorTaskId = adTask.getConfigLevelTaskId();
 
         ActionListener<UpdateResponse> wrappedListener = ActionListener.wrap(response -> {
             logger.info("Historical HC detector done with state: {}. Remove from cache, detector id:{}", state.name(), detectorId);
diff --git a/src/main/java/org/opensearch/forecast/model/ForecastTask.java b/src/main/java/org/opensearch/forecast/model/ForecastTask.java
@@ -1,12 +1,6 @@
 /*
+ * Copyright OpenSearch Contributors
  * SPDX-License-Identifier: Apache-2.0
- *
- * The OpenSearch Contributors require contributions made to
- * this file be licensed under the Apache-2.0 license or a
- * compatible open source license.
- *
- * Modifications Copyright OpenSearch Contributors. See
- * GitHub history for details.
  */
 
 package org.opensearch.forecast.model;
@@ -67,21 +61,18 @@ public ForecastTask(StreamInput input) throws IOException {
         } else {
             user = null;
         }
-        // Below are new fields added since AD 1.1
-        if (input.available() > 0) {
-            if (input.readBoolean()) {
-                this.dateRange = new DateRange(input);
-            } else {
-                this.dateRange = null;
-            }
-            if (input.readBoolean()) {
-                this.entity = new Entity(input);
-            } else {
-                this.entity = null;
-            }
-            this.parentTaskId = input.readOptionalString();
-            this.estimatedMinutesLeft = input.readOptionalInt();
+        if (input.readBoolean()) {
+            this.dateRange = new DateRange(input);
+        } else {
+            this.dateRange = null;
+        }
+        if (input.readBoolean()) {
+            this.entity = new Entity(input);
+        } else {
+            this.entity = null;
         }
+        this.parentTaskId = input.readOptionalString();
+        this.estimatedMinutesLeft = input.readOptionalInt();
     }
 
     @Override
@@ -392,11 +383,6 @@ public DateRange getDateRange() {
         return dateRange;
     }
 
-    @Override
-    public String getEntityModelId() {
-        return entity == null ? null : entity.getModelId(configId).orElse(null);
-    }
-
     public void setDateRange(DateRange dateRange) {
         this.dateRange = dateRange;
     }
diff --git a/src/main/java/org/opensearch/timeseries/model/TimeSeriesTask.java b/src/main/java/org/opensearch/timeseries/model/TimeSeriesTask.java
@@ -201,10 +201,10 @@ public boolean isHistoricalTask() {
     }
 
     /**
-     * Get detector level task id. If a task has no parent task, the task is detector level task.
-     * @return detector level task id
+     * Get config level task id. If a task has no parent task, the task is config level task.
+     * @return config level task id
      */
-    public String getDetectorLevelTaskId() {
+    public String getConfigLevelTaskId() {
         return getParentTaskId() != null ? getParentTaskId() : getTaskId();
     }
 
@@ -442,5 +442,7 @@ public int hashCode() {
 
     public abstract boolean isEntityTask();
 
-    public abstract String getEntityModelId();
+    public String getEntityModelId() {
+        return entity == null ? null : entity.getModelId(configId).orElse(null);
+    }
 }
diff --git a/src/test/java/org/opensearch/StreamInputOutputTests.java b/src/test/java/org/opensearch/StreamInputOutputTests.java
@@ -39,8 +39,8 @@
 import org.opensearch.cluster.ClusterName;
 import org.opensearch.cluster.node.DiscoveryNode;
 import org.opensearch.common.io.stream.BytesStreamOutput;
-import org.opensearch.common.transport.TransportAddress;
 import org.opensearch.core.common.io.stream.StreamInput;
+import org.opensearch.core.common.transport.TransportAddress;
 import org.opensearch.timeseries.AbstractTimeSeriesTest;
 import org.opensearch.timeseries.model.Entity;
 
diff --git a/src/test/java/org/opensearch/ad/ADUnitTestCase.java b/src/test/java/org/opensearch/ad/ADUnitTestCase.java
@@ -28,7 +28,7 @@
 import org.opensearch.common.settings.ClusterSettings;
 import org.opensearch.common.settings.Setting;
 import org.opensearch.common.settings.Settings;
-import org.opensearch.common.transport.TransportAddress;
+import org.opensearch.core.common.transport.TransportAddress;
 import org.opensearch.test.OpenSearchTestCase;
 
 import com.google.common.collect.ImmutableMap;
diff --git a/src/test/java/org/opensearch/ad/AbstractProfileRunnerTests.java b/src/test/java/org/opensearch/ad/AbstractProfileRunnerTests.java
@@ -41,7 +41,7 @@
 import org.opensearch.cluster.ClusterState;
 import org.opensearch.cluster.node.DiscoveryNode;
 import org.opensearch.cluster.service.ClusterService;
-import org.opensearch.common.transport.TransportAddress;
+import org.opensearch.core.common.transport.TransportAddress;
 import org.opensearch.timeseries.AbstractTimeSeriesTest;
 import org.opensearch.timeseries.TestHelpers;
 import org.opensearch.timeseries.util.DiscoveryNodeFilterer;
diff --git a/src/test/java/org/opensearch/ad/AnomalyDetectorProfileRunnerTests.java b/src/test/java/org/opensearch/ad/AnomalyDetectorProfileRunnerTests.java
@@ -55,8 +55,8 @@
 import org.opensearch.cluster.ClusterName;
 import org.opensearch.cluster.node.DiscoveryNode;
 import org.opensearch.common.settings.Settings;
-import org.opensearch.common.transport.TransportAddress;
 import org.opensearch.core.common.io.stream.NotSerializableExceptionWrapper;
+import org.opensearch.core.common.transport.TransportAddress;
 import org.opensearch.index.IndexNotFoundException;
 import org.opensearch.timeseries.AnalysisType;
 import org.opensearch.timeseries.NodeStateManager;
diff --git a/src/test/java/org/opensearch/ad/MultiEntityProfileRunnerTests.java b/src/test/java/org/opensearch/ad/MultiEntityProfileRunnerTests.java
@@ -61,7 +61,7 @@
 import org.opensearch.cluster.ClusterName;
 import org.opensearch.cluster.node.DiscoveryNode;
 import org.opensearch.common.settings.Settings;
-import org.opensearch.common.transport.TransportAddress;
+import org.opensearch.core.common.transport.TransportAddress;
 import org.opensearch.timeseries.AbstractTimeSeriesTest;
 import org.opensearch.timeseries.NodeStateManager;
 import org.opensearch.timeseries.TestHelpers;
diff --git a/src/test/java/org/opensearch/ad/task/ADTaskManagerTests.java b/src/test/java/org/opensearch/ad/task/ADTaskManagerTests.java
@@ -103,11 +103,11 @@
 import org.opensearch.cluster.service.ClusterService;
 import org.opensearch.common.settings.ClusterSettings;
 import org.opensearch.common.settings.Settings;
-import org.opensearch.common.transport.TransportAddress;
 import org.opensearch.common.unit.TimeValue;
 import org.opensearch.common.util.concurrent.ThreadContext;
 import org.opensearch.commons.authuser.User;
 import org.opensearch.core.common.bytes.BytesReference;
+import org.opensearch.core.common.transport.TransportAddress;
 import org.opensearch.core.index.Index;
 import org.opensearch.core.index.shard.ShardId;
 import org.opensearch.core.xcontent.ToXContent;
diff --git a/src/test/java/org/opensearch/ad/transport/ADStatsTests.java b/src/test/java/org/opensearch/ad/transport/ADStatsTests.java
@@ -40,8 +40,8 @@
 import org.opensearch.cluster.node.DiscoveryNode;
 import org.opensearch.common.Strings;
 import org.opensearch.common.io.stream.BytesStreamOutput;
-import org.opensearch.common.transport.TransportAddress;
 import org.opensearch.core.common.io.stream.StreamInput;
+import org.opensearch.core.common.transport.TransportAddress;
 import org.opensearch.core.xcontent.ToXContent;
 import org.opensearch.core.xcontent.XContentBuilder;
 import org.opensearch.test.OpenSearchTestCase;
diff --git a/src/test/java/org/opensearch/ad/transport/AnomalyResultTests.java b/src/test/java/org/opensearch/ad/transport/AnomalyResultTests.java
@@ -93,12 +93,13 @@
 import org.opensearch.common.Strings;
 import org.opensearch.common.io.stream.BytesStreamOutput;
 import org.opensearch.common.settings.Settings;
-import org.opensearch.common.transport.TransportAddress;
 import org.opensearch.common.util.concurrent.ThreadContext;
 import org.opensearch.core.common.io.stream.NotSerializableExceptionWrapper;
 import org.opensearch.core.common.io.stream.StreamInput;
+import org.opensearch.core.common.transport.TransportAddress;
 import org.opensearch.core.index.Index;
 import org.opensearch.core.index.shard.ShardId;
+import org.opensearch.core.transport.TransportResponse;
 import org.opensearch.core.xcontent.NamedXContentRegistry;
 import org.opensearch.core.xcontent.ToXContent;
 import org.opensearch.core.xcontent.XContentBuilder;
@@ -126,7 +127,6 @@
 import org.opensearch.transport.TransportInterceptor;
 import org.opensearch.transport.TransportRequest;
 import org.opensearch.transport.TransportRequestOptions;
-import org.opensearch.transport.TransportResponse;
 import org.opensearch.transport.TransportResponseHandler;
 import org.opensearch.transport.TransportService;
 
diff --git a/src/test/java/org/opensearch/ad/transport/DeleteTests.java b/src/test/java/org/opensearch/ad/transport/DeleteTests.java
@@ -50,9 +50,9 @@
 import org.opensearch.common.Strings;
 import org.opensearch.common.io.stream.BytesStreamOutput;
 import org.opensearch.common.settings.Settings;
-import org.opensearch.common.transport.TransportAddress;
 import org.opensearch.common.unit.TimeValue;
 import org.opensearch.core.common.io.stream.StreamInput;
+import org.opensearch.core.common.transport.TransportAddress;
 import org.opensearch.core.xcontent.ToXContent;
 import org.opensearch.core.xcontent.XContentBuilder;
 import org.opensearch.index.reindex.BulkByScrollResponse;
diff --git a/src/test/java/org/opensearch/ad/transport/EntityProfileTests.java b/src/test/java/org/opensearch/ad/transport/EntityProfileTests.java
@@ -43,8 +43,9 @@
 import org.opensearch.cluster.node.DiscoveryNode;
 import org.opensearch.cluster.service.ClusterService;
 import org.opensearch.common.settings.Settings;
-import org.opensearch.common.transport.TransportAddress;
 import org.opensearch.core.common.io.stream.StreamInput;
+import org.opensearch.core.common.transport.TransportAddress;
+import org.opensearch.core.transport.TransportResponse;
 import org.opensearch.core.xcontent.ToXContent;
 import org.opensearch.tasks.Task;
 import org.opensearch.timeseries.AbstractTimeSeriesTest;
@@ -58,7 +59,6 @@
 import org.opensearch.transport.TransportInterceptor;
 import org.opensearch.transport.TransportRequest;
 import org.opensearch.transport.TransportRequestOptions;
-import org.opensearch.transport.TransportResponse;
 import org.opensearch.transport.TransportResponseHandler;
 import org.opensearch.transport.TransportService;
 
diff --git a/src/test/java/org/opensearch/ad/transport/MultiEntityResultTests.java b/src/test/java/org/opensearch/ad/transport/MultiEntityResultTests.java
@@ -98,6 +98,7 @@
 import org.opensearch.common.unit.TimeValue;
 import org.opensearch.common.util.concurrent.ThreadContext;
 import org.opensearch.core.common.io.stream.StreamInput;
+import org.opensearch.core.transport.TransportResponse;
 import org.opensearch.index.IndexNotFoundException;
 import org.opensearch.search.DocValueFormat;
 import org.opensearch.search.SearchHits;
@@ -128,7 +129,6 @@
 import org.opensearch.transport.TransportInterceptor;
 import org.opensearch.transport.TransportRequest;
 import org.opensearch.transport.TransportRequestOptions;
-import org.opensearch.transport.TransportResponse;
 import org.opensearch.transport.TransportResponseHandler;
 import org.opensearch.transport.TransportService;
 
diff --git a/src/test/java/org/opensearch/ad/transport/ProfileTests.java b/src/test/java/org/opensearch/ad/transport/ProfileTests.java
@@ -37,8 +37,8 @@
 import org.opensearch.cluster.node.DiscoveryNode;
 import org.opensearch.common.Strings;
 import org.opensearch.common.io.stream.BytesStreamOutput;
-import org.opensearch.common.transport.TransportAddress;
 import org.opensearch.core.common.io.stream.StreamInput;
+import org.opensearch.core.common.transport.TransportAddress;
 import org.opensearch.core.xcontent.ToXContent;
 import org.opensearch.core.xcontent.XContentBuilder;
 import org.opensearch.test.OpenSearchTestCase;
diff --git a/src/test/java/org/opensearch/ad/transport/RCFPollingTests.java b/src/test/java/org/opensearch/ad/transport/RCFPollingTests.java
@@ -36,8 +36,9 @@
 import org.opensearch.cluster.node.DiscoveryNode;
 import org.opensearch.cluster.service.ClusterService;
 import org.opensearch.common.settings.Settings;
-import org.opensearch.common.transport.TransportAddress;
 import org.opensearch.core.common.io.stream.StreamInput;
+import org.opensearch.core.common.transport.TransportAddress;
+import org.opensearch.core.transport.TransportResponse;
 import org.opensearch.core.xcontent.ToXContent;
 import org.opensearch.tasks.Task;
 import org.opensearch.timeseries.AbstractTimeSeriesTest;
@@ -50,7 +51,6 @@
 import org.opensearch.transport.TransportInterceptor;
 import org.opensearch.transport.TransportRequest;
 import org.opensearch.transport.TransportRequestOptions;
-import org.opensearch.transport.TransportResponse;
 import org.opensearch.transport.TransportResponseHandler;
 import org.opensearch.transport.TransportService;
 
diff --git a/src/test/java/test/org/opensearch/ad/util/ClusterCreation.java b/src/test/java/test/org/opensearch/ad/util/ClusterCreation.java
@@ -28,7 +28,7 @@
 import org.opensearch.cluster.metadata.Metadata;
 import org.opensearch.cluster.node.DiscoveryNode;
 import org.opensearch.cluster.node.DiscoveryNodes;
-import org.opensearch.common.transport.TransportAddress;
+import org.opensearch.core.common.transport.TransportAddress;
 
 public class ClusterCreation {
     /**
diff --git a/src/test/java/test/org/opensearch/ad/util/FakeNode.java b/src/test/java/test/org/opensearch/ad/util/FakeNode.java
@@ -41,10 +41,10 @@
 import org.opensearch.common.settings.ClusterSettings;
 import org.opensearch.common.settings.Setting;
 import org.opensearch.common.settings.Settings;
-import org.opensearch.common.transport.BoundTransportAddress;
-import org.opensearch.common.transport.TransportAddress;
 import org.opensearch.common.util.PageCacheRecycler;
 import org.opensearch.core.common.io.stream.NamedWriteableRegistry;
+import org.opensearch.core.common.transport.BoundTransportAddress;
+import org.opensearch.core.common.transport.TransportAddress;
 import org.opensearch.core.indices.breaker.NoneCircuitBreakerService;
 import org.opensearch.tasks.TaskManager;
 import org.opensearch.tasks.TaskResourceTrackingService;

Original file line number	Diff line number	Diff line change
`@@ -399,9 +399,4 @@ public DateRange getDetectionDateRange() {`
`399`	`399`	`public void setDetectionDateRange(DateRange detectionDateRange) {`
`400`	`400`	`this.detectionDateRange = detectionDateRange;`
`401`	`401`	`}`
`402`		`-`
`403`		`- @Override`
`404`		`- public String getEntityModelId() {`
`405`		`- return entity == null ? null : entity.getModelId(getConfigId()).orElse(null);`
`406`		`- }`
`407`	`402`	`}`
Original file line number	Diff line number	Diff line change
`@@ -189,7 +189,7 @@ public synchronized void add(ADTask adTask) {`
`189`	`189`	`taskCache.getCacheMemorySize().set(neededCacheSize);`
`190`	`190`	`batchTaskCaches.put(taskId, taskCache);`
`191`	`191`	`if (adTask.isEntityTask()) {`
`192`		`- ADHCBatchTaskRunState hcBatchTaskRunState = getHCBatchTaskRunState(detectorId, adTask.getDetectorLevelTaskId());`
	`192`	`+ ADHCBatchTaskRunState hcBatchTaskRunState = getHCBatchTaskRunState(detectorId, adTask.getConfigLevelTaskId());`
`193`	`193`	`if (hcBatchTaskRunState != null) {`
`194`	`194`	`hcBatchTaskRunState.setLastTaskRunTimeInMillis(Instant.now().toEpochMilli());`
`195`	`195`	`}`
Original file line number	Diff line number	Diff line change
`@@ -201,10 +201,10 @@ public boolean isHistoricalTask() {`
`201`	`201`	`}`
`202`	`202`
`203`	`203`	`/**`
`204`		`- * Get detector level task id. If a task has no parent task, the task is detector level task.`
`205`		`- * @return detector level task id`
	`204`	`+ * Get config level task id. If a task has no parent task, the task is config level task.`
	`205`	`+ * @return config level task id`
`206`	`206`	`*/`
`207`		`- public String getDetectorLevelTaskId() {`
	`207`	`+ public String getConfigLevelTaskId() {`
`208`	`208`	`return getParentTaskId() != null ? getParentTaskId() : getTaskId();`
`209`	`209`	`}`
`210`	`210`
`@@ -442,5 +442,7 @@ public int hashCode() {`
`442`	`442`
`443`	`443`	`public abstract boolean isEntityTask();`
`444`	`444`
`445`		`- public abstract String getEntityModelId();`
	`445`	`+ public String getEntityModelId() {`
	`446`	`+ return entity == null ? null : entity.getModelId(configId).orElse(null);`
	`447`	`+ }`
`446`	`448`	`}`