Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Set version for release 1.0.7 & the following SNAPSHOT release #60

Merged
merged 2 commits into from
Oct 1, 2024
Merged

Set version for release 1.0.7 & the following SNAPSHOT release #60

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
af7fec6
Set version for release 1.0.7
juhoautio-rovio Oct 1, 2024
9f2f252
Set version to 1.0.8_spark_3.4.1-SNAPSHOT
juhoautio-rovio Oct 1, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -145,7 +145,7 @@ Set the following spark conf:

```python
.conf("spark.jars.packages",
"com.rovio.ingest:rovio-ingest:1.0.6_spark_3.0.1") \
"com.rovio.ingest:rovio-ingest:1.0.7_spark_3.4.1") \
```

#### PySpark job example
Expand Down Expand Up @@ -207,14 +207,14 @@ 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.6_spark_3.0.1")
("spark.jars.packages", "com.rovio.ingest:rovio-ingest:1.0.7_spark_3.4.1")
```

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.7_spark_3.4.1-SNAPSHOT")
("spark.jars.packages", "com.rovio.ingest:rovio-ingest:1.0.8_spark_3.4.1-SNAPSHOT")
```

```scala
Expand Down Expand Up @@ -250,7 +250,7 @@ Maven (for a full example, see [examples/rovio-ingest-maven-example](examples/ro
<dependency>
<groupId>com.rovio.ingest</groupId>
<artifactId>rovio-ingest</artifactId>
<version>1.0.6_spark_3.0.1</version>
<version>1.0.7_spark_3.4.1</version>
</dependency>
<dependency>
<groupId>org.apache.logging.log4j</groupId>
Expand Down
4 changes: 2 additions & 2 deletions examples/rovio-ingest-maven-example/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,9 +38,9 @@
<dependency>
<groupId>com.rovio.ingest</groupId>
<artifactId>rovio-ingest</artifactId>
<version>1.0.6_spark_3.0.1</version>
<version>1.0.7_spark_3.4.1</version>
<!-- NOTE: This requires the sonatype snapshot repository. See <repositories>.
<version>1.0.7_spark_3.4.1-SNAPSHOT</version>
<version>1.0.8_spark_3.4.1-SNAPSHOT</version>
-->
</dependency>
<dependency>
Expand Down
2 changes: 1 addition & 1 deletion pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@

<groupId>com.rovio.ingest</groupId>
<artifactId>rovio-ingest</artifactId>
<version>1.0.7_spark_3.4.1-SNAPSHOT</version>
<version>1.0.8_spark_3.4.1-SNAPSHOT</version>
<packaging>jar</packaging>
<name>rovio-ingest</name>
<description>An implementation of the DatasourceV2 interface of Apache Spark™ for writing Spark Datasets to Apache Druid™</description>
Expand Down
14 changes: 7 additions & 7 deletions python/notebooks/druid_ingestion_test.ipynb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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.7_spark_3.4.1-SNAPSHOT.jar \\\n",
" s3://$JAR_BUCKET/tmp/juho/druid/jars/rovio-ingest-1.0.7_spark_3.4.1-SNAPSHOT.jar\n",
" target/rovio-ingest-1.0.8_spark_3.4.1-SNAPSHOT.jar \\\n",
" s3://$JAR_BUCKET/tmp/juho/druid/jars/rovio-ingest-1.0.8_spark_3.4.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.7_spark_3.4.1-SNAPSHOT.jar \\\n",
" s3://$JAR_BUCKET/tmp/juho/druid/jars/original-rovio-ingest-1.0.7_spark_3.4.1-SNAPSHOT.jar\n",
" target/original-rovio-ingest-1.0.8_spark_3.4.1-SNAPSHOT.jar \\\n",
" s3://$JAR_BUCKET/tmp/juho/druid/jars/original-rovio-ingest-1.0.8_spark_3.4.1-SNAPSHOT.jar\n",
"\n",
"Then invert the boolean in the cell below to use it in spark_conf."
]
Expand Down Expand Up @@ -200,8 +200,8 @@
" \"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.7_spark_3.4.1-SNAPSHOT\"\n",
" \"spark.jars.packages\": \"com.rovio.ingest:rovio-ingest:1.0.6_spark_3.0.1\"\n",
"# \"spark.jars.packages\": \"com.rovio.ingest:rovio-ingest:1.0.8_spark_3.4.1-SNAPSHOT\"\n",
" \"spark.jars.packages\": \"com.rovio.ingest:rovio-ingest:1.0.7_spark_3.4.1\"\n",
" }\n",
"}\n",
"\n",
Expand All @@ -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.7_spark_3.4.1-SNAPSHOT.jar\"\n",
" f\"s3://{packages_bucket}/{PREFIX}druid/jars/rovio-ingest-1.0.8_spark_3.4.1-SNAPSHOT.jar\"\n",
" del spark_conf[\"conf\"][\"spark.jars.packages\"]\n",
"\n",
"set_spark_config(spark_conf)\n",
Expand Down
10 changes: 5 additions & 5 deletions python/notebooks/druid_sketch_ingestion_test.ipynb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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.7_spark_3.4.1-SNAPSHOT.jar \\\n",
" s3://$JAR_BUCKET/tmp/vivek/druid/jars/rovio-ingest-1.0.7_spark_3.4.1-SNAPSHOT.jar\n",
" target/rovio-ingest-1.0.8_spark_3.4.1-SNAPSHOT.jar \\\n",
" s3://$JAR_BUCKET/tmp/vivek/druid/jars/rovio-ingest-1.0.8_spark_3.4.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.7_spark_3.4.1-SNAPSHOT.jar \\\n",
" s3://$JAR_BUCKET/tmp/vivek/druid/jars/original-rovio-ingest-1.0.7_spark_3.4.1-SNAPSHOT.jar\n",
" target/original-rovio-ingest-1.0.8_spark_3.4.1-SNAPSHOT.jar \\\n",
" s3://$JAR_BUCKET/tmp/vivek/druid/jars/original-rovio-ingest-1.0.8_spark_3.4.1-SNAPSHOT.jar\n",
"\n",
"Then invert the boolean in the cell below to use it in spark_conf."
]
Expand Down Expand Up @@ -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.7_spark_3.4.1-SNAPSHOT.jar,\"\n",
" f\"{jars_base_path}/rovio-ingest-1.0.8_spark_3.4.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",
Expand Down
Loading