Skip to content

Commit

Permalink
Bump version
Browse files Browse the repository at this point in the history
  • Loading branch information
nineinchnick committed Feb 14, 2022
1 parent 4a8dd1d commit 4bbde35
Show file tree
Hide file tree
Showing 8 changed files with 21 additions and 92 deletions.
4 changes: 2 additions & 2 deletions Dockerfile
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
FROM trinodb/trino:361
FROM trinodb/trino:370

ARG VERSION

RUN rm -rf /usr/lib/trino/plugin/{accumulo,bigquery,cassandra,druid,example-http,google-sheets,iceberg,kafka,kudu,ml,mysql,password-authenticators,phoenix5,postgresql,raptor-legacy,redshift,session-property-managers,teradata-functions,tpcds,atop,blackhole,clickhouse,elasticsearch,geospatial,hive-hadoop2,kinesis,local-file,memsql,mongodb,oracle,phoenix,pinot,prometheus,redis,resource-group-managers,sqlserver,thrift,tpch}
RUN rm -rf /usr/lib/trino/plugin/{accumulo,atop,bigquery,blackhole,cassandra,clickhouse,druid,elasticsearch,example-http,geospatial,google-sheets,hive,http-event-listener,iceberg,kafka,kinesis,kudu,local-file,memsql,ml,mongodb,mysql,oracle,password-authenticators,phoenix,phoenix5,pinot,postgresql,prometheus,raptor-legacy,redis,redshift,resource-group-managers,session-property-managers,sqlserver,teradata-functions,thrift,tpcds,tpch}

ADD trino-cloud-aws/target/trino-cloud-aws-$VERSION/ /usr/lib/trino/plugin/aws/
25 changes: 13 additions & 12 deletions pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@
<parent>
<groupId>io.airlift</groupId>
<artifactId>airbase</artifactId>
<version>116</version>
<version>120</version>
</parent>

<licenses>
Expand All @@ -54,14 +54,15 @@
<air.check.fail-checkstyle>true</air.check.fail-checkstyle>
<air.check.skip-checkstyle>false</air.check.skip-checkstyle>

<dep.trino.version>367</dep.trino.version>
<dep.airlift.version>212</dep.airlift.version>
<dep.trino.version>370</dep.trino.version>
<dep.airlift.version>214</dep.airlift.version>
<dep.packaging.version>${dep.airlift.version}</dep.packaging.version>
<dep.errorprone.version>2.10.0</dep.errorprone.version>
<dep.jackson.version>2.13.0</dep.jackson.version>
<dep.testng.version>6.10</dep.testng.version>
<dep.errorprone.version>2.11.0</dep.errorprone.version>
<dep.jackson.version>2.13.1</dep.jackson.version>
<dep.testng.version>7.5</dep.testng.version>

<project.scm.id>github</project.scm.id>
<argLine></argLine>
</properties>

<distributionManagement>
Expand All @@ -77,7 +78,7 @@
<dependency>
<groupId>org.checkerframework</groupId>
<artifactId>checker-qual</artifactId>
<version>3.21.0</version>
<version>3.21.1</version>
</dependency>
<dependency>
<groupId>org.osgi</groupId>
Expand All @@ -87,7 +88,7 @@
<dependency>
<groupId>com.github.spotbugs</groupId>
<artifactId>spotbugs-annotations</artifactId>
<version>4.5.2</version>
<version>4.5.3</version>
</dependency>
<dependency>
<groupId>javax.xml.bind</groupId>
Expand All @@ -102,7 +103,7 @@
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-api</artifactId>
<version>1.7.32</version>
<version>1.7.35</version>
</dependency>
</dependencies>
</dependencyManagement>
Expand Down Expand Up @@ -203,14 +204,14 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-deploy-plugin</artifactId>
<version>3.0.0-M1</version>
<version>3.0.0-M2</version>
<configuration>
<skip>true</skip>
</configuration>
</plugin>
<plugin>
<artifactId>maven-release-plugin</artifactId>
<version>3.0.0-M4</version>
<version>3.0.0-M5</version>
<configuration>
<scmCommentPrefix>[ci skip]</scmCommentPrefix>
<tagNameFormat>v@{project.version}</tagNameFormat>
Expand All @@ -220,7 +221,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-scm-plugin</artifactId>
<version>1.12.0</version>
<version>1.12.2</version>
<configuration>
<pushChanges>true</pushChanges>
</configuration>
Expand Down
6 changes: 3 additions & 3 deletions trino-cloud-aws/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -80,20 +80,20 @@ An example command to run the Trino server with the aws plugin and catalog enabl
```bash
src=$(git rev-parse --show-toplevel)
docker run \
-v $src/trino-cloud-aws/target/trino-cloud-aws-0.1-SNAPSHOT:/usr/lib/trino/plugin/aws \
-v $src/trino-cloud-aws/target/trino-cloud-aws-0.12-SNAPSHOT:/usr/lib/trino/plugin/aws \
-v $src/catalog:/etc/trino/catalog \
-e AWS_ACCESS_KEY_ID \
-e AWS_SECRET_ACCESS_KEY \
-e AWS_REGION \
-p 8080:8080 \
--name trino \
-d \
trinodb/trino:361
trinodb/trino:370
```

Connect to that server using:
```bash
docker run -it --rm --link trino trinodb/trino:361 trino --server trino:8080 --catalog aws --schema default
docker run -it --rm --link trino trinodb/trino:370 trino --server trino:8080 --catalog aws --schema default
```

# Adding new tables
Expand Down
2 changes: 1 addition & 1 deletion trino-cloud-aws/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@
<dependency>
<groupId>software.amazon.awssdk</groupId>
<artifactId>bom</artifactId>
<version>2.17.102</version>
<version>2.17.129</version>
<type>pom</type>
<scope>import</scope>
</dependency>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -41,12 +41,6 @@ public String getName()
return name;
}

@Override
public ConnectorHandleResolver getHandleResolver()
{
return new AwsHandleResolver();
}

@Override
public Connector create(String catalogName, Map<String, String> requiredConfig, ConnectorContext context)
{
Expand Down

This file was deleted.

Original file line number Diff line number Diff line change
Expand Up @@ -295,12 +295,6 @@ public ColumnMetadata getColumnMetadata(
return new ColumnMetadata(restColumnHandle.getName(), restColumnHandle.getType());
}

@Override
public boolean usesLegacyTableLayouts()
{
return false;
}

@Override
public ConnectorTableProperties getTableProperties(ConnectorSession session, ConnectorTableHandle table)
{
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -99,9 +99,9 @@ public Page getNextPage()
}

@Override
public long getSystemMemoryUsage()
public long getMemoryUsage()
{
return inner.getSystemMemoryUsage();
return inner.getMemoryUsage();
}

@Override
Expand Down

0 comments on commit 4bbde35

Please sign in to comment.