fix warnings

sfu-db · Jan 22, 2025 · d880fb7 · d880fb7
1 parent ce973e5
commit d880fb7
Show file tree

Hide file tree

Showing 9 changed files with 21 additions and 34 deletions.
diff --git a/connectorx-python/Cargo.lock b/connectorx-python/Cargo.lock
diff --git a/connectorx-python/src/lib.rs b/connectorx-python/src/lib.rs
@@ -40,6 +40,7 @@ fn connectorx(_: Python, m: &Bound<'_, PyModule>) -> PyResult<()> {
 }
 
 #[pyfunction]
+#[pyo3(signature = (conn, return_type, protocol=None, queries=None, partition_query=None))]
 pub fn read_sql<'py>(
     py: Python<'py>,
     conn: &str,
@@ -64,6 +65,7 @@ pub fn partition_sql(
 }
 
 #[pyfunction]
+#[pyo3(signature = (sql, db_map, strategy=None))]
 pub fn read_sql2<'py>(
     py: Python<'py>,
     sql: &str,
@@ -87,6 +89,7 @@ pub fn read_sql2<'py>(
 }
 
 #[pyfunction]
+#[pyo3(signature = (conn, query, protocol=None))]
 pub fn get_meta<'py>(
     py: Python<'py>,
     conn: &str,

diff --git a/connectorx-python/src/pandas/pandas_columns/array.rs b/connectorx-python/src/pandas/pandas_columns/array.rs
@@ -58,7 +58,7 @@ impl<'a, V> ArrayBlock<'a, V> {
             view = rest;
             ret.push(ArrayColumn::<V> {
                 data: col
-                    .into_shape(nrows)?
+                    .into_shape_with_order(nrows)?
                     .into_slice()
                     .ok_or_else(|| anyhow!("get None for splitted FloatArray data"))?
                     .as_mut_ptr(),

diff --git a/connectorx-python/src/pandas/pandas_columns/boolean.rs b/connectorx-python/src/pandas/pandas_columns/boolean.rs
@@ -28,8 +28,8 @@ impl<'a> ExtractBlockFromBound<'a> for BooleanBlock<'a> {
         } else {
             // if extension array
             let tuple = ob.downcast::<PyTuple>()?;
-            let data = tuple.as_slice().get(0).unwrap();
-            let mask = tuple.as_slice().get(1).unwrap();
+            let data = &tuple.as_slice()[0];
+            let mask = &tuple.as_slice()[1];
             check_dtype(data, "bool")?;
             check_dtype(mask, "bool")?;
 
@@ -64,7 +64,7 @@ impl<'a> BooleanBlock<'a> {
                     view = rest;
                     ret.push(BooleanColumn {
                         data: col
-                            .into_shape(nrows)?
+                            .into_shape_with_order(nrows)?
                             .into_slice()
                             .ok_or_else(|| anyhow!("get None for splitted Boolean data"))?
                             .as_mut_ptr(),

diff --git a/connectorx-python/src/pandas/pandas_columns/bytes.rs b/connectorx-python/src/pandas/pandas_columns/bytes.rs
@@ -55,7 +55,7 @@ impl<'a> BytesBlock<'a> {
             view = rest;
             ret.push(BytesColumn {
                 data: col
-                    .into_shape(nrows)?
+                    .into_shape_with_order(nrows)?
                     .into_slice()
                     .ok_or_else(|| anyhow!("get None for splitted String data"))?
                     .as_mut_ptr(),

diff --git a/connectorx-python/src/pandas/pandas_columns/datetime.rs b/connectorx-python/src/pandas/pandas_columns/datetime.rs
@@ -37,7 +37,7 @@ impl<'a> DateTimeBlock<'a> {
             view = rest;
             ret.push(DateTimeColumn {
                 data: col
-                    .into_shape(nrows)?
+                    .into_shape_with_order(nrows)?
                     .into_slice()
                     .ok_or_else(|| anyhow!("get None for splitted DateTime data"))?
                     .as_mut_ptr(),

diff --git a/connectorx-python/src/pandas/pandas_columns/float64.rs b/connectorx-python/src/pandas/pandas_columns/float64.rs
@@ -35,7 +35,7 @@ impl<'a> Float64Block<'a> {
             view = rest;
             ret.push(Float64Column {
                 data: col
-                    .into_shape(nrows)?
+                    .into_shape_with_order(nrows)?
                     .into_slice()
                     .ok_or_else(|| anyhow!("get None for splitted Float64 data"))?
                     .as_mut_ptr(),

diff --git a/connectorx-python/src/pandas/pandas_columns/int64.rs b/connectorx-python/src/pandas/pandas_columns/int64.rs
@@ -26,8 +26,8 @@ impl<'a> ExtractBlockFromBound<'a> for Int64Block<'a> {
         } else {
             let tuple = ob.downcast::<PyTuple>()?;
             // let data = tuple.get_borrowed_item(0)?;
-            let data = tuple.as_slice().get(0).unwrap();
-            let mask = tuple.as_slice().get(1).unwrap();
+            let data = &tuple.as_slice()[0];
+            let mask = &tuple.as_slice()[1];
             check_dtype(data, "int64")?;
             check_dtype(mask, "bool")?;
             Ok(Int64Block::Extention(
@@ -61,7 +61,7 @@ impl<'a> Int64Block<'a> {
                     view = rest;
                     ret.push(Int64Column {
                         data: col
-                            .into_shape(nrows)?
+                            .into_shape_with_order(nrows)?
                             .into_slice()
                             .ok_or_else(|| anyhow!("get None for splitted Int64 data"))?
                             .as_mut_ptr(),

diff --git a/connectorx-python/src/pandas/pandas_columns/string.rs b/connectorx-python/src/pandas/pandas_columns/string.rs
@@ -42,7 +42,7 @@ impl<'a> StringBlock<'a> {
             view = rest;
             ret.push(StringColumn {
                 data: col
-                    .into_shape(nrows)?
+                    .into_shape_with_order(nrows)?
                     .into_slice()
                     .ok_or_else(|| anyhow!("get None for splitted String data"))?
                     .as_mut_ptr(),