This is an automated email from the ASF dual-hosted git repository.
ericphanson pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/arrow-julia.git
The following commit(s) were added to refs/heads/main by this push:
new 384c242 fix Julia 1.6 (#349)
384c242 is described below
commit 384c242572604e4a3b9b552a30c56754775a5edc
Author: Simon <[email protected]>
AuthorDate: Fri Oct 28 18:29:43 2022 +0200
fix Julia 1.6 (#349)
* fix 1.6
* bump patch version
* remove exclude
---
.github/workflows/ci.yml | 8 --------
Project.toml | 2 +-
src/arraytypes/dictencoding.jl | 4 ++--
3 files changed, 3 insertions(+), 11 deletions(-)
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index e65fd7e..55ab814 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -79,14 +79,6 @@ jobs:
- ubuntu-latest
arch:
- x64
- exclude:
- # Test Arrow.jl/ArrowTypes.jl on their oldest supported Julia
versions
- - pkg:
- name: Arrow.jl
- version: '1.6'
- - pkg:
- name: ArrowTypes.jl
- version: '1.4'
steps:
- uses: actions/checkout@v2
- uses: julia-actions/setup-julia@v1
diff --git a/Project.toml b/Project.toml
index 777b3d3..7798081 100644
--- a/Project.toml
+++ b/Project.toml
@@ -18,7 +18,7 @@
name = "Arrow"
uuid = "69666777-d1a9-59fb-9406-91d4454c9d45"
authors = ["quinnj <[email protected]>"]
-version = "2.4.0"
+version = "2.4.1"
[deps]
ArrowTypes = "31f734f8-188a-4ce0-8406-c8a06bd891cd"
diff --git a/src/arraytypes/dictencoding.jl b/src/arraytypes/dictencoding.jl
index e470d2e..3eb03db 100644
--- a/src/arraytypes/dictencoding.jl
+++ b/src/arraytypes/dictencoding.jl
@@ -128,7 +128,7 @@ function arrowvector(::DictEncodedKind, x::DictEncoded, i,
nl, fi, de, ded, meta
de[id] = Lockable(x.encoding)
else
encodinglockable = de[id]
- @lock encodinglockable begin
+ Base.@lock encodinglockable begin
encoding = encodinglockable.value
# in this case, we just need to check if any values in our local
pool need to be delta dicationary serialized
deltas = setdiff(x.encoding, encoding)
@@ -195,7 +195,7 @@ function arrowvector(::DictEncodedKind, x, i, nl, fi, de,
ded, meta; dictencode:
# if value doesn't exist in encoding, push! it
# also add to deltas updates
encodinglockable = de[id]
- @lock encodinglockable begin
+ Base.@lock encodinglockable begin
encoding = encodinglockable.value
len = length(x)
ET = indextype(encoding)
