Skip to content

Commit 7ce24d6

Browse files
author
Dan Corneanu
committed
Revert "Preserver type of empty datasets"
This reverts commit e7e8fa5.
1 parent 56a0ab1 commit 7ce24d6

File tree

2 files changed

+3
-12
lines changed

2 files changed

+3
-12
lines changed

lib/red_amber/data_frame_variable_operation.rb

Lines changed: 2 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -675,12 +675,7 @@ def update_fields_and_arrays(updater)
675675
raise DataFrameArgumentError, "Data size mismatch (#{data.size} != #{size})"
676676
end
677677

678-
if data.is_a?(Vector)
679-
a = data.data
680-
else
681-
a = Arrow::Array.new(data)
682-
end
683-
678+
a = Arrow::Array.new(data.is_a?(Vector) ? data.to_a : data)
684679
fields[i] = Arrow::Field.new(key, a.value_data_type)
685680
arrays[i] = Arrow::ChunkedArray.new([a])
686681
end
@@ -694,11 +689,7 @@ def append_to_fields_and_arrays(appender, fields, arrays, append_to_left)
694689
raise DataFrameArgumentError, "Data size mismatch (#{data.size} != #{size})"
695690
end
696691

697-
if data.is_a?(Vector)
698-
a = data.data
699-
else
700-
a = Arrow::Array.new(data)
701-
end
692+
a = Arrow::Array.new(data.is_a?(Vector) ? data.to_a : data)
702693

703694
if append_to_left
704695
fields.unshift(Arrow::Field.new(key.to_sym, a.value_data_type))

test/test_group.rb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -250,7 +250,7 @@ class GroupTest < Test::Unit::TestCase
250250
Vectors : 3 numeric
251251
# key type level data_preview
252252
0 :i uint8 4 [0, 1, 2, nil], 1 nil
253-
1 :count int64 3 [2, 1, 2, 0]
253+
1 :count uint8 3 [2, 1, 2, 0]
254254
2 :"sum(f)" double 4 [1.1, 2.2, NaN, nil], 1 NaN, 1 nil
255255
STR
256256
assert_equal str, @df.group(:i) { [count(:i, :f, :b), sum] }.tdr_str(tally: 0)

0 commit comments

Comments
 (0)