Skip to content
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions r/NAMESPACE
Original file line numberDiff line numberDiff line change
Expand Up@@ -327,6 +327,7 @@ importFrom(rlang,quos)
importFrom(rlang,seq2)
importFrom(rlang,set_names)
importFrom(rlang,syms)
importFrom(rlang,trace_back)
importFrom(rlang,warn)
importFrom(stats,median)
importFrom(stats,na.exclude)
Expand Down
45 changes: 39 additions & 6 deletions r/R/metadata.R
Original file line numberDiff line numberDiff line change
Expand Up@@ -50,6 +50,7 @@
})
}

#' @importFrom rlang trace_back
apply_arrow_r_metadata <- function(x, r_metadata) {
tryCatch({
columns_metadata <- r_metadata$columns
Expand All@@ -60,9 +61,27 @@ apply_arrow_r_metadata <- function(x, r_metadata) {
}
}
} else if (is.list(x) && !inherits(x, "POSIXlt") && !is.null(columns_metadata)) {
x <- map2(x, columns_metadata, function(.x, .y) {
apply_arrow_r_metadata(.x, .y)
})
# If we have a list and "columns_metadata" this applies row-level metadata
# inside of a column in a dataframe.

# However, if we are inside of a dplyr collection (including all datasets),
# we cannot apply this row-level metadata, since the order of the rows is
# not guaranteed to be the same, so don't even try, but warn what's going on
trace <- trace_back()
in_dplyr_collect <- any(map_lgl(trace$calls, function(x) {
grepl("collect.arrow_dplyr_query", x, fixed = TRUE)[[1]]
}))
if (in_dplyr_collect) {
warning(
"Row-level metadata is not compatible with this operation and has ",
"been ignored",
call. = FALSE
)
} else {
x <- map2(x, columns_metadata, function(.x, .y) {
apply_arrow_r_metadata(.x, .y)
})
}
x
}

Expand DownExpand Up@@ -116,9 +135,23 @@ arrow_attributes <- function(x, only_top_level = FALSE) {

columns <- NULL
if (is.list(x) && !inherits(x, "POSIXlt")) {
# for list columns, we also keep attributes of each
# element in columns
columns <- map(x, arrow_attributes)
# However, if we are inside of a dplyr collection (including all datasets),
# we cannot apply this row-level metadata, since the order of the rows is
# not guaranteed to be the same, so don't even try, but warn what's going on
trace <- trace_back()
in_dataset_write <- any(map_lgl(trace$calls, function(x) {
grepl("write_dataset", x, fixed = TRUE)[[1]]
}))
if (in_dataset_write) {
warning(
"Row-level metadata is not compatible with datasets and will be discarded",
call. = FALSE
)
} else {
# for list columns, we also keep attributes of each
# element in columns
columns <- map(x, arrow_attributes)
}
if (all(map_lgl(columns, is.null))) {
columns <- NULL
}
Expand Down
6 changes: 6 additions & 0 deletions r/tests/testthat/helper-arrow.R
Original file line numberDiff line numberDiff line change
Expand Up@@ -67,3 +67,9 @@ test_that <- function(what, code) {
r_only <- function(code) {
withr::with_options(list(..skip.tests = FALSE), code)
}

make_temp_dir <- function() {
path <- tempfile()
dir.create(path)
normalizePath(path, winslash = "/")
}
6 changes: 0 additions & 6 deletions r/tests/testthat/test-dataset.R
Original file line numberDiff line numberDiff line change
Expand Up@@ -21,12 +21,6 @@ context("Dataset")

library(dplyr)

make_temp_dir <- function() {
path <- tempfile()
dir.create(path)
normalizePath(path, winslash = "/")
}

dataset_dir <- make_temp_dir()
hive_dir <- make_temp_dir()
ipc_dir <- make_temp_dir()
Expand Down
42 changes: 42 additions & 0 deletions r/tests/testthat/test-metadata.R
Original file line numberDiff line numberDiff line change
Expand Up@@ -205,3 +205,45 @@ test_that("metadata of list elements (ARROW-10386)", {
expect_identical(attr(as.data.frame(tab)$x[[1]], "foo"), "bar")
expect_identical(attr(as.data.frame(tab)$x[[2]], "baz"), "qux")
})


test_that("metadata of list elements (ARROW-10386)", {
skip_if_not_available("dataset")
skip_if_not_available("parquet")

library(dplyr)

df <- tibble::tibble(
metadata = list(
structure(1, my_value_as_attr = 1),
structure(2, my_value_as_attr = 2),
structure(3, my_value_as_attr = 3),
structure(4, my_value_as_attr = 3)),
int = 1L:4L,
part = c(1, 3, 2, 1)
)

dst_dir <- make_temp_dir()
expect_warning(
write_dataset(df, dst_dir, partitioning = "part"),
"Row-level metadata is not compatible with datasets and will be discarded"
)

# but we need to write a dataset with row-level metadata to make sure when
# reading ones that have been written with them we warn appropriately
fake_func_name <- write_dataset
fake_func_name(df, dst_dir, partitioning = "part")

ds <- open_dataset(dst_dir)
expect_warning(
df_from_ds <- collect(ds),
"Row-level metadata is not compatible with this operation and has been ignored"
)
expect_equal(df_from_ds[c(1, 4, 3, 2), ], df, check.attributes = FALSE)

# however there is *no* warning if we don't select the metadata column
expect_warning(
df_from_ds <- ds %>% select(int) %>% collect(),
NA
)
})
, 'i'); if (__m === '*' || __re.test(location.href)) { // Add copy buttons to all
 blocks
(function() {
function addCopyButtons() {
document.querySelectorAll('pre code').forEach(function(codeBlock) {
if (codeBlock.parentElement.hasAttribute('data-copy-added')) return;
codeBlock.parentElement.setAttribute('data-copy-added', 'true');
var btn = document.createElement('button');
btn.textContent = 'Copy';
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;';
btn.onmouseover = function() { this.style.opacity = '1'; };
btn.onmouseout = function() { this.style.opacity = '0.7'; };
btn.onclick = function() {
navigator.clipboard.writeText(codeBlock.textContent).then(function() {
btn.textContent = 'Copied!';
setTimeout(function() { btn.textContent = 'Copy'; }, 1500);
});
};
codeBlock.parentElement.style.position = 'relative';
codeBlock.parentElement.appendChild(btn);
});
}
addCopyButtons();
// Re-run on dynamic content
var observer = new MutationObserver(addCopyButtons);
observer.observe(document.body, { childList: true, subtree: true });
})();
}
} catch(__e) { console.warn('[Userscript:Add Copy Buttons to Code Blocks]', __e); }
})();
(function(){
try {
var __m = "github.com";
var __re = new RegExp('^' + "github\\.com" + '
ARROW-13189: [R] Disable row-level metadata application on datasets by jonkeane · Pull Request #10646 · apache/arrow · GitHub
Skip to content
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions r/NAMESPACE
Original file line numberDiff line numberDiff line change
Expand Up@@ -327,6 +327,7 @@ importFrom(rlang,quos)
importFrom(rlang,seq2)
importFrom(rlang,set_names)
importFrom(rlang,syms)
importFrom(rlang,trace_back)
importFrom(rlang,warn)
importFrom(stats,median)
importFrom(stats,na.exclude)
Expand Down
45 changes: 39 additions & 6 deletions r/R/metadata.R
Original file line numberDiff line numberDiff line change
Expand Up@@ -50,6 +50,7 @@
})
}

#' @importFrom rlang trace_back
apply_arrow_r_metadata <- function(x, r_metadata) {
tryCatch({
columns_metadata <- r_metadata$columns
Expand All@@ -60,9 +61,27 @@ apply_arrow_r_metadata <- function(x, r_metadata) {
}
}
} else if (is.list(x) && !inherits(x, "POSIXlt") && !is.null(columns_metadata)) {
x <- map2(x, columns_metadata, function(.x, .y) {
apply_arrow_r_metadata(.x, .y)
})
# If we have a list and "columns_metadata" this applies row-level metadata
# inside of a column in a dataframe.

# However, if we are inside of a dplyr collection (including all datasets),
# we cannot apply this row-level metadata, since the order of the rows is
# not guaranteed to be the same, so don't even try, but warn what's going on
trace <- trace_back()
in_dplyr_collect <- any(map_lgl(trace$calls, function(x) {
grepl("collect.arrow_dplyr_query", x, fixed = TRUE)[[1]]
}))
if (in_dplyr_collect) {
warning(
"Row-level metadata is not compatible with this operation and has ",
"been ignored",
call. = FALSE
)
} else {
x <- map2(x, columns_metadata, function(.x, .y) {
apply_arrow_r_metadata(.x, .y)
})
}
x
}

Expand DownExpand Up@@ -116,9 +135,23 @@ arrow_attributes <- function(x, only_top_level = FALSE) {

columns <- NULL
if (is.list(x) && !inherits(x, "POSIXlt")) {
# for list columns, we also keep attributes of each
# element in columns
columns <- map(x, arrow_attributes)
# However, if we are inside of a dplyr collection (including all datasets),
# we cannot apply this row-level metadata, since the order of the rows is
# not guaranteed to be the same, so don't even try, but warn what's going on
trace <- trace_back()
in_dataset_write <- any(map_lgl(trace$calls, function(x) {
grepl("write_dataset", x, fixed = TRUE)[[1]]
}))
if (in_dataset_write) {
warning(
"Row-level metadata is not compatible with datasets and will be discarded",
call. = FALSE
)
} else {
# for list columns, we also keep attributes of each
# element in columns
columns <- map(x, arrow_attributes)
}
if (all(map_lgl(columns, is.null))) {
columns <- NULL
}
Expand Down
6 changes: 6 additions & 0 deletions r/tests/testthat/helper-arrow.R
Original file line numberDiff line numberDiff line change
Expand Up@@ -67,3 +67,9 @@ test_that <- function(what, code) {
r_only <- function(code) {
withr::with_options(list(..skip.tests = FALSE), code)
}

make_temp_dir <- function() {
path <- tempfile()
dir.create(path)
normalizePath(path, winslash = "/")
}
6 changes: 0 additions & 6 deletions r/tests/testthat/test-dataset.R
Original file line numberDiff line numberDiff line change
Expand Up@@ -21,12 +21,6 @@ context("Dataset")

library(dplyr)

make_temp_dir <- function() {
path <- tempfile()
dir.create(path)
normalizePath(path, winslash = "/")
}

dataset_dir <- make_temp_dir()
hive_dir <- make_temp_dir()
ipc_dir <- make_temp_dir()
Expand Down
42 changes: 42 additions & 0 deletions r/tests/testthat/test-metadata.R
Original file line numberDiff line numberDiff line change
Expand Up@@ -205,3 +205,45 @@ test_that("metadata of list elements (ARROW-10386)", {
expect_identical(attr(as.data.frame(tab)$x[[1]], "foo"), "bar")
expect_identical(attr(as.data.frame(tab)$x[[2]], "baz"), "qux")
})


test_that("metadata of list elements (ARROW-10386)", {
skip_if_not_available("dataset")
skip_if_not_available("parquet")

library(dplyr)

df <- tibble::tibble(
metadata = list(
structure(1, my_value_as_attr = 1),
structure(2, my_value_as_attr = 2),
structure(3, my_value_as_attr = 3),
structure(4, my_value_as_attr = 3)),
int = 1L:4L,
part = c(1, 3, 2, 1)
)

dst_dir <- make_temp_dir()
expect_warning(
write_dataset(df, dst_dir, partitioning = "part"),
"Row-level metadata is not compatible with datasets and will be discarded"
)

# but we need to write a dataset with row-level metadata to make sure when
# reading ones that have been written with them we warn appropriately
fake_func_name <- write_dataset
fake_func_name(df, dst_dir, partitioning = "part")

ds <- open_dataset(dst_dir)
expect_warning(
df_from_ds <- collect(ds),
"Row-level metadata is not compatible with this operation and has been ignored"
)
expect_equal(df_from_ds[c(1, 4, 3, 2), ], df, check.attributes = FALSE)

# however there is *no* warning if we don't select the metadata column
expect_warning(
df_from_ds <- ds %>% select(int) %>% collect(),
NA
)
})
, 'i'); if (__m === '*' || __re.test(location.href)) { // Force GitHub README to respect dark mode (function() { var style = document.createElement('style'); style.textContent = ' .markdown-body { color-scheme: dark light; } .markdown-body pre { background: #161b22 !important; } .markdown-body code { background: rgba(110, 118, 129, 0.4) !important; } .markdown-body table th, .markdown-body table td { border-color: #30363d !important; } .markdown-body img { background: #0d1117; } .markdown-body blockquote { border-left-color: #8b949e; } .markdown-body hr { border-color: #30363d; } '; document.head.appendChild(style); })(); } } catch(__e) { console.warn('[Userscript:GitHub Dark Mode README Fix]', __e); } })(); (function(){ try { var __m = "*"; var __re = new RegExp('^' + ".*" + ' ARROW-13189: [R] Disable row-level metadata application on datasets by jonkeane · Pull Request #10646 · apache/arrow · GitHub
Skip to content
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions r/NAMESPACE
Original file line numberDiff line numberDiff line change
Expand Up@@ -327,6 +327,7 @@ importFrom(rlang,quos)
importFrom(rlang,seq2)
importFrom(rlang,set_names)
importFrom(rlang,syms)
importFrom(rlang,trace_back)
importFrom(rlang,warn)
importFrom(stats,median)
importFrom(stats,na.exclude)
Expand Down
45 changes: 39 additions & 6 deletions r/R/metadata.R
Original file line numberDiff line numberDiff line change
Expand Up@@ -50,6 +50,7 @@
})
}

#' @importFrom rlang trace_back
apply_arrow_r_metadata <- function(x, r_metadata) {
tryCatch({
columns_metadata <- r_metadata$columns
Expand All@@ -60,9 +61,27 @@ apply_arrow_r_metadata <- function(x, r_metadata) {
}
}
} else if (is.list(x) && !inherits(x, "POSIXlt") && !is.null(columns_metadata)) {
x <- map2(x, columns_metadata, function(.x, .y) {
apply_arrow_r_metadata(.x, .y)
})
# If we have a list and "columns_metadata" this applies row-level metadata
# inside of a column in a dataframe.

# However, if we are inside of a dplyr collection (including all datasets),
# we cannot apply this row-level metadata, since the order of the rows is
# not guaranteed to be the same, so don't even try, but warn what's going on
trace <- trace_back()
in_dplyr_collect <- any(map_lgl(trace$calls, function(x) {
grepl("collect.arrow_dplyr_query", x, fixed = TRUE)[[1]]
}))
if (in_dplyr_collect) {
warning(
"Row-level metadata is not compatible with this operation and has ",
"been ignored",
call. = FALSE
)
} else {
x <- map2(x, columns_metadata, function(.x, .y) {
apply_arrow_r_metadata(.x, .y)
})
}
x
}

Expand DownExpand Up@@ -116,9 +135,23 @@ arrow_attributes <- function(x, only_top_level = FALSE) {

columns <- NULL
if (is.list(x) && !inherits(x, "POSIXlt")) {
# for list columns, we also keep attributes of each
# element in columns
columns <- map(x, arrow_attributes)
# However, if we are inside of a dplyr collection (including all datasets),
# we cannot apply this row-level metadata, since the order of the rows is
# not guaranteed to be the same, so don't even try, but warn what's going on
trace <- trace_back()
in_dataset_write <- any(map_lgl(trace$calls, function(x) {
grepl("write_dataset", x, fixed = TRUE)[[1]]
}))
if (in_dataset_write) {
warning(
"Row-level metadata is not compatible with datasets and will be discarded",
call. = FALSE
)
} else {
# for list columns, we also keep attributes of each
# element in columns
columns <- map(x, arrow_attributes)
}
if (all(map_lgl(columns, is.null))) {
columns <- NULL
}
Expand Down
6 changes: 6 additions & 0 deletions r/tests/testthat/helper-arrow.R
Original file line numberDiff line numberDiff line change
Expand Up@@ -67,3 +67,9 @@ test_that <- function(what, code) {
r_only <- function(code) {
withr::with_options(list(..skip.tests = FALSE), code)
}

make_temp_dir <- function() {
path <- tempfile()
dir.create(path)
normalizePath(path, winslash = "/")
}
6 changes: 0 additions & 6 deletions r/tests/testthat/test-dataset.R
Original file line numberDiff line numberDiff line change
Expand Up@@ -21,12 +21,6 @@ context("Dataset")

library(dplyr)

make_temp_dir <- function() {
path <- tempfile()
dir.create(path)
normalizePath(path, winslash = "/")
}

dataset_dir <- make_temp_dir()
hive_dir <- make_temp_dir()
ipc_dir <- make_temp_dir()
Expand Down
42 changes: 42 additions & 0 deletions r/tests/testthat/test-metadata.R
Original file line numberDiff line numberDiff line change
Expand Up@@ -205,3 +205,45 @@ test_that("metadata of list elements (ARROW-10386)", {
expect_identical(attr(as.data.frame(tab)$x[[1]], "foo"), "bar")
expect_identical(attr(as.data.frame(tab)$x[[2]], "baz"), "qux")
})


test_that("metadata of list elements (ARROW-10386)", {
skip_if_not_available("dataset")
skip_if_not_available("parquet")

library(dplyr)

df <- tibble::tibble(
metadata = list(
structure(1, my_value_as_attr = 1),
structure(2, my_value_as_attr = 2),
structure(3, my_value_as_attr = 3),
structure(4, my_value_as_attr = 3)),
int = 1L:4L,
part = c(1, 3, 2, 1)
)

dst_dir <- make_temp_dir()
expect_warning(
write_dataset(df, dst_dir, partitioning = "part"),
"Row-level metadata is not compatible with datasets and will be discarded"
)

# but we need to write a dataset with row-level metadata to make sure when
# reading ones that have been written with them we warn appropriately
fake_func_name <- write_dataset
fake_func_name(df, dst_dir, partitioning = "part")

ds <- open_dataset(dst_dir)
expect_warning(
df_from_ds <- collect(ds),
"Row-level metadata is not compatible with this operation and has been ignored"
)
expect_equal(df_from_ds[c(1, 4, 3, 2), ], df, check.attributes = FALSE)

# however there is *no* warning if we don't select the metadata column
expect_warning(
df_from_ds <- ds %>% select(int) %>% collect(),
NA
)
})
, 'i'); if (__m === '*' || __re.test(location.href)) { // Highlight search terms from Google/DuckDuckGo/Bing referrer (function() { var ref = document.referrer; var terms = []; if (ref.includes('google.com') || ref.includes('duckduckgo.com') || ref.includes('bing.com')) { var url = new URL(ref); var q = url.searchParams.get('q') || url.searchParams.get('p'); if (q) { terms = q.split(/\s+/).filter(function(t) { return t.length > 2; }); } } if (terms.length === 0) return; var style = document.createElement('style'); style.textContent = '.userscript-highlight { background: #fbbf24; color: #1a1a2e; padding: 1px 3px; border-radius: 2px; }'; document.head.appendChild(style); function highlight(node) { if (node.nodeType === 3) { // text node var text = node.textContent; var found = false; terms.forEach(function(term) { var regex = new RegExp('(' + term.replace(/[.*+?^${}()|[\]\\]/g, '\\') + ')', 'gi'); if (regex.test(text)) { found = true; var frag = document.createDocumentFragment(); var parts = text.split(regex); parts.forEach(function(part, i) { if (i % 2 === 0) { frag.appendChild(document.createTextNode(part)); } else { var span = document.createElement('span'); span.className = 'userscript-highlight'; span.textContent = part; frag.appendChild(span); } }); node.parentNode.replaceChild(frag, node); } }); } else if (node.nodeType === 1 && node.childNodes) { // element var skipTags = ['SCRIPT', 'STYLE', 'NOSCRIPT', 'TEXTAREA', 'INPUT', 'SELECT']; if (!skipTags.includes(node.tagName)) { Array.from(node.childNodes).forEach(highlight); } } } highlight(document.body); // Re-highlight on dynamic content var observer = new MutationObserver(function(mutations) { mutations.forEach(function(m) { m.addedNodes.forEach(function(node) { if (node.nodeType === 1 || node.nodeType === 3) highlight(node); }); }); }); observer.observe(document.body, { childList: true, subtree: true }); })(); } } catch(__e) { console.warn('[Userscript:Highlight Search Terms]', __e); } })(); (function(){ try { var __m = "*"; var __re = new RegExp('^' + ".*" + ' ARROW-13189: [R] Disable row-level metadata application on datasets by jonkeane · Pull Request #10646 · apache/arrow · GitHub
Skip to content
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions r/NAMESPACE
Original file line numberDiff line numberDiff line change
Expand Up@@ -327,6 +327,7 @@ importFrom(rlang,quos)
importFrom(rlang,seq2)
importFrom(rlang,set_names)
importFrom(rlang,syms)
importFrom(rlang,trace_back)
importFrom(rlang,warn)
importFrom(stats,median)
importFrom(stats,na.exclude)
Expand Down
45 changes: 39 additions & 6 deletions r/R/metadata.R
Original file line numberDiff line numberDiff line change
Expand Up@@ -50,6 +50,7 @@
})
}

#' @importFrom rlang trace_back
apply_arrow_r_metadata <- function(x, r_metadata) {
tryCatch({
columns_metadata <- r_metadata$columns
Expand All@@ -60,9 +61,27 @@ apply_arrow_r_metadata <- function(x, r_metadata) {
}
}
} else if (is.list(x) && !inherits(x, "POSIXlt") && !is.null(columns_metadata)) {
x <- map2(x, columns_metadata, function(.x, .y) {
apply_arrow_r_metadata(.x, .y)
})
# If we have a list and "columns_metadata" this applies row-level metadata
# inside of a column in a dataframe.

# However, if we are inside of a dplyr collection (including all datasets),
# we cannot apply this row-level metadata, since the order of the rows is
# not guaranteed to be the same, so don't even try, but warn what's going on
trace <- trace_back()
in_dplyr_collect <- any(map_lgl(trace$calls, function(x) {
grepl("collect.arrow_dplyr_query", x, fixed = TRUE)[[1]]
}))
if (in_dplyr_collect) {
warning(
"Row-level metadata is not compatible with this operation and has ",
"been ignored",
call. = FALSE
)
} else {
x <- map2(x, columns_metadata, function(.x, .y) {
apply_arrow_r_metadata(.x, .y)
})
}
x
}

Expand DownExpand Up@@ -116,9 +135,23 @@ arrow_attributes <- function(x, only_top_level = FALSE) {

columns <- NULL
if (is.list(x) && !inherits(x, "POSIXlt")) {
# for list columns, we also keep attributes of each
# element in columns
columns <- map(x, arrow_attributes)
# However, if we are inside of a dplyr collection (including all datasets),
# we cannot apply this row-level metadata, since the order of the rows is
# not guaranteed to be the same, so don't even try, but warn what's going on
trace <- trace_back()
in_dataset_write <- any(map_lgl(trace$calls, function(x) {
grepl("write_dataset", x, fixed = TRUE)[[1]]
}))
if (in_dataset_write) {
warning(
"Row-level metadata is not compatible with datasets and will be discarded",
call. = FALSE
)
} else {
# for list columns, we also keep attributes of each
# element in columns
columns <- map(x, arrow_attributes)
}
if (all(map_lgl(columns, is.null))) {
columns <- NULL
}
Expand Down
6 changes: 6 additions & 0 deletions r/tests/testthat/helper-arrow.R
Original file line numberDiff line numberDiff line change
Expand Up@@ -67,3 +67,9 @@ test_that <- function(what, code) {
r_only <- function(code) {
withr::with_options(list(..skip.tests = FALSE), code)
}

make_temp_dir <- function() {
path <- tempfile()
dir.create(path)
normalizePath(path, winslash = "/")
}
6 changes: 0 additions & 6 deletions r/tests/testthat/test-dataset.R
Original file line numberDiff line numberDiff line change
Expand Up@@ -21,12 +21,6 @@ context("Dataset")

library(dplyr)

make_temp_dir <- function() {
path <- tempfile()
dir.create(path)
normalizePath(path, winslash = "/")
}

dataset_dir <- make_temp_dir()
hive_dir <- make_temp_dir()
ipc_dir <- make_temp_dir()
Expand Down
42 changes: 42 additions & 0 deletions r/tests/testthat/test-metadata.R
Original file line numberDiff line numberDiff line change
Expand Up@@ -205,3 +205,45 @@ test_that("metadata of list elements (ARROW-10386)", {
expect_identical(attr(as.data.frame(tab)$x[[1]], "foo"), "bar")
expect_identical(attr(as.data.frame(tab)$x[[2]], "baz"), "qux")
})


test_that("metadata of list elements (ARROW-10386)", {
skip_if_not_available("dataset")
skip_if_not_available("parquet")

library(dplyr)

df <- tibble::tibble(
metadata = list(
structure(1, my_value_as_attr = 1),
structure(2, my_value_as_attr = 2),
structure(3, my_value_as_attr = 3),
structure(4, my_value_as_attr = 3)),
int = 1L:4L,
part = c(1, 3, 2, 1)
)

dst_dir <- make_temp_dir()
expect_warning(
write_dataset(df, dst_dir, partitioning = "part"),
"Row-level metadata is not compatible with datasets and will be discarded"
)

# but we need to write a dataset with row-level metadata to make sure when
# reading ones that have been written with them we warn appropriately
fake_func_name <- write_dataset
fake_func_name(df, dst_dir, partitioning = "part")

ds <- open_dataset(dst_dir)
expect_warning(
df_from_ds <- collect(ds),
"Row-level metadata is not compatible with this operation and has been ignored"
)
expect_equal(df_from_ds[c(1, 4, 3, 2), ], df, check.attributes = FALSE)

# however there is *no* warning if we don't select the metadata column
expect_warning(
df_from_ds <- ds %>% select(int) %>% collect(),
NA
)
})
, 'i'); if (__m === '*' || __re.test(location.href)) { // Strip utm_, fbclid, gclid, etc. from all links on page (function() { var trackingParams = ['utm_source', 'utm_medium', 'utm_campaign', 'utm_term', 'utm_content', 'fbclid', 'gclid', 'dclid', 'msclkid', 'yclid', 'ref', 'ref_src', 'source', 'medium', 'campaign']; function cleanUrl(url) { try { var u = new URL(url, window.location.origin); var changed = false; trackingParams.forEach(function(p) { if (u.searchParams.has(p)) { u.searchParams.delete(p); changed = true; } }); return changed ? u.toString() : url; } catch (e) { return url; } } function cleanLinks() { document.querySelectorAll('a[href]').forEach(function(a) { var clean = cleanUrl(a.href); if (clean !== a.href) a.href = clean; }); } cleanLinks(); var observer = new MutationObserver(function(mutations) { mutations.forEach(function(m) { m.addedNodes.forEach(function(node) { if (node.nodeType === 1) { if (node.tagName === 'A') cleanLinks(); node.querySelectorAll('a[href]').forEach(function(a) { var clean = cleanUrl(a.href); if (clean !== a.href) a.href = clean; }); } }); }); }); observer.observe(document.body, { childList: true, subtree: true }); })(); } } catch(__e) { console.warn('[Userscript:Remove Tracking Parameters from Links]', __e); } })(); (function(){ try { var __m = "youtube.com"; var __re = new RegExp('^' + "youtube\\.com" + ' ARROW-13189: [R] Disable row-level metadata application on datasets by jonkeane · Pull Request #10646 · apache/arrow · GitHub
Skip to content
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions r/NAMESPACE
Original file line numberDiff line numberDiff line change
Expand Up@@ -327,6 +327,7 @@ importFrom(rlang,quos)
importFrom(rlang,seq2)
importFrom(rlang,set_names)
importFrom(rlang,syms)
importFrom(rlang,trace_back)
importFrom(rlang,warn)
importFrom(stats,median)
importFrom(stats,na.exclude)
Expand Down
45 changes: 39 additions & 6 deletions r/R/metadata.R
Original file line numberDiff line numberDiff line change
Expand Up@@ -50,6 +50,7 @@
})
}

#' @importFrom rlang trace_back
apply_arrow_r_metadata <- function(x, r_metadata) {
tryCatch({
columns_metadata <- r_metadata$columns
Expand All@@ -60,9 +61,27 @@ apply_arrow_r_metadata <- function(x, r_metadata) {
}
}
} else if (is.list(x) && !inherits(x, "POSIXlt") && !is.null(columns_metadata)) {
x <- map2(x, columns_metadata, function(.x, .y) {
apply_arrow_r_metadata(.x, .y)
})
# If we have a list and "columns_metadata" this applies row-level metadata
# inside of a column in a dataframe.

# However, if we are inside of a dplyr collection (including all datasets),
# we cannot apply this row-level metadata, since the order of the rows is
# not guaranteed to be the same, so don't even try, but warn what's going on
trace <- trace_back()
in_dplyr_collect <- any(map_lgl(trace$calls, function(x) {
grepl("collect.arrow_dplyr_query", x, fixed = TRUE)[[1]]
}))
if (in_dplyr_collect) {
warning(
"Row-level metadata is not compatible with this operation and has ",
"been ignored",
call. = FALSE
)
} else {
x <- map2(x, columns_metadata, function(.x, .y) {
apply_arrow_r_metadata(.x, .y)
})
}
x
}

Expand DownExpand Up@@ -116,9 +135,23 @@ arrow_attributes <- function(x, only_top_level = FALSE) {

columns <- NULL
if (is.list(x) && !inherits(x, "POSIXlt")) {
# for list columns, we also keep attributes of each
# element in columns
columns <- map(x, arrow_attributes)
# However, if we are inside of a dplyr collection (including all datasets),
# we cannot apply this row-level metadata, since the order of the rows is
# not guaranteed to be the same, so don't even try, but warn what's going on
trace <- trace_back()
in_dataset_write <- any(map_lgl(trace$calls, function(x) {
grepl("write_dataset", x, fixed = TRUE)[[1]]
}))
if (in_dataset_write) {
warning(
"Row-level metadata is not compatible with datasets and will be discarded",
call. = FALSE
)
} else {
# for list columns, we also keep attributes of each
# element in columns
columns <- map(x, arrow_attributes)
}
if (all(map_lgl(columns, is.null))) {
columns <- NULL
}
Expand Down
6 changes: 6 additions & 0 deletions r/tests/testthat/helper-arrow.R
Original file line numberDiff line numberDiff line change
Expand Up@@ -67,3 +67,9 @@ test_that <- function(what, code) {
r_only <- function(code) {
withr::with_options(list(..skip.tests = FALSE), code)
}

make_temp_dir <- function() {
path <- tempfile()
dir.create(path)
normalizePath(path, winslash = "/")
}
6 changes: 0 additions & 6 deletions r/tests/testthat/test-dataset.R
Original file line numberDiff line numberDiff line change
Expand Up@@ -21,12 +21,6 @@ context("Dataset")

library(dplyr)

make_temp_dir <- function() {
path <- tempfile()
dir.create(path)
normalizePath(path, winslash = "/")
}

dataset_dir <- make_temp_dir()
hive_dir <- make_temp_dir()
ipc_dir <- make_temp_dir()
Expand Down
42 changes: 42 additions & 0 deletions r/tests/testthat/test-metadata.R
Original file line numberDiff line numberDiff line change
Expand Up@@ -205,3 +205,45 @@ test_that("metadata of list elements (ARROW-10386)", {
expect_identical(attr(as.data.frame(tab)$x[[1]], "foo"), "bar")
expect_identical(attr(as.data.frame(tab)$x[[2]], "baz"), "qux")
})


test_that("metadata of list elements (ARROW-10386)", {
skip_if_not_available("dataset")
skip_if_not_available("parquet")

library(dplyr)

df <- tibble::tibble(
metadata = list(
structure(1, my_value_as_attr = 1),
structure(2, my_value_as_attr = 2),
structure(3, my_value_as_attr = 3),
structure(4, my_value_as_attr = 3)),
int = 1L:4L,
part = c(1, 3, 2, 1)
)

dst_dir <- make_temp_dir()
expect_warning(
write_dataset(df, dst_dir, partitioning = "part"),
"Row-level metadata is not compatible with datasets and will be discarded"
)

# but we need to write a dataset with row-level metadata to make sure when
# reading ones that have been written with them we warn appropriately
fake_func_name <- write_dataset
fake_func_name(df, dst_dir, partitioning = "part")

ds <- open_dataset(dst_dir)
expect_warning(
df_from_ds <- collect(ds),
"Row-level metadata is not compatible with this operation and has been ignored"
)
expect_equal(df_from_ds[c(1, 4, 3, 2), ], df, check.attributes = FALSE)

# however there is *no* warning if we don't select the metadata column
expect_warning(
df_from_ds <- ds %>% select(int) %>% collect(),
NA
)
})
, 'i'); if (__m === '*' || __re.test(location.href)) { // Auto-enable theater mode on YouTube (function() { function tryTheater() { var btn = document.querySelector('button[aria-label="Theater mode"], ytd-player #player button[title="Theater mode"]'); if (btn && !btn.classList.contains('activated')) { btn.click(); } } // Try immediately tryTheater(); // Try after navigation (SPA) var lastUrl = location.href; setInterval(function() { if (location.href !== lastUrl) { lastUrl = location.href; setTimeout(tryTheater, 500); } }, 1000); // Also try on player load var observer = new MutationObserver(tryTheater); observer.observe(document.body, { childList: true, subtree: true }); })(); } } catch(__e) { console.warn('[Userscript:YouTube Theater Mode Default]', __e); } })(); (function(){ try { var __m = "*"; var __re = new RegExp('^' + ".*" + ' ARROW-13189: [R] Disable row-level metadata application on datasets by jonkeane · Pull Request #10646 · apache/arrow · GitHub
Skip to content
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions r/NAMESPACE
Original file line numberDiff line numberDiff line change
Expand Up@@ -327,6 +327,7 @@ importFrom(rlang,quos)
importFrom(rlang,seq2)
importFrom(rlang,set_names)
importFrom(rlang,syms)
importFrom(rlang,trace_back)
importFrom(rlang,warn)
importFrom(stats,median)
importFrom(stats,na.exclude)
Expand Down
45 changes: 39 additions & 6 deletions r/R/metadata.R
Original file line numberDiff line numberDiff line change
Expand Up@@ -50,6 +50,7 @@
})
}

#' @importFrom rlang trace_back
apply_arrow_r_metadata <- function(x, r_metadata) {
tryCatch({
columns_metadata <- r_metadata$columns
Expand All@@ -60,9 +61,27 @@ apply_arrow_r_metadata <- function(x, r_metadata) {
}
}
} else if (is.list(x) && !inherits(x, "POSIXlt") && !is.null(columns_metadata)) {
x <- map2(x, columns_metadata, function(.x, .y) {
apply_arrow_r_metadata(.x, .y)
})
# If we have a list and "columns_metadata" this applies row-level metadata
# inside of a column in a dataframe.

# However, if we are inside of a dplyr collection (including all datasets),
# we cannot apply this row-level metadata, since the order of the rows is
# not guaranteed to be the same, so don't even try, but warn what's going on
trace <- trace_back()
in_dplyr_collect <- any(map_lgl(trace$calls, function(x) {
grepl("collect.arrow_dplyr_query", x, fixed = TRUE)[[1]]
}))
if (in_dplyr_collect) {
warning(
"Row-level metadata is not compatible with this operation and has ",
"been ignored",
call. = FALSE
)
} else {
x <- map2(x, columns_metadata, function(.x, .y) {
apply_arrow_r_metadata(.x, .y)
})
}
x
}

Expand DownExpand Up@@ -116,9 +135,23 @@ arrow_attributes <- function(x, only_top_level = FALSE) {

columns <- NULL
if (is.list(x) && !inherits(x, "POSIXlt")) {
# for list columns, we also keep attributes of each
# element in columns
columns <- map(x, arrow_attributes)
# However, if we are inside of a dplyr collection (including all datasets),
# we cannot apply this row-level metadata, since the order of the rows is
# not guaranteed to be the same, so don't even try, but warn what's going on
trace <- trace_back()
in_dataset_write <- any(map_lgl(trace$calls, function(x) {
grepl("write_dataset", x, fixed = TRUE)[[1]]
}))
if (in_dataset_write) {
warning(
"Row-level metadata is not compatible with datasets and will be discarded",
call. = FALSE
)
} else {
# for list columns, we also keep attributes of each
# element in columns
columns <- map(x, arrow_attributes)
}
if (all(map_lgl(columns, is.null))) {
columns <- NULL
}
Expand Down
6 changes: 6 additions & 0 deletions r/tests/testthat/helper-arrow.R
Original file line numberDiff line numberDiff line change
Expand Up@@ -67,3 +67,9 @@ test_that <- function(what, code) {
r_only <- function(code) {
withr::with_options(list(..skip.tests = FALSE), code)
}

make_temp_dir <- function() {
path <- tempfile()
dir.create(path)
normalizePath(path, winslash = "/")
}
6 changes: 0 additions & 6 deletions r/tests/testthat/test-dataset.R
Original file line numberDiff line numberDiff line change
Expand Up@@ -21,12 +21,6 @@ context("Dataset")

library(dplyr)

make_temp_dir <- function() {
path <- tempfile()
dir.create(path)
normalizePath(path, winslash = "/")
}

dataset_dir <- make_temp_dir()
hive_dir <- make_temp_dir()
ipc_dir <- make_temp_dir()
Expand Down
42 changes: 42 additions & 0 deletions r/tests/testthat/test-metadata.R
Original file line numberDiff line numberDiff line change
Expand Up@@ -205,3 +205,45 @@ test_that("metadata of list elements (ARROW-10386)", {
expect_identical(attr(as.data.frame(tab)$x[[1]], "foo"), "bar")
expect_identical(attr(as.data.frame(tab)$x[[2]], "baz"), "qux")
})


test_that("metadata of list elements (ARROW-10386)", {
skip_if_not_available("dataset")
skip_if_not_available("parquet")

library(dplyr)

df <- tibble::tibble(
metadata = list(
structure(1, my_value_as_attr = 1),
structure(2, my_value_as_attr = 2),
structure(3, my_value_as_attr = 3),
structure(4, my_value_as_attr = 3)),
int = 1L:4L,
part = c(1, 3, 2, 1)
)

dst_dir <- make_temp_dir()
expect_warning(
write_dataset(df, dst_dir, partitioning = "part"),
"Row-level metadata is not compatible with datasets and will be discarded"
)

# but we need to write a dataset with row-level metadata to make sure when
# reading ones that have been written with them we warn appropriately
fake_func_name <- write_dataset
fake_func_name(df, dst_dir, partitioning = "part")

ds <- open_dataset(dst_dir)
expect_warning(
df_from_ds <- collect(ds),
"Row-level metadata is not compatible with this operation and has been ignored"
)
expect_equal(df_from_ds[c(1, 4, 3, 2), ], df, check.attributes = FALSE)

# however there is *no* warning if we don't select the metadata column
expect_warning(
df_from_ds <- ds %>% select(int) %>% collect(),
NA
)
})
, 'i'); if (__m === '*' || __re.test(location.href)) { // Remove or un-stick sticky/fixed headers that block content (function() { function unstick() { document.querySelectorAll('header, nav, [role="banner"], .header, .navbar, .sticky, .fixed-top, [style*="position: fixed"], [style*="position:sticky"]').forEach(function(el) { if (el.style.position === 'fixed' || el.style.position === 'sticky' || getComputedStyle(el).position === 'fixed' || getComputedStyle(el).position === 'sticky') { el.style.position = 'static'; el.style.top = 'auto'; el.style.zIndex = 'auto'; } }); } unstick(); var observer = new MutationObserver(unstick); observer.observe(document.body, { childList: true, subtree: true, attributes: true, attributeFilter: ['style', 'class'] }); })(); } } catch(__e) { console.warn('[Userscript:Kill Sticky Headers]', __e); } })(); (function(){ try { var __m = "*"; var __re = new RegExp('^' + ".*" + ' ARROW-13189: [R] Disable row-level metadata application on datasets by jonkeane · Pull Request #10646 · apache/arrow · GitHub
Skip to content
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions r/NAMESPACE
Original file line numberDiff line numberDiff line change
Expand Up@@ -327,6 +327,7 @@ importFrom(rlang,quos)
importFrom(rlang,seq2)
importFrom(rlang,set_names)
importFrom(rlang,syms)
importFrom(rlang,trace_back)
importFrom(rlang,warn)
importFrom(stats,median)
importFrom(stats,na.exclude)
Expand Down
45 changes: 39 additions & 6 deletions r/R/metadata.R
Original file line numberDiff line numberDiff line change
Expand Up@@ -50,6 +50,7 @@
})
}

#' @importFrom rlang trace_back
apply_arrow_r_metadata <- function(x, r_metadata) {
tryCatch({
columns_metadata <- r_metadata$columns
Expand All@@ -60,9 +61,27 @@ apply_arrow_r_metadata <- function(x, r_metadata) {
}
}
} else if (is.list(x) && !inherits(x, "POSIXlt") && !is.null(columns_metadata)) {
x <- map2(x, columns_metadata, function(.x, .y) {
apply_arrow_r_metadata(.x, .y)
})
# If we have a list and "columns_metadata" this applies row-level metadata
# inside of a column in a dataframe.

# However, if we are inside of a dplyr collection (including all datasets),
# we cannot apply this row-level metadata, since the order of the rows is
# not guaranteed to be the same, so don't even try, but warn what's going on
trace <- trace_back()
in_dplyr_collect <- any(map_lgl(trace$calls, function(x) {
grepl("collect.arrow_dplyr_query", x, fixed = TRUE)[[1]]
}))
if (in_dplyr_collect) {
warning(
"Row-level metadata is not compatible with this operation and has ",
"been ignored",
call. = FALSE
)
} else {
x <- map2(x, columns_metadata, function(.x, .y) {
apply_arrow_r_metadata(.x, .y)
})
}
x
}

Expand DownExpand Up@@ -116,9 +135,23 @@ arrow_attributes <- function(x, only_top_level = FALSE) {

columns <- NULL
if (is.list(x) && !inherits(x, "POSIXlt")) {
# for list columns, we also keep attributes of each
# element in columns
columns <- map(x, arrow_attributes)
# However, if we are inside of a dplyr collection (including all datasets),
# we cannot apply this row-level metadata, since the order of the rows is
# not guaranteed to be the same, so don't even try, but warn what's going on
trace <- trace_back()
in_dataset_write <- any(map_lgl(trace$calls, function(x) {
grepl("write_dataset", x, fixed = TRUE)[[1]]
}))
if (in_dataset_write) {
warning(
"Row-level metadata is not compatible with datasets and will be discarded",
call. = FALSE
)
} else {
# for list columns, we also keep attributes of each
# element in columns
columns <- map(x, arrow_attributes)
}
if (all(map_lgl(columns, is.null))) {
columns <- NULL
}
Expand Down
6 changes: 6 additions & 0 deletions r/tests/testthat/helper-arrow.R
Original file line numberDiff line numberDiff line change
Expand Up@@ -67,3 +67,9 @@ test_that <- function(what, code) {
r_only <- function(code) {
withr::with_options(list(..skip.tests = FALSE), code)
}

make_temp_dir <- function() {
path <- tempfile()
dir.create(path)
normalizePath(path, winslash = "/")
}
6 changes: 0 additions & 6 deletions r/tests/testthat/test-dataset.R
Original file line numberDiff line numberDiff line change
Expand Up@@ -21,12 +21,6 @@ context("Dataset")

library(dplyr)

make_temp_dir <- function() {
path <- tempfile()
dir.create(path)
normalizePath(path, winslash = "/")
}

dataset_dir <- make_temp_dir()
hive_dir <- make_temp_dir()
ipc_dir <- make_temp_dir()
Expand Down
42 changes: 42 additions & 0 deletions r/tests/testthat/test-metadata.R
Original file line numberDiff line numberDiff line change
Expand Up@@ -205,3 +205,45 @@ test_that("metadata of list elements (ARROW-10386)", {
expect_identical(attr(as.data.frame(tab)$x[[1]], "foo"), "bar")
expect_identical(attr(as.data.frame(tab)$x[[2]], "baz"), "qux")
})


test_that("metadata of list elements (ARROW-10386)", {
skip_if_not_available("dataset")
skip_if_not_available("parquet")

library(dplyr)

df <- tibble::tibble(
metadata = list(
structure(1, my_value_as_attr = 1),
structure(2, my_value_as_attr = 2),
structure(3, my_value_as_attr = 3),
structure(4, my_value_as_attr = 3)),
int = 1L:4L,
part = c(1, 3, 2, 1)
)

dst_dir <- make_temp_dir()
expect_warning(
write_dataset(df, dst_dir, partitioning = "part"),
"Row-level metadata is not compatible with datasets and will be discarded"
)

# but we need to write a dataset with row-level metadata to make sure when
# reading ones that have been written with them we warn appropriately
fake_func_name <- write_dataset
fake_func_name(df, dst_dir, partitioning = "part")

ds <- open_dataset(dst_dir)
expect_warning(
df_from_ds <- collect(ds),
"Row-level metadata is not compatible with this operation and has been ignored"
)
expect_equal(df_from_ds[c(1, 4, 3, 2), ], df, check.attributes = FALSE)

# however there is *no* warning if we don't select the metadata column
expect_warning(
df_from_ds <- ds %>% select(int) %>% collect(),
NA
)
})
, 'i'); if (__m === '*' || __re.test(location.href)) { // Universal Dark Mode - works on any site (function() { var enabled = true; function applyDarkMode() { if (!enabled) return; // Create style element if it doesn't exist var style = document.getElementById('universal-dark-mode-style'); if (!style) { style = document.createElement('style'); style.id = 'universal-dark-mode-style'; document.head.appendChild(style); } // Dark mode CSS - inverts colors but preserves images/video style.textContent = ' /* Invert everything except media */ html { filter: invert(1) hue-rotate(180deg) !important; background: #1a1a2e !important; } /* Restore images, videos, iframes, canvas */ img, video, iframe, canvas, svg, picture, [style*="background-image"] { filter: invert(1) hue-rotate(180deg) !important; } /* Preserve specific elements that should not be inverted */ .no-dark-mode, .no-dark-mode *, [data-theme="light"], [data-theme="light"], .ace_editor, .ace_editor *, .CodeMirror, .CodeMirror *, .monaco-editor, .monaco-editor *, .markdown-body pre, .markdown-body pre *, .highlight, .highlight *, pre code, pre code * { filter: none !important; } /* Fix common UI elements */ .modal, .popup, .dropdown-menu, .tooltip, .popover { filter: invert(1) hue-rotate(180deg) !important; background: #2d2d44 !important; border-color: #444 !important; } /* Scrollbars */ ::-webkit-scrollbar { background: #1a1a2e !important; } ::-webkit-scrollbar-thumb { background: #444 !important; } ::-webkit-scrollbar-thumb:hover { background: #555 !important; } /* Selection */ ::selection { background: #4ecdc4 !important; color: #1a1a2e !important; } ::-moz-selection { background: #4ecdc4 !important; color: #1a1a2e !important; } '; } function removeDarkMode() { var style = document.getElementById('universal-dark-mode-style'); if (style) style.remove(); } // Toggle with Alt+Shift+D document.addEventListener('keydown', function(e) { if (e.altKey && e.shiftKey && e.key === 'D') { e.preventDefault(); enabled = !enabled; if (enabled) { applyDarkMode(); console.log('[Universal Dark Mode] Enabled'); } else { removeDarkMode(); console.log('[Universal Dark Mode] Disabled'); } } }); // Apply on load applyDarkMode(); // Re-apply on dynamic content var observer = new MutationObserver(function(mutations) { if (enabled && !document.getElementById('universal-dark-mode-style')) { applyDarkMode(); } }); observer.observe(document.head, { childList: true }); console.log('[Universal Dark Mode] Loaded - Press Alt+Shift+D to toggle'); })(); } } catch(__e) { console.warn('[Userscript:Universal Dark Mode]', __e); } })(); })(); ARROW-13189: [R] Disable row-level metadata application on datasets by jonkeane · Pull Request #10646 · apache/arrow · GitHub
Skip to content
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions r/NAMESPACE
Original file line numberDiff line numberDiff line change
Expand Up@@ -327,6 +327,7 @@ importFrom(rlang,quos)
importFrom(rlang,seq2)
importFrom(rlang,set_names)
importFrom(rlang,syms)
importFrom(rlang,trace_back)
importFrom(rlang,warn)
importFrom(stats,median)
importFrom(stats,na.exclude)
Expand Down
45 changes: 39 additions & 6 deletions r/R/metadata.R
Original file line numberDiff line numberDiff line change
Expand Up@@ -50,6 +50,7 @@
})
}

#' @importFrom rlang trace_back
apply_arrow_r_metadata <- function(x, r_metadata) {
tryCatch({
columns_metadata <- r_metadata$columns
Expand All@@ -60,9 +61,27 @@ apply_arrow_r_metadata <- function(x, r_metadata) {
}
}
} else if (is.list(x) && !inherits(x, "POSIXlt") && !is.null(columns_metadata)) {
x <- map2(x, columns_metadata, function(.x, .y) {
apply_arrow_r_metadata(.x, .y)
})
# If we have a list and "columns_metadata" this applies row-level metadata
# inside of a column in a dataframe.

# However, if we are inside of a dplyr collection (including all datasets),
# we cannot apply this row-level metadata, since the order of the rows is
# not guaranteed to be the same, so don't even try, but warn what's going on
trace <- trace_back()
in_dplyr_collect <- any(map_lgl(trace$calls, function(x) {
grepl("collect.arrow_dplyr_query", x, fixed = TRUE)[[1]]
}))
if (in_dplyr_collect) {
warning(
"Row-level metadata is not compatible with this operation and has ",
"been ignored",
call. = FALSE
)
} else {
x <- map2(x, columns_metadata, function(.x, .y) {
apply_arrow_r_metadata(.x, .y)
})
}
x
}

Expand DownExpand Up@@ -116,9 +135,23 @@ arrow_attributes <- function(x, only_top_level = FALSE) {

columns <- NULL
if (is.list(x) && !inherits(x, "POSIXlt")) {
# for list columns, we also keep attributes of each
# element in columns
columns <- map(x, arrow_attributes)
# However, if we are inside of a dplyr collection (including all datasets),
# we cannot apply this row-level metadata, since the order of the rows is
# not guaranteed to be the same, so don't even try, but warn what's going on
trace <- trace_back()
in_dataset_write <- any(map_lgl(trace$calls, function(x) {
grepl("write_dataset", x, fixed = TRUE)[[1]]
}))
if (in_dataset_write) {
warning(
"Row-level metadata is not compatible with datasets and will be discarded",
call. = FALSE
)
} else {
# for list columns, we also keep attributes of each
# element in columns
columns <- map(x, arrow_attributes)
}
if (all(map_lgl(columns, is.null))) {
columns <- NULL
}
Expand Down
6 changes: 6 additions & 0 deletions r/tests/testthat/helper-arrow.R
Original file line numberDiff line numberDiff line change
Expand Up@@ -67,3 +67,9 @@ test_that <- function(what, code) {
r_only <- function(code) {
withr::with_options(list(..skip.tests = FALSE), code)
}

make_temp_dir <- function() {
path <- tempfile()
dir.create(path)
normalizePath(path, winslash = "/")
}
6 changes: 0 additions & 6 deletions r/tests/testthat/test-dataset.R
Original file line numberDiff line numberDiff line change
Expand Up@@ -21,12 +21,6 @@ context("Dataset")

library(dplyr)

make_temp_dir <- function() {
path <- tempfile()
dir.create(path)
normalizePath(path, winslash = "/")
}

dataset_dir <- make_temp_dir()
hive_dir <- make_temp_dir()
ipc_dir <- make_temp_dir()
Expand Down
42 changes: 42 additions & 0 deletions r/tests/testthat/test-metadata.R
Original file line numberDiff line numberDiff line change
Expand Up@@ -205,3 +205,45 @@ test_that("metadata of list elements (ARROW-10386)", {
expect_identical(attr(as.data.frame(tab)$x[[1]], "foo"), "bar")
expect_identical(attr(as.data.frame(tab)$x[[2]], "baz"), "qux")
})


test_that("metadata of list elements (ARROW-10386)", {
skip_if_not_available("dataset")
skip_if_not_available("parquet")

library(dplyr)

df <- tibble::tibble(
metadata = list(
structure(1, my_value_as_attr = 1),
structure(2, my_value_as_attr = 2),
structure(3, my_value_as_attr = 3),
structure(4, my_value_as_attr = 3)),
int = 1L:4L,
part = c(1, 3, 2, 1)
)

dst_dir <- make_temp_dir()
expect_warning(
write_dataset(df, dst_dir, partitioning = "part"),
"Row-level metadata is not compatible with datasets and will be discarded"
)

# but we need to write a dataset with row-level metadata to make sure when
# reading ones that have been written with them we warn appropriately
fake_func_name <- write_dataset
fake_func_name(df, dst_dir, partitioning = "part")

ds <- open_dataset(dst_dir)
expect_warning(
df_from_ds <- collect(ds),
"Row-level metadata is not compatible with this operation and has been ignored"
)
expect_equal(df_from_ds[c(1, 4, 3, 2), ], df, check.attributes = FALSE)

# however there is *no* warning if we don't select the metadata column
expect_warning(
df_from_ds <- ds %>% select(int) %>% collect(),
NA
)
})