Update to Trino-431

TileDB-Inc · Nov 9, 2023 · c5cb6e9 · c5cb6e9
1 parent b79982c
commit c5cb6e9
Show file tree

Hide file tree

Showing 18 changed files with 149 additions and 124 deletions.
diff --git a/pom.xml b/pom.xml
@@ -1,50 +1,16 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0"
-         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
     <modelVersion>4.0.0</modelVersion>
     <parent>
-        <artifactId>trino-root</artifactId>
         <groupId>io.trino</groupId>
-        <version>411</version>
+        <artifactId>trino-root</artifactId>
+        <version>431</version>
     </parent>
 
     <artifactId>trino-tiledb</artifactId>
     <description>Trino - TileDB Connector</description>
 
-    <repositories>
-        <repository>
-            <id>oss.sonatype.org-snapshot</id>
-            <url>http://oss.sonatype.org/content/repositories/snapshots</url>
-            <releases>
-                <enabled>false</enabled>
-            </releases>
-            <snapshots>
-                <enabled>true</enabled>
-            </snapshots>
-        </repository>
-    </repositories>
-
     <dependencies>
-        <dependency>
-            <groupId>io.airlift</groupId>
-            <artifactId>bootstrap</artifactId>
-        </dependency>
-
-        <dependency>
-            <groupId>io.airlift</groupId>
-            <artifactId>configuration</artifactId>
-        </dependency>
-
-        <dependency>
-            <groupId>io.airlift</groupId>
-            <artifactId>json</artifactId>
-        </dependency>
-
-        <dependency>
-            <groupId>io.airlift</groupId>
-            <artifactId>log</artifactId>
-        </dependency>
 
         <dependency>
             <groupId>com.fasterxml.jackson.core</groupId>
@@ -91,6 +57,25 @@
                 </exclusion>
             </exclusions>
         </dependency>
+        <dependency>
+            <groupId>io.airlift</groupId>
+            <artifactId>bootstrap</artifactId>
+        </dependency>
+
+        <dependency>
+            <groupId>io.airlift</groupId>
+            <artifactId>configuration</artifactId>
+        </dependency>
+
+        <dependency>
+            <groupId>io.airlift</groupId>
+            <artifactId>json</artifactId>
+        </dependency>
+
+        <dependency>
+            <groupId>io.airlift</groupId>
+            <artifactId>log</artifactId>
+        </dependency>
 
         <dependency>
             <groupId>io.tiledb</groupId>
@@ -99,15 +84,34 @@
         </dependency>
 
         <dependency>
-            <groupId>javax.inject</groupId>
-            <artifactId>javax.inject</artifactId>
+            <groupId>jakarta.inject</groupId>
+            <artifactId>jakarta.inject-api</artifactId>
+            <version>2.0.1</version>
         </dependency>
 
         <dependency>
             <groupId>joda-time</groupId>
             <artifactId>joda-time</artifactId>
         </dependency>
 
+        <dependency>
+            <groupId>com.fasterxml.jackson.core</groupId>
+            <artifactId>jackson-annotations</artifactId>
+            <scope>provided</scope>
+        </dependency>
+
+        <dependency>
+            <groupId>io.airlift</groupId>
+            <artifactId>slice</artifactId>
+            <scope>provided</scope>
+        </dependency>
+
+        <dependency>
+            <groupId>io.airlift</groupId>
+            <artifactId>units</artifactId>
+            <scope>provided</scope>
+        </dependency>
+
         <!-- Trino SPI -->
         <dependency>
             <groupId>io.trino</groupId>
@@ -124,20 +128,15 @@
 
         <dependency>
             <groupId>io.airlift</groupId>
-            <artifactId>slice</artifactId>
-            <scope>provided</scope>
-        </dependency>
-
-        <dependency>
-            <groupId>io.airlift</groupId>
-            <artifactId>units</artifactId>
-            <scope>provided</scope>
+            <artifactId>testing</artifactId>
+            <scope>test</scope>
         </dependency>
 
         <dependency>
-            <groupId>com.fasterxml.jackson.core</groupId>
-            <artifactId>jackson-annotations</artifactId>
-            <scope>provided</scope>
+            <groupId>io.airlift.tpch</groupId>
+            <artifactId>tpch</artifactId>
+            <version>0.10</version>
+            <scope>test</scope>
         </dependency>
 
         <!-- for testing -->
@@ -167,19 +166,6 @@
             <scope>test</scope>
         </dependency>
 
-        <dependency>
-            <groupId>io.airlift</groupId>
-            <artifactId>testing</artifactId>
-            <scope>test</scope>
-        </dependency>
-
-        <dependency>
-            <groupId>io.airlift.tpch</groupId>
-            <artifactId>tpch</artifactId>
-            <version>0.10</version>
-            <scope>test</scope>
-        </dependency>
-
         <!-- https://mvnrepository.com/artifact/org.assertj/assertj-core -->
         <dependency>
             <groupId>org.assertj</groupId>
@@ -207,6 +193,19 @@
         </dependency>
     </dependencies>
 
+    <repositories>
+        <repository>
+            <releases>
+                <enabled>false</enabled>
+            </releases>
+            <snapshots>
+                <enabled>true</enabled>
+            </snapshots>
+            <id>oss.sonatype.org-snapshot</id>
+            <url>http://oss.sonatype.org/content/repositories/snapshots</url>
+        </repository>
+    </repositories>
+
     <build>
         <plugins>
             <plugin>
@@ -227,7 +226,7 @@
                     <!-- put your configurations here -->
                     <packaging>trino-plugin</packaging>
                     <transformers>
-                        <transformer implementation="org.apache.maven.plugins.shade.resource.ServicesResourceTransformer"/>
+                        <transformer implementation="org.apache.maven.plugins.shade.resource.ServicesResourceTransformer" />
                         <transformer implementation="org.apache.maven.plugins.shade.resource.IncludeResourceTransformer">
                             <resource>META-INF/services/io.trino.spi.Plugin</resource>
                             <file>src/main/resources/services/io.trino.spi.Plugin</file>
@@ -236,10 +235,10 @@
                 </configuration>
                 <executions>
                     <execution>
-                        <phase>package</phase>
                         <goals>
                             <goal>shade</goal>
                         </goals>
+                        <phase>package</phase>
                     </execution>
                 </executions>
             </plugin>

diff --git a/src/main/java/io/trino/plugin/tiledb/TileDBClient.java b/src/main/java/io/trino/plugin/tiledb/TileDBClient.java
@@ -21,10 +21,9 @@
 import io.tiledb.java.api.TileDBObject;
 import io.trino.spi.TrinoException;
 import io.trino.spi.connector.ConnectorSession;
+import jakarta.inject.Inject;
 import oshi.hardware.HardwareAbstractionLayer;
 
-import javax.inject.Inject;
-
 import java.io.File;
 import java.net.URI;
 import java.net.URISyntaxException;
@@ -276,7 +275,8 @@ public Config buildConfig()
         }
     }
 
-    public Context buildContext(ConnectorSession session, EncryptionType encryptionType, String encryptionKey) throws TileDBError
+    public Context buildContext(ConnectorSession session, EncryptionType encryptionType, String encryptionKey)
+            throws TileDBError
     {
         Config tileDBConfig = new Config();
         boolean updateCtx = false;

diff --git a/src/main/java/io/trino/plugin/tiledb/TileDBColumnProperties.java b/src/main/java/io/trino/plugin/tiledb/TileDBColumnProperties.java
@@ -16,8 +16,7 @@
 import com.google.common.collect.ImmutableList;
 import io.trino.spi.session.PropertyMetadata;
 import io.trino.spi.type.TypeManager;
-
-import javax.inject.Inject;
+import jakarta.inject.Inject;
 
 import java.util.List;
 import java.util.Map;

diff --git a/src/main/java/io/trino/plugin/tiledb/TileDBConnector.java b/src/main/java/io/trino/plugin/tiledb/TileDBConnector.java
@@ -26,8 +26,7 @@
 import io.trino.spi.connector.ConnectorTransactionHandle;
 import io.trino.spi.session.PropertyMetadata;
 import io.trino.spi.transaction.IsolationLevel;
-
-import javax.inject.Inject;
+import jakarta.inject.Inject;
 
 import java.util.List;
 import java.util.concurrent.ConcurrentHashMap;

diff --git a/src/main/java/io/trino/plugin/tiledb/TileDBMetadata.java b/src/main/java/io/trino/plugin/tiledb/TileDBMetadata.java
@@ -46,8 +46,7 @@
 import io.trino.spi.statistics.ComputedStatistics;
 import io.trino.spi.type.Type;
 import io.trino.spi.type.VarcharType;
-
-import javax.inject.Inject;
+import jakarta.inject.Inject;
 
 import java.net.URI;
 import java.net.URISyntaxException;

diff --git a/src/main/java/io/trino/plugin/tiledb/TileDBModule.java b/src/main/java/io/trino/plugin/tiledb/TileDBModule.java
@@ -26,8 +26,7 @@
 import io.trino.spi.type.TypeSignature;
 import io.trino.spi.type.VarbinaryType;
 import io.trino.spi.type.VarcharType;
-
-import javax.inject.Inject;
+import jakarta.inject.Inject;
 
 import java.util.ArrayList;
 import java.util.List;
@@ -102,7 +101,8 @@ protected Type _deserialize(String value, DeserializationContext context)
         }
     }
 
-    public static Type prestoTypeFromTileDBType(Datatype type) throws TileDBError
+    public static Type prestoTypeFromTileDBType(Datatype type)
+            throws TileDBError
     {
         switch (type) {
             case TILEDB_INT8:
@@ -149,7 +149,8 @@ public static Type prestoTypeFromTileDBType(Datatype type) throws TileDBError
         }
     }
 
-    public static Datatype tileDBTypeFromTrinoType(Type type) throws TileDBError
+    public static Datatype tileDBTypeFromTrinoType(Type type)
+            throws TileDBError
     {
         type.getJavaType();
         if (type.equals(TINYINT)) {
@@ -202,7 +203,8 @@ else if (type.equals(TIMESTAMP_MILLIS)) {
      * @return List
      * @throws TileDBError if the datatype passed is not supported
      */
-    public static List<?> getJavaListForType(Datatype type, boolean isVariableLength) throws TileDBError
+    public static List<?> getJavaListForType(Datatype type, boolean isVariableLength)
+            throws TileDBError
     {
         switch (type) {
             case TILEDB_FLOAT32: {

diff --git a/src/main/java/io/trino/plugin/tiledb/TileDBPageSink.java b/src/main/java/io/trino/plugin/tiledb/TileDBPageSink.java
@@ -149,7 +149,8 @@ public TileDBPageSink(TileDBOutputTableHandle handle, TileDBClient tileDBClient,
      * @param buffers the buffers
      * @throws TileDBError TileDBError
      */
-    private void resetQuery(Map<String, Pair<NativeArray, NativeArray>> buffers) throws TileDBError
+    private void resetQuery(Map<String, Pair<NativeArray, NativeArray>> buffers)
+            throws TileDBError
     {
         // Create query object
         query.close();
@@ -165,7 +166,8 @@ private void resetQuery(Map<String, Pair<NativeArray, NativeArray>> buffers) thr
      * @param buffers the buffers
      * @throws TileDBError TileDBError
      */
-    private void resetBuffers(Map<String, Pair<NativeArray, NativeArray>> buffers) throws TileDBError
+    private void resetBuffers(Map<String, Pair<NativeArray, NativeArray>> buffers)
+            throws TileDBError
     {
         for (Map.Entry<String, Pair<NativeArray, NativeArray>> bufferEntry : buffers.entrySet()) {
             NativeArray offsets = bufferEntry.getValue().getFirst();
@@ -312,7 +314,8 @@ private void initBufferEffectiveSizes(Map<String, Pair<Optional<Long>, Long>> bu
      * @return QueryStatus
      * @throws TileDBError TileDBError
      */
-    private QueryStatus submitQuery(Map<String, Pair<NativeArray, NativeArray>> buffers, Map<String, Pair<Optional<Long>, Long>> bufferEffectiveSizes) throws TileDBError
+    private QueryStatus submitQuery(Map<String, Pair<NativeArray, NativeArray>> buffers, Map<String, Pair<Optional<Long>, Long>> bufferEffectiveSizes)
+            throws TileDBError
     {
         // We have to keep track of if we created a new buffer or not and if we should clear it
         List<NativeArray> buffersToClear = new ArrayList<>();
@@ -401,7 +404,8 @@ private QueryStatus submitQuery(Map<String, Pair<NativeArray, NativeArray>> buff
      * @return new effective buffer size after write
      * @throws TileDBError TileDBError
      */
-    private long appendColumn(Page page, int position, int channel, NativeArray columnBuffer, int bufferPosition) throws TileDBError
+    private long appendColumn(Page page, int position, int channel, NativeArray columnBuffer, int bufferPosition)
+            throws TileDBError
     {
         OffsetDateTime dt;
         Block block = page.getBlock(channel);

diff --git a/src/main/java/io/trino/plugin/tiledb/TileDBPageSinkProvider.java b/src/main/java/io/trino/plugin/tiledb/TileDBPageSinkProvider.java
@@ -20,8 +20,7 @@
 import io.trino.spi.connector.ConnectorPageSinkProvider;
 import io.trino.spi.connector.ConnectorSession;
 import io.trino.spi.connector.ConnectorTransactionHandle;
-
-import javax.inject.Inject;
+import jakarta.inject.Inject;
 
 import static java.util.Objects.requireNonNull;