Skip to content

[SPARK-44602][SQL][CONNECT][PS] Make WidenSetOperationTypes retain the Plan_ID_TAG #42230

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
zhengruifeng wants to merge 1 commit into from
Closed

[SPARK-44602][SQL][CONNECT][PS] Make WidenSetOperationTypes retain the Plan_ID_TAG #42230

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
11 changes: 1 addition & 10 deletions python/pyspark/pandas/tests/connect/computation/test_parity_combine.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,22 +16,13 @@
#
import unittest

from pyspark import pandas as ps
from pyspark.pandas.tests.computation.test_combine import FrameCombineMixin
from pyspark.testing.connectutils import ReusedConnectTestCase
from pyspark.testing.pandasutils import PandasOnSparkTestUtils


class FrameParityCombineTests(FrameCombineMixin, PandasOnSparkTestUtils, ReusedConnectTestCase):
@property
def psdf(self):
return ps.from_pandas(self.pdf)

@unittest.skip(
"TODO(SPARK-43611): Fix unexpected `AnalysisException` from Spark Connect client."
)
def test_append(self):
super().test_append()
pass


if __name__ == "__main__":
Expand Down
6 changes: 0 additions & 6 deletions python/pyspark/pandas/tests/connect/indexes/test_parity_base.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,12 +29,6 @@ class IndexesParityTests(
def psdf(self):
return ps.from_pandas(self.pdf)

@unittest.skip(
"TODO(SPARK-43611): Fix unexpected `AnalysisException` from Spark Connect client."
)
def test_append(self):
super().test_append()

@unittest.skip("TODO(SPARK-43620): Support `Column` for SparkConnectColumn.__getitem__.")
def test_factorize(self):
super().test_factorize()
Expand Down
6 changes: 1 addition & 5 deletions python/pyspark/pandas/tests/connect/series/test_parity_arg_ops.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,11 +22,7 @@


class SeriesParityArgOpsTests(SeriesArgOpsMixin, PandasOnSparkTestUtils, ReusedConnectTestCase):
@unittest.skip(
"TODO(SPARK-43611): Fix unexpected `AnalysisException` from Spark Connect client."
)
def test_argsort(self):
super().test_argsort()
pass


if __name__ == "__main__":
Expand Down
12 changes: 0 additions & 12 deletions python/pyspark/pandas/tests/connect/test_parity_namespace.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,18 +22,6 @@


class NamespaceParityTests(NamespaceTestsMixin, PandasOnSparkTestUtils, ReusedConnectTestCase):
@unittest.skip(
"TODO(SPARK-43611): Fix unexpected `AnalysisException` from Spark Connect client."
)
def test_concat_index_axis(self):
super().test_concat_index_axis()

@unittest.skip(
"TODO(SPARK-43611): Fix unexpected `AnalysisException` from Spark Connect client."
)
def test_concat_multiindex_sort(self):
super().test_concat_multiindex_sort()

@unittest.skip("TODO(SPARK-43655): Enable NamespaceParityTests.test_get_index_map.")
def test_get_index_map(self):
super().test_get_index_map()
Expand Down
13 changes: 9 additions & 4 deletions sql/catalyst/src/main/scala/org/apache/spark/sql/catalyst/analysis/TypeCoercion.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -265,8 +265,10 @@ abstract class TypeCoercionBase {
s -> Nil
} else {
assert(newChildren.length == 2)
val newExcept = Except(newChildren.head, newChildren.last, isAll)
newExcept.copyTagsFrom(s)
val attrMapping = left.output.zip(newChildren.head.output)
Except(newChildren.head, newChildren.last, isAll) -> attrMapping
newExcept -> attrMapping
}

case s @ Intersect(left, right, isAll) if s.childrenResolved &&
Expand All @@ -276,19 +278,22 @@ abstract class TypeCoercionBase {
s -> Nil
} else {
assert(newChildren.length == 2)
val newIntersect = Intersect(newChildren.head, newChildren.last, isAll)
newIntersect.copyTagsFrom(s)
val attrMapping = left.output.zip(newChildren.head.output)
Intersect(newChildren.head, newChildren.last, isAll) -> attrMapping
newIntersect -> attrMapping
}

case s: Union if s.childrenResolved && !s.byName &&
s.children.forall(_.output.length == s.children.head.output.length) && !s.resolved =>
val newChildren: Seq[LogicalPlan] = buildNewChildrenWithWiderTypes(s.children)

if (newChildren.isEmpty) {
s -> Nil
} else {
val attrMapping = s.children.head.output.zip(newChildren.head.output)
s.copy(children = newChildren) -> attrMapping
val newUnion = s.copy(children = newChildren)
newUnion.copyTagsFrom(s)
newUnion -> attrMapping
}
}
}
Expand Down