Fix q6

pola-rs · Apr 12, 2024 · 565d572 · 565d572
1 parent 1781ba7
commit 565d572
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 20 deletions.
diff --git a/queries/dask/q6.py b/queries/dask/q6.py
@@ -25,16 +25,12 @@ def query() -> pd.DataFrame:
         var4 = 0.07
         var5 = 24
 
-        flineitem = line_item_ds[
+        filt = line_item_ds[
             (line_item_ds["l_shipdate"] >= var1) & (line_item_ds["l_shipdate"] < var2)
         ]
-        flineitem = line_item_ds[
-            (line_item_ds["l_discount"] >= var3) & (line_item_ds["l_discount"] <= var4)
-        ]
-        flineitem = line_item_ds[line_item_ds["l_quantity"] < var5]
-        result_value = (
-            (flineitem["l_extendedprice"] * flineitem["l_discount"]).sum().compute()
-        )
+        filt = filt[(filt["l_discount"] >= var3) & (filt["l_discount"] <= var4)]
+        filt = filt[filt["l_quantity"] < var5]
+        result_value = (filt["l_extendedprice"] * filt["l_discount"]).sum().compute()
         result_df = pd.DataFrame({"revenue": [result_value]})
 
         return result_df

diff --git a/queries/modin/q6.py b/queries/modin/q6.py
@@ -25,14 +25,12 @@ def query() -> pd.DataFrame:
         var4 = 0.07
         var5 = 24
 
-        flineitem = line_item_ds[
+        filt = line_item_ds[
             (line_item_ds["l_shipdate"] >= var1) & (line_item_ds["l_shipdate"] < var2)
         ]
-        flineitem = line_item_ds[
-            (line_item_ds["l_discount"] >= var3) & (line_item_ds["l_discount"] <= var4)
-        ]
-        flineitem = line_item_ds[line_item_ds["l_quantity"] < var5]
-        result_value = (flineitem["l_extendedprice"] * flineitem["l_discount"]).sum()
+        filt = filt[(filt["l_discount"] >= var3) & (filt["l_discount"] <= var4)]
+        filt = filt[filt["l_quantity"] < var5]
+        result_value = (filt["l_extendedprice"] * filt["l_discount"]).sum()
         result_df = pd.DataFrame({"revenue": [result_value]})
 
         return result_df

diff --git a/queries/pandas/q6.py b/queries/pandas/q6.py
@@ -25,14 +25,12 @@ def query() -> pd.DataFrame:
         var4 = 0.07
         var5 = 24
 
-        flineitem = line_item_ds[
+        filt = line_item_ds[
             (line_item_ds["l_shipdate"] >= var1) & (line_item_ds["l_shipdate"] < var2)
         ]
-        flineitem = line_item_ds[
-            (line_item_ds["l_discount"] >= var3) & (line_item_ds["l_discount"] <= var4)
-        ]
-        flineitem = line_item_ds[line_item_ds["l_quantity"] < var5]
-        result_value = (flineitem["l_extendedprice"] * flineitem["l_discount"]).sum()
+        filt = filt[(filt["l_discount"] >= var3) & (filt["l_discount"] <= var4)]
+        filt = filt[filt["l_quantity"] < var5]
+        result_value = (filt["l_extendedprice"] * filt["l_discount"]).sum()
         result_df = pd.DataFrame({"revenue": [result_value]})
 
         return result_df