switch from view to viewhint in Tables.subset (#3181)

Author: bkamins

Project.toml

@@ -36,7 +36,7 @@ Reexport = "0.1, 0.2, 1"
 ShiftedArrays = "1, 2"
 SortingAlgorithms = "0.1, 0.2, 0.3, 1"
 TableTraits = "0.4, 1"
-Tables = "1.8.1"
+Tables = "1.9.0"
 Unitful = "1"
 julia = "1.6"
 

src/other/tables.jl

@@ -106,9 +106,9 @@ IteratorInterfaceExtensions.getiterator(df::AbstractDataFrame) =
 IteratorInterfaceExtensions.isiterable(x::AbstractDataFrame) = true
 TableTraits.isiterabletable(x::AbstractDataFrame) = true
 
-@inline function Tables.subset(df::AbstractDataFrame, inds; view::Union{Bool, Nothing}=nothing)
-    res = view === true ? DataFrames.view(df, inds, :) : df[inds, :]
-    if res isa DataFrameRow && view === false
+@inline function Tables.subset(df::AbstractDataFrame, inds; viewhint::Union{Bool, Nothing}=nothing)
+    res = viewhint === true ? view(df, inds, :) : df[inds, :]
+    if res isa DataFrameRow && viewhint === false
         return copy(res)
     else
         return res

test/tables.jl

@@ -329,40 +329,40 @@ end
     res = @inferred Tables.subset(df, :)
     @test res isa DataFrame
     @test res == DataFrame(a=1:3, b=4:6)
-    res = Tables.subset(df, :, view=false)
+    res = Tables.subset(df, :, viewhint=false)
     @test res isa DataFrame
     @test res == DataFrame(a=1:3, b=4:6)
-    res = Tables.subset(df, :, view=true)
+    res = Tables.subset(df, :, viewhint=true)
     @test res isa SubDataFrame
     @test res == DataFrame(a=1:3, b=4:6)
 
     res = @inferred Tables.subset(df, [3, 1])
     @test res isa DataFrame
     @test res == DataFrame(a=[3, 1], b=[6, 4])
-    res = Tables.subset(df, [3, 1], view=false)
+    res = Tables.subset(df, [3, 1], viewhint=false)
     @test res isa DataFrame
     @test res == DataFrame(a=[3, 1], b=[6, 4])
-    res = Tables.subset(df, [3, 1], view=true)
+    res = Tables.subset(df, [3, 1], viewhint=true)
     @test res isa SubDataFrame
     @test res == DataFrame(a=[3, 1], b=[6, 4])
 
     res = @inferred Tables.subset(df, [true, false, true])
     @test res isa DataFrame
     @test res == DataFrame(a=[1, 3], b=[4, 6])
-    res = Tables.subset(df, [1, 3], view=false)
+    res = Tables.subset(df, [1, 3], viewhint=false)
     @test res isa DataFrame
     @test res == DataFrame(a=[1, 3], b=[4, 6])
-    res = Tables.subset(df, [1, 3], view=true)
+    res = Tables.subset(df, [1, 3], viewhint=true)
     @test res isa SubDataFrame
     @test res == DataFrame(a=[1, 3], b=[4, 6])
 
     res = @inferred Tables.subset(df, 2)
     @test res isa DataFrameRow
     @test res == DataFrame(a=2, b=5)[1, :]
-    res = Tables.subset(df, 2, view=false)
+    res = Tables.subset(df, 2, viewhint=false)
     @test res isa NamedTuple{(:a, :b), Tuple{Int, Int}}
     @test res == (a=2, b=5)
-    res = Tables.subset(df, 2, view=true)
+    res = Tables.subset(df, 2, viewhint=true)
     @test res isa DataFrameRow
     @test res == DataFrame(a=2, b=5)[1, :]
 end