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

Bump beam to 2.61, pin beam dependencies, reduce dependabot noise #925

Merged
merged 6 commits into from
Dec 11, 2024
Merged

Bump beam to 2.61, pin beam dependencies, reduce dependabot noise #925

Show file tree
Hide file tree
Changes from 4 commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
1f130c3
wip
kellen Nov 21, 2024
ac8f258
wip
kellen Nov 21, 2024
dcc9fca
wip
kellen Nov 21, 2024
8dd394c
avro
kellen Nov 22, 2024
1d174c2
Update to beam 2.61
RustedBones Dec 11, 2024
429dc21
Merge remote-tracking branch 'origin/master' into kellen/deps
RustedBones Dec 11, 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
19 changes: 19 additions & 0 deletions .github/dependabot.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,15 +12,34 @@ updates:
- dependency-name: com.fasterxml.jackson.core:jackson-annotations
- dependency-name: com.fasterxml.jackson.core:jackson-core
- dependency-name: com.fasterxml.jackson.core:jackson-databind
- dependency-name: com.fasterxml.jackson:jackson-bom
- dependency-name: com.github.luben:zstd-jni
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggested change
- dependency-name: com.github.luben:zstd-jni

I think we can keep zstd updates, as they are decoupled with Beam.

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

zstd-jni is not following classic semver. the postfix -3 causes sometimes conflict with dependency resolvers. We prefer to stick with on the common version with beam

- dependency-name: com.google.api-client:google-api-client
- dependency-name: com.google.api.grpc:proto-google-iam-v1
- dependency-name: com.google.apis:google-api-services-storage
- dependency-name: com.google.auto.value:auto-value
- dependency-name: com.google.auto.value:auto-value-annotations
- dependency-name: com.google.cloud.sql:mysql-socket-factory
- dependency-name: com.google.cloud.sql:postgres-socket-factory
- dependency-name: com.google.cloud:libraries-bom
- dependency-name: com.google.errorprone:error_prone_annotations
- dependency-name: com.google.guava:guava-bom
- dependency-name: com.google.http-client:google-http-client
- dependency-name: com.google.http-client:google-http-client-test
- dependency-name: com.google.oauth-client:google-oauth-client
- dependency-name: com.google.protobuf:protobuf-java
- dependency-name: com.google.protobuf:protobuf-java-util
- dependency-name: commons-codec:commons-codec
- dependency-name: org.apache.beam:beam-sdks-java-bom # manually bump this
- dependency-name: org.apache.commons:commons-compress
- dependency-name: org.apache.httpcomponents:httpcore
- dependency-name: org.apache.httpcomponents:httpclient
- dependency-name: org.checkerframework:checker-qual
- dependency-name: org.slf4j:slf4j-api
- dependency-name: org.slf4j:slf4j-jdk14
- dependency-name: org.threeten:threetenbp
- dependency-name: io.grpc:grpc-bom
- dependency-name: io.netty:netty-bom
- dependency-name: joda-time:joda-time
# sync with libraries-bom
- dependency-name: io.opencensus:opencensus-contrib-grpc-metrics
2 changes: 1 addition & 1 deletion NOTICE
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
DBeam
Copyright 2017 Spotify AB
Copyright 2024 Spotify AB
56 changes: 28 additions & 28 deletions docs/type-conversion.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,31 +5,31 @@ When applicable and `--useAvroLogicalTypes` parameter is set to `true`, Avro log

To represent nullable columns, unions with the Avro NULL type are used.

**Java SQL type** | **Avro type** | **Avro schema annotations** | **Comments**
--- | --- | --- | ---
BIGINT | long / string | | Depends on a SQL column precision
INTEGER | int | |
SMALLINT | int | |
TINYINT | int | |
TIMESTAMP | long |logicalType: time-millis |
DATE | long | logicalType: time-millis |
TIME | long | logicalType: time-millis |
TIME_WITH_TIMEZONE | long | logicalType: time-millis |
BOOLEAN | boolean | |
BIT | boolean / bytes | | Depends on a SQL column precision
BINARY | bytes | |
BINARY | bytes | |
VARBINARY | bytes | |
LONGVARBINARY | bytes | |
ARRAY | bytes | |
BLOB | bytes | |
DOUBLE | double | |
FLOAT | float | |
REAL | float | |
VARCHAR | string | |
CHAR | string | |
CLOB | string | |
LONGNVARCHAR | string | |
LONGVARCHAR | string | |
NCHAR | string | |
all other Java SQL types | string | |
| **Java SQL type** | **Avro type** | **Avro schema annotations** | **Comments** |
|--------------------------|-----------------|-----------------------------|-----------------------------------|
| BIGINT | long / string | | Depends on a SQL column precision |
| INTEGER | int | | |
| SMALLINT | int | | |
| TINYINT | int | | |
| TIMESTAMP | long | logicalType: time-millis | |
| DATE | long | logicalType: time-millis | |
| TIME | long | logicalType: time-millis | |
| TIME_WITH_TIMEZONE | long | logicalType: time-millis | |
| BOOLEAN | boolean | | |
| BIT | boolean / bytes | | Depends on a SQL column precision |
| BINARY | bytes | | |
| BINARY | bytes | | |
| VARBINARY | bytes | | |
| LONGVARBINARY | bytes | | |
| ARRAY | bytes | | |
| BLOB | bytes | | |
| DOUBLE | double | | |
| FLOAT | float | | |
| REAL | float | | |
| VARCHAR | string | | |
| CHAR | string | | |
| CLOB | string | | |
| LONGNVARCHAR | string | | |
| LONGVARCHAR | string | | |
| NCHAR | string | | |
| all other Java SQL types | string | | |
Loading