Skip to content
Merged
Show file tree
Hide file tree
Changes from 2 commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion Project.toml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
name = "DataFrames"
uuid = "a93c6f00-e57d-5684-b7b6-d8193f3e46c0"
version = "1.8.0"
version = "1.8.1"

[deps]
Compat = "34da2185-b29b-5c13-b0c7-acf172513d20"
Expand Down
3 changes: 1 addition & 2 deletions src/join/core.jl
Original file line number Diff line number Diff line change
Expand Up @@ -33,8 +33,7 @@ Base.IndexStyle(::Type{<:OnCol}) = Base.IndexLinear()
return OnColRow(i, oc.cols, oc.h)
end

Base.hash(ocr1::OnColRow, h::UInt) = throw(MethodError(hash, (ocr1, h)))
@inline Base.hash(ocr1::OnColRow) = @inbounds ocr1.h[ocr1.row]
@inline Base.hash(ocr1::OnColRow, ::UInt) = @inbounds ocr1.h[ocr1.row]
Comment thread
KristofferC marked this conversation as resolved.

# Hashing one column at a time is faster since it can use SIMD
function _prehash(oc::OnCol)
Expand Down
1 change: 0 additions & 1 deletion test/join.jl
Original file line number Diff line number Diff line change
Expand Up @@ -1000,7 +1000,6 @@ end
end

for i in eachindex(c1), j in eachindex(oncols, tupcols)
@test_throws MethodError hash(oncols[j][1], zero(UInt))
DataFrames._prehash(oncols[j])
@test hash(oncols[j][i]) == hash(tupcols[j][i])
for k in eachindex(c1)
Expand Down
Loading