sparkql 0.1.8 → 0.3.2

data/lib/sparkql/parser.rb

@@ -16,108 +16,132 @@ module Sparkql
 ##### State transition tables begin ###
 
 racc_action_table = [
-    35,     4,    31,     5,     6,    14,    15,    16,    18,    19,
-    21,    23,    26,    32,    14,    15,    16,    18,    19,    21,
-    23,    14,    15,    16,    18,    19,    21,    23,    39,    13,
-    12,     4,    40,     5,     6,     4,    10,     5,     6,    13,
-    29,    28,    14,    15,    16 ]
+    49,    14,    13,    45,    43,    29,    30,    31,    32,    33,
+    34,    35,    27,    46,    29,    30,    31,    32,    33,    34,
+    35,    27,    19,    38,    39,    12,    40,    41,    29,    30,
+    31,    32,    33,    34,    35,    27,   -26,    38,    39,    55,
+    40,    41,     8,    56,     9,    44,    10,    11,     8,   nil,
+     9,   nil,    10,    11,    27,   nil,    29,    30,    31,     9,
+   nil,    10,    11,     9,   nil,    10,    11,     9,   nil,    10,
+    11,    14,    13,    15,    16 ]
 
 racc_action_check = [
-    32,    13,    22,    13,    13,    32,    32,    32,    32,    32,
-    32,    32,    10,    25,    10,    10,    10,    10,    10,    10,
-    10,    40,    40,    40,    40,    40,    40,    40,    36,     8,
-     7,     4,    36,     4,     4,     0,     2,     0,     0,    11,
-    12,    11,    31,    31,    31 ]
+    45,    18,    18,    26,    18,    45,    45,    45,    45,    45,
+    45,    45,    15,    37,    15,    15,    15,    15,    15,    15,
+    15,    46,    12,    46,    46,     1,    46,    46,    56,    56,
+    56,    56,    56,    56,    56,    16,    24,    16,    16,    50,
+    16,    16,     9,    50,     9,    25,     9,     9,     0,   nil,
+     0,   nil,     0,     0,    44,   nil,    44,    44,    44,    13,
+   nil,    13,    13,     8,   nil,     8,     8,    14,   nil,    14,
+    14,     2,     2,     6,     6 ]
 
 racc_action_pointer = [
-    30,   nil,    33,   nil,    26,   nil,   nil,    30,    25,   nil,
-     3,    35,    40,    -4,   nil,   nil,   nil,   nil,   nil,   nil,
-   nil,   nil,    -8,   nil,   nil,     8,   nil,   nil,   nil,   nil,
-   nil,    31,    -6,   nil,   nil,   nil,    22,   nil,   nil,   nil,
-    10,   nil ]
+    43,    25,    66,   nil,   nil,   nil,    70,   nil,    56,    37,
+   nil,   nil,    22,    52,    60,     1,    24,   nil,    -4,   nil,
+   nil,   nil,   nil,   nil,    24,    33,    -4,   nil,   nil,   nil,
+   nil,   nil,   nil,   nil,   nil,   nil,   nil,     1,   nil,   nil,
+   nil,   nil,   nil,   nil,    43,    -8,    10,   nil,   nil,   nil,
+    31,   nil,   nil,   nil,   nil,   nil,    15,   nil ]
 
 racc_action_default = [
-    -2,    -4,   -30,    -6,   -30,    -9,   -10,   -30,    -1,    -3,
-   -30,   -30,   -30,   -30,   -23,   -24,   -25,    -5,   -26,   -27,
-   -11,   -28,   -12,   -29,   -13,   -30,   -16,   -21,    -8,    42,
-    -7,   -30,   -30,   -22,   -19,   -14,   -30,   -17,   -20,   -15,
-   -30,   -18 ]
+    -2,   -42,    -1,    -3,    -4,    -5,   -42,    -8,   -42,   -42,
+   -13,   -14,   -42,   -42,   -42,   -42,   -42,    -9,   -42,    58,
+   -10,   -11,    -6,   -15,   -16,   -17,   -42,   -20,   -25,   -30,
+   -31,   -32,   -33,   -34,   -35,   -36,    -7,   -42,   -37,   -38,
+   -39,   -40,   -41,   -12,   -42,   -42,   -42,   -27,   -28,   -18,
+   -42,   -21,   -23,   -24,   -29,   -19,   -42,   -22 ]
 
 racc_goto_table = [
-    27,    37,     8,    22,    20,    17,    11,    24,    25,    41,
-    36,    30,     7,   nil,   nil,   nil,   nil,   nil,   nil,   nil,
-   nil,    33 ]
+    37,    51,    28,    24,     2,    17,    25,    22,    50,    23,
+    20,    21,    57,    18,    36,     1,   nil,   nil,   nil,   nil,
+   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,
+    54,    47,    48 ]
 
 racc_goto_check = [
-    14,    13,     2,     9,     8,     6,     2,    10,    11,    13,
-    12,     3,     1,   nil,   nil,   nil,   nil,   nil,   nil,   nil,
-   nil,    14 ]
+    17,    15,    16,    11,     2,     3,    12,     7,    14,    10,
+     3,     3,    15,     2,     8,     1,   nil,   nil,   nil,   nil,
+   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,
+    17,    16,    11 ]
 
 racc_goto_pointer = [
-   nil,    12,     2,    -2,   nil,   nil,    -5,   nil,    -6,    -7,
-    -3,    -2,   -22,   -31,   -10 ]
+   nil,    15,     4,    -3,   nil,   nil,   nil,    -8,    -2,   nil,
+    -6,   -12,    -9,   nil,   -37,   -44,   -13,   -16 ]
 
 racc_goto_default = [
-   nil,   nil,   nil,     9,     1,     2,   nil,     3,    34,   nil,
-   nil,   nil,   nil,   nil,    38 ]
+   nil,   nil,   nil,     3,     4,     5,     6,   nil,   nil,     7,
+    52,    42,   nil,    26,   nil,   nil,    53,   nil ]
 
 racc_reduce_table = [
   0, 0, :racc_error,
-  1, 19, :_reduce_none,
-  0, 19, :_reduce_2,
-  1, 20, :_reduce_none,
-  1, 20, :_reduce_none,
-  3, 21, :_reduce_5,
   1, 21, :_reduce_none,
-  3, 22, :_reduce_7,
-  3, 25, :_reduce_8,
+  0, 21, :_reduce_2,
+  1, 22, :_reduce_none,
+  1, 22, :_reduce_none,
+  1, 22, :_reduce_none,
+  3, 23, :_reduce_6,
+  3, 23, :_reduce_7,
   1, 23, :_reduce_none,
-  1, 23, :_reduce_none,
-  1, 24, :_reduce_none,
-  1, 24, :_reduce_none,
-  1, 24, :_reduce_none,
-  3, 28, :_reduce_14,
-  4, 28, :_reduce_15,
-  1, 29, :_reduce_none,
-  1, 30, :_reduce_none,
-  3, 30, :_reduce_none,
-  1, 31, :_reduce_none,
-  1, 31, :_reduce_none,
+  2, 25, :_reduce_9,
+  3, 24, :_reduce_10,
+  3, 24, :_reduce_11,
+  3, 29, :_reduce_12,
+  1, 26, :_reduce_none,
+  1, 26, :_reduce_none,
   1, 27, :_reduce_none,
-  3, 27, :_reduce_22,
-  1, 32, :_reduce_none,
+  1, 27, :_reduce_none,
+  1, 27, :_reduce_17,
+  3, 31, :_reduce_18,
+  4, 31, :_reduce_19,
+  1, 33, :_reduce_none,
+  1, 34, :_reduce_none,
+  3, 34, :_reduce_22,
+  1, 35, :_reduce_none,
+  1, 35, :_reduce_none,
   1, 32, :_reduce_none,
   1, 32, :_reduce_none,
-  1, 26, :_reduce_none,
-  1, 26, :_reduce_none,
-  1, 26, :_reduce_none,
-  1, 26, :_reduce_none ]
+  3, 32, :_reduce_27,
+  3, 32, :_reduce_28,
+  3, 28, :_reduce_29,
+  1, 36, :_reduce_none,
+  1, 36, :_reduce_none,
+  1, 36, :_reduce_none,
+  1, 30, :_reduce_none,
+  1, 30, :_reduce_none,
+  1, 30, :_reduce_none,
+  1, 30, :_reduce_none,
+  1, 37, :_reduce_none,
+  1, 37, :_reduce_none,
+  1, 37, :_reduce_none,
+  1, 37, :_reduce_none,
+  1, 37, :_reduce_none ]
 
-racc_reduce_n = 30
+racc_reduce_n = 42
 
-racc_shift_n = 42
+racc_shift_n = 58
 
 racc_token_table = {
   false => 0,
   :error => 1,
   :UMINUS => 2,
   :OPERATOR => 3,
-  :CONJUNCTION => 4,
-  :LPAREN => 5,
-  :RPAREN => 6,
-  :STANDARD_FIELD => 7,
-  :CUSTOM_FIELD => 8,
-  :KEYWORD => 9,
-  :COMMA => 10,
-  :INTEGER => 11,
-  :DECIMAL => 12,
-  :CHARACTER => 13,
-  :DATE => 14,
-  :DATETIME => 15,
-  :BOOLEAN => 16,
-  :NULL => 17 }
-
-racc_nt_base = 18
+  :RANGE_OPERATOR => 4,
+  :UNARY_CONJUNCTION => 5,
+  :CONJUNCTION => 6,
+  :LPAREN => 7,
+  :RPAREN => 8,
+  :STANDARD_FIELD => 9,
+  :CUSTOM_FIELD => 10,
+  :KEYWORD => 11,
+  :COMMA => 12,
+  :INTEGER => 13,
+  :DECIMAL => 14,
+  :CHARACTER => 15,
+  :DATE => 16,
+  :DATETIME => 17,
+  :BOOLEAN => 18,
+  :NULL => 19 }
+
+racc_nt_base = 20
 
 racc_use_result_var = true
 
@@ -142,6 +166,8 @@ Racc_token_to_s_table = [
   "error",
   "UMINUS",
   "OPERATOR",
+  "RANGE_OPERATOR",
+  "UNARY_CONJUNCTION",
   "CONJUNCTION",
   "LPAREN",
   "RPAREN",
@@ -161,16 +187,19 @@ Racc_token_to_s_table = [
   "expressions",
   "expression",
   "conjunction",
+  "unary_conjunction",
   "field",
   "condition",
+  "range",
   "group",
   "literal",
-  "literal_list",
   "function",
+  "literal_list",
   "function_name",
   "function_args",
   "function_arg",
-  "literals" ]
+  "literals",
+  "rangeable" ]
 
 Racc_debug_parser = false
 
@@ -189,57 +218,69 @@ end
 
 # reduce 4 omitted
 
-def _reduce_5(val, _values, result)
+# reduce 5 omitted
+
+def _reduce_6(val, _values, result)
  result = tokenize_expression(val[0], val[1],val[2]) 
     result
 end
 
-# reduce 6 omitted
-
 def _reduce_7(val, _values, result)
+ result = tokenize_expression(val[0], val[1], val[2]) 
+    result
+end
+
+# reduce 8 omitted
+
+def _reduce_9(val, _values, result)
+ result = tokenize_unary_conjunction(val[0], val[1]) 
+    result
+end
+
+def _reduce_10(val, _values, result)
  result = tokenize_conjunction(val[0], val[1],val[2]) 
     result
 end
 
-def _reduce_8(val, _values, result)
+def _reduce_11(val, _values, result)
+ result = tokenize_conjunction(val[0], val[1],val[2]) 
+    result
+end
+
+def _reduce_12(val, _values, result)
  result = tokenize_group(val[1]) 
     result
 end
 
-# reduce 9 omitted
+# reduce 13 omitted
 
-# reduce 10 omitted
+# reduce 14 omitted
 
-# reduce 11 omitted
+# reduce 15 omitted
 
-# reduce 12 omitted
+# reduce 16 omitted
 
-# reduce 13 omitted
+def _reduce_17(val, _values, result)
+ result = tokenize_list(val[0]) 
+    result
+end
 
-def _reduce_14(val, _values, result)
+def _reduce_18(val, _values, result)
  result = tokenize_function(val[0], []) 
     result
 end
 
-def _reduce_15(val, _values, result)
+def _reduce_19(val, _values, result)
  result = tokenize_function(val[0], val[2]) 
     result
 end
 
-# reduce 16 omitted
-
-# reduce 17 omitted
-
-# reduce 18 omitted
-
-# reduce 19 omitted
-
 # reduce 20 omitted
 
 # reduce 21 omitted
 
 def _reduce_22(val, _values, result)
- result = tokenize_multiple(val[0], val[2]) 
+ result = tokenize_function_args(val[0], val[2]) 
     result
 end
 
@@ -251,11 +292,44 @@ end
 
 # reduce 26 omitted
 
-# reduce 27 omitted
+def _reduce_27(val, _values, result)
+ result = tokenize_multiple(val[0], val[2]) 
+    result
+end
+
+def _reduce_28(val, _values, result)
+ result = tokenize_multiple(val[0], val[2]) 
+    result
+end
+
+def _reduce_29(val, _values, result)
+ result = tokenize_multiple(val[0], val[2]) 
+    result
+end
+
+# reduce 30 omitted
+
+# reduce 31 omitted
+
+# reduce 32 omitted
+
+# reduce 33 omitted
+
+# reduce 34 omitted
+
+# reduce 35 omitted
+
+# reduce 36 omitted
+
+# reduce 37 omitted
+
+# reduce 38 omitted
+
+# reduce 39 omitted
 
-# reduce 28 omitted
+# reduce 40 omitted
 
-# reduce 29 omitted
+# reduce 41 omitted
 
 def _reduce_none(val, _values, result)
   val[0]

data/lib/sparkql/parser.y

@@ -3,44 +3,113 @@
 # SparkQL grammar
 
 class Sparkql::Parser
-  prechigh
-    nonassoc UMINUS
-  preclow
+
+###############################################################################
+# READ THIS!
+# The grammar documentation is parsed from this file and is in a sensitive 
+# syntax between the START_MARKDOWN and STOP_MARKDOWN keywords. In general, all
+# line comments will be treated as markdown text, and everything else is padded
+# for code formatting
+###############################################################################
+
+#START_MARKDOWN
+
+### SparkQL BNF Grammar
+# 
+# This document explains the rules for the Spark API filter language syntax and
+# is a living document generated from the reference implementation at 
+# https://github.com/sparkapi/sparkql.
+
+#### Precedence Rules
+# 
+# Unless otherwise specified, SparkQL follows SQL precendence conventions for 
+# operators and conjunctions.
+# 
+# Unary minus is always tied to value, such as for negative numbers.
+prechigh
+  nonassoc UMINUS
+preclow
+  
+
+#### Grammar Rules
+# 
+# A filter (target) is a composition of filter basic filter expressions.
 rule
   target
     : expressions
     | /* none */ { result = 0 }
     ;
 
+##### Expressions
+# 
+# One or more expressions
   expressions
     : expression
     | conjunction
+    | unary_conjunction
     ;
-    
+
+##### Expression
+# 
+# The core of the filtering system, the expression requires a field, a condition 
+# and criteria for comparing the value of the field to the value(s) of the 
+# condition. The result of evaluating the expression on a resource is a true of 
+# false for matching the criteria.
   expression
     : field OPERATOR condition { result = tokenize_expression(val[0], val[1],val[2]) }
+    | field RANGE_OPERATOR range { result = tokenize_expression(val[0], val[1], val[2]) }
     | group
     ;
   
+##### Unary Conjunction
+# 
+# Some conjunctions don't need to expression at all times (e.g. 'NOT'). 
+  unary_conjunction
+    : UNARY_CONJUNCTION expression { result = tokenize_unary_conjunction(val[0], val[1]) }
+    ;  
+  
+##### Conjunction
+# 
+# Two expressions joined together using a supported conjunction
   conjunction
     : expressions CONJUNCTION expression { result = tokenize_conjunction(val[0], val[1],val[2]) }
+    | expressions UNARY_CONJUNCTION expression { result = tokenize_conjunction(val[0], val[1],val[2]) }
     ;
   
+##### Group
+# 
+# One or more expressions encased in parenthesis. There are limitations on nesting depth at the time of this writing.
   group
   	: LPAREN expressions RPAREN { result = tokenize_group(val[1]) }
   	;
 
+##### Field
+# 
+# Keyword for searching on, these fields should be discovered using the metadata 
+# rules. In general, Keywords that cannot be found will be dropped from the 
+# filter.
   field
   	: STANDARD_FIELD
   	| CUSTOM_FIELD
   	;
   
+##### Condition
+# 
+# The determinant of the filter, this is typically a value or set of values of 
+# a type that the field supports (review the field meta data for support). 
+# Functions are also supported on some field types, and provide more flexibility
+# on filtering values
   condition
     : literal
-    | literal_list
     | function
+    | literal_list { result = tokenize_list(val[0]) }
     ;
     
+##### Function
+# 
+# Functions may replace static values for conditions with supported field 
+# types. Functions may have parameters that match types supported by 
+# fields.
   function
     : function_name LPAREN RPAREN { result = tokenize_function(val[0], []) }
     | function_name LPAREN function_args RPAREN { result = tokenize_function(val[0], val[2]) }
@@ -50,9 +119,12 @@ rule
     : KEYWORD
     ;
     
+##### Function Arguments
+# 
+# Functions may optionally have a comma delimited list of parameters.
   function_args
     : function_arg
-    | function_args COMMA function_arg
+    | function_args COMMA function_arg { result = tokenize_function_args(val[0], val[2]) }
     ; 
     
   function_arg
@@ -60,25 +132,56 @@ rule
     | literals
     ;
     
+##### Literal List
+# 
+# A comma delimited list of functions and values.
   literal_list
     : literals
+    | function
     | literal_list COMMA literals { result = tokenize_multiple(val[0], val[2]) }
+    | literal_list COMMA function { result = tokenize_multiple(val[0], val[2]) }
     ;
     
-  # Literals that support multiple
+##### Range List
+# 
+# A comma delimited list of values that support ranges for the Between operator 
+# (see rangeable).
+  range                                                                             
+    : rangeable COMMA rangeable { result = tokenize_multiple(val[0], val[2]) }
+    ;
+
+##### Literals
+# 
+# Literals that support multiple values in a list for a condition
   literals
     : INTEGER
     | DECIMAL
     | CHARACTER
     ;
   
-  # Literals that support single only
+##### Literal
+# 
+# Literals only support a single value in a condition
   literal
     : DATE
     | DATETIME
     | BOOLEAN
     | NULL
     ;
+
+##### Range List
+# 
+# Functions, and literals that can be used in a range                                                       
+  rangeable
+    : INTEGER
+    | DECIMAL
+    | DATE
+    | DATETIME
+    | function
+    ;
+
+#STOP_MARKDOWN
+
     
 end