Skip to content

Commit dd86a75

Browse files
committed
consistently use ns for namespace
1 parent 9fe56ef commit dd86a75

File tree

4 files changed

+22
-22
lines changed

4 files changed

+22
-22
lines changed

spec/API_specification/dataframe_api/__init__.py

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -283,10 +283,10 @@ def date(year: int, month: int, day: int) -> Scalar:
283283
Examples
284284
--------
285285
>>> df: DataFrame
286-
>>> namespace = df.__dataframe_namespace__()
286+
>>> ns = df.__dataframe_namespace__()
287287
>>> mask = (
288-
... (df.get_column_by_name('date') >= namespace.date(2020, 1, 1))
289-
... & (df.get_column_by_name('date') < namespace.date(2021, 1, 1))
288+
... (df.get_column_by_name('date') >= ns.date(2020, 1, 1))
289+
... & (df.get_column_by_name('date') < ns.date(2021, 1, 1))
290290
... )
291291
>>> df.filter(mask)
292292
"""

spec/API_specification/dataframe_api/groupby_object.py

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -61,13 +61,13 @@ def aggregate(self, *aggregation: Aggregation) -> DataFrame:
6161
Examples
6262
--------
6363
>>> df: DataFrame
64-
>>> namespace = df.__dataframe_namespace__()
64+
>>> ns = df.__dataframe_namespace__()
6565
>>> df.group_by('year').aggregate(
66-
... namespace.Aggregation.sum('l_quantity').rename('sum_qty'),
67-
... namespace.Aggregation.mean('l_quantity').rename('avg_qty'),
68-
... namespace.Aggregation.mean('l_extended_price').rename('avg_price'),
69-
... namespace.Aggregation.mean('l_discount').rename('avg_disc'),
70-
... namespace.Aggregation.size().rename('count_order'),
66+
... ns.Aggregation.sum('l_quantity').rename('sum_qty'),
67+
... ns.Aggregation.mean('l_quantity').rename('avg_qty'),
68+
... ns.Aggregation.mean('l_extended_price').rename('avg_price'),
69+
... ns.Aggregation.mean('l_discount').rename('avg_disc'),
70+
... ns.Aggregation.size().rename('count_order'),
7171
... )
7272
"""
7373
...

spec/API_specification/examples/tpch/q1.py

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -8,9 +8,9 @@
88

99
def query(lineitem_raw: SupportsDataFrameAPI) -> Any:
1010
lineitem = lineitem_raw.__dataframe_consortium_standard__(api_version="2023.10-beta")
11-
namespace = lineitem.__dataframe_namespace__()
11+
ns = lineitem.__dataframe_namespace__()
1212

13-
mask = lineitem.col("l_shipdate") <= namespace.date(1998, 9, 2)
13+
mask = lineitem.col("l_shipdate") <= ns.date(1998, 9, 2)
1414
lineitem = lineitem.assign(
1515
(lineitem.col("l_extended_price") * (1 - lineitem.col("l_discount"))).rename(
1616
"l_disc_price",
@@ -25,13 +25,13 @@ def query(lineitem_raw: SupportsDataFrameAPI) -> Any:
2525
lineitem.filter(mask)
2626
.group_by("l_returnflag", "l_linestatus")
2727
.aggregate(
28-
namespace.Aggregation.sum("l_quantity").rename("sum_qty"),
29-
namespace.Aggregation.sum("l_extendedprice").rename("sum_base_price"),
30-
namespace.Aggregation.sum("l_disc_price").rename("sum_disc_price"),
31-
namespace.Aggregation.sum("change").rename("sum_charge"),
32-
namespace.Aggregation.mean("l_quantity").rename("avg_qty"),
33-
namespace.Aggregation.mean("l_discount").rename("avg_disc"),
34-
namespace.Aggregation.size().rename("count_order"),
28+
ns.Aggregation.sum("l_quantity").rename("sum_qty"),
29+
ns.Aggregation.sum("l_extendedprice").rename("sum_base_price"),
30+
ns.Aggregation.sum("l_disc_price").rename("sum_disc_price"),
31+
ns.Aggregation.sum("change").rename("sum_charge"),
32+
ns.Aggregation.mean("l_quantity").rename("avg_qty"),
33+
ns.Aggregation.mean("l_discount").rename("avg_disc"),
34+
ns.Aggregation.size().rename("count_order"),
3535
)
3636
.sort("l_returnflag", "l_linestatus")
3737
)

spec/API_specification/examples/tpch/q5.py

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ def query(
3939
nation = nation_raw.__dataframe_consortium_standard__(api_version="2023-10.beta")
4040
region = region_raw.__dataframe_consortium_standard__(api_version="2023-10.beta")
4141

42-
namespace = customer.__dataframe_namespace__()
42+
ns = customer.__dataframe_namespace__()
4343

4444
result = (
4545
region.join(nation, how="inner", left_on="r_regionkey", right_on="n_regionkey")
@@ -56,15 +56,15 @@ def query(
5656
mask = (
5757
(result.col("c_nationkey") == result.col("s_nationkey"))
5858
& (result.col("r_name") == "ASIA")
59-
& (result.col("o_orderdate") >= namespace.date(1994, 1, 1))
60-
& (result.col("o_orderdate") < namespace.date(1995, 1, 1))
59+
& (result.col("o_orderdate") >= ns.date(1994, 1, 1))
60+
& (result.col("o_orderdate") < ns.date(1995, 1, 1))
6161
)
6262
result = result.filter(mask)
6363

6464
new_column = (result.col("l_extendedprice") * (1 - result.col("l_discount"))).rename(
6565
"revenue",
6666
)
6767
result = result.assign(new_column)
68-
result = result.group_by("n_name").aggregate(namespace.Aggregation.sum("revenue"))
68+
result = result.group_by("n_name").aggregate(ns.Aggregation.sum("revenue"))
6969

7070
return result.dataframe

0 commit comments

Comments
 (0)