Skip to content

Commit 00a7380

Browse files
Cosmos spark3.2 support (Azure#26527)
* Version bump after cosmos spark release 4.5.3 * Skeleton for Spark 3.1 and 3.2 support * Mergin main * Update external_dependencies.txt * Updating external dependencies for Spark 3.1 and 3.2 * Update pom.xml * Update pom.xml * Updating md files * Update external_dependencies.txt * Fixing versioning * Update version_client.txt * Update .docsettings.yml * Update .docsettings.yml * fixing links * fixing links * adding versions to child poms * adding groupid to child poms * Removing parent section from dependency-reduced-pom * Update pom.xml * Fixing Build_Analyze issues * Update CHANGELOG.md * Update ci.yml
1 parent 052dca8 commit 00a7380

File tree

144 files changed

+1735
-691
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

144 files changed

+1735
-691
lines changed

.gitignore

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -96,3 +96,7 @@ scalastyle-output.xml
9696
# Emacs #
9797

9898
#changebundle.txt#
99+
100+
# Flatten-pom
101+
.flattened-pom.xml
102+
flatter.pom

eng/.docsettings.yml

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -44,6 +44,7 @@ known_presence_issues:
4444
- ['sdk/cognitiveservices/ms-azure-cs-videosearch', '#2847']
4545
- ['sdk/cognitiveservices/ms-azure-cs-visualsearch', '#2847']
4646
- ['sdk/cognitiveservices/ms-azure-cs-websearch', '#2847']
47+
- ['sdk/cosmos/azure-cosmos-spark_3_2-12', '#2847']
4748
- ['sdk/eventhubs/microsoft-azure-eventhubs-extensions', '#2847']
4849
- ['sdk/keyvault/microsoft-azure-keyvault', '#2847']
4950
- ['sdk/keyvault/microsoft-azure-keyvault-core', '#2847']
@@ -111,11 +112,12 @@ known_content_issues:
111112
- ['sdk/cosmos/azure-cosmos/README.md', '#3113']
112113
- ['sdk/cosmos/azure-cosmos-encryption/README.md', '#3113']
113114
- ['sdk/cosmos/azure-cosmos-spark_3-1_2-12/README.md', '#3113']
114-
- ['sdk/cosmos/azure-cosmos-spark_3-1_2-12/docs/catalog-api.md', '#3113']
115-
- ['sdk/cosmos/azure-cosmos-spark_3-1_2-12/docs/configuration-reference.md', '#3113']
116-
- ['sdk/cosmos/azure-cosmos-spark_3-1_2-12/docs/local-emulator.md', '#3113']
117-
- ['sdk/cosmos/azure-cosmos-spark_3-1_2-12/docs/quick-start.md', '#3113']
118-
- ['sdk/cosmos/azure-cosmos-spark_3-1_2-12/dev/README.md', '#3113']
115+
- ['sdk/cosmos/azure-cosmos-spark_3-2_2-12/README.md', '#3113']
116+
- ['sdk/cosmos/azure-cosmos-spark_3_2-12/dev/README.md', '#3113']
117+
- ['sdk/cosmos/azure-cosmos-spark_3_2-12/docs/catalog-api.md', '#3113']
118+
- ['sdk/cosmos/azure-cosmos-spark_3_2-12/docs/configuration-reference.md', '#3113']
119+
- ['sdk/cosmos/azure-cosmos-spark_3_2-12/docs/local-emulator.md', '#3113']
120+
- ['sdk/cosmos/azure-cosmos-spark_3_2-12/docs/quick-start.md', '#3113']
119121
- ['sdk/cosmos/README.md', '#3113']
120122
- ['sdk/e2e/README.md', '#3113']
121123
- ['sdk/eventgrid/microsoft-azure-eventgrid/README.md', '#3113']

eng/versioning/external_dependencies.txt

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -312,8 +312,10 @@ cosmos_org.hdrhistogram:HdrHistogram;2.1.12
312312

313313
## Cosmos Spark connector under sdk\cosmos\azure-cosmos-spark_3-1_2-12\pom.xml
314314
# Cosmos Spark connector runtime dependencies - provided by Spark runtime/host
315-
cosmos_org.apache.spark:spark-sql_2.12;3.1.1
316-
cosmos_org.apache.spark:spark-hive_2.12;3.1.1
315+
cosmos-spark_3-1_org.apache.spark:spark-sql_2.12;3.1.1
316+
cosmos-spark_3-2_org.apache.spark:spark-sql_2.12;3.2.0
317+
cosmos-spark_3-1_org.apache.spark:spark-hive_2.12;3.1.1
318+
cosmos-spark_3-2_org.apache.spark:spark-hive_2.12;3.2.0
317319
cosmos_org.scala-lang:scala-library;2.12.10
318320
cosmos_org.scala-lang.modules:scala-java8-compat_2.12;0.8.0
319321
cosmos_io.projectreactor:reactor-scala-extensions_2.12;0.8.0
@@ -329,6 +331,9 @@ cosmos_org.scalamock:scalamock_2.12;5.0.0
329331
cosmos_org.scalatest:scalatest-maven-plugin;2.0.2
330332
cosmos_net.alchim31.maven:scala-maven-plugin;4.5.4
331333
cosmos_org.scalastyle:scalastyle-maven-plugin;1.0.0
334+
cosmos_org.apache.maven.plugins:maven-shade-plugin;1.2.7
335+
cosmos_org.codehaus.mojo:flatten-maven-plugin;1.2.7
336+
cosmos_com.coderplus.maven.plugins:copy-rename-maven-plugin;1.0.1
332337

333338
# sdk\core\azure-core-serializer-avro-jackson\pom.xml
334339
# This dependency is needed since Jackson Avro uses an older dependency on Apache Avro which is another library.

eng/versioning/version_client.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -81,7 +81,7 @@ com.azure:azure-core-tracing-opentelemetry;1.0.0-beta.19;1.0.0-beta.20
8181
com.azure:azure-cosmos;4.25.0;4.26.0-beta.1
8282
com.azure:azure-cosmos-benchmark;4.0.1-beta.1;4.0.1-beta.1
8383
com.azure:azure-cosmos-dotnet-benchmark;4.0.1-beta.1;4.0.1-beta.1
84-
com.azure.cosmos.spark:azure-cosmos-spark_3-1_2-12;4.6.0-beta.1;4.6.0-beta.1
84+
com.azure.cosmos.spark:azure-cosmos-spark_3_2-12;4.6.0-beta.1;4.6.0-beta.1
8585
com.azure:azure-cosmos-encryption;1.0.0-beta.9;1.0.0-beta.10
8686
com.azure:azure-data-appconfiguration;1.2.4;1.2.5
8787
com.azure:azure-data-appconfiguration-perf;1.0.0-beta.1;1.0.0-beta.1

sdk/cosmos/azure-cosmos-spark_3-1_2-12/CHANGELOG.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -95,7 +95,7 @@
9595
* Cosmos DB Spark 3.1.1 Connector Preview `4.0.0-beta.3` Release.
9696
#### Configuration Renames
9797
* Renamed data source name `cosmos.changeFeed` to `cosmos.oltp.changeFeed`, see [PR](https://github.com/Azure/azure-sdk-for-java/pull/21121).
98-
* Configuration renamed. See [PR](https://github.com/Azure/azure-sdk-for-java/pull/21004) for list of changes. See [Configuration-Reference](https://github.com/Azure/azure-sdk-for-java/blob/main/sdk/cosmos/azure-cosmos-spark_3-1_2-12/docs/configuration-reference.md) for more details.
98+
* Configuration renamed. See [PR](https://github.com/Azure/azure-sdk-for-java/pull/21004) for list of changes. See [Configuration-Reference](https://github.com/Azure/azure-sdk-for-java/blob/main/sdk/cosmos/azure-cosmos-spark_3_2-12/docs/configuration-reference.md) for more details.
9999

100100
#### Key Bug Fixes
101101
* Added validation for all config-settings with a name starting with "spark.cosmos."

sdk/cosmos/azure-cosmos-spark_3-1_2-12/CONTRIBUTING.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,8 +10,8 @@ To build the project, run maven commands.
1010

1111
```bash
1212
git clone https://github.com/Azure/azure-sdk-for-java.git
13-
cd sdk/cosmos/azure-cosmos-spark_3_2.12
14-
mvnw clean install
13+
cd sdk/cosmos/azure-cosmos-spark_3-1_2.12
14+
mvn clean install
1515
```
1616

1717
## Test

sdk/cosmos/azure-cosmos-spark_3-1_2-12/README.md

Lines changed: 10 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -10,9 +10,9 @@ https://github.com/Azure/azure-sdk-for-java/issues/new
1010

1111
### Documentation
1212

13-
- [Getting started](https://github.com/Azure/azure-sdk-for-java/blob/main/sdk/cosmos/azure-cosmos-spark_3-1_2-12/docs/quick-start.md)
14-
- [Catalog API](https://github.com/Azure/azure-sdk-for-java/blob/main/sdk/cosmos/azure-cosmos-spark_3-1_2-12/docs/catalog-api.md)
15-
- [Configuration Parameter Reference](https://github.com/Azure/azure-sdk-for-java/blob/main/sdk/cosmos/azure-cosmos-spark_3-1_2-12/docs/configuration-reference.md)
13+
- [Getting started](https://github.com/Azure/azure-sdk-for-java/blob/main/sdk/cosmos/azure-cosmos-spark_3_2-12/docs/quick-start.md)
14+
- [Catalog API](https://github.com/Azure/azure-sdk-for-java/blob/main/sdk/cosmos/azure-cosmos-spark_3_2-12/docs/catalog-api.md)
15+
- [Configuration Parameter Reference](https://github.com/Azure/azure-sdk-for-java/blob/main/sdk/cosmos/azure-cosmos-spark_3_2-12/docs/configuration-reference.md)
1616

1717
[//]: # (//TODO: moderakh add more sections)
1818
[//]: # (//TODO: moderakh Enable Client Logging)
@@ -24,8 +24,10 @@ https://github.com/Azure/azure-sdk-for-java/issues/new
2424

2525
### Version Compatibility
2626

27+
#### azure-cosmos-spark_3-1_2-12
2728
| Connector | Supported Spark Versions | Minimum Java Version | Supported Scala Versions | Supported Databricks Runtimes |
2829
| ------------- | ------------------------ | -------------------- | ----------------------- | ----------------------------- |
30+
| 4.6.0 | 3.1.1 - 3.1.2 | 8 | 2.12 | 8.\*, 9.\* |
2931
| 4.5.3 | 3.1.1 - 3.1.2 | 8 | 2.12 | 8.\*, 9.\* |
3032
| 4.5.2 | 3.1.1 - 3.1.2 | 8 | 2.12 | 8.\*, 9.\* |
3133
| 4.5.1 | 3.1.1 - 3.1.2 | 8 | 2.12 | 8.\*, 9.\* |
@@ -42,6 +44,11 @@ https://github.com/Azure/azure-sdk-for-java/issues/new
4244
| 4.0.0-beta.2 | 3.1.1 | 8 | 2.12 | 8.\* |
4345
| 4.0.0-beta.1 | 3.1.1 | 8 | 2.12 | 8.\* |
4446

47+
#### azure-cosmos-spark_3-2_2-12
48+
| Connector | Supported Spark Versions | Minimum Java Version | Supported Scala Versions | Supported Databricks Runtimes |
49+
| ------------- | ------------------------ | -------------------- | ----------------------- | ----------------------------- |
50+
| 4.6.0 | 3.2.0 - 3.2.1 | 8 | 2.12 | 10.\* |
51+
4552
### Download
4653

4754
You can use the maven coordinate of the jar to auto install the Spark Connector to your Databricks Runtime 8 from Maven:

0 commit comments

Comments
 (0)