Alter support

noCharger · Sep 3, 2024 · 4c9f054 · 4c9f054
1 parent dccc30e
commit 4c9f054
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 4 deletions.
diff --git a/...query-core/src/main/java/org/opensearch/sql/spark/dispatcher/model/FlintIndexOptions.java b/...query-core/src/main/java/org/opensearch/sql/spark/dispatcher/model/FlintIndexOptions.java
@@ -35,8 +35,8 @@ public boolean autoRefresh() {
   }
 
   public boolean isExternalScheduler() {
-    // Default is true, which means using external scheduler to refresh the index.
-    return getOption(SCHEDULER_MODE).map(mode -> "external".equals(mode)).orElse(true);
+    // Default is false, which means using internal scheduler to refresh the index.
+    return getOption(SCHEDULER_MODE).map(mode -> "external".equals(mode)).orElse(false);
   }
 
   public Map<String, String> getProvidedOptions() {

diff --git a/...-query-core/src/main/java/org/opensearch/sql/spark/flint/operation/FlintIndexOpAlter.java b/...-query-core/src/main/java/org/opensearch/sql/spark/flint/operation/FlintIndexOpAlter.java
@@ -57,7 +57,11 @@ void runOp(
         "Running alter index operation for index: {}", flintIndexMetadata.getOpensearchIndexName());
     this.flintIndexMetadataService.updateIndexToManualRefresh(
         flintIndexMetadata.getOpensearchIndexName(), flintIndexOptions, asyncQueryRequestContext);
-    cancelStreamingJob(flintIndexStateModel);
+    if (flintIndexMetadata.getFlintIndexOptions().isExternalScheduler()) {
+      asyncQueryScheduler.unscheduleJob(flintIndexMetadata.getOpensearchIndexName());
+    } else {
+      cancelStreamingJob(flintIndexStateModel);
+    }
   }
 
   @Override

diff --git a/...c-query-core/src/main/java/org/opensearch/sql/spark/flint/operation/FlintIndexOpDrop.java b/...c-query-core/src/main/java/org/opensearch/sql/spark/flint/operation/FlintIndexOpDrop.java
@@ -54,7 +54,6 @@ void runOp(
         "Performing drop index operation for index: {}",
         flintIndexMetadata.getOpensearchIndexName());
     if (flintIndexMetadata.getFlintIndexOptions().isExternalScheduler()) {
-      // Scheduler jobid is the opensearch index name until we support multiple jobs per index
       asyncQueryScheduler.unscheduleJob(flintIndexMetadata.getOpensearchIndexName());
     } else {
       cancelStreamingJob(flintIndexStateModel);

diff --git a/...re/src/main/java/org/opensearch/sql/spark/scheduler/model/AsyncQuerySchedulerRequest.java b/...re/src/main/java/org/opensearch/sql/spark/scheduler/model/AsyncQuerySchedulerRequest.java
@@ -17,6 +17,7 @@
 @AllArgsConstructor
 public class AsyncQuerySchedulerRequest {
   protected String accountId;
+// Scheduler jobid is the opensearch index name until we support multiple jobs per index
   protected String jobId;
   protected String dataSource;
   protected String scheduledQuery;