Fix undef writes in setindex take 2 (#173)

* add unit tests for range setindex

* Fix issue

* Bump patch version

Author: meggart

Project.toml

@@ -1,7 +1,7 @@
 name = "DiskArrays"
 uuid = "3c3547ce-8d99-4f5e-a174-61eb10b00ae3"
 authors = ["Fabian Gans <[email protected]>"]
-version = "0.4.2"
+version = "0.4.3"
 
 [deps]
 LRUCache = "8ac3fa9e-de4c-5943-b1dc-09c6b5f20637"

src/diskarray.jl

@@ -293,12 +293,16 @@ function setindex_disk_batch!(a,v,i)
     for (output_indices, temparray_indices, data_indices) in zip(moutput_indices, mtemparray_indices, mdata_indicess)
         transfer_results_write!(v, temparray, output_indices, temparray_indices)
         vtemparray = maybeshrink(temparray, a, data_indices)
+        if any(ind->is_sparse_index(ind,density_threshold=1.0),temparray_indices)
+            readblock!(a, vtemparray, data_indices...)
+            transfer_results_write!(v, temparray, output_indices, temparray_indices)
+        end
         writeblock!(a, vtemparray, data_indices...)
     end
 end
 
 function setindex_disk_nobatch!(a,v,i)
-    indices = resolve_indices(a, i, NoBatch())
+    indices = resolve_indices(a, i, NoBatch(batchstrategy(a)))
     outalias = output_aliasing(indices,ndims(a),ndims(v))
     if outalias === :identical
         writeblock!(a, v, indices.data_indices...)
@@ -307,6 +311,13 @@ function setindex_disk_nobatch!(a,v,i)
         writeblock!(a, temparray, indices.data_indices...)
     else
         temparray = Array{eltype(a)}(undef, indices.temparray_size...)
+        if any(ind->is_sparse_index(ind,density_threshold=1.0),indices.temparray_indices)
+            #We have some sparse indexing pattern and are not in a batch situation, so
+            #we need to read before writing
+            #This check could be optimized away in some cases, when writing unit ranges etc, 
+            #but is probably not too expensive
+            readblock!(a, temparray, indices.data_indices...)
+        end
         transfer_results_write!(v, temparray, indices.output_indices, indices.temparray_indices)
         writeblock!(a, temparray, indices.data_indices...)
     end

test/runtests.jl

@@ -526,6 +526,18 @@ end
     b[mask] = fill(2.0, 4)
     @test_broken setindex_count(b) == 4
 
+    b = AccessCountDiskArray(zeros(4, 5, 1); chunksize=(4, 1, 1), batchstrategy=DiskArrays.ChunkRead())
+    b[1:2:4, 1] = [1, 2]
+    @test b.parent[1:3, 1] == [1, 0, 2]
+    @test getindex_count(b) == 1
+    @test setindex_count(b) == 1
+
+    b = AccessCountDiskArray(zeros(4, 5, 1); chunksize=(4, 1, 1), batchstrategy=DiskArrays.SubRanges(DiskArrays.CanStepRange(), 1.0))
+    b[1:2:4, 1] = [1, 2]
+    @test b.parent[1:3, 1] == [1, 0, 2]
+    @test getindex_count(b) == 0
+    @test setindex_count(b) == 1
+
     #Test for #131
     a = reshape(1:75,5,5,3)
     a1 = AccessCountDiskArray(a);