red-arrow 0.2.1 → 0.2.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e1fbd43acae6f8bbb8688d76e64154f5fa6398d8
-  data.tar.gz: a4c89fcb98100f1853cbe33ee528edd83a233f22
+  metadata.gz: 9557cac923316c8ff79fe9308b97d9a48dfe7a92
+  data.tar.gz: e8e485563267fefa6219e4890d5de589b79fa186
 SHA512:
-  metadata.gz: 8ba4889b6bd62a4c28528360343f834d67465623f9a7dbf7de6bd63534db73f91a536f700bb07c004d6aa314ca92443fe8e65f90224827c85a63366dfbf7b6ab
-  data.tar.gz: bd459dc051e5d564014ee8920241a863a1f82ba64062cc162413b33fb400ee6c6e13fb67db047a9b62eb7f28dda4d80798332627e38c123dc0b023cc757289b3
+  metadata.gz: 4022b9925abe4269ced64d25f2ac5ac24cb4752b58d924e00a2f818f62c70b8f79e458055c0d34b20f8b0ad8077d1bfeadaf530c04d64c1ebc095d146c344106
+  data.tar.gz: 01517b6e438f619b0f8ad3fe6b7d1fbf76195afed624523de4d42896a87a1eb2fcd0d924202952f4bc6160936cbc69c4cb580e3f609bc99ff940c36809deabf3

data/README.md

@@ -12,14 +12,18 @@ Red Arrow is a Ruby bindings of Apache Arrow. Red Arrow is based on GObject Intr
 
 [GObject Introspection](https://wiki.gnome.org/action/show/Projects/GObjectIntrospection) is a middleware for language bindings of C library. GObject Introspection can generate language bindings automatically at runtime.
 
-Red Arrow uses [arrow-glib](https://github.com/kou/arrow-glib) and [gobject-introspection gem](https://rubygems.org/gems/gobject-introspection) to generate Ruby bindings of Apache Arrow.
+Red Arrow uses [Arrow GLib](https://github.com/apache/arrow/tree/master/c_glib) and [gobject-introspection gem](https://rubygems.org/gems/gobject-introspection) to generate Ruby bindings of Apache Arrow.
 
-arrow-glib is a C wrapper for Apache Arrow. Apache Arrow is a C++ library. So GObject Introspection can't use Apache Arrow directly. arrow-glib is a bridge between Apache Arrow and GObject Introspection.
+Arrow GLib is a C wrapper for [Arrow C++](https://github.com/apache/arrow/tree/master/cpp). GObject Introspection can't use Arrow C++ directly. Arrow GLib is a bridge between Arrow C++ and GObject Introspection.
 
 gobject-introspection gem is a Ruby bindings of GObject Introspection. Red Arrow uses GObject Introspection via gobject-introspection gem.
 
 ## Install
 
+Install Arrow GLib before install Red Arrow. Use [Apache Arrow packages](https://github.com/kou/arrow-packages) for installing Arrow GLib.
+
+Install Red Arrow after you install Arrow GLib:
+
 ```text
 % gem install red-arrow
 ```
@@ -36,7 +40,7 @@ require "arrow"
 
 * [Apache Arrow](https://arrow.apache.org/)
 
-* [arrow-glib](https://github.com/kou/arrow-glib)
+* [Arrow GLib](https://github.com/apache/arrow/tree/master/c_glib)
 
 * [gobject-introspection gem](https://rubygems.org/gems/gobject-introspection)
 

data/Rakefile

@@ -40,3 +40,5 @@ desc "Run tests"
 task :test do
   ruby("test/run-test.rb")
 end
+
+task default: :test

data/doc/text/news.md

@@ -1,5 +1,16 @@
 # News
 
+## 0.2.2 - 2017-04-24
+
+### Improvements
+
+  * `Arrow::RecordBatch#each`: Supported reusing record object for
+    performance.
+
+  * ``Arrow::IO`: Unified into `Arrow`.
+
+  * ``Arrow::IPC`: Unified into `Arrow`.
+
 ## 0.2.1 - 2017-03-23
 
 ### Improvements

data/lib/arrow.rb

@@ -17,14 +17,10 @@ require "gobject-introspection"
 require "arrow/version"
 
 require "arrow/loader"
-require "arrow/io/loader"
-require "arrow/ipc/loader"
 
 module Arrow
   class Error < StandardError
   end
 
   Loader.load
-  IO::Loader.load
-  IPC::Loader.load
 end

data/lib/arrow/loader.rb

@@ -12,6 +12,8 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
+require "arrow/block-openable"
+
 module Arrow
   class Loader < GObjectIntrospection::Loader
     class << self
@@ -30,6 +32,18 @@ module Arrow
       require "arrow/array-builder"
       require "arrow/field"
       require "arrow/record-batch"
+
+      require "arrow/ipc-file-reader"
+      require "arrow/ipc-stream-reader"
+    end
+
+    def load_object_info(info)
+      super
+
+      klass = @base_module.const_get(rubyish_class_name(info))
+      if klass.respond_to?(:open)
+        klass.singleton_class.prepend(BlockOpenable)
+      end
     end
 
     def rubyish_method_name(function_info, options={})

data/lib/arrow/record-batch.rb

@@ -18,9 +18,21 @@ module Arrow
   class RecordBatch
     include Enumerable
 
-    def each
-      n_rows.times do |i|
-        yield(Record.new(self, i))
+    def each(reuse_record: false)
+      unless block_given?
+        return to_enum(__method__, reuse_record: reuse_record)
+      end
+
+      if reuse_record
+        record = Record.new(self, nil)
+        n_rows.times do |i|
+          record.index = i
+          yield(record)
+        end
+      else
+        n_rows.times do |i|
+          yield(Record.new(self, i))
+        end
       end
     end
 
@@ -32,7 +44,12 @@ module Arrow
       else
         index = name_or_index
       end
-      (@columns ||= columns)[index]
+      columns[index]
+    end
+
+    alias_method :columns_raw, :columns
+    def columns
+      @columns ||= columns_raw
     end
 
     private

data/lib/arrow/record.rb

@@ -14,13 +14,18 @@
 
 module Arrow
   class Record
-    def initialize(record_batch, i)
+    attr_accessor :index
+    def initialize(record_batch, index)
       @record_batch = record_batch
-      @i = i
+      @index = index
     end
 
-    def [](name_or_index)
-      @record_batch.find_column(name_or_index)[@i]
+    def [](column_name_or_column_index)
+      @record_batch.find_column(column_name_or_column_index)[@index]
+    end
+
+    def columns
+      @record_batch.columns
     end
   end
 end

data/lib/arrow/version.rb

@@ -13,5 +13,5 @@
 # limitations under the License.
 
 module Arrow
-  VERSION = "0.2.1"
+  VERSION = "0.2.2"
 end

data/red-arrow.gemspec

@@ -24,7 +24,7 @@ require "arrow/version"
 Gem::Specification.new do |spec|
   spec.name = "red-arrow"
   spec.version = Arrow::VERSION
-  spec.homepage = "https://github.com/kou/red-arrow"
+  spec.homepage = "https://github.com/red-data-tools/red-arrow"
   spec.authors = ["Kouhei Sutou"]
   spec.email = ["kou@clear-code.com"]
 

data/test/test-record-batch.rb

@@ -0,0 +1,54 @@
+# Copyright 2017 Kouhei Sutou <kou@clear-code.com>
+#
+# Licensed 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 RecordBatchTest < Test::Unit::TestCase
+  sub_test_case(".each") do
+    setup do
+      fields = [
+        Arrow::Field.new("count", :uint32),
+      ]
+      @schema = Arrow::Schema.new(fields)
+      @counts = Arrow::UInt32Array.new([1, 2, 4, 8])
+      @record_batch = Arrow::RecordBatch.new(@schema, @counts.length, [@counts])
+    end
+
+    test("default") do
+      records = []
+      @record_batch.each do |record|
+        records << [record, record.index]
+      end
+      assert_equal([
+                     [0, 0],
+                     [1, 1],
+                     [2, 2],
+                     [3, 3],
+                   ],
+                   records.collect {|record, i| [record.index, i]})
+    end
+
+    test("reuse_record: true") do
+      records = []
+      @record_batch.each(reuse_record: true) do |record|
+        records << [record, record.index]
+      end
+      assert_equal([
+                     [3, 0],
+                     [3, 1],
+                     [3, 2],
+                     [3, 3],
+                   ],
+                   records.collect {|record, i| [record.index, i]})
+    end
+  end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: red-arrow
 version: !ruby/object:Gem::Version
-  version: 0.2.1
+  version: 0.2.2
 platform: ruby
 authors:
 - Kouhei Sutou
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-03-23 00:00:00.000000000 Z
+date: 2017-04-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: gobject-introspection
@@ -111,13 +111,10 @@ files:
 - lib/arrow.rb
 - lib/arrow/array-builder.rb
 - lib/arrow/array.rb
-- lib/arrow/block-openable-applicable.rb
 - lib/arrow/block-openable.rb
 - lib/arrow/field.rb
-- lib/arrow/io/loader.rb
-- lib/arrow/ipc/file-reader.rb
-- lib/arrow/ipc/loader.rb
-- lib/arrow/ipc/stream-reader.rb
+- lib/arrow/ipc-file-reader.rb
+- lib/arrow/ipc-stream-reader.rb
 - lib/arrow/loader.rb
 - lib/arrow/record-batch.rb
 - lib/arrow/record.rb
@@ -126,7 +123,8 @@ files:
 - test/helper.rb
 - test/run-test.rb
 - test/test-array.rb
-homepage: https://github.com/kou/red-arrow
+- test/test-record-batch.rb
+homepage: https://github.com/red-data-tools/red-arrow
 licenses:
 - Apache-2.0
 metadata: {}
@@ -152,6 +150,7 @@ specification_version: 4
 summary: Red Arrow is a Ruby bindings of Apache Arrow. Red Arrow is based on GObject
   Introspection.
 test_files:
+- test/test-record-batch.rb
 - test/helper.rb
 - test/run-test.rb
 - test/test-array.rb

data/lib/arrow/block-openable-applicable.rb

@@ -1,29 +0,0 @@
-# Copyright 2017 Kouhei Sutou <kou@clear-code.com>
-#
-# Licensed 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 "arrow/block-openable"
-
-module Arrow
-  module BlockOpenableApplicable
-    private
-    def load_object_info(info)
-      super
-
-      klass = @base_module.const_get(rubyish_class_name(info))
-      if klass.respond_to?(:open)
-        klass.singleton_class.prepend(BlockOpenable)
-      end
-    end
-  end
-end

data/lib/arrow/io/loader.rb

@@ -1,37 +0,0 @@
-# Copyright 2017 Kouhei Sutou <kou@clear-code.com>
-#
-# Licensed 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 "arrow/block-openable-applicable"
-
-module Arrow
-  module IO
-    class Loader < GObjectIntrospection::Loader
-      class << self
-        def load
-          super("ArrowIO", IO)
-        end
-      end
-
-      include BlockOpenableApplicable
-
-      private
-      def post_load(repository, namespace)
-        require_libraries
-      end
-
-      def require_libraries
-      end
-    end
-  end
-end

data/lib/arrow/ipc/loader.rb

@@ -1,39 +0,0 @@
-# Copyright 2017 Kouhei Sutou <kou@clear-code.com>
-#
-# Licensed 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 "arrow/block-openable-applicable"
-
-module Arrow
-  module IPC
-    class Loader < GObjectIntrospection::Loader
-      class << self
-        def load
-          super("ArrowIPC", IPC)
-        end
-      end
-
-      include BlockOpenableApplicable
-
-      private
-      def post_load(repository, namespace)
-        require_libraries
-      end
-
-      def require_libraries
-        require "arrow/ipc/file-reader"
-        require "arrow/ipc/stream-reader"
-      end
-    end
-  end
-end