red-arrow-dataset 10.0.0 → 11.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 750cc9830aa11f794adf47a0952511f2ce158f86756c0e4118d1f46477bfbd9c
-  data.tar.gz: 820a640b35f252f216e12a9261dff3fd5491d3c514dabd2d3a2518f5625b5d81
+  metadata.gz: e359bff12f88d0d14a8890b1ca27616a8a36ef01e090c6aae6c5590af99f9899
+  data.tar.gz: c291a76e52a71502480617fb6fa18ed122ddbec79dad31ce35d2d8afaf02447d
 SHA512:
-  metadata.gz: 572c37f621fb53e89ecf40ec04d4815edcd0f0febb65fea8cfcfb69f156ce0b170bdaf69665838744e512ab0c4720e9a7db6cf3b2496e71a76aacc854caf6957
-  data.tar.gz: f29be28d61a6b06d10a268bf4c88adc84dfb8ae947aa10a8491acf40ac009a554d32a185b3fb71f50f37210fe5e1e3d855c2c5d148da0862cfd63401d57d70f0
+  metadata.gz: 5dc98531b0877703e1f57b9ba4e601bee6c1fe2556b959cbc876a3fe1b43564b16f78a9973c9c066784c0e3de393d3a2686c63776a748439bf7c761ec16d8815
+  data.tar.gz: 5f8dcce29250233c2d513d427b99f1eb77dbb6dba9cca72e9dc9854681f6af6fc503839ee8a66a1f0151bf61afb235e614cc8365fb794a84229db1e73fd437fe

data/lib/arrow-dataset/arrow-table-loadable.rb

@@ -36,13 +36,21 @@ module ArrowDataset
     end
 
     def internal_load_from_uri(uri)
-      format = FileFormat.resolve(@options[:format])
+      options = @options.dup
+      format = FileFormat.resolve(options.delete(:format))
       dataset = FileSystemDataset.build(format) do |factory|
         factory.file_system_uri = uri
+        finish_options = FinishOptions.new
+        FinishOptions.instance_methods(false).each do |method|
+          next unless method.to_s.end_with?("=")
+          value = options.delete(method[0..-2].to_sym)
+          next if value.nil?
+          finish_options.public_send(method, value)
+        end
+        finish_options
       end
       scanner_builder = dataset.begin_scan
-      @options.each do |key, value|
-        next if key == :format
+      options.each do |key, value|
         next if value.nil?
         setter = "#{key}="
         next unless scanner_builder.respond_to?(setter)

data/lib/arrow-dataset/dataset.rb

@@ -21,8 +21,11 @@ module ArrowDataset
       def build(*args)
         factory_class = ArrowDataset.const_get("#{name}Factory")
         factory = factory_class.new(*args)
-        yield(factory)
-        factory.finish
+        options = yield(factory)
+        unless options.is_a?(FinishOptions)
+          options = FinishOptions.try_convert(options)
+        end
+        factory.finish(options)
       end
     end
   end

data/lib/arrow-dataset/finish-options.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.
+
+module ArrowDataset
+  class FinishOptions
+    class << self
+      # @api private
+      def try_convert(value)
+        case value
+        when Hash
+          options = new
+          value.each do |k, v|
+            setter = "#{k}="
+            next unless options.respond_to?(setter)
+            options.public_send(setter, v)
+          end
+          options
+        else
+          nil
+        end
+      end
+    end
+  end
+end

data/lib/arrow-dataset/loader.rb

@@ -34,6 +34,7 @@ module ArrowDataset
       require "arrow-dataset/dataset"
       require "arrow-dataset/file-format"
       require "arrow-dataset/file-system-dataset-factory"
+      require "arrow-dataset/finish-options"
     end
   end
 end

data/lib/arrow-dataset/version.rb

@@ -16,7 +16,7 @@
 # under the License.
 
 module ArrowDataset
-  VERSION = "10.0.0"
+  VERSION = "11.0.0"
 
   module Version
     numbers, TAG = VERSION.split("-")

data/test/test-arrow-table.rb

@@ -76,5 +76,18 @@ class TestArrowTable < Test::Unit::TestCase
                    Arrow::Table.load(@dir,
                                      filter: ["equal", :visible, true]))
     end
+
+    def test_schema
+      uri = build_file_uri(@path1)
+      @table1.save(uri)
+      schema = Arrow::Schema.new(visible: :boolean,
+                                 point: :int64)
+      assert_equal(Arrow::Table.new(schema,
+                                    [
+                                      @table1[:visible].data,
+                                      @table1[:point].cast(:int64),
+                                    ]),
+                   Arrow::Table.load(uri, schema: schema))
+    end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: red-arrow-dataset
 version: !ruby/object:Gem::Version
-  version: 10.0.0
+  version: 11.0.0
 platform: ruby
 authors:
 - Apache Arrow Developers
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-11-04 00:00:00.000000000 Z
+date: 2023-02-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: red-arrow
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 10.0.0
+        version: 11.0.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 10.0.0
+        version: 11.0.0
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -87,6 +87,7 @@ files:
 - lib/arrow-dataset/dataset.rb
 - lib/arrow-dataset/file-format.rb
 - lib/arrow-dataset/file-system-dataset-factory.rb
+- lib/arrow-dataset/finish-options.rb
 - lib/arrow-dataset/loader.rb
 - lib/arrow-dataset/version.rb
 - red-arrow-dataset.gemspec
@@ -113,7 +114,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.3.15
+rubygems_version: 3.5.0.dev
 signing_key:
 specification_version: 4
 summary: Red Arrow Dataset is the Ruby bindings of Apache Arrow Dataset