Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix Distributed.head_and_tail #32431

Merged
merged 2 commits into from
Jun 27, 2019
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
11 changes: 4 additions & 7 deletions stdlib/Distributed/src/pmap.jl
Original file line number Diff line number Diff line change
Expand Up @@ -238,14 +238,11 @@ Return `head`: the first `n` elements of `c`;
and `tail`: an iterator over the remaining elements.

```jldoctest
julia> a = 1:10
1:10

julia> b, c = Base.head_and_tail(a, 3)
([1,2,3],Base.Iterators.Rest{UnitRange{Int64},Int64}(1:10,4))
julia> b, c = Distributed.head_and_tail(1:10, 3)
([1, 2, 3], Base.Iterators.Rest{UnitRange{Int64},Int64}(1:10, 3))

julia> collect(c)
7-element Array{Any,1}:
7-element Array{Int64,1}:
4
5
6
Expand All @@ -268,7 +265,7 @@ function head_and_tail(c, n)
i += 1
head[i] = y[1]
end
return head, Iterators.rest(c, s)
return head, Iterators.rest(c, y[2])
end

"""
Expand Down
26 changes: 26 additions & 0 deletions stdlib/Distributed/test/distributed_exec.jl
Original file line number Diff line number Diff line change
Expand Up @@ -1626,6 +1626,32 @@ let code = """
@test success(`$(Base.julia_cmd()) --startup-file=no -e $code`)
end

# PR 32431: tests for internal Distributed.head_and_tail
let (h, t) = Distributed.head_and_tail(1:10, 3)
@test h == 1:3
@test collect(t) == 4:10
end
let (h, t) = Distributed.head_and_tail(1:10, 0)
@test h == []
@test collect(t) == 1:10
end
let (h, t) = Distributed.head_and_tail(1:3, 5)
@test h == 1:3
@test collect(t) == []
end
let (h, t) = Distributed.head_and_tail(1:3, 3)
@test h == 1:3
@test collect(t) == []
end
let (h, t) = Distributed.head_and_tail(Int[], 3)
@test h == []
@test collect(t) == []
end
let (h, t) = Distributed.head_and_tail(Int[], 0)
@test h == []
@test collect(t) == []
end

# Run topology tests last after removing all workers, since a given
# cluster at any time only supports a single topology.
rmprocs(workers())
Expand Down