Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
26 changes: 26 additions & 0 deletions ruby/red-arrow-format/lib/arrow-format/array.rb
Original file line number Diff line number Diff line change
Expand Up @@ -480,6 +480,32 @@ class ListArray < VariableSizeListArray
class LargeListArray < VariableSizeListArray
end

class FixedSizeListArray < Array
attr_reader :child
def initialize(type, size, validity_buffer, child)
super(type, size, validity_buffer)
@child = child
end

def each_buffer(&block)
return to_enum(__method__) unless block_given?

yield(slice_bitmap_buffer(:validity, @validity_buffer))
end

def to_a
values = @child.to_a.each_slice(@type.size).to_a
apply_validity(values)
end

private
def slice!(offset, size)
super
@child = @child.slice(@type.size * @offset,
@type.size * (@offset + @size + 1))
end
end

class StructArray < Array
attr_reader :children
def initialize(type, size, validity_buffer, children)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
# specific language governing permissions and limitations
# under the License.

require_relative "flat-buffers"
require_relative "flatbuffers"

module ArrowFormat
module BufferAlignable
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,7 @@
require_relative "org/apache/arrow/flatbuf/dictionary_batch"
require_relative "org/apache/arrow/flatbuf/duration"
require_relative "org/apache/arrow/flatbuf/fixed_size_binary"
require_relative "org/apache/arrow/flatbuf/fixed_size_list"
require_relative "org/apache/arrow/flatbuf/floating_point"
require_relative "org/apache/arrow/flatbuf/footer"
require_relative "org/apache/arrow/flatbuf/int"
Expand Down
8 changes: 7 additions & 1 deletion ruby/red-arrow-format/lib/arrow-format/readable.rb
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@

require_relative "array"
require_relative "field"
require_relative "flat-buffers"
require_relative "flatbuffers"
require_relative "record-batch"
require_relative "schema"
require_relative "type"
Expand Down Expand Up @@ -101,6 +101,9 @@ def read_field(fb_field)
type = ListType.new(read_field(fb_field.children[0]))
when FB::LargeList
type = LargeListType.new(read_field(fb_field.children[0]))
when FB::FixedSizeList
type = FixedSizeListType.new(read_field(fb_field.children[0]),
fb_type.list_size)
when FB::Struct
children = fb_field.children.collect {|child| read_field(child)}
type = StructType.new(children)
Expand Down Expand Up @@ -223,6 +226,9 @@ def read_column(field, nodes, buffers, body)
offsets = body.slice(offsets_buffer.offset, offsets_buffer.length)
child = read_column(field.type.child, nodes, buffers, body)
field.type.build_array(length, validity, offsets, child)
when FixedSizeListType
child = read_column(field.type.child, nodes, buffers, body)
field.type.build_array(length, validity, child)
when StructType
children = field.type.children.collect do |child|
read_column(child, nodes, buffers, body)
Expand Down
28 changes: 28 additions & 0 deletions ruby/red-arrow-format/lib/arrow-format/type.rb
Original file line number Diff line number Diff line change
Expand Up @@ -856,6 +856,34 @@ def to_flatbuffers
end
end

class FixedSizeListType < Type
attr_reader :child
attr_reader :size
def initialize(child, size)
super()
@child = child
@size = size
end

def name
"FixedSizeList"
end

def to_s
"#{super}<#{child.name}: #{child.type}>(#{@size})"
end

def build_array(size, validity_buffer, child)
FixedSizeListArray.new(self, size, validity_buffer, child)
end

def to_flatbuffers
fb_type = FB::FixedSizeList::Data.new
fb_type.list_size = @size
fb_type
end
end

class StructType < Type
attr_reader :children
def initialize(children)
Expand Down
20 changes: 20 additions & 0 deletions ruby/red-arrow-format/test/test-reader.rb
Original file line number Diff line number Diff line change
Expand Up @@ -561,6 +561,26 @@ def test_large_list
[type.to_s, values])
end

def test_fixed_size_list
data_type = Arrow::FixedSizeListDataType.new({
name: "count",
type: :int8,
},
2)
array = Arrow::FixedSizeListArray.new(data_type,
[[-128, 127], nil, [-1, 1]])
type, values = roundtrip(array)
assert_equal([
"FixedSizeList<count: Int8>(2)",
[
[-128, 127],
nil,
[-1, 1],
],
],
[type.to_s, values])
end

def test_struct
data_type = Arrow::StructDataType.new(count: :int8,
visible: :boolean)
Expand Down
23 changes: 23 additions & 0 deletions ruby/red-arrow-format/test/test-writer.rb
Original file line number Diff line number Diff line change
Expand Up @@ -91,6 +91,9 @@ def convert_type(red_arrow_type)
ArrowFormat::ListType.new(convert_field(red_arrow_type.field))
when Arrow::LargeListDataType
ArrowFormat::LargeListType.new(convert_field(red_arrow_type.field))
when Arrow::FixedSizeListDataType
ArrowFormat::FixedSizeListType.new(convert_field(red_arrow_type.field),
red_arrow_type.list_size)
when Arrow::StructDataType
fields = red_arrow_type.fields.collect do |field|
convert_field(field)
Expand Down Expand Up @@ -161,6 +164,10 @@ def convert_array(red_arrow_array)
convert_buffer(red_arrow_array.null_bitmap),
convert_buffer(red_arrow_array.value_offsets_buffer),
convert_array(red_arrow_array.values_raw))
when ArrowFormat::FixedSizeListType
type.build_array(red_arrow_array.size,
convert_buffer(red_arrow_array.null_bitmap),
convert_array(red_arrow_array.values_raw))
when ArrowFormat::StructType
children = red_arrow_array.fields.collect do |red_arrow_field|
convert_array(red_arrow_field)
Expand Down Expand Up @@ -806,6 +813,22 @@ def test_large_list
[type.to_s, values])
end

def test_fixed_size_list
data_type = Arrow::FixedSizeListDataType.new({
name: "count",
type: :int8,
},
2)
array = Arrow::FixedSizeListArray.new(data_type,
[[-128, 127], nil, [-1, 1]])
type, values = roundtrip(array)
assert_equal([
"fixed_size_list<count: int8>[2]",
[[-128, 127], nil, [-1, 1]],
],
[type.to_s, values])
end

def test_map
data_type = Arrow::MapDataType.new(:string, :int8)
array = Arrow::MapArray.new(data_type,
Expand Down
Loading