eitsupi · eitsupi · May 27, 2024 · May 27, 2024 · May 27, 2024
diff --git a/.devcontainer/devcontainer.json b/.devcontainer/devcontainer.json
@@ -7,7 +7,8 @@
 		"ghcr.io/devcontainers-contrib/features/protoc:1": {},
 		"ghcr.io/rocker-org/devcontainer-features/r-dependent-packages": {
 			"when": "updateContent",
-			"additionalRepositories": "polars = 'https://rpolars.r-universe.dev'"
+			"additionalRepositories": "polars = 'https://rpolars.r-universe.dev'",
+			"dependencyTypes": "all,Config/Needs/dev,Config/Needs/website"
 		},
 		"ghcr.io/eitsupi/devcontainer-features/go-task:1": {}
 	},

diff --git a/DESCRIPTION b/DESCRIPTION
@@ -37,4 +37,4 @@ Config/Needs/dev:
 Config/Needs/website:
     pkgdown
 Config/testthat/edition: 3
-Config/glaredb/LibVersion: 0.0.1
+Config/glaredb/LibVersion: 0.0.2
diff --git a/R/as-external-class.R b/R/as-external-class.R
@@ -9,7 +9,7 @@ as_nanoarrow_array_stream.RGlareDbTable <- function(x, ..., schema = NULL) {
   }
 
   stream <- nanoarrow_allocate_array_stream()
-  x$export_stream(nanoarrow_pointer_addr_chr(stream))
+  x$export_stream(stream)
 
   stream
 }

diff --git a/Taskfile.yml b/Taskfile.yml
@@ -2,7 +2,7 @@ version: "3"
 
 env:
   NOT_CRAN: "true"
-  LIBR_GLAREDB: "false"
+  LIBR_GLAREDB_BUILD: "true"
   DEBUG: "true"
 
 vars:

diff --git a/src/rust/Cargo.lock b/src/rust/Cargo.lock
diff --git a/src/rust/Cargo.toml b/src/rust/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "r-glaredb"
-version = "0.0.1"
+version = "0.0.2"
 edition = "2021"
 publish = false
 

diff --git a/src/rust/src/table.rs b/src/rust/src/table.rs
@@ -45,9 +45,11 @@ impl RGlareDbTable {
         Ok(RGlareDbTable { schema, batches })
     }
 
-    pub fn export_stream(&self, stream_ptr: &str) -> savvy::Result<()> {
-        let stream_ptr: usize = stream_ptr.parse().unwrap();
-        let stream_out = stream_ptr as *mut FFI_ArrowArrayStream;
+    pub fn export_stream(&self, stream_ptr: savvy::Sexp) -> savvy::Result<()> {
+        let stream_out = unsafe {
+            savvy::ExternalPointerSexp::try_from(stream_ptr)?
+                .cast_mut_unchecked::<FFI_ArrowArrayStream>()
+        };
 
         let reader = arrow::record_batch::RecordBatchIterator::new(
             self.batches.clone().into_iter().map(Ok),

diff --git a/tools/lib-sums.tsv b/tools/lib-sums.tsv
-Original file line number
+Diff line change
@@ Expand Up @@
       }
       stream <- nanoarrow_allocate_array_stream()
-      x$export_stream(nanoarrow_pointer_addr_chr(stream))
+      x$export_stream(stream)
       stream
     }
@@ Expand Down @@