changes: re-export non_blocking mod, blocking mod for sync traits, add sync wrappers

Signed-off-by: if0ne <[email protected]>

Author: if0ne

rust/core/src/blocking.rs

@@ -0,0 +1,26 @@
+// Licensed to the Apache Software Foundation (ASF) under one
+// or more contributor license agreements.  See the NOTICE file
+// distributed with this work for additional information
+// regarding copyright ownership.  The ASF licenses this file
+// to you under the Apache License, Version 2.0 (the
+// "License"); you may not use this file except in compliance
+// with the License.  You may obtain a copy of the License at
+//
+//   http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing,
+// software distributed under the License is distributed on an
+// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+// KIND, either express or implied.  See the License for the
+// specific language governing permissions and limitations
+// under the License.
+
+use std::{fmt::Debug, future::Future};
+
+pub trait AsyncExecutor: Sized {
+    type Config: Default;
+    type Error: Debug;
+
+    fn new(config: Self::Config) -> Result<Self, Self::Error>;
+    fn block_on<F: Future>(&self, future: F) -> F::Output;
+}

rust/core/src/executor.rs

@@ -22,7 +22,21 @@ use std::collections::HashSet;
 
 use crate::error::Result;
 use crate::options::{self, *};
-use crate::PartitionedResult;
+
+/// Each data partition is described by an opaque byte array and can be
+/// retrieved with [Connection::read_partition].
+pub type Partitions = Vec<Vec<u8>>;
+
+/// A partitioned result set as returned by [Statement::execute_partitions].
+#[derive(Debug, PartialEq, Eq)]
+pub struct PartitionedResult {
+    /// The result partitions.
+    pub partitions: Partitions,
+    /// The schema of the result set.
+    pub schema: Schema,
+    /// The number of rows affected if known, else -1.
+    pub rows_affected: i64,
+}
 
 /// Ability to configure an object by setting/getting options.
 #[trait_variant::make(AsyncOptionable: Send)]
@@ -362,7 +376,10 @@ pub trait LocalAsyncConnection: LocalAsyncOptionable<Option = OptionConnection>
     /// # Arguments
     ///
     /// - `partition` - The partition descriptor.
-    async fn read_partition(&self, partition: &[u8]) -> Result<impl RecordBatchReader + Send>;
+    async fn read_partition(
+        &self,
+        partition: &[u8],
+    ) -> Result<impl RecordBatchReader + Send + 'static>;
 }
 
 /// A handle to an async ADBC statement.

rust/core/src/lib.rs

@@ -16,8 +16,7 @@
 // under the License.
 #![allow(refining_impl_trait)]
 
-mod syncify;
-
+use adbc_core::executor::AsyncExecutor;
 use adbc_core::non_blocking::{
     AsyncConnection, AsyncDatabase, AsyncDriver, AsyncStatement, LocalAsyncOptionable,
 };
@@ -950,5 +949,26 @@ impl AsyncStatement for DataFusionStatement {
     }
 }
 
+pub struct TokioRuntime(tokio::runtime::Runtime);
+
+impl AsyncExecutor for TokioRuntime {
+    type Config = ();
+    type Error = std::io::Error;
+
+    fn new(_: Self::Config) -> std::result::Result<Self, Self::Error> {
+        tokio::runtime::Builder::new_multi_thread()
+            .enable_all()
+            .build()
+            .map(TokioRuntime)
+    }
+
+    fn block_on<F: Future>(&self, future: F) -> F::Output {
+        self.0.block_on(future)
+    }
+}
+
 #[cfg(feature = "ffi")]
-adbc_ffi::export_driver!(DataFusionDriverInit, crate::syncify::SyncDataFusionDriver);
+adbc_ffi::export_driver!(
+    DataFusionDriverInit,
+    adbc_core::blocking::SyncDriverWrapper::<TokioRuntime, DataFusionDriver>
+);