From 1f89aaf7722ee8ab5752efea74a696d28bff9243 Mon Sep 17 00:00:00 2001 From: Chen Dai Date: Thu, 4 Jan 2024 15:34:07 -0800 Subject: [PATCH] Bump Flint to version 0.2.0 (#183) Signed-off-by: Chen Dai --- README.md | 5 +++-- build.sbt | 2 +- docs/PPL-on-Spark.md | 4 ++-- docs/index.md | 6 +++--- .../main/scala/org/opensearch/flint/core/FlintVersion.scala | 3 ++- 5 files changed, 11 insertions(+), 9 deletions(-) diff --git a/README.md b/README.md index 8d91806fb..b2709e348 100644 --- a/README.md +++ b/README.md @@ -18,6 +18,7 @@ Version compatibility: | Flint version | JDK version | Spark version | Scala version | OpenSearch | |---------------|-------------|---------------|---------------|------------| | 0.1.0 | 11+ | 3.3.1 | 2.12.14 | 2.6+ | +| 0.2.0 | 11+ | 3.3.1 | 2.12.14 | 2.6+ | ## Flint Extension Usage @@ -49,7 +50,7 @@ sbt clean standaloneCosmetic/publishM2 ``` then add org.opensearch:opensearch-spark_2.12 when run spark application, for example, ``` -bin/spark-shell --packages "org.opensearch:opensearch-spark_2.12:0.1.0-SNAPSHOT" +bin/spark-shell --packages "org.opensearch:opensearch-spark_2.12:0.2.0-SNAPSHOT" ``` ### PPL Build & Run @@ -61,7 +62,7 @@ sbt clean sparkPPLCosmetic/publishM2 ``` then add org.opensearch:opensearch-spark_2.12 when run spark application, for example, ``` -bin/spark-shell --packages "org.opensearch:opensearch-spark-ppl_2.12:0.1.0-SNAPSHOT" +bin/spark-shell --packages "org.opensearch:opensearch-spark-ppl_2.12:0.2.0-SNAPSHOT" ``` ## Code of Conduct diff --git a/build.sbt b/build.sbt index 058f622c2..469d57223 100644 --- a/build.sbt +++ b/build.sbt @@ -10,7 +10,7 @@ lazy val opensearchVersion = "2.6.0" ThisBuild / organization := "org.opensearch" -ThisBuild / version := "0.1.0-SNAPSHOT" +ThisBuild / version := "0.2.0-SNAPSHOT" ThisBuild / scalaVersion := scala212 diff --git a/docs/PPL-on-Spark.md b/docs/PPL-on-Spark.md index d94ee8037..f421d5679 100644 --- a/docs/PPL-on-Spark.md +++ b/docs/PPL-on-Spark.md @@ -34,7 +34,7 @@ sbt clean sparkPPLCosmetic/publishM2 ``` then add org.opensearch:opensearch-spark_2.12 when run spark application, for example, ``` -bin/spark-shell --packages "org.opensearch:opensearch-spark-ppl_2.12:0.1.0-SNAPSHOT" +bin/spark-shell --packages "org.opensearch:opensearch-spark-ppl_2.12:0.2.0-SNAPSHOT" ``` ### PPL Extension Usage @@ -46,7 +46,7 @@ spark-sql --conf "spark.sql.extensions=org.opensearch.flint.FlintPPLSparkExtensi ``` ### Running With both Flint & PPL Extensions -In order to make use of both flint and ppl extension, one can simply add both jars (`org.opensearch:opensearch-spark-ppl_2.12:0.1.0-SNAPSHOT`,`org.opensearch:opensearch-spark_2.12:0.1.0-SNAPSHOT`) to the cluster's +In order to make use of both flint and ppl extension, one can simply add both jars (`org.opensearch:opensearch-spark-ppl_2.12:0.2.0-SNAPSHOT`,`org.opensearch:opensearch-spark_2.12:0.2.0-SNAPSHOT`) to the cluster's classpath. Next need to configure both extensions : diff --git a/docs/index.md b/docs/index.md index ea6778f39..cfbf0cbbb 100644 --- a/docs/index.md +++ b/docs/index.md @@ -33,7 +33,7 @@ Currently, Flint metadata is only static configuration without version control a ```json { - "version": "0.1.0", + "version": "0.2.0", "name": "...", "kind": "skipping", "source": "...", @@ -507,7 +507,7 @@ Manual refreshing a table which already has skipping index being auto-refreshed, ### AWS EMR Spark Integration - Using execution role Flint use [DefaultAWSCredentialsProviderChain](https://docs.aws.amazon.com/AWSJavaSDK/latest/javadoc/com/amazonaws/auth/DefaultAWSCredentialsProviderChain.html). When running in EMR Spark, Flint use executionRole credentials ``` ---conf spark.jars.packages=org.opensearch:opensearch-spark-standalone_2.12:0.1.0-SNAPSHOT \ +--conf spark.jars.packages=org.opensearch:opensearch-spark-standalone_2.12:0.2.0-SNAPSHOT \ --conf spark.jars.repositories=https://aws.oss.sonatype.org/content/repositories/snapshots \ --conf spark.emr-serverless.driverEnv.JAVA_HOME=/usr/lib/jvm/java-17-amazon-corretto.x86_64 \ --conf spark.executorEnv.JAVA_HOME=/usr/lib/jvm/java-17-amazon-corretto.x86_64 \ @@ -549,7 +549,7 @@ Flint use [DefaultAWSCredentialsProviderChain](https://docs.aws.amazon.com/AWSJa ``` 3. Set the spark.datasource.flint.customAWSCredentialsProvider property with value as com.amazonaws.emr.AssumeRoleAWSCredentialsProvider. Set the environment variable ASSUME_ROLE_CREDENTIALS_ROLE_ARN with the ARN value of CrossAccountRoleB. ``` ---conf spark.jars.packages=org.opensearch:opensearch-spark-standalone_2.12:0.1.0-SNAPSHOT \ +--conf spark.jars.packages=org.opensearch:opensearch-spark-standalone_2.12:0.2.0-SNAPSHOT \ --conf spark.jars.repositories=https://aws.oss.sonatype.org/content/repositories/snapshots \ --conf spark.emr-serverless.driverEnv.JAVA_HOME=/usr/lib/jvm/java-17-amazon-corretto.x86_64 \ --conf spark.executorEnv.JAVA_HOME=/usr/lib/jvm/java-17-amazon-corretto.x86_64 \ diff --git a/flint-core/src/main/scala/org/opensearch/flint/core/FlintVersion.scala b/flint-core/src/main/scala/org/opensearch/flint/core/FlintVersion.scala index 0af93b179..2ff83d4b4 100644 --- a/flint-core/src/main/scala/org/opensearch/flint/core/FlintVersion.scala +++ b/flint-core/src/main/scala/org/opensearch/flint/core/FlintVersion.scala @@ -15,6 +15,7 @@ case class FlintVersion(version: String) { object FlintVersion { val V_0_1_0: FlintVersion = FlintVersion("0.1.0") + val V_0_2_0: FlintVersion = FlintVersion("0.2.0") - def current(): FlintVersion = V_0_1_0 + def current(): FlintVersion = V_0_2_0 }