From 300fedf0f77c857ded187b86b1eec7829715fc79 Mon Sep 17 00:00:00 2001 From: Chen Dai Date: Fri, 17 May 2024 10:10:30 -0700 Subject: [PATCH] Bump Flint version to 0.5.0 (#343) 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 f614e7a17..eefed4c09 100644 --- a/README.md +++ b/README.md @@ -21,6 +21,7 @@ Version compatibility: | 0.2.0 | 11+ | 3.3.1 | 2.12.14 | 2.6+ | | 0.3.0 | 11+ | 3.3.2 | 2.12.14 | 2.13+ | | 0.4.0 | 11+ | 3.3.2 | 2.12.14 | 2.13+ | +| 0.5.0 | 11+ | 3.3.2 | 2.12.14 | 2.13+ | ## Flint Extension Usage @@ -52,7 +53,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.4.0-SNAPSHOT" +bin/spark-shell --packages "org.opensearch:opensearch-spark_2.12:0.5.0-SNAPSHOT" ``` ### PPL Build & Run @@ -64,7 +65,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.4.0-SNAPSHOT" +bin/spark-shell --packages "org.opensearch:opensearch-spark-ppl_2.12:0.5.0-SNAPSHOT" ``` ## Code of Conduct diff --git a/build.sbt b/build.sbt index c8c94ad1c..f12a19647 100644 --- a/build.sbt +++ b/build.sbt @@ -14,7 +14,7 @@ val sparkMinorVersion = sparkVersion.split("\\.").take(2).mkString(".") ThisBuild / organization := "org.opensearch" -ThisBuild / version := "0.4.0-SNAPSHOT" +ThisBuild / version := "0.5.0-SNAPSHOT" ThisBuild / scalaVersion := scala212 diff --git a/docs/PPL-on-Spark.md b/docs/PPL-on-Spark.md index 59ae1652a..dd7c40710 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.4.0-SNAPSHOT" +bin/spark-shell --packages "org.opensearch:opensearch-spark-ppl_2.12:0.5.0-SNAPSHOT" ``` ### PPL Extension Usage @@ -46,7 +46,7 @@ spark-sql --conf "spark.sql.extensions=org.opensearch.flint.spark.FlintPPLSparkE ``` ### 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.4.0-SNAPSHOT`,`org.opensearch:opensearch-spark_2.12:0.4.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.5.0-SNAPSHOT`,`org.opensearch:opensearch-spark_2.12:0.5.0-SNAPSHOT`) to the cluster's classpath. Next need to configure both extensions : diff --git a/docs/index.md b/docs/index.md index ace390f7a..7900cd359 100644 --- a/docs/index.md +++ b/docs/index.md @@ -54,7 +54,7 @@ Currently, Flint metadata is only static configuration without version control a ```json { - "version": "0.4.0", + "version": "0.5.0", "name": "...", "kind": "skipping", "source": "...", @@ -667,7 +667,7 @@ For now, only single or conjunct conditions (conditions connected by AND) in WHE ### 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.4.0-SNAPSHOT \ +--conf spark.jars.packages=org.opensearch:opensearch-spark-standalone_2.12:0.5.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 \ @@ -709,7 +709,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.4.0-SNAPSHOT \ +--conf spark.jars.packages=org.opensearch:opensearch-spark-standalone_2.12:0.5.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 a6ea39e37..909d76ce5 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 @@ -18,6 +18,7 @@ object FlintVersion { val V_0_2_0: FlintVersion = FlintVersion("0.2.0") val V_0_3_0: FlintVersion = FlintVersion("0.3.0") val V_0_4_0: FlintVersion = FlintVersion("0.4.0") + val V_0_5_0: FlintVersion = FlintVersion("0.5.0") - def current(): FlintVersion = V_0_4_0 + def current(): FlintVersion = V_0_5_0 }