Use optimize option in SPARQL.parse and SPARQL::Algebra.parse to run optimizer, if specified.

Author: gkellogg

lib/sparql.rb

@@ -24,6 +24,8 @@ module SPARQL
   #
   # @param  [IO, StringIO, String, #to_s]  query
   # @param  [Hash{Symbol => Object}] options
+  # @option options [Boolean] :optimize (false)
+  #   Run query optimizer after parsing.
   # @option options [Boolean] :update (false)
   #   Parse starting with UpdateUnit production, QueryUnit otherwise.
   # @option options (see SPARQL::Grammar::Parser#initialize)
@@ -34,7 +36,9 @@ module SPARQL
   # @raise  [SPARQL::Grammar::Parser::Error] on invalid input
   def self.parse(query, **options)
     parser_class = options[:use11] ? Grammar::Parser11 : Grammar::Parser
-    parser_class.new(query, **options).parse(options[:update] ? :UpdateUnit : :QueryUnit)
+    query = parser_class.new(query, **options).parse(options[:update] ? :UpdateUnit : :QueryUnit)
+    query = query.optimize if options[:optimize]
+    query
   end
 
   ##

lib/sparql/algebra.rb

@@ -402,9 +402,13 @@ module Algebra
     #   a SPARQL S-Expression (SSE) string
     # @param  [Hash{Symbol => Object}] options
     #   any additional options (see {Operator#initialize})
+    # @option options [Boolean] :optimize (false)
+    #   Run query optimizer after parsing.
     # @return [SPARQL::Algebra::Operator]
     def parse(sse, **options)
-      Expression.parse(sse, **options)
+      query = Expression.parse(sse, **options)
+      query = query.optimize if options[:optimize]
+      query
     end
     module_function :parse
 

spec/spec_helper.rb

@@ -134,10 +134,11 @@ def sparql_query(opts)
 
   query_str = opts[:query]
   parser_opts = {
-    update: opts[:form] == :update,
-    base_uri: opts[:base_uri],
     all_vars: opts[:all_vars],
-    use11: opts[:use11]
+    base_uri: opts[:base_uri],
+    optimize: opts[:optimize],
+    update: opts[:form] == :update,
+    use11: opts[:use11],
   }
   query_opts = {logger: opts.fetch(:logger, RDF::Spec.logger)}
   query_opts[:base_uri] = opts[:base_uri]
@@ -148,7 +149,6 @@ def sparql_query(opts)
     SPARQL.parse(query_str, **parser_opts)
   end
 
-  query = query.optimize if opts[:optimize]
   repo.query(query, logger: opts.fetch(:logger, RDF::Spec.logger))
 end