red-arrow-dataset 4.0.1 → 7.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 00cf96f680d62ad003d931b3628313f83dd351b34222a59e5d1f85018ea20d7e
-  data.tar.gz: 399966d45ae4bb31868c9ae21df1b5ee6e6738297597b8536718db398f2a927b
+  metadata.gz: 65cd29db2fd974c5f9f645dbb15fc9b60fc18795888ed2625238b7af530b39b2
+  data.tar.gz: b4097a34d26ff22b1d42aa1d88e81aa499f55de83f1a68cb75fddc71aa47747a
 SHA512:
-  metadata.gz: c61e5f5ecd8ed9b027091a55ca9213e206c71c7d13c6f11714ec4ad9cdf58c45b4811a46315e267a9fcbf7d5d7a893af2b2dd935dce23c6c898d0c4ae37f4a83
-  data.tar.gz: 0acea5814073860de6780405ff597227dd9fc0971b1312f2e51af2e43c710650968b301160ba4542498189728fb87f2a66cc9344293d80ea71efaba8fe25166c
+  metadata.gz: 207d36ef73e6a044375f16fdcc752c126b404cc9e49c573d226cabe1a380897bce63babd1ad229354f212d4ec2e8532f0cddfac1de894b9aed0239db8714eceb
+  data.tar.gz: b446b7e0b2fb95b80b77a7106d8de68f0bb9092e3228fa10bfe7f2cd8d90d58621f413e876cfd23f4b63c586a1ecb6a0c4607bcc2796dde90f6bc51586eeb497

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

@@ -0,0 +1,61 @@
+# 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
+  module ArrowTableLoadable
+    private
+    def path_to_uri(path)
+      absolute_path = ::File.expand_path(path)
+      if absolute_path.start_with?("/")
+        URI("file://#{absolute_path}")
+      else
+        URI("file:///#{absolute_path}")
+      end
+    end
+
+    def load_from_directory
+      internal_load_from_uri(path_to_uri(@input))
+    end
+
+    def load_from_uri
+      internal_load_from_uri(@input)
+    end
+
+    def internal_load_from_uri(uri)
+      format = FileFormat.resolve(@options[:format])
+      dataset = FileSystemDataset.build(format) do |factory|
+        factory.file_system_uri = uri
+      end
+      scanner_builder = dataset.begin_scan
+      @options.each do |key, value|
+        next if key == :format
+        next if value.nil?
+        setter = "#{key}="
+        next unless scanner_builder.respond_to?(setter)
+        scanner_builder.public_send(setter, value)
+      end
+      scanner = scanner_builder.finish
+      scanner.to_table
+    end
+  end
+end
+
+module Arrow
+  class TableLoader
+    include ArrowDataset::ArrowTableLoadable
+  end
+end

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

@@ -0,0 +1,69 @@
+# 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
+  module ArrowTableSavable
+    private
+    def save_to_uri
+      format = FileFormat.resolve(@options[:format])
+      options = FileSystemDatasetWriteOptions.new
+      options.file_write_options = format.default_write_options
+      path = @output.path
+      if @output.scheme.nil?
+        options.file_system = Arrow::LocalFileSystem.new
+      else
+        options.file_system = Arrow::FileSystem.create(@output.to_s)
+        # /C:/... -> C:/...
+        unless File.expand_path(".").start_with?("/")
+          path = path.gsub(/\A\//, "")
+        end
+      end
+      partitioning = @options[:partitioning]
+      if partitioning
+        # TODO
+        options.base_dir = File.dirname(path)
+        options.base_name_template = File.basename(path)
+        options.partitioning = Partitioning.resolve(@options[:partitioning])
+        scanner_builder = ScannerBuilder.new(@table)
+        scanner_builder.use_async(true)
+        scanner = scanner_builder.finish
+        FileSystemDataset.write_scanner(scanner, options)
+      else
+        dir = File.dirname(path)
+        unless File.exist?(dir)
+          options.file_system.create_dir(dir, true)
+        end
+        options.file_system.open_output_stream(path) do |output_stream|
+          format.open_writer(output_stream,
+                             options.file_system,
+                             path,
+                             @table.schema,
+                             format.default_write_options) do |writer|
+            reader = Arrow::TableBatchReader.new(@table)
+            writer.write_record_batch_reader(reader)
+          end
+        end
+      end
+    end
+  end
+end
+
+module Arrow
+  class TableSaver
+    include ArrowDataset::ArrowTableSavable
+  end
+end

data/lib/arrow-dataset/{scan-options.rb → dataset.rb}

@@ -16,21 +16,13 @@
 # under the License.
 
 module ArrowDataset
-  class ScanOptions
+  class Dataset
     class << self
-      def try_convert(value)
-        case value
-        when Hash
-          return nil unless value.key?(:schema)
-          options = new(value[:schema])
-          value.each do |name, value|
-            next if name == :schema
-            options.__send__("#{name}=", value)
-          end
-          options
-        else
-          nil
-        end
+      def build(*args)
+        factory_class = ArrowDataset.const_get("#{name}Factory")
+        factory = factory_class.new(*args)
+        yield(factory)
+        factory.finish
       end
     end
   end

data/lib/arrow-dataset/file-format.rb

@@ -0,0 +1,59 @@
+# 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 FileFormat
+    class << self
+      def resolve(format)
+        case format
+        when :arrow, :arrow_file, :arrow_streaming
+          IPCFileFormat.new
+        when :parquet
+          ParquetFileFormat.new
+        when :csv
+          CSVFileFormat.new
+        else
+          available_formats = [
+            :arrow,
+            :arrow_file,
+            :arrow_streaming,
+            :parquet,
+            :csv,
+          ]
+          message = "Arrow::Table load format must be one of ["
+          message << available_formats.join(", ")
+          message << "]: #{@options[:format].inspect}"
+          raise ArgumentError, message
+        end
+      end
+    end
+
+    alias_method :open_writer_raw, :open_writer
+    def open_writer(destination, file_system, path, schema, options)
+      writer = open_writer_raw(destination, file_system, path, schema, options)
+      if block_given?
+        begin
+          yield(writer)
+        ensure
+          writer.finish
+        end
+      else
+        writer
+      end
+    end
+  end
+end

data/lib/arrow-dataset/{in-memory-fragment.rb → file-system-dataset-factory.rb}

@@ -16,17 +16,24 @@
 # under the License.
 
 module ArrowDataset
-  class InMemoryFragment
-    alias_method :initialize_raw, :initialize
-    private :initialize_raw
-    def initialize(schema, record_batches)
-      record_batches = record_batches.collect do |record_batch|
-        unless record_batch.is_a?(Arrow::RecordBatch)
-          record_batch = Arrow::RecordBatch.new(record_batch)
+  class FileSystemDatasetFactory
+    alias_method :set_file_system_uri_raw, :set_file_system_uri
+    def set_file_system_uri(uri)
+      if uri.is_a?(URI)
+        if uri.scheme.nil?
+          uri = uri.dup
+          absolute_path = File.expand_path(uri.path)
+          if absolute_path.start_with?("/")
+            uri.path = absolute_path
+          else
+            uri.path = "/#{absolute_path}"
+          end
+          uri.scheme = "file"
         end
-        record_batch
+        uri = uri.to_s
       end
-      initialize_raw(schema, record_batches)
+      set_file_system_uri_raw(uri)
     end
+    alias_method :file_system_uri=, :set_file_system_uri
   end
 end

data/lib/arrow-dataset/loader.rb

@@ -29,8 +29,11 @@ module ArrowDataset
     end
 
     def require_libraries
-      require "arrow-dataset/in-memory-scan-task"
-      require "arrow-dataset/scan-options"
+      require "arrow-dataset/arrow-table-loadable"
+      require "arrow-dataset/arrow-table-savable"
+      require "arrow-dataset/dataset"
+      require "arrow-dataset/file-format"
+      require "arrow-dataset/file-system-dataset-factory"
     end
   end
 end

data/lib/arrow-dataset/version.rb

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

data/test/helper.rb

@@ -17,4 +17,6 @@
 
 require "arrow-dataset"
 
+require "tmpdir"
+
 require "test-unit"

data/test/test-arrow-table.rb

@@ -0,0 +1,80 @@
+# 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 TestArrowTable < Test::Unit::TestCase
+  def setup
+    Dir.mktmpdir do |tmpdir|
+      @dir = tmpdir
+      @path1 = File.join(@dir, "data", "table1.arrow")
+      @table1 = Arrow::Table.new(visible: [true, false, true],
+                                 point: [1, 2, 3])
+      @path2 = File.join(@dir, "data", "table2.arrow")
+      @table2 = Arrow::Table.new(visible: [true],
+                                 point: [10])
+      yield
+    end
+  end
+
+  def build_file_uri(path)
+    absolute_path = File.expand_path(path)
+    if absolute_path.start_with?("/")
+      URI("file://#{absolute_path}")
+    else
+      URI("file:///#{absolute_path}")
+    end
+  end
+
+  sub_test_case("load") do
+    def test_no_scheme
+      Dir.chdir(@dir) do
+        uri = URI(File.basename(@path1))
+        @table1.save(uri)
+        assert_equal(@table1, Arrow::Table.load(uri))
+      end
+    end
+
+    def test_file
+      uri = build_file_uri(@path1)
+      @table1.save(uri)
+      assert_equal(@table1, Arrow::Table.load(uri))
+    end
+
+    def test_directory_uri
+      uri = build_file_uri(@dir)
+      @table1.save(build_file_uri(@path1))
+      @table2.save(build_file_uri(@path2))
+      assert_equal(@table1.concatenate([@table2]),
+                   Arrow::Table.load(uri))
+    end
+
+    def test_directory_path
+      @table1.save(build_file_uri(@path1))
+      @table2.save(build_file_uri(@path2))
+      assert_equal(@table1.concatenate([@table2]),
+                   Arrow::Table.load(@dir))
+    end
+
+    def test_filter
+      @table1.save(build_file_uri(@path1))
+      @table2.save(build_file_uri(@path2))
+      assert_equal(Arrow::Table.new(visible: [true, true, true],
+                                    point: [1, 3, 10]),
+                   Arrow::Table.load(@dir,
+                                     filter: ["equal", :visible, true]))
+    end
+  end
+end

data/test/{test-scan-options.rb → test-file-system-dataset.rb}

@@ -15,22 +15,24 @@
 # specific language governing permissions and limitations
 # under the License.
 
-class TestScanOptions < Test::Unit::TestCase
+class TestFileSystemDataset < Test::Unit::TestCase
   def setup
-    @record_batches = [
-      Arrow::RecordBatch.new(visible: [true, false, true],
-                             point: [1, 2, 3]),
-    ]
-    @schema = @record_batches.first.schema
+    Dir.mktmpdir do |tmpdir|
+      @dir = tmpdir
+      @path = File.join(@dir, "table.arrow")
+      @table = Arrow::Table.new(visible: [true, false, true],
+                                point: [1, 2, 3])
+      @table.save(@path)
+      @format = ArrowDataset::IPCFileFormat.new
+      yield
+    end
   end
 
-  sub_test_case(".try_convert") do
-    def test_hash
-      batch_size = 1024
-      context = ArrowDataset::ScanOptions.try_convert(schema: @schema,
-                                                      batch_size: batch_size)
-      assert_equal([@schema, batch_size],
-                   [context.schema, context.batch_size])
+  test(".build") do
+    dataset = ArrowDataset::FileSystemDataset.build(@format) do |factory|
+      factory.file_system = Arrow::LocalFileSystem.new
+      factory.add_path(File.expand_path(@path))
     end
+    assert_equal(@table, dataset.to_table)
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: red-arrow-dataset
 version: !ruby/object:Gem::Version
-  version: 4.0.1
+  version: 7.0.0
 platform: ruby
 authors:
 - Apache Arrow Developers
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-05-27 00:00:00.000000000 Z
+date: 2022-02-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: red-arrow
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 4.0.1
+        version: 7.0.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 4.0.1
+        version: 7.0.0
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -82,16 +82,18 @@ files:
 - Rakefile
 - dependency-check/Rakefile
 - lib/arrow-dataset.rb
-- lib/arrow-dataset/in-memory-fragment.rb
-- lib/arrow-dataset/in-memory-scan-task.rb
+- lib/arrow-dataset/arrow-table-loadable.rb
+- lib/arrow-dataset/arrow-table-savable.rb
+- lib/arrow-dataset/dataset.rb
+- lib/arrow-dataset/file-format.rb
+- lib/arrow-dataset/file-system-dataset-factory.rb
 - lib/arrow-dataset/loader.rb
-- lib/arrow-dataset/scan-options.rb
 - lib/arrow-dataset/version.rb
 - red-arrow-dataset.gemspec
 - test/helper.rb
 - test/run-test.rb
-- test/test-in-memory-scan-task.rb
-- test/test-scan-options.rb
+- test/test-arrow-table.rb
+- test/test-file-system-dataset.rb
 homepage: https://arrow.apache.org/
 licenses:
 - Apache-2.0
@@ -111,12 +113,12 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.2.5
+rubygems_version: 3.4.0.dev
 signing_key: 
 specification_version: 4
 summary: Red Arrow Dataset is the Ruby bindings of Apache Arrow Dataset
 test_files:
 - test/helper.rb
 - test/run-test.rb
-- test/test-scan-options.rb
-- test/test-in-memory-scan-task.rb
+- test/test-arrow-table.rb
+- test/test-file-system-dataset.rb

data/lib/arrow-dataset/in-memory-scan-task.rb

@@ -1,35 +0,0 @@
-# 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 InMemoryScanTask
-    alias_method :initialize_raw, :initialize
-    private :initialize_raw
-    def initialize(record_batches, **options)
-      record_batches = record_batches.collect do |record_batch|
-        unless record_batch.is_a?(Arrow::RecordBatch)
-          record_batch = Arrow::RecordBatch.new(record_batch)
-        end
-        record_batch
-      end
-      options[:schema] ||= record_batches.first.schema
-      fragment = options.delete(:fragment)
-      fragment ||= InMemoryFragment.new(options[:schema], record_batches)
-      initialize_raw(record_batches, options, fragment)
-    end
-  end
-end

data/test/test-in-memory-scan-task.rb

@@ -1,33 +0,0 @@
-# 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 TestInMemoryScanTask < Test::Unit::TestCase
-  def setup
-    @record_batches = [
-      Arrow::RecordBatch.new(visible: [true, false, true],
-                             point: [1, 2, 3]),
-    ]
-  end
-
-  sub_test_case(".new") do
-    test("[[Arrow::RecordBatch]]") do
-      scan_task = ArrowDataset::InMemoryScanTask.new(@record_batches)
-      assert_equal(@record_batches,
-                   scan_task.execute.to_a)
-    end
-  end
-end