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

Update airbase, airlift and other dependencies #20370

Merged
merged 7 commits into from
Jan 13, 2024
Merged

Update airbase, airlift and other dependencies #20370

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
550ab96
Add missing Slice serializer for JsonPath2016Type
wendigo Jan 13, 2024
bde3949
Upgrade airbase to 149
wendigo Jan 13, 2024
4b73301
Update airlift to 240
wendigo Jan 13, 2024
0b5339a
Update libraries-bom to 26.29.0
wendigo Jan 13, 2024
0eb81d2
Update AWS SDK v1 to 1.12.636
wendigo Jan 13, 2024
3a55dc7
Update flyway to 10.5.0
wendigo Jan 13, 2024
bb4a3ef
Update AWS SDK v2 to 2.23.2
wendigo Jan 13, 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
5 changes: 4 additions & 1 deletion core/trino-main/src/main/java/io/trino/type/JsonPath2016Type.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,7 @@
import io.airlift.slice.Slice;
import io.trino.block.BlockJsonSerde;
import io.trino.json.ir.IrJsonPath;
import io.trino.server.SliceSerialization;
import io.trino.spi.block.Block;
import io.trino.spi.block.BlockBuilder;
import io.trino.spi.block.BlockEncodingSerde;
Expand Down Expand Up @@ -75,7 +76,9 @@ public void writeObject(BlockBuilder blockBuilder, Object value)
private static JsonCodec<IrJsonPath> getCodec(TypeDeserializer typeDeserializer, BlockEncodingSerde blockEncodingSerde)
{
ObjectMapperProvider provider = new ObjectMapperProvider();
provider.setJsonSerializers(ImmutableMap.of(Block.class, new BlockJsonSerde.Serializer(blockEncodingSerde)));
provider.setJsonSerializers(ImmutableMap.of(
Block.class, new BlockJsonSerde.Serializer(blockEncodingSerde),
Slice.class, new SliceSerialization.SliceSerializer()));
provider.setJsonDeserializers(ImmutableMap.of(
Type.class, typeDeserializer,
Block.class, new BlockJsonSerde.Deserializer(blockEncodingSerde)));
Expand Down
18 changes: 12 additions & 6 deletions pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<parent>
<groupId>io.airlift</groupId>
<artifactId>airbase</artifactId>
<version>148</version>
<version>149</version>
</parent>

<groupId>io.trino</groupId>
Expand Down Expand Up @@ -174,18 +174,18 @@
<!-- keep dependency properties sorted -->
<dep.accumulo-hadoop.version>2.7.7-1</dep.accumulo-hadoop.version>
<dep.accumulo.version>1.10.2</dep.accumulo.version>
<dep.airlift.version>239</dep.airlift.version>
<dep.airlift.version>240</dep.airlift.version>
<dep.antlr.version>4.13.1</dep.antlr.version>
<dep.arrow.version>14.0.2</dep.arrow.version>
<dep.avro.version>1.11.3</dep.avro.version>
<dep.aws-sdk.version>1.12.630</dep.aws-sdk.version>
<dep.aws-sdk.version>1.12.636</dep.aws-sdk.version>
<dep.cassandra.version>4.17.0</dep.cassandra.version>
<dep.confluent.version>7.5.1</dep.confluent.version>
<dep.docker.images.version>87</dep.docker.images.version>
<dep.drift.version>1.21</dep.drift.version>
<dep.duct-tape.version>1.0.8</dep.duct-tape.version>
<dep.errorprone.version>2.23.0</dep.errorprone.version>
<dep.flyway.version>10.4.1</dep.flyway.version>
<dep.flyway.version>10.5.0</dep.flyway.version>
<dep.google.http.client.version>1.43.3</dep.google.http.client.version>
<dep.iceberg.version>1.4.3</dep.iceberg.version>
<dep.jna.version>5.14.0</dep.jna.version>
Expand Down Expand Up @@ -218,7 +218,7 @@
<dependency>
<groupId>com.google.cloud</groupId>
<artifactId>libraries-bom</artifactId>
<version>26.27.0</version>
<version>26.29.0</version>
<type>pom</type>
<scope>import</scope>
</dependency>
Expand Down Expand Up @@ -298,7 +298,7 @@
<dependency>
<groupId>software.amazon.awssdk</groupId>
<artifactId>bom</artifactId>
<version>2.22.10</version>
<version>2.23.2</version>
<type>pom</type>
<scope>import</scope>
</dependency>
Expand Down Expand Up @@ -538,6 +538,12 @@
<version>${dep.errorprone.version}</version>
</dependency>

<dependency>
<groupId>com.google.guava</groupId>
<artifactId>failureaccess</artifactId>
<version>1.0.2</version>
</dependency>

<dependency>
<groupId>com.google.http-client</groupId>
<artifactId>google-http-client</artifactId>
Expand Down
Loading