Skip to content

Commit 3e7ef4f

Browse files
committed
cleanup
Signed-off-by: Jackie Han <hnyng@amazon.com>
1 parent 499e7ea commit 3e7ef4f

File tree

2 files changed

+14
-13
lines changed

2 files changed

+14
-13
lines changed

src/main/java/org/opensearch/timeseries/indices/IndexManagement.java

+8
Original file line numberDiff line numberDiff line change
@@ -1052,6 +1052,14 @@ public void initFlattenedResultIndex(String flattenedResultIndexAlias, ActionLis
10521052
}));
10531053
}
10541054

1055+
public String getFlattenedResultIndexAlias(String indexOrAliasName, String configId) {
1056+
return indexOrAliasName + "_flattened_" + configId.toLowerCase(Locale.ROOT);
1057+
}
1058+
1059+
public String getFlattenResultIndexIngestPipelineId(String configId) {
1060+
return "flatten_result_index_ingest_pipeline" + configId.toLowerCase(Locale.ROOT);
1061+
}
1062+
10551063
public <T> void validateCustomIndexForBackendJob(
10561064
String resultIndexOrAlias,
10571065
String securityLogId,

src/main/java/org/opensearch/timeseries/rest/handler/AbstractTimeSeriesActionHandler.java

+6-13
Original file line numberDiff line numberDiff line change
@@ -454,14 +454,6 @@ protected void prepareConfigIndexing(boolean indexingDryRun, ActionListener<T> l
454454
}
455455
}
456456

457-
private String getFlattenedResultIndexAlias(String configId) {
458-
return config.getCustomResultIndexOrAlias() + "_flattened_" + configId.toLowerCase(Locale.ROOT);
459-
}
460-
461-
private String getFlattenResultIndexIngestPipelineId(String configId) {
462-
return "flatten_result_index_ingest_pipeline" + configId.toLowerCase(Locale.ROOT);
463-
}
464-
465457
private void handlePutRequest(boolean indexingDryRun, ActionListener<T> listener) {
466458
handler.confirmJobRunning(clusterService, client, id, listener, () -> {
467459
handleFlattenResultIndexMappingUpdate(listener);
@@ -474,8 +466,9 @@ private void handlePostRequest(boolean indexingDryRun, ActionListener<T> listene
474466
if (shouldHandleFlattening(indexingDryRun, createConfigResponse)) {
475467
IndexAnomalyDetectorResponse response = (IndexAnomalyDetectorResponse) createConfigResponse;
476468
String configId = response.getId();
477-
String flattenedResultIndexAlias = getFlattenedResultIndexAlias(configId);
478-
String pipelineId = getFlattenResultIndexIngestPipelineId(configId);
469+
String flattenedResultIndexAlias = timeSeriesIndices
470+
.getFlattenedResultIndexAlias(config.getCustomResultIndexOrAlias(), configId);
471+
String pipelineId = timeSeriesIndices.getFlattenResultIndexIngestPipelineId(configId);
479472

480473
timeSeriesIndices
481474
.initFlattenedResultIndex(
@@ -504,8 +497,8 @@ private boolean shouldHandleFlattening(boolean indexingDryRun, Object createConf
504497
}
505498

506499
protected void setupIngestPipeline(String configId, ActionListener<T> listener) {
507-
String flattenedResultIndexAlias = getFlattenedResultIndexAlias(configId);
508-
String pipelineId = getFlattenResultIndexIngestPipelineId(configId);
500+
String flattenedResultIndexAlias = timeSeriesIndices.getFlattenedResultIndexAlias(config.getCustomResultIndexOrAlias(), configId);
501+
String pipelineId = timeSeriesIndices.getFlattenResultIndexIngestPipelineId(configId);
509502

510503
try {
511504
BytesReference pipelineSource = createPipelineDefinition(flattenedResultIndexAlias);
@@ -588,7 +581,7 @@ private void handleFlattenResultIndexMappingUpdate(ActionListener<T> listener) {
588581
if (config.getFlattenResultIndexMapping() != null && config.getFlattenResultIndexMapping()) {
589582
setupIngestPipeline(id, listener);
590583
} else {
591-
String pipelineId = getFlattenResultIndexIngestPipelineId(config.getId());
584+
String pipelineId = timeSeriesIndices.getFlattenResultIndexIngestPipelineId(config.getId());
592585
client.admin().cluster().deletePipeline(new DeletePipelineRequest(pipelineId), new ActionListener<AcknowledgedResponse>() {
593586

594587
@Override

0 commit comments

Comments
 (0)