[sql] Upgrade prestosql to trino

bin/pulsar

@@ -391,7 +391,7 @@ elif [ $COMMAND == "compact-topic" ]; then
     exec $JAVA $OPTS org.apache.pulsar.compaction.CompactorTool --broker-conf $PULSAR_BROKER_CONF $@
 elif [ $COMMAND == "sql" ]; then
     check_presto_libraries
-    exec $JAVA -cp "${PRESTO_HOME}/lib/*" io.prestosql.cli.Presto --server localhost:8081 "${@}"
+    exec $JAVA -cp "${PRESTO_HOME}/lib/*" io.trino.cli.Presto --server localhost:8081 "${@}"
 elif [ $COMMAND == "sql-worker" ]; then
     check_presto_libraries
     exec python3 ${PRESTO_HOME}/bin/launcher.py --etc-dir ${PULSAR_PRESTO_CONF} "${@}"

conf/presto/log.properties

@@ -20,4 +20,4 @@
 io.prestosql=INFO
 com.sun.jersey.guice.spi.container.GuiceComponentProviderFactory=WARN
 com.ning.http.client=WARN
-io.prestosql.server.PluginManager=DEBUG
+io.trino.server.PluginManager=DEBUG

pom.xml

@@ -169,7 +169,7 @@ flexible messaging model and an intuitive client API.</description>
     <json-smart.version>2.4.7</json-smart.version>
     <opensearch.version>1.2.4</opensearch.version>
     <elasticsearch-java.version>8.1.0</elasticsearch-java.version>
-    <presto.version>334</presto.version>
+    <trino.version>389</trino.version>
     <scala.binary.version>2.13</scala.binary.version>
     <scala-library.version>2.13.6</scala-library.version>
     <debezium.version>1.7.2.Final</debezium.version>
@@ -1635,7 +1635,7 @@ flexible messaging model and an intuitive client API.</description>
             <exclude>pulsar-client-cpp/generated/**</exclude>
             <!-- This is a text property file that contains just a class name -->
             <exclude>**/META-INF/services/com.scurrilous.circe.HashProvider</exclude>
-            <exclude>**/META-INF/services/io.prestosql.spi.Plugin</exclude>
+            <exclude>**/META-INF/services/io.trino.spi.Plugin</exclude>
 
             <!-- Django generated code -->
             <exclude>**/django/stats/migrations/*.py</exclude>

pulsar-sql/presto-distribution/pom.xml

@@ -80,9 +80,9 @@
     </dependency>
 
     <dependency>
-      <groupId>io.prestosql</groupId>
-      <artifactId>presto-server-main</artifactId>
-      <version>${presto.version}</version>
+      <groupId>io.trino</groupId>
+      <artifactId>trino-server-main</artifactId>
+      <version>${trino.version}</version>
       <exclusions>
         <!-- exclude openjdk because of GPL license -->
         <exclusion>
@@ -105,9 +105,9 @@
     </dependency>
 
     <dependency>
-      <groupId>io.prestosql</groupId>
-      <artifactId>presto-cli</artifactId>
-      <version>${presto.version}</version>
+      <groupId>io.trino</groupId>
+      <artifactId>trino-cli</artifactId>
+      <version>${trino.version}</version>
     </dependency>
 
     <dependency>

pulsar-sql/presto-distribution/src/main/resources/launcher.properties

@@ -17,5 +17,5 @@
 # under the License.
 #
 
-main-class=io.prestosql.server.PrestoServer
+main-class=io.trino.server.TrinoServer
 process-name=pulsar-presto-distribution

pulsar-sql/presto-pulsar/pom.xml

@@ -79,16 +79,16 @@
         </dependency>
 
         <dependency>
-            <groupId>io.prestosql</groupId>
-            <artifactId>presto-plugin-toolkit</artifactId>
-            <version>${presto.version}</version>
+            <groupId>io.trino</groupId>
+            <artifactId>trino-plugin-toolkit</artifactId>
+            <version>${trino.version}</version>
         </dependency>
 
         <!-- Presto SPI -->
         <dependency>
-            <groupId>io.prestosql</groupId>
-            <artifactId>presto-spi</artifactId>
-            <version>${presto.version}</version>
+            <groupId>io.trino</groupId>
+            <artifactId>trino-spi</artifactId>
+            <version>${trino.version}</version>
             <scope>provided</scope>
         </dependency>
 
@@ -99,9 +99,9 @@
         </dependency>
 
         <dependency>
-            <groupId>io.prestosql</groupId>
-            <artifactId>presto-record-decoder</artifactId>
-            <version>${presto.version}</version>
+            <groupId>io.trino</groupId>
+            <artifactId>trino-record-decoder</artifactId>
+            <version>${trino.version}</version>
         </dependency>
 
         <dependency>
@@ -118,16 +118,16 @@
         </dependency>
 
         <dependency>
-            <groupId>io.prestosql</groupId>
-            <artifactId>presto-main</artifactId>
-            <version>${presto.version}</version>
+            <groupId>io.trino</groupId>
+            <artifactId>trino-main</artifactId>
+            <version>${trino.version}</version>
             <scope>test</scope>
         </dependency>
 
         <dependency>
-            <groupId>io.prestosql</groupId>
-            <artifactId>presto-testing</artifactId>
-            <version>${presto.version}</version>
+            <groupId>io.trino</groupId>
+            <artifactId>trino-testing</artifactId>
+            <version>${trino.version}</version>
             <scope>test</scope>
         </dependency>
 

pulsar-sql/presto-pulsar/src/main/java/org/apache/pulsar/sql/presto/PulsarAuth.java

@@ -18,13 +18,13 @@
  */
 package org.apache.pulsar.sql.presto;
 
-import static io.prestosql.spi.StandardErrorCode.PERMISSION_DENIED;
-import static io.prestosql.spi.StandardErrorCode.QUERY_REJECTED;
+import static io.trino.spi.StandardErrorCode.PERMISSION_DENIED;
+import static io.trino.spi.StandardErrorCode.QUERY_REJECTED;
 import com.google.common.annotations.VisibleForTesting;
 import com.google.inject.Inject;
 import io.airlift.log.Logger;
-import io.prestosql.spi.PrestoException;
-import io.prestosql.spi.connector.ConnectorSession;
+import io.trino.spi.TrinoException;
+import io.trino.spi.connector.ConnectorSession;
 import java.io.IOException;
 import java.util.HashSet;
 import java.util.Map;
@@ -82,15 +82,15 @@ public void checkTopicAuth(ConnectorSession session, String topic) {
         }
         Map<String, String> extraCredentials = session.getIdentity().getExtraCredentials();
         if (extraCredentials.isEmpty()) { // the extraCredentials won't be null
-            throw new PrestoException(QUERY_REJECTED,
+            throw new TrinoException(QUERY_REJECTED,
                     String.format(
                             "Failed to check the authorization for topic %s: The credential information is empty.",
                             topic));
         }
         String authMethod = extraCredentials.get(CREDENTIALS_AUTH_PLUGIN);
         String authParams = extraCredentials.get(CREDENTIALS_AUTH_PARAMS);
         if (StringUtils.isEmpty(authMethod) || StringUtils.isEmpty(authParams)) {
-            throw new PrestoException(QUERY_REJECTED,
+            throw new TrinoException(QUERY_REJECTED,
                     String.format(
                             "Failed to check the authorization for topic %s: Required credential parameters are "
                                     + "missing. Please specify the auth-method and auth-params in the extra "
@@ -117,10 +117,10 @@ public void checkTopicAuth(ConnectorSession session, String topic) {
                 log.debug("Check the authorization for the topic %s successfully.", topic);
             }
         } catch (PulsarClientException.AuthenticationException | PulsarClientException.AuthorizationException e) {
-            throw new PrestoException(PERMISSION_DENIED,
+            throw new TrinoException(PERMISSION_DENIED,
                     String.format("Failed to access topic %s: %s", topic, e.getLocalizedMessage()));
         } catch (IOException e) {
-            throw new PrestoException(QUERY_REJECTED,
+            throw new TrinoException(QUERY_REJECTED,
                     String.format("Failed to check authorization for topic %s: %s", topic, e.getLocalizedMessage()));
         }
     }

pulsar-sql/presto-pulsar/src/main/java/org/apache/pulsar/sql/presto/PulsarColumnHandle.java

@@ -22,9 +22,9 @@
 import com.fasterxml.jackson.annotation.JsonCreator;
 import com.fasterxml.jackson.annotation.JsonIgnore;
 import com.fasterxml.jackson.annotation.JsonProperty;
-import io.prestosql.decoder.DecoderColumnHandle;
-import io.prestosql.spi.connector.ColumnMetadata;
-import io.prestosql.spi.type.Type;
+import io.trino.decoder.DecoderColumnHandle;
+import io.trino.spi.connector.ColumnMetadata;
+import io.trino.spi.type.Type;
 import java.util.Objects;
 
 /**
@@ -55,21 +55,21 @@ public class PulsarColumnHandle implements DecoderColumnHandle {
     private final boolean internal;
 
 
-    private HandleKeyValueType handleKeyValueType;
+    private final HandleKeyValueType handleKeyValueType;
 
     /**
      * {@link org.apache.pulsar.sql.presto.PulsarColumnMetadata.DecoderExtraInfo#mapping}.
      */
-    private String mapping;
+    private final String mapping;
     /**
      * {@link org.apache.pulsar.sql.presto.PulsarColumnMetadata.DecoderExtraInfo#dataFormat}.
      */
-    private String dataFormat;
+    private final String dataFormat;
 
     /**
      * {@link org.apache.pulsar.sql.presto.PulsarColumnMetadata.DecoderExtraInfo#formatHint}.
      */
-    private String formatHint;
+    private final String formatHint;
 
     /**
      * Column Handle keyValue type, used for keyValue schema.
@@ -108,11 +108,7 @@ public PulsarColumnHandle(
         this.mapping = mapping;
         this.dataFormat = dataFormat;
         this.formatHint = formatHint;
-        if (handleKeyValueType == null) {
-            this.handleKeyValueType = HandleKeyValueType.NONE;
-        } else {
-            this.handleKeyValueType = handleKeyValueType;
-        }
+        this.handleKeyValueType = Objects.requireNonNullElse(handleKeyValueType, HandleKeyValueType.NONE);
     }
 
     @JsonProperty

pulsar-sql/presto-pulsar/src/main/java/org/apache/pulsar/sql/presto/PulsarColumnMetadata.java

@@ -18,8 +18,8 @@
  */
 package org.apache.pulsar.sql.presto;
 
-import io.prestosql.spi.connector.ColumnMetadata;
-import io.prestosql.spi.type.Type;
+import io.trino.spi.connector.ColumnMetadata;
+import io.trino.spi.type.Type;
 import java.util.Objects;
 
 /**
@@ -128,7 +128,7 @@ public int hashCode() {
 
     /**
      * Decoder extra info for {@link org.apache.pulsar.sql.presto.PulsarColumnHandle}
-     * used by {@link io.prestosql.decoder.RowDecoder}.
+     * used by {@link io.trino.decoder.RowDecoder}.
      */
     public static class DecoderExtraInfo {
 

pulsar-sql/presto-pulsar/src/main/java/org/apache/pulsar/sql/presto/PulsarConnector.java

@@ -18,18 +18,18 @@
  */
 package org.apache.pulsar.sql.presto;
 
-import static io.prestosql.spi.transaction.IsolationLevel.READ_COMMITTED;
-import static io.prestosql.spi.transaction.IsolationLevel.checkConnectorSupports;
+import static io.trino.spi.transaction.IsolationLevel.READ_COMMITTED;
+import static io.trino.spi.transaction.IsolationLevel.checkConnectorSupports;
 import static java.util.Objects.requireNonNull;
 import io.airlift.bootstrap.LifeCycleManager;
 import io.airlift.log.Logger;
-import io.prestosql.plugin.base.classloader.ClassLoaderSafeConnectorMetadata;
-import io.prestosql.spi.connector.Connector;
-import io.prestosql.spi.connector.ConnectorMetadata;
-import io.prestosql.spi.connector.ConnectorRecordSetProvider;
-import io.prestosql.spi.connector.ConnectorSplitManager;
-import io.prestosql.spi.connector.ConnectorTransactionHandle;
-import io.prestosql.spi.transaction.IsolationLevel;
+import io.trino.plugin.base.classloader.ClassLoaderSafeConnectorMetadata;
+import io.trino.spi.connector.Connector;
+import io.trino.spi.connector.ConnectorMetadata;
+import io.trino.spi.connector.ConnectorRecordSetProvider;
+import io.trino.spi.connector.ConnectorSplitManager;
+import io.trino.spi.connector.ConnectorTransactionHandle;
+import io.trino.spi.transaction.IsolationLevel;
 import javax.inject.Inject;
 
 /**

pulsar-sql/presto-pulsar/src/main/java/org/apache/pulsar/sql/presto/PulsarConnectorFactory.java

@@ -24,10 +24,9 @@
 import io.airlift.bootstrap.Bootstrap;
 import io.airlift.json.JsonModule;
 import io.airlift.log.Logger;
-import io.prestosql.spi.connector.Connector;
-import io.prestosql.spi.connector.ConnectorContext;
-import io.prestosql.spi.connector.ConnectorFactory;
-import io.prestosql.spi.connector.ConnectorHandleResolver;
+import io.trino.spi.connector.Connector;
+import io.trino.spi.connector.ConnectorContext;
+import io.trino.spi.connector.ConnectorFactory;
 import java.util.Map;
 
 /**
@@ -42,11 +41,6 @@ public String getName() {
         return "pulsar";
     }
 
-    @Override
-    public ConnectorHandleResolver getHandleResolver() {
-        return new PulsarHandleResolver();
-    }
-
     @Override
     public Connector create(String connectorId, Map<String, String> config, ConnectorContext context) {
         requireNonNull(config, "requiredConfig is null");

pulsar-sql/presto-pulsar/src/main/java/org/apache/pulsar/sql/presto/PulsarConnectorModule.java

@@ -26,10 +26,10 @@
 import com.google.inject.Binder;
 import com.google.inject.Module;
 import com.google.inject.Scopes;
-import io.prestosql.decoder.DecoderModule;
-import io.prestosql.spi.type.Type;
-import io.prestosql.spi.type.TypeId;
-import io.prestosql.spi.type.TypeManager;
+import io.trino.decoder.DecoderModule;
+import io.trino.spi.type.Type;
+import io.trino.spi.type.TypeId;
+import io.trino.spi.type.TypeManager;
 import javax.inject.Inject;
 
 /**
@@ -70,8 +70,7 @@ public void configure(Binder binder) {
     /**
      * A wrapper to deserialize the Presto types.
      */
-    public static final class TypeDeserializer
-            extends FromStringDeserializer<Type> {
+    public static final class TypeDeserializer extends FromStringDeserializer<Type> {
         private static final long serialVersionUID = 1L;
 
         private final TypeManager typeManager;

pulsar-sql/presto-pulsar/src/main/java/org/apache/pulsar/sql/presto/PulsarDispatchingRowDecoderFactory.java

@@ -21,9 +21,9 @@
 import static java.lang.String.format;
 import com.google.inject.Inject;
 import io.airlift.log.Logger;
-import io.prestosql.decoder.DecoderColumnHandle;
-import io.prestosql.spi.connector.ColumnMetadata;
-import io.prestosql.spi.type.TypeManager;
+import io.trino.decoder.DecoderColumnHandle;
+import io.trino.spi.connector.ColumnMetadata;
+import io.trino.spi.type.TypeManager;
 import java.util.List;
 import java.util.Set;
 import org.apache.pulsar.common.naming.TopicName;

pulsar-sql/presto-pulsar/src/main/java/org/apache/pulsar/sql/presto/PulsarFieldValueProviders.java

@@ -18,7 +18,7 @@
  */
 package org.apache.pulsar.sql.presto;
 
-import io.prestosql.decoder.FieldValueProvider;
+import io.trino.decoder.FieldValueProvider;
 
 /**
  * custom FieldValueProvider for Pulsar.

pulsar-sql/presto-pulsar/src/main/java/org/apache/pulsar/sql/presto/PulsarHandleResolver.java

@@ -20,12 +20,12 @@
 
 import static com.google.common.base.Preconditions.checkArgument;
 import static java.util.Objects.requireNonNull;
-import io.prestosql.spi.connector.ColumnHandle;
-import io.prestosql.spi.connector.ConnectorHandleResolver;
-import io.prestosql.spi.connector.ConnectorSplit;
-import io.prestosql.spi.connector.ConnectorTableHandle;
-import io.prestosql.spi.connector.ConnectorTableLayoutHandle;
-import io.prestosql.spi.connector.ConnectorTransactionHandle;
+import io.trino.spi.connector.ColumnHandle;
+import io.trino.spi.connector.ConnectorHandleResolver;
+import io.trino.spi.connector.ConnectorSplit;
+import io.trino.spi.connector.ConnectorTableHandle;
+import io.trino.spi.connector.ConnectorTableLayoutHandle;
+import io.trino.spi.connector.ConnectorTransactionHandle;
 
 /**
  * This class helps to resolve classes for the Presto connector.

pulsar-sql/presto-pulsar/src/main/java/org/apache/pulsar/sql/presto/PulsarInternalColumn.java

@@ -23,11 +23,11 @@
 import static java.util.Objects.requireNonNull;
 import com.google.common.collect.ImmutableMap;
 import com.google.common.collect.ImmutableSet;
-import io.prestosql.spi.type.BigintType;
-import io.prestosql.spi.type.IntegerType;
-import io.prestosql.spi.type.TimestampType;
-import io.prestosql.spi.type.Type;
-import io.prestosql.spi.type.VarcharType;
+import io.trino.spi.type.BigintType;
+import io.trino.spi.type.IntegerType;
+import io.trino.spi.type.TimestampType;
+import io.trino.spi.type.Type;
+import io.trino.spi.type.VarcharType;
 import java.util.Map;
 import java.util.Set;
 import java.util.function.Consumer;