Merge pull request #239 from supabase/fix/scan-state-reset

fix: reset state when begin scan

Author: burmecia

Diff for: wrappers/src/fdw/mssql_fdw/mssql_fdw.rs

@@ -192,6 +192,8 @@ impl ForeignDataWrapper<MssqlFdwError> for MssqlFdw {
         self.table = require_option("table", options)?.to_string();
         self.tgt_cols = columns.to_vec();
 
+        self.iter_idx = 0;
+
         // create sql server client
         let tcp = self
             .rt

Diff for: wrappers/src/fdw/redis_fdw/redis_fdw.rs

@@ -74,6 +74,13 @@ impl RedisFdw {
     const FDW_NAME: &'static str = "RedisFdw";
     const BUF_SIZE: isize = 256;
 
+    fn reset(&mut self) {
+        self.iter_idx = 0;
+        self.scan_result.clear();
+        self.iter_idx_stream = "-".to_string();
+        self.scan_result_stream.clear();
+    }
+
     // fetch a target row for list and zset
     fn fetch_row_list(&mut self) -> RedisFdwResult<Option<Row>> {
         if let Some(ref mut conn) = &mut self.conn {
@@ -271,6 +278,8 @@ impl ForeignDataWrapper<RedisFdwError> for RedisFdw {
 
         let mut conn = self.client.get_connection()?;
 
+        self.reset();
+
         match src_type.as_str() {
             "list" | "zset" => {
                 check_target_columns(
@@ -366,10 +375,7 @@ impl ForeignDataWrapper<RedisFdwError> for RedisFdw {
     }
 
     fn re_scan(&mut self) -> RedisFdwResult<()> {
-        self.iter_idx = 0;
-        self.scan_result.clear();
-        self.iter_idx_stream = "-".to_string();
-        self.scan_result_stream.clear();
+        self.reset();
         Ok(())
     }
 

Diff for: wrappers/src/fdw/stripe_fdw/stripe_fdw.rs

@@ -660,6 +660,8 @@ impl ForeignDataWrapper<StripeFdwError> for StripeFdw {
     ) -> StripeFdwResult<()> {
         let obj = require_option("object", options)?;
 
+        self.iter_idx = 0;
+
         if let Some(client) = &self.client {
             let page_size = 100; // maximum page size limit for Stripe API
             let page_cnt = if let Some(limit) = limit {