WIP: [R] Verify CRAN release-20.0.0.1#46472

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.

Sign up for GitHub

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

Closed
amoeba wants to merge 4 commits into from
Closed

WIP: [R] Verify CRAN release-20.0.0.1 #46472

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
95e0b2b
GH-40756: [C++] Remove dead Boost urls (#46452)
jonkeane May 16, 2025
e957c3b
GH-46394: [C++][R] gcc-UBSAN errors on CRAN (#46397)
jonkeane May 13, 2025
bd7024d
Update NEWS.md
amoeba May 16, 2025
f5fa324
20.0.0.1
amoeba May 16, 2025
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: 0 additions & 2 deletions cpp/cmake_modules/ThirdpartyToolchain.cmake
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -610,8 +610,6 @@ else()
# our currently used packages and doesn't fall out of sync with
# ${ARROW_BOOST_BUILD_VERSION_UNDERSCORES}
"${THIRDPARTY_MIRROR_URL}/boost_${ARROW_BOOST_BUILD_VERSION_UNDERSCORES}.tar.gz"
"https://boostorg.jfrog.io/artifactory/main/release/${ARROW_BOOST_BUILD_VERSION}/source/boost_${ARROW_BOOST_BUILD_VERSION_UNDERSCORES}.tar.gz"
"https://sourceforge.net/projects/boost/files/boost/${ARROW_BOOST_BUILD_VERSION}/boost_${ARROW_BOOST_BUILD_VERSION_UNDERSCORES}.tar.gz"
)
endif()

Expand Down
6 changes: 5 additions & 1 deletion cpp/src/arrow/csv/parser.cc
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -144,7 +144,11 @@ class ValueDescWriter {

protected:
ValueDescWriter(MemoryPool* pool, int64_t values_capacity)
: values_size_(0), values_capacity_(values_capacity), status_(Status::OK()) {
: values_size_(0),
values_capacity_(values_capacity),
quoted_(false),
saved_values_size_(0),
status_(Status::OK()) {
status_ &= AllocateResizableBuffer(values_capacity_ * sizeof(*values_), pool)
.Value(&values_buffer_);
if (status_.ok()) {
Expand Down
60 changes: 60 additions & 0 deletions dev/tasks/r/github.linux.sanitizers.yml
View file
Open in desktop
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,60 @@
# Licensed to the Apache Software Foundation (ASF) under one
# or more contributor license agreements. See the NOTICE file
# distributed with this work for additional information
# regarding copyright ownership. The ASF licenses this file
# to you under the Apache License, Version 2.0 (the
# "License"); you may not use this file except in compliance
# with the License. You may obtain a copy of the License at
#
# http://www.apache.org/licenses/LICENSE-2.0
#
# Unless required by applicable law or agreed to in writing,
# software distributed under the License is distributed on an
# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
# KIND, either express or implied. See the License for the
# specific language governing permissions and limitations
# under the License.

{% import 'macros.jinja' as macros with context %}

{{ macros.github_header() }}

jobs:
r-linux-sanitizers:
name: "rhub/{{ '${{ matrix.config.r_image }}' }}"
runs-on: ubuntu-latest
timeout-minutes: {{ timeout|default(60) }}
env:
R_PRUNE_DEPS: TRUE
R_ORG: "rhub"
R_IMAGE: "{{ '${{ matrix.config.r_image }}' }}"
R_TAG: "latest"
strategy:
fail-fast: false
matrix:
config:
# See https://r-hub.github.io/containers/
- { r_image: "clang-asan", skip_vignettes: true }
- { r_image: "clang-ubsan", skip_vignettes: true }
- { r_image: "gcc-asan", skip_vignettes: true} # includes both asan and ubsan
steps:
{{ macros.github_checkout_arrow()|indent }}
{{ macros.github_install_archery()|indent }}

- name: Docker Run
shell: bash
env:
{{ macros.github_set_sccache_envvars()|indent(8)}}
run: archery docker run -e SKIP_VIGNETTES={{ '${{ matrix.config.skip_vignettes }}' }} r-san
- name: Dump install logs
run: cat arrow/r/arrow.Rcheck/00install.out
if: always()
- name: Dump test logs
run: cat arrow/r/arrow.Rcheck/tests/testthat.Rout*
if: always()
- name: Save the test output
if: always()
uses: actions/upload-artifact@v4
with:
name: test-output-{{ "${{ matrix.config.r_image }}" }}
path: arrow/r/arrow.Rcheck/tests/testthat.Rout*
25 changes: 3 additions & 22 deletions dev/tasks/tasks.yml
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -1078,30 +1078,11 @@ tasks:
r_tag: latest
flags: "-e LIBARROW_MINIMAL=TRUE"

test-r-linux-sanitizer:
test-r-linux-sanitizers:
ci: github
template: docker-tests/github.linux.yml
params:
env:
R_PRUNE_DEPS: TRUE
image: ubuntu-r-sanitizer
timeout: 120

test-r-clang-asan:
ci: github
template: docker-tests/github.linux.yml
template: r/github.linux.sanitizers.yml
params:
env:
R_PRUNE_DEPS: TRUE
image: r-clang-asan

test-r-clang-ubsan:
ci: github
template: docker-tests/github.linux.yml
params:
env:
R_PRUNE_DEPS: TRUE
image: r-clang-ubsan
timeout: 240 # 4 hours

test-r-m1-san:
ci: github
Expand Down
67 changes: 5 additions & 62 deletions docker-compose.yml
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -158,14 +158,12 @@ x-hierarchy:
- ubuntu-cpp-sanitizer
- ubuntu-cpp-thread-sanitizer
- ubuntu-cpp-emscripten
- ubuntu-r-sanitizer
- ubuntu-r-valgrind
- ubuntu-swift
- ubuntu-verify-rc
- r-clang-asan
- r-clang-ubsan
- r
- r-revdepcheck
- r-san
# helper services
- impala
- postgres
Expand DownExpand Up@@ -1690,70 +1688,15 @@ services:
command: >
/bin/bash -c "/arrow/ci/scripts/r_test.sh /arrow"

ubuntu-r-sanitizer:
# Only amd64 supported
# Usage:
# docker compose build ubuntu-r-sanitizer
# docker compose run ubuntu-r-sanitizer
image: ${REPO}:amd64-ubuntu-r-sanitizer
cap_add:
# LeakSanitizer and gdb requires ptrace(2)
- SYS_PTRACE
r-san:
image: ${REPO}:r-${R_ORG}-${R_IMAGE}
build:
context: .
dockerfile: ci/docker/linux-r.dockerfile
cache_from:
- ${REPO}:amd64-ubuntu-r-sanitizer
- ${REPO}:r-${R_ORG}-${R_IMAGE}
args:
base: wch1/r-debug:latest
cmake: ${CMAKE}
r_bin: RDsan
tz: ${TZ}
r_prune_deps: ${R_PRUNE_DEPS}
environment:
<<: [*common, *ccache]
ARROW_SOURCE_HOME: "/arrow"
volumes: *ubuntu-volumes
command: >
/bin/bash -c "
/arrow/ci/scripts/r_sanitize.sh /arrow"

r-clang-asan:
image: ${REPO}:r-rhub-clang-devel-latest
build:
context: .
dockerfile: ci/docker/linux-r.dockerfile
cache_from:
- ${REPO}:r-rhub-clang-devel-latest
args:
base: rhub/clang-asan
cmake: ${CMAKE}
r_dev: ${ARROW_R_DEV}
r_bin: R
tz: ${TZ}
r_prune_deps: ${R_PRUNE_DEPS}
shm_size: *shm-size
environment:
<<: *common
LIBARROW_DOWNLOAD: "false"
ARROW_SOURCE_HOME: "/arrow"
ARROW_R_DEV: ${ARROW_R_DEV}
ARROW_USE_PKG_CONFIG: "false"
volumes:
- .:/arrow:delegated
command: >
/bin/bash -c "
/arrow/ci/scripts/r_sanitize.sh /arrow"

r-clang-ubsan:
image: ${REPO}:r-rhub-clang-ubsan-devel-latest
build:
context: .
dockerfile: ci/docker/linux-r.dockerfile
cache_from:
- ${REPO}:r-rhub-clang-ubsan-devel-latest
args:
base: rhub/clang-ubsan
base: ${R_ORG}/${R_IMAGE}:${R_TAG}
cmake: ${CMAKE}
r_dev: ${ARROW_R_DEV}
r_bin: R
Expand Down
2 changes: 1 addition & 1 deletion r/DESCRIPTION
View file
Open in desktop
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
Package: arrow
Title: Integration to 'Apache' 'Arrow'
Version: 20.0.0
Version: 20.0.0.1
Authors@R: c(
person("Neal", "Richardson", email = "neal.p.richardson@gmail.com", role = c("aut")),
person("Ian", "Cook", email = "ianmcook@gmail.com", role = c("aut")),
Expand Down
7 changes: 7 additions & 0 deletions r/NEWS.md
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -17,6 +17,13 @@
under the License.
-->

# arrow 20.0.0.1

## Minor improvements and fixes

- Updated internal C++ code to comply with CRAN's gcc-UBSAN checks
([#46394](https://github.com/apache/arrow/issues/46394))

# arrow 20.0.0

## Minor improvements and fixes
Expand Down
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Add copy buttons to all 
 blocks\n(function() {\n function addCopyButtons() {\n document.querySelectorAll('pre code').forEach(function(codeBlock) {\n if (codeBlock.parentElement.hasAttribute('data-copy-added')) return;\n codeBlock.parentElement.setAttribute('data-copy-added', 'true');\n \n var btn = document.createElement('button');\n btn.textContent = 'Copy';\n btn.style.cssText = 'position:absolute;top:4px;right:4px;padding:2px 8px;font-size:11px;background:#4ecdc4;border:none;border-radius:4px;color:#1a1a2e;cursor:pointer;opacity:0.7;transition:opacity 0.2s;';\n btn.onmouseover = function() { this.style.opacity = '1'; };\n btn.onmouseout = function() { this.style.opacity = '0.7'; };\n btn.onclick = function() {\n navigator.clipboard.writeText(codeBlock.textContent).then(function() {\n btn.textContent = 'Copied!';\n setTimeout(function() { btn.textContent = 'Copy'; }, 1500);\n });\n };\n codeBlock.parentElement.style.position = 'relative';\n codeBlock.parentElement.appendChild(btn);\n });\n }\n \n addCopyButtons();\n \n // Re-run on dynamic content\n var observer = new MutationObserver(addCopyButtons);\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Add Copy Buttons to Code Blocks");
}
} catch(__e) { console.warn('[Userscript:Add Copy Buttons to Code Blocks]', __e); }
})();
(function(){
try {
var __m = "github.com";
var __re = new RegExp('^' + "github\\.com" + '

Skip to content
WIP: [R] Verify CRAN release-20.0.0.1#46472

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.

 Sign up for GitHub

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

 Closed

amoeba
wants to merge
4
commits into

from

 Closed


WIP: [R] Verify CRAN release-20.0.0.1
#46472
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


4 commits


Select commit
Hold shift + click to select a range
95e0b2b

GH-40756: [C++] Remove dead Boost urls (#46452)


jonkeane May 16, 2025
e957c3b

GH-46394: [C++][R] gcc-UBSAN errors on CRAN (#46397)


jonkeane May 13, 2025
bd7024d

Update NEWS.md


amoeba May 16, 2025
f5fa324

20.0.0.1


amoeba May 16, 2025

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: 0 additions & 2 deletions
cpp/cmake_modules/ThirdpartyToolchain.cmake

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -610,8 +610,6 @@ else()
 # our currently used packages and doesn't fall out of sync with
 # ${ARROW_BOOST_BUILD_VERSION_UNDERSCORES}
 "${THIRDPARTY_MIRROR_URL}/boost_${ARROW_BOOST_BUILD_VERSION_UNDERSCORES}.tar.gz"
 "https://boostorg.jfrog.io/artifactory/main/release/${ARROW_BOOST_BUILD_VERSION}/source/boost_${ARROW_BOOST_BUILD_VERSION_UNDERSCORES}.tar.gz"
 "https://sourceforge.net/projects/boost/files/boost/${ARROW_BOOST_BUILD_VERSION}/boost_${ARROW_BOOST_BUILD_VERSION_UNDERSCORES}.tar.gz"
 )
endif()

Expand Down

6 changes: 5 additions & 1 deletion
cpp/src/arrow/csv/parser.cc

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -144,7 +144,11 @@ class ValueDescWriter {

 protected:
 ValueDescWriter(MemoryPool* pool, int64_t values_capacity)
 : values_size_(0), values_capacity_(values_capacity), status_(Status::OK()) {
 : values_size_(0),
 values_capacity_(values_capacity),
 quoted_(false),
 saved_values_size_(0),
 status_(Status::OK()) {
 status_ &= AllocateResizableBuffer(values_capacity_ * sizeof(*values_), pool)
 .Value(&values_buffer_);
 if (status_.ok()) {
Expand Down

60 changes: 60 additions & 0 deletions
dev/tasks/r/github.linux.sanitizers.yml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,60 @@
# Licensed to the Apache Software Foundation (ASF) under one
# or more contributor license agreements. See the NOTICE file
# distributed with this work for additional information
# regarding copyright ownership. The ASF licenses this file
# to you under the Apache License, Version 2.0 (the
# "License"); you may not use this file except in compliance
# with the License. You may obtain a copy of the License at
#
# http://www.apache.org/licenses/LICENSE-2.0
#
# Unless required by applicable law or agreed to in writing,
# software distributed under the License is distributed on an
# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
# KIND, either express or implied. See the License for the
# specific language governing permissions and limitations
# under the License.

{% import 'macros.jinja' as macros with context %}

{{ macros.github_header() }}

jobs:
 r-linux-sanitizers:
 name: "rhub/{{ '${{ matrix.config.r_image }}' }}"
 runs-on: ubuntu-latest
 timeout-minutes: {{ timeout|default(60) }}
 env:
 R_PRUNE_DEPS: TRUE
 R_ORG: "rhub"
 R_IMAGE: "{{ '${{ matrix.config.r_image }}' }}"
 R_TAG: "latest"
 strategy:
 fail-fast: false
 matrix:
 config:
 # See https://r-hub.github.io/containers/
 - { r_image: "clang-asan", skip_vignettes: true } 
 - { r_image: "clang-ubsan", skip_vignettes: true } 
 - { r_image: "gcc-asan", skip_vignettes: true} # includes both asan and ubsan
 steps:
 {{ macros.github_checkout_arrow()|indent }}
 {{ macros.github_install_archery()|indent }}

 - name: Docker Run
 shell: bash
 env:
 {{ macros.github_set_sccache_envvars()|indent(8)}}
 run: archery docker run -e SKIP_VIGNETTES={{ '${{ matrix.config.skip_vignettes }}' }} r-san
 - name: Dump install logs
 run: cat arrow/r/arrow.Rcheck/00install.out
 if: always()
 - name: Dump test logs
 run: cat arrow/r/arrow.Rcheck/tests/testthat.Rout*
 if: always()
 - name: Save the test output
 if: always()
 uses: actions/upload-artifact@v4
 with:
 name: test-output-{{ "${{ matrix.config.r_image }}" }}
 path: arrow/r/arrow.Rcheck/tests/testthat.Rout*

25 changes: 3 additions & 22 deletions
dev/tasks/tasks.yml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -1078,30 +1078,11 @@ tasks:
 r_tag: latest
 flags: "-e LIBARROW_MINIMAL=TRUE"

 test-r-linux-sanitizer:
 test-r-linux-sanitizers:
 ci: github
 template: docker-tests/github.linux.yml
 params:
 env:
 R_PRUNE_DEPS: TRUE
 image: ubuntu-r-sanitizer
 timeout: 120

 test-r-clang-asan:
 ci: github
 template: docker-tests/github.linux.yml
 template: r/github.linux.sanitizers.yml
 params:
 env:
 R_PRUNE_DEPS: TRUE
 image: r-clang-asan

 test-r-clang-ubsan:
 ci: github
 template: docker-tests/github.linux.yml
 params:
 env:
 R_PRUNE_DEPS: TRUE
 image: r-clang-ubsan
 timeout: 240 # 4 hours

 test-r-m1-san:
 ci: github
Expand Down

67 changes: 5 additions & 62 deletions
docker-compose.yml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -158,14 +158,12 @@ x-hierarchy:
 - ubuntu-cpp-sanitizer
 - ubuntu-cpp-thread-sanitizer
 - ubuntu-cpp-emscripten
 - ubuntu-r-sanitizer
 - ubuntu-r-valgrind
 - ubuntu-swift
 - ubuntu-verify-rc
 - r-clang-asan
 - r-clang-ubsan
 - r
 - r-revdepcheck
 - r-san
 # helper services
 - impala
 - postgres
Expand DownExpand Up@@ -1690,70 +1688,15 @@ services:
 command: >
 /bin/bash -c "/arrow/ci/scripts/r_test.sh /arrow"

 ubuntu-r-sanitizer:
 # Only amd64 supported
 # Usage:
 # docker compose build ubuntu-r-sanitizer
 # docker compose run ubuntu-r-sanitizer
 image: ${REPO}:amd64-ubuntu-r-sanitizer
 cap_add:
 # LeakSanitizer and gdb requires ptrace(2)
 - SYS_PTRACE
 r-san:
 image: ${REPO}:r-${R_ORG}-${R_IMAGE}
 build:
 context: .
 dockerfile: ci/docker/linux-r.dockerfile
 cache_from:
 - ${REPO}:amd64-ubuntu-r-sanitizer
 - ${REPO}:r-${R_ORG}-${R_IMAGE}
 args:
 base: wch1/r-debug:latest
 cmake: ${CMAKE}
 r_bin: RDsan
 tz: ${TZ}
 r_prune_deps: ${R_PRUNE_DEPS}
 environment:
 <<: [*common, *ccache]
 ARROW_SOURCE_HOME: "/arrow"
 volumes: *ubuntu-volumes
 command: >
 /bin/bash -c "
 /arrow/ci/scripts/r_sanitize.sh /arrow"

 r-clang-asan:
 image: ${REPO}:r-rhub-clang-devel-latest
 build:
 context: .
 dockerfile: ci/docker/linux-r.dockerfile
 cache_from:
 - ${REPO}:r-rhub-clang-devel-latest
 args:
 base: rhub/clang-asan
 cmake: ${CMAKE}
 r_dev: ${ARROW_R_DEV}
 r_bin: R
 tz: ${TZ}
 r_prune_deps: ${R_PRUNE_DEPS}
 shm_size: *shm-size
 environment:
 <<: *common
 LIBARROW_DOWNLOAD: "false"
 ARROW_SOURCE_HOME: "/arrow"
 ARROW_R_DEV: ${ARROW_R_DEV}
 ARROW_USE_PKG_CONFIG: "false"
 volumes:
 - .:/arrow:delegated
 command: >
 /bin/bash -c "
 /arrow/ci/scripts/r_sanitize.sh /arrow"

 r-clang-ubsan:
 image: ${REPO}:r-rhub-clang-ubsan-devel-latest
 build:
 context: .
 dockerfile: ci/docker/linux-r.dockerfile
 cache_from:
 - ${REPO}:r-rhub-clang-ubsan-devel-latest
 args:
 base: rhub/clang-ubsan
 base: ${R_ORG}/${R_IMAGE}:${R_TAG}
 cmake: ${CMAKE}
 r_dev: ${ARROW_R_DEV}
 r_bin: R
Expand Down

2 changes: 1 addition & 1 deletion
r/DESCRIPTION

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
Package: arrow
Title: Integration to 'Apache' 'Arrow'
Version: 20.0.0
Version: 20.0.0.1
Authors@R: c(
 person("Neal", "Richardson", email = "neal.p.richardson@gmail.com", role = c("aut")),
 person("Ian", "Cook", email = "ianmcook@gmail.com", role = c("aut")),
Expand Down

7 changes: 7 additions & 0 deletions
r/NEWS.md

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -17,6 +17,13 @@
 under the License.
-->

# arrow 20.0.0.1

## Minor improvements and fixes

- Updated internal C++ code to comply with CRAN's gcc-UBSAN checks
 ([#46394](https://github.com/apache/arrow/issues/46394))

# arrow 20.0.0

## Minor improvements and fixes
Expand Down

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Force GitHub README to respect dark mode\n(function() {\n var style = document.createElement('style');\n style.textContent = '\n .markdown-body {\n color-scheme: dark light;\n }\n .markdown-body pre { background: #161b22 !important; }\n .markdown-body code { background: rgba(110, 118, 129, 0.4) !important; }\n .markdown-body table th, .markdown-body table td { border-color: #30363d !important; }\n .markdown-body img { background: #0d1117; }\n .markdown-body blockquote { border-left-color: #8b949e; }\n .markdown-body hr { border-color: #30363d; }\n ';\n document.head.appendChild(style);\n})();", "GitHub Dark Mode README Fix");
}
} catch(__e) { console.warn('[Userscript:GitHub Dark Mode README Fix]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content
WIP: [R] Verify CRAN release-20.0.0.1#46472

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.

 Sign up for GitHub

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

 Closed

amoeba
wants to merge
4
commits into

from

 Closed


WIP: [R] Verify CRAN release-20.0.0.1
#46472
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


4 commits


Select commit
Hold shift + click to select a range
95e0b2b

GH-40756: [C++] Remove dead Boost urls (#46452)


jonkeane May 16, 2025
e957c3b

GH-46394: [C++][R] gcc-UBSAN errors on CRAN (#46397)


jonkeane May 13, 2025
bd7024d

Update NEWS.md


amoeba May 16, 2025
f5fa324

20.0.0.1


amoeba May 16, 2025

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: 0 additions & 2 deletions
cpp/cmake_modules/ThirdpartyToolchain.cmake

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -610,8 +610,6 @@ else()
 # our currently used packages and doesn't fall out of sync with
 # ${ARROW_BOOST_BUILD_VERSION_UNDERSCORES}
 "${THIRDPARTY_MIRROR_URL}/boost_${ARROW_BOOST_BUILD_VERSION_UNDERSCORES}.tar.gz"
 "https://boostorg.jfrog.io/artifactory/main/release/${ARROW_BOOST_BUILD_VERSION}/source/boost_${ARROW_BOOST_BUILD_VERSION_UNDERSCORES}.tar.gz"
 "https://sourceforge.net/projects/boost/files/boost/${ARROW_BOOST_BUILD_VERSION}/boost_${ARROW_BOOST_BUILD_VERSION_UNDERSCORES}.tar.gz"
 )
endif()

Expand Down

6 changes: 5 additions & 1 deletion
cpp/src/arrow/csv/parser.cc

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -144,7 +144,11 @@ class ValueDescWriter {

 protected:
 ValueDescWriter(MemoryPool* pool, int64_t values_capacity)
 : values_size_(0), values_capacity_(values_capacity), status_(Status::OK()) {
 : values_size_(0),
 values_capacity_(values_capacity),
 quoted_(false),
 saved_values_size_(0),
 status_(Status::OK()) {
 status_ &= AllocateResizableBuffer(values_capacity_ * sizeof(*values_), pool)
 .Value(&values_buffer_);
 if (status_.ok()) {
Expand Down

60 changes: 60 additions & 0 deletions
dev/tasks/r/github.linux.sanitizers.yml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,60 @@
# Licensed to the Apache Software Foundation (ASF) under one
# or more contributor license agreements. See the NOTICE file
# distributed with this work for additional information
# regarding copyright ownership. The ASF licenses this file
# to you under the Apache License, Version 2.0 (the
# "License"); you may not use this file except in compliance
# with the License. You may obtain a copy of the License at
#
# http://www.apache.org/licenses/LICENSE-2.0
#
# Unless required by applicable law or agreed to in writing,
# software distributed under the License is distributed on an
# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
# KIND, either express or implied. See the License for the
# specific language governing permissions and limitations
# under the License.

{% import 'macros.jinja' as macros with context %}

{{ macros.github_header() }}

jobs:
 r-linux-sanitizers:
 name: "rhub/{{ '${{ matrix.config.r_image }}' }}"
 runs-on: ubuntu-latest
 timeout-minutes: {{ timeout|default(60) }}
 env:
 R_PRUNE_DEPS: TRUE
 R_ORG: "rhub"
 R_IMAGE: "{{ '${{ matrix.config.r_image }}' }}"
 R_TAG: "latest"
 strategy:
 fail-fast: false
 matrix:
 config:
 # See https://r-hub.github.io/containers/
 - { r_image: "clang-asan", skip_vignettes: true } 
 - { r_image: "clang-ubsan", skip_vignettes: true } 
 - { r_image: "gcc-asan", skip_vignettes: true} # includes both asan and ubsan
 steps:
 {{ macros.github_checkout_arrow()|indent }}
 {{ macros.github_install_archery()|indent }}

 - name: Docker Run
 shell: bash
 env:
 {{ macros.github_set_sccache_envvars()|indent(8)}}
 run: archery docker run -e SKIP_VIGNETTES={{ '${{ matrix.config.skip_vignettes }}' }} r-san
 - name: Dump install logs
 run: cat arrow/r/arrow.Rcheck/00install.out
 if: always()
 - name: Dump test logs
 run: cat arrow/r/arrow.Rcheck/tests/testthat.Rout*
 if: always()
 - name: Save the test output
 if: always()
 uses: actions/upload-artifact@v4
 with:
 name: test-output-{{ "${{ matrix.config.r_image }}" }}
 path: arrow/r/arrow.Rcheck/tests/testthat.Rout*

25 changes: 3 additions & 22 deletions
dev/tasks/tasks.yml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -1078,30 +1078,11 @@ tasks:
 r_tag: latest
 flags: "-e LIBARROW_MINIMAL=TRUE"

 test-r-linux-sanitizer:
 test-r-linux-sanitizers:
 ci: github
 template: docker-tests/github.linux.yml
 params:
 env:
 R_PRUNE_DEPS: TRUE
 image: ubuntu-r-sanitizer
 timeout: 120

 test-r-clang-asan:
 ci: github
 template: docker-tests/github.linux.yml
 template: r/github.linux.sanitizers.yml
 params:
 env:
 R_PRUNE_DEPS: TRUE
 image: r-clang-asan

 test-r-clang-ubsan:
 ci: github
 template: docker-tests/github.linux.yml
 params:
 env:
 R_PRUNE_DEPS: TRUE
 image: r-clang-ubsan
 timeout: 240 # 4 hours

 test-r-m1-san:
 ci: github
Expand Down

67 changes: 5 additions & 62 deletions
docker-compose.yml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -158,14 +158,12 @@ x-hierarchy:
 - ubuntu-cpp-sanitizer
 - ubuntu-cpp-thread-sanitizer
 - ubuntu-cpp-emscripten
 - ubuntu-r-sanitizer
 - ubuntu-r-valgrind
 - ubuntu-swift
 - ubuntu-verify-rc
 - r-clang-asan
 - r-clang-ubsan
 - r
 - r-revdepcheck
 - r-san
 # helper services
 - impala
 - postgres
Expand DownExpand Up@@ -1690,70 +1688,15 @@ services:
 command: >
 /bin/bash -c "/arrow/ci/scripts/r_test.sh /arrow"

 ubuntu-r-sanitizer:
 # Only amd64 supported
 # Usage:
 # docker compose build ubuntu-r-sanitizer
 # docker compose run ubuntu-r-sanitizer
 image: ${REPO}:amd64-ubuntu-r-sanitizer
 cap_add:
 # LeakSanitizer and gdb requires ptrace(2)
 - SYS_PTRACE
 r-san:
 image: ${REPO}:r-${R_ORG}-${R_IMAGE}
 build:
 context: .
 dockerfile: ci/docker/linux-r.dockerfile
 cache_from:
 - ${REPO}:amd64-ubuntu-r-sanitizer
 - ${REPO}:r-${R_ORG}-${R_IMAGE}
 args:
 base: wch1/r-debug:latest
 cmake: ${CMAKE}
 r_bin: RDsan
 tz: ${TZ}
 r_prune_deps: ${R_PRUNE_DEPS}
 environment:
 <<: [*common, *ccache]
 ARROW_SOURCE_HOME: "/arrow"
 volumes: *ubuntu-volumes
 command: >
 /bin/bash -c "
 /arrow/ci/scripts/r_sanitize.sh /arrow"

 r-clang-asan:
 image: ${REPO}:r-rhub-clang-devel-latest
 build:
 context: .
 dockerfile: ci/docker/linux-r.dockerfile
 cache_from:
 - ${REPO}:r-rhub-clang-devel-latest
 args:
 base: rhub/clang-asan
 cmake: ${CMAKE}
 r_dev: ${ARROW_R_DEV}
 r_bin: R
 tz: ${TZ}
 r_prune_deps: ${R_PRUNE_DEPS}
 shm_size: *shm-size
 environment:
 <<: *common
 LIBARROW_DOWNLOAD: "false"
 ARROW_SOURCE_HOME: "/arrow"
 ARROW_R_DEV: ${ARROW_R_DEV}
 ARROW_USE_PKG_CONFIG: "false"
 volumes:
 - .:/arrow:delegated
 command: >
 /bin/bash -c "
 /arrow/ci/scripts/r_sanitize.sh /arrow"

 r-clang-ubsan:
 image: ${REPO}:r-rhub-clang-ubsan-devel-latest
 build:
 context: .
 dockerfile: ci/docker/linux-r.dockerfile
 cache_from:
 - ${REPO}:r-rhub-clang-ubsan-devel-latest
 args:
 base: rhub/clang-ubsan
 base: ${R_ORG}/${R_IMAGE}:${R_TAG}
 cmake: ${CMAKE}
 r_dev: ${ARROW_R_DEV}
 r_bin: R
Expand Down

2 changes: 1 addition & 1 deletion
r/DESCRIPTION

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
Package: arrow
Title: Integration to 'Apache' 'Arrow'
Version: 20.0.0
Version: 20.0.0.1
Authors@R: c(
 person("Neal", "Richardson", email = "neal.p.richardson@gmail.com", role = c("aut")),
 person("Ian", "Cook", email = "ianmcook@gmail.com", role = c("aut")),
Expand Down

7 changes: 7 additions & 0 deletions
r/NEWS.md

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -17,6 +17,13 @@
 under the License.
-->

# arrow 20.0.0.1

## Minor improvements and fixes

- Updated internal C++ code to comply with CRAN's gcc-UBSAN checks
 ([#46394](https://github.com/apache/arrow/issues/46394))

# arrow 20.0.0

## Minor improvements and fixes
Expand Down

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Highlight search terms from Google/DuckDuckGo/Bing referrer\n(function() {\n var ref = document.referrer;\n var terms = [];\n \n if (ref.includes('google.com') || ref.includes('duckduckgo.com') || ref.includes('bing.com')) {\n var url = new URL(ref);\n var q = url.searchParams.get('q') || url.searchParams.get('p');\n if (q) {\n terms = q.split(/\\s+/).filter(function(t) { return t.length > 2; });\n }\n }\n \n if (terms.length === 0) return;\n \n var style = document.createElement('style');\n style.textContent = '.userscript-highlight { background: #fbbf24; color: #1a1a2e; padding: 1px 3px; border-radius: 2px; }';\n document.head.appendChild(style);\n \n function highlight(node) {\n if (node.nodeType === 3) { // text node\n var text = node.textContent;\n var found = false;\n terms.forEach(function(term) {\n var regex = new RegExp('(' + term.replace(/[.*+?^${}()|[\\]\\\\]/g, '\\\\') + ')', 'gi');\n if (regex.test(text)) {\n found = true;\n var frag = document.createDocumentFragment();\n var parts = text.split(regex);\n parts.forEach(function(part, i) {\n if (i % 2 === 0) {\n frag.appendChild(document.createTextNode(part));\n } else {\n var span = document.createElement('span');\n span.className = 'userscript-highlight';\n span.textContent = part;\n frag.appendChild(span);\n }\n });\n node.parentNode.replaceChild(frag, node);\n }\n });\n } else if (node.nodeType === 1 && node.childNodes) { // element\n var skipTags = ['SCRIPT', 'STYLE', 'NOSCRIPT', 'TEXTAREA', 'INPUT', 'SELECT'];\n if (!skipTags.includes(node.tagName)) {\n Array.from(node.childNodes).forEach(highlight);\n }\n }\n }\n \n highlight(document.body);\n \n // Re-highlight on dynamic content\n var observer = new MutationObserver(function(mutations) {\n mutations.forEach(function(m) {\n m.addedNodes.forEach(function(node) {\n if (node.nodeType === 1 || node.nodeType === 3) highlight(node);\n });\n });\n });\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Highlight Search Terms");
}
} catch(__e) { console.warn('[Userscript:Highlight Search Terms]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content
WIP: [R] Verify CRAN release-20.0.0.1#46472

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.

 Sign up for GitHub

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

 Closed

amoeba
wants to merge
4
commits into

from

 Closed


WIP: [R] Verify CRAN release-20.0.0.1
#46472
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


4 commits


Select commit
Hold shift + click to select a range
95e0b2b

GH-40756: [C++] Remove dead Boost urls (#46452)


jonkeane May 16, 2025
e957c3b

GH-46394: [C++][R] gcc-UBSAN errors on CRAN (#46397)


jonkeane May 13, 2025
bd7024d

Update NEWS.md


amoeba May 16, 2025
f5fa324

20.0.0.1


amoeba May 16, 2025

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: 0 additions & 2 deletions
cpp/cmake_modules/ThirdpartyToolchain.cmake

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -610,8 +610,6 @@ else()
 # our currently used packages and doesn't fall out of sync with
 # ${ARROW_BOOST_BUILD_VERSION_UNDERSCORES}
 "${THIRDPARTY_MIRROR_URL}/boost_${ARROW_BOOST_BUILD_VERSION_UNDERSCORES}.tar.gz"
 "https://boostorg.jfrog.io/artifactory/main/release/${ARROW_BOOST_BUILD_VERSION}/source/boost_${ARROW_BOOST_BUILD_VERSION_UNDERSCORES}.tar.gz"
 "https://sourceforge.net/projects/boost/files/boost/${ARROW_BOOST_BUILD_VERSION}/boost_${ARROW_BOOST_BUILD_VERSION_UNDERSCORES}.tar.gz"
 )
endif()

Expand Down

6 changes: 5 additions & 1 deletion
cpp/src/arrow/csv/parser.cc

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -144,7 +144,11 @@ class ValueDescWriter {

 protected:
 ValueDescWriter(MemoryPool* pool, int64_t values_capacity)
 : values_size_(0), values_capacity_(values_capacity), status_(Status::OK()) {
 : values_size_(0),
 values_capacity_(values_capacity),
 quoted_(false),
 saved_values_size_(0),
 status_(Status::OK()) {
 status_ &= AllocateResizableBuffer(values_capacity_ * sizeof(*values_), pool)
 .Value(&values_buffer_);
 if (status_.ok()) {
Expand Down

60 changes: 60 additions & 0 deletions
dev/tasks/r/github.linux.sanitizers.yml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,60 @@
# Licensed to the Apache Software Foundation (ASF) under one
# or more contributor license agreements. See the NOTICE file
# distributed with this work for additional information
# regarding copyright ownership. The ASF licenses this file
# to you under the Apache License, Version 2.0 (the
# "License"); you may not use this file except in compliance
# with the License. You may obtain a copy of the License at
#
# http://www.apache.org/licenses/LICENSE-2.0
#
# Unless required by applicable law or agreed to in writing,
# software distributed under the License is distributed on an
# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
# KIND, either express or implied. See the License for the
# specific language governing permissions and limitations
# under the License.

{% import 'macros.jinja' as macros with context %}

{{ macros.github_header() }}

jobs:
 r-linux-sanitizers:
 name: "rhub/{{ '${{ matrix.config.r_image }}' }}"
 runs-on: ubuntu-latest
 timeout-minutes: {{ timeout|default(60) }}
 env:
 R_PRUNE_DEPS: TRUE
 R_ORG: "rhub"
 R_IMAGE: "{{ '${{ matrix.config.r_image }}' }}"
 R_TAG: "latest"
 strategy:
 fail-fast: false
 matrix:
 config:
 # See https://r-hub.github.io/containers/
 - { r_image: "clang-asan", skip_vignettes: true } 
 - { r_image: "clang-ubsan", skip_vignettes: true } 
 - { r_image: "gcc-asan", skip_vignettes: true} # includes both asan and ubsan
 steps:
 {{ macros.github_checkout_arrow()|indent }}
 {{ macros.github_install_archery()|indent }}

 - name: Docker Run
 shell: bash
 env:
 {{ macros.github_set_sccache_envvars()|indent(8)}}
 run: archery docker run -e SKIP_VIGNETTES={{ '${{ matrix.config.skip_vignettes }}' }} r-san
 - name: Dump install logs
 run: cat arrow/r/arrow.Rcheck/00install.out
 if: always()
 - name: Dump test logs
 run: cat arrow/r/arrow.Rcheck/tests/testthat.Rout*
 if: always()
 - name: Save the test output
 if: always()
 uses: actions/upload-artifact@v4
 with:
 name: test-output-{{ "${{ matrix.config.r_image }}" }}
 path: arrow/r/arrow.Rcheck/tests/testthat.Rout*

25 changes: 3 additions & 22 deletions
dev/tasks/tasks.yml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -1078,30 +1078,11 @@ tasks:
 r_tag: latest
 flags: "-e LIBARROW_MINIMAL=TRUE"

 test-r-linux-sanitizer:
 test-r-linux-sanitizers:
 ci: github
 template: docker-tests/github.linux.yml
 params:
 env:
 R_PRUNE_DEPS: TRUE
 image: ubuntu-r-sanitizer
 timeout: 120

 test-r-clang-asan:
 ci: github
 template: docker-tests/github.linux.yml
 template: r/github.linux.sanitizers.yml
 params:
 env:
 R_PRUNE_DEPS: TRUE
 image: r-clang-asan

 test-r-clang-ubsan:
 ci: github
 template: docker-tests/github.linux.yml
 params:
 env:
 R_PRUNE_DEPS: TRUE
 image: r-clang-ubsan
 timeout: 240 # 4 hours

 test-r-m1-san:
 ci: github
Expand Down

67 changes: 5 additions & 62 deletions
docker-compose.yml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -158,14 +158,12 @@ x-hierarchy:
 - ubuntu-cpp-sanitizer
 - ubuntu-cpp-thread-sanitizer
 - ubuntu-cpp-emscripten
 - ubuntu-r-sanitizer
 - ubuntu-r-valgrind
 - ubuntu-swift
 - ubuntu-verify-rc
 - r-clang-asan
 - r-clang-ubsan
 - r
 - r-revdepcheck
 - r-san
 # helper services
 - impala
 - postgres
Expand DownExpand Up@@ -1690,70 +1688,15 @@ services:
 command: >
 /bin/bash -c "/arrow/ci/scripts/r_test.sh /arrow"

 ubuntu-r-sanitizer:
 # Only amd64 supported
 # Usage:
 # docker compose build ubuntu-r-sanitizer
 # docker compose run ubuntu-r-sanitizer
 image: ${REPO}:amd64-ubuntu-r-sanitizer
 cap_add:
 # LeakSanitizer and gdb requires ptrace(2)
 - SYS_PTRACE
 r-san:
 image: ${REPO}:r-${R_ORG}-${R_IMAGE}
 build:
 context: .
 dockerfile: ci/docker/linux-r.dockerfile
 cache_from:
 - ${REPO}:amd64-ubuntu-r-sanitizer
 - ${REPO}:r-${R_ORG}-${R_IMAGE}
 args:
 base: wch1/r-debug:latest
 cmake: ${CMAKE}
 r_bin: RDsan
 tz: ${TZ}
 r_prune_deps: ${R_PRUNE_DEPS}
 environment:
 <<: [*common, *ccache]
 ARROW_SOURCE_HOME: "/arrow"
 volumes: *ubuntu-volumes
 command: >
 /bin/bash -c "
 /arrow/ci/scripts/r_sanitize.sh /arrow"

 r-clang-asan:
 image: ${REPO}:r-rhub-clang-devel-latest
 build:
 context: .
 dockerfile: ci/docker/linux-r.dockerfile
 cache_from:
 - ${REPO}:r-rhub-clang-devel-latest
 args:
 base: rhub/clang-asan
 cmake: ${CMAKE}
 r_dev: ${ARROW_R_DEV}
 r_bin: R
 tz: ${TZ}
 r_prune_deps: ${R_PRUNE_DEPS}
 shm_size: *shm-size
 environment:
 <<: *common
 LIBARROW_DOWNLOAD: "false"
 ARROW_SOURCE_HOME: "/arrow"
 ARROW_R_DEV: ${ARROW_R_DEV}
 ARROW_USE_PKG_CONFIG: "false"
 volumes:
 - .:/arrow:delegated
 command: >
 /bin/bash -c "
 /arrow/ci/scripts/r_sanitize.sh /arrow"

 r-clang-ubsan:
 image: ${REPO}:r-rhub-clang-ubsan-devel-latest
 build:
 context: .
 dockerfile: ci/docker/linux-r.dockerfile
 cache_from:
 - ${REPO}:r-rhub-clang-ubsan-devel-latest
 args:
 base: rhub/clang-ubsan
 base: ${R_ORG}/${R_IMAGE}:${R_TAG}
 cmake: ${CMAKE}
 r_dev: ${ARROW_R_DEV}
 r_bin: R
Expand Down

2 changes: 1 addition & 1 deletion
r/DESCRIPTION

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
Package: arrow
Title: Integration to 'Apache' 'Arrow'
Version: 20.0.0
Version: 20.0.0.1
Authors@R: c(
 person("Neal", "Richardson", email = "neal.p.richardson@gmail.com", role = c("aut")),
 person("Ian", "Cook", email = "ianmcook@gmail.com", role = c("aut")),
Expand Down

7 changes: 7 additions & 0 deletions
r/NEWS.md

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -17,6 +17,13 @@
 under the License.
-->

# arrow 20.0.0.1

## Minor improvements and fixes

- Updated internal C++ code to comply with CRAN's gcc-UBSAN checks
 ([#46394](https://github.com/apache/arrow/issues/46394))

# arrow 20.0.0

## Minor improvements and fixes
Expand Down

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Strip utm_, fbclid, gclid, etc. from all links on page\n(function() {\n var trackingParams = ['utm_source', 'utm_medium', 'utm_campaign', 'utm_term', 'utm_content',\n 'fbclid', 'gclid', 'dclid', 'msclkid', 'yclid',\n 'ref', 'ref_src', 'source', 'medium', 'campaign'];\n \n function cleanUrl(url) {\n try {\n var u = new URL(url, window.location.origin);\n var changed = false;\n trackingParams.forEach(function(p) {\n if (u.searchParams.has(p)) {\n u.searchParams.delete(p);\n changed = true;\n }\n });\n return changed ? u.toString() : url;\n } catch (e) {\n return url;\n }\n }\n \n function cleanLinks() {\n document.querySelectorAll('a[href]').forEach(function(a) {\n var clean = cleanUrl(a.href);\n if (clean !== a.href) a.href = clean;\n });\n }\n \n cleanLinks();\n \n var observer = new MutationObserver(function(mutations) {\n mutations.forEach(function(m) {\n m.addedNodes.forEach(function(node) {\n if (node.nodeType === 1) {\n if (node.tagName === 'A') cleanLinks();\n node.querySelectorAll('a[href]').forEach(function(a) {\n var clean = cleanUrl(a.href);\n if (clean !== a.href) a.href = clean;\n });\n }\n });\n });\n });\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Remove Tracking Parameters from Links");
}
} catch(__e) { console.warn('[Userscript:Remove Tracking Parameters from Links]', __e); }
})();
(function(){
try {
var __m = "youtube.com";
var __re = new RegExp('^' + "youtube\\.com" + '

Skip to content
WIP: [R] Verify CRAN release-20.0.0.1#46472

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.

 Sign up for GitHub

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

 Closed

amoeba
wants to merge
4
commits into

from

 Closed


WIP: [R] Verify CRAN release-20.0.0.1
#46472
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


4 commits


Select commit
Hold shift + click to select a range
95e0b2b

GH-40756: [C++] Remove dead Boost urls (#46452)


jonkeane May 16, 2025
e957c3b

GH-46394: [C++][R] gcc-UBSAN errors on CRAN (#46397)


jonkeane May 13, 2025
bd7024d

Update NEWS.md


amoeba May 16, 2025
f5fa324

20.0.0.1


amoeba May 16, 2025

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: 0 additions & 2 deletions
cpp/cmake_modules/ThirdpartyToolchain.cmake

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -610,8 +610,6 @@ else()
 # our currently used packages and doesn't fall out of sync with
 # ${ARROW_BOOST_BUILD_VERSION_UNDERSCORES}
 "${THIRDPARTY_MIRROR_URL}/boost_${ARROW_BOOST_BUILD_VERSION_UNDERSCORES}.tar.gz"
 "https://boostorg.jfrog.io/artifactory/main/release/${ARROW_BOOST_BUILD_VERSION}/source/boost_${ARROW_BOOST_BUILD_VERSION_UNDERSCORES}.tar.gz"
 "https://sourceforge.net/projects/boost/files/boost/${ARROW_BOOST_BUILD_VERSION}/boost_${ARROW_BOOST_BUILD_VERSION_UNDERSCORES}.tar.gz"
 )
endif()

Expand Down

6 changes: 5 additions & 1 deletion
cpp/src/arrow/csv/parser.cc

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -144,7 +144,11 @@ class ValueDescWriter {

 protected:
 ValueDescWriter(MemoryPool* pool, int64_t values_capacity)
 : values_size_(0), values_capacity_(values_capacity), status_(Status::OK()) {
 : values_size_(0),
 values_capacity_(values_capacity),
 quoted_(false),
 saved_values_size_(0),
 status_(Status::OK()) {
 status_ &= AllocateResizableBuffer(values_capacity_ * sizeof(*values_), pool)
 .Value(&values_buffer_);
 if (status_.ok()) {
Expand Down

60 changes: 60 additions & 0 deletions
dev/tasks/r/github.linux.sanitizers.yml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,60 @@
# Licensed to the Apache Software Foundation (ASF) under one
# or more contributor license agreements. See the NOTICE file
# distributed with this work for additional information
# regarding copyright ownership. The ASF licenses this file
# to you under the Apache License, Version 2.0 (the
# "License"); you may not use this file except in compliance
# with the License. You may obtain a copy of the License at
#
# http://www.apache.org/licenses/LICENSE-2.0
#
# Unless required by applicable law or agreed to in writing,
# software distributed under the License is distributed on an
# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
# KIND, either express or implied. See the License for the
# specific language governing permissions and limitations
# under the License.

{% import 'macros.jinja' as macros with context %}

{{ macros.github_header() }}

jobs:
 r-linux-sanitizers:
 name: "rhub/{{ '${{ matrix.config.r_image }}' }}"
 runs-on: ubuntu-latest
 timeout-minutes: {{ timeout|default(60) }}
 env:
 R_PRUNE_DEPS: TRUE
 R_ORG: "rhub"
 R_IMAGE: "{{ '${{ matrix.config.r_image }}' }}"
 R_TAG: "latest"
 strategy:
 fail-fast: false
 matrix:
 config:
 # See https://r-hub.github.io/containers/
 - { r_image: "clang-asan", skip_vignettes: true } 
 - { r_image: "clang-ubsan", skip_vignettes: true } 
 - { r_image: "gcc-asan", skip_vignettes: true} # includes both asan and ubsan
 steps:
 {{ macros.github_checkout_arrow()|indent }}
 {{ macros.github_install_archery()|indent }}

 - name: Docker Run
 shell: bash
 env:
 {{ macros.github_set_sccache_envvars()|indent(8)}}
 run: archery docker run -e SKIP_VIGNETTES={{ '${{ matrix.config.skip_vignettes }}' }} r-san
 - name: Dump install logs
 run: cat arrow/r/arrow.Rcheck/00install.out
 if: always()
 - name: Dump test logs
 run: cat arrow/r/arrow.Rcheck/tests/testthat.Rout*
 if: always()
 - name: Save the test output
 if: always()
 uses: actions/upload-artifact@v4
 with:
 name: test-output-{{ "${{ matrix.config.r_image }}" }}
 path: arrow/r/arrow.Rcheck/tests/testthat.Rout*

25 changes: 3 additions & 22 deletions
dev/tasks/tasks.yml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -1078,30 +1078,11 @@ tasks:
 r_tag: latest
 flags: "-e LIBARROW_MINIMAL=TRUE"

 test-r-linux-sanitizer:
 test-r-linux-sanitizers:
 ci: github
 template: docker-tests/github.linux.yml
 params:
 env:
 R_PRUNE_DEPS: TRUE
 image: ubuntu-r-sanitizer
 timeout: 120

 test-r-clang-asan:
 ci: github
 template: docker-tests/github.linux.yml
 template: r/github.linux.sanitizers.yml
 params:
 env:
 R_PRUNE_DEPS: TRUE
 image: r-clang-asan

 test-r-clang-ubsan:
 ci: github
 template: docker-tests/github.linux.yml
 params:
 env:
 R_PRUNE_DEPS: TRUE
 image: r-clang-ubsan
 timeout: 240 # 4 hours

 test-r-m1-san:
 ci: github
Expand Down

67 changes: 5 additions & 62 deletions
docker-compose.yml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -158,14 +158,12 @@ x-hierarchy:
 - ubuntu-cpp-sanitizer
 - ubuntu-cpp-thread-sanitizer
 - ubuntu-cpp-emscripten
 - ubuntu-r-sanitizer
 - ubuntu-r-valgrind
 - ubuntu-swift
 - ubuntu-verify-rc
 - r-clang-asan
 - r-clang-ubsan
 - r
 - r-revdepcheck
 - r-san
 # helper services
 - impala
 - postgres
Expand DownExpand Up@@ -1690,70 +1688,15 @@ services:
 command: >
 /bin/bash -c "/arrow/ci/scripts/r_test.sh /arrow"

 ubuntu-r-sanitizer:
 # Only amd64 supported
 # Usage:
 # docker compose build ubuntu-r-sanitizer
 # docker compose run ubuntu-r-sanitizer
 image: ${REPO}:amd64-ubuntu-r-sanitizer
 cap_add:
 # LeakSanitizer and gdb requires ptrace(2)
 - SYS_PTRACE
 r-san:
 image: ${REPO}:r-${R_ORG}-${R_IMAGE}
 build:
 context: .
 dockerfile: ci/docker/linux-r.dockerfile
 cache_from:
 - ${REPO}:amd64-ubuntu-r-sanitizer
 - ${REPO}:r-${R_ORG}-${R_IMAGE}
 args:
 base: wch1/r-debug:latest
 cmake: ${CMAKE}
 r_bin: RDsan
 tz: ${TZ}
 r_prune_deps: ${R_PRUNE_DEPS}
 environment:
 <<: [*common, *ccache]
 ARROW_SOURCE_HOME: "/arrow"
 volumes: *ubuntu-volumes
 command: >
 /bin/bash -c "
 /arrow/ci/scripts/r_sanitize.sh /arrow"

 r-clang-asan:
 image: ${REPO}:r-rhub-clang-devel-latest
 build:
 context: .
 dockerfile: ci/docker/linux-r.dockerfile
 cache_from:
 - ${REPO}:r-rhub-clang-devel-latest
 args:
 base: rhub/clang-asan
 cmake: ${CMAKE}
 r_dev: ${ARROW_R_DEV}
 r_bin: R
 tz: ${TZ}
 r_prune_deps: ${R_PRUNE_DEPS}
 shm_size: *shm-size
 environment:
 <<: *common
 LIBARROW_DOWNLOAD: "false"
 ARROW_SOURCE_HOME: "/arrow"
 ARROW_R_DEV: ${ARROW_R_DEV}
 ARROW_USE_PKG_CONFIG: "false"
 volumes:
 - .:/arrow:delegated
 command: >
 /bin/bash -c "
 /arrow/ci/scripts/r_sanitize.sh /arrow"

 r-clang-ubsan:
 image: ${REPO}:r-rhub-clang-ubsan-devel-latest
 build:
 context: .
 dockerfile: ci/docker/linux-r.dockerfile
 cache_from:
 - ${REPO}:r-rhub-clang-ubsan-devel-latest
 args:
 base: rhub/clang-ubsan
 base: ${R_ORG}/${R_IMAGE}:${R_TAG}
 cmake: ${CMAKE}
 r_dev: ${ARROW_R_DEV}
 r_bin: R
Expand Down

2 changes: 1 addition & 1 deletion
r/DESCRIPTION

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
Package: arrow
Title: Integration to 'Apache' 'Arrow'
Version: 20.0.0
Version: 20.0.0.1
Authors@R: c(
 person("Neal", "Richardson", email = "neal.p.richardson@gmail.com", role = c("aut")),
 person("Ian", "Cook", email = "ianmcook@gmail.com", role = c("aut")),
Expand Down

7 changes: 7 additions & 0 deletions
r/NEWS.md

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -17,6 +17,13 @@
 under the License.
-->

# arrow 20.0.0.1

## Minor improvements and fixes

- Updated internal C++ code to comply with CRAN's gcc-UBSAN checks
 ([#46394](https://github.com/apache/arrow/issues/46394))

# arrow 20.0.0

## Minor improvements and fixes
Expand Down

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Auto-enable theater mode on YouTube\n(function() {\n function tryTheater() {\n var btn = document.querySelector('button[aria-label=\"Theater mode\"], ytd-player #player button[title=\"Theater mode\"]');\n if (btn && !btn.classList.contains('activated')) {\n btn.click();\n }\n }\n \n // Try immediately\n tryTheater();\n \n // Try after navigation (SPA)\n var lastUrl = location.href;\n setInterval(function() {\n if (location.href !== lastUrl) {\n lastUrl = location.href;\n setTimeout(tryTheater, 500);\n }\n }, 1000);\n \n // Also try on player load\n var observer = new MutationObserver(tryTheater);\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "YouTube Theater Mode Default");
}
} catch(__e) { console.warn('[Userscript:YouTube Theater Mode Default]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content
WIP: [R] Verify CRAN release-20.0.0.1#46472

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.

 Sign up for GitHub

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

 Closed

amoeba
wants to merge
4
commits into

from

 Closed


WIP: [R] Verify CRAN release-20.0.0.1
#46472
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


4 commits


Select commit
Hold shift + click to select a range
95e0b2b

GH-40756: [C++] Remove dead Boost urls (#46452)


jonkeane May 16, 2025
e957c3b

GH-46394: [C++][R] gcc-UBSAN errors on CRAN (#46397)


jonkeane May 13, 2025
bd7024d

Update NEWS.md


amoeba May 16, 2025
f5fa324

20.0.0.1


amoeba May 16, 2025

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: 0 additions & 2 deletions
cpp/cmake_modules/ThirdpartyToolchain.cmake

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -610,8 +610,6 @@ else()
 # our currently used packages and doesn't fall out of sync with
 # ${ARROW_BOOST_BUILD_VERSION_UNDERSCORES}
 "${THIRDPARTY_MIRROR_URL}/boost_${ARROW_BOOST_BUILD_VERSION_UNDERSCORES}.tar.gz"
 "https://boostorg.jfrog.io/artifactory/main/release/${ARROW_BOOST_BUILD_VERSION}/source/boost_${ARROW_BOOST_BUILD_VERSION_UNDERSCORES}.tar.gz"
 "https://sourceforge.net/projects/boost/files/boost/${ARROW_BOOST_BUILD_VERSION}/boost_${ARROW_BOOST_BUILD_VERSION_UNDERSCORES}.tar.gz"
 )
endif()

Expand Down

6 changes: 5 additions & 1 deletion
cpp/src/arrow/csv/parser.cc

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -144,7 +144,11 @@ class ValueDescWriter {

 protected:
 ValueDescWriter(MemoryPool* pool, int64_t values_capacity)
 : values_size_(0), values_capacity_(values_capacity), status_(Status::OK()) {
 : values_size_(0),
 values_capacity_(values_capacity),
 quoted_(false),
 saved_values_size_(0),
 status_(Status::OK()) {
 status_ &= AllocateResizableBuffer(values_capacity_ * sizeof(*values_), pool)
 .Value(&values_buffer_);
 if (status_.ok()) {
Expand Down

60 changes: 60 additions & 0 deletions
dev/tasks/r/github.linux.sanitizers.yml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,60 @@
# Licensed to the Apache Software Foundation (ASF) under one
# or more contributor license agreements. See the NOTICE file
# distributed with this work for additional information
# regarding copyright ownership. The ASF licenses this file
# to you under the Apache License, Version 2.0 (the
# "License"); you may not use this file except in compliance
# with the License. You may obtain a copy of the License at
#
# http://www.apache.org/licenses/LICENSE-2.0
#
# Unless required by applicable law or agreed to in writing,
# software distributed under the License is distributed on an
# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
# KIND, either express or implied. See the License for the
# specific language governing permissions and limitations
# under the License.

{% import 'macros.jinja' as macros with context %}

{{ macros.github_header() }}

jobs:
 r-linux-sanitizers:
 name: "rhub/{{ '${{ matrix.config.r_image }}' }}"
 runs-on: ubuntu-latest
 timeout-minutes: {{ timeout|default(60) }}
 env:
 R_PRUNE_DEPS: TRUE
 R_ORG: "rhub"
 R_IMAGE: "{{ '${{ matrix.config.r_image }}' }}"
 R_TAG: "latest"
 strategy:
 fail-fast: false
 matrix:
 config:
 # See https://r-hub.github.io/containers/
 - { r_image: "clang-asan", skip_vignettes: true } 
 - { r_image: "clang-ubsan", skip_vignettes: true } 
 - { r_image: "gcc-asan", skip_vignettes: true} # includes both asan and ubsan
 steps:
 {{ macros.github_checkout_arrow()|indent }}
 {{ macros.github_install_archery()|indent }}

 - name: Docker Run
 shell: bash
 env:
 {{ macros.github_set_sccache_envvars()|indent(8)}}
 run: archery docker run -e SKIP_VIGNETTES={{ '${{ matrix.config.skip_vignettes }}' }} r-san
 - name: Dump install logs
 run: cat arrow/r/arrow.Rcheck/00install.out
 if: always()
 - name: Dump test logs
 run: cat arrow/r/arrow.Rcheck/tests/testthat.Rout*
 if: always()
 - name: Save the test output
 if: always()
 uses: actions/upload-artifact@v4
 with:
 name: test-output-{{ "${{ matrix.config.r_image }}" }}
 path: arrow/r/arrow.Rcheck/tests/testthat.Rout*

25 changes: 3 additions & 22 deletions
dev/tasks/tasks.yml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -1078,30 +1078,11 @@ tasks:
 r_tag: latest
 flags: "-e LIBARROW_MINIMAL=TRUE"

 test-r-linux-sanitizer:
 test-r-linux-sanitizers:
 ci: github
 template: docker-tests/github.linux.yml
 params:
 env:
 R_PRUNE_DEPS: TRUE
 image: ubuntu-r-sanitizer
 timeout: 120

 test-r-clang-asan:
 ci: github
 template: docker-tests/github.linux.yml
 template: r/github.linux.sanitizers.yml
 params:
 env:
 R_PRUNE_DEPS: TRUE
 image: r-clang-asan

 test-r-clang-ubsan:
 ci: github
 template: docker-tests/github.linux.yml
 params:
 env:
 R_PRUNE_DEPS: TRUE
 image: r-clang-ubsan
 timeout: 240 # 4 hours

 test-r-m1-san:
 ci: github
Expand Down

67 changes: 5 additions & 62 deletions
docker-compose.yml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -158,14 +158,12 @@ x-hierarchy:
 - ubuntu-cpp-sanitizer
 - ubuntu-cpp-thread-sanitizer
 - ubuntu-cpp-emscripten
 - ubuntu-r-sanitizer
 - ubuntu-r-valgrind
 - ubuntu-swift
 - ubuntu-verify-rc
 - r-clang-asan
 - r-clang-ubsan
 - r
 - r-revdepcheck
 - r-san
 # helper services
 - impala
 - postgres
Expand DownExpand Up@@ -1690,70 +1688,15 @@ services:
 command: >
 /bin/bash -c "/arrow/ci/scripts/r_test.sh /arrow"

 ubuntu-r-sanitizer:
 # Only amd64 supported
 # Usage:
 # docker compose build ubuntu-r-sanitizer
 # docker compose run ubuntu-r-sanitizer
 image: ${REPO}:amd64-ubuntu-r-sanitizer
 cap_add:
 # LeakSanitizer and gdb requires ptrace(2)
 - SYS_PTRACE
 r-san:
 image: ${REPO}:r-${R_ORG}-${R_IMAGE}
 build:
 context: .
 dockerfile: ci/docker/linux-r.dockerfile
 cache_from:
 - ${REPO}:amd64-ubuntu-r-sanitizer
 - ${REPO}:r-${R_ORG}-${R_IMAGE}
 args:
 base: wch1/r-debug:latest
 cmake: ${CMAKE}
 r_bin: RDsan
 tz: ${TZ}
 r_prune_deps: ${R_PRUNE_DEPS}
 environment:
 <<: [*common, *ccache]
 ARROW_SOURCE_HOME: "/arrow"
 volumes: *ubuntu-volumes
 command: >
 /bin/bash -c "
 /arrow/ci/scripts/r_sanitize.sh /arrow"

 r-clang-asan:
 image: ${REPO}:r-rhub-clang-devel-latest
 build:
 context: .
 dockerfile: ci/docker/linux-r.dockerfile
 cache_from:
 - ${REPO}:r-rhub-clang-devel-latest
 args:
 base: rhub/clang-asan
 cmake: ${CMAKE}
 r_dev: ${ARROW_R_DEV}
 r_bin: R
 tz: ${TZ}
 r_prune_deps: ${R_PRUNE_DEPS}
 shm_size: *shm-size
 environment:
 <<: *common
 LIBARROW_DOWNLOAD: "false"
 ARROW_SOURCE_HOME: "/arrow"
 ARROW_R_DEV: ${ARROW_R_DEV}
 ARROW_USE_PKG_CONFIG: "false"
 volumes:
 - .:/arrow:delegated
 command: >
 /bin/bash -c "
 /arrow/ci/scripts/r_sanitize.sh /arrow"

 r-clang-ubsan:
 image: ${REPO}:r-rhub-clang-ubsan-devel-latest
 build:
 context: .
 dockerfile: ci/docker/linux-r.dockerfile
 cache_from:
 - ${REPO}:r-rhub-clang-ubsan-devel-latest
 args:
 base: rhub/clang-ubsan
 base: ${R_ORG}/${R_IMAGE}:${R_TAG}
 cmake: ${CMAKE}
 r_dev: ${ARROW_R_DEV}
 r_bin: R
Expand Down

2 changes: 1 addition & 1 deletion
r/DESCRIPTION

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
Package: arrow
Title: Integration to 'Apache' 'Arrow'
Version: 20.0.0
Version: 20.0.0.1
Authors@R: c(
 person("Neal", "Richardson", email = "neal.p.richardson@gmail.com", role = c("aut")),
 person("Ian", "Cook", email = "ianmcook@gmail.com", role = c("aut")),
Expand Down

7 changes: 7 additions & 0 deletions
r/NEWS.md

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -17,6 +17,13 @@
 under the License.
-->

# arrow 20.0.0.1

## Minor improvements and fixes

- Updated internal C++ code to comply with CRAN's gcc-UBSAN checks
 ([#46394](https://github.com/apache/arrow/issues/46394))

# arrow 20.0.0

## Minor improvements and fixes
Expand Down

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Remove or un-stick sticky/fixed headers that block content\n(function() {\n function unstick() {\n document.querySelectorAll('header, nav, [role=\"banner\"], .header, .navbar, .sticky, .fixed-top, [style*=\"position: fixed\"], [style*=\"position:sticky\"]').forEach(function(el) {\n if (el.style.position === 'fixed' || el.style.position === 'sticky' || \n getComputedStyle(el).position === 'fixed' || getComputedStyle(el).position === 'sticky') {\n el.style.position = 'static';\n el.style.top = 'auto';\n el.style.zIndex = 'auto';\n }\n });\n }\n \n unstick();\n \n var observer = new MutationObserver(unstick);\n observer.observe(document.body, { childList: true, subtree: true, attributes: true, attributeFilter: ['style', 'class'] });\n})();", "Kill Sticky Headers");
}
} catch(__e) { console.warn('[Userscript:Kill Sticky Headers]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content
WIP: [R] Verify CRAN release-20.0.0.1#46472

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.

 Sign up for GitHub

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

 Closed

amoeba
wants to merge
4
commits into

from

 Closed


WIP: [R] Verify CRAN release-20.0.0.1
#46472
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


4 commits


Select commit
Hold shift + click to select a range
95e0b2b

GH-40756: [C++] Remove dead Boost urls (#46452)


jonkeane May 16, 2025
e957c3b

GH-46394: [C++][R] gcc-UBSAN errors on CRAN (#46397)


jonkeane May 13, 2025
bd7024d

Update NEWS.md


amoeba May 16, 2025
f5fa324

20.0.0.1


amoeba May 16, 2025

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: 0 additions & 2 deletions
cpp/cmake_modules/ThirdpartyToolchain.cmake

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -610,8 +610,6 @@ else()
 # our currently used packages and doesn't fall out of sync with
 # ${ARROW_BOOST_BUILD_VERSION_UNDERSCORES}
 "${THIRDPARTY_MIRROR_URL}/boost_${ARROW_BOOST_BUILD_VERSION_UNDERSCORES}.tar.gz"
 "https://boostorg.jfrog.io/artifactory/main/release/${ARROW_BOOST_BUILD_VERSION}/source/boost_${ARROW_BOOST_BUILD_VERSION_UNDERSCORES}.tar.gz"
 "https://sourceforge.net/projects/boost/files/boost/${ARROW_BOOST_BUILD_VERSION}/boost_${ARROW_BOOST_BUILD_VERSION_UNDERSCORES}.tar.gz"
 )
endif()

Expand Down

6 changes: 5 additions & 1 deletion
cpp/src/arrow/csv/parser.cc

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -144,7 +144,11 @@ class ValueDescWriter {

 protected:
 ValueDescWriter(MemoryPool* pool, int64_t values_capacity)
 : values_size_(0), values_capacity_(values_capacity), status_(Status::OK()) {
 : values_size_(0),
 values_capacity_(values_capacity),
 quoted_(false),
 saved_values_size_(0),
 status_(Status::OK()) {
 status_ &= AllocateResizableBuffer(values_capacity_ * sizeof(*values_), pool)
 .Value(&values_buffer_);
 if (status_.ok()) {
Expand Down

60 changes: 60 additions & 0 deletions
dev/tasks/r/github.linux.sanitizers.yml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,60 @@
# Licensed to the Apache Software Foundation (ASF) under one
# or more contributor license agreements. See the NOTICE file
# distributed with this work for additional information
# regarding copyright ownership. The ASF licenses this file
# to you under the Apache License, Version 2.0 (the
# "License"); you may not use this file except in compliance
# with the License. You may obtain a copy of the License at
#
# http://www.apache.org/licenses/LICENSE-2.0
#
# Unless required by applicable law or agreed to in writing,
# software distributed under the License is distributed on an
# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
# KIND, either express or implied. See the License for the
# specific language governing permissions and limitations
# under the License.

{% import 'macros.jinja' as macros with context %}

{{ macros.github_header() }}

jobs:
 r-linux-sanitizers:
 name: "rhub/{{ '${{ matrix.config.r_image }}' }}"
 runs-on: ubuntu-latest
 timeout-minutes: {{ timeout|default(60) }}
 env:
 R_PRUNE_DEPS: TRUE
 R_ORG: "rhub"
 R_IMAGE: "{{ '${{ matrix.config.r_image }}' }}"
 R_TAG: "latest"
 strategy:
 fail-fast: false
 matrix:
 config:
 # See https://r-hub.github.io/containers/
 - { r_image: "clang-asan", skip_vignettes: true } 
 - { r_image: "clang-ubsan", skip_vignettes: true } 
 - { r_image: "gcc-asan", skip_vignettes: true} # includes both asan and ubsan
 steps:
 {{ macros.github_checkout_arrow()|indent }}
 {{ macros.github_install_archery()|indent }}

 - name: Docker Run
 shell: bash
 env:
 {{ macros.github_set_sccache_envvars()|indent(8)}}
 run: archery docker run -e SKIP_VIGNETTES={{ '${{ matrix.config.skip_vignettes }}' }} r-san
 - name: Dump install logs
 run: cat arrow/r/arrow.Rcheck/00install.out
 if: always()
 - name: Dump test logs
 run: cat arrow/r/arrow.Rcheck/tests/testthat.Rout*
 if: always()
 - name: Save the test output
 if: always()
 uses: actions/upload-artifact@v4
 with:
 name: test-output-{{ "${{ matrix.config.r_image }}" }}
 path: arrow/r/arrow.Rcheck/tests/testthat.Rout*

25 changes: 3 additions & 22 deletions
dev/tasks/tasks.yml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -1078,30 +1078,11 @@ tasks:
 r_tag: latest
 flags: "-e LIBARROW_MINIMAL=TRUE"

 test-r-linux-sanitizer:
 test-r-linux-sanitizers:
 ci: github
 template: docker-tests/github.linux.yml
 params:
 env:
 R_PRUNE_DEPS: TRUE
 image: ubuntu-r-sanitizer
 timeout: 120

 test-r-clang-asan:
 ci: github
 template: docker-tests/github.linux.yml
 template: r/github.linux.sanitizers.yml
 params:
 env:
 R_PRUNE_DEPS: TRUE
 image: r-clang-asan

 test-r-clang-ubsan:
 ci: github
 template: docker-tests/github.linux.yml
 params:
 env:
 R_PRUNE_DEPS: TRUE
 image: r-clang-ubsan
 timeout: 240 # 4 hours

 test-r-m1-san:
 ci: github
Expand Down

67 changes: 5 additions & 62 deletions
docker-compose.yml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -158,14 +158,12 @@ x-hierarchy:
 - ubuntu-cpp-sanitizer
 - ubuntu-cpp-thread-sanitizer
 - ubuntu-cpp-emscripten
 - ubuntu-r-sanitizer
 - ubuntu-r-valgrind
 - ubuntu-swift
 - ubuntu-verify-rc
 - r-clang-asan
 - r-clang-ubsan
 - r
 - r-revdepcheck
 - r-san
 # helper services
 - impala
 - postgres
Expand DownExpand Up@@ -1690,70 +1688,15 @@ services:
 command: >
 /bin/bash -c "/arrow/ci/scripts/r_test.sh /arrow"

 ubuntu-r-sanitizer:
 # Only amd64 supported
 # Usage:
 # docker compose build ubuntu-r-sanitizer
 # docker compose run ubuntu-r-sanitizer
 image: ${REPO}:amd64-ubuntu-r-sanitizer
 cap_add:
 # LeakSanitizer and gdb requires ptrace(2)
 - SYS_PTRACE
 r-san:
 image: ${REPO}:r-${R_ORG}-${R_IMAGE}
 build:
 context: .
 dockerfile: ci/docker/linux-r.dockerfile
 cache_from:
 - ${REPO}:amd64-ubuntu-r-sanitizer
 - ${REPO}:r-${R_ORG}-${R_IMAGE}
 args:
 base: wch1/r-debug:latest
 cmake: ${CMAKE}
 r_bin: RDsan
 tz: ${TZ}
 r_prune_deps: ${R_PRUNE_DEPS}
 environment:
 <<: [*common, *ccache]
 ARROW_SOURCE_HOME: "/arrow"
 volumes: *ubuntu-volumes
 command: >
 /bin/bash -c "
 /arrow/ci/scripts/r_sanitize.sh /arrow"

 r-clang-asan:
 image: ${REPO}:r-rhub-clang-devel-latest
 build:
 context: .
 dockerfile: ci/docker/linux-r.dockerfile
 cache_from:
 - ${REPO}:r-rhub-clang-devel-latest
 args:
 base: rhub/clang-asan
 cmake: ${CMAKE}
 r_dev: ${ARROW_R_DEV}
 r_bin: R
 tz: ${TZ}
 r_prune_deps: ${R_PRUNE_DEPS}
 shm_size: *shm-size
 environment:
 <<: *common
 LIBARROW_DOWNLOAD: "false"
 ARROW_SOURCE_HOME: "/arrow"
 ARROW_R_DEV: ${ARROW_R_DEV}
 ARROW_USE_PKG_CONFIG: "false"
 volumes:
 - .:/arrow:delegated
 command: >
 /bin/bash -c "
 /arrow/ci/scripts/r_sanitize.sh /arrow"

 r-clang-ubsan:
 image: ${REPO}:r-rhub-clang-ubsan-devel-latest
 build:
 context: .
 dockerfile: ci/docker/linux-r.dockerfile
 cache_from:
 - ${REPO}:r-rhub-clang-ubsan-devel-latest
 args:
 base: rhub/clang-ubsan
 base: ${R_ORG}/${R_IMAGE}:${R_TAG}
 cmake: ${CMAKE}
 r_dev: ${ARROW_R_DEV}
 r_bin: R
Expand Down

2 changes: 1 addition & 1 deletion
r/DESCRIPTION

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
Package: arrow
Title: Integration to 'Apache' 'Arrow'
Version: 20.0.0
Version: 20.0.0.1
Authors@R: c(
 person("Neal", "Richardson", email = "neal.p.richardson@gmail.com", role = c("aut")),
 person("Ian", "Cook", email = "ianmcook@gmail.com", role = c("aut")),
Expand Down

7 changes: 7 additions & 0 deletions
r/NEWS.md

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -17,6 +17,13 @@
 under the License.
-->

# arrow 20.0.0.1

## Minor improvements and fixes

- Updated internal C++ code to comply with CRAN's gcc-UBSAN checks
 ([#46394](https://github.com/apache/arrow/issues/46394))

# arrow 20.0.0

## Minor improvements and fixes
Expand Down

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Universal Dark Mode - works on any site\n(function() {\n var enabled = true;\n \n function applyDarkMode() {\n if (!enabled) return;\n \n // Create style element if it doesn't exist\n var style = document.getElementById('universal-dark-mode-style');\n if (!style) {\n style = document.createElement('style');\n style.id = 'universal-dark-mode-style';\n document.head.appendChild(style);\n }\n \n // Dark mode CSS - inverts colors but preserves images/video\n style.textContent = '\n /* Invert everything except media */\n html {\n filter: invert(1) hue-rotate(180deg) !important;\n background: #1a1a2e !important;\n }\n \n /* Restore images, videos, iframes, canvas */\n img, video, iframe, canvas, svg, picture, [style*=\"background-image\"] {\n filter: invert(1) hue-rotate(180deg) !important;\n }\n \n /* Preserve specific elements that should not be inverted */\n .no-dark-mode, .no-dark-mode *,\n [data-theme=\"light\"], [data-theme=\"light\"],\n .ace_editor, .ace_editor *,\n .CodeMirror, .CodeMirror *,\n .monaco-editor, .monaco-editor *,\n .markdown-body pre, .markdown-body pre *,\n .highlight, .highlight *,\n pre code, pre code * {\n filter: none !important;\n }\n \n /* Fix common UI elements */\n .modal, .popup, .dropdown-menu, .tooltip, .popover {\n filter: invert(1) hue-rotate(180deg) !important;\n background: #2d2d44 !important;\n border-color: #444 !important;\n }\n \n /* Scrollbars */\n ::-webkit-scrollbar { background: #1a1a2e !important; }\n ::-webkit-scrollbar-thumb { background: #444 !important; }\n ::-webkit-scrollbar-thumb:hover { background: #555 !important; }\n \n /* Selection */\n ::selection { background: #4ecdc4 !important; color: #1a1a2e !important; }\n ::-moz-selection { background: #4ecdc4 !important; color: #1a1a2e !important; }\n ';\n }\n \n function removeDarkMode() {\n var style = document.getElementById('universal-dark-mode-style');\n if (style) style.remove();\n }\n \n // Toggle with Alt+Shift+D\n document.addEventListener('keydown', function(e) {\n if (e.altKey && e.shiftKey && e.key === 'D') {\n e.preventDefault();\n enabled = !enabled;\n if (enabled) {\n applyDarkMode();\n console.log('[Universal Dark Mode] Enabled');\n } else {\n removeDarkMode();\n console.log('[Universal Dark Mode] Disabled');\n }\n }\n });\n \n // Apply on load\n applyDarkMode();\n \n // Re-apply on dynamic content\n var observer = new MutationObserver(function(mutations) {\n if (enabled && !document.getElementById('universal-dark-mode-style')) {\n applyDarkMode();\n }\n });\n observer.observe(document.head, { childList: true });\n \n console.log('[Universal Dark Mode] Loaded - Press Alt+Shift+D to toggle');\n})();", "Universal Dark Mode");
}
} catch(__e) { console.warn('[Userscript:Universal Dark Mode]', __e); }
})();
})();

Skip to content
WIP: [R] Verify CRAN release-20.0.0.1#46472

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.

 Sign up for GitHub

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

 Closed

amoeba
wants to merge
4
commits into

from

 Closed


WIP: [R] Verify CRAN release-20.0.0.1
#46472
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


4 commits


Select commit
Hold shift + click to select a range
95e0b2b

GH-40756: [C++] Remove dead Boost urls (#46452)


jonkeane May 16, 2025
e957c3b

GH-46394: [C++][R] gcc-UBSAN errors on CRAN (#46397)


jonkeane May 13, 2025
bd7024d

Update NEWS.md


amoeba May 16, 2025
f5fa324

20.0.0.1


amoeba May 16, 2025

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: 0 additions & 2 deletions
cpp/cmake_modules/ThirdpartyToolchain.cmake

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -610,8 +610,6 @@ else()
 # our currently used packages and doesn't fall out of sync with
 # ${ARROW_BOOST_BUILD_VERSION_UNDERSCORES}
 "${THIRDPARTY_MIRROR_URL}/boost_${ARROW_BOOST_BUILD_VERSION_UNDERSCORES}.tar.gz"
 "https://boostorg.jfrog.io/artifactory/main/release/${ARROW_BOOST_BUILD_VERSION}/source/boost_${ARROW_BOOST_BUILD_VERSION_UNDERSCORES}.tar.gz"
 "https://sourceforge.net/projects/boost/files/boost/${ARROW_BOOST_BUILD_VERSION}/boost_${ARROW_BOOST_BUILD_VERSION_UNDERSCORES}.tar.gz"
 )
endif()

Expand Down

6 changes: 5 additions & 1 deletion
cpp/src/arrow/csv/parser.cc

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -144,7 +144,11 @@ class ValueDescWriter {

 protected:
 ValueDescWriter(MemoryPool* pool, int64_t values_capacity)
 : values_size_(0), values_capacity_(values_capacity), status_(Status::OK()) {
 : values_size_(0),
 values_capacity_(values_capacity),
 quoted_(false),
 saved_values_size_(0),
 status_(Status::OK()) {
 status_ &= AllocateResizableBuffer(values_capacity_ * sizeof(*values_), pool)
 .Value(&values_buffer_);
 if (status_.ok()) {
Expand Down

60 changes: 60 additions & 0 deletions
dev/tasks/r/github.linux.sanitizers.yml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,60 @@
# Licensed to the Apache Software Foundation (ASF) under one
# or more contributor license agreements. See the NOTICE file
# distributed with this work for additional information
# regarding copyright ownership. The ASF licenses this file
# to you under the Apache License, Version 2.0 (the
# "License"); you may not use this file except in compliance
# with the License. You may obtain a copy of the License at
#
# http://www.apache.org/licenses/LICENSE-2.0
#
# Unless required by applicable law or agreed to in writing,
# software distributed under the License is distributed on an
# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
# KIND, either express or implied. See the License for the
# specific language governing permissions and limitations
# under the License.

{% import 'macros.jinja' as macros with context %}

{{ macros.github_header() }}

jobs:
 r-linux-sanitizers:
 name: "rhub/{{ '${{ matrix.config.r_image }}' }}"
 runs-on: ubuntu-latest
 timeout-minutes: {{ timeout|default(60) }}
 env:
 R_PRUNE_DEPS: TRUE
 R_ORG: "rhub"
 R_IMAGE: "{{ '${{ matrix.config.r_image }}' }}"
 R_TAG: "latest"
 strategy:
 fail-fast: false
 matrix:
 config:
 # See https://r-hub.github.io/containers/
 - { r_image: "clang-asan", skip_vignettes: true } 
 - { r_image: "clang-ubsan", skip_vignettes: true } 
 - { r_image: "gcc-asan", skip_vignettes: true} # includes both asan and ubsan
 steps:
 {{ macros.github_checkout_arrow()|indent }}
 {{ macros.github_install_archery()|indent }}

 - name: Docker Run
 shell: bash
 env:
 {{ macros.github_set_sccache_envvars()|indent(8)}}
 run: archery docker run -e SKIP_VIGNETTES={{ '${{ matrix.config.skip_vignettes }}' }} r-san
 - name: Dump install logs
 run: cat arrow/r/arrow.Rcheck/00install.out
 if: always()
 - name: Dump test logs
 run: cat arrow/r/arrow.Rcheck/tests/testthat.Rout*
 if: always()
 - name: Save the test output
 if: always()
 uses: actions/upload-artifact@v4
 with:
 name: test-output-{{ "${{ matrix.config.r_image }}" }}
 path: arrow/r/arrow.Rcheck/tests/testthat.Rout*

25 changes: 3 additions & 22 deletions
dev/tasks/tasks.yml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -1078,30 +1078,11 @@ tasks:
 r_tag: latest
 flags: "-e LIBARROW_MINIMAL=TRUE"

 test-r-linux-sanitizer:
 test-r-linux-sanitizers:
 ci: github
 template: docker-tests/github.linux.yml
 params:
 env:
 R_PRUNE_DEPS: TRUE
 image: ubuntu-r-sanitizer
 timeout: 120

 test-r-clang-asan:
 ci: github
 template: docker-tests/github.linux.yml
 template: r/github.linux.sanitizers.yml
 params:
 env:
 R_PRUNE_DEPS: TRUE
 image: r-clang-asan

 test-r-clang-ubsan:
 ci: github
 template: docker-tests/github.linux.yml
 params:
 env:
 R_PRUNE_DEPS: TRUE
 image: r-clang-ubsan
 timeout: 240 # 4 hours

 test-r-m1-san:
 ci: github
Expand Down

67 changes: 5 additions & 62 deletions
docker-compose.yml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -158,14 +158,12 @@ x-hierarchy:
 - ubuntu-cpp-sanitizer
 - ubuntu-cpp-thread-sanitizer
 - ubuntu-cpp-emscripten
 - ubuntu-r-sanitizer
 - ubuntu-r-valgrind
 - ubuntu-swift
 - ubuntu-verify-rc
 - r-clang-asan
 - r-clang-ubsan
 - r
 - r-revdepcheck
 - r-san
 # helper services
 - impala
 - postgres
Expand DownExpand Up@@ -1690,70 +1688,15 @@ services:
 command: >
 /bin/bash -c "/arrow/ci/scripts/r_test.sh /arrow"

 ubuntu-r-sanitizer:
 # Only amd64 supported
 # Usage:
 # docker compose build ubuntu-r-sanitizer
 # docker compose run ubuntu-r-sanitizer
 image: ${REPO}:amd64-ubuntu-r-sanitizer
 cap_add:
 # LeakSanitizer and gdb requires ptrace(2)
 - SYS_PTRACE
 r-san:
 image: ${REPO}:r-${R_ORG}-${R_IMAGE}
 build:
 context: .
 dockerfile: ci/docker/linux-r.dockerfile
 cache_from:
 - ${REPO}:amd64-ubuntu-r-sanitizer
 - ${REPO}:r-${R_ORG}-${R_IMAGE}
 args:
 base: wch1/r-debug:latest
 cmake: ${CMAKE}
 r_bin: RDsan
 tz: ${TZ}
 r_prune_deps: ${R_PRUNE_DEPS}
 environment:
 <<: [*common, *ccache]
 ARROW_SOURCE_HOME: "/arrow"
 volumes: *ubuntu-volumes
 command: >
 /bin/bash -c "
 /arrow/ci/scripts/r_sanitize.sh /arrow"

 r-clang-asan:
 image: ${REPO}:r-rhub-clang-devel-latest
 build:
 context: .
 dockerfile: ci/docker/linux-r.dockerfile
 cache_from:
 - ${REPO}:r-rhub-clang-devel-latest
 args:
 base: rhub/clang-asan
 cmake: ${CMAKE}
 r_dev: ${ARROW_R_DEV}
 r_bin: R
 tz: ${TZ}
 r_prune_deps: ${R_PRUNE_DEPS}
 shm_size: *shm-size
 environment:
 <<: *common
 LIBARROW_DOWNLOAD: "false"
 ARROW_SOURCE_HOME: "/arrow"
 ARROW_R_DEV: ${ARROW_R_DEV}
 ARROW_USE_PKG_CONFIG: "false"
 volumes:
 - .:/arrow:delegated
 command: >
 /bin/bash -c "
 /arrow/ci/scripts/r_sanitize.sh /arrow"

 r-clang-ubsan:
 image: ${REPO}:r-rhub-clang-ubsan-devel-latest
 build:
 context: .
 dockerfile: ci/docker/linux-r.dockerfile
 cache_from:
 - ${REPO}:r-rhub-clang-ubsan-devel-latest
 args:
 base: rhub/clang-ubsan
 base: ${R_ORG}/${R_IMAGE}:${R_TAG}
 cmake: ${CMAKE}
 r_dev: ${ARROW_R_DEV}
 r_bin: R
Expand Down

2 changes: 1 addition & 1 deletion
r/DESCRIPTION

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
Package: arrow
Title: Integration to 'Apache' 'Arrow'
Version: 20.0.0
Version: 20.0.0.1
Authors@R: c(
 person("Neal", "Richardson", email = "neal.p.richardson@gmail.com", role = c("aut")),
 person("Ian", "Cook", email = "ianmcook@gmail.com", role = c("aut")),
Expand Down

7 changes: 7 additions & 0 deletions
r/NEWS.md

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -17,6 +17,13 @@
 under the License.
-->

# arrow 20.0.0.1

## Minor improvements and fixes

- Updated internal C++ code to comply with CRAN's gcc-UBSAN checks
 ([#46394](https://github.com/apache/arrow/issues/46394))

# arrow 20.0.0

## Minor improvements and fixes
Expand Down