Merge branch 'apache:main' into main

Author: jiayuasu

Cargo.lock

@@ -20,6 +20,8 @@
 # SedonaDB
 
 [![PyPI Version](https://img.shields.io/pypi/v/sedonadb)](https://pypi.org/project/sedonadb/) [![PyPI - Downloads](https://img.shields.io/pypi/dm/sedonadb)](https://pepy.tech/project/sedonadb) [![Downloads](https://static.pepy.tech/personalized-badge/sedonadb?period=total&units=international_system&left_color=black&right_color=brightgreen&left_text=total%20downloads)](https://pepy.tech/project/sedonadb)
+[![Anaconda Version](
+https://anaconda.org/conda-forge/sedonadb/badges/version.svg)](https://anaconda.org/conda-forge/sedonadb) [![Conda Downloads](https://anaconda.org/conda-forge/sedonadb/badges/downloads.svg)](https://anaconda.org/channels/conda-forge/packages/sedonadb/overview)
 
 SedonaDB is an open-source single-node analytical database engine with **geospatial as a first-class citizen**. It aims to deliver the fastest spatial analytics query speed and the most comprehensive function coverage available.
 
@@ -70,12 +72,18 @@ This is a performance benchmark comparing SedonaDB 0.1.0, DuckDB 1.4.0, and GeoP
 
 ## Install
 
-You can install Python SedonaDB with PyPI:
+You can install Python SedonaDB with [PyPI](https://packaging.python.org/en/latest/tutorials/installing-packages/):
 
 ```sh
 pip install "apache-sedona[db]"
 ```
 
+Or with [conda](https://www.anaconda.com/docs/getting-started/main):
+
+```sh
+conda install sedonadb
+```
+
 ## Quick Start
 
 Get started with SedonaDB in just a few lines:

README.md

@@ -40,6 +40,16 @@
     "```"
    ]
   },
+  {
+   "metadata": {},
+   "cell_type": "markdown",
+   "source": [
+    "```sh\n",
+    "conda install sedonadb\n",
+    "```"
+   ],
+   "id": "bd40492cc22ae6ed"
+  },
   {
    "cell_type": "markdown",
    "id": "293d4bc4",

docs/quickstart-python.ipynb

@@ -27,6 +27,10 @@ First, install SedonaDB:
 pip install "apache-sedona[db]"
 ```
 
+```sh
+conda install sedonadb
+```
+
 If the import and connection are successful, your installation is complete.
 
 

docs/quickstart-python.md

@@ -29,6 +29,12 @@ SedonaDB for Python can be installed from [PyPI](https://pypi.org):
 pip install "apache-sedona[db]"
 ```
 
+Or with [conda](https://www.anaconda.com/docs/getting-started/main):
+
+```sh
+conda install sedonadb
+```
+
 ## Example
 
 ```python

python/sedonadb/README.md

@@ -23,7 +23,8 @@ use adbc_core::{
     options::{InfoCode, ObjectDepth},
     Connection,
 };
-use sedona::{context::SedonaContext, reader::SedonaStreamReader};
+use arrow_array::RecordBatchReader;
+use sedona::context::SedonaContext;
 use std::sync::Arc;
 use tokio::runtime::Runtime;
 
@@ -129,7 +130,7 @@ impl Connection for SedonaConnection {
     fn get_info(
         &self,
         _codes: Option<std::collections::HashSet<InfoCode>>,
-    ) -> Result<SedonaStreamReader> {
+    ) -> Result<Box<dyn RecordBatchReader + Send + 'static>> {
         err_not_implemented!()
     }
 
@@ -141,7 +142,7 @@ impl Connection for SedonaConnection {
         _table_name: Option<&str>,
         _table_type: Option<Vec<&str>>,
         _column_name: Option<&str>,
-    ) -> Result<SedonaStreamReader> {
+    ) -> Result<Box<dyn RecordBatchReader + Send + 'static>> {
         err_not_implemented!()
     }
 
@@ -154,11 +155,11 @@ impl Connection for SedonaConnection {
         err_not_implemented!()
     }
 
-    fn get_table_types(&self) -> Result<SedonaStreamReader> {
+    fn get_table_types(&self) -> Result<Box<dyn RecordBatchReader + Send + 'static>> {
         err_not_implemented!()
     }
 
-    fn get_statistic_names(&self) -> Result<SedonaStreamReader> {
+    fn get_statistic_names(&self) -> Result<Box<dyn RecordBatchReader + Send + 'static>> {
         err_not_implemented!()
     }
 
@@ -168,7 +169,7 @@ impl Connection for SedonaConnection {
         _db_schema: Option<&str>,
         _table_name: Option<&str>,
         _approximate: bool,
-    ) -> Result<SedonaStreamReader> {
+    ) -> Result<Box<dyn RecordBatchReader + Send + 'static>> {
         err_not_implemented!()
     }
 
@@ -180,7 +181,10 @@ impl Connection for SedonaConnection {
         err_not_implemented!()
     }
 
-    fn read_partition(&self, _partition: impl AsRef<[u8]>) -> Result<SedonaStreamReader> {
+    fn read_partition(
+        &self,
+        _partition: impl AsRef<[u8]>,
+    ) -> Result<Box<dyn RecordBatchReader + Send + 'static>> {
         err_not_implemented!()
     }
 }

rust/sedona-adbc/src/connection.rs

@@ -93,12 +93,15 @@ impl Statement for SedonaStatement {
         }
     }
 
-    fn execute(&mut self) -> Result<impl RecordBatchReader + Send> {
+    fn execute(&mut self) -> Result<Box<dyn RecordBatchReader + Send + 'static>> {
         if let Some(query) = self.sql_query.clone() {
             self.runtime.block_on(async {
                 let df = self.ctx.sql(&query).await.map_err(from_datafusion_error)?;
                 let stream = df.execute_stream().await.map_err(from_datafusion_error)?;
-                Ok(SedonaStreamReader::new(self.runtime.clone(), stream))
+                Ok(
+                    Box::new(SedonaStreamReader::new(self.runtime.clone(), stream))
+                        as Box<dyn RecordBatchReader + Send + 'static>,
+                )
             })
         } else {
             Err(Error::with_message_and_status(