Merge d1983de into 040053c

JuliaData · Mar 1, 2021 · b523437 · b523437
2 parents 040053c + d1983de
commit b523437
Show file tree

Hide file tree

Showing 3 changed files with 32 additions and 36 deletions.
diff --git a/Project.toml b/Project.toml
@@ -1,6 +1,6 @@
 name = "PooledArrays"
 uuid = "2dfb63ee-cc39-5dd5-95bd-886bf059d720"
-version = "1.2.0"
+version = "1.2.1"
 
 [deps]
 DataAPI = "9a962f9c-6df0-11e9-0e5d-c546b8b5ee8a"

diff --git a/src/PooledArrays.jl b/src/PooledArrays.jl
@@ -42,11 +42,13 @@ mutable struct PooledArray{T, R<:Integer, N, RA} <: AbstractArray{T, N}
         if length(pool) != length(invpool)
             throw(ArgumentError("inconsistent pool and invpool"))
         end
-        # refs mustn't overflow pool
-        minref, maxref = extrema(rs.a)
-        # 0 indicates #undef
-        if length(rs.a) > 0 && (minref < 0 || maxref > length(invpool))
-            throw(ArgumentError("Reference array points beyond the end of the pool"))
+        if length(rs.a) > 0
+            # 0 indicates #undef
+            # refs mustn't overflow pool
+            minref, maxref = extrema(rs.a)
+            if (minref < 0 || maxref > length(invpool))
+                throw(ArgumentError("Reference array points beyond the end of the pool"))
+            end
         end
         pa = new{T,R,N,RA}(rs.a, pool, invpool, refcount)
         finalizer(x -> Threads.atomic_sub!(x.refcount, 1), pa)
@@ -444,40 +446,25 @@ Base.convert(::Type{Array}, pa::PooledArray{T, R, N}) where {T, R, N} = convert(
 
 # We need separate functions due to dispatch ambiguities
 
-for T in (PooledArray, SubArray{<:Any, <:Any, <:PooledArray})
-    @eval Base.@propagate_inbounds function Base.getindex(A::$T, I::Integer...)
-        idx = DataAPI.refarray(A)[I...]
-        iszero(idx) && throw(UndefRefError())
-        return @inbounds DataAPI.refpool(A)[idx]
-    end
-
-    @eval Base.@propagate_inbounds function Base.getindex(A::$T, I::Union{Real, AbstractVector}...)
-        # make sure we do not increase A.refcount in case creation of newrefs fails
-        newrefs = DataAPI.refarray(A)[I...]
-        @assert newrefs isa AbstractArray
-        Threads.atomic_add!(refcount(A), 1)
-        return PooledArray(RefArray(newrefs), DataAPI.invrefpool(A), DataAPI.refpool(A), refcount(A))
-    end
-end
-
-if VERSION < v"1.1"
-    Base.@propagate_inbounds function Base.getindex(A::SubArray{T,D,P,I,true} ,
-                                                    i::Int) where {I<:Tuple{Union{Base.Slice,
-                                                                                  AbstractUnitRange},
-                                                                            Vararg{Any}}, P<:PooledArray, T, D}
-        idx = DataAPI.refarray(A)[i]
-        iszero(idx) && throw(UndefRefError())
-        return @inbounds DataAPI.refpool(A)[idx]
-    end
-end
-
-# Defined to avoid ambiguities with Base
-Base.@propagate_inbounds function Base.getindex(A::SubArray{<:Any, N, <:PooledArray}, I::Vararg{Int,N}) where {T,N}
-    idx = DataAPI.refarray(A)[I...]
+Base.@propagate_inbounds function Base.getindex(A::PooledArray, I::Int)
+    idx = DataAPI.refarray(A)[I]
     iszero(idx) && throw(UndefRefError())
     return @inbounds DataAPI.refpool(A)[idx]
 end
 
+# we handle fast only the case when the first index is an abstract vector
+# this is to make sure other indexing synraxes use standard dispatch from Base
+# the reason is that creation of DataAPI.refarray(A) is unfortunately slow
+Base.@propagate_inbounds function Base.getindex(A::PooledArrOrSub,
+                                                I1::AbstractVector,
+                                                I2::Union{Real, AbstractVector}...)
+    # make sure we do not increase A.refcount in case creation of newrefs fails
+    newrefs = DataAPI.refarray(A)[I1, I2...]
+    @assert newrefs isa AbstractArray
+    Threads.atomic_add!(refcount(A), 1)
+    return PooledArray(RefArray(newrefs), DataAPI.invrefpool(A), DataAPI.refpool(A), refcount(A))
+end
+
 Base.@propagate_inbounds function Base.isassigned(pa::PooledArrOrSub, I::Int...)
     !iszero(DataAPI.refarray(pa)[I...])
 end

diff --git a/test/runtests.jl b/test/runtests.jl
@@ -11,6 +11,8 @@ else
 end
 
 @testset "PooledArrays" begin
+    @test eltype(PooledArray(Int[])) === Int
+
     a = rand(10)
     b = rand(10,10)
     c = rand(1:10, 1000)
@@ -426,6 +428,13 @@ end
     @test pav[1:1, [1, 2]] == [1 2]
     @test pav[[1], 1:2] == [1 2]
     @test pav[[1], [1, 2]] == [1 2]
+
+    pav2 = view(PooledArray([1]), 1)
+    pa2 = similar(pav2)
+    pa2[] = 10
+
+    @test pav2[] == 1
+    @test pa2[] == 10
 end
 
 @testset "isassigned" begin