Skip to content

Commit

Permalink
Update to Trino
Browse files Browse the repository at this point in the history
  • Loading branch information
@kokosing
kokosing committed Mar 7, 2021
1 parent 9fa21e6 commit d2f6e10
Show file tree
Hide file tree
Showing 7 changed files with 22 additions and 3,755 deletions.
63 changes: 13 additions & 50 deletions pom.xml
View file
Expand Up @@ -5,17 +5,17 @@
<parent>
<groupId>io.airlift</groupId>
<artifactId>airbase</artifactId>
<version>59</version>
<version>106</version>
</parent>

<groupId>rocks.prestodb</groupId>
<artifactId>presto-query-formatter</artifactId>
<groupId>rocks.trino</groupId>
<artifactId>trino-query-formatter</artifactId>
<version>0.3-SNAPSHOT</version>
<packaging>jar</packaging>

<name>presto-query-formatter</name>
<description>Presto query formatter</description>
<url>https://github.com/prestodb-rocks/presto-query-formatter</url>
<name>trino-query-formatter</name>
<description>Trino query formatter</description>
<url>https://github.com/kokosing/trino-query-formatter</url>

<inceptionYear>2016</inceptionYear>

Expand All @@ -27,21 +27,6 @@
</license>
</licenses>

<developers>
<developer>
<name>Grzegorz Kokosinski</name>
<email>kokosing@prestodb.rocks</email>
<organization>prestodb.rocks</organization>
<organizationUrl>http://prestodb.rocks</organizationUrl>
</developer>
</developers>

<scm>
<connection>scm:git:git://github.com/prestodb-rocks/presto-query-formatter.git</connection>
<url>https://github.com/facebook/presto</url>
<tag>HEAD</tag>
</scm>

<properties>
<air.main.basedir>${project.basedir}</air.main.basedir>

Expand All @@ -53,24 +38,24 @@

<air.java.version>1.8.0-60</air.java.version>
<air.maven.version>3.3.9</air.maven.version>
<dep.slice.version>0.29</dep.slice.version>
<dep.slice.version>0.39</dep.slice.version>

<cli.skip-execute>true</cli.skip-execute>
<cli.main-class>None</cli.main-class>

<presto.version>0.177</presto.version>
<trino.version>353</trino.version>
</properties>

<dependencies>
<dependency>
<groupId>com.facebook.presto</groupId>
<artifactId>presto-parser</artifactId>
<version>${presto.version}</version>
<groupId>io.trino</groupId>
<artifactId>trino-parser</artifactId>
<version>${trino.version}</version>
</dependency>
<dependency>
<groupId>com.google.guava</groupId>
<artifactId>guava</artifactId>
<version>21.0</version>
<version>30.1-jre</version>
</dependency>
<dependency>
<groupId>junit</groupId>
Expand All @@ -96,7 +81,7 @@
<transformers>
<transformer implementation="org.apache.maven.plugins.shade.resource.ManifestResourceTransformer">
<manifestEntries>
<Main-Class>rocks.prestodb.query.formatter.Main</Main-Class>
<Main-Class>rocks.trino.query.formatter.Main</Main-Class>
</manifestEntries>
</transformer>
</transformers>
Expand Down Expand Up @@ -135,17 +120,6 @@
</plugins>
</build>

<distributionManagement>
<snapshotRepository>
<id>ossrh-prestodb-rocks</id>
<url>https://oss.sonatype.org/content/repositories/snapshots</url>
</snapshotRepository>
<repository>
<id>ossrh-prestodb-rocks</id>
<url>https://oss.sonatype.org/service/local/staging/deploy/maven2/</url>
</repository>
</distributionManagement>

<profiles>
<profile>
<id>release</id>
Expand Down Expand Up @@ -191,17 +165,6 @@
</execution>
</executions>
</plugin>
<plugin>
<groupId>org.sonatype.plugins</groupId>
<artifactId>nexus-staging-maven-plugin</artifactId>
<version>1.6.7</version>
<extensions>true</extensions>
<configuration>
<serverId>ossrh-prestodb-rocks</serverId>
<nexusUrl>https://oss.sonatype.org/</nexusUrl>
<autoReleaseAfterClose>true</autoReleaseAfterClose>
</configuration>
</plugin>
</plugins>
</build>
</profile>
Expand Down
76 changes: 0 additions & 76 deletions src/main/java/com/facebook/presto/sql/tree/StackableAstVisitorRocks.java
View file

This file was deleted.

16 changes: 9 additions & 7 deletions .../rocks/prestodb/query/formatter/Main.java → .../kokosing/trino/query/formatter/Main.java
View file
Expand Up @@ -11,19 +11,20 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package rocks.prestodb.query.formatter;
package kokosing.trino.query.formatter;

import com.facebook.presto.sql.parser.SqlParser;
import com.facebook.presto.sql.parser.StatementSplitter;
import com.facebook.presto.sql.tree.Statement;
import com.google.common.collect.ImmutableSet;
import io.trino.sql.parser.ParsingOptions;
import io.trino.sql.parser.SqlParser;
import io.trino.sql.parser.StatementSplitter;
import io.trino.sql.tree.Statement;

import java.io.BufferedReader;
import java.io.IOException;
import java.io.InputStreamReader;

import static com.google.common.base.Preconditions.checkState;
import static rocks.prestodb.query.formatter.StatementFormatter.formatSql;
import static io.trino.sql.SqlFormatter.formatSql;

public class Main
{
Expand Down Expand Up @@ -58,9 +59,10 @@ public static void main(String[] args)

private static void format(String sql)
{
Statement statement = SQL_PARSER.createStatement(sql);
ParsingOptions parsingOptions = new ParsingOptions();
Statement statement = SQL_PARSER.createStatement(sql, parsingOptions);
String formattedSql = formatSql(statement);
checkState(statement.equals(SQL_PARSER.createStatement(formattedSql)), "Formatted SQL is different than original");
checkState(statement.equals(SQL_PARSER.createStatement(formattedSql, parsingOptions)), "Formatted SQL is different than original");
System.out.println(formattedSql + ";");
}
}

0 comments on commit d2f6e10

Please sign in to comment.