trino_sql_parser 1.1.0 → 1.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 0fab1f747a3ffd1712e2047e1ae823f4a83426f0d69b297d98d5266db69fa3c0
-  data.tar.gz: 398bb435ddc860cb2164e001e424aa64cd16da0ac6fec394c9b43be66741947e
+  metadata.gz: 75acc0afee42849c2cdb319a3f2359fd0f9e6ede1c650b0f71ed210db932dc81
+  data.tar.gz: fcfa4ace779c744892acc0382b79b438241334b7df21cc3b37d76fcc499dffcf
 SHA512:
-  metadata.gz: 4816c2d9ed1d218a77f8fd8886b074aaebfc4cd839cb577458bcf39014bef8470c4aa8a6b8fd1093760b1b687f93f86020265993c9b7130450966fa8ac969902
-  data.tar.gz: e73763ede15e0be526bd1e6498fcbc46a0917d66ad33e88159381724fb4923ddc7007f0e8e13bea54373b3f2e731ff19e01565caaf17d8e21481f75c6f7ed6d6
+  metadata.gz: 3209f53ed31c2318ff5582e6e4fa77140538a9cab4ed9f1cd9b62e077ab9d23d89ad42914d5785daa4d93c66b17b7d3afd32e7770925a8777cc7d5179b8f3723
+  data.tar.gz: de651e2d7e7326af8aa024b2e5c03e8b713595318194a773f6d43d3d923241da8d445f3a542d2af316008b08370178b47f99e06176245325ce5637b417c096d8

data/ChangeLog

@@ -1,4 +1,10 @@
 
+2022-08-03 version 1.2.0:
+
+* Update Trino 351 to Trino 391
+* Add with_statement and idle_timeout options
+* TrinoSqlParser#parse is thread-safe
+
 2021-01-05 version 1.1.0:
 
 * Update Presto 341 to Trino 351.

data/README.md

@@ -79,7 +79,7 @@ rescue TrinoSqlParser::ParseError => e
 end
 ```
 
-Optionally, you can get ANTLR token list. It also supports multiple statements.
+Optionally, you can set `with_tokens: true` option to get ANTLR token list. It also supports multiple statements.
 
 ```ruby
 require 'trino_sql_parser'
@@ -114,6 +114,15 @@ p statements[1]['tokens']
 TrinoSqlParser.java_cmd = "java"  # java command (default: TRINO_SQL_PARSER_JAVA env var or "java")
 TrinoSqlParser.java_args = []     # command-line arguments of java_cmd
 TrinoSqlParser.java_env = {}      # environment variables given to java_cmd
+
+TrinoSqlParser.new(
+  with_tokens: true,    # Set true to include ANTLR token list in 'tokens' field of the result of #parse.
+  with_statement: true, # Set true to include AST in 'statement' field of the result of #parse.
+                        # Be aware that the structure might be changed when you update trino_sql_parser
+                        # version because it's not strictly defined in Trino documents.
+  idle_timeout: 2       # Number of seconds to wait until TrinoSqlParser kills a java process. Although
+                        # it restarts a java process automatically, cold start takes time. Default is 2.
+)
 ```
 
 ## Development

data/build.gradle

@@ -1,5 +1,5 @@
 plugins {
-    id 'com.github.johnrengelman.shadow' version '5.1.0'
+    id 'com.github.johnrengelman.shadow' version '7.1.2'
 }
 apply plugin: 'com.github.johnrengelman.shadow'
 apply plugin: 'java'
@@ -9,10 +9,10 @@ group = 'trino-sql-parser-support-process'
 version = '1.0.0'
 
 dependencies {
-    compile 'io.trino:trino-parser:351'
-    compile "com.fasterxml.jackson.core:jackson-databind:2.9.9"
-    compile "com.fasterxml.jackson.datatype:jackson-datatype-guava:2.9.9"
-    compile "com.fasterxml.jackson.datatype:jackson-datatype-jdk8:2.9.9"
+    implementation 'io.trino:trino-parser:391'
+    implementation "com.fasterxml.jackson.core:jackson-databind:2.9.9"
+    implementation "com.fasterxml.jackson.datatype:jackson-datatype-guava:2.9.9"
+    implementation "com.fasterxml.jackson.datatype:jackson-datatype-jdk8:2.9.9"
 }
 
 repositories {

data/gradle/wrapper/gradle-wrapper.properties

@@ -1,5 +1,5 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-5.5.1-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-7.5-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists

data/gradlew

@@ -1,78 +1,129 @@
-#!/usr/bin/env sh
+#!/bin/sh
+
+#
+# Copyright © 2015-2021 the original authors.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      https://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
 
 ##############################################################################
-##
-##  Gradle start up script for UN*X
-##
+#
+#   Gradle start up script for POSIX generated by Gradle.
+#
+#   Important for running:
+#
+#   (1) You need a POSIX-compliant shell to run this script. If your /bin/sh is
+#       noncompliant, but you have some other compliant shell such as ksh or
+#       bash, then to run this script, type that shell name before the whole
+#       command line, like:
+#
+#           ksh Gradle
+#
+#       Busybox and similar reduced shells will NOT work, because this script
+#       requires all of these POSIX shell features:
+#         * functions;
+#         * expansions «$var», «${var}», «${var:-default}», «${var+SET}»,
+#           «${var#prefix}», «${var%suffix}», and «$( cmd )»;
+#         * compound commands having a testable exit status, especially «case»;
+#         * various built-in commands including «command», «set», and «ulimit».
+#
+#   Important for patching:
+#
+#   (2) This script targets any POSIX shell, so it avoids extensions provided
+#       by Bash, Ksh, etc; in particular arrays are avoided.
+#
+#       The "traditional" practice of packing multiple parameters into a
+#       space-separated string is a well documented source of bugs and security
+#       problems, so this is (mostly) avoided, by progressively accumulating
+#       options in "$@", and eventually passing that to Java.
+#
+#       Where the inherited environment variables (DEFAULT_JVM_OPTS, JAVA_OPTS,
+#       and GRADLE_OPTS) rely on word-splitting, this is performed explicitly;
+#       see the in-line comments for details.
+#
+#       There are tweaks for specific operating systems such as AIX, CygWin,
+#       Darwin, MinGW, and NonStop.
+#
+#   (3) This script is generated from the Groovy template
+#       https://github.com/gradle/gradle/blob/master/subprojects/plugins/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt
+#       within the Gradle project.
+#
+#       You can find Gradle at https://github.com/gradle/gradle/.
+#
 ##############################################################################
 
 # Attempt to set APP_HOME
+
 # Resolve links: $0 may be a link
-PRG="$0"
-# Need this for relative symlinks.
-while [ -h "$PRG" ] ; do
-    ls=`ls -ld "$PRG"`
-    link=`expr "$ls" : '.*-> \(.*\)$'`
-    if expr "$link" : '/.*' > /dev/null; then
-        PRG="$link"
-    else
-        PRG=`dirname "$PRG"`"/$link"
-    fi
+app_path=$0
+
+# Need this for daisy-chained symlinks.
+while
+    APP_HOME=${app_path%"${app_path##*/}"}  # leaves a trailing /; empty if no leading path
+    [ -h "$app_path" ]
+do
+    ls=$( ls -ld "$app_path" )
+    link=${ls#*' -> '}
+    case $link in             #(
+      /*)   app_path=$link ;; #(
+      *)    app_path=$APP_HOME$link ;;
+    esac
 done
-SAVED="`pwd`"
-cd "`dirname \"$PRG\"`/" >/dev/null
-APP_HOME="`pwd -P`"
-cd "$SAVED" >/dev/null
+
+APP_HOME=$( cd "${APP_HOME:-./}" && pwd -P ) || exit
 
 APP_NAME="Gradle"
-APP_BASE_NAME=`basename "$0"`
+APP_BASE_NAME=${0##*/}
 
 # Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
-DEFAULT_JVM_OPTS=""
+DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"'
 
 # Use the maximum available, or set MAX_FD != -1 to use that value.
-MAX_FD="maximum"
+MAX_FD=maximum
 
 warn () {
     echo "$*"
-}
+} >&2
 
 die () {
     echo
     echo "$*"
     echo
     exit 1
-}
+} >&2
 
 # OS specific support (must be 'true' or 'false').
 cygwin=false
 msys=false
 darwin=false
 nonstop=false
-case "`uname`" in
-  CYGWIN* )
-    cygwin=true
-    ;;
-  Darwin* )
-    darwin=true
-    ;;
-  MINGW* )
-    msys=true
-    ;;
-  NONSTOP* )
-    nonstop=true
-    ;;
+case "$( uname )" in                #(
+  CYGWIN* )         cygwin=true  ;; #(
+  Darwin* )         darwin=true  ;; #(
+  MSYS* | MINGW* )  msys=true    ;; #(
+  NONSTOP* )        nonstop=true ;;
 esac
 
 CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar
 
+
 # Determine the Java command to use to start the JVM.
 if [ -n "$JAVA_HOME" ] ; then
     if [ -x "$JAVA_HOME/jre/sh/java" ] ; then
         # IBM's JDK on AIX uses strange locations for the executables
-        JAVACMD="$JAVA_HOME/jre/sh/java"
+        JAVACMD=$JAVA_HOME/jre/sh/java
     else
-        JAVACMD="$JAVA_HOME/bin/java"
+        JAVACMD=$JAVA_HOME/bin/java
     fi
     if [ ! -x "$JAVACMD" ] ; then
         die "ERROR: JAVA_HOME is set to an invalid directory: $JAVA_HOME
@@ -81,7 +132,7 @@ Please set the JAVA_HOME variable in your environment to match the
 location of your Java installation."
     fi
 else
-    JAVACMD="java"
+    JAVACMD=java
     which java >/dev/null 2>&1 || die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
 
 Please set the JAVA_HOME variable in your environment to match the
@@ -89,84 +140,101 @@ location of your Java installation."
 fi
 
 # Increase the maximum file descriptors if we can.
-if [ "$cygwin" = "false" -a "$darwin" = "false" -a "$nonstop" = "false" ] ; then
-    MAX_FD_LIMIT=`ulimit -H -n`
-    if [ $? -eq 0 ] ; then
-        if [ "$MAX_FD" = "maximum" -o "$MAX_FD" = "max" ] ; then
-            MAX_FD="$MAX_FD_LIMIT"
-        fi
-        ulimit -n $MAX_FD
-        if [ $? -ne 0 ] ; then
-            warn "Could not set maximum file descriptor limit: $MAX_FD"
-        fi
-    else
-        warn "Could not query maximum file descriptor limit: $MAX_FD_LIMIT"
-    fi
+if ! "$cygwin" && ! "$darwin" && ! "$nonstop" ; then
+    case $MAX_FD in #(
+      max*)
+        MAX_FD=$( ulimit -H -n ) ||
+            warn "Could not query maximum file descriptor limit"
+    esac
+    case $MAX_FD in  #(
+      '' | soft) :;; #(
+      *)
+        ulimit -n "$MAX_FD" ||
+            warn "Could not set maximum file descriptor limit to $MAX_FD"
+    esac
 fi
 
-# For Darwin, add options to specify how the application appears in the dock
-if $darwin; then
-    GRADLE_OPTS="$GRADLE_OPTS \"-Xdock:name=$APP_NAME\" \"-Xdock:icon=$APP_HOME/media/gradle.icns\""
-fi
+# Collect all arguments for the java command, stacking in reverse order:
+#   * args from the command line
+#   * the main class name
+#   * -classpath
+#   * -D...appname settings
+#   * --module-path (only if needed)
+#   * DEFAULT_JVM_OPTS, JAVA_OPTS, and GRADLE_OPTS environment variables.
+
+# For Cygwin or MSYS, switch paths to Windows format before running java
+if "$cygwin" || "$msys" ; then
+    APP_HOME=$( cygpath --path --mixed "$APP_HOME" )
+    CLASSPATH=$( cygpath --path --mixed "$CLASSPATH" )
+
+    JAVACMD=$( cygpath --unix "$JAVACMD" )
 
-# For Cygwin, switch paths to Windows format before running java
-if $cygwin ; then
-    APP_HOME=`cygpath --path --mixed "$APP_HOME"`
-    CLASSPATH=`cygpath --path --mixed "$CLASSPATH"`
-    JAVACMD=`cygpath --unix "$JAVACMD"`
-
-    # We build the pattern for arguments to be converted via cygpath
-    ROOTDIRSRAW=`find -L / -maxdepth 1 -mindepth 1 -type d 2>/dev/null`
-    SEP=""
-    for dir in $ROOTDIRSRAW ; do
-        ROOTDIRS="$ROOTDIRS$SEP$dir"
-        SEP="|"
-    done
-    OURCYGPATTERN="(^($ROOTDIRS))"
-    # Add a user-defined pattern to the cygpath arguments
-    if [ "$GRADLE_CYGPATTERN" != "" ] ; then
-        OURCYGPATTERN="$OURCYGPATTERN|($GRADLE_CYGPATTERN)"
-    fi
     # Now convert the arguments - kludge to limit ourselves to /bin/sh
-    i=0
-    for arg in "$@" ; do
-        CHECK=`echo "$arg"|egrep -c "$OURCYGPATTERN" -`
-        CHECK2=`echo "$arg"|egrep -c "^-"`                                 ### Determine if an option
-
-        if [ $CHECK -ne 0 ] && [ $CHECK2 -eq 0 ] ; then                    ### Added a condition
-            eval `echo args$i`=`cygpath --path --ignore --mixed "$arg"`
-        else
-            eval `echo args$i`="\"$arg\""
+    for arg do
+        if
+            case $arg in                                #(
+              -*)   false ;;                            # don't mess with options #(
+              /?*)  t=${arg#/} t=/${t%%/*}              # looks like a POSIX filepath
+                    [ -e "$t" ] ;;                      #(
+              *)    false ;;
+            esac
+        then
+            arg=$( cygpath --path --ignore --mixed "$arg" )
         fi
-        i=$((i+1))
+        # Roll the args list around exactly as many times as the number of
+        # args, so each arg winds up back in the position where it started, but
+        # possibly modified.
+        #
+        # NB: a `for` loop captures its iteration list before it begins, so
+        # changing the positional parameters here affects neither the number of
+        # iterations, nor the values presented in `arg`.
+        shift                   # remove old arg
+        set -- "$@" "$arg"      # push replacement arg
     done
-    case $i in
-        (0) set -- ;;
-        (1) set -- "$args0" ;;
-        (2) set -- "$args0" "$args1" ;;
-        (3) set -- "$args0" "$args1" "$args2" ;;
-        (4) set -- "$args0" "$args1" "$args2" "$args3" ;;
-        (5) set -- "$args0" "$args1" "$args2" "$args3" "$args4" ;;
-        (6) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" ;;
-        (7) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" ;;
-        (8) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" ;;
-        (9) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" "$args8" ;;
-    esac
 fi
 
-# Escape application args
-save () {
-    for i do printf %s\\n "$i" | sed "s/'/'\\\\''/g;1s/^/'/;\$s/\$/' \\\\/" ; done
-    echo " "
-}
-APP_ARGS=$(save "$@")
-
-# Collect all arguments for the java command, following the shell quoting and substitution rules
-eval set -- $DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS "\"-Dorg.gradle.appname=$APP_BASE_NAME\"" -classpath "\"$CLASSPATH\"" org.gradle.wrapper.GradleWrapperMain "$APP_ARGS"
-
-# by default we should be in the correct project dir, but when run from Finder on Mac, the cwd is wrong
-if [ "$(uname)" = "Darwin" ] && [ "$HOME" = "$PWD" ]; then
-  cd "$(dirname "$0")"
+# Collect all arguments for the java command;
+#   * $DEFAULT_JVM_OPTS, $JAVA_OPTS, and $GRADLE_OPTS can contain fragments of
+#     shell script including quotes and variable substitutions, so put them in
+#     double quotes to make sure that they get re-expanded; and
+#   * put everything else in single quotes, so that it's not re-expanded.
+
+set -- \
+        "-Dorg.gradle.appname=$APP_BASE_NAME" \
+        -classpath "$CLASSPATH" \
+        org.gradle.wrapper.GradleWrapperMain \
+        "$@"
+
+# Stop when "xargs" is not available.
+if ! command -v xargs >/dev/null 2>&1
+then
+    die "xargs is not available"
 fi
 
+# Use "xargs" to parse quoted args.
+#
+# With -n1 it outputs one arg per line, with the quotes and backslashes removed.
+#
+# In Bash we could simply go:
+#
+#   readarray ARGS < <( xargs -n1 <<<"$var" ) &&
+#   set -- "${ARGS[@]}" "$@"
+#
+# but POSIX shell has neither arrays nor command substitution, so instead we
+# post-process each arg (as a line of input to sed) to backslash-escape any
+# character that might be a shell metacharacter, then use eval to reverse
+# that process (while maintaining the separation between arguments), and wrap
+# the whole thing up as a single "set" statement.
+#
+# This will of course break if any of these variables contains a newline or
+# an unmatched quote.
+#
+
+eval "set -- $(
+        printf '%s\n' "$DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS" |
+        xargs -n1 |
+        sed ' s~[^-[:alnum:]+,./:=@_]~\\&~g; ' |
+        tr '\n' ' '
+    )" '"$@"'
+
 exec "$JAVACMD" "$@"

data/gradlew.bat

@@ -1,4 +1,20 @@
-@if "%DEBUG%" == "" @echo off
+@rem
+@rem Copyright 2015 the original author or authors.
+@rem
+@rem Licensed under the Apache License, Version 2.0 (the "License");
+@rem you may not use this file except in compliance with the License.
+@rem You may obtain a copy of the License at
+@rem
+@rem      https://www.apache.org/licenses/LICENSE-2.0
+@rem
+@rem Unless required by applicable law or agreed to in writing, software
+@rem distributed under the License is distributed on an "AS IS" BASIS,
+@rem WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+@rem See the License for the specific language governing permissions and
+@rem limitations under the License.
+@rem
+
+@if "%DEBUG%"=="" @echo off
 @rem ##########################################################################
 @rem
 @rem  Gradle startup script for Windows
@@ -9,19 +25,22 @@
 if "%OS%"=="Windows_NT" setlocal
 
 set DIRNAME=%~dp0
-if "%DIRNAME%" == "" set DIRNAME=.
+if "%DIRNAME%"=="" set DIRNAME=.
 set APP_BASE_NAME=%~n0
 set APP_HOME=%DIRNAME%
 
+@rem Resolve any "." and ".." in APP_HOME to make it shorter.
+for %%i in ("%APP_HOME%") do set APP_HOME=%%~fi
+
 @rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
-set DEFAULT_JVM_OPTS=
+set DEFAULT_JVM_OPTS="-Xmx64m" "-Xms64m"
 
 @rem Find java.exe
 if defined JAVA_HOME goto findJavaFromJavaHome
 
 set JAVA_EXE=java.exe
 %JAVA_EXE% -version >NUL 2>&1
-if "%ERRORLEVEL%" == "0" goto init
+if %ERRORLEVEL% equ 0 goto execute
 
 echo.
 echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
@@ -35,7 +54,7 @@ goto fail
 set JAVA_HOME=%JAVA_HOME:"=%
 set JAVA_EXE=%JAVA_HOME%/bin/java.exe
 
-if exist "%JAVA_EXE%" goto init
+if exist "%JAVA_EXE%" goto execute
 
 echo.
 echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME%
@@ -45,38 +64,26 @@ echo location of your Java installation.
 
 goto fail
 
-:init
-@rem Get command-line arguments, handling Windows variants
-
-if not "%OS%" == "Windows_NT" goto win9xME_args
-
-:win9xME_args
-@rem Slurp the command line arguments.
-set CMD_LINE_ARGS=
-set _SKIP=2
-
-:win9xME_args_slurp
-if "x%~1" == "x" goto execute
-
-set CMD_LINE_ARGS=%*
-
 :execute
 @rem Setup the command line
 
 set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar
 
+
 @rem Execute Gradle
-"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %CMD_LINE_ARGS%
+"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %*
 
 :end
 @rem End local scope for the variables with windows NT shell
-if "%ERRORLEVEL%"=="0" goto mainEnd
+if %ERRORLEVEL% equ 0 goto mainEnd
 
 :fail
 rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of
 rem the _cmd.exe /c_ return code!
-if  not "" == "%GRADLE_EXIT_CONSOLE%" exit 1
-exit /b 1
+set EXIT_CODE=%ERRORLEVEL%
+if %EXIT_CODE% equ 0 set EXIT_CODE=1
+if not ""=="%GRADLE_EXIT_CONSOLE%" exit %EXIT_CODE%
+exit /b %EXIT_CODE%
 
 :mainEnd
 if "%OS%"=="Windows_NT" endlocal

data/lib/trino_sql_parser/support_process.rb

@@ -2,9 +2,10 @@ require 'shellwords'
 
 class TrinoSqlParser
   class SupportProcess
-    def initialize(idle_wait: 2, with_tokens:)
-      @idle_wait = idle_wait
+    def initialize(idle_timeout:, with_tokens:, with_statement:)
+      @idle_timeout = idle_timeout
       @with_tokens = with_tokens
+      @with_statement = with_statement
       @mutex = Mutex.new
       @last_used_pid = nil
       @pipe = nil
@@ -23,6 +24,9 @@ class TrinoSqlParser
       if @with_tokens
         cmd << " --with-tokens"
       end
+      if @with_statement
+        cmd << " --with-statement"
+      end
 
       @pipe = IO.popen(TrinoSqlParser.java_env, cmd, "r+", external_encoding: 'UTF-8')
       @pid = @pipe.pid
@@ -40,17 +44,13 @@ class TrinoSqlParser
       end
     end
 
-    def send_line(line)
+    def send_and_receive_line(line)
       @mutex.synchronize do  # block kill! during execution
         start! unless @pipe
         @pipe.puts line
         @last_used_pid = @pipe.pid
+        @pipe.gets
       end
-      nil
-    end
-
-    def receive_line
-      @pipe.gets
     end
 
     private
@@ -60,7 +60,7 @@ class TrinoSqlParser
         done = Process.waitpid2(pid, Process::WNOHANG) rescue true
         break if done
 
-        sleep @idle_wait
+        sleep @idle_timeout
         if @last_used_pid != pid
           kill! rescue nil
         end

data/lib/trino_sql_parser/version.rb

@@ -1,3 +1,3 @@
 class TrinoSqlParser
-  VERSION = "1.1.0"
+  VERSION = "1.2.0"
 end

data/lib/trino_sql_parser.rb

@@ -35,8 +35,8 @@ class TrinoSqlParser
 
   require 'trino_sql_parser/support_process'
 
-  def initialize(with_tokens: false)
-    @support_process = SupportProcess.new(with_tokens: with_tokens)
+  def initialize(idle_timeout: 2, with_tokens: false, with_statement: false)
+    @support_process = SupportProcess.new(idle_timeout: idle_timeout, with_tokens: with_tokens, with_statement: with_statement)
   end
 
   def parse(sql)
@@ -47,8 +47,7 @@ class TrinoSqlParser
 
     success = false
     begin
-      @support_process.send_line(request_line)
-      response_line = @support_process.receive_line
+      response_line = @support_process.send_and_receive_line(request_line)
       raise "Process crashed" unless response_line
       response = JSON.parse(response_line)
       statements = response['statements']

data/spec/trino_sql_parser_spec.rb

@@ -6,7 +6,7 @@ RSpec.describe TrinoSqlParser do
   end
 
   it "raises ParseError::ParseError" do
-    expect(lambda { parser.parse("...") }).to raise_error(TrinoSqlParser::ParseError)
+    expect { parser.parse("...") }.to raise_error(TrinoSqlParser::ParseError)
   end
 
   describe TrinoSqlParser::ParseError do
@@ -30,11 +30,37 @@ RSpec.describe TrinoSqlParser do
     end
 
     it "returns token list" do
-      statements = parser.parse("select 1; select * from t")
+      statements = parser.parse("select 1; select func(time, '%S%S'), * from t")
       text, type, line, column = *statements[0]['tokens'].first
       expect(text).to eq("select")
       expect(line).to eq(1)
       expect(column).to eq(0)
+      expect(statements[0].has_key?('statements')).to eq(false)
+    end
+  end
+
+  context "with_statement" do
+    let(:parser) do
+      TrinoSqlParser.new(with_statement: true)
+    end
+
+    it "returns token list" do
+      statements = parser.parse("select 1; select func(time, '%Y%m%d') as f, * from t")
+
+      select_items = statements[1]['statement']['children'][0]['children'][0]['selectItems']
+
+      select_item_classes = select_items.map {|n| n['class'] }
+      expect(select_item_classes).to eq(['SingleColumn', 'AllColumns'])
+
+      func_alias = select_items[0]['alias']['value']
+      expect(func_alias).to eq('f')
+
+      func_arg_classes = select_items[0]['expression']['arguments'].map {|n| n['class'] }
+      func_arg_values = select_items[0]['expression']['arguments'].map {|n| n['value'] }
+      expect(func_arg_classes).to eq(['Identifier', 'StringLiteral'])
+      expect(func_arg_values).to eq(['time', '%Y%m%d'])
+
+      expect(statements[0].has_key?('tokens')).to eq(false)
     end
   end
 end

data/src/main/java/JsonStatement.java

@@ -1,5 +1,6 @@
 
 import com.fasterxml.jackson.annotation.JsonFormat;
+import com.fasterxml.jackson.annotation.JsonInclude;
 import com.fasterxml.jackson.annotation.JsonProperty;
 import com.fasterxml.jackson.annotation.JsonPropertyOrder;
 import io.trino.sql.parser.StatementSplitterWithOffsetRetained.Fragment;
@@ -40,17 +41,24 @@ public class JsonStatement
     private final int line;
     private final int column;
     private final List<JsonToken> tokens;
+    private final Statement statement;
 
-    public JsonStatement(Fragment fragment, Statement statement, boolean withTokens)
+    public JsonStatement(Fragment fragment, Statement statement, boolean withTokens, boolean withStatement)
     {
-        this.line= fragment.getLineOffset() + 1;
-        this.column= fragment.getFirstLineColumnOffset();
+        this.line = fragment.getLineOffset() + 1;
+        this.column = fragment.getFirstLineColumnOffset();
         if (withTokens) {
             this.tokens = fragment.getTokens().stream().map(JsonToken::new).collect(toImmutableList());
         }
         else {
             this.tokens = null;
         }
+        if (withStatement) {
+            this.statement = statement;
+        }
+        else {
+            this.statement = null;
+        }
     }
 
     @JsonProperty
@@ -60,5 +68,10 @@ public class JsonStatement
     public int getColumn() { return column; }
 
     @JsonProperty
+    @JsonInclude(JsonInclude.Include.NON_NULL)
+    public Statement getStatement() { return statement; }
+
+    @JsonProperty
+    @JsonInclude(JsonInclude.Include.NON_NULL)
     public List<JsonToken> getTokens() { return tokens; }
 }

data/src/main/java/TrinoSqlParserSupportProcess.java

@@ -1,4 +1,6 @@
 
+import com.fasterxml.jackson.annotation.JsonTypeInfo;
+import com.fasterxml.jackson.databind.JavaType;
 import com.fasterxml.jackson.databind.ObjectMapper;
 import com.fasterxml.jackson.datatype.guava.GuavaModule;
 import com.fasterxml.jackson.datatype.jdk8.Jdk8Module;
@@ -22,12 +24,16 @@ public class TrinoSqlParserSupportProcess
     public static void main(String[] args) throws Exception
     {
         boolean withTokens = false;
+        boolean withStatement = false;
 
         for (String arg : args) {
             switch (arg) {
             case "--with-tokens":
                 withTokens = true;
                 break;
+            case "--with-statement":
+                withStatement = true;
+                break;
             default:
                 System.err.println("Unknown argument: " + arg);
                 System.exit(1);
@@ -37,6 +43,7 @@ public class TrinoSqlParserSupportProcess
         ObjectMapper mapper = new ObjectMapper();
         mapper.registerModule(new GuavaModule());
         mapper.registerModule(new Jdk8Module());
+        mapper.setDefaultTyping(new TrinoTreeNodeTypeResolver());
 
         BufferedReader in = new BufferedReader(new InputStreamReader(System.in, UTF_8));
         while (true) {
@@ -46,13 +53,13 @@ public class TrinoSqlParserSupportProcess
             }
 
             JsonRequest request = mapper.readValue(line, JsonRequest.class);
-            JsonResult result = parse(request.getSql(), withTokens);
+            JsonResult result = parse(request.getSql(), withTokens, withStatement);
             System.out.println(mapper.writeValueAsString(result));
         }
     }
 
     public static JsonResult parse(String sql,
-            boolean withTokens)
+            boolean withTokens, boolean withStatement)
     {
         ImmutableList.Builder<JsonStatement> statements = ImmutableList.builder();
         ImmutableList.Builder<JsonErrorReport> errors = ImmutableList.builder();
@@ -66,7 +73,7 @@ public class TrinoSqlParserSupportProcess
                 Statement statement = parser.createStatement(
                         fragment.getStatement(),
                         new ParsingOptions(DecimalLiteralTreatment.AS_DOUBLE));
-                statements.add(new JsonStatement(fragment, statement, withTokens));
+                statements.add(new JsonStatement(fragment, statement, withTokens, withStatement));
             }
             catch (ParsingException ex) {
                 errors.add(
@@ -79,4 +86,24 @@ public class TrinoSqlParserSupportProcess
 
         return new JsonResult(statements.build(), errors.build());
     }
+
+    // Use this type resolver to include class name as "class" field. The field
+    // name of "class" is safe because no node classes of io.trino.sql.tree.*
+    // define getClass() method.
+    private static class TrinoTreeNodeTypeResolver
+            extends ObjectMapper.DefaultTypeResolverBuilder
+    {
+        public TrinoTreeNodeTypeResolver() {
+            super(ObjectMapper.DefaultTyping.NON_FINAL);
+            init(JsonTypeInfo.Id.NAME, null);
+            inclusion(JsonTypeInfo.As.PROPERTY);
+            typeProperty("class");
+        }
+
+        @Override
+        public boolean useForType(JavaType t)
+        {
+            return t.getRawClass().getName().startsWith("io.trino.sql.tree");
+        }
+    }
 }

data/src/main/java/io/trino/sql/parser/StatementSplitterWithOffsetRetained.java

@@ -9,8 +9,8 @@ import java.util.List;
 import java.util.Set;
 import java.util.stream.Collectors;
 import java.util.stream.Stream;
-import org.antlr.v4.runtime.ANTLRInputStream;
 import org.antlr.v4.runtime.CharStream;
+import org.antlr.v4.runtime.CharStreams;
 import org.antlr.v4.runtime.Token;
 import org.antlr.v4.runtime.TokenSource;
 import org.antlr.v4.runtime.Vocabulary;
@@ -106,9 +106,9 @@ public class StatementSplitterWithOffsetRetained
         }
     }
 
-    private static TokenSource getLexer(String sql, Set<String> terminators)
+    public static TokenSource getLexer(String sql, Set<String> terminators)
     {
-        CharStream stream = new CaseInsensitiveStream(new ANTLRInputStream(sql));
+        CharStream stream = new CaseInsensitiveStream(CharStreams.fromString(sql));
         return new DelimiterLexer(stream, terminators);
     }
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: trino_sql_parser
 version: !ruby/object:Gem::Version
-  version: 1.1.0
+  version: 1.2.0
 platform: ruby
 authors:
 - Sadayuki Furuhashi
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-01-05 00:00:00.000000000 Z
+date: 2022-08-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -104,7 +104,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.3
+rubygems_version: 3.3.7
 signing_key:
 specification_version: 4
 summary: Trino SQL Parser for Ruby