From faa0d0769dc0c03b51e1d51150a21ed59e02e2c5 Mon Sep 17 00:00:00 2001 From: Peng Huo Date: Thu, 22 Feb 2024 11:18:37 -0800 Subject: [PATCH] Bump Flint version to 0.3.0 (#258) Signed-off-by: Peng Huo --- .gitignore | 2 ++ 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 ++- 6 files changed, 13 insertions(+), 9 deletions(-) diff --git a/.gitignore b/.gitignore index 34602292e..bc1705ce3 100644 --- a/.gitignore +++ b/.gitignore @@ -19,3 +19,5 @@ logs/ *.class *.log *.zip + +gen/ diff --git a/README.md b/README.md index b2709e348..83189dcb1 100644 --- a/README.md +++ b/README.md @@ -19,6 +19,7 @@ Version compatibility: |---------------|-------------|---------------|---------------|------------| | 0.1.0 | 11+ | 3.3.1 | 2.12.14 | 2.6+ | | 0.2.0 | 11+ | 3.3.1 | 2.12.14 | 2.6+ | +| 0.3.0 | 11+ | 3.3.2 | 2.12.14 | 2.6+ | ## Flint Extension Usage @@ -50,7 +51,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.2.0-SNAPSHOT" +bin/spark-shell --packages "org.opensearch:opensearch-spark_2.12:0.3.0-SNAPSHOT" ``` ### PPL Build & Run @@ -62,7 +63,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.2.0-SNAPSHOT" +bin/spark-shell --packages "org.opensearch:opensearch-spark-ppl_2.12:0.3.0-SNAPSHOT" ``` ## Code of Conduct diff --git a/build.sbt b/build.sbt index 3c6281684..95324fc99 100644 --- a/build.sbt +++ b/build.sbt @@ -10,7 +10,7 @@ lazy val opensearchVersion = "2.6.0" ThisBuild / organization := "org.opensearch" -ThisBuild / version := "0.2.0-SNAPSHOT" +ThisBuild / version := "0.3.0-SNAPSHOT" ThisBuild / scalaVersion := scala212 diff --git a/docs/PPL-on-Spark.md b/docs/PPL-on-Spark.md index f421d5679..a7e539d23 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.2.0-SNAPSHOT" +bin/spark-shell --packages "org.opensearch:opensearch-spark-ppl_2.12:0.3.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.2.0-SNAPSHOT`,`org.opensearch:opensearch-spark_2.12:0.2.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.3.0-SNAPSHOT`,`org.opensearch:opensearch-spark_2.12:0.3.0-SNAPSHOT`) to the cluster's classpath. Next need to configure both extensions : diff --git a/docs/index.md b/docs/index.md index 1832953be..d686980ad 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.2.0", + "version": "0.3.0", "name": "...", "kind": "skipping", "source": "...", @@ -570,7 +570,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.2.0-SNAPSHOT \ +--conf spark.jars.packages=org.opensearch:opensearch-spark-standalone_2.12:0.3.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 \ @@ -612,7 +612,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.2.0-SNAPSHOT \ +--conf spark.jars.packages=org.opensearch:opensearch-spark-standalone_2.12:0.3.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 2ff83d4b4..d226df24d 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 @@ -16,6 +16,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") + val V_0_3_0: FlintVersion = FlintVersion("0.3.0") - def current(): FlintVersion = V_0_2_0 + def current(): FlintVersion = V_0_3_0 }