You are viewing a plain text version of this content. The canonical link for it is here.
Posted to reviews@spark.apache.org by "itholic (via GitHub)" <gi...@apache.org> on 2023/09/16 09:30:17 UTC
[GitHub] [spark] itholic opened a new pull request, #42956: [SPARK-43654][CONNECT][PS][TESTS] Enable `InternalFrameParityTests.test_from_pandas`
itholic opened a new pull request, #42956:
URL: https://github.com/apache/spark/pull/42956
<!--
Thanks for sending a pull request! Here are some tips for you:
1. If this is your first time, please read our contributor guidelines: https://spark.apache.org/contributing.html
2. Ensure you have added or run the appropriate tests for your PR: https://spark.apache.org/developer-tools.html
3. If the PR is unfinished, add '[WIP]' in your PR title, e.g., '[WIP][SPARK-XXXX] Your PR title ...'.
4. Be sure to keep the PR description updated to reflect all changes.
5. Please write your PR title to summarize what this PR proposes.
6. If possible, provide a concise example to reproduce the issue for a faster review.
7. If you want to add a new configuration, please read the guideline first for naming configurations in
'core/src/main/scala/org/apache/spark/internal/config/ConfigEntry.scala'.
8. If you want to add or modify an error type or message, please read the guideline first in
'core/src/main/resources/error/README.md'.
-->
### What changes were proposed in this pull request?
<!--
Please clarify what changes you are proposing. The purpose of this section is to outline the changes and how this PR fixes the issue.
If possible, please consider writing useful notes for better and faster reviews in your PR. See the examples below.
1. If you refactor some codes with changing classes, showing the class hierarchy will help reviewers.
2. If you fix some SQL features, you can provide some references of other DBMSes.
3. If there is design documentation, please add the link.
4. If there is a discussion in the mailing list, please add the link.
-->
This PR proposes to enable `InternalFrameParityTests.test_from_pandas`
### Why are the changes needed?
<!--
Please clarify why the changes are needed. For instance,
1. If you propose a new API, clarify the use case for a new API.
2. If you fix a bug, you can clarify why it is a bug.
-->
To improve the test coverage for Pandas API with Spark Connect.
### Does this PR introduce _any_ user-facing change?
<!--
Note that it means *any* user-facing change including all aspects such as the documentation fix.
If yes, please clarify the previous behavior and the change this PR proposes - provide the console output, description and/or an example to show the behavior difference if possible.
If possible, please also clarify if this is a user-facing change compared to the released Spark versions or within the unreleased branches such as master.
If no, write 'No'.
-->
No.
### How was this patch tested?
<!--
If tests were added, say they were added here. Please make sure to add some test cases that check the changes thoroughly including negative and positive cases if possible.
If it was tested in a way different from regular unit tests, please clarify how you tested step by step, ideally copy and paste-able, so that other reviewers can test and check, and descendants can verify in the future.
If tests were not added, please describe why they were not added and/or why it was difficult to add.
If benchmark tests were added, please run the benchmarks in GitHub Actions for the consistent environment, and the instructions could accord to: https://spark.apache.org/developer-tools.html#github-workflow-benchmarks.
-->
Added UT for Spark Connect.
### Was this patch authored or co-authored using generative AI tooling?
<!--
If generative AI tooling has been used in the process of authoring this patch, please include the
phrase: 'Generated-by: ' followed by the name of the tool and its version.
If no, write 'No'.
Please refer to the [ASF Generative Tooling Guidance](https://www.apache.org/legal/generative-tooling.html) for details.
-->
No.
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: reviews-unsubscribe@spark.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
---------------------------------------------------------------------
To unsubscribe, e-mail: reviews-unsubscribe@spark.apache.org
For additional commands, e-mail: reviews-help@spark.apache.org
[GitHub] [spark] HyukjinKwon commented on a diff in pull request #42956: [SPARK-43654][CONNECT][PS][TESTS] Enable `InternalFrameParityTests.test_from_pandas`
Posted by "HyukjinKwon (via GitHub)" <gi...@apache.org>.
HyukjinKwon commented on code in PR #42956:
URL: https://github.com/apache/spark/pull/42956#discussion_r1328212842
##########
python/pyspark/pandas/tests/connect/test_parity_internal.py:
##########
@@ -15,18 +15,86 @@
# limitations under the License.
#
import unittest
+import pandas as pd
from pyspark.pandas.tests.test_internal import InternalFrameTestsMixin
from pyspark.testing.connectutils import ReusedConnectTestCase
from pyspark.testing.pandasutils import PandasOnSparkTestUtils
+from pyspark.pandas.internal import (
+ InternalFrame,
+ SPARK_DEFAULT_INDEX_NAME,
+ SPARK_INDEX_NAME_FORMAT,
+)
+from pyspark.pandas.utils import spark_column_equals
class InternalFrameParityTests(
InternalFrameTestsMixin, PandasOnSparkTestUtils, ReusedConnectTestCase
):
- @unittest.skip("TODO(SPARK-43654): Enable InternalFrameParityTests.test_from_pandas.")
def test_from_pandas(self):
- super().test_from_pandas()
+ pdf = pd.DataFrame({"a": [1, 2, 3], "b": [4, 5, 6]})
Review Comment:
can we refactor and share the common code for now?
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: reviews-unsubscribe@spark.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
---------------------------------------------------------------------
To unsubscribe, e-mail: reviews-unsubscribe@spark.apache.org
For additional commands, e-mail: reviews-help@spark.apache.org
[GitHub] [spark] dongjoon-hyun commented on a diff in pull request #42956: [SPARK-43654][CONNECT][PS][TESTS] Enable `InternalFrameParityTests.test_from_pandas`
Posted by "dongjoon-hyun (via GitHub)" <gi...@apache.org>.
dongjoon-hyun commented on code in PR #42956:
URL: https://github.com/apache/spark/pull/42956#discussion_r1328040066
##########
python/pyspark/pandas/tests/connect/test_parity_internal.py:
##########
@@ -15,18 +15,86 @@
# limitations under the License.
#
import unittest
+import pandas as pd
from pyspark.pandas.tests.test_internal import InternalFrameTestsMixin
from pyspark.testing.connectutils import ReusedConnectTestCase
from pyspark.testing.pandasutils import PandasOnSparkTestUtils
+from pyspark.pandas.internal import (
+ InternalFrame,
+ SPARK_DEFAULT_INDEX_NAME,
+ SPARK_INDEX_NAME_FORMAT,
+)
+from pyspark.pandas.utils import spark_column_equals
class InternalFrameParityTests(
InternalFrameTestsMixin, PandasOnSparkTestUtils, ReusedConnectTestCase
):
- @unittest.skip("TODO(SPARK-43654): Enable InternalFrameParityTests.test_from_pandas.")
def test_from_pandas(self):
- super().test_from_pandas()
+ pdf = pd.DataFrame({"a": [1, 2, 3], "b": [4, 5, 6]})
Review Comment:
Is it copied from somewhere?
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: reviews-unsubscribe@spark.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
---------------------------------------------------------------------
To unsubscribe, e-mail: reviews-unsubscribe@spark.apache.org
For additional commands, e-mail: reviews-help@spark.apache.org
[GitHub] [spark] HyukjinKwon commented on a diff in pull request #42956: [SPARK-43654][CONNECT][PS][TESTS] Enable `InternalFrameParityTests.test_from_pandas`
Posted by "HyukjinKwon (via GitHub)" <gi...@apache.org>.
HyukjinKwon commented on code in PR #42956:
URL: https://github.com/apache/spark/pull/42956#discussion_r1328213080
##########
python/pyspark/pandas/tests/connect/test_parity_internal.py:
##########
@@ -15,18 +15,86 @@
# limitations under the License.
#
import unittest
+import pandas as pd
from pyspark.pandas.tests.test_internal import InternalFrameTestsMixin
from pyspark.testing.connectutils import ReusedConnectTestCase
from pyspark.testing.pandasutils import PandasOnSparkTestUtils
+from pyspark.pandas.internal import (
+ InternalFrame,
+ SPARK_DEFAULT_INDEX_NAME,
+ SPARK_INDEX_NAME_FORMAT,
+)
+from pyspark.pandas.utils import spark_column_equals
class InternalFrameParityTests(
InternalFrameTestsMixin, PandasOnSparkTestUtils, ReusedConnectTestCase
):
- @unittest.skip("TODO(SPARK-43654): Enable InternalFrameParityTests.test_from_pandas.")
def test_from_pandas(self):
- super().test_from_pandas()
+ pdf = pd.DataFrame({"a": [1, 2, 3], "b": [4, 5, 6]})
Review Comment:
For the column comparison, you can do it separately.
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: reviews-unsubscribe@spark.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
---------------------------------------------------------------------
To unsubscribe, e-mail: reviews-unsubscribe@spark.apache.org
For additional commands, e-mail: reviews-help@spark.apache.org
[GitHub] [spark] itholic commented on a diff in pull request #42956: [SPARK-43654][CONNECT][PS][TESTS] Enable `InternalFrameParityTests.test_from_pandas`
Posted by "itholic (via GitHub)" <gi...@apache.org>.
itholic commented on code in PR #42956:
URL: https://github.com/apache/spark/pull/42956#discussion_r1328217955
##########
python/pyspark/pandas/tests/connect/test_parity_internal.py:
##########
@@ -15,18 +15,86 @@
# limitations under the License.
#
import unittest
+import pandas as pd
from pyspark.pandas.tests.test_internal import InternalFrameTestsMixin
from pyspark.testing.connectutils import ReusedConnectTestCase
from pyspark.testing.pandasutils import PandasOnSparkTestUtils
+from pyspark.pandas.internal import (
+ InternalFrame,
+ SPARK_DEFAULT_INDEX_NAME,
+ SPARK_INDEX_NAME_FORMAT,
+)
+from pyspark.pandas.utils import spark_column_equals
class InternalFrameParityTests(
InternalFrameTestsMixin, PandasOnSparkTestUtils, ReusedConnectTestCase
):
- @unittest.skip("TODO(SPARK-43654): Enable InternalFrameParityTests.test_from_pandas.")
def test_from_pandas(self):
- super().test_from_pandas()
+ pdf = pd.DataFrame({"a": [1, 2, 3], "b": [4, 5, 6]})
Review Comment:
> what about simplify the tests by comparing the column string representations
Yeah, this is exactly what we're doing currently for `spark_column_equals`:
```python
if is_remote():
# Hide unrelated codes
return repr(left) == repr(right)
else:
return left._jc.equals(right._jc)
```
But it's not working for the case comparing `internal.spark_column_for(("a",))` and `sdf["a"]` because they have different string representations for some reason as below:
```python
import pandas as pd
from pyspark.pandas.internal import InternalFrame
internal = InternalFrame.from_pandas(pdf)
sdf = internal.spark_frame
pdf = pd.DataFrame({"a": [1, 2, 3]})
internal = InternalFrame.from_pandas(pdf)
sdf = internal.spark_frame
repr(internal.spark_column_for(("a",)))
# "Column<'`a`'>"
repr(sdf["a"])
# "Column<'a'>"
```
Do you happen to have any idea why the backtick surrounds the Column name in Spark Connect?
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: reviews-unsubscribe@spark.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
---------------------------------------------------------------------
To unsubscribe, e-mail: reviews-unsubscribe@spark.apache.org
For additional commands, e-mail: reviews-help@spark.apache.org
[GitHub] [spark] itholic commented on a diff in pull request #42956: [SPARK-43654][CONNECT][PS][TESTS] Enable `InternalFrameParityTests.test_from_pandas`
Posted by "itholic (via GitHub)" <gi...@apache.org>.
itholic commented on code in PR #42956:
URL: https://github.com/apache/spark/pull/42956#discussion_r1328221746
##########
python/pyspark/pandas/tests/connect/test_parity_internal.py:
##########
@@ -15,18 +15,86 @@
# limitations under the License.
#
import unittest
+import pandas as pd
from pyspark.pandas.tests.test_internal import InternalFrameTestsMixin
from pyspark.testing.connectutils import ReusedConnectTestCase
from pyspark.testing.pandasutils import PandasOnSparkTestUtils
+from pyspark.pandas.internal import (
+ InternalFrame,
+ SPARK_DEFAULT_INDEX_NAME,
+ SPARK_INDEX_NAME_FORMAT,
+)
+from pyspark.pandas.utils import spark_column_equals
class InternalFrameParityTests(
InternalFrameTestsMixin, PandasOnSparkTestUtils, ReusedConnectTestCase
):
- @unittest.skip("TODO(SPARK-43654): Enable InternalFrameParityTests.test_from_pandas.")
def test_from_pandas(self):
- super().test_from_pandas()
+ pdf = pd.DataFrame({"a": [1, 2, 3], "b": [4, 5, 6]})
Review Comment:
Using regex for comparing the Column sounds good to me for now. Let me try to fix the `spark_column_equals` to share the common code for testing.
> I think we discussed the string representation https://github.com/apache/spark/pull/39296 and https://github.com/apache/spark/pull/39616, it seems non-trival.
Thanks for searching the previous discussion!
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: reviews-unsubscribe@spark.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
---------------------------------------------------------------------
To unsubscribe, e-mail: reviews-unsubscribe@spark.apache.org
For additional commands, e-mail: reviews-help@spark.apache.org
[GitHub] [spark] zhengruifeng commented on a diff in pull request #42956: [SPARK-43654][CONNECT][PS][TESTS] Enable `InternalFrameParityTests.test_from_pandas`
Posted by "zhengruifeng (via GitHub)" <gi...@apache.org>.
zhengruifeng commented on code in PR #42956:
URL: https://github.com/apache/spark/pull/42956#discussion_r1328219551
##########
python/pyspark/pandas/tests/connect/test_parity_internal.py:
##########
@@ -15,18 +15,86 @@
# limitations under the License.
#
import unittest
+import pandas as pd
from pyspark.pandas.tests.test_internal import InternalFrameTestsMixin
from pyspark.testing.connectutils import ReusedConnectTestCase
from pyspark.testing.pandasutils import PandasOnSparkTestUtils
+from pyspark.pandas.internal import (
+ InternalFrame,
+ SPARK_DEFAULT_INDEX_NAME,
+ SPARK_INDEX_NAME_FORMAT,
+)
+from pyspark.pandas.utils import spark_column_equals
class InternalFrameParityTests(
InternalFrameTestsMixin, PandasOnSparkTestUtils, ReusedConnectTestCase
):
- @unittest.skip("TODO(SPARK-43654): Enable InternalFrameParityTests.test_from_pandas.")
def test_from_pandas(self):
- super().test_from_pandas()
+ pdf = pd.DataFrame({"a": [1, 2, 3], "b": [4, 5, 6]})
Review Comment:
I think we discussed the string representation [1](https://github.com/apache/spark/pull/39296) and [2](https://github.com/apache/spark/pull/39616), it seems non-trival.
In the test case in this PR, what about simply comparing `repr(col)` with a string literal or regex?
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: reviews-unsubscribe@spark.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
---------------------------------------------------------------------
To unsubscribe, e-mail: reviews-unsubscribe@spark.apache.org
For additional commands, e-mail: reviews-help@spark.apache.org
[GitHub] [spark] itholic commented on a diff in pull request #42956: [SPARK-43654][CONNECT][PS][TESTS] Enable `InternalFrameParityTests.test_from_pandas`
Posted by "itholic (via GitHub)" <gi...@apache.org>.
itholic commented on code in PR #42956:
URL: https://github.com/apache/spark/pull/42956#discussion_r1328210599
##########
python/pyspark/pandas/tests/connect/test_parity_internal.py:
##########
@@ -15,18 +15,86 @@
# limitations under the License.
#
import unittest
+import pandas as pd
from pyspark.pandas.tests.test_internal import InternalFrameTestsMixin
from pyspark.testing.connectutils import ReusedConnectTestCase
from pyspark.testing.pandasutils import PandasOnSparkTestUtils
+from pyspark.pandas.internal import (
+ InternalFrame,
+ SPARK_DEFAULT_INDEX_NAME,
+ SPARK_INDEX_NAME_FORMAT,
+)
+from pyspark.pandas.utils import spark_column_equals
class InternalFrameParityTests(
InternalFrameTestsMixin, PandasOnSparkTestUtils, ReusedConnectTestCase
):
- @unittest.skip("TODO(SPARK-43654): Enable InternalFrameParityTests.test_from_pandas.")
def test_from_pandas(self):
- super().test_from_pandas()
+ pdf = pd.DataFrame({"a": [1, 2, 3], "b": [4, 5, 6]})
Review Comment:
I copied this from [test_internal.py](https://github.com/apache/spark/blob/master/python/pyspark/pandas/tests/test_internal.py#L31-L107) with excluding tests that leverages `spark_column_equals`, e.g. `self.assertTrue(spark_column_equals(internal.spark_column_for(("a",)), sdf["a"]))`.
Because currently `spark_column_equals` is working in different way from the "Non-Connect", since we can't compare the two Column object itself as below:
**Non-Connect**
```python
>>> sdf = spark.range(10)
>>> sdf.id._jc.equals(sdf.id._jc)
True
```
**Connect**
```python
>>> sdf = spark.range(10)
>>> sdf.id._jc.equals(sdf.id._jc)
# [JVM_ATTRIBUTE_NOT_SUPPORTED] Attribute `_jc` is not supported in Spark Connect as it depends on the JVM. If you need to use this attribute, do not use Spark Connect when creating your session.
```
But on my second thought regarding the comments, maybe we should find a proper way to compare the Column objects instead of separating the tests.
Because iur current way to compare two Column object from Spark Connect is rely on comparing `repr` for each Column, but it's a bit hacky way so we should fix it even though it functions properly in our current code base.
@zhengruifeng May I happen to ask your thought on this? Just as comparing equality by directly accessing a Java Object in Non-Connect mode, do you think this operation is also possible in Spark Connect?
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: reviews-unsubscribe@spark.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
---------------------------------------------------------------------
To unsubscribe, e-mail: reviews-unsubscribe@spark.apache.org
For additional commands, e-mail: reviews-help@spark.apache.org
[GitHub] [spark] itholic commented on a diff in pull request #42956: [SPARK-43654][CONNECT][PS][TESTS] Enable `InternalFrameParityTests.test_from_pandas`
Posted by "itholic (via GitHub)" <gi...@apache.org>.
itholic commented on code in PR #42956:
URL: https://github.com/apache/spark/pull/42956#discussion_r1328217955
##########
python/pyspark/pandas/tests/connect/test_parity_internal.py:
##########
@@ -15,18 +15,86 @@
# limitations under the License.
#
import unittest
+import pandas as pd
from pyspark.pandas.tests.test_internal import InternalFrameTestsMixin
from pyspark.testing.connectutils import ReusedConnectTestCase
from pyspark.testing.pandasutils import PandasOnSparkTestUtils
+from pyspark.pandas.internal import (
+ InternalFrame,
+ SPARK_DEFAULT_INDEX_NAME,
+ SPARK_INDEX_NAME_FORMAT,
+)
+from pyspark.pandas.utils import spark_column_equals
class InternalFrameParityTests(
InternalFrameTestsMixin, PandasOnSparkTestUtils, ReusedConnectTestCase
):
- @unittest.skip("TODO(SPARK-43654): Enable InternalFrameParityTests.test_from_pandas.")
def test_from_pandas(self):
- super().test_from_pandas()
+ pdf = pd.DataFrame({"a": [1, 2, 3], "b": [4, 5, 6]})
Review Comment:
> what about simplify the tests by comparing the column string representations
Yeah, this is exactly what we're already doing currently for `spark_column_equals`:
```python
if is_remote():
# Hide unrelated codes
return repr(left) == repr(right)
else:
return left._jc.equals(right._jc)
```
But it's not working for the case comparing `internal.spark_column_for(("a",))` and `sdf["a"]` because they have different string representations for some reason as below:
```python
import pandas as pd
from pyspark.pandas.internal import InternalFrame
internal = InternalFrame.from_pandas(pdf)
sdf = internal.spark_frame
pdf = pd.DataFrame({"a": [1, 2, 3]})
internal = InternalFrame.from_pandas(pdf)
sdf = internal.spark_frame
repr(internal.spark_column_for(("a",)))
# "Column<'`a`'>"
repr(sdf["a"])
# "Column<'a'>"
```
Do you happen to have any idea why the backtick surrounds the Column name in Spark Connect?
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: reviews-unsubscribe@spark.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
---------------------------------------------------------------------
To unsubscribe, e-mail: reviews-unsubscribe@spark.apache.org
For additional commands, e-mail: reviews-help@spark.apache.org
[GitHub] [spark] itholic commented on a diff in pull request #42956: [SPARK-43654][CONNECT][PS][TESTS] Enable `InternalFrameParityTests.test_from_pandas`
Posted by "itholic (via GitHub)" <gi...@apache.org>.
itholic commented on code in PR #42956:
URL: https://github.com/apache/spark/pull/42956#discussion_r1327938259
##########
python/pyspark/pandas/tests/connect/test_parity_internal.py:
##########
@@ -15,18 +15,86 @@
# limitations under the License.
#
import unittest
+import pandas as pd
from pyspark.pandas.tests.test_internal import InternalFrameTestsMixin
from pyspark.testing.connectutils import ReusedConnectTestCase
from pyspark.testing.pandasutils import PandasOnSparkTestUtils
+from pyspark.pandas.internal import (
+ InternalFrame,
+ SPARK_DEFAULT_INDEX_NAME,
+ SPARK_INDEX_NAME_FORMAT,
+)
+from pyspark.pandas.utils import spark_column_equals
class InternalFrameParityTests(
InternalFrameTestsMixin, PandasOnSparkTestUtils, ReusedConnectTestCase
):
- @unittest.skip("TODO(SPARK-43654): Enable InternalFrameParityTests.test_from_pandas.")
def test_from_pandas(self):
- super().test_from_pandas()
Review Comment:
We cannot test exactly same way with non-connect mode, so I manually write the test for Spark Connect.
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: reviews-unsubscribe@spark.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
---------------------------------------------------------------------
To unsubscribe, e-mail: reviews-unsubscribe@spark.apache.org
For additional commands, e-mail: reviews-help@spark.apache.org
[GitHub] [spark] itholic commented on a diff in pull request #42956: [SPARK-43654][CONNECT][PS][TESTS] Enable `InternalFrameParityTests.test_from_pandas`
Posted by "itholic (via GitHub)" <gi...@apache.org>.
itholic commented on code in PR #42956:
URL: https://github.com/apache/spark/pull/42956#discussion_r1328217955
##########
python/pyspark/pandas/tests/connect/test_parity_internal.py:
##########
@@ -15,18 +15,86 @@
# limitations under the License.
#
import unittest
+import pandas as pd
from pyspark.pandas.tests.test_internal import InternalFrameTestsMixin
from pyspark.testing.connectutils import ReusedConnectTestCase
from pyspark.testing.pandasutils import PandasOnSparkTestUtils
+from pyspark.pandas.internal import (
+ InternalFrame,
+ SPARK_DEFAULT_INDEX_NAME,
+ SPARK_INDEX_NAME_FORMAT,
+)
+from pyspark.pandas.utils import spark_column_equals
class InternalFrameParityTests(
InternalFrameTestsMixin, PandasOnSparkTestUtils, ReusedConnectTestCase
):
- @unittest.skip("TODO(SPARK-43654): Enable InternalFrameParityTests.test_from_pandas.")
def test_from_pandas(self):
- super().test_from_pandas()
+ pdf = pd.DataFrame({"a": [1, 2, 3], "b": [4, 5, 6]})
Review Comment:
> what about simplify the tests by comparing the column string representations
Yeah, this is exactly what we're doing currently for `spark_column_equals`:
```python
if is_remote():
# Hide unrelated codes
return repr(left) == repr(right)
else:
return left._jc.equals(right._jc)
```
But it's not working for the case comparing `internal.spark_column_for(("b",))` and `sdf["b"]` because they have different string representations for some reason as below:
```python
import pandas as pd
from pyspark.pandas.internal import InternalFrame
internal = InternalFrame.from_pandas(pdf)
sdf = internal.spark_frame
pdf = pd.DataFrame({"a": [1, 2, 3]})
internal = InternalFrame.from_pandas(pdf)
sdf = internal.spark_frame
repr(internal.spark_column_for(("a",)))
# "Column<'`a`'>"
repr(sdf["a"])
# "Column<'a'>"
```
Do you happen to have any idea why the backtick surrounds the Column name in Spark Connect?
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: reviews-unsubscribe@spark.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
---------------------------------------------------------------------
To unsubscribe, e-mail: reviews-unsubscribe@spark.apache.org
For additional commands, e-mail: reviews-help@spark.apache.org
[GitHub] [spark] itholic commented on a diff in pull request #42956: [SPARK-43654][CONNECT][PS][TESTS] Enable `InternalFrameParityTests.test_from_pandas`
Posted by "itholic (via GitHub)" <gi...@apache.org>.
itholic commented on code in PR #42956:
URL: https://github.com/apache/spark/pull/42956#discussion_r1327938259
##########
python/pyspark/pandas/tests/connect/test_parity_internal.py:
##########
@@ -15,18 +15,86 @@
# limitations under the License.
#
import unittest
+import pandas as pd
from pyspark.pandas.tests.test_internal import InternalFrameTestsMixin
from pyspark.testing.connectutils import ReusedConnectTestCase
from pyspark.testing.pandasutils import PandasOnSparkTestUtils
+from pyspark.pandas.internal import (
+ InternalFrame,
+ SPARK_DEFAULT_INDEX_NAME,
+ SPARK_INDEX_NAME_FORMAT,
+)
+from pyspark.pandas.utils import spark_column_equals
class InternalFrameParityTests(
InternalFrameTestsMixin, PandasOnSparkTestUtils, ReusedConnectTestCase
):
- @unittest.skip("TODO(SPARK-43654): Enable InternalFrameParityTests.test_from_pandas.")
def test_from_pandas(self):
- super().test_from_pandas()
Review Comment:
We cannot test exactly same way with non-connect mode, so I manually write the test for Spark Connect.
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: reviews-unsubscribe@spark.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
---------------------------------------------------------------------
To unsubscribe, e-mail: reviews-unsubscribe@spark.apache.org
For additional commands, e-mail: reviews-help@spark.apache.org
[GitHub] [spark] dongjoon-hyun closed pull request #42956: [SPARK-43654][CONNECT][PS][TESTS] Enable `InternalFrameParityTests.test_from_pandas`
Posted by "dongjoon-hyun (via GitHub)" <gi...@apache.org>.
dongjoon-hyun closed pull request #42956: [SPARK-43654][CONNECT][PS][TESTS] Enable `InternalFrameParityTests.test_from_pandas`
URL: https://github.com/apache/spark/pull/42956
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: reviews-unsubscribe@spark.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
---------------------------------------------------------------------
To unsubscribe, e-mail: reviews-unsubscribe@spark.apache.org
For additional commands, e-mail: reviews-help@spark.apache.org
[GitHub] [spark] zhengruifeng commented on a diff in pull request #42956: [SPARK-43654][CONNECT][PS][TESTS] Enable `InternalFrameParityTests.test_from_pandas`
Posted by "zhengruifeng (via GitHub)" <gi...@apache.org>.
zhengruifeng commented on code in PR #42956:
URL: https://github.com/apache/spark/pull/42956#discussion_r1328212481
##########
python/pyspark/pandas/tests/connect/test_parity_internal.py:
##########
@@ -15,18 +15,86 @@
# limitations under the License.
#
import unittest
+import pandas as pd
from pyspark.pandas.tests.test_internal import InternalFrameTestsMixin
from pyspark.testing.connectutils import ReusedConnectTestCase
from pyspark.testing.pandasutils import PandasOnSparkTestUtils
+from pyspark.pandas.internal import (
+ InternalFrame,
+ SPARK_DEFAULT_INDEX_NAME,
+ SPARK_INDEX_NAME_FORMAT,
+)
+from pyspark.pandas.utils import spark_column_equals
class InternalFrameParityTests(
InternalFrameTestsMixin, PandasOnSparkTestUtils, ReusedConnectTestCase
):
- @unittest.skip("TODO(SPARK-43654): Enable InternalFrameParityTests.test_from_pandas.")
def test_from_pandas(self):
- super().test_from_pandas()
+ pdf = pd.DataFrame({"a": [1, 2, 3], "b": [4, 5, 6]})
Review Comment:
Instead of compare the columns, what about simplify the tests by comparing the column string representations?
Otherwise, you may have to add `__eq__` for Column and all the Expressions in Connect, but I am not sure whether it works in case 'resolved column' vs 'unresolved column'
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: reviews-unsubscribe@spark.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
---------------------------------------------------------------------
To unsubscribe, e-mail: reviews-unsubscribe@spark.apache.org
For additional commands, e-mail: reviews-help@spark.apache.org
[GitHub] [spark] HyukjinKwon commented on a diff in pull request #42956: [SPARK-43654][CONNECT][PS][TESTS] Enable `InternalFrameParityTests.test_from_pandas`
Posted by "HyukjinKwon (via GitHub)" <gi...@apache.org>.
HyukjinKwon commented on code in PR #42956:
URL: https://github.com/apache/spark/pull/42956#discussion_r1328167074
##########
python/pyspark/pandas/tests/connect/test_parity_internal.py:
##########
@@ -15,18 +15,86 @@
# limitations under the License.
#
import unittest
+import pandas as pd
from pyspark.pandas.tests.test_internal import InternalFrameTestsMixin
from pyspark.testing.connectutils import ReusedConnectTestCase
from pyspark.testing.pandasutils import PandasOnSparkTestUtils
+from pyspark.pandas.internal import (
+ InternalFrame,
+ SPARK_DEFAULT_INDEX_NAME,
+ SPARK_INDEX_NAME_FORMAT,
+)
+from pyspark.pandas.utils import spark_column_equals
class InternalFrameParityTests(
InternalFrameTestsMixin, PandasOnSparkTestUtils, ReusedConnectTestCase
):
- @unittest.skip("TODO(SPARK-43654): Enable InternalFrameParityTests.test_from_pandas.")
def test_from_pandas(self):
- super().test_from_pandas()
+ pdf = pd.DataFrame({"a": [1, 2, 3], "b": [4, 5, 6]})
Review Comment:
yeah, why is the test different? Can we use the same test?
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: reviews-unsubscribe@spark.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
---------------------------------------------------------------------
To unsubscribe, e-mail: reviews-unsubscribe@spark.apache.org
For additional commands, e-mail: reviews-help@spark.apache.org
[GitHub] [spark] itholic commented on a diff in pull request #42956: [SPARK-43654][CONNECT][PS][TESTS] Enable `InternalFrameParityTests.test_from_pandas`
Posted by "itholic (via GitHub)" <gi...@apache.org>.
itholic commented on code in PR #42956:
URL: https://github.com/apache/spark/pull/42956#discussion_r1328218762
##########
python/pyspark/pandas/tests/connect/test_parity_internal.py:
##########
@@ -15,18 +15,86 @@
# limitations under the License.
#
import unittest
+import pandas as pd
from pyspark.pandas.tests.test_internal import InternalFrameTestsMixin
from pyspark.testing.connectutils import ReusedConnectTestCase
from pyspark.testing.pandasutils import PandasOnSparkTestUtils
+from pyspark.pandas.internal import (
+ InternalFrame,
+ SPARK_DEFAULT_INDEX_NAME,
+ SPARK_INDEX_NAME_FORMAT,
+)
+from pyspark.pandas.utils import spark_column_equals
class InternalFrameParityTests(
InternalFrameTestsMixin, PandasOnSparkTestUtils, ReusedConnectTestCase
):
- @unittest.skip("TODO(SPARK-43654): Enable InternalFrameParityTests.test_from_pandas.")
def test_from_pandas(self):
- super().test_from_pandas()
+ pdf = pd.DataFrame({"a": [1, 2, 3], "b": [4, 5, 6]})
Review Comment:
Or maybe we can manually remove the backticks when comparing the Column `repr` for now?
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: reviews-unsubscribe@spark.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
---------------------------------------------------------------------
To unsubscribe, e-mail: reviews-unsubscribe@spark.apache.org
For additional commands, e-mail: reviews-help@spark.apache.org