red-arrow 8.0.0 → 24.0.0

data/lib/arrow/timestamp-array-builder.rb

@@ -18,31 +18,19 @@
 module Arrow
   class TimestampArrayBuilder
     class << self
-      def build(unit_or_data_type, values)
-        builder = new(unit_or_data_type)
+      def build(data_type, values)
+        builder = new(data_type)
         builder.build(values)
       end
     end
 
-    alias_method :initialize_raw, :initialize
-    def initialize(unit_or_data_type)
-      case unit_or_data_type
-      when DataType
-        data_type = unit_or_data_type
-      else
-        unit = unit_or_data_type
-        data_type = TimestampDataType.new(unit)
-      end
-      initialize_raw(data_type)
-    end
-
     private
     def unit_id
       @unit_id ||= value_data_type.unit.nick.to_sym
     end
 
     def convert_to_arrow_value(value)
-      if value.respond_to?(:to_time) and not value.is_a?(Time)
+      if value.respond_to?(:to_time) and not value.is_a?(::Time)
         value = value.to_time
       end
 

data/lib/arrow/timestamp-data-type.rb

@@ -17,41 +17,16 @@
 
 module Arrow
   class TimestampDataType
-    alias_method :initialize_raw, :initialize
-    private :initialize_raw
-
-    # Creates a new {Arrow::TimestampDataType}.
-    #
-    # @overload initialize(unit)
-    #
-    #   @param unit [Arrow::TimeUnit, Symbol] The unit of the
-    #     timestamp data type.
-    #
-    #   @example Create a timestamp data type with Arrow::TimeUnit
-    #     Arrow::TimestampDataType.new(Arrow::TimeUnit::MILLI)
-    #
-    #   @example Create a timestamp data type with Symbol
-    #     Arrow::TimestampDataType.new(:milli)
-    #
-    # @overload initialize(description)
-    #
-    #   @param description [Hash] The description of the timestamp data
-    #     type. It must have `:unit` value.
-    #
-    #   @option description [Arrow::TimeUnit, Symbol] :unit The unit of
-    #     the timestamp data type.
-    #
-    #   @example Create a timestamp data type with Arrow::TimeUnit
-    #     Arrow::TimestampDataType.new(unit: Arrow::TimeUnit::MILLI)
-    #
-    #   @example Create a timestamp data type with Symbol
-    #     Arrow::TimestampDataType.new(unit: :milli)
-    def initialize(unit)
-      if unit.is_a?(Hash)
-        description = unit
-        unit = description[:unit]
+    class << self
+      # @api private
+      def try_convert(value)
+        case value
+        when Symbol, Arrow::TimeUnit
+          new(value)
+        else
+          super
+        end
       end
-      initialize_raw(unit)
     end
   end
 end

data/{test/test-date64-array.rb → lib/arrow/timestamp-parser.rb}

@@ -15,11 +15,19 @@
 # specific language governing permissions and limitations
 # under the License.
 
-class Date64ArrayTest < Test::Unit::TestCase
-  test("#[]") do
-    n_msecs_since_epoch = 1503878400000 # 2017-08-28T00:00:00Z
-    array = Arrow::Date64Array.new([n_msecs_since_epoch])
-    assert_equal(DateTime.new(2017, 8, 28, 0, 0, 0),
-                 array[0])
+module Arrow
+  class TimestampParser
+    class << self
+      def try_convert(value)
+        case value
+        when :iso8601
+          ISO8601TimestampParser.new
+        when String
+          StrptimeTimestampParser.new(value)
+        else
+          nil
+        end
+      end
+    end
   end
 end

data/lib/arrow/union-array-builder.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 Arrow
+  class UnionArrayBuilder
+    def append_values(values, is_valids=nil)
+      if is_valids
+        is_valids.each_with_index do |is_valid, i|
+          if is_valid
+            append_value(values[i])
+          else
+            append_null
+          end
+        end
+      else
+        values.each do |value|
+          append_value(value)
+        end
+      end
+    end
+
+    alias_method :append_child_raw, :append_child
+    def append_child(builder, filed_name=nil)
+      @child_infos = nil
+      append_child_raw(builder, field_name)
+    end
+
+    private
+    def child_infos
+      @child_infos ||= create_child_infos
+    end
+
+    def create_child_infos
+      infos = {}
+      type = value_data_type
+      type.fields.zip(children, type.type_codes).each do |field, child, id|
+        infos[field.name] = {
+          builder: child,
+          id: id,
+        }
+      end
+      infos
+    end
+  end
+end

data/lib/arrow/union-array.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 Arrow
+  class UnionArray
+    def fields
+      @fields ||= n_fields.times.collect do |i|
+        get_field(i)
+      end
+    end
+  end
+end

data/lib/arrow/version.rb

@@ -16,7 +16,7 @@
 # under the License.
 
 module Arrow
-  VERSION = "8.0.0"
+  VERSION = "24.0.0"
 
   module Version
     numbers, TAG = VERSION.split("-")

data/lib/arrow.rb

@@ -15,16 +15,11 @@
 # specific language governing permissions and limitations
 # under the License.
 
-require "extpp/setup"
-require "gio2"
-
 require "arrow/version"
 
-require "arrow/loader"
-
 module Arrow
   class Error < StandardError
   end
-
-  Loader.load
 end
+
+require_relative "arrow/#{RUBY_ENGINE}"

data/red-arrow.gemspec

@@ -20,7 +20,11 @@
 require_relative "lib/arrow/version"
 
 Gem::Specification.new do |spec|
+  is_jruby = RUBY_ENGINE == "jruby"
+
   spec.name = "red-arrow"
+  spec.platform = "java" if is_jruby
+
   version_components = [
     Arrow::Version::MAJOR.to_s,
     Arrow::Version::MINOR.to_s,
@@ -29,13 +33,13 @@ Gem::Specification.new do |spec|
   ]
   spec.version = version_components.compact.join(".")
   spec.homepage = "https://arrow.apache.org/"
-  spec.authors = ["Apache Arrow Developers"]
+  spec.authors = ["The Apache Software Foundation"]
   spec.email = ["dev@arrow.apache.org"]
 
   spec.summary = "Red Arrow is the Ruby bindings of Apache Arrow"
   spec.description =
     "Apache Arrow is a common in-memory columnar data store. " +
-    "It's useful to share and process large data."
+    "It's useful to share and process large data efficiently."
   spec.license = "Apache-2.0"
   spec.files = ["README.md", "Rakefile", "Gemfile", "#{spec.name}.gemspec"]
   spec.files += ["LICENSE.txt", "NOTICE.txt"]
@@ -43,16 +47,75 @@ Gem::Specification.new do |spec|
   spec.files += Dir.glob("lib/**/*.rb")
   spec.files += Dir.glob("image/*.*")
   spec.files += Dir.glob("doc/text/*")
-  spec.test_files += Dir.glob("test/**/*")
-  spec.extensions = ["ext/arrow/extconf.rb"]
+  spec.extensions = ["ext/arrow/extconf.rb"] unless is_jruby
+
+  required_arrow_glib_version = version_components[0, 3].join(".")
+
+  spec.add_runtime_dependency("bigdecimal", ">= 3.1.0")
+  spec.add_runtime_dependency("csv")
+  if is_jruby
+    spec.add_runtime_dependency("jar-dependencies")
+    spec.requirements << "jar org.apache.arrow, arrow-vector, #{spec.version}"
+    spec.requirements << "jar org.apache.arrow, arrow-memory-netty, #{spec.version}"
+  else
+    spec.add_runtime_dependency("extpp", ">= 0.1.2")
+    spec.add_runtime_dependency("gio2", ">= 4.2.3")
+    spec.add_runtime_dependency("pkg-config")
+
+    repository_url_prefix = "https://packages.apache.org/artifactory/arrow"
+    [
+      # Try without additional repository
+      ["amazon_linux", "arrow-glib-devel"],
+      # Retry with additional repository
+      [
+        "amazon_linux",
+        "#{repository_url_prefix}/amazon-linux/%{version}/" +
+        "apache-arrow-release-latest.rpm",
+      ],
+      ["amazon_linux", "arrow-glib-devel"],
+
+      # Try without additional repository
+      ["centos", "arrow-glib-devel"],
+      # Retry with additional repository
+      [
+        "centos",
+        "#{repository_url_prefix}/centos/%{major_version}-stream/" +
+        "apache-arrow-release-latest.rpm",
+      ],
+      ["centos", "arrow-glib-devel"],
+
+      ["conda", "arrow-c-glib"],
+
+      # Try without additional repository
+      ["debian", "libarrow-glib-dev"],
+      # Retry with additional repository
+      [
+        "debian",
+        "#{repository_url_prefix}/%{distribution}/" +
+        "apache-arrow-apt-source-latest-%{code_name}.deb",
+      ],
+      ["debian", "libarrow-glib-dev"],
+
+      ["fedora", "libarrow-glib-devel"],
+
+      ["homebrew", "apache-arrow-glib"],
 
-  spec.add_runtime_dependency("bigdecimal", ">= 2.0.3")
-  spec.add_runtime_dependency("extpp", ">= 0.0.7")
-  spec.add_runtime_dependency("gio2", ">= 3.5.0")
-  spec.add_runtime_dependency("native-package-installer")
-  spec.add_runtime_dependency("pkg-config")
+      # Try without additional repository
+      ["rhel", "arrow-glib-devel"],
+      # Retry with additional repository
+      [
+        "rhel",
+        "#{repository_url_prefix}/almalinux/%{major_version}/" +
+        "apache-arrow-release-latest.rpm",
+      ],
+      ["rhel", "arrow-glib-devel"],
+    ].each do |platform, package|
+      spec.requirements <<
+        "system: arrow-glib>=#{required_arrow_glib_version}: " +
+        "#{platform}: #{package}"
+    end
+  end
 
-  required_msys2_package_version = version_components[0, 3].join(".")
   spec.metadata["msys2_mingw_dependencies"] =
-    "arrow>=#{required_msys2_package_version}"
+    "arrow>=#{required_arrow_glib_version}"
 end