Skip to content

Commit 4980320

Browse files
authored
Consistently use ns for namespace in docs/examples (#328)
* consistently use ns for namespace * use pdx instead of ns * use pdx instead of ns * pdx
1 parent 27d5fc4 commit 4980320

File tree

8 files changed

+36
-36
lines changed

8 files changed

+36
-36
lines changed

spec/API_specification/dataframe_api/__init__.py

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -293,10 +293,10 @@ def date(year: int, month: int, day: int) -> Scalar:
293293
Examples
294294
--------
295295
>>> df: DataFrame
296-
>>> namespace = df.__dataframe_namespace__()
296+
>>> pdx = df.__dataframe_namespace__()
297297
>>> mask = (
298-
... (df.get_column_by_name('date') >= namespace.date(2020, 1, 1))
299-
... & (df.get_column_by_name('date') < namespace.date(2021, 1, 1))
298+
... (df.get_column_by_name('date') >= pdx.date(2020, 1, 1))
299+
... & (df.get_column_by_name('date') < pdx.date(2021, 1, 1))
300300
... )
301301
>>> df.filter(mask)
302302
"""
@@ -319,8 +319,8 @@ def any_horizontal(*columns: Column, skip_nulls: bool = True) -> Column:
319319
Examples
320320
--------
321321
>>> df: DataFrame
322-
>>> ns = df.__dataframe_namespace__()
323-
>>> mask = ns.any_horizontal(
322+
>>> pdx = df.__dataframe_namespace__()
323+
>>> mask = pdx.any_horizontal(
324324
... *[df.col(col_name) > 0 for col_name in df.column_names()]
325325
... )
326326
>>> df = df.filter(mask)
@@ -345,8 +345,8 @@ def all_horizontal(*columns: Column, skip_nulls: bool = True) -> Column:
345345
Examples
346346
--------
347347
>>> df: DataFrame
348-
>>> ns = df.__dataframe_namespace__()
349-
>>> mask = ns.all_horizontal(
348+
>>> pdx = df.__dataframe_namespace__()
349+
>>> mask = pdx.all_horizontal(
350350
... *[df.col(col_name) > 0 for col_name in df.column_names()]
351351
... )
352352
>>> df = df.filter(mask)

spec/API_specification/dataframe_api/groupby_object.py

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -72,13 +72,13 @@ def aggregate(self, *aggregation: Aggregation) -> DataFrame:
7272
Examples
7373
--------
7474
>>> df: DataFrame
75-
>>> namespace = df.__dataframe_namespace__()
75+
>>> pdx = df.__dataframe_namespace__()
7676
>>> df.group_by('year').aggregate(
77-
... namespace.Aggregation.sum('l_quantity').rename('sum_qty'),
78-
... namespace.Aggregation.mean('l_quantity').rename('avg_qty'),
79-
... namespace.Aggregation.mean('l_extended_price').rename('avg_price'),
80-
... namespace.Aggregation.mean('l_discount').rename('avg_disc'),
81-
... namespace.Aggregation.size().rename('count_order'),
77+
... pdx.Aggregation.sum('l_quantity').rename('sum_qty'),
78+
... pdx.Aggregation.mean('l_quantity').rename('avg_qty'),
79+
... pdx.Aggregation.mean('l_extended_price').rename('avg_price'),
80+
... pdx.Aggregation.mean('l_discount').rename('avg_disc'),
81+
... pdx.Aggregation.size().rename('count_order'),
8282
... )
8383
"""
8484
...

spec/API_specification/examples/02_plotting.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,9 +19,9 @@ def group_by_and_plot(
1919
y = y_any.__column_consortium_standard__(api_version="2023-10.beta")
2020
color = color_any.__column_consortium_standard__(api_version="2023-10.beta")
2121

22-
namespace = x.__column_namespace__()
22+
pdx = x.__column_namespace__()
2323

24-
df = namespace.dataframe_from_columns(
24+
df = pdx.dataframe_from_columns(
2525
x.rename("x"),
2626
y.rename("y"),
2727
color.rename("color"),

spec/API_specification/examples/03_working_with_nulls.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,6 @@
99

1010
def main(df_raw: SupportsDataFrameAPI) -> SupportsDataFrameAPI:
1111
df = df_raw.__dataframe_consortium_standard__(api_version="2023-11.beta")
12-
namespace = df.__dataframe_namespace__()
13-
df = df.fill_nan(namespace.null)
12+
pdx = df.__dataframe_namespace__()
13+
df = df.fill_nan(pdx.null)
1414
return df.dataframe

spec/API_specification/examples/04_datatypes.py

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -10,15 +10,15 @@
1010

1111
def main(df_raw: SupportsDataFrameAPI) -> SupportsDataFrameAPI:
1212
df = df_raw.__dataframe_consortium_standard__(api_version="2023-11.beta").persist()
13-
namespace = df.__dataframe_namespace__()
13+
pdx = df.__dataframe_namespace__()
1414
df = df.select(
1515
*[
1616
col_name
1717
for col_name in df.column_names
18-
if isinstance(df.col(col_name).dtype, namespace.Int64)
18+
if isinstance(df.col(col_name).dtype, pdx.Int64)
1919
],
2020
)
21-
arr = df.to_array(namespace.Int64())
21+
arr = df.to_array(pdx.Int64())
2222
arr = some_array_function(arr)
23-
df = namespace.dataframe_from_2d_array(arr, names=["a", "b"])
23+
df = pdx.dataframe_from_2d_array(arr, names=["a", "b"])
2424
return df.dataframe

spec/API_specification/examples/06_horizontal_functions.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,8 +21,8 @@
2121

2222
def main(df_raw: SupportsDataFrameAPI) -> SupportsDataFrameAPI:
2323
df = df_raw.__dataframe_consortium_standard__(api_version="2023-11.beta")
24-
ns = df.__dataframe_namespace__()
24+
pdx = df.__dataframe_namespace__()
2525
df = df.filter(
26-
ns.any_horizontal(*[df.col(col_name) > 0 for col_name in df.column_names]),
26+
pdx.any_horizontal(*[df.col(col_name) > 0 for col_name in df.column_names]),
2727
)
2828
return df.dataframe

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+
pdx = lineitem.__dataframe_namespace__()
1212

13-
mask = lineitem.col("l_shipdate") <= namespace.date(1998, 9, 2)
13+
mask = lineitem.col("l_shipdate") <= pdx.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+
pdx.Aggregation.sum("l_quantity").rename("sum_qty"),
29+
pdx.Aggregation.sum("l_extendedprice").rename("sum_base_price"),
30+
pdx.Aggregation.sum("l_disc_price").rename("sum_disc_price"),
31+
pdx.Aggregation.sum("change").rename("sum_charge"),
32+
pdx.Aggregation.mean("l_quantity").rename("avg_qty"),
33+
pdx.Aggregation.mean("l_discount").rename("avg_disc"),
34+
pdx.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+
pdx = 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") >= pdx.date(1994, 1, 1))
60+
& (result.col("o_orderdate") < pdx.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(pdx.Aggregation.sum("revenue"))
6969

7070
return result.dataframe

0 commit comments

Comments
 (0)