presto_sql_parser 0.1.0 → 1.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 3b904b2e685196e62a2c8cea2d83393faf90ea43463f1e05d0b1fb0639f5c4e8
-  data.tar.gz: 9a77ce1ee675aefbb0d6ac2b0f3e1e02345af3cb530baf0a9ab8766d9ff19530
+  metadata.gz: 3ab8a614effaa4824c265fa37ee3954c358a82498d7d032662d759866d33245f
+  data.tar.gz: 538d5ac4d1bd8b048a203ed1c79823eb07a94a962ab500d66931705e779c596b
 SHA512:
-  metadata.gz: 35e54bb4874f9f8bddceb1973849da51070bb7a7d384eed70c57f6af86e344ed8c796be8f322e98173389f57543a065b6f81c95e16487e98a085957ef43594bc
-  data.tar.gz: 8351a85fe1edb3a7f714f0bff32ae29d13ce25470c387c2d94169d2bf729cdc073b4c02b09c9102541d41b3d2136930d016a134eafc5bc7956926d3870920114
+  metadata.gz: 1f8dbce4a936a7bf38fa7f4f91af3238a3e3261c566f9c233dbb2bbf942ebee1d06398a33db6d66396143f87eeed2e09f8cf8e30afb561a5d76af26f0a39dccc
+  data.tar.gz: '0791debb0f6b091db3c951a47e19a57d5bf413ae22320b3ef6e705cb7e8c6442487e96b80df8a9b34d1979f5e04d346f0761fcc45d88c6c27caa45bb75fa5060'

data/ChangeLog

@@ -0,0 +1,27 @@
+
+2020-10-09 version 1.0.0:
+
+* Update Presto version from 317 to 341
+* Presto 341 supports (CREATE | REFRESH) MATERIALIZED VIEW statements
+
+2020-05-27 version 0.4.1:
+
+* Update Presto version from 316 to 317
+* Updated dependency gem versions
+
+2019-08-02 version 0.4.0:
+
+* Support process running more than idle_wait was killed unexpectedly
+
+2019-08-02 version 0.3.0:
+
+* Added support for PRESTO_SQL_PARSER_JAVA env var
+
+2019-08-02 version 0.2.0:
+
+* Fixed PrestoSqlParser.java_args to work
+
+2019-08-01 version 0.1.0:
+
+* The first release
+

data/README.md

@@ -24,6 +24,38 @@ Or install it yourself as:
 
 `java` command must be available because this PrestoSqlParser needs to use Presto's jar file.
 
+If `java` is not available, such as in a pre-built Docker container, you would install java using following script:
+
+```bash
+if [[ ! -d ~/java/jre_11.0.4_11 ]]; then
+    mkdir -p ~/java
+    curl -L "https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk-11.0.4%2B11/OpenJDK11U-jre_x64_linux_hotspot_11.0.4_11.tar.gz" | tar zx -C ~/java
+    mv ~/java/jdk-11.0.4+11-jre ~/java/jre_11.0.4_11
+fi
+echo 'export PATH=$HOME/java/jre_11.0.4_11/bin:$PATH' >> ~/.bashrc
+```
+
+On Circle CI 2.0, you can add following configuration to `steps` section:
+
+```yaml
+  - type: cache-restore
+    key: jre_11.0.4_11
+  - run:
+      name: Install java
+      command: |
+        set -xe
+        if [[ ! -d ~/java/jre_11.0.4_11 ]]; then
+          mkdir -p ~/java
+          curl -L "https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk-11.0.4%2B11/OpenJDK11U-jre_x64_linux_hotspot_11.0.4_11.tar.gz" | tar zx -C ~/java
+          mv ~/java/jdk-11.0.4+11-jre ~/java/jre_11.0.4_11
+        fi
+        echo 'export PATH=$HOME/java/jre_11.0.4_11/bin:$PATH' >> $BASH_ENV
+  - type: cache-save
+    key: jre_11.04_11
+    paths:
+      - ~/java
+```
+
 ## Usage
 
 Most typical use case is checking syntax error as following:
@@ -35,7 +67,7 @@ parser = PrestoSqlParser.new
 begin
   parser.parse("syntax error!")
 rescue PrestoSqlParser::ParseError => e
-  #puts e.message
+  puts e.message
 
   # Detailed error information is available in ParseError#errors
   e.errors.each do |error|
@@ -63,18 +95,23 @@ SQL
 
 parser = PrestoSqlParser.new(with_tokens: true)
 statements = parser.parse(sql)
+
+# First statement's tokens
 p statements[0]['tokens']
 #=> [
 #     ["select", "'SELECT'", 1, 0],
 #     [" ", "WS", 1, 6],
 #     ["1", "INTEGER_VALUE", 1, 7], [";", "DELIMITER", 1, 8]
 #   ]
+
+# Second statement's tokens
+p statements[1]['tokens']
 ```
 
 ## Options
 
 ```ruby
-PrestoSqlParser.java_cmd = "java"  # java command
+PrestoSqlParser.java_cmd = "java"  # java command (default: PRESTO_SQL_PARSER_JAVA env var or "java")
 PrestoSqlParser.java_args = []     # command-line arguments of java_cmd
 PrestoSqlParser.java_env = {}      # environment variables given to java_cmd
 ```
@@ -87,7 +124,7 @@ PrestoSqlParser.java_env = {}      # environment variables given to java_cmd
 bundle
 bundle exec rake jar    # builds jar to lib/presto_sql_parser/presto-sql-parser.jar
 bundle exec rake spec   # runs tests
-bundle ecec rake build  # builds a gem file
+bundle exec rake build  # builds a gem file
 ```
 
 ### Release
@@ -98,6 +135,6 @@ gem push pkg/presto_sql_parser-<version>.gem
 
 ### Update version and dependencies
 
-Gem version: `VERSION` at `lib/presto_sql_parser/version.rb`
-Presto version: dependency version at `build.gradle`
+* Gem version: `VERSION` at `lib/presto_sql_parser/version.rb`
+* Presto version: dependency version at `build.gradle`
 

data/build.gradle

@@ -9,7 +9,7 @@ group = 'presto-sql-parser-support-process'
 version = '1.0.0'
 
 dependencies {
-    compile 'io.prestosql:presto-parser:316'
+    compile 'io.prestosql:presto-parser:341'
     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"

data/lib/presto_sql_parser.rb

@@ -10,9 +10,15 @@ class PrestoSqlParser
 
   extend ClassMethods
 
-  self.java_cmd = "java"
+  self.java_cmd = ENV['PRESTO_SQL_PARSER_JAVA']
+  if self.java_cmd == nil || self.java_cmd.strip.empty?
+    self.java_cmd = "java"
+  end
+
   self.java_args = []
+
   self.java_env = {}
+
   self.jar_path = File.join(File.dirname(__FILE__), "presto_sql_parser/presto-sql-parser.jar")
 
   class ParseError < StandardError
@@ -34,6 +40,9 @@ class PrestoSqlParser
   end
 
   def parse(sql)
+    unless sql.is_a?(String)
+      raise ArgumentError, "SQL must be a String but got #{sql.class}"
+    end
     request_line = JSON.dump({"sql" => sql})
 
     success = false

data/lib/presto_sql_parser/support_process.rb

@@ -1,3 +1,5 @@
+require 'shellwords'
+
 class PrestoSqlParser
   class SupportProcess
     def initialize(idle_wait: 2, with_tokens:)
@@ -12,13 +14,14 @@ class PrestoSqlParser
     def start!
       return if @pipe
 
-      cmd = [
-        PrestoSqlParser.java_cmd,
-        "-jar",
-        PrestoSqlParser.jar_path,
-      ]
+      cmd = (
+        [PrestoSqlParser.java_cmd] +
+        PrestoSqlParser.java_args.map {|arg| Shellwords.escape(arg) } +
+        ["-jar", Shellwords.escape(PrestoSqlParser.jar_path)]
+      ).join(' ')
+
       if @with_tokens
-        cmd << "--with-tokens"
+        cmd << " --with-tokens"
       end
 
       @pipe = IO.popen(PrestoSqlParser.java_env, cmd, "r+", external_encoding: 'UTF-8')
@@ -38,12 +41,11 @@ class PrestoSqlParser
     end
 
     def send_line(line)
-      pipe = @mutex.synchronize do
+      @mutex.synchronize do  # block kill! during execution
         start! unless @pipe
-        @pipe
+        @pipe.puts line
+        @last_used_pid = @pipe.pid
       end
-      pipe.puts line
-      @last_used_pid = pipe.pid
       nil
     end
 

data/lib/presto_sql_parser/version.rb

@@ -1,3 +1,3 @@
 class PrestoSqlParser
-  VERSION = "0.1.0"
+  VERSION = "1.0.0"
 end

data/presto_sql_parser.gemspec

@@ -16,7 +16,7 @@ Gem::Specification.new do |gem|
   gem.executables   = `git ls-files -- bin/*`.split("\n").map{ |f| File.basename(f) }
   gem.require_paths = ["lib"]
 
-  gem.add_development_dependency "bundler", "~> 1.17"
-  gem.add_development_dependency "rake", "~> 10"
-  gem.add_development_dependency "rspec", "~> 3.4"
+  gem.add_development_dependency "bundler"
+  gem.add_development_dependency "rake", "~> 13"
+  gem.add_development_dependency "rspec", "~> 3"
 end

metadata

@@ -1,57 +1,57 @@
 --- !ruby/object:Gem::Specification
 name: presto_sql_parser
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 1.0.0
 platform: ruby
 authors:
 - Sadayuki Furuhashi
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2019-08-02 00:00:00.000000000 Z
+date: 2020-10-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '1.17'
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '1.17'
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '10'
+        version: '13'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '10'
+        version: '13'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.4'
+        version: '3'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.4'
+        version: '3'
 description: Presto SQL Parser for Ruby parses a SQL using Presto's native SQL parser
   precisely and reports error if given SQL has syntax errors. Optionally, it returns
   a ANTLR tokens sequence.
@@ -62,6 +62,7 @@ extensions: []
 extra_rdoc_files: []
 files:
 - ".gitignore"
+- ChangeLog
 - Gemfile
 - LICENSE
 - README.md
@@ -87,7 +88,7 @@ homepage: https://github.com/frsyuki/presto_sql_parser
 licenses:
 - MIT
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -103,7 +104,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubygems_version: 3.0.3
-signing_key: 
+signing_key:
 specification_version: 4
 summary: Presto SQL Parser for Ruby
 test_files: