diff --git a/Project.toml b/Project.toml index bc1852458..2110edc79 100644 --- a/Project.toml +++ b/Project.toml @@ -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" diff --git a/src/join/core.jl b/src/join/core.jl index 48f112f73..4f6513343 100644 --- a/src/join/core.jl +++ b/src/join/core.jl @@ -33,8 +33,8 @@ 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] +# Note second argument is ignored as it is always zero in practice +@inline Base.hash(ocr1::OnColRow, ::UInt) = @inbounds ocr1.h[ocr1.row] # Hashing one column at a time is faster since it can use SIMD function _prehash(oc::OnCol) diff --git a/test/join.jl b/test/join.jl index 0453d3b63..bba82df25 100644 --- a/test/join.jl +++ b/test/join.jl @@ -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)