red-gandiva 0.15.1 → 0.16.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f416fcc98a45f270d3da1768e01ff1ab06d4fc6da43101397f453583f46a77e3
-  data.tar.gz: e436a03e8520097f0a60ddbea9d99c3f98b604010c7b55feecd72b76e0e951b6
+  metadata.gz: 58f3d77bc9396b1da9c54c9ce7429ccae42240af4cee7542bd484c6c69b9a05c
+  data.tar.gz: 5c632d1300bb99f30bb54137244858f505202139b59329612f89cbdd872e04d6
 SHA512:
-  metadata.gz: ff3b4b0d77701034d8667410eafd0b652cd8de6176a2e16b946d17d716e5677aafe163bda6b52429c91550d8976368b0e0cb38b9b65f504e604c8d2acaef5e74
-  data.tar.gz: 5e48f6227728211cd21c2b6b67bacf243fed07648b2093cda2a66fe383c89fc5e88bf0dcd2966f2878ce71668474ea4238687e4e59931882cd99485e34a6e2fd
+  metadata.gz: 33a743a8936c77ead7a9ca9a2cb6f5e29a9605f1982e6d2249997b7a85606c5e56a841f53008f7480404521fd0abacbab491c2e60a542020bcb9b4d2f96084a5
+  data.tar.gz: 4f99eee50279cba73d4411d2b07607abdc332a1eca031eb6241490946daa17132b9e652218bf9959489ff02bc30cbecfa50e0bfaad5f93cddffb6f5aa25ddd0a

data/README.md

@@ -46,18 +46,23 @@ Install Red Gandiva after you install Gandiva GLib:
 ```ruby
 require "gandiva"
 
-field1 = Arrow::Field.new("field1", Arrow::Int32DataType.new)
-field2 = Arrow::Field.new("field2", Arrow::Int32DataType.new)
-schema = Arrow::Schema.new([field1, field2])
-add_result = Arrow::Field.new("add_result", Arrow::Int32DataType.new)
-subtract_result = Arrow::Field.new("subtract_result", Arrow::Int32DataType.new)
-add_expression = Gandiva::Expression.new("add", [field1, field2], add_result)
-subtract_expression = Gandiva::Expression.new("subtract", [field1, field2], subtract_result)
-projector = Gandiva::Projector.new(schema, [add_expression, subtract_expression])
-input_arrays = [
-  Arrow::Int32Array.new([1, 2, 3, 4]),
-  Arrow::Int32Array.new([11, 13, 15, 17]),
-]
-record_batch = Arrow::RecordBatch.new(schema, 4, input_arrays)
-output_arrays = projector.evaluate(record_batch)
+table = Arrow::Table.new(:field1 => Arrow::Int32Array.new([1, 2, 3, 4]),
+                         :field2 => Arrow::Int32Array.new([11, 13, 15, 17]))
+schema = table.schema
+
+expression1 = schema.build_expression do |record|
+  record.field1 + record.field2
+end
+
+expression2 = schema.build_expression do |record, context|
+  context.if(record.field1 > record.field2)
+    .then(record.field1 / record.field2)
+    .else(record.field1)
+end
+
+projector = Gandiva::Projector.new(schema, [expression1, expression2])
+table.each_record_batch do |record_batch|
+  outputs = projector.evaluate(record_batch)
+  puts outputs.collect(&:values))
+end
 ```

data/lib/gandiva/arrow-schema.rb

@@ -0,0 +1,25 @@
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you 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
+#
+#   http://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.
+
+module Arrow
+  class Schema
+    def build_expression(&block)
+      builder = Gandiva::ExpressionBuilder.new(self)
+      builder.build(&block)
+    end
+  end
+end

data/lib/gandiva/expression-builder.rb

@@ -0,0 +1,45 @@
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you 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
+#
+#   http://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.
+
+module Gandiva
+  class ExpressionBuilder
+    def initialize(schema)
+      @schema = schema
+    end
+
+    def build
+      builder = yield(Record.new(@schema), Context.new)
+      node = builder.build
+      Expression.new(node,
+                     Arrow::Field.new("result", node.return_type))
+    end
+  end
+end
+
+require "gandiva/expression-builder/add"
+require "gandiva/expression-builder/context"
+require "gandiva/expression-builder/divide"
+require "gandiva/expression-builder/elsif"
+require "gandiva/expression-builder/equal"
+require "gandiva/expression-builder/field"
+require "gandiva/expression-builder/greater-than"
+require "gandiva/expression-builder/if"
+require "gandiva/expression-builder/literal"
+require "gandiva/expression-builder/less-than"
+require "gandiva/expression-builder/multiply"
+require "gandiva/expression-builder/record"
+require "gandiva/expression-builder/subtract"

data/lib/gandiva/expression-builder/add.rb

@@ -0,0 +1,40 @@
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you 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
+#
+#   http://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.
+
+require "gandiva/expression-builder/binary-operation"
+
+module Gandiva
+  class ExpressionBuilder
+    class Add < BinaryOperation
+      def initialize(left, right)
+        super("add", left, right)
+      end
+
+      private
+      def return_type(left_node, right_node)
+        # TODO: More clever implementation. e.g. (int64, float) -> float
+        left_return_type = left_node.return_type
+        right_return_type = right_node.return_type
+        if left_return_type.bit_width > right_return_type.bit_width
+          left_return_type
+        else
+          right_return_type
+        end
+      end
+    end
+  end
+end

data/lib/gandiva/expression-builder/binary-operation.rb

@@ -0,0 +1,38 @@
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you 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
+#
+#   http://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.
+
+require "gandiva/expression-builder/value"
+
+module Gandiva
+  class ExpressionBuilder
+    class BinaryOperation < Value
+      def initialize(operator, left, right)
+        @operator = operator
+        @left = left
+        @right = right
+      end
+
+      def build
+        left_node = @left.build
+        right_node = @right.build
+        FunctionNode.new(@operator,
+                         [left_node, right_node],
+                         return_type(left_node, right_node))
+      end
+    end
+  end
+end

data/lib/gandiva/expression-builder/context.rb

@@ -0,0 +1,26 @@
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you 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
+#
+#   http://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.
+
+module Gandiva
+  class ExpressionBuilder
+    class Context
+      def if(condition)
+        If.new(condition)
+      end
+    end
+  end
+end

data/lib/gandiva/expression-builder/divide.rb

@@ -0,0 +1,34 @@
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you 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
+#
+#   http://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.
+
+require "gandiva/expression-builder/binary-operation"
+
+module Gandiva
+  class ExpressionBuilder
+    class Divide < BinaryOperation
+      def initialize(left, right)
+        super("divide", left, right)
+      end
+
+      private
+      def return_type(left_node, right_node)
+        # TODO: Use float if left or right is float
+        left_node.return_type
+      end
+    end
+  end
+end

data/lib/gandiva/expression-builder/elsif.rb

@@ -0,0 +1,36 @@
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you 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
+#
+#   http://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.
+
+require "gandiva/expression-builder/if"
+
+module Gandiva
+  class ExpressionBuilder
+    class Elsif < If
+      def initialize(parent, condition)
+        @parent = parent
+        super(condition)
+      end
+
+      def build
+        elsif_node = super
+        build_if_node(@parent.condition_node,
+                      @parent.then_node,
+                      elsif_node)
+      end
+    end
+  end
+end

data/lib/gandiva/expression-builder/equal.rb

@@ -0,0 +1,33 @@
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you 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
+#
+#   http://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.
+
+require "gandiva/expression-builder/binary-operation"
+
+module Gandiva
+  class ExpressionBuilder
+    class Equal < BinaryOperation
+      def initialize(left, right)
+        super("equal", left, right)
+      end
+
+      private
+      def return_type(left_node, right_node)
+        Arrow::BooleanDataType.new
+      end
+    end
+  end
+end

data/lib/gandiva/expression-builder/field.rb

@@ -0,0 +1,32 @@
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you 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
+#
+#   http://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.
+
+require "gandiva/expression-builder/value"
+
+module Gandiva
+  class ExpressionBuilder
+    class Field < Value
+      def initialize(field)
+        @field = field
+      end
+
+      def build
+        FieldNode.new(@field)
+      end
+    end
+  end
+end

data/lib/gandiva/expression-builder/greater-than.rb

@@ -0,0 +1,33 @@
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you 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
+#
+#   http://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.
+
+require "gandiva/expression-builder/binary-operation"
+
+module Gandiva
+  class ExpressionBuilder
+    class GreaterThan < BinaryOperation
+      def initialize(left, right)
+        super("greater_than", left, right)
+      end
+
+      private
+      def return_type(left_node, right_node)
+        Arrow::BooleanDataType.new
+      end
+    end
+  end
+end

data/lib/gandiva/expression-builder/if.rb

@@ -0,0 +1,75 @@
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you 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
+#
+#   http://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.
+
+module Gandiva
+  class ExpressionBuilder
+    class If
+      def initialize(condition)
+        @condition = condition
+        @then = nil
+        @else = nil
+      end
+
+      def then(clause)
+        @then = clause
+        self
+      end
+
+      def else(clause)
+        @else = clause
+        self
+      end
+
+      def elsif(condition)
+        Elsif.new(self, condition)
+      end
+
+      def build
+        build_if_node(condition_node,
+                      then_node,
+                      else_node)
+      end
+
+      protected
+      def condition_node
+        @condition.build
+      end
+
+      def then_node
+        @then&.build
+      end
+
+      def else_node
+        @else&.build
+      end
+
+      private
+      def build_if_node(condition_node, then_node, else_node)
+        if then_node and else_node
+          # TODO: Validate then_node.return_type == else_node.return_type
+          return_type = then_node.return_type
+        else
+          return_type = (then_node || else_node).return_type
+        end
+        IfNode.new(condition_node,
+                   then_node,
+                   else_node,
+                   return_type)
+      end
+    end
+  end
+end

data/lib/gandiva/expression-builder/less-than.rb

@@ -0,0 +1,33 @@
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you 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
+#
+#   http://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.
+
+require "gandiva/expression-builder/binary-operation"
+
+module Gandiva
+  class ExpressionBuilder
+    class LessThan < BinaryOperation
+      def initialize(left, right)
+        super("less_than", left, right)
+      end
+
+      private
+      def return_type(left_node, right_node)
+        Arrow::BooleanDataType.new
+      end
+    end
+  end
+end

data/lib/gandiva/expression-builder/literal.rb

@@ -0,0 +1,65 @@
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you 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
+#
+#   http://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.
+
+module Gandiva
+  class ExpressionBuilder
+    class Literal
+      class << self
+        def resolve(value)
+          case value
+          when true, false
+            new(BooleanLiteralNode, value)
+          when Integer
+            if value < -(2 ** 31)
+              new(Int64LiteralNode, value)
+            elsif value < -(2 ** 15)
+              new(Int32LiteralNode, value)
+            elsif value < -(2 ** 7)
+              new(Int16LiteralNode, value)
+            elsif value < 0
+              new(Int8LiteralNode, value)
+            elsif value < (2 ** 8 - 1)
+              new(UInt8LiteralNode, value)
+            elsif value < (2 ** 16 - 1)
+              new(UInt16LiteralNode, value)
+            elsif value < (2 ** 32 - 1)
+              new(UInt32LiteralNode, value)
+            else
+              new(UInt64LiteralNode, value)
+            end
+          when Float
+            new(DoubleLiteralNode, value)
+          when String
+            new(StringLiteralNode, value)
+          else
+            nil
+          end
+        end
+      end
+
+      attr_reader :value
+      def initialize(node_class, value)
+        @node_class = node_class
+        @value = value
+      end
+
+      def build
+        @node_class.new(value)
+      end
+    end
+  end
+end

data/lib/gandiva/expression-builder/multiply.rb

@@ -0,0 +1,34 @@
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you 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
+#
+#   http://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.
+
+require "gandiva/expression-builder/binary-operation"
+
+module Gandiva
+  class ExpressionBuilder
+    class Multiply < BinaryOperation
+      def initialize(left, right)
+        super("multiply", left, right)
+      end
+
+      private
+      def return_type(left_node, right_node)
+        # TODO: Use larger type
+        right_node.return_type
+      end
+    end
+  end
+end

data/lib/gandiva/expression-builder/record.rb

@@ -0,0 +1,45 @@
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you 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
+#
+#   http://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.
+
+module Gandiva
+  class ExpressionBuilder
+    class Record
+      def initialize(schema)
+        @schema = schema
+      end
+
+      def respond_to_missing?(name, include_private)
+        return true if @schema[name]
+        super
+      end
+
+      def method_missing(name, *args)
+        return super unless args.empty?
+        self[name] || super
+      end
+
+      def [](name)
+        field = @schema[name]
+        if field
+          Field.new(field)
+        else
+          nil
+        end
+      end
+    end
+  end
+end

data/lib/gandiva/expression-builder/subtract.rb

@@ -0,0 +1,34 @@
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you 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
+#
+#   http://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.
+
+require "gandiva/expression-builder/binary-operation"
+
+module Gandiva
+  class ExpressionBuilder
+    class Subtract < BinaryOperation
+      def initialize(left, right)
+        super("subtract", left, right)
+      end
+
+      private
+      def return_type(left_node, right_node)
+        # TODO: Use larger type
+        right_node.return_type
+      end
+    end
+  end
+end

data/lib/gandiva/expression-builder/value.rb

@@ -0,0 +1,55 @@
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you 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
+#
+#   http://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.
+
+module Gandiva
+  class ExpressionBuilder
+    class Value
+      def +(right)
+        Add.new(self, resolve(right))
+      end
+
+      def -(right)
+        Subtract.new(self, resolve(right))
+      end
+
+      def *(right)
+        Multiply.new(self, resolve(right))
+      end
+
+      def /(right)
+        Divide.new(self, resolve(right))
+      end
+
+      def >(right)
+        GreaterThan.new(self, resolve(right))
+      end
+
+      def <(right)
+        LessThan.new(self, resolve(right))
+      end
+
+      def ==(right)
+        Equal.new(self, resolve(right))
+      end
+
+      private
+      def resolve(value)
+        Literal.resolve(value) or value
+      end
+    end
+  end
+end

data/lib/gandiva/loader.rb

@@ -36,5 +36,14 @@ module Gandiva
         super
       end
     end
+
+    def post_load(repository, namespace)
+      require_libraries
+    end
+
+    def require_libraries
+      require "gandiva/arrow-schema"
+      require "gandiva/expression-builder"
+    end
   end
 end

data/lib/gandiva/version.rb

@@ -16,7 +16,7 @@
 # under the License.
 
 module Gandiva
-  VERSION = "0.15.1"
+  VERSION = "0.16.0"
 
   module Version
     numbers, TAG = VERSION.split("-")

data/test/expression-builder/test-add.rb

@@ -0,0 +1,54 @@
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you 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
+#
+#   http://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.
+
+class TestExpressionBuilderAdd < Test::Unit::TestCase
+  def setup
+    @table = Arrow::Table.new(int32_field: Arrow::Int32Array.new([1]),
+                              int64_field: Arrow::Int64Array.new([2]))
+    @schema = @table.schema
+  end
+
+  def build
+    record = Gandiva::ExpressionBuilder::Record.new(@schema)
+    builder = yield(record)
+    builder.build
+  end
+
+  test("literal") do
+    node = build do |record|
+      record.int32_field + (2 ** 63)
+    end
+    assert_equal("uint64 add((int32) int32_field, (const uint64) #{2 ** 63})",
+                 node.to_s)
+  end
+
+  test("int32 + int64") do
+    node = build do |record|
+      record.int32_field + record.int64_field
+    end
+    assert_equal("int64 add((int32) int32_field, (int64) int64_field)",
+                 node.to_s)
+  end
+
+  test("int64 + int32") do
+    node = build do |record|
+      record.int64_field + record.int32_field
+    end
+    assert_equal("int64 add((int64) int64_field, (int32) int32_field)",
+                 node.to_s)
+  end
+end

data/test/expression-builder/test-record.rb

@@ -0,0 +1,45 @@
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you 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
+#
+#   http://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.
+
+class TestExpressionBuilderRecord < Test::Unit::TestCase
+  def setup
+    @table = Arrow::Table.new(field: Arrow::Int32Array.new([1, 13, 3, 17]))
+    @schema = @table.schema
+  end
+
+  def build
+    record = Gandiva::ExpressionBuilder::Record.new(@schema)
+    builder = yield(record)
+    builder.build
+  end
+
+  test("name") do
+    node = build do |record|
+      record.field
+    end
+    assert_equal("(int32) field",
+                 node.to_s)
+  end
+
+  test("#[]") do
+    node = build do |record|
+      record[:field]
+    end
+    assert_equal("(int32) field",
+                 node.to_s)
+  end
+end

data/test/test-projector.rb

@@ -17,32 +17,31 @@
 
 class TestProjector < Test::Unit::TestCase
   def test_evaluate
-    table = Arrow::Table.new(:field1 => Arrow::Int32Array.new([1, 2, 3, 4]),
-                             :field2 => Arrow::Int32Array.new([11, 13, 15, 17]))
+    table = Arrow::Table.new(:field1 => Arrow::Int32Array.new([1, 13, 3, 17]),
+                             :field2 => Arrow::Int32Array.new([11, 2, 15, 17]),
+                             :field3 => Arrow::Int32Array.new([1, 10, 2, 2]))
     schema = table.schema
-    field1 = schema[:field1]
-    field2 = schema[:field2]
-    field_node1 = Gandiva::FieldNode.new(field1)
-    field_node2 = Gandiva::FieldNode.new(field2)
-    add_function_node = Gandiva::FunctionNode.new("add",
-                                                  [field_node1, field_node2],
-                                                  Arrow::Int32DataType.new)
-    add_result = Arrow::Field.new("add_result", :int32)
-    add_expression = Gandiva::Expression.new(add_function_node,
-                                             add_result)
-    subtract_function_node = Gandiva::FunctionNode.new("subtract",
-                                                       [field_node1, field_node2],
-                                                       Arrow::Int32DataType.new)
-    subtract_result = Arrow::Field.new("subtract_result", :int32)
-    subtract_expression = Gandiva::Expression.new(subtract_function_node,
-                                                  subtract_result)
+
+    expression1 = schema.build_expression do |record|
+      record.field1 + record.field2
+    end
+
+    expression2 = schema.build_expression do |record, context|
+      context.if(record.field1 > record.field2)
+        .then(record.field1 + record.field2 * record.field3)
+        .elsif(record.field1 == record.field2)
+        .then(record.field1 - record.field2 / record.field3)
+        .else(record.field2)
+    end
+
     projector = Gandiva::Projector.new(schema,
-                                       [add_expression, subtract_expression])
+                                       [expression1, expression2])
+
     table.each_record_batch do |record_batch|
       outputs = projector.evaluate(record_batch)
       assert_equal([
-                     [12, 15, 18, 21],
-                     [-10, -11, -12, -13],
+                     [12, 15, 18, 34],
+                     [11, 33, 15, 9]
                    ],
                    outputs.collect(&:values))
     end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: red-gandiva
 version: !ruby/object:Gem::Version
-  version: 0.15.1
+  version: 0.16.0
 platform: ruby
 authors:
 - Apache Arrow Developers
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-11-01 00:00:00.000000000 Z
+date: 2020-02-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: red-arrow
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.15.1
+        version: 0.16.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.15.1
+        version: 0.16.0
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -82,9 +82,28 @@ files:
 - Rakefile
 - dependency-check/Rakefile
 - lib/gandiva.rb
+- lib/gandiva/arrow-schema.rb
+- lib/gandiva/expression-builder.rb
+- lib/gandiva/expression-builder/add.rb
+- lib/gandiva/expression-builder/binary-operation.rb
+- lib/gandiva/expression-builder/context.rb
+- lib/gandiva/expression-builder/divide.rb
+- lib/gandiva/expression-builder/elsif.rb
+- lib/gandiva/expression-builder/equal.rb
+- lib/gandiva/expression-builder/field.rb
+- lib/gandiva/expression-builder/greater-than.rb
+- lib/gandiva/expression-builder/if.rb
+- lib/gandiva/expression-builder/less-than.rb
+- lib/gandiva/expression-builder/literal.rb
+- lib/gandiva/expression-builder/multiply.rb
+- lib/gandiva/expression-builder/record.rb
+- lib/gandiva/expression-builder/subtract.rb
+- lib/gandiva/expression-builder/value.rb
 - lib/gandiva/loader.rb
 - lib/gandiva/version.rb
 - red-gandiva.gemspec
+- test/expression-builder/test-add.rb
+- test/expression-builder/test-record.rb
 - test/helper.rb
 - test/run-test.rb
 - test/test-boolean-literal-node.rb
@@ -108,12 +127,15 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.6
+rubyforge_project: 
+rubygems_version: 2.7.6.2
 signing_key: 
 specification_version: 4
 summary: Red Gandiva is the Ruby bindings of Gandiva
 test_files:
-- test/test-projector.rb
-- test/run-test.rb
-- test/helper.rb
 - test/test-boolean-literal-node.rb
+- test/expression-builder/test-add.rb
+- test/expression-builder/test-record.rb
+- test/helper.rb
+- test/run-test.rb
+- test/test-projector.rb