From c144f8d1fbcb707761858a8660bcc2a48c3c76bf Mon Sep 17 00:00:00 2001 From: Tomoyuki Morita Date: Thu, 29 Aug 2024 16:13:40 -0700 Subject: [PATCH] Address comments Signed-off-by: Tomoyuki Morita --- .../main/scala/org/opensearch/flint/core/FlintOptions.java | 5 ++++- .../org/apache/spark/sql/flint/config/FlintSparkConf.scala | 3 ++- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/flint-core/src/main/scala/org/opensearch/flint/core/FlintOptions.java b/flint-core/src/main/scala/org/opensearch/flint/core/FlintOptions.java index e23444570..36fc4e8c3 100644 --- a/flint-core/src/main/scala/org/opensearch/flint/core/FlintOptions.java +++ b/flint-core/src/main/scala/org/opensearch/flint/core/FlintOptions.java @@ -100,7 +100,9 @@ public class FlintOptions implements Serializable { public static final String CUSTOM_FLINT_METADATA_LOG_SERVICE_CLASS = "customFlintMetadataLogServiceClass"; public static final String CUSTOM_FLINT_INDEX_METADATA_SERVICE_CLASS = "customFlintIndexMetadataServiceClass"; - public static final String CUSTOM_QUERY_METADATA_SERVICE = "spark.flint.job.customFlintIndexMetadataServiceClass"; + + // TODO: This is POC specific + public static final String CUSTOM_QUERY_METADATA_SERVICE = "spark.flint.job.customQueryMetadataServiceClass"; public FlintOptions(Map options) { this.options = options; @@ -188,6 +190,7 @@ public String getCustomCommandLifecycleManager() { return options.getOrDefault(CUSTOM_COMMAND_LIFECYCLE_MANAGER, "org.apache.spark.sql.CommandLifecycleManagerImpl"); } + // TODO: This is POC specific public String getCustomQueryMetadataService() { return options.getOrDefault(CUSTOM_QUERY_METADATA_SERVICE, "org.apache.spark.sql.NoOpQueryMetadataService"); } diff --git a/flint-spark-integration/src/main/scala/org/apache/spark/sql/flint/config/FlintSparkConf.scala b/flint-spark-integration/src/main/scala/org/apache/spark/sql/flint/config/FlintSparkConf.scala index 0547bf256..20830e0f8 100644 --- a/flint-spark-integration/src/main/scala/org/apache/spark/sql/flint/config/FlintSparkConf.scala +++ b/flint-spark-integration/src/main/scala/org/apache/spark/sql/flint/config/FlintSparkConf.scala @@ -210,7 +210,7 @@ object FlintSparkConf { .createOptional() val QUERY_ID = FlintConfig(s"spark.flint.job.queryId") - .doc("Flint session id") + .doc("Flint query id") .createOptional() val REQUEST_INDEX = FlintConfig(s"spark.flint.job.requestIndex") @@ -243,6 +243,7 @@ object FlintSparkConf { FlintConfig("spark.flint.job.customQueryResultWriter") .createOptional() + // TODO: This is POC specific val CUSTOM_QUERY_METADATA_SERVICE = FlintConfig(FlintOptions.CUSTOM_QUERY_METADATA_SERVICE) .createWithDefault("org.apache.spark.sql.NoOpQueryMetadataService")