Skip to content

Commit 218c886

Browse files
authored
GH-43623: [R] remove libarrow backwards compatibility enforcement (#46491)
### Rationale for this change Remove checks and enforcement of minimum versions. See discussion in the issue. This caused more confusion and discussion than it was helpful. We have the CI in git history if we need it. ### What changes are included in this PR? Removing the CI job ### Are these changes tested? They are the tests ### Are there any user-facing changes? No, we are still technically compatible with 19.0.1, but we don't explicitly support that or use it anywhere. The R package version should match the libarrow version to ensure compatibility — using anything else might work but is off label. * GitHub Issue: #43623 Authored-by: Jonathan Keane <[email protected]> Signed-off-by: Jonathan Keane <[email protected]>
1 parent 40dcc15 commit 218c886

File tree

5 files changed

+1
-71
lines changed

5 files changed

+1
-71
lines changed

.github/workflows/r.yml

Lines changed: 0 additions & 57 deletions
Original file line numberDiff line numberDiff line change
@@ -62,63 +62,6 @@ env:
6262
DOCKER_VOLUME_PREFIX: ".docker/"
6363

6464
jobs:
65-
ubuntu-minimum-cpp-version:
66-
name: Check minimum supported Arrow C++ Version (${{ matrix.cpp_version }})
67-
runs-on: ubuntu-22.04
68-
strategy:
69-
matrix:
70-
include:
71-
- cpp_version: "19.0.1"
72-
steps:
73-
- name: Checkout Arrow
74-
uses: actions/checkout@3df4ab11eba7bda6032a0b82a6bb43b11571feac # v4.0.0
75-
with:
76-
path: src
77-
submodules: recursive
78-
79-
- name: Install Arrow C++ (${{ matrix.cpp_version }})
80-
run: |
81-
sudo apt update
82-
sudo apt install -y -V ca-certificates lsb-release wget
83-
wget https://apache.jfrog.io/artifactory/arrow/$(lsb_release --id --short | tr 'A-Z' 'a-z')/apache-arrow-apt-source-latest-$(lsb_release --codename --short).deb
84-
sudo apt install -y -V ./apache-arrow-apt-source-latest-$(lsb_release --codename --short).deb
85-
sudo apt update
86-
# We have to list all packages to avoid version conflicts.
87-
sudo apt install -y -V libarrow-dev=${{ matrix.cpp_version }}-1 \
88-
libarrow-acero-dev=${{ matrix.cpp_version }}-1 \
89-
libparquet-dev=${{ matrix.cpp_version }}-1 \
90-
libarrow-dataset-dev=${{ matrix.cpp_version }}-1
91-
92-
- name: Install checkbashisms
93-
run: |
94-
sudo apt-get install devscripts
95-
96-
- uses: r-lib/actions/setup-r@v2
97-
with:
98-
use-public-rspm: true
99-
install-r: false
100-
101-
- uses: r-lib/actions/setup-r-dependencies@v2
102-
with:
103-
extra-packages: any::rcmdcheck
104-
needs: check
105-
working-directory: src/r
106-
107-
- uses: r-lib/actions/check-r-package@v2
108-
with:
109-
working-directory: src/r
110-
env:
111-
LIBARROW_BINARY: "false"
112-
LIBARROW_BUILD: "false"
113-
ARROW_R_VERBOSE_TEST: "true"
114-
ARROW_R_ALLOW_CPP_VERSION_MISMATCH: "true"
115-
116-
- name: Show install output
117-
if: always()
118-
run: find src/r/check -name '00install.out*' -exec cat '{}' \; || true
119-
shell: bash
120-
121-
12265
ubuntu:
12366
name: AMD64 Ubuntu ${{ matrix.ubuntu }} R ${{ matrix.r }} Force-Tests ${{ matrix.force-tests }}
12467
runs-on: ubuntu-latest

r/PACKAGING.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ For a high-level overview of the Arrow release process see the [Apache Arrow Rel
2525
## Before the Arrow Release Candidate Is Created
2626

2727
- [ ] [Create a GitHub issue](https://github.com/apache/arrow/issues/new/) entitled `[R] CRAN packaging checklist for version X.Y.Z` and copy this checklist to the issue.
28-
- [ ] Review deprecated functions to advance their deprecation status, including removing preprocessor directives that no longer apply (search for `ARROW_VERSION_MAJOR` in r/src).
28+
- [ ] Review deprecated functions to advance their deprecation status.
2929
- [ ] Evaluate the status of any failing [nightly tests and nightly packaging builds](http://crossbow.voltrondata.com). These checks replicate most of the checks that CRAN runs, so we need them all to be passing or to understand that the failures may (though won't necessarily) result in a rejection from CRAN.
3030
- [ ] Check [current CRAN check results](https://cran.rstudio.org/web/checks/check_results_arrow.html).
3131
- [ ] Ensure the contents of the README are accurate and up to date.

r/src/altrep.cpp

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -80,13 +80,8 @@ void DeletePointer(std::shared_ptr<T>* ptr) {
8080
template <typename T>
8181
using Pointer = cpp11::external_pointer<std::shared_ptr<T>, DeletePointer<T>>;
8282

83-
#if ARROW_VERSION_MAJOR >= 18
8483
using ChunkResolver = arrow::ChunkResolver;
8584
using ChunkLocation = arrow::ChunkLocation;
86-
#else
87-
using ChunkResolver = arrow::internal::ChunkResolver;
88-
using ChunkLocation = arrow::internal::ChunkLocation;
89-
#endif
9085

9186
class ArrowAltrepData {
9287
public:

r/src/extension-impl.cpp

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -100,11 +100,7 @@ std::string RExtensionType::ToString(bool show_metadata) const {
100100
// In the event of an error (e.g., we are not on the main thread
101101
// and we are not inside RunWithCapturedR()), just call the default method
102102
if (!result.ok()) {
103-
#if ARROW_VERSION_MAJOR >= 16
104103
return ExtensionType::ToString(show_metadata);
105-
#else
106-
return ExtensionType::ToString();
107-
#endif
108104
} else {
109105
return result.ValueUnsafe();
110106
}

r/src/filesystem.cpp

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -429,11 +429,7 @@ std::shared_ptr<fs::GcsFileSystem> fs___GcsFileSystem__Make(bool anonymous,
429429
}
430430

431431
auto io_context = MainRThread::GetInstance().CancellableIOContext();
432-
#if ARROW_VERSION_MAJOR >= 18
433432
return ValueOrStop(fs::GcsFileSystem::Make(gcs_opts, io_context));
434-
#else
435-
return fs::GcsFileSystem::Make(gcs_opts, io_context);
436-
#endif
437433
}
438434

439435
// [[gcs::export]]

0 commit comments

Comments
 (0)