From 88c9117225ef7fb737f0bb05754500a1e48951b8 Mon Sep 17 00:00:00 2001 From: Vivek Balakrishnan Date: Mon, 2 Oct 2023 10:41:19 +0300 Subject: [PATCH 1/2] Set version for release 1.0.6 --- README.md | 6 +++--- examples/rovio-ingest-maven-example/pom.xml | 2 +- pom.xml | 2 +- python/notebooks/druid_ingestion_test.ipynb | 2 +- 4 files changed, 6 insertions(+), 6 deletions(-) diff --git a/README.md b/README.md index 05fa7e5..0a054c7 100644 --- a/README.md +++ b/README.md @@ -144,7 +144,7 @@ Set the following spark conf: ```python .conf("spark.jars.packages", - "com.rovio.ingest:rovio-ingest:1.0.5_spark_3.0.1") \ + "com.rovio.ingest:rovio-ingest:1.0.6_spark_3.0.1") \ ``` #### PySpark job example @@ -206,7 +206,7 @@ A `Dataset[Row]` extension is provided to repartition the dataset for the `Druid For an interactive spark session you can set the following spark conf: ```scala -("spark.jars.packages", "com.rovio.ingest:rovio-ingest:1.0.5_spark_3.0.1") +("spark.jars.packages", "com.rovio.ingest:rovio-ingest:1.0.6_spark_3.0.1") ``` To use a snapshot version: @@ -249,7 +249,7 @@ Maven (for a full example, see [examples/rovio-ingest-maven-example](examples/ro com.rovio.ingest rovio-ingest - 1.0.5_spark_3.0.1 + 1.0.6_spark_3.0.1 org.apache.logging.log4j diff --git a/examples/rovio-ingest-maven-example/pom.xml b/examples/rovio-ingest-maven-example/pom.xml index 969f9a0..db6de33 100644 --- a/examples/rovio-ingest-maven-example/pom.xml +++ b/examples/rovio-ingest-maven-example/pom.xml @@ -38,7 +38,7 @@ com.rovio.ingest rovio-ingest - 1.0.5_spark_3.0.1 + 1.0.6_spark_3.0.1 diff --git a/pom.xml b/pom.xml index 8280f08..b06a005 100644 --- a/pom.xml +++ b/pom.xml @@ -23,7 +23,7 @@ com.rovio.ingest rovio-ingest - 1.0.6_spark_3.0.1-SNAPSHOT + 1.0.6_spark_3.0.1 jar rovio-ingest An implementation of the DatasourceV2 interface of Apache Spark™ for writing Spark Datasets to Apache Druid™ diff --git a/python/notebooks/druid_ingestion_test.ipynb b/python/notebooks/druid_ingestion_test.ipynb index cb50e3e..6e115c1 100644 --- a/python/notebooks/druid_ingestion_test.ipynb +++ b/python/notebooks/druid_ingestion_test.ipynb @@ -201,7 +201,7 @@ " # alternative if using a snapshot version\n", "# \"spark.jars.repositories\": \"https://s01.oss.sonatype.org/content/repositories/snapshots\",\n", "# \"spark.jars.packages\": \"com.rovio.ingest:rovio-ingest:1.0.6_spark_3.0.1-SNAPSHOT\"\n", - " \"spark.jars.packages\": \"com.rovio.ingest:rovio-ingest:1.0.5_spark_3.0.1\"\n", + " \"spark.jars.packages\": \"com.rovio.ingest:rovio-ingest:1.0.6_spark_3.0.1\"\n", " }\n", "}\n", "\n", From c843705ba0372347cee09fc68c9a4da03c120c23 Mon Sep 17 00:00:00 2001 From: Vivek Balakrishnan Date: Mon, 2 Oct 2023 10:48:18 +0300 Subject: [PATCH 2/2] Set version to 1.0.7_spark_3.0.1-SNAPSHOT --- README.md | 2 +- examples/rovio-ingest-maven-example/pom.xml | 2 +- pom.xml | 2 +- python/notebooks/druid_ingestion_test.ipynb | 12 ++++++------ python/notebooks/druid_sketch_ingestion_test.ipynb | 10 +++++----- 5 files changed, 14 insertions(+), 14 deletions(-) diff --git a/README.md b/README.md index 0a054c7..0f238f5 100644 --- a/README.md +++ b/README.md @@ -213,7 +213,7 @@ To use a snapshot version: ```scala ("spark.jars.repositories", "https://s01.oss.sonatype.org/content/repositories/snapshots"), -("spark.jars.packages", "com.rovio.ingest:rovio-ingest:1.0.6_spark_3.0.1-SNAPSHOT") +("spark.jars.packages", "com.rovio.ingest:rovio-ingest:1.0.7_spark_3.0.1-SNAPSHOT") ``` ```scala diff --git a/examples/rovio-ingest-maven-example/pom.xml b/examples/rovio-ingest-maven-example/pom.xml index db6de33..731d85b 100644 --- a/examples/rovio-ingest-maven-example/pom.xml +++ b/examples/rovio-ingest-maven-example/pom.xml @@ -40,7 +40,7 @@ rovio-ingest 1.0.6_spark_3.0.1 diff --git a/pom.xml b/pom.xml index b06a005..c8a842e 100644 --- a/pom.xml +++ b/pom.xml @@ -23,7 +23,7 @@ com.rovio.ingest rovio-ingest - 1.0.6_spark_3.0.1 + 1.0.7_spark_3.0.1-SNAPSHOT jar rovio-ingest An implementation of the DatasourceV2 interface of Apache Spark™ for writing Spark Datasets to Apache Druid™ diff --git a/python/notebooks/druid_ingestion_test.ipynb b/python/notebooks/druid_ingestion_test.ipynb index 6e115c1..4511e89 100644 --- a/python/notebooks/druid_ingestion_test.ipynb +++ b/python/notebooks/druid_ingestion_test.ipynb @@ -66,14 +66,14 @@ "2. A) Copy the shaded jar to s3:\n", "\n", " aws s3 --profile $AWS_PROFILE cp \\\n", - " target/rovio-ingest-1.0.6_spark_3.0.1-SNAPSHOT.jar \\\n", - " s3://$JAR_BUCKET/tmp/juho/druid/jars/rovio-ingest-1.0.6_spark_3.0.1-SNAPSHOT.jar\n", + " target/rovio-ingest-1.0.7_spark_3.0.1-SNAPSHOT.jar \\\n", + " s3://$JAR_BUCKET/tmp/juho/druid/jars/rovio-ingest-1.0.7_spark_3.0.1-SNAPSHOT.jar\n", "\n", "2. B) Copy the plain jar to s3: \n", "\n", " aws s3 --profile $AWS_PROFILE cp \\\n", - " target/original-rovio-ingest-1.0.6_spark_3.0.1-SNAPSHOT.jar \\\n", - " s3://$JAR_BUCKET/tmp/juho/druid/jars/original-rovio-ingest-1.0.6_spark_3.0.1-SNAPSHOT.jar\n", + " target/original-rovio-ingest-1.0.7_spark_3.0.1-SNAPSHOT.jar \\\n", + " s3://$JAR_BUCKET/tmp/juho/druid/jars/original-rovio-ingest-1.0.7_spark_3.0.1-SNAPSHOT.jar\n", "\n", "Then invert the boolean in the cell below to use it in spark_conf." ] @@ -200,7 +200,7 @@ " \"spark.sql.session.timeZone\": \"UTC\",\n", " # alternative if using a snapshot version\n", "# \"spark.jars.repositories\": \"https://s01.oss.sonatype.org/content/repositories/snapshots\",\n", - "# \"spark.jars.packages\": \"com.rovio.ingest:rovio-ingest:1.0.6_spark_3.0.1-SNAPSHOT\"\n", + "# \"spark.jars.packages\": \"com.rovio.ingest:rovio-ingest:1.0.7_spark_3.0.1-SNAPSHOT\"\n", " \"spark.jars.packages\": \"com.rovio.ingest:rovio-ingest:1.0.6_spark_3.0.1\"\n", " }\n", "}\n", @@ -220,7 +220,7 @@ "# Enable this to test with a manually built & copied jar instead of published package from maven\n", "if False:\n", " spark_conf[\"conf\"][\"spark.jars\"] = \\\n", - " f\"s3://{packages_bucket}/{PREFIX}druid/jars/rovio-ingest-1.0.6_spark_3.0.1-SNAPSHOT.jar\"\n", + " f\"s3://{packages_bucket}/{PREFIX}druid/jars/rovio-ingest-1.0.7_spark_3.0.1-SNAPSHOT.jar\"\n", " del spark_conf[\"conf\"][\"spark.jars.packages\"]\n", "\n", "set_spark_config(spark_conf)\n", diff --git a/python/notebooks/druid_sketch_ingestion_test.ipynb b/python/notebooks/druid_sketch_ingestion_test.ipynb index 5806fad..80bbcd1 100644 --- a/python/notebooks/druid_sketch_ingestion_test.ipynb +++ b/python/notebooks/druid_sketch_ingestion_test.ipynb @@ -66,14 +66,14 @@ "2. A) Copy the shaded jar to s3:\n", "\n", " aws s3 --profile $AWS_PROFILE cp \\\n", - " target/rovio-ingest-1.0.6_spark_3.0.1-SNAPSHOT.jar \\\n", - " s3://$JAR_BUCKET/tmp/vivek/druid/jars/rovio-ingest-1.0.6_spark_3.0.1-SNAPSHOT.jar\n", + " target/rovio-ingest-1.0.7_spark_3.0.1-SNAPSHOT.jar \\\n", + " s3://$JAR_BUCKET/tmp/vivek/druid/jars/rovio-ingest-1.0.7_spark_3.0.1-SNAPSHOT.jar\n", "\n", "2. B) Copy the plain jar to s3: \n", "\n", " aws s3 --profile $AWS_PROFILE cp \\\n", - " target/original-rovio-ingest-1.0.6_spark_3.0.1-SNAPSHOT.jar \\\n", - " s3://$JAR_BUCKET/tmp/vivek/druid/jars/original-rovio-ingest-1.0.6_spark_3.0.1-SNAPSHOT.jar\n", + " target/original-rovio-ingest-1.0.7_spark_3.0.1-SNAPSHOT.jar \\\n", + " s3://$JAR_BUCKET/tmp/vivek/druid/jars/original-rovio-ingest-1.0.7_spark_3.0.1-SNAPSHOT.jar\n", "\n", "Then invert the boolean in the cell below to use it in spark_conf." ] @@ -166,7 +166,7 @@ "if True:\n", " jars_base_path = \"s3://{packages_bucket}/{PREFIX}druid/jars\"\n", " jars = (\n", - " f\"{jars_base_path}/rovio-ingest-1.0.6_spark_3.0.1-SNAPSHOT.jar,\"\n", + " f\"{jars_base_path}/rovio-ingest-1.0.7_spark_3.0.1-SNAPSHOT.jar,\"\n", " f\"{jars_base_path}/datasketches-hive-1.2.0.jar,\"\n", " f\"{jars_base_path}/datasketches-java-4.1.0.jar,\"\n", " f\"{jars_base_path}/datasketches-memory-2.0.0.jar\"\n",