ok nvm then

Signed-off-by: Andrew Duffy <[email protected]>

Author: a10y

vortex-duckdb/src/copy.rs

@@ -128,11 +128,7 @@ impl CopyFunction for VortexCopyFunction {
         let handle = SESSION.handle();
         let write_task = handle.spawn(async move {
             let mut file = async_fs::File::create(file_path).await?;
-            SESSION
-                .write_options()
-                .write(&mut file, array_stream)
-                .await
-                .map(|(summary, _)| summary)
+            SESSION.write_options().write(&mut file, array_stream).await
         });
 
         let worker_pool = RUNTIME.new_pool();

vortex-file/src/writer.rs

@@ -128,7 +128,7 @@ impl VortexWriteOptions {
         self,
         write: W,
         stream: S,
-    ) -> VortexResult<(WriteSummary, W)> {
+    ) -> VortexResult<WriteSummary> {
         self.write_internal(write, ArrayStreamExt::boxed(stream))
             .await
     }
@@ -137,7 +137,7 @@ impl VortexWriteOptions {
         self,
         mut write: W,
         stream: SendableArrayStream,
-    ) -> VortexResult<(WriteSummary, W)> {
+    ) -> VortexResult<WriteSummary> {
         // Set up a Context to capture the encodings used in the file.
         let ctx = ArrayContext::empty();
         let dtype = stream.dtype().clone();
@@ -216,13 +216,10 @@ impl VortexWriteOptions {
 
         write.flush().await?;
 
-        Ok((
-            WriteSummary {
-                footer,
-                size: position,
-            },
-            write,
-        ))
+        Ok(WriteSummary {
+            footer,
+            size: position,
+        })
     }
 
     /// Create a push-based [`Writer`] that can be used to incrementally write arrays to the file.
@@ -236,11 +233,7 @@ impl VortexWriteOptions {
         let write = CountingVortexWrite::new(write);
         let bytes_written = write.counter();
         let strategy = self.strategy.clone();
-        let future = self
-            .write(write, arrays)
-            .map(move |result| result.map(|(summary, _writer)| summary))
-            .boxed_local()
-            .fuse();
+        let future = self.write(write, arrays).boxed_local().fuse();
 
         Writer {
             arrays: Some(arrays_send),
@@ -377,13 +370,11 @@ impl<'rt, B: BlockingRuntime> BlockingWrite<'rt, B> {
         write: W,
         iter: impl ArrayIterator + Send + 'static,
     ) -> VortexResult<WriteSummary> {
-        self.runtime
-            .block_on(async move {
-                self.options
-                    .write(BlockingWriteAdapter(write), iter.into_array_stream())
-                    .await
-            })
-            .map(|(summary, _)| summary)
+        self.runtime.block_on(async move {
+            self.options
+                .write(BlockingWriteAdapter(write), iter.into_array_stream())
+                .await
+        })
     }
 
     pub fn writer<'w, W: Write + Unpin + 'w>(

vortex-file/tests/test_write_table.rs

@@ -77,11 +77,11 @@ async fn test_file_roundtrip() {
             .set_field_writer(field_path!(a.raw), Arc::new(FlatLayoutStrategy::default())),
     );
 
-    let bytes = Vec::new();
-    let (_, bytes) = SESSION
+    let mut bytes = Vec::new();
+    SESSION
         .write_options()
         .with_strategy(writer)
-        .write(bytes, data.to_array_stream())
+        .write(&mut bytes, data.to_array_stream())
         .await
         .expect("write");
 

vortex-jni/src/writer.rs

@@ -176,8 +176,8 @@ pub extern "system" fn Java_dev_vortex_jni_NativeWriterMethods_create(
 
         let (store, _scheme) = make_object_store(&url, &properties)?;
         let write_handle = SESSION.handle().spawn(async move {
-            let write = ObjectStoreWriter::new(store, &path).await?;
-            let (summary, mut write) = SESSION.write_options().write(write, w).await?;
+            let mut write = ObjectStoreWriter::new(store, &path).await?;
+            let summary = SESSION.write_options().write(&mut write, w).await?;
             write.shutdown().await?;
             Ok(summary)
         });