removed redundancies

anecdotes-ai · Sep 26, 2021 · 346b92f · 346b92f
1 parent 00648b7
commit 346b92f
Show file tree

Hide file tree

Showing 3 changed files with 18 additions and 29 deletions.
diff --git a/main.py b/main.py
@@ -27,19 +27,27 @@ def main():
         con.set_db_warehouse(warehouse)
 
         query_results = []
-        for query in queries_list:
-            query_result = con.query(query)
-            query_results.append(query_result)
-            print("### Running query ###")
-            print(f"[!] Query id - {query_result.query_id}")
-            print(f"[!] Running query ### - {query}")
-
+        # default, run all queries async
         if not sync:
+            for query in queries_list:
+                query_result = con.query(query)
+                query_results.append(query_result)
+                print("### Running query ###")
+                print(f"[!] Query id - {query_result.query_id}")
+                print(f"[!] Running query ### - {query}")
             json_results = asyncio.run(utils.gather_all_results(query_results))
+        # o/w, run them sync
         else:
-            json_results = utils.gather_all_results_sync(query_results)
+            json_results = {}
+            for query in queries_list:
+                query_result = con.query(query)
+                print("### Running query ###")
+                print(f"[!] Query id - {query_result.query_id}")
+                print(f"[!] Running query ### - {query}")
+                json_results[query_result.query_id] = query_result.fetch_all()
 
     utils.set_github_action_output('queries_results', json.dumps(json_results))
-
+
+
 if __name__ == '__main__':
     main()
diff --git a/snowflake_connector.py b/snowflake_connector.py
@@ -64,8 +64,4 @@ async def fetch_results(self):
         while self.is_query_running():
             await asyncio.sleep(0.1)
 
-        return self._fetch_results()
-
-    def fetch_results_sync(self):
-        self.cursor.get_results_from_sfqid(self.query_id)
-        return self.cursor.fetchall()
+        return self._fetch_results()
diff --git a/utils.py b/utils.py
@@ -35,19 +35,4 @@ async def gather_all_results(query_result_list: List[QueryResult]) -> dict:
                 print(row)
                 json_total_results[done_task.get_name()].append(str(row))
 
-    return json_total_results
-
-
-def gather_all_results_sync(query_results_list: List[QueryResult]) -> dict:
-    """
-
-    Args:
-        query_results_list:
-
-    Returns:
-
-    """
-    json_total_results = {}
-    for query in query_results_list:
-        json_total_results[query.query_id] = query.fetch_results_sync()
     return json_total_results