GH-41952: [R] Turn S3 and ZSTD on by default for macOS - #42210

Merged
jonkeane merged 6 commits into
apache:mainfrom
jonkeane:macos_default_s3
Jun 23, 2024
Merged

GH-41952: [R] Turn S3 and ZSTD on by default for macOS#42210
jonkeane merged 6 commits into
apache:mainfrom
jonkeane:macos_default_s3

Conversation

@jonkeane

@jonkeanejonkeane commented Jun 19, 2024

Copy link
Copy Markdown
Member

Changeup nixlibs.R so that we enable S3 and ZSTD by default on CRAN. I've checked this against the CRAN macbuilder to confirm it does work (that's not a guarantee it'll work on other CRAN maintained macOS builders, but a good indication).

It also removes gcs from the list of features we expect to be on and warn folks about if it is not.

Rationale for this change

So that our builds are more fully featured.

What changes are included in this PR?

Enable ARROW_S3 by default when building form source on macOS.

Are these changes tested?

Existing CI should not fail.

Are there any user-facing changes?

Getting Arrow from the canonical repository would be more fully featured.

@github-actions

Copy link
Copy Markdown

⚠️ GitHub issue #41952has been automatically assigned in GitHub to PR creator.

Comment threadr/tools/nixlibs.R
cleanup(build_dir)

env_var_list <- c(
env_var_list <- list(

Copy link
Copy Markdown
MemberAuthor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This isn't technically necessary, but it was the easiest way to do what I wanted to in is_feature_requested(). Further, it's a bit strange that this thing called X_X_list is not a list.

@github-actionsgithub-actionsBot added awaiting changes Awaiting changes and removed awaiting committer review Awaiting committer review labels Jun 19, 2024
Comment threadr/tools/nixlibs.R
Comment on lines +819 to +825
is_feature_requested <- function(env_varname, env_var_list, default = env_is("LIBARROW_MINIMAL", "false")) {
# look in our env_var_list first, if it's not found there go to
# the actual environment
env_value <- tolower(env_var_list[[env_varname]])
if (is.null(env_value)) {
env_value <- tolower(Sys.getenv(env_varname))
}

Copy link
Copy Markdown
MemberAuthor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This is a change in behavior that warrants some thought. Though I will say this is how I thought this worked already — or rather I thought is_feature_requested() was looking at env_var_list and not only looking at the literal environment. It's possible this was a mistake / it should have never looked at the environment but instead be looking at the env_var_list. But I kept it for now in case this is actually intended.

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The original intent of the function was to check whether the user requested a feature. env_var_list doesn't contain any user-requested features, at least not in the active sense. But now that you're putting some default selections in there, it makes sense to check it here. The function is currently only used to check for S3/GCS, to know whether we need to have openssl and curl.

Copy link
Copy Markdown
MemberAuthor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

AAAAH I was missing the user- part there, that makes it make more sense now.

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

See, this is why passive voice is bad.

@github-actionsgithub-actionsBot added awaiting change review Awaiting change review and removed awaiting changes Awaiting changes labels Jun 19, 2024
@jonkeanejonkeane changed the title GH-41952: [R] Turn S3 on by default for macOSGH-41952: [R] Turn S3, GCS, and ZSTD on by default for macOSJun 19, 2024
@jonkeane

Copy link
Copy Markdown
MemberAuthor

I also noticed two other optional libraries that were being flagged as not a full build. I added those, and ran mac builder: https://mac.r-project.org/macbuilder/results/1718828010-3fa0fa8b00b3b11c/

@nealrichardsonnealrichardson left a comment

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This seems like the least bad option for turning these features on. The other places where we handle defaults, like by the value of LIBARROW_MINIMAL, aren't good for S3/GCS because we have to check up front for openssl/curl.

Comment threadr/tools/nixlibs.R Outdated
Comment threadr/tools/nixlibs.R
Comment on lines +819 to +825
is_feature_requested <- function(env_varname, env_var_list, default = env_is("LIBARROW_MINIMAL", "false")) {
# look in our env_var_list first, if it's not found there go to
# the actual environment
env_value <- tolower(env_var_list[[env_varname]])
if (is.null(env_value)) {
env_value <- tolower(Sys.getenv(env_varname))
}

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The original intent of the function was to check whether the user requested a feature. env_var_list doesn't contain any user-requested features, at least not in the active sense. But now that you're putting some default selections in there, it makes sense to check it here. The function is currently only used to check for S3/GCS, to know whether we need to have openssl and curl.

Co-authored-by: Neal Richardson <neal.p.richardson@gmail.com>
@github-actionsgithub-actionsBot added awaiting changes Awaiting changes and removed awaiting change review Awaiting change review labels Jun 20, 2024
@jonkeane

jonkeane commented Jun 20, 2024

Copy link
Copy Markdown
MemberAuthor

I also wonder whether GCS is worth including.

I agree + though similar when I checked if S3 alone was sufficient for quieting the message. I'm happy to pull GCS out of this, though IMO we should also add GCS to the block list so that it's not being checked if we do that too.

I'm happy to do this in this PR if we want.

@nealrichardson

Copy link
Copy Markdown
Member

I also wonder whether GCS is worth including.

I agree + though similar when I checked if S3 alone was sufficient for quieting the message. I'm happy to pull GCS out of this, though IMO we should also add GCS to the block list so that it's not being checked if we do that too.

I'm happy to do this in this PR if we want.

Right, we would want to change that message.

On the one hand, users won't generally experience this because they'll get a binary from CRAN. On the other, GCS increases build time there and increases the BDR attack surface. I don't know how big that risk is and if demand for GCS outweighs it--I haven't noticed demand for GCS, but maybe I'm not looking in the right places.

I guess we could leave it on, and if we get dinged on CRAN, we know how to turn it back off?

@jonkeane

Copy link
Copy Markdown
MemberAuthor

MM, I think you've convinced me that we should pull GCS back for now (and see if someone requests it before we open up our attack surface more). At the very least, it would be nice to send something with a more minimal expansion at first in case the CRAN macOS builders are different in key ways, we'll know that it's just an issue with S3 or zstd now. And maybe add GCS in 18 (or only when someone asks for it in a CRAN release). Like you said, it's easy enough to see how to change these now.

@github-actionsgithub-actionsBot added awaiting change review Awaiting change review and removed awaiting changes Awaiting changes labels Jun 20, 2024
@jonkeanejonkeane changed the title GH-41952: [R] Turn S3, GCS, and ZSTD on by default for macOSGH-41952: [R] Turn S3 and ZSTD on by default for macOSJun 20, 2024
@jonkeane

Copy link
Copy Markdown
MemberAuthor

@github-actions crossbow submit -g r

@github-actions

Copy link
Copy Markdown

Revision: 548b6b2

Submitted crossbow builds: ursacomputing/crossbow @ actions-e5cdc79a11

TaskStatus
r-binary-packagesGitHub Actions
test-r-arrow-backwards-compatibilityGitHub Actions
test-r-clang-sanitizerGitHub Actions
test-r-depsource-bundledAzure
test-r-depsource-systemGitHub Actions
test-r-dev-duckdbGitHub Actions
test-r-devdocsGitHub Actions
test-r-gcc-11GitHub Actions
test-r-gcc-12GitHub Actions
test-r-install-localGitHub Actions
test-r-install-local-minsizerelGitHub Actions
test-r-linux-as-cranGitHub Actions
test-r-linux-rchkGitHub Actions
test-r-linux-valgrindGitHub Actions
test-r-minimal-buildAzure
test-r-offline-maximalGitHub Actions
test-r-offline-minimalAzure
test-r-rhub-debian-gcc-devel-lto-latestAzure
test-r-rhub-debian-gcc-release-custom-ccacheAzure
test-r-rhub-ubuntu-release-latestAzure
test-r-rocker-r-ver-latestAzure
test-r-rstudio-r-base-4.1-opensuse155Azure
test-r-rstudio-r-base-4.2-focalAzure
test-r-ubuntu-22.04GitHub Actions
test-r-versionsGitHub Actions
test-ubuntu-r-sanitizerGitHub Actions

@assignUser

Copy link
Copy Markdown
Member

I also wonder whether GCS is worth including.

IMO the CRAN builds should be as feature complete as possible as they are (well after the issue with the last two released binaries maybe used to be...) the way to get the package for mac users and there shouldn't be a reason for users to user alternative sources like r-universe or source build but:

On the other, GCS increases build time there and increases the BDR attack surface.

While I would have disagreed previously reality has beaten me down and eh... ok.

@jonkeane

Copy link
Copy Markdown
MemberAuthor

@github-actions crossbow submit -g r

@github-actions

Copy link
Copy Markdown

Revision: b23878a

Submitted crossbow builds: ursacomputing/crossbow @ actions-f75e6668f4

TaskStatus
r-binary-packagesGitHub Actions
test-r-arrow-backwards-compatibilityGitHub Actions
test-r-clang-sanitizerGitHub Actions
test-r-depsource-bundledAzure
test-r-depsource-systemGitHub Actions
test-r-dev-duckdbGitHub Actions
test-r-devdocsGitHub Actions
test-r-gcc-11GitHub Actions
test-r-gcc-12GitHub Actions
test-r-install-localGitHub Actions
test-r-install-local-minsizerelGitHub Actions
test-r-linux-as-cranGitHub Actions
test-r-linux-rchkGitHub Actions
test-r-linux-valgrindGitHub Actions
test-r-minimal-buildAzure
test-r-offline-maximalGitHub Actions
test-r-offline-minimalAzure
test-r-rhub-debian-gcc-devel-lto-latestAzure
test-r-rhub-debian-gcc-release-custom-ccacheAzure
test-r-rhub-ubuntu-release-latestAzure
test-r-rocker-r-ver-latestAzure
test-r-rstudio-r-base-4.1-opensuse155Azure
test-r-rstudio-r-base-4.2-focalAzure
test-r-ubuntu-22.04GitHub Actions
test-r-versionsGitHub Actions
test-ubuntu-r-sanitizerGitHub Actions

@jonkeane

Copy link
Copy Markdown
MemberAuthor

This is probably paranoid, but I'm going to run one last mc builder run before I merge.

Comment threadr/tools/nixlibs.R
Comment on lines +830 to +834
env_var_list_value <- env_var_list[[env_varname]]
if (is.null(env_var_list_value)) {
env_var_list_value <- ""
}
env_value <- tolower(Sys.getenv(env_varname, env_var_list_value))

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Is this equivalent?

Suggested change
env_var_list_value<-env_var_list[[env_varname]]
if (is.null(env_var_list_value)) {
env_var_list_value<-""
}
env_value<- tolower(Sys.getenv(env_varname, env_var_list_value))
env_value<- tolower(Sys.getenv(env_varname, env_var_list[[env_varname]]))

Copy link
Copy Markdown
MemberAuthor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Well I feel slightly better having thought the exact same thing. But turns out: no! env_var_list[[env_varname]] is NULL if it doesn't exist (which is what we want) but:

Sys.getenv("env_varname", NULL)
Error in Sys.getenv("env_varname", NULL) : wrong type for argument

Though I only found that out when I pushed (+ got a little too eager and triggered all of crossbow r) and then saw lots of red.

This would be a perfect place for %||% or the native equivalent, but I didn't want to require rlang here (I mean we require it for the package, so maybe that's ok?)

@github-actionsgithub-actionsBot added awaiting changes Awaiting changes and removed awaiting change review Awaiting change review labels Jun 21, 2024
@jonkeane

Copy link
Copy Markdown
MemberAuthor

I'm glad I submitted to mac builder again, cause I noticed there that we're doing something wrong with linking snappy: ... -lparquet -larrow_acero -larrow -larrow_bundled_dependencies /opt/homebrew/lib/libsnappy.1.1.9.dylib ...

Which then means when you try to load without having snappy from homebrew it fails. I will look into why this is and push it to this branch.

@github-actionsgithub-actionsBot added awaiting change review Awaiting change review and removed awaiting changes Awaiting changes labels Jun 21, 2024
mkdir -p "${BUILD_DIR}"
pushd "${BUILD_DIR}"
${CMAKE} -DARROW_BOOST_USE_SHARED=OFF \
-DARROW_SNAPPY_USE_SHARED=OFF \

Copy link
Copy Markdown
MemberAuthor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This prevents shared (homebrew) snappy from being used on the builder. Are there other dependencies we should add here?

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

ARROW_DEPENDENCY_USE_SHARED should be the default for all the more specific versions, so just setting that should work?

@github-actionsgithub-actionsBot added awaiting changes Awaiting changes and removed awaiting change review Awaiting change review labels Jun 21, 2024
@jonkeane
jonkeane merged commit 67bbf84 into apache:mainJun 23, 2024
@jonkeanejonkeane removed the awaiting changes Awaiting changes label Jun 23, 2024
@jonkeane
jonkeane deleted the macos_default_s3 branch June 23, 2024 21:03
@conbench-apache-arrow

Copy link
Copy Markdown

After merging your PR, Conbench analyzed the 7 benchmarking runs that have been run so far on merge-commit 67bbf84.

There were 4 benchmark results indicating a performance regression:

The full Conbench report has more details. It also includes information about 88 possible false positives for unstable benchmarks that are known to sometimes produce them.

Sign up for freeto join this conversation on GitHub. Already have an account? Sign in to comment

Labels

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants

@jonkeane@nealrichardson@assignUser
, '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

GH-41952: [R] Turn S3 and ZSTD on by default for macOS - #42210

Merged
jonkeane merged 6 commits into
apache:mainfrom
jonkeane:macos_default_s3
Jun 23, 2024
Merged

GH-41952: [R] Turn S3 and ZSTD on by default for macOS#42210
jonkeane merged 6 commits into
apache:mainfrom
jonkeane:macos_default_s3

Conversation

@jonkeane

@jonkeanejonkeane commented Jun 19, 2024

Copy link
Copy Markdown
Member

Changeup nixlibs.R so that we enable S3 and ZSTD by default on CRAN. I've checked this against the CRAN macbuilder to confirm it does work (that's not a guarantee it'll work on other CRAN maintained macOS builders, but a good indication).

It also removes gcs from the list of features we expect to be on and warn folks about if it is not.

Rationale for this change

So that our builds are more fully featured.

What changes are included in this PR?

Enable ARROW_S3 by default when building form source on macOS.

Are these changes tested?

Existing CI should not fail.

Are there any user-facing changes?

Getting Arrow from the canonical repository would be more fully featured.

@github-actions

Copy link
Copy Markdown

⚠️ GitHub issue #41952has been automatically assigned in GitHub to PR creator.

Comment threadr/tools/nixlibs.R
cleanup(build_dir)

env_var_list <- c(
env_var_list <- list(

Copy link
Copy Markdown
MemberAuthor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This isn't technically necessary, but it was the easiest way to do what I wanted to in is_feature_requested(). Further, it's a bit strange that this thing called X_X_list is not a list.

@github-actionsgithub-actionsBot added awaiting changes Awaiting changes and removed awaiting committer review Awaiting committer review labels Jun 19, 2024
Comment threadr/tools/nixlibs.R
Comment on lines +819 to +825
is_feature_requested <- function(env_varname, env_var_list, default = env_is("LIBARROW_MINIMAL", "false")) {
# look in our env_var_list first, if it's not found there go to
# the actual environment
env_value <- tolower(env_var_list[[env_varname]])
if (is.null(env_value)) {
env_value <- tolower(Sys.getenv(env_varname))
}

Copy link
Copy Markdown
MemberAuthor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This is a change in behavior that warrants some thought. Though I will say this is how I thought this worked already — or rather I thought is_feature_requested() was looking at env_var_list and not only looking at the literal environment. It's possible this was a mistake / it should have never looked at the environment but instead be looking at the env_var_list. But I kept it for now in case this is actually intended.

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The original intent of the function was to check whether the user requested a feature. env_var_list doesn't contain any user-requested features, at least not in the active sense. But now that you're putting some default selections in there, it makes sense to check it here. The function is currently only used to check for S3/GCS, to know whether we need to have openssl and curl.

Copy link
Copy Markdown
MemberAuthor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

AAAAH I was missing the user- part there, that makes it make more sense now.

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

See, this is why passive voice is bad.

@github-actionsgithub-actionsBot added awaiting change review Awaiting change review and removed awaiting changes Awaiting changes labels Jun 19, 2024
@jonkeanejonkeane changed the title GH-41952: [R] Turn S3 on by default for macOSGH-41952: [R] Turn S3, GCS, and ZSTD on by default for macOSJun 19, 2024
@jonkeane

Copy link
Copy Markdown
MemberAuthor

I also noticed two other optional libraries that were being flagged as not a full build. I added those, and ran mac builder: https://mac.r-project.org/macbuilder/results/1718828010-3fa0fa8b00b3b11c/

@nealrichardsonnealrichardson left a comment

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This seems like the least bad option for turning these features on. The other places where we handle defaults, like by the value of LIBARROW_MINIMAL, aren't good for S3/GCS because we have to check up front for openssl/curl.

Comment threadr/tools/nixlibs.R Outdated
Comment threadr/tools/nixlibs.R
Comment on lines +819 to +825
is_feature_requested <- function(env_varname, env_var_list, default = env_is("LIBARROW_MINIMAL", "false")) {
# look in our env_var_list first, if it's not found there go to
# the actual environment
env_value <- tolower(env_var_list[[env_varname]])
if (is.null(env_value)) {
env_value <- tolower(Sys.getenv(env_varname))
}

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The original intent of the function was to check whether the user requested a feature. env_var_list doesn't contain any user-requested features, at least not in the active sense. But now that you're putting some default selections in there, it makes sense to check it here. The function is currently only used to check for S3/GCS, to know whether we need to have openssl and curl.

Co-authored-by: Neal Richardson <neal.p.richardson@gmail.com>
@github-actionsgithub-actionsBot added awaiting changes Awaiting changes and removed awaiting change review Awaiting change review labels Jun 20, 2024
@jonkeane

jonkeane commented Jun 20, 2024

Copy link
Copy Markdown
MemberAuthor

I also wonder whether GCS is worth including.

I agree + though similar when I checked if S3 alone was sufficient for quieting the message. I'm happy to pull GCS out of this, though IMO we should also add GCS to the block list so that it's not being checked if we do that too.

I'm happy to do this in this PR if we want.

@nealrichardson

Copy link
Copy Markdown
Member

I also wonder whether GCS is worth including.

I agree + though similar when I checked if S3 alone was sufficient for quieting the message. I'm happy to pull GCS out of this, though IMO we should also add GCS to the block list so that it's not being checked if we do that too.

I'm happy to do this in this PR if we want.

Right, we would want to change that message.

On the one hand, users won't generally experience this because they'll get a binary from CRAN. On the other, GCS increases build time there and increases the BDR attack surface. I don't know how big that risk is and if demand for GCS outweighs it--I haven't noticed demand for GCS, but maybe I'm not looking in the right places.

I guess we could leave it on, and if we get dinged on CRAN, we know how to turn it back off?

@jonkeane

Copy link
Copy Markdown
MemberAuthor

MM, I think you've convinced me that we should pull GCS back for now (and see if someone requests it before we open up our attack surface more). At the very least, it would be nice to send something with a more minimal expansion at first in case the CRAN macOS builders are different in key ways, we'll know that it's just an issue with S3 or zstd now. And maybe add GCS in 18 (or only when someone asks for it in a CRAN release). Like you said, it's easy enough to see how to change these now.

@github-actionsgithub-actionsBot added awaiting change review Awaiting change review and removed awaiting changes Awaiting changes labels Jun 20, 2024
@jonkeanejonkeane changed the title GH-41952: [R] Turn S3, GCS, and ZSTD on by default for macOSGH-41952: [R] Turn S3 and ZSTD on by default for macOSJun 20, 2024
@jonkeane

Copy link
Copy Markdown
MemberAuthor

@github-actions crossbow submit -g r

@github-actions

Copy link
Copy Markdown

Revision: 548b6b2

Submitted crossbow builds: ursacomputing/crossbow @ actions-e5cdc79a11

TaskStatus
r-binary-packagesGitHub Actions
test-r-arrow-backwards-compatibilityGitHub Actions
test-r-clang-sanitizerGitHub Actions
test-r-depsource-bundledAzure
test-r-depsource-systemGitHub Actions
test-r-dev-duckdbGitHub Actions
test-r-devdocsGitHub Actions
test-r-gcc-11GitHub Actions
test-r-gcc-12GitHub Actions
test-r-install-localGitHub Actions
test-r-install-local-minsizerelGitHub Actions
test-r-linux-as-cranGitHub Actions
test-r-linux-rchkGitHub Actions
test-r-linux-valgrindGitHub Actions
test-r-minimal-buildAzure
test-r-offline-maximalGitHub Actions
test-r-offline-minimalAzure
test-r-rhub-debian-gcc-devel-lto-latestAzure
test-r-rhub-debian-gcc-release-custom-ccacheAzure
test-r-rhub-ubuntu-release-latestAzure
test-r-rocker-r-ver-latestAzure
test-r-rstudio-r-base-4.1-opensuse155Azure
test-r-rstudio-r-base-4.2-focalAzure
test-r-ubuntu-22.04GitHub Actions
test-r-versionsGitHub Actions
test-ubuntu-r-sanitizerGitHub Actions

@assignUser

Copy link
Copy Markdown
Member

I also wonder whether GCS is worth including.

IMO the CRAN builds should be as feature complete as possible as they are (well after the issue with the last two released binaries maybe used to be...) the way to get the package for mac users and there shouldn't be a reason for users to user alternative sources like r-universe or source build but:

On the other, GCS increases build time there and increases the BDR attack surface.

While I would have disagreed previously reality has beaten me down and eh... ok.

@jonkeane

Copy link
Copy Markdown
MemberAuthor

@github-actions crossbow submit -g r

@github-actions

Copy link
Copy Markdown

Revision: b23878a

Submitted crossbow builds: ursacomputing/crossbow @ actions-f75e6668f4

TaskStatus
r-binary-packagesGitHub Actions
test-r-arrow-backwards-compatibilityGitHub Actions
test-r-clang-sanitizerGitHub Actions
test-r-depsource-bundledAzure
test-r-depsource-systemGitHub Actions
test-r-dev-duckdbGitHub Actions
test-r-devdocsGitHub Actions
test-r-gcc-11GitHub Actions
test-r-gcc-12GitHub Actions
test-r-install-localGitHub Actions
test-r-install-local-minsizerelGitHub Actions
test-r-linux-as-cranGitHub Actions
test-r-linux-rchkGitHub Actions
test-r-linux-valgrindGitHub Actions
test-r-minimal-buildAzure
test-r-offline-maximalGitHub Actions
test-r-offline-minimalAzure
test-r-rhub-debian-gcc-devel-lto-latestAzure
test-r-rhub-debian-gcc-release-custom-ccacheAzure
test-r-rhub-ubuntu-release-latestAzure
test-r-rocker-r-ver-latestAzure
test-r-rstudio-r-base-4.1-opensuse155Azure
test-r-rstudio-r-base-4.2-focalAzure
test-r-ubuntu-22.04GitHub Actions
test-r-versionsGitHub Actions
test-ubuntu-r-sanitizerGitHub Actions

@jonkeane

Copy link
Copy Markdown
MemberAuthor

This is probably paranoid, but I'm going to run one last mc builder run before I merge.

Comment threadr/tools/nixlibs.R
Comment on lines +830 to +834
env_var_list_value <- env_var_list[[env_varname]]
if (is.null(env_var_list_value)) {
env_var_list_value <- ""
}
env_value <- tolower(Sys.getenv(env_varname, env_var_list_value))

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Is this equivalent?

Suggested change
env_var_list_value<-env_var_list[[env_varname]]
if (is.null(env_var_list_value)) {
env_var_list_value<-""
}
env_value<- tolower(Sys.getenv(env_varname, env_var_list_value))
env_value<- tolower(Sys.getenv(env_varname, env_var_list[[env_varname]]))

Copy link
Copy Markdown
MemberAuthor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Well I feel slightly better having thought the exact same thing. But turns out: no! env_var_list[[env_varname]] is NULL if it doesn't exist (which is what we want) but:

Sys.getenv("env_varname", NULL)
Error in Sys.getenv("env_varname", NULL) : wrong type for argument

Though I only found that out when I pushed (+ got a little too eager and triggered all of crossbow r) and then saw lots of red.

This would be a perfect place for %||% or the native equivalent, but I didn't want to require rlang here (I mean we require it for the package, so maybe that's ok?)

@github-actionsgithub-actionsBot added awaiting changes Awaiting changes and removed awaiting change review Awaiting change review labels Jun 21, 2024
@jonkeane

Copy link
Copy Markdown
MemberAuthor

I'm glad I submitted to mac builder again, cause I noticed there that we're doing something wrong with linking snappy: ... -lparquet -larrow_acero -larrow -larrow_bundled_dependencies /opt/homebrew/lib/libsnappy.1.1.9.dylib ...

Which then means when you try to load without having snappy from homebrew it fails. I will look into why this is and push it to this branch.

@github-actionsgithub-actionsBot added awaiting change review Awaiting change review and removed awaiting changes Awaiting changes labels Jun 21, 2024
mkdir -p "${BUILD_DIR}"
pushd "${BUILD_DIR}"
${CMAKE} -DARROW_BOOST_USE_SHARED=OFF \
-DARROW_SNAPPY_USE_SHARED=OFF \

Copy link
Copy Markdown
MemberAuthor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This prevents shared (homebrew) snappy from being used on the builder. Are there other dependencies we should add here?

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

ARROW_DEPENDENCY_USE_SHARED should be the default for all the more specific versions, so just setting that should work?

@github-actionsgithub-actionsBot added awaiting changes Awaiting changes and removed awaiting change review Awaiting change review labels Jun 21, 2024
@jonkeane
jonkeane merged commit 67bbf84 into apache:mainJun 23, 2024
@jonkeanejonkeane removed the awaiting changes Awaiting changes label Jun 23, 2024
@jonkeane
jonkeane deleted the macos_default_s3 branch June 23, 2024 21:03
@conbench-apache-arrow

Copy link
Copy Markdown

After merging your PR, Conbench analyzed the 7 benchmarking runs that have been run so far on merge-commit 67bbf84.

There were 4 benchmark results indicating a performance regression:

The full Conbench report has more details. It also includes information about 88 possible false positives for unstable benchmarks that are known to sometimes produce them.

Sign up for freeto join this conversation on GitHub. Already have an account? Sign in to comment

Labels

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants

@jonkeane@nealrichardson@assignUser
, '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

GH-41952: [R] Turn S3 and ZSTD on by default for macOS - #42210

Merged
jonkeane merged 6 commits into
apache:mainfrom
jonkeane:macos_default_s3
Jun 23, 2024
Merged

GH-41952: [R] Turn S3 and ZSTD on by default for macOS#42210
jonkeane merged 6 commits into
apache:mainfrom
jonkeane:macos_default_s3

Conversation

@jonkeane

@jonkeanejonkeane commented Jun 19, 2024

Copy link
Copy Markdown
Member

Changeup nixlibs.R so that we enable S3 and ZSTD by default on CRAN. I've checked this against the CRAN macbuilder to confirm it does work (that's not a guarantee it'll work on other CRAN maintained macOS builders, but a good indication).

It also removes gcs from the list of features we expect to be on and warn folks about if it is not.

Rationale for this change

So that our builds are more fully featured.

What changes are included in this PR?

Enable ARROW_S3 by default when building form source on macOS.

Are these changes tested?

Existing CI should not fail.

Are there any user-facing changes?

Getting Arrow from the canonical repository would be more fully featured.

@github-actions

Copy link
Copy Markdown

⚠️ GitHub issue #41952has been automatically assigned in GitHub to PR creator.

Comment threadr/tools/nixlibs.R
cleanup(build_dir)

env_var_list <- c(
env_var_list <- list(

Copy link
Copy Markdown
MemberAuthor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This isn't technically necessary, but it was the easiest way to do what I wanted to in is_feature_requested(). Further, it's a bit strange that this thing called X_X_list is not a list.

@github-actionsgithub-actionsBot added awaiting changes Awaiting changes and removed awaiting committer review Awaiting committer review labels Jun 19, 2024
Comment threadr/tools/nixlibs.R
Comment on lines +819 to +825
is_feature_requested <- function(env_varname, env_var_list, default = env_is("LIBARROW_MINIMAL", "false")) {
# look in our env_var_list first, if it's not found there go to
# the actual environment
env_value <- tolower(env_var_list[[env_varname]])
if (is.null(env_value)) {
env_value <- tolower(Sys.getenv(env_varname))
}

Copy link
Copy Markdown
MemberAuthor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This is a change in behavior that warrants some thought. Though I will say this is how I thought this worked already — or rather I thought is_feature_requested() was looking at env_var_list and not only looking at the literal environment. It's possible this was a mistake / it should have never looked at the environment but instead be looking at the env_var_list. But I kept it for now in case this is actually intended.

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The original intent of the function was to check whether the user requested a feature. env_var_list doesn't contain any user-requested features, at least not in the active sense. But now that you're putting some default selections in there, it makes sense to check it here. The function is currently only used to check for S3/GCS, to know whether we need to have openssl and curl.

Copy link
Copy Markdown
MemberAuthor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

AAAAH I was missing the user- part there, that makes it make more sense now.

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

See, this is why passive voice is bad.

@github-actionsgithub-actionsBot added awaiting change review Awaiting change review and removed awaiting changes Awaiting changes labels Jun 19, 2024
@jonkeanejonkeane changed the title GH-41952: [R] Turn S3 on by default for macOSGH-41952: [R] Turn S3, GCS, and ZSTD on by default for macOSJun 19, 2024
@jonkeane

Copy link
Copy Markdown
MemberAuthor

I also noticed two other optional libraries that were being flagged as not a full build. I added those, and ran mac builder: https://mac.r-project.org/macbuilder/results/1718828010-3fa0fa8b00b3b11c/

@nealrichardsonnealrichardson left a comment

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This seems like the least bad option for turning these features on. The other places where we handle defaults, like by the value of LIBARROW_MINIMAL, aren't good for S3/GCS because we have to check up front for openssl/curl.

Comment threadr/tools/nixlibs.R Outdated
Comment threadr/tools/nixlibs.R
Comment on lines +819 to +825
is_feature_requested <- function(env_varname, env_var_list, default = env_is("LIBARROW_MINIMAL", "false")) {
# look in our env_var_list first, if it's not found there go to
# the actual environment
env_value <- tolower(env_var_list[[env_varname]])
if (is.null(env_value)) {
env_value <- tolower(Sys.getenv(env_varname))
}

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The original intent of the function was to check whether the user requested a feature. env_var_list doesn't contain any user-requested features, at least not in the active sense. But now that you're putting some default selections in there, it makes sense to check it here. The function is currently only used to check for S3/GCS, to know whether we need to have openssl and curl.

Co-authored-by: Neal Richardson <neal.p.richardson@gmail.com>
@github-actionsgithub-actionsBot added awaiting changes Awaiting changes and removed awaiting change review Awaiting change review labels Jun 20, 2024
@jonkeane

jonkeane commented Jun 20, 2024

Copy link
Copy Markdown
MemberAuthor

I also wonder whether GCS is worth including.

I agree + though similar when I checked if S3 alone was sufficient for quieting the message. I'm happy to pull GCS out of this, though IMO we should also add GCS to the block list so that it's not being checked if we do that too.

I'm happy to do this in this PR if we want.

@nealrichardson

Copy link
Copy Markdown
Member

I also wonder whether GCS is worth including.

I agree + though similar when I checked if S3 alone was sufficient for quieting the message. I'm happy to pull GCS out of this, though IMO we should also add GCS to the block list so that it's not being checked if we do that too.

I'm happy to do this in this PR if we want.

Right, we would want to change that message.

On the one hand, users won't generally experience this because they'll get a binary from CRAN. On the other, GCS increases build time there and increases the BDR attack surface. I don't know how big that risk is and if demand for GCS outweighs it--I haven't noticed demand for GCS, but maybe I'm not looking in the right places.

I guess we could leave it on, and if we get dinged on CRAN, we know how to turn it back off?

@jonkeane

Copy link
Copy Markdown
MemberAuthor

MM, I think you've convinced me that we should pull GCS back for now (and see if someone requests it before we open up our attack surface more). At the very least, it would be nice to send something with a more minimal expansion at first in case the CRAN macOS builders are different in key ways, we'll know that it's just an issue with S3 or zstd now. And maybe add GCS in 18 (or only when someone asks for it in a CRAN release). Like you said, it's easy enough to see how to change these now.

@github-actionsgithub-actionsBot added awaiting change review Awaiting change review and removed awaiting changes Awaiting changes labels Jun 20, 2024
@jonkeanejonkeane changed the title GH-41952: [R] Turn S3, GCS, and ZSTD on by default for macOSGH-41952: [R] Turn S3 and ZSTD on by default for macOSJun 20, 2024
@jonkeane

Copy link
Copy Markdown
MemberAuthor

@github-actions crossbow submit -g r

@github-actions

Copy link
Copy Markdown

Revision: 548b6b2

Submitted crossbow builds: ursacomputing/crossbow @ actions-e5cdc79a11

TaskStatus
r-binary-packagesGitHub Actions
test-r-arrow-backwards-compatibilityGitHub Actions
test-r-clang-sanitizerGitHub Actions
test-r-depsource-bundledAzure
test-r-depsource-systemGitHub Actions
test-r-dev-duckdbGitHub Actions
test-r-devdocsGitHub Actions
test-r-gcc-11GitHub Actions
test-r-gcc-12GitHub Actions
test-r-install-localGitHub Actions
test-r-install-local-minsizerelGitHub Actions
test-r-linux-as-cranGitHub Actions
test-r-linux-rchkGitHub Actions
test-r-linux-valgrindGitHub Actions
test-r-minimal-buildAzure
test-r-offline-maximalGitHub Actions
test-r-offline-minimalAzure
test-r-rhub-debian-gcc-devel-lto-latestAzure
test-r-rhub-debian-gcc-release-custom-ccacheAzure
test-r-rhub-ubuntu-release-latestAzure
test-r-rocker-r-ver-latestAzure
test-r-rstudio-r-base-4.1-opensuse155Azure
test-r-rstudio-r-base-4.2-focalAzure
test-r-ubuntu-22.04GitHub Actions
test-r-versionsGitHub Actions
test-ubuntu-r-sanitizerGitHub Actions

@assignUser

Copy link
Copy Markdown
Member

I also wonder whether GCS is worth including.

IMO the CRAN builds should be as feature complete as possible as they are (well after the issue with the last two released binaries maybe used to be...) the way to get the package for mac users and there shouldn't be a reason for users to user alternative sources like r-universe or source build but:

On the other, GCS increases build time there and increases the BDR attack surface.

While I would have disagreed previously reality has beaten me down and eh... ok.

@jonkeane

Copy link
Copy Markdown
MemberAuthor

@github-actions crossbow submit -g r

@github-actions

Copy link
Copy Markdown

Revision: b23878a

Submitted crossbow builds: ursacomputing/crossbow @ actions-f75e6668f4

TaskStatus
r-binary-packagesGitHub Actions
test-r-arrow-backwards-compatibilityGitHub Actions
test-r-clang-sanitizerGitHub Actions
test-r-depsource-bundledAzure
test-r-depsource-systemGitHub Actions
test-r-dev-duckdbGitHub Actions
test-r-devdocsGitHub Actions
test-r-gcc-11GitHub Actions
test-r-gcc-12GitHub Actions
test-r-install-localGitHub Actions
test-r-install-local-minsizerelGitHub Actions
test-r-linux-as-cranGitHub Actions
test-r-linux-rchkGitHub Actions
test-r-linux-valgrindGitHub Actions
test-r-minimal-buildAzure
test-r-offline-maximalGitHub Actions
test-r-offline-minimalAzure
test-r-rhub-debian-gcc-devel-lto-latestAzure
test-r-rhub-debian-gcc-release-custom-ccacheAzure
test-r-rhub-ubuntu-release-latestAzure
test-r-rocker-r-ver-latestAzure
test-r-rstudio-r-base-4.1-opensuse155Azure
test-r-rstudio-r-base-4.2-focalAzure
test-r-ubuntu-22.04GitHub Actions
test-r-versionsGitHub Actions
test-ubuntu-r-sanitizerGitHub Actions

@jonkeane

Copy link
Copy Markdown
MemberAuthor

This is probably paranoid, but I'm going to run one last mc builder run before I merge.

Comment threadr/tools/nixlibs.R
Comment on lines +830 to +834
env_var_list_value <- env_var_list[[env_varname]]
if (is.null(env_var_list_value)) {
env_var_list_value <- ""
}
env_value <- tolower(Sys.getenv(env_varname, env_var_list_value))

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Is this equivalent?

Suggested change
env_var_list_value<-env_var_list[[env_varname]]
if (is.null(env_var_list_value)) {
env_var_list_value<-""
}
env_value<- tolower(Sys.getenv(env_varname, env_var_list_value))
env_value<- tolower(Sys.getenv(env_varname, env_var_list[[env_varname]]))

Copy link
Copy Markdown
MemberAuthor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Well I feel slightly better having thought the exact same thing. But turns out: no! env_var_list[[env_varname]] is NULL if it doesn't exist (which is what we want) but:

Sys.getenv("env_varname", NULL)
Error in Sys.getenv("env_varname", NULL) : wrong type for argument

Though I only found that out when I pushed (+ got a little too eager and triggered all of crossbow r) and then saw lots of red.

This would be a perfect place for %||% or the native equivalent, but I didn't want to require rlang here (I mean we require it for the package, so maybe that's ok?)

@github-actionsgithub-actionsBot added awaiting changes Awaiting changes and removed awaiting change review Awaiting change review labels Jun 21, 2024
@jonkeane

Copy link
Copy Markdown
MemberAuthor

I'm glad I submitted to mac builder again, cause I noticed there that we're doing something wrong with linking snappy: ... -lparquet -larrow_acero -larrow -larrow_bundled_dependencies /opt/homebrew/lib/libsnappy.1.1.9.dylib ...

Which then means when you try to load without having snappy from homebrew it fails. I will look into why this is and push it to this branch.

@github-actionsgithub-actionsBot added awaiting change review Awaiting change review and removed awaiting changes Awaiting changes labels Jun 21, 2024
mkdir -p "${BUILD_DIR}"
pushd "${BUILD_DIR}"
${CMAKE} -DARROW_BOOST_USE_SHARED=OFF \
-DARROW_SNAPPY_USE_SHARED=OFF \

Copy link
Copy Markdown
MemberAuthor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This prevents shared (homebrew) snappy from being used on the builder. Are there other dependencies we should add here?

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

ARROW_DEPENDENCY_USE_SHARED should be the default for all the more specific versions, so just setting that should work?

@github-actionsgithub-actionsBot added awaiting changes Awaiting changes and removed awaiting change review Awaiting change review labels Jun 21, 2024
@jonkeane
jonkeane merged commit 67bbf84 into apache:mainJun 23, 2024
@jonkeanejonkeane removed the awaiting changes Awaiting changes label Jun 23, 2024
@jonkeane
jonkeane deleted the macos_default_s3 branch June 23, 2024 21:03
@conbench-apache-arrow

Copy link
Copy Markdown

After merging your PR, Conbench analyzed the 7 benchmarking runs that have been run so far on merge-commit 67bbf84.

There were 4 benchmark results indicating a performance regression:

The full Conbench report has more details. It also includes information about 88 possible false positives for unstable benchmarks that are known to sometimes produce them.

Sign up for freeto join this conversation on GitHub. Already have an account? Sign in to comment

Labels

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants

@jonkeane@nealrichardson@assignUser
, '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

GH-41952: [R] Turn S3 and ZSTD on by default for macOS - #42210

Merged
jonkeane merged 6 commits into
apache:mainfrom
jonkeane:macos_default_s3
Jun 23, 2024
Merged

GH-41952: [R] Turn S3 and ZSTD on by default for macOS#42210
jonkeane merged 6 commits into
apache:mainfrom
jonkeane:macos_default_s3

Conversation

@jonkeane

@jonkeanejonkeane commented Jun 19, 2024

Copy link
Copy Markdown
Member

Changeup nixlibs.R so that we enable S3 and ZSTD by default on CRAN. I've checked this against the CRAN macbuilder to confirm it does work (that's not a guarantee it'll work on other CRAN maintained macOS builders, but a good indication).

It also removes gcs from the list of features we expect to be on and warn folks about if it is not.

Rationale for this change

So that our builds are more fully featured.

What changes are included in this PR?

Enable ARROW_S3 by default when building form source on macOS.

Are these changes tested?

Existing CI should not fail.

Are there any user-facing changes?

Getting Arrow from the canonical repository would be more fully featured.

@github-actions

Copy link
Copy Markdown

⚠️ GitHub issue #41952has been automatically assigned in GitHub to PR creator.

Comment threadr/tools/nixlibs.R
cleanup(build_dir)

env_var_list <- c(
env_var_list <- list(

Copy link
Copy Markdown
MemberAuthor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This isn't technically necessary, but it was the easiest way to do what I wanted to in is_feature_requested(). Further, it's a bit strange that this thing called X_X_list is not a list.

@github-actionsgithub-actionsBot added awaiting changes Awaiting changes and removed awaiting committer review Awaiting committer review labels Jun 19, 2024
Comment threadr/tools/nixlibs.R
Comment on lines +819 to +825
is_feature_requested <- function(env_varname, env_var_list, default = env_is("LIBARROW_MINIMAL", "false")) {
# look in our env_var_list first, if it's not found there go to
# the actual environment
env_value <- tolower(env_var_list[[env_varname]])
if (is.null(env_value)) {
env_value <- tolower(Sys.getenv(env_varname))
}

Copy link
Copy Markdown
MemberAuthor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This is a change in behavior that warrants some thought. Though I will say this is how I thought this worked already — or rather I thought is_feature_requested() was looking at env_var_list and not only looking at the literal environment. It's possible this was a mistake / it should have never looked at the environment but instead be looking at the env_var_list. But I kept it for now in case this is actually intended.

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The original intent of the function was to check whether the user requested a feature. env_var_list doesn't contain any user-requested features, at least not in the active sense. But now that you're putting some default selections in there, it makes sense to check it here. The function is currently only used to check for S3/GCS, to know whether we need to have openssl and curl.

Copy link
Copy Markdown
MemberAuthor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

AAAAH I was missing the user- part there, that makes it make more sense now.

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

See, this is why passive voice is bad.

@github-actionsgithub-actionsBot added awaiting change review Awaiting change review and removed awaiting changes Awaiting changes labels Jun 19, 2024
@jonkeanejonkeane changed the title GH-41952: [R] Turn S3 on by default for macOSGH-41952: [R] Turn S3, GCS, and ZSTD on by default for macOSJun 19, 2024
@jonkeane

Copy link
Copy Markdown
MemberAuthor

I also noticed two other optional libraries that were being flagged as not a full build. I added those, and ran mac builder: https://mac.r-project.org/macbuilder/results/1718828010-3fa0fa8b00b3b11c/

@nealrichardsonnealrichardson left a comment

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This seems like the least bad option for turning these features on. The other places where we handle defaults, like by the value of LIBARROW_MINIMAL, aren't good for S3/GCS because we have to check up front for openssl/curl.

Comment threadr/tools/nixlibs.R Outdated
Comment threadr/tools/nixlibs.R
Comment on lines +819 to +825
is_feature_requested <- function(env_varname, env_var_list, default = env_is("LIBARROW_MINIMAL", "false")) {
# look in our env_var_list first, if it's not found there go to
# the actual environment
env_value <- tolower(env_var_list[[env_varname]])
if (is.null(env_value)) {
env_value <- tolower(Sys.getenv(env_varname))
}

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The original intent of the function was to check whether the user requested a feature. env_var_list doesn't contain any user-requested features, at least not in the active sense. But now that you're putting some default selections in there, it makes sense to check it here. The function is currently only used to check for S3/GCS, to know whether we need to have openssl and curl.

Co-authored-by: Neal Richardson <neal.p.richardson@gmail.com>
@github-actionsgithub-actionsBot added awaiting changes Awaiting changes and removed awaiting change review Awaiting change review labels Jun 20, 2024
@jonkeane

jonkeane commented Jun 20, 2024

Copy link
Copy Markdown
MemberAuthor

I also wonder whether GCS is worth including.

I agree + though similar when I checked if S3 alone was sufficient for quieting the message. I'm happy to pull GCS out of this, though IMO we should also add GCS to the block list so that it's not being checked if we do that too.

I'm happy to do this in this PR if we want.

@nealrichardson

Copy link
Copy Markdown
Member

I also wonder whether GCS is worth including.

I agree + though similar when I checked if S3 alone was sufficient for quieting the message. I'm happy to pull GCS out of this, though IMO we should also add GCS to the block list so that it's not being checked if we do that too.

I'm happy to do this in this PR if we want.

Right, we would want to change that message.

On the one hand, users won't generally experience this because they'll get a binary from CRAN. On the other, GCS increases build time there and increases the BDR attack surface. I don't know how big that risk is and if demand for GCS outweighs it--I haven't noticed demand for GCS, but maybe I'm not looking in the right places.

I guess we could leave it on, and if we get dinged on CRAN, we know how to turn it back off?

@jonkeane

Copy link
Copy Markdown
MemberAuthor

MM, I think you've convinced me that we should pull GCS back for now (and see if someone requests it before we open up our attack surface more). At the very least, it would be nice to send something with a more minimal expansion at first in case the CRAN macOS builders are different in key ways, we'll know that it's just an issue with S3 or zstd now. And maybe add GCS in 18 (or only when someone asks for it in a CRAN release). Like you said, it's easy enough to see how to change these now.

@github-actionsgithub-actionsBot added awaiting change review Awaiting change review and removed awaiting changes Awaiting changes labels Jun 20, 2024
@jonkeanejonkeane changed the title GH-41952: [R] Turn S3, GCS, and ZSTD on by default for macOSGH-41952: [R] Turn S3 and ZSTD on by default for macOSJun 20, 2024
@jonkeane

Copy link
Copy Markdown
MemberAuthor

@github-actions crossbow submit -g r

@github-actions

Copy link
Copy Markdown

Revision: 548b6b2

Submitted crossbow builds: ursacomputing/crossbow @ actions-e5cdc79a11

TaskStatus
r-binary-packagesGitHub Actions
test-r-arrow-backwards-compatibilityGitHub Actions
test-r-clang-sanitizerGitHub Actions
test-r-depsource-bundledAzure
test-r-depsource-systemGitHub Actions
test-r-dev-duckdbGitHub Actions
test-r-devdocsGitHub Actions
test-r-gcc-11GitHub Actions
test-r-gcc-12GitHub Actions
test-r-install-localGitHub Actions
test-r-install-local-minsizerelGitHub Actions
test-r-linux-as-cranGitHub Actions
test-r-linux-rchkGitHub Actions
test-r-linux-valgrindGitHub Actions
test-r-minimal-buildAzure
test-r-offline-maximalGitHub Actions
test-r-offline-minimalAzure
test-r-rhub-debian-gcc-devel-lto-latestAzure
test-r-rhub-debian-gcc-release-custom-ccacheAzure
test-r-rhub-ubuntu-release-latestAzure
test-r-rocker-r-ver-latestAzure
test-r-rstudio-r-base-4.1-opensuse155Azure
test-r-rstudio-r-base-4.2-focalAzure
test-r-ubuntu-22.04GitHub Actions
test-r-versionsGitHub Actions
test-ubuntu-r-sanitizerGitHub Actions

@assignUser

Copy link
Copy Markdown
Member

I also wonder whether GCS is worth including.

IMO the CRAN builds should be as feature complete as possible as they are (well after the issue with the last two released binaries maybe used to be...) the way to get the package for mac users and there shouldn't be a reason for users to user alternative sources like r-universe or source build but:

On the other, GCS increases build time there and increases the BDR attack surface.

While I would have disagreed previously reality has beaten me down and eh... ok.

@jonkeane

Copy link
Copy Markdown
MemberAuthor

@github-actions crossbow submit -g r

@github-actions

Copy link
Copy Markdown

Revision: b23878a

Submitted crossbow builds: ursacomputing/crossbow @ actions-f75e6668f4

TaskStatus
r-binary-packagesGitHub Actions
test-r-arrow-backwards-compatibilityGitHub Actions
test-r-clang-sanitizerGitHub Actions
test-r-depsource-bundledAzure
test-r-depsource-systemGitHub Actions
test-r-dev-duckdbGitHub Actions
test-r-devdocsGitHub Actions
test-r-gcc-11GitHub Actions
test-r-gcc-12GitHub Actions
test-r-install-localGitHub Actions
test-r-install-local-minsizerelGitHub Actions
test-r-linux-as-cranGitHub Actions
test-r-linux-rchkGitHub Actions
test-r-linux-valgrindGitHub Actions
test-r-minimal-buildAzure
test-r-offline-maximalGitHub Actions
test-r-offline-minimalAzure
test-r-rhub-debian-gcc-devel-lto-latestAzure
test-r-rhub-debian-gcc-release-custom-ccacheAzure
test-r-rhub-ubuntu-release-latestAzure
test-r-rocker-r-ver-latestAzure
test-r-rstudio-r-base-4.1-opensuse155Azure
test-r-rstudio-r-base-4.2-focalAzure
test-r-ubuntu-22.04GitHub Actions
test-r-versionsGitHub Actions
test-ubuntu-r-sanitizerGitHub Actions

@jonkeane

Copy link
Copy Markdown
MemberAuthor

This is probably paranoid, but I'm going to run one last mc builder run before I merge.

Comment threadr/tools/nixlibs.R
Comment on lines +830 to +834
env_var_list_value <- env_var_list[[env_varname]]
if (is.null(env_var_list_value)) {
env_var_list_value <- ""
}
env_value <- tolower(Sys.getenv(env_varname, env_var_list_value))

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Is this equivalent?

Suggested change
env_var_list_value<-env_var_list[[env_varname]]
if (is.null(env_var_list_value)) {
env_var_list_value<-""
}
env_value<- tolower(Sys.getenv(env_varname, env_var_list_value))
env_value<- tolower(Sys.getenv(env_varname, env_var_list[[env_varname]]))

Copy link
Copy Markdown
MemberAuthor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Well I feel slightly better having thought the exact same thing. But turns out: no! env_var_list[[env_varname]] is NULL if it doesn't exist (which is what we want) but:

Sys.getenv("env_varname", NULL)
Error in Sys.getenv("env_varname", NULL) : wrong type for argument

Though I only found that out when I pushed (+ got a little too eager and triggered all of crossbow r) and then saw lots of red.

This would be a perfect place for %||% or the native equivalent, but I didn't want to require rlang here (I mean we require it for the package, so maybe that's ok?)

@github-actionsgithub-actionsBot added awaiting changes Awaiting changes and removed awaiting change review Awaiting change review labels Jun 21, 2024
@jonkeane

Copy link
Copy Markdown
MemberAuthor

I'm glad I submitted to mac builder again, cause I noticed there that we're doing something wrong with linking snappy: ... -lparquet -larrow_acero -larrow -larrow_bundled_dependencies /opt/homebrew/lib/libsnappy.1.1.9.dylib ...

Which then means when you try to load without having snappy from homebrew it fails. I will look into why this is and push it to this branch.

@github-actionsgithub-actionsBot added awaiting change review Awaiting change review and removed awaiting changes Awaiting changes labels Jun 21, 2024
mkdir -p "${BUILD_DIR}"
pushd "${BUILD_DIR}"
${CMAKE} -DARROW_BOOST_USE_SHARED=OFF \
-DARROW_SNAPPY_USE_SHARED=OFF \

Copy link
Copy Markdown
MemberAuthor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This prevents shared (homebrew) snappy from being used on the builder. Are there other dependencies we should add here?

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

ARROW_DEPENDENCY_USE_SHARED should be the default for all the more specific versions, so just setting that should work?

@github-actionsgithub-actionsBot added awaiting changes Awaiting changes and removed awaiting change review Awaiting change review labels Jun 21, 2024
@jonkeane
jonkeane merged commit 67bbf84 into apache:mainJun 23, 2024
@jonkeanejonkeane removed the awaiting changes Awaiting changes label Jun 23, 2024
@jonkeane
jonkeane deleted the macos_default_s3 branch June 23, 2024 21:03
@conbench-apache-arrow

Copy link
Copy Markdown

After merging your PR, Conbench analyzed the 7 benchmarking runs that have been run so far on merge-commit 67bbf84.

There were 4 benchmark results indicating a performance regression:

The full Conbench report has more details. It also includes information about 88 possible false positives for unstable benchmarks that are known to sometimes produce them.

Sign up for freeto join this conversation on GitHub. Already have an account? Sign in to comment

Labels

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants

@jonkeane@nealrichardson@assignUser
, '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

GH-41952: [R] Turn S3 and ZSTD on by default for macOS - #42210

Merged
jonkeane merged 6 commits into
apache:mainfrom
jonkeane:macos_default_s3
Jun 23, 2024
Merged

GH-41952: [R] Turn S3 and ZSTD on by default for macOS#42210
jonkeane merged 6 commits into
apache:mainfrom
jonkeane:macos_default_s3

Conversation

@jonkeane

@jonkeanejonkeane commented Jun 19, 2024

Copy link
Copy Markdown
Member

Changeup nixlibs.R so that we enable S3 and ZSTD by default on CRAN. I've checked this against the CRAN macbuilder to confirm it does work (that's not a guarantee it'll work on other CRAN maintained macOS builders, but a good indication).

It also removes gcs from the list of features we expect to be on and warn folks about if it is not.

Rationale for this change

So that our builds are more fully featured.

What changes are included in this PR?

Enable ARROW_S3 by default when building form source on macOS.

Are these changes tested?

Existing CI should not fail.

Are there any user-facing changes?

Getting Arrow from the canonical repository would be more fully featured.

@github-actions

Copy link
Copy Markdown

⚠️ GitHub issue #41952has been automatically assigned in GitHub to PR creator.

Comment threadr/tools/nixlibs.R
cleanup(build_dir)

env_var_list <- c(
env_var_list <- list(

Copy link
Copy Markdown
MemberAuthor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This isn't technically necessary, but it was the easiest way to do what I wanted to in is_feature_requested(). Further, it's a bit strange that this thing called X_X_list is not a list.

@github-actionsgithub-actionsBot added awaiting changes Awaiting changes and removed awaiting committer review Awaiting committer review labels Jun 19, 2024
Comment threadr/tools/nixlibs.R
Comment on lines +819 to +825
is_feature_requested <- function(env_varname, env_var_list, default = env_is("LIBARROW_MINIMAL", "false")) {
# look in our env_var_list first, if it's not found there go to
# the actual environment
env_value <- tolower(env_var_list[[env_varname]])
if (is.null(env_value)) {
env_value <- tolower(Sys.getenv(env_varname))
}

Copy link
Copy Markdown
MemberAuthor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This is a change in behavior that warrants some thought. Though I will say this is how I thought this worked already — or rather I thought is_feature_requested() was looking at env_var_list and not only looking at the literal environment. It's possible this was a mistake / it should have never looked at the environment but instead be looking at the env_var_list. But I kept it for now in case this is actually intended.

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The original intent of the function was to check whether the user requested a feature. env_var_list doesn't contain any user-requested features, at least not in the active sense. But now that you're putting some default selections in there, it makes sense to check it here. The function is currently only used to check for S3/GCS, to know whether we need to have openssl and curl.

Copy link
Copy Markdown
MemberAuthor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

AAAAH I was missing the user- part there, that makes it make more sense now.

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

See, this is why passive voice is bad.

@github-actionsgithub-actionsBot added awaiting change review Awaiting change review and removed awaiting changes Awaiting changes labels Jun 19, 2024
@jonkeanejonkeane changed the title GH-41952: [R] Turn S3 on by default for macOSGH-41952: [R] Turn S3, GCS, and ZSTD on by default for macOSJun 19, 2024
@jonkeane

Copy link
Copy Markdown
MemberAuthor

I also noticed two other optional libraries that were being flagged as not a full build. I added those, and ran mac builder: https://mac.r-project.org/macbuilder/results/1718828010-3fa0fa8b00b3b11c/

@nealrichardsonnealrichardson left a comment

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This seems like the least bad option for turning these features on. The other places where we handle defaults, like by the value of LIBARROW_MINIMAL, aren't good for S3/GCS because we have to check up front for openssl/curl.

Comment threadr/tools/nixlibs.R Outdated
Comment threadr/tools/nixlibs.R
Comment on lines +819 to +825
is_feature_requested <- function(env_varname, env_var_list, default = env_is("LIBARROW_MINIMAL", "false")) {
# look in our env_var_list first, if it's not found there go to
# the actual environment
env_value <- tolower(env_var_list[[env_varname]])
if (is.null(env_value)) {
env_value <- tolower(Sys.getenv(env_varname))
}

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The original intent of the function was to check whether the user requested a feature. env_var_list doesn't contain any user-requested features, at least not in the active sense. But now that you're putting some default selections in there, it makes sense to check it here. The function is currently only used to check for S3/GCS, to know whether we need to have openssl and curl.

Co-authored-by: Neal Richardson <neal.p.richardson@gmail.com>
@github-actionsgithub-actionsBot added awaiting changes Awaiting changes and removed awaiting change review Awaiting change review labels Jun 20, 2024
@jonkeane

jonkeane commented Jun 20, 2024

Copy link
Copy Markdown
MemberAuthor

I also wonder whether GCS is worth including.

I agree + though similar when I checked if S3 alone was sufficient for quieting the message. I'm happy to pull GCS out of this, though IMO we should also add GCS to the block list so that it's not being checked if we do that too.

I'm happy to do this in this PR if we want.

@nealrichardson

Copy link
Copy Markdown
Member

I also wonder whether GCS is worth including.

I agree + though similar when I checked if S3 alone was sufficient for quieting the message. I'm happy to pull GCS out of this, though IMO we should also add GCS to the block list so that it's not being checked if we do that too.

I'm happy to do this in this PR if we want.

Right, we would want to change that message.

On the one hand, users won't generally experience this because they'll get a binary from CRAN. On the other, GCS increases build time there and increases the BDR attack surface. I don't know how big that risk is and if demand for GCS outweighs it--I haven't noticed demand for GCS, but maybe I'm not looking in the right places.

I guess we could leave it on, and if we get dinged on CRAN, we know how to turn it back off?

@jonkeane

Copy link
Copy Markdown
MemberAuthor

MM, I think you've convinced me that we should pull GCS back for now (and see if someone requests it before we open up our attack surface more). At the very least, it would be nice to send something with a more minimal expansion at first in case the CRAN macOS builders are different in key ways, we'll know that it's just an issue with S3 or zstd now. And maybe add GCS in 18 (or only when someone asks for it in a CRAN release). Like you said, it's easy enough to see how to change these now.

@github-actionsgithub-actionsBot added awaiting change review Awaiting change review and removed awaiting changes Awaiting changes labels Jun 20, 2024
@jonkeanejonkeane changed the title GH-41952: [R] Turn S3, GCS, and ZSTD on by default for macOSGH-41952: [R] Turn S3 and ZSTD on by default for macOSJun 20, 2024
@jonkeane

Copy link
Copy Markdown
MemberAuthor

@github-actions crossbow submit -g r

@github-actions

Copy link
Copy Markdown

Revision: 548b6b2

Submitted crossbow builds: ursacomputing/crossbow @ actions-e5cdc79a11

TaskStatus
r-binary-packagesGitHub Actions
test-r-arrow-backwards-compatibilityGitHub Actions
test-r-clang-sanitizerGitHub Actions
test-r-depsource-bundledAzure
test-r-depsource-systemGitHub Actions
test-r-dev-duckdbGitHub Actions
test-r-devdocsGitHub Actions
test-r-gcc-11GitHub Actions
test-r-gcc-12GitHub Actions
test-r-install-localGitHub Actions
test-r-install-local-minsizerelGitHub Actions
test-r-linux-as-cranGitHub Actions
test-r-linux-rchkGitHub Actions
test-r-linux-valgrindGitHub Actions
test-r-minimal-buildAzure
test-r-offline-maximalGitHub Actions
test-r-offline-minimalAzure
test-r-rhub-debian-gcc-devel-lto-latestAzure
test-r-rhub-debian-gcc-release-custom-ccacheAzure
test-r-rhub-ubuntu-release-latestAzure
test-r-rocker-r-ver-latestAzure
test-r-rstudio-r-base-4.1-opensuse155Azure
test-r-rstudio-r-base-4.2-focalAzure
test-r-ubuntu-22.04GitHub Actions
test-r-versionsGitHub Actions
test-ubuntu-r-sanitizerGitHub Actions

@assignUser

Copy link
Copy Markdown
Member

I also wonder whether GCS is worth including.

IMO the CRAN builds should be as feature complete as possible as they are (well after the issue with the last two released binaries maybe used to be...) the way to get the package for mac users and there shouldn't be a reason for users to user alternative sources like r-universe or source build but:

On the other, GCS increases build time there and increases the BDR attack surface.

While I would have disagreed previously reality has beaten me down and eh... ok.

@jonkeane

Copy link
Copy Markdown
MemberAuthor

@github-actions crossbow submit -g r

@github-actions

Copy link
Copy Markdown

Revision: b23878a

Submitted crossbow builds: ursacomputing/crossbow @ actions-f75e6668f4

TaskStatus
r-binary-packagesGitHub Actions
test-r-arrow-backwards-compatibilityGitHub Actions
test-r-clang-sanitizerGitHub Actions
test-r-depsource-bundledAzure
test-r-depsource-systemGitHub Actions
test-r-dev-duckdbGitHub Actions
test-r-devdocsGitHub Actions
test-r-gcc-11GitHub Actions
test-r-gcc-12GitHub Actions
test-r-install-localGitHub Actions
test-r-install-local-minsizerelGitHub Actions
test-r-linux-as-cranGitHub Actions
test-r-linux-rchkGitHub Actions
test-r-linux-valgrindGitHub Actions
test-r-minimal-buildAzure
test-r-offline-maximalGitHub Actions
test-r-offline-minimalAzure
test-r-rhub-debian-gcc-devel-lto-latestAzure
test-r-rhub-debian-gcc-release-custom-ccacheAzure
test-r-rhub-ubuntu-release-latestAzure
test-r-rocker-r-ver-latestAzure
test-r-rstudio-r-base-4.1-opensuse155Azure
test-r-rstudio-r-base-4.2-focalAzure
test-r-ubuntu-22.04GitHub Actions
test-r-versionsGitHub Actions
test-ubuntu-r-sanitizerGitHub Actions

@jonkeane

Copy link
Copy Markdown
MemberAuthor

This is probably paranoid, but I'm going to run one last mc builder run before I merge.

Comment threadr/tools/nixlibs.R
Comment on lines +830 to +834
env_var_list_value <- env_var_list[[env_varname]]
if (is.null(env_var_list_value)) {
env_var_list_value <- ""
}
env_value <- tolower(Sys.getenv(env_varname, env_var_list_value))

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Is this equivalent?

Suggested change
env_var_list_value<-env_var_list[[env_varname]]
if (is.null(env_var_list_value)) {
env_var_list_value<-""
}
env_value<- tolower(Sys.getenv(env_varname, env_var_list_value))
env_value<- tolower(Sys.getenv(env_varname, env_var_list[[env_varname]]))

Copy link
Copy Markdown
MemberAuthor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Well I feel slightly better having thought the exact same thing. But turns out: no! env_var_list[[env_varname]] is NULL if it doesn't exist (which is what we want) but:

Sys.getenv("env_varname", NULL)
Error in Sys.getenv("env_varname", NULL) : wrong type for argument

Though I only found that out when I pushed (+ got a little too eager and triggered all of crossbow r) and then saw lots of red.

This would be a perfect place for %||% or the native equivalent, but I didn't want to require rlang here (I mean we require it for the package, so maybe that's ok?)

@github-actionsgithub-actionsBot added awaiting changes Awaiting changes and removed awaiting change review Awaiting change review labels Jun 21, 2024
@jonkeane

Copy link
Copy Markdown
MemberAuthor

I'm glad I submitted to mac builder again, cause I noticed there that we're doing something wrong with linking snappy: ... -lparquet -larrow_acero -larrow -larrow_bundled_dependencies /opt/homebrew/lib/libsnappy.1.1.9.dylib ...

Which then means when you try to load without having snappy from homebrew it fails. I will look into why this is and push it to this branch.

@github-actionsgithub-actionsBot added awaiting change review Awaiting change review and removed awaiting changes Awaiting changes labels Jun 21, 2024
mkdir -p "${BUILD_DIR}"
pushd "${BUILD_DIR}"
${CMAKE} -DARROW_BOOST_USE_SHARED=OFF \
-DARROW_SNAPPY_USE_SHARED=OFF \

Copy link
Copy Markdown
MemberAuthor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This prevents shared (homebrew) snappy from being used on the builder. Are there other dependencies we should add here?

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

ARROW_DEPENDENCY_USE_SHARED should be the default for all the more specific versions, so just setting that should work?

@github-actionsgithub-actionsBot added awaiting changes Awaiting changes and removed awaiting change review Awaiting change review labels Jun 21, 2024
@jonkeane
jonkeane merged commit 67bbf84 into apache:mainJun 23, 2024
@jonkeanejonkeane removed the awaiting changes Awaiting changes label Jun 23, 2024
@jonkeane
jonkeane deleted the macos_default_s3 branch June 23, 2024 21:03
@conbench-apache-arrow

Copy link
Copy Markdown

After merging your PR, Conbench analyzed the 7 benchmarking runs that have been run so far on merge-commit 67bbf84.

There were 4 benchmark results indicating a performance regression:

The full Conbench report has more details. It also includes information about 88 possible false positives for unstable benchmarks that are known to sometimes produce them.

Sign up for freeto join this conversation on GitHub. Already have an account? Sign in to comment

Labels

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants

@jonkeane@nealrichardson@assignUser
, '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

GH-41952: [R] Turn S3 and ZSTD on by default for macOS - #42210

Merged
jonkeane merged 6 commits into
apache:mainfrom
jonkeane:macos_default_s3
Jun 23, 2024
Merged

GH-41952: [R] Turn S3 and ZSTD on by default for macOS#42210
jonkeane merged 6 commits into
apache:mainfrom
jonkeane:macos_default_s3

Conversation

@jonkeane

@jonkeanejonkeane commented Jun 19, 2024

Copy link
Copy Markdown
Member

Changeup nixlibs.R so that we enable S3 and ZSTD by default on CRAN. I've checked this against the CRAN macbuilder to confirm it does work (that's not a guarantee it'll work on other CRAN maintained macOS builders, but a good indication).

It also removes gcs from the list of features we expect to be on and warn folks about if it is not.

Rationale for this change

So that our builds are more fully featured.

What changes are included in this PR?

Enable ARROW_S3 by default when building form source on macOS.

Are these changes tested?

Existing CI should not fail.

Are there any user-facing changes?

Getting Arrow from the canonical repository would be more fully featured.

@github-actions

Copy link
Copy Markdown

⚠️ GitHub issue #41952has been automatically assigned in GitHub to PR creator.

Comment threadr/tools/nixlibs.R
cleanup(build_dir)

env_var_list <- c(
env_var_list <- list(

Copy link
Copy Markdown
MemberAuthor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This isn't technically necessary, but it was the easiest way to do what I wanted to in is_feature_requested(). Further, it's a bit strange that this thing called X_X_list is not a list.

@github-actionsgithub-actionsBot added awaiting changes Awaiting changes and removed awaiting committer review Awaiting committer review labels Jun 19, 2024
Comment threadr/tools/nixlibs.R
Comment on lines +819 to +825
is_feature_requested <- function(env_varname, env_var_list, default = env_is("LIBARROW_MINIMAL", "false")) {
# look in our env_var_list first, if it's not found there go to
# the actual environment
env_value <- tolower(env_var_list[[env_varname]])
if (is.null(env_value)) {
env_value <- tolower(Sys.getenv(env_varname))
}

Copy link
Copy Markdown
MemberAuthor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This is a change in behavior that warrants some thought. Though I will say this is how I thought this worked already — or rather I thought is_feature_requested() was looking at env_var_list and not only looking at the literal environment. It's possible this was a mistake / it should have never looked at the environment but instead be looking at the env_var_list. But I kept it for now in case this is actually intended.

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The original intent of the function was to check whether the user requested a feature. env_var_list doesn't contain any user-requested features, at least not in the active sense. But now that you're putting some default selections in there, it makes sense to check it here. The function is currently only used to check for S3/GCS, to know whether we need to have openssl and curl.

Copy link
Copy Markdown
MemberAuthor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

AAAAH I was missing the user- part there, that makes it make more sense now.

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

See, this is why passive voice is bad.

@github-actionsgithub-actionsBot added awaiting change review Awaiting change review and removed awaiting changes Awaiting changes labels Jun 19, 2024
@jonkeanejonkeane changed the title GH-41952: [R] Turn S3 on by default for macOSGH-41952: [R] Turn S3, GCS, and ZSTD on by default for macOSJun 19, 2024
@jonkeane

Copy link
Copy Markdown
MemberAuthor

I also noticed two other optional libraries that were being flagged as not a full build. I added those, and ran mac builder: https://mac.r-project.org/macbuilder/results/1718828010-3fa0fa8b00b3b11c/

@nealrichardsonnealrichardson left a comment

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This seems like the least bad option for turning these features on. The other places where we handle defaults, like by the value of LIBARROW_MINIMAL, aren't good for S3/GCS because we have to check up front for openssl/curl.

Comment threadr/tools/nixlibs.R Outdated
Comment threadr/tools/nixlibs.R
Comment on lines +819 to +825
is_feature_requested <- function(env_varname, env_var_list, default = env_is("LIBARROW_MINIMAL", "false")) {
# look in our env_var_list first, if it's not found there go to
# the actual environment
env_value <- tolower(env_var_list[[env_varname]])
if (is.null(env_value)) {
env_value <- tolower(Sys.getenv(env_varname))
}

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The original intent of the function was to check whether the user requested a feature. env_var_list doesn't contain any user-requested features, at least not in the active sense. But now that you're putting some default selections in there, it makes sense to check it here. The function is currently only used to check for S3/GCS, to know whether we need to have openssl and curl.

Co-authored-by: Neal Richardson <neal.p.richardson@gmail.com>
@github-actionsgithub-actionsBot added awaiting changes Awaiting changes and removed awaiting change review Awaiting change review labels Jun 20, 2024
@jonkeane

jonkeane commented Jun 20, 2024

Copy link
Copy Markdown
MemberAuthor

I also wonder whether GCS is worth including.

I agree + though similar when I checked if S3 alone was sufficient for quieting the message. I'm happy to pull GCS out of this, though IMO we should also add GCS to the block list so that it's not being checked if we do that too.

I'm happy to do this in this PR if we want.

@nealrichardson

Copy link
Copy Markdown
Member

I also wonder whether GCS is worth including.

I agree + though similar when I checked if S3 alone was sufficient for quieting the message. I'm happy to pull GCS out of this, though IMO we should also add GCS to the block list so that it's not being checked if we do that too.

I'm happy to do this in this PR if we want.

Right, we would want to change that message.

On the one hand, users won't generally experience this because they'll get a binary from CRAN. On the other, GCS increases build time there and increases the BDR attack surface. I don't know how big that risk is and if demand for GCS outweighs it--I haven't noticed demand for GCS, but maybe I'm not looking in the right places.

I guess we could leave it on, and if we get dinged on CRAN, we know how to turn it back off?

@jonkeane

Copy link
Copy Markdown
MemberAuthor

MM, I think you've convinced me that we should pull GCS back for now (and see if someone requests it before we open up our attack surface more). At the very least, it would be nice to send something with a more minimal expansion at first in case the CRAN macOS builders are different in key ways, we'll know that it's just an issue with S3 or zstd now. And maybe add GCS in 18 (or only when someone asks for it in a CRAN release). Like you said, it's easy enough to see how to change these now.

@github-actionsgithub-actionsBot added awaiting change review Awaiting change review and removed awaiting changes Awaiting changes labels Jun 20, 2024
@jonkeanejonkeane changed the title GH-41952: [R] Turn S3, GCS, and ZSTD on by default for macOSGH-41952: [R] Turn S3 and ZSTD on by default for macOSJun 20, 2024
@jonkeane

Copy link
Copy Markdown
MemberAuthor

@github-actions crossbow submit -g r

@github-actions

Copy link
Copy Markdown

Revision: 548b6b2

Submitted crossbow builds: ursacomputing/crossbow @ actions-e5cdc79a11

TaskStatus
r-binary-packagesGitHub Actions
test-r-arrow-backwards-compatibilityGitHub Actions
test-r-clang-sanitizerGitHub Actions
test-r-depsource-bundledAzure
test-r-depsource-systemGitHub Actions
test-r-dev-duckdbGitHub Actions
test-r-devdocsGitHub Actions
test-r-gcc-11GitHub Actions
test-r-gcc-12GitHub Actions
test-r-install-localGitHub Actions
test-r-install-local-minsizerelGitHub Actions
test-r-linux-as-cranGitHub Actions
test-r-linux-rchkGitHub Actions
test-r-linux-valgrindGitHub Actions
test-r-minimal-buildAzure
test-r-offline-maximalGitHub Actions
test-r-offline-minimalAzure
test-r-rhub-debian-gcc-devel-lto-latestAzure
test-r-rhub-debian-gcc-release-custom-ccacheAzure
test-r-rhub-ubuntu-release-latestAzure
test-r-rocker-r-ver-latestAzure
test-r-rstudio-r-base-4.1-opensuse155Azure
test-r-rstudio-r-base-4.2-focalAzure
test-r-ubuntu-22.04GitHub Actions
test-r-versionsGitHub Actions
test-ubuntu-r-sanitizerGitHub Actions

@assignUser

Copy link
Copy Markdown
Member

I also wonder whether GCS is worth including.

IMO the CRAN builds should be as feature complete as possible as they are (well after the issue with the last two released binaries maybe used to be...) the way to get the package for mac users and there shouldn't be a reason for users to user alternative sources like r-universe or source build but:

On the other, GCS increases build time there and increases the BDR attack surface.

While I would have disagreed previously reality has beaten me down and eh... ok.

@jonkeane

Copy link
Copy Markdown
MemberAuthor

@github-actions crossbow submit -g r

@github-actions

Copy link
Copy Markdown

Revision: b23878a

Submitted crossbow builds: ursacomputing/crossbow @ actions-f75e6668f4

TaskStatus
r-binary-packagesGitHub Actions
test-r-arrow-backwards-compatibilityGitHub Actions
test-r-clang-sanitizerGitHub Actions
test-r-depsource-bundledAzure
test-r-depsource-systemGitHub Actions
test-r-dev-duckdbGitHub Actions
test-r-devdocsGitHub Actions
test-r-gcc-11GitHub Actions
test-r-gcc-12GitHub Actions
test-r-install-localGitHub Actions
test-r-install-local-minsizerelGitHub Actions
test-r-linux-as-cranGitHub Actions
test-r-linux-rchkGitHub Actions
test-r-linux-valgrindGitHub Actions
test-r-minimal-buildAzure
test-r-offline-maximalGitHub Actions
test-r-offline-minimalAzure
test-r-rhub-debian-gcc-devel-lto-latestAzure
test-r-rhub-debian-gcc-release-custom-ccacheAzure
test-r-rhub-ubuntu-release-latestAzure
test-r-rocker-r-ver-latestAzure
test-r-rstudio-r-base-4.1-opensuse155Azure
test-r-rstudio-r-base-4.2-focalAzure
test-r-ubuntu-22.04GitHub Actions
test-r-versionsGitHub Actions
test-ubuntu-r-sanitizerGitHub Actions

@jonkeane

Copy link
Copy Markdown
MemberAuthor

This is probably paranoid, but I'm going to run one last mc builder run before I merge.

Comment threadr/tools/nixlibs.R
Comment on lines +830 to +834
env_var_list_value <- env_var_list[[env_varname]]
if (is.null(env_var_list_value)) {
env_var_list_value <- ""
}
env_value <- tolower(Sys.getenv(env_varname, env_var_list_value))

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Is this equivalent?

Suggested change
env_var_list_value<-env_var_list[[env_varname]]
if (is.null(env_var_list_value)) {
env_var_list_value<-""
}
env_value<- tolower(Sys.getenv(env_varname, env_var_list_value))
env_value<- tolower(Sys.getenv(env_varname, env_var_list[[env_varname]]))

Copy link
Copy Markdown
MemberAuthor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Well I feel slightly better having thought the exact same thing. But turns out: no! env_var_list[[env_varname]] is NULL if it doesn't exist (which is what we want) but:

Sys.getenv("env_varname", NULL)
Error in Sys.getenv("env_varname", NULL) : wrong type for argument

Though I only found that out when I pushed (+ got a little too eager and triggered all of crossbow r) and then saw lots of red.

This would be a perfect place for %||% or the native equivalent, but I didn't want to require rlang here (I mean we require it for the package, so maybe that's ok?)

@github-actionsgithub-actionsBot added awaiting changes Awaiting changes and removed awaiting change review Awaiting change review labels Jun 21, 2024
@jonkeane

Copy link
Copy Markdown
MemberAuthor

I'm glad I submitted to mac builder again, cause I noticed there that we're doing something wrong with linking snappy: ... -lparquet -larrow_acero -larrow -larrow_bundled_dependencies /opt/homebrew/lib/libsnappy.1.1.9.dylib ...

Which then means when you try to load without having snappy from homebrew it fails. I will look into why this is and push it to this branch.

@github-actionsgithub-actionsBot added awaiting change review Awaiting change review and removed awaiting changes Awaiting changes labels Jun 21, 2024
mkdir -p "${BUILD_DIR}"
pushd "${BUILD_DIR}"
${CMAKE} -DARROW_BOOST_USE_SHARED=OFF \
-DARROW_SNAPPY_USE_SHARED=OFF \

Copy link
Copy Markdown
MemberAuthor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This prevents shared (homebrew) snappy from being used on the builder. Are there other dependencies we should add here?

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

ARROW_DEPENDENCY_USE_SHARED should be the default for all the more specific versions, so just setting that should work?

@github-actionsgithub-actionsBot added awaiting changes Awaiting changes and removed awaiting change review Awaiting change review labels Jun 21, 2024
@jonkeane
jonkeane merged commit 67bbf84 into apache:mainJun 23, 2024
@jonkeanejonkeane removed the awaiting changes Awaiting changes label Jun 23, 2024
@jonkeane
jonkeane deleted the macos_default_s3 branch June 23, 2024 21:03
@conbench-apache-arrow

Copy link
Copy Markdown

After merging your PR, Conbench analyzed the 7 benchmarking runs that have been run so far on merge-commit 67bbf84.

There were 4 benchmark results indicating a performance regression:

The full Conbench report has more details. It also includes information about 88 possible false positives for unstable benchmarks that are known to sometimes produce them.

Sign up for freeto join this conversation on GitHub. Already have an account? Sign in to comment

Labels

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants

@jonkeane@nealrichardson@assignUser
, '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

GH-41952: [R] Turn S3 and ZSTD on by default for macOS - #42210

Merged
jonkeane merged 6 commits into
apache:mainfrom
jonkeane:macos_default_s3
Jun 23, 2024
Merged

GH-41952: [R] Turn S3 and ZSTD on by default for macOS#42210
jonkeane merged 6 commits into
apache:mainfrom
jonkeane:macos_default_s3

Conversation

@jonkeane

@jonkeanejonkeane commented Jun 19, 2024

Copy link
Copy Markdown
Member

Changeup nixlibs.R so that we enable S3 and ZSTD by default on CRAN. I've checked this against the CRAN macbuilder to confirm it does work (that's not a guarantee it'll work on other CRAN maintained macOS builders, but a good indication).

It also removes gcs from the list of features we expect to be on and warn folks about if it is not.

Rationale for this change

So that our builds are more fully featured.

What changes are included in this PR?

Enable ARROW_S3 by default when building form source on macOS.

Are these changes tested?

Existing CI should not fail.

Are there any user-facing changes?

Getting Arrow from the canonical repository would be more fully featured.

@github-actions

Copy link
Copy Markdown

⚠️ GitHub issue #41952has been automatically assigned in GitHub to PR creator.

Comment threadr/tools/nixlibs.R
cleanup(build_dir)

env_var_list <- c(
env_var_list <- list(

Copy link
Copy Markdown
MemberAuthor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This isn't technically necessary, but it was the easiest way to do what I wanted to in is_feature_requested(). Further, it's a bit strange that this thing called X_X_list is not a list.

@github-actionsgithub-actionsBot added awaiting changes Awaiting changes and removed awaiting committer review Awaiting committer review labels Jun 19, 2024
Comment threadr/tools/nixlibs.R
Comment on lines +819 to +825
is_feature_requested <- function(env_varname, env_var_list, default = env_is("LIBARROW_MINIMAL", "false")) {
# look in our env_var_list first, if it's not found there go to
# the actual environment
env_value <- tolower(env_var_list[[env_varname]])
if (is.null(env_value)) {
env_value <- tolower(Sys.getenv(env_varname))
}

Copy link
Copy Markdown
MemberAuthor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This is a change in behavior that warrants some thought. Though I will say this is how I thought this worked already — or rather I thought is_feature_requested() was looking at env_var_list and not only looking at the literal environment. It's possible this was a mistake / it should have never looked at the environment but instead be looking at the env_var_list. But I kept it for now in case this is actually intended.

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The original intent of the function was to check whether the user requested a feature. env_var_list doesn't contain any user-requested features, at least not in the active sense. But now that you're putting some default selections in there, it makes sense to check it here. The function is currently only used to check for S3/GCS, to know whether we need to have openssl and curl.

Copy link
Copy Markdown
MemberAuthor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

AAAAH I was missing the user- part there, that makes it make more sense now.

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

See, this is why passive voice is bad.

@github-actionsgithub-actionsBot added awaiting change review Awaiting change review and removed awaiting changes Awaiting changes labels Jun 19, 2024
@jonkeanejonkeane changed the title GH-41952: [R] Turn S3 on by default for macOSGH-41952: [R] Turn S3, GCS, and ZSTD on by default for macOSJun 19, 2024
@jonkeane

Copy link
Copy Markdown
MemberAuthor

I also noticed two other optional libraries that were being flagged as not a full build. I added those, and ran mac builder: https://mac.r-project.org/macbuilder/results/1718828010-3fa0fa8b00b3b11c/

@nealrichardsonnealrichardson left a comment

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This seems like the least bad option for turning these features on. The other places where we handle defaults, like by the value of LIBARROW_MINIMAL, aren't good for S3/GCS because we have to check up front for openssl/curl.

Comment threadr/tools/nixlibs.R Outdated
Comment threadr/tools/nixlibs.R
Comment on lines +819 to +825
is_feature_requested <- function(env_varname, env_var_list, default = env_is("LIBARROW_MINIMAL", "false")) {
# look in our env_var_list first, if it's not found there go to
# the actual environment
env_value <- tolower(env_var_list[[env_varname]])
if (is.null(env_value)) {
env_value <- tolower(Sys.getenv(env_varname))
}

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The original intent of the function was to check whether the user requested a feature. env_var_list doesn't contain any user-requested features, at least not in the active sense. But now that you're putting some default selections in there, it makes sense to check it here. The function is currently only used to check for S3/GCS, to know whether we need to have openssl and curl.

Co-authored-by: Neal Richardson <neal.p.richardson@gmail.com>
@github-actionsgithub-actionsBot added awaiting changes Awaiting changes and removed awaiting change review Awaiting change review labels Jun 20, 2024
@jonkeane

jonkeane commented Jun 20, 2024

Copy link
Copy Markdown
MemberAuthor

I also wonder whether GCS is worth including.

I agree + though similar when I checked if S3 alone was sufficient for quieting the message. I'm happy to pull GCS out of this, though IMO we should also add GCS to the block list so that it's not being checked if we do that too.

I'm happy to do this in this PR if we want.

@nealrichardson

Copy link
Copy Markdown
Member

I also wonder whether GCS is worth including.

I agree + though similar when I checked if S3 alone was sufficient for quieting the message. I'm happy to pull GCS out of this, though IMO we should also add GCS to the block list so that it's not being checked if we do that too.

I'm happy to do this in this PR if we want.

Right, we would want to change that message.

On the one hand, users won't generally experience this because they'll get a binary from CRAN. On the other, GCS increases build time there and increases the BDR attack surface. I don't know how big that risk is and if demand for GCS outweighs it--I haven't noticed demand for GCS, but maybe I'm not looking in the right places.

I guess we could leave it on, and if we get dinged on CRAN, we know how to turn it back off?

@jonkeane

Copy link
Copy Markdown
MemberAuthor

MM, I think you've convinced me that we should pull GCS back for now (and see if someone requests it before we open up our attack surface more). At the very least, it would be nice to send something with a more minimal expansion at first in case the CRAN macOS builders are different in key ways, we'll know that it's just an issue with S3 or zstd now. And maybe add GCS in 18 (or only when someone asks for it in a CRAN release). Like you said, it's easy enough to see how to change these now.

@github-actionsgithub-actionsBot added awaiting change review Awaiting change review and removed awaiting changes Awaiting changes labels Jun 20, 2024
@jonkeanejonkeane changed the title GH-41952: [R] Turn S3, GCS, and ZSTD on by default for macOSGH-41952: [R] Turn S3 and ZSTD on by default for macOSJun 20, 2024
@jonkeane

Copy link
Copy Markdown
MemberAuthor

@github-actions crossbow submit -g r

@github-actions

Copy link
Copy Markdown

Revision: 548b6b2

Submitted crossbow builds: ursacomputing/crossbow @ actions-e5cdc79a11

TaskStatus
r-binary-packagesGitHub Actions
test-r-arrow-backwards-compatibilityGitHub Actions
test-r-clang-sanitizerGitHub Actions
test-r-depsource-bundledAzure
test-r-depsource-systemGitHub Actions
test-r-dev-duckdbGitHub Actions
test-r-devdocsGitHub Actions
test-r-gcc-11GitHub Actions
test-r-gcc-12GitHub Actions
test-r-install-localGitHub Actions
test-r-install-local-minsizerelGitHub Actions
test-r-linux-as-cranGitHub Actions
test-r-linux-rchkGitHub Actions
test-r-linux-valgrindGitHub Actions
test-r-minimal-buildAzure
test-r-offline-maximalGitHub Actions
test-r-offline-minimalAzure
test-r-rhub-debian-gcc-devel-lto-latestAzure
test-r-rhub-debian-gcc-release-custom-ccacheAzure
test-r-rhub-ubuntu-release-latestAzure
test-r-rocker-r-ver-latestAzure
test-r-rstudio-r-base-4.1-opensuse155Azure
test-r-rstudio-r-base-4.2-focalAzure
test-r-ubuntu-22.04GitHub Actions
test-r-versionsGitHub Actions
test-ubuntu-r-sanitizerGitHub Actions

@assignUser

Copy link
Copy Markdown
Member

I also wonder whether GCS is worth including.

IMO the CRAN builds should be as feature complete as possible as they are (well after the issue with the last two released binaries maybe used to be...) the way to get the package for mac users and there shouldn't be a reason for users to user alternative sources like r-universe or source build but:

On the other, GCS increases build time there and increases the BDR attack surface.

While I would have disagreed previously reality has beaten me down and eh... ok.

@jonkeane

Copy link
Copy Markdown
MemberAuthor

@github-actions crossbow submit -g r

@github-actions

Copy link
Copy Markdown

Revision: b23878a

Submitted crossbow builds: ursacomputing/crossbow @ actions-f75e6668f4

TaskStatus
r-binary-packagesGitHub Actions
test-r-arrow-backwards-compatibilityGitHub Actions
test-r-clang-sanitizerGitHub Actions
test-r-depsource-bundledAzure
test-r-depsource-systemGitHub Actions
test-r-dev-duckdbGitHub Actions
test-r-devdocsGitHub Actions
test-r-gcc-11GitHub Actions
test-r-gcc-12GitHub Actions
test-r-install-localGitHub Actions
test-r-install-local-minsizerelGitHub Actions
test-r-linux-as-cranGitHub Actions
test-r-linux-rchkGitHub Actions
test-r-linux-valgrindGitHub Actions
test-r-minimal-buildAzure
test-r-offline-maximalGitHub Actions
test-r-offline-minimalAzure
test-r-rhub-debian-gcc-devel-lto-latestAzure
test-r-rhub-debian-gcc-release-custom-ccacheAzure
test-r-rhub-ubuntu-release-latestAzure
test-r-rocker-r-ver-latestAzure
test-r-rstudio-r-base-4.1-opensuse155Azure
test-r-rstudio-r-base-4.2-focalAzure
test-r-ubuntu-22.04GitHub Actions
test-r-versionsGitHub Actions
test-ubuntu-r-sanitizerGitHub Actions

@jonkeane

Copy link
Copy Markdown
MemberAuthor

This is probably paranoid, but I'm going to run one last mc builder run before I merge.

Comment threadr/tools/nixlibs.R
Comment on lines +830 to +834
env_var_list_value <- env_var_list[[env_varname]]
if (is.null(env_var_list_value)) {
env_var_list_value <- ""
}
env_value <- tolower(Sys.getenv(env_varname, env_var_list_value))

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Is this equivalent?

Suggested change
env_var_list_value<-env_var_list[[env_varname]]
if (is.null(env_var_list_value)) {
env_var_list_value<-""
}
env_value<- tolower(Sys.getenv(env_varname, env_var_list_value))
env_value<- tolower(Sys.getenv(env_varname, env_var_list[[env_varname]]))

Copy link
Copy Markdown
MemberAuthor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Well I feel slightly better having thought the exact same thing. But turns out: no! env_var_list[[env_varname]] is NULL if it doesn't exist (which is what we want) but:

Sys.getenv("env_varname", NULL)
Error in Sys.getenv("env_varname", NULL) : wrong type for argument

Though I only found that out when I pushed (+ got a little too eager and triggered all of crossbow r) and then saw lots of red.

This would be a perfect place for %||% or the native equivalent, but I didn't want to require rlang here (I mean we require it for the package, so maybe that's ok?)

@github-actionsgithub-actionsBot added awaiting changes Awaiting changes and removed awaiting change review Awaiting change review labels Jun 21, 2024
@jonkeane

Copy link
Copy Markdown
MemberAuthor

I'm glad I submitted to mac builder again, cause I noticed there that we're doing something wrong with linking snappy: ... -lparquet -larrow_acero -larrow -larrow_bundled_dependencies /opt/homebrew/lib/libsnappy.1.1.9.dylib ...

Which then means when you try to load without having snappy from homebrew it fails. I will look into why this is and push it to this branch.

@github-actionsgithub-actionsBot added awaiting change review Awaiting change review and removed awaiting changes Awaiting changes labels Jun 21, 2024
mkdir -p "${BUILD_DIR}"
pushd "${BUILD_DIR}"
${CMAKE} -DARROW_BOOST_USE_SHARED=OFF \
-DARROW_SNAPPY_USE_SHARED=OFF \

Copy link
Copy Markdown
MemberAuthor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This prevents shared (homebrew) snappy from being used on the builder. Are there other dependencies we should add here?

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

ARROW_DEPENDENCY_USE_SHARED should be the default for all the more specific versions, so just setting that should work?

@github-actionsgithub-actionsBot added awaiting changes Awaiting changes and removed awaiting change review Awaiting change review labels Jun 21, 2024
@jonkeane
jonkeane merged commit 67bbf84 into apache:mainJun 23, 2024
@jonkeanejonkeane removed the awaiting changes Awaiting changes label Jun 23, 2024
@jonkeane
jonkeane deleted the macos_default_s3 branch June 23, 2024 21:03
@conbench-apache-arrow

Copy link
Copy Markdown

After merging your PR, Conbench analyzed the 7 benchmarking runs that have been run so far on merge-commit 67bbf84.

There were 4 benchmark results indicating a performance regression:

The full Conbench report has more details. It also includes information about 88 possible false positives for unstable benchmarks that are known to sometimes produce them.

Sign up for freeto join this conversation on GitHub. Already have an account? Sign in to comment

Labels

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants

@jonkeane@nealrichardson@assignUser
, '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

GH-41952: [R] Turn S3 and ZSTD on by default for macOS - #42210

Merged
jonkeane merged 6 commits into
apache:mainfrom
jonkeane:macos_default_s3
Jun 23, 2024
Merged

GH-41952: [R] Turn S3 and ZSTD on by default for macOS#42210
jonkeane merged 6 commits into
apache:mainfrom
jonkeane:macos_default_s3

Conversation

@jonkeane

@jonkeanejonkeane commented Jun 19, 2024

Copy link
Copy Markdown
Member

Changeup nixlibs.R so that we enable S3 and ZSTD by default on CRAN. I've checked this against the CRAN macbuilder to confirm it does work (that's not a guarantee it'll work on other CRAN maintained macOS builders, but a good indication).

It also removes gcs from the list of features we expect to be on and warn folks about if it is not.

Rationale for this change

So that our builds are more fully featured.

What changes are included in this PR?

Enable ARROW_S3 by default when building form source on macOS.

Are these changes tested?

Existing CI should not fail.

Are there any user-facing changes?

Getting Arrow from the canonical repository would be more fully featured.

@github-actions

Copy link
Copy Markdown

⚠️ GitHub issue #41952has been automatically assigned in GitHub to PR creator.

Comment threadr/tools/nixlibs.R
cleanup(build_dir)

env_var_list <- c(
env_var_list <- list(

Copy link
Copy Markdown
MemberAuthor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This isn't technically necessary, but it was the easiest way to do what I wanted to in is_feature_requested(). Further, it's a bit strange that this thing called X_X_list is not a list.

@github-actionsgithub-actionsBot added awaiting changes Awaiting changes and removed awaiting committer review Awaiting committer review labels Jun 19, 2024
Comment threadr/tools/nixlibs.R
Comment on lines +819 to +825
is_feature_requested <- function(env_varname, env_var_list, default = env_is("LIBARROW_MINIMAL", "false")) {
# look in our env_var_list first, if it's not found there go to
# the actual environment
env_value <- tolower(env_var_list[[env_varname]])
if (is.null(env_value)) {
env_value <- tolower(Sys.getenv(env_varname))
}

Copy link
Copy Markdown
MemberAuthor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This is a change in behavior that warrants some thought. Though I will say this is how I thought this worked already — or rather I thought is_feature_requested() was looking at env_var_list and not only looking at the literal environment. It's possible this was a mistake / it should have never looked at the environment but instead be looking at the env_var_list. But I kept it for now in case this is actually intended.

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The original intent of the function was to check whether the user requested a feature. env_var_list doesn't contain any user-requested features, at least not in the active sense. But now that you're putting some default selections in there, it makes sense to check it here. The function is currently only used to check for S3/GCS, to know whether we need to have openssl and curl.

Copy link
Copy Markdown
MemberAuthor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

AAAAH I was missing the user- part there, that makes it make more sense now.

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

See, this is why passive voice is bad.

@github-actionsgithub-actionsBot added awaiting change review Awaiting change review and removed awaiting changes Awaiting changes labels Jun 19, 2024
@jonkeanejonkeane changed the title GH-41952: [R] Turn S3 on by default for macOSGH-41952: [R] Turn S3, GCS, and ZSTD on by default for macOSJun 19, 2024
@jonkeane

Copy link
Copy Markdown
MemberAuthor

I also noticed two other optional libraries that were being flagged as not a full build. I added those, and ran mac builder: https://mac.r-project.org/macbuilder/results/1718828010-3fa0fa8b00b3b11c/

@nealrichardsonnealrichardson left a comment

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This seems like the least bad option for turning these features on. The other places where we handle defaults, like by the value of LIBARROW_MINIMAL, aren't good for S3/GCS because we have to check up front for openssl/curl.

Comment threadr/tools/nixlibs.R Outdated
Comment threadr/tools/nixlibs.R
Comment on lines +819 to +825
is_feature_requested <- function(env_varname, env_var_list, default = env_is("LIBARROW_MINIMAL", "false")) {
# look in our env_var_list first, if it's not found there go to
# the actual environment
env_value <- tolower(env_var_list[[env_varname]])
if (is.null(env_value)) {
env_value <- tolower(Sys.getenv(env_varname))
}

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The original intent of the function was to check whether the user requested a feature. env_var_list doesn't contain any user-requested features, at least not in the active sense. But now that you're putting some default selections in there, it makes sense to check it here. The function is currently only used to check for S3/GCS, to know whether we need to have openssl and curl.

Co-authored-by: Neal Richardson <neal.p.richardson@gmail.com>
@github-actionsgithub-actionsBot added awaiting changes Awaiting changes and removed awaiting change review Awaiting change review labels Jun 20, 2024
@jonkeane

jonkeane commented Jun 20, 2024

Copy link
Copy Markdown
MemberAuthor

I also wonder whether GCS is worth including.

I agree + though similar when I checked if S3 alone was sufficient for quieting the message. I'm happy to pull GCS out of this, though IMO we should also add GCS to the block list so that it's not being checked if we do that too.

I'm happy to do this in this PR if we want.

@nealrichardson

Copy link
Copy Markdown
Member

I also wonder whether GCS is worth including.

I agree + though similar when I checked if S3 alone was sufficient for quieting the message. I'm happy to pull GCS out of this, though IMO we should also add GCS to the block list so that it's not being checked if we do that too.

I'm happy to do this in this PR if we want.

Right, we would want to change that message.

On the one hand, users won't generally experience this because they'll get a binary from CRAN. On the other, GCS increases build time there and increases the BDR attack surface. I don't know how big that risk is and if demand for GCS outweighs it--I haven't noticed demand for GCS, but maybe I'm not looking in the right places.

I guess we could leave it on, and if we get dinged on CRAN, we know how to turn it back off?

@jonkeane

Copy link
Copy Markdown
MemberAuthor

MM, I think you've convinced me that we should pull GCS back for now (and see if someone requests it before we open up our attack surface more). At the very least, it would be nice to send something with a more minimal expansion at first in case the CRAN macOS builders are different in key ways, we'll know that it's just an issue with S3 or zstd now. And maybe add GCS in 18 (or only when someone asks for it in a CRAN release). Like you said, it's easy enough to see how to change these now.

@github-actionsgithub-actionsBot added awaiting change review Awaiting change review and removed awaiting changes Awaiting changes labels Jun 20, 2024
@jonkeanejonkeane changed the title GH-41952: [R] Turn S3, GCS, and ZSTD on by default for macOSGH-41952: [R] Turn S3 and ZSTD on by default for macOSJun 20, 2024
@jonkeane

Copy link
Copy Markdown
MemberAuthor

@github-actions crossbow submit -g r

@github-actions

Copy link
Copy Markdown

Revision: 548b6b2

Submitted crossbow builds: ursacomputing/crossbow @ actions-e5cdc79a11

TaskStatus
r-binary-packagesGitHub Actions
test-r-arrow-backwards-compatibilityGitHub Actions
test-r-clang-sanitizerGitHub Actions
test-r-depsource-bundledAzure
test-r-depsource-systemGitHub Actions
test-r-dev-duckdbGitHub Actions
test-r-devdocsGitHub Actions
test-r-gcc-11GitHub Actions
test-r-gcc-12GitHub Actions
test-r-install-localGitHub Actions
test-r-install-local-minsizerelGitHub Actions
test-r-linux-as-cranGitHub Actions
test-r-linux-rchkGitHub Actions
test-r-linux-valgrindGitHub Actions
test-r-minimal-buildAzure
test-r-offline-maximalGitHub Actions
test-r-offline-minimalAzure
test-r-rhub-debian-gcc-devel-lto-latestAzure
test-r-rhub-debian-gcc-release-custom-ccacheAzure
test-r-rhub-ubuntu-release-latestAzure
test-r-rocker-r-ver-latestAzure
test-r-rstudio-r-base-4.1-opensuse155Azure
test-r-rstudio-r-base-4.2-focalAzure
test-r-ubuntu-22.04GitHub Actions
test-r-versionsGitHub Actions
test-ubuntu-r-sanitizerGitHub Actions

@assignUser

Copy link
Copy Markdown
Member

I also wonder whether GCS is worth including.

IMO the CRAN builds should be as feature complete as possible as they are (well after the issue with the last two released binaries maybe used to be...) the way to get the package for mac users and there shouldn't be a reason for users to user alternative sources like r-universe or source build but:

On the other, GCS increases build time there and increases the BDR attack surface.

While I would have disagreed previously reality has beaten me down and eh... ok.

@jonkeane

Copy link
Copy Markdown
MemberAuthor

@github-actions crossbow submit -g r

@github-actions

Copy link
Copy Markdown

Revision: b23878a

Submitted crossbow builds: ursacomputing/crossbow @ actions-f75e6668f4

TaskStatus
r-binary-packagesGitHub Actions
test-r-arrow-backwards-compatibilityGitHub Actions
test-r-clang-sanitizerGitHub Actions
test-r-depsource-bundledAzure
test-r-depsource-systemGitHub Actions
test-r-dev-duckdbGitHub Actions
test-r-devdocsGitHub Actions
test-r-gcc-11GitHub Actions
test-r-gcc-12GitHub Actions
test-r-install-localGitHub Actions
test-r-install-local-minsizerelGitHub Actions
test-r-linux-as-cranGitHub Actions
test-r-linux-rchkGitHub Actions
test-r-linux-valgrindGitHub Actions
test-r-minimal-buildAzure
test-r-offline-maximalGitHub Actions
test-r-offline-minimalAzure
test-r-rhub-debian-gcc-devel-lto-latestAzure
test-r-rhub-debian-gcc-release-custom-ccacheAzure
test-r-rhub-ubuntu-release-latestAzure
test-r-rocker-r-ver-latestAzure
test-r-rstudio-r-base-4.1-opensuse155Azure
test-r-rstudio-r-base-4.2-focalAzure
test-r-ubuntu-22.04GitHub Actions
test-r-versionsGitHub Actions
test-ubuntu-r-sanitizerGitHub Actions

@jonkeane

Copy link
Copy Markdown
MemberAuthor

This is probably paranoid, but I'm going to run one last mc builder run before I merge.

Comment threadr/tools/nixlibs.R
Comment on lines +830 to +834
env_var_list_value <- env_var_list[[env_varname]]
if (is.null(env_var_list_value)) {
env_var_list_value <- ""
}
env_value <- tolower(Sys.getenv(env_varname, env_var_list_value))

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Is this equivalent?

Suggested change
env_var_list_value<-env_var_list[[env_varname]]
if (is.null(env_var_list_value)) {
env_var_list_value<-""
}
env_value<- tolower(Sys.getenv(env_varname, env_var_list_value))
env_value<- tolower(Sys.getenv(env_varname, env_var_list[[env_varname]]))

Copy link
Copy Markdown
MemberAuthor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Well I feel slightly better having thought the exact same thing. But turns out: no! env_var_list[[env_varname]] is NULL if it doesn't exist (which is what we want) but:

Sys.getenv("env_varname", NULL)
Error in Sys.getenv("env_varname", NULL) : wrong type for argument

Though I only found that out when I pushed (+ got a little too eager and triggered all of crossbow r) and then saw lots of red.

This would be a perfect place for %||% or the native equivalent, but I didn't want to require rlang here (I mean we require it for the package, so maybe that's ok?)

@github-actionsgithub-actionsBot added awaiting changes Awaiting changes and removed awaiting change review Awaiting change review labels Jun 21, 2024
@jonkeane

Copy link
Copy Markdown
MemberAuthor

I'm glad I submitted to mac builder again, cause I noticed there that we're doing something wrong with linking snappy: ... -lparquet -larrow_acero -larrow -larrow_bundled_dependencies /opt/homebrew/lib/libsnappy.1.1.9.dylib ...

Which then means when you try to load without having snappy from homebrew it fails. I will look into why this is and push it to this branch.

@github-actionsgithub-actionsBot added awaiting change review Awaiting change review and removed awaiting changes Awaiting changes labels Jun 21, 2024
mkdir -p "${BUILD_DIR}"
pushd "${BUILD_DIR}"
${CMAKE} -DARROW_BOOST_USE_SHARED=OFF \
-DARROW_SNAPPY_USE_SHARED=OFF \

Copy link
Copy Markdown
MemberAuthor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This prevents shared (homebrew) snappy from being used on the builder. Are there other dependencies we should add here?

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

ARROW_DEPENDENCY_USE_SHARED should be the default for all the more specific versions, so just setting that should work?

@github-actionsgithub-actionsBot added awaiting changes Awaiting changes and removed awaiting change review Awaiting change review labels Jun 21, 2024
@jonkeane
jonkeane merged commit 67bbf84 into apache:mainJun 23, 2024
@jonkeanejonkeane removed the awaiting changes Awaiting changes label Jun 23, 2024
@jonkeane
jonkeane deleted the macos_default_s3 branch June 23, 2024 21:03
@conbench-apache-arrow

Copy link
Copy Markdown

After merging your PR, Conbench analyzed the 7 benchmarking runs that have been run so far on merge-commit 67bbf84.

There were 4 benchmark results indicating a performance regression:

The full Conbench report has more details. It also includes information about 88 possible false positives for unstable benchmarks that are known to sometimes produce them.

Sign up for freeto join this conversation on GitHub. Already have an account? Sign in to comment

Labels

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants

@jonkeane@nealrichardson@assignUser