This is an automated email from the ASF dual-hosted git repository.
paleolimbot pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/arrow-adbc.git
The following commit(s) were added to refs/heads/main by this push:
new f44c9331 fix(r/adbcdrivermanager): Fix tests to avoid moving an
external pointer with dependents (#1167)
f44c9331 is described below
commit f44c9331eab9475bd82e1a70e41ad5d0ab292a69
Author: Dewey Dunnington <[email protected]>
AuthorDate: Thu Oct 5 16:10:21 2023 -0300
fix(r/adbcdrivermanager): Fix tests to avoid moving an external pointer
with dependents (#1167)
Closes #1161.
When we implement dependent reverse-reference counting (#1128), we can
avoid a user accidentally ending up in this situation by prohibiting
`adbc_xptr_move()` when the number of dependents is greater than 0.
---
r/adbcdrivermanager/tests/testthat/test-utils.R | 21 ++++++++++++++-------
1 file changed, 14 insertions(+), 7 deletions(-)
diff --git a/r/adbcdrivermanager/tests/testthat/test-utils.R
b/r/adbcdrivermanager/tests/testthat/test-utils.R
index 3c46c489..739f6c27 100644
--- a/r/adbcdrivermanager/tests/testthat/test-utils.R
+++ b/r/adbcdrivermanager/tests/testthat/test-utils.R
@@ -61,24 +61,31 @@ test_that("external pointer embedded environment works", {
test_that("pointer mover leaves behind an invalid external pointer", {
db <- adbc_database_init(adbc_driver_void())
- con <- adbc_connection_init(db)
- stmt <- adbc_statement_init(con)
-
expect_true(adbc_xptr_is_valid(db))
- expect_true(adbc_xptr_is_valid(adbc_xptr_move(db)))
+
+ db2 <- adbc_xptr_move(db)
+ expect_true(adbc_xptr_is_valid(db2))
expect_false(adbc_xptr_is_valid(db))
+ con <- adbc_connection_init(db2)
expect_true(adbc_xptr_is_valid(con))
- expect_true(adbc_xptr_is_valid(adbc_xptr_move(con)))
+
+ con2 <- adbc_xptr_move(con)
+ expect_true(adbc_xptr_is_valid(con2))
expect_false(adbc_xptr_is_valid(con))
+ stmt <- adbc_statement_init(con2)
expect_true(adbc_xptr_is_valid(stmt))
- expect_true(adbc_xptr_is_valid(adbc_xptr_move(stmt)))
+
+ stmt2 <- adbc_xptr_move(stmt)
+ expect_true(adbc_xptr_is_valid(stmt2))
expect_false(adbc_xptr_is_valid(stmt))
stream <- nanoarrow::basic_array_stream(list(1:5))
expect_true(adbc_xptr_is_valid(stream))
- expect_true(adbc_xptr_is_valid(adbc_xptr_move(stream)))
+
+ stream2 <- adbc_xptr_move(stream)
+ expect_true(adbc_xptr_is_valid(stream2))
expect_false(adbc_xptr_is_valid(stream))
})
