Skip to content
This repository has been archived by the owner on Nov 22, 2022. It is now read-only.

Fix return type for DataFrame.groupBy / cube / rollup #131

Merged
merged 2 commits into from
May 21, 2019
Merged
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 7 additions & 6 deletions third_party/3/pyspark/sql/dataframe.pyi
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@ from py4j.java_gateway import JavaObject # type: ignore
from pyspark.sql._typing import ColumnOrName, Literal, LiteralType
from pyspark.sql.types import *
from pyspark.sql.context import SQLContext
from pyspark.sql.group import GroupedData
from pyspark.sql.readwriter import DataFrameWriter
from pyspark.sql.streaming import DataStreamWriter
from pyspark.sql.column import Column
Expand Down Expand Up @@ -91,17 +92,17 @@ class DataFrame:
def selectExpr(self, *expr: List[str]) -> 'DataFrame': ...
def filter(self, condition: ColumnOrName) -> 'DataFrame': ...
@overload
def groupBy(self, *cols: ColumnOrName) -> 'DataFrame': ...
def groupBy(self, *cols: ColumnOrName) -> GroupedData: ...
@overload
def groupBy(self, __cols: List[ColumnOrName]) -> 'DataFrame': ...
def groupBy(self, __cols: List[ColumnOrName]) -> GroupedData: ...
@overload
def rollup(self, *cols: ColumnOrName) -> 'DataFrame': ...
def rollup(self, *cols: ColumnOrName) -> GroupedData: ...
@overload
def rollup(self, __cols: List[ColumnOrName]) -> 'DataFrame': ...
def rollup(self, __cols: List[ColumnOrName]) -> GroupedData: ...
@overload
def cube(self, *cols: ColumnOrName) -> 'DataFrame': ...
def cube(self, *cols: ColumnOrName) -> GroupedData: ...
@overload
def cube(self, __cols: List[ColumnOrName]) -> 'DataFrame': ...
def cube(self, __cols: List[ColumnOrName]) -> GroupedData: ...
def agg(self, *exprs: Union[Column, Dict[str, str]]) -> 'DataFrame': ...
def union(self, other: 'DataFrame') -> 'DataFrame': ...
def unionAll(self, other: 'DataFrame') -> 'DataFrame': ...
Expand Down