Merge branch 'main' into prerelease

sfu-db · Sep 8, 2023 · f268e71 · f268e71
2 parents 8347fd0 + 3075e5f
commit f268e71
Show file tree

Hide file tree

Showing 11 changed files with 28 additions and 27 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/connectorx-cpp/Cargo.toml b/connectorx-cpp/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "connectorx-cpp"
-version = "0.3.2"
+version = "0.3.3-alpha.1"
 edition = "2021"
 license = "MIT"
 

diff --git a/connectorx-python/Cargo.lock b/connectorx-python/Cargo.lock
diff --git a/connectorx-python/Cargo.toml b/connectorx-python/Cargo.toml
@@ -2,7 +2,7 @@
 authors = ["Weiyuan Wu <[email protected]>"]
 edition = "2018"
 name = "connectorx-python"
-version = "0.3.2"
+version = "0.3.3-alpha.1"
 license = "MIT"
 readme = "README.md"
 
@@ -27,12 +27,12 @@ lazy_static = "1.4.0"
 libc = "0.2"
 log = "0.4"
 ndarray = "0.15"
-numpy = "0.14"
+numpy = "0.15"
 openssl = {version = "0.10", features = ["vendored"]}
 postgres = {version = "0.19", features = ["with-chrono-0_4", "with-uuid-0_8", "with-serde_json-1"]}
 postgres-native-tls = {version = "0.5"}
 postgres-openssl = {version = "0.5.0"}
-pyo3 = {version = "0.14", default-features = false, features = ["macros"]}
+pyo3 = {version = "0.15", default-features = false, features = ["macros"]}
 pyo3-built = "0.4"
 rust_decimal = {version = "1", features = ["db-postgres"]}
 serde_json = "1"

diff --git a/connectorx-python/pyproject.toml b/connectorx-python/pyproject.toml
@@ -18,12 +18,13 @@ license = "MIT"
 maintainers = ["Weiyuan Wu <[email protected]>"] 
 name = "connectorx" 
 readme = "README.md" # Markdown files are supported
-version = "0.3.2" 
+version = "0.3.3-alpha.1" 
 
 [project]
 name = "connectorx" # Target file name of maturin build
 readme = "README.md"
 license = { text = "MIT" }
+requires-python = ">=3.8"
 
 [tool.poetry.dependencies]
 dask = {version = "^2021", optional = true, extras = ["dataframe"]}

diff --git a/connectorx-python/src/pandas/pandas_columns/array.rs b/connectorx-python/src/pandas/pandas_columns/array.rs
@@ -13,7 +13,7 @@ use std::marker::PhantomData;
 pub struct PyList(Py<pyo3::types::PyList>);
 
 // In order to put it into a numpy array
-impl Element for PyList {
+unsafe impl Element for PyList {
     const DATA_TYPE: numpy::DataType = numpy::DataType::Object;
     fn is_same_type(dtype: &PyArrayDescr) -> bool {
         unsafe { *dtype.as_dtype_ptr() }.type_num == NPY_TYPES::NPY_OBJECT as i32

diff --git a/connectorx-python/src/pandas/pandas_columns/boolean.rs b/connectorx-python/src/pandas/pandas_columns/boolean.rs
@@ -22,8 +22,8 @@ impl<'a> FromPyObject<'a> for BooleanBlock<'a> {
         } else {
             // if extension array
             let tuple = ob.downcast::<PyTuple>()?;
-            let data = tuple.get_item(0);
-            let mask = tuple.get_item(1);
+            let data = tuple.get_item(0)?;
+            let mask = tuple.get_item(1)?;
             check_dtype(data, "bool")?;
             check_dtype(mask, "bool")?;
 

diff --git a/connectorx-python/src/pandas/pandas_columns/bytes.rs b/connectorx-python/src/pandas/pandas_columns/bytes.rs
@@ -12,7 +12,7 @@ use std::any::TypeId;
 pub struct PyBytes(Py<pyo3::types::PyBytes>);
 
 // In order to put it into a numpy array
-impl Element for PyBytes {
+unsafe impl Element for PyBytes {
     const DATA_TYPE: numpy::DataType = numpy::DataType::Object;
     fn is_same_type(dtype: &PyArrayDescr) -> bool {
         unsafe { *dtype.as_dtype_ptr() }.type_num == NPY_TYPES::NPY_OBJECT as i32

diff --git a/connectorx-python/src/pandas/pandas_columns/int64.rs b/connectorx-python/src/pandas/pandas_columns/int64.rs
@@ -19,8 +19,8 @@ impl<'a> FromPyObject<'a> for Int64Block<'a> {
             Ok(Int64Block::NumPy(data))
         } else {
             let tuple = ob.downcast::<PyTuple>()?;
-            let data = tuple.get_item(0);
-            let mask = tuple.get_item(1);
+            let data = tuple.get_item(0)?;
+            let mask = tuple.get_item(1)?;
             check_dtype(data, "int64")?;
             check_dtype(mask, "bool")?;
 

diff --git a/connectorx-python/src/pandas/pystring.rs b/connectorx-python/src/pandas/pystring.rs
@@ -8,7 +8,7 @@ use std::str::from_utf8_unchecked;
 pub struct PyString(Py<pyo3::types::PyString>);
 
 // In order to put it into a numpy array
-impl Element for PyString {
+unsafe impl Element for PyString {
     const DATA_TYPE: numpy::DataType = numpy::DataType::Object;
     fn is_same_type(dtype: &PyArrayDescr) -> bool {
         unsafe { *dtype.as_dtype_ptr() }.type_num == NPY_TYPES::NPY_OBJECT as i32

diff --git a/connectorx/Cargo.toml b/connectorx/Cargo.toml
@@ -7,7 +7,7 @@ license = "MIT"
 name = "connectorx"
 readme = "../README.md"
 repository = "https://github.com/sfu-db/connector-x"
-version = "0.3.2"
+version = "0.3.3-alpha.1"
 
 [dependencies]
 anyhow = "1"