sparkql 1.2.1 → 1.2.2

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    MGYwODJjZmY5MTNkOWFjYjRlZTBkOGZjNjhmNGI1ZjU5MzhjNGM1OA==
+    OGNlZDVlNWY0ZDgwNDY0YTY1ZWI0ZGY5MzQ1ZmY0NTIxMGY4ZTI2OQ==
   data.tar.gz: !binary |-
-    YTViYjY5OWVjYzJkYzYxMmQzZTQwZjg1MWFmN2MzNDM4ZmI3MjlmNw==
+    ZjhiZmI1Mjc4ZDM0YmE5M2Q4YzU5NTMwMmRhODY3MDY5YWE3ODQ5YQ==
 SHA512:
   metadata.gz: !binary |-
-    ZDc5MjYxMmZiOTY5ZTIxNDg4YmFkYTUwNDRiNGE4YTMwNzgxYTBmNGMyNDUx
-    ZWViZmNkNTI3ODk1ZWRkOWVkZDAyMDk2YWE5MDMxZWQ2MzNlNzI0OTE5ZDEy
-    ZjUyZGQ1ZTIxNzVmODM0OGVmNGQzOWU1MzEzMGZhZWFlMWIzNDU=
+    Yzk5NzlkOTMxY2VkZTUyN2JmMmFkYWU0NmM4MWY4ODUyNzQ0NzZkYzM5ZTU5
+    YTg5NjJhNmFlMDVlNzkxNWM2MDgyYTQwZjI5ZTc1OGZjODI1MzIxMTE2ZGQ5
+    ZjBmYmQ2ZjdiNzNlODIwOWUzMjI5ODEzMThiMTcyZTJkYWUwOTk=
   data.tar.gz: !binary |-
-    OWFmNWE1ZTYwZjY5ZTQxMmZhOTFiMjQ5YjM0YjAwMGUxNjE5YTQ2Y2Q5ODRi
-    YmQ1NTg5OGQ3M2UzOTJiOTNjNWQzMDhjNWQyYzJlM2I1NmMyMWVlMDU4N2Fl
-    MTQxODY1ODc3ZmQzOGJmY2FhMGQ3MTMwYjEzMGJjZmJkOWJiMDk=
+    YmUyZjU5ZWI3NWNhOGVhYmU5MDQxZDNhZjhhZWEwNzJmMzNmZjkzNTUxODQ5
+    YzIwODQwMjgzMThlODc4ZWJiYjdkMzM0NDU4ZjBiZjlhMGMwODQ3YzdkNDRh
+    MTRiYzZkMmVmMTM0NGNhZWY1ZWJkZDcwYjEzZDIyMDU0ZjY4YmM=

data/CHANGELOG.md

@@ -1,3 +1,7 @@
+v1.2.2, 2018-11-28
+-------------------
+  * [IMPROVEMENT] Support Arithmetic: Add, Sub, Mul, Div, Mod
+
 v1.2.1, 2018-10-09
 -------------------
   * [BUGFIX] Check deepest function when type checking field arguments.

data/GRAMMAR.md

@@ -1,9 +1,9 @@
 ## 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 
+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 
+Unless otherwise specified, SparkQL follows SQL precendence conventions for
 operators and conjunctions.
 Unary minus is always tied to value, such as for negative numbers.
 
@@ -11,6 +11,8 @@ Unary minus is always tied to value, such as for negative numbers.
 ```
    prechigh
      nonassoc UMINUS
+     left MUL DIV MOD
+     left ADD SUB
    preclow
 ```
 
@@ -39,28 +41,31 @@ One or more expressions
 ```
 
 #### 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.
+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. We are separating functions and arithmetic
+based on if we are acting on the field side or the literal side. This is to
+allow literal folding on the literal side and to prevent unnecessary checks
+to see if a field is in the expression.
 
 
 ```
      expression
-       : field OPERATOR condition 
-       | field RANGE_OPERATOR range 
+       : field_expression OPERATOR condition 
+       | field_expression RANGE_OPERATOR range 
        | group
        ;
 ```
 
 #### Unary Conjunction
-Some conjunctions don't need to expression at all times (e.g. 'NOT'). 
+Some conjunctions don't need to expression at all times (e.g. 'NOT').
 
 
 ```
      unary_conjunction
        : UNARY_CONJUNCTION expression 
-       ;  
+       ;
 ```
 
 #### Conjunction
@@ -80,42 +85,50 @@ One or more expressions encased in parenthesis. There are limitations on nesting
 
 ```
      group
-     	: LPAREN expressions RPAREN 
-     	;
-```
-
-#### 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
-     	| function
-     	;
+       : LPAREN expressions RPAREN 
+       ;
+     field_expression
+       : field_arithmetic_expression
+       ;
+     field_arithmetic_expression
+       : field_arithmetic_expression ADD field_arithmetic_expression 
+       | field_arithmetic_expression SUB field_arithmetic_expression 
+       | field_arithmetic_expression MUL field_arithmetic_expression 
+       | field_arithmetic_expression DIV field_arithmetic_expression 
+       | field_arithmetic_expression MOD field_arithmetic_expression 
+       | literals
+       | field_function_expression
+       ;
+     field_function_expression
+       : field
+       | function
+       ;
 ```
 
 #### 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). 
+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_function
+       : arithmetic_condition
        | literal_list 
+       | literal
        ;
+     arithmetic_condition
+       : condition ADD condition 
+       | condition SUB condition 
+       | condition MUL condition 
+       | condition DIV condition 
+       | condition MOD condition 
 ```
 
 #### Function
-Functions may replace static values for conditions with supported field 
-types. Functions may have parameters that match types supported by 
+Functions may replace static values for conditions with supported field
+types. Functions may have parameters that match types supported by
 fields.
 
 
@@ -143,9 +156,9 @@ Functions may optionally have a comma delimited list of parameters.
        | function_args COMMA function_arg 
        ;
      function_arg
-       : literal
+       : field_function_expression 
+       | literal
        | literals
-       | field 
        ;
      literal_function_args
        : literal_function_arg
@@ -154,7 +167,6 @@ Functions may optionally have a comma delimited list of parameters.
      literal_function_arg
        : literal
        | literals
-       | literal_function
        ;
 ```
 
@@ -172,12 +184,12 @@ A comma delimited list of functions and values.
 ```
 
 #### Range List
-A comma delimited list of values that support ranges for the Between operator 
+A comma delimited list of values that support ranges for the Between operator
 (see rangeable).
 
 
 ```
-     range                                                                             
+     range
        : rangeable COMMA rangeable 
        ;
 ```
@@ -211,7 +223,7 @@ Literals only support a single value in a condition
 ```
 
 #### Range List
-Functions, and literals that can be used in a range                                                       
+Functions, and literals that can be used in a range
 
 
 ```
@@ -225,3 +237,16 @@ Functions, and literals that can be used in a range
        ;
 ```
 
+#### 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
+       ;
+```
+

data/VERSION

@@ -1 +1 @@
-1.2.1
+1.2.2

data/lib/sparkql/lexer.rb

@@ -62,7 +62,7 @@ class Sparkql::Lexer < StringScanner
 
     token.freeze
   end
-  
+
   def check_reserved_words(value)
     u_value = value.capitalize
     if OPERATORS.include?(u_value)
@@ -73,6 +73,16 @@ class Sparkql::Lexer < StringScanner
       [:CONJUNCTION,u_value]
     elsif UNARY_CONJUNCTIONS.include?(u_value)
       [:UNARY_CONJUNCTION,u_value]
+    elsif ADD == u_value
+      [:ADD, u_value]
+    elsif SUB == u_value
+      [:SUB, u_value]
+    elsif MUL == u_value
+      [:MUL, u_value]
+    elsif DIV == u_value
+      [:DIV, u_value]
+    elsif MOD == u_value
+      [:MOD, u_value]
     else
       [:UNKNOWN, "ERROR: '#{self.string}'"]
     end