Skip to content

Commit ebb5564

Browse files
author
Julien Ruaux
committed
deps: Upgraded to trino 393
1 parent af5a25f commit ebb5564

File tree

6 files changed

+25
-8
lines changed

6 files changed

+25
-8
lines changed

.github/workflows/early-access.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -62,7 +62,7 @@ jobs:
6262
JRELEASER_GPG_PASSPHRASE: ${{ secrets.GPG_PASSPHRASE }}
6363
JRELEASER_GPG_PUBLIC_KEY: ${{ secrets.GPG_PUBLIC_KEY }}
6464
JRELEASER_GPG_SECRET_KEY: ${{ secrets.GPG_SECRET_KEY }}
65-
JRELEASER_SLACK_WEBHOOK: ${{ secrets.JRELEASER_SLACK_WEBHOOK }}
65+
JRELEASER_ANNOUNCE_ACTIVE: false
6666

6767
- name: JReleaser output
6868
if: always()

.gitignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -39,3 +39,4 @@ out/
3939
.vscode/
4040
.DS_Store
4141
/target/
42+
.checkstyle

Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
ARG TRINO_VERSION=380
1+
ARG TRINO_VERSION=393
22

33
FROM docker.io/library/maven:3.6.3-openjdk-11 AS builder
44
WORKDIR /root/trino-redisearch

pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
<parent>
66
<groupId>io.trino</groupId>
77
<artifactId>trino-root</artifactId>
8-
<version>380</version>
8+
<version>393</version>
99
</parent>
1010

1111
<groupId>com.redis</groupId>

src/main/java/com/redis/trino/RediSearchMetadata.java

Lines changed: 12 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -42,6 +42,8 @@
4242

4343
import io.airlift.log.Logger;
4444
import io.airlift.slice.Slice;
45+
import io.trino.spi.StandardErrorCode;
46+
import io.trino.spi.TrinoException;
4547
import io.trino.spi.connector.AggregateFunction;
4648
import io.trino.spi.connector.AggregationApplicationResult;
4749
import io.trino.spi.connector.Assignment;
@@ -60,6 +62,7 @@
6062
import io.trino.spi.connector.ConstraintApplicationResult;
6163
import io.trino.spi.connector.LimitApplicationResult;
6264
import io.trino.spi.connector.NotFoundException;
65+
import io.trino.spi.connector.RetryMode;
6366
import io.trino.spi.connector.SchemaTableName;
6467
import io.trino.spi.connector.SchemaTablePrefix;
6568
import io.trino.spi.connector.TableNotFoundException;
@@ -182,7 +185,10 @@ public void dropColumn(ConnectorSession session, ConnectorTableHandle tableHandl
182185

183186
@Override
184187
public ConnectorOutputTableHandle beginCreateTable(ConnectorSession session, ConnectorTableMetadata tableMetadata,
185-
Optional<ConnectorTableLayout> layout) {
188+
Optional<ConnectorTableLayout> layout, RetryMode retryMode) {
189+
if (retryMode != RetryMode.NO_RETRIES) {
190+
throw new TrinoException(StandardErrorCode.NOT_SUPPORTED, "This connector does not support query retries");
191+
}
186192
List<RediSearchColumnHandle> columns = buildColumnHandles(tableMetadata);
187193

188194
rediSearchSession.createTable(tableMetadata.getTable(), columns);
@@ -202,7 +208,11 @@ public Optional<ConnectorOutputMetadata> finishCreateTable(ConnectorSession sess
202208
}
203209

204210
@Override
205-
public ConnectorInsertTableHandle beginInsert(ConnectorSession session, ConnectorTableHandle tableHandle) {
211+
public ConnectorInsertTableHandle beginInsert(ConnectorSession session, ConnectorTableHandle tableHandle,
212+
List<ColumnHandle> insertedColumns, RetryMode retryMode) {
213+
if (retryMode != RetryMode.NO_RETRIES) {
214+
throw new TrinoException(StandardErrorCode.NOT_SUPPORTED, "This connector does not support query retries");
215+
}
206216
RediSearchTableHandle table = (RediSearchTableHandle) tableHandle;
207217
List<RediSearchColumnHandle> columns = rediSearchSession.getTable(table.getSchemaTableName()).getColumns();
208218

src/main/java/com/redis/trino/RediSearchSplitManager.java

Lines changed: 9 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -35,6 +35,7 @@
3535
import io.trino.spi.connector.ConnectorSplitSource;
3636
import io.trino.spi.connector.ConnectorTableHandle;
3737
import io.trino.spi.connector.ConnectorTransactionHandle;
38+
import io.trino.spi.connector.Constraint;
3839
import io.trino.spi.connector.DynamicFilter;
3940
import io.trino.spi.connector.FixedSplitSource;
4041

@@ -47,9 +48,14 @@ public RediSearchSplitManager(RediSearchSession session) {
4748
this.addresses = session.getAddresses();
4849
}
4950

50-
@Override
51-
public ConnectorSplitSource getSplits(ConnectorTransactionHandle transaction, ConnectorSession session,
52-
ConnectorTableHandle table, SplitSchedulingStrategy splitSchedulingStrategy, DynamicFilter dynamicFilter) {
51+
@Override
52+
public ConnectorSplitSource getSplits(
53+
ConnectorTransactionHandle transaction,
54+
ConnectorSession session,
55+
ConnectorTableHandle tableHandle,
56+
DynamicFilter dynamicFilter,
57+
Constraint constraint)
58+
{
5359
RediSearchSplit split = new RediSearchSplit(addresses);
5460

5561
return new FixedSplitSource(ImmutableList.of(split));

0 commit comments

Comments
 (0)