Unify implementation of fillna and isna in Pyspark backend #2882
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
icexelloss
reviewed
Jul 29, 2021
ibis/backends/pyspark/compiler.py
Outdated
| @@ -1742,7 +1742,9 @@ def compile_if_null(t, expr, scope, timecontext, **kwargs): | |||
| op = expr.op() | |||
| col = t.translate(op.arg, scope, timecontext) | |||
| ifnull_col = t.translate(op.ifnull_expr, scope, timecontext) | |||
| return F.when(col.isNull(), ifnull_col).otherwise(col) | |||
| return F.when(col.isNull(), ifnull_col).otherwise( | |||
There was a problem hiding this comment.
F.when(col.isNull() | F.isnan(col), ifnull_col).otherwise(col)
Does this work?
icexelloss
reviewed
Jul 29, 2021
| drop=True | ||
| ) | ||
| tm.assert_frame_equal(result, expected) | ||
|
|
||
|
|
||
| def test_fillna(client): |
There was a problem hiding this comment.
Can you move this test to the shared test?
There was a problem hiding this comment.
Moved to test_generic.py
icexelloss
reviewed
Jul 29, 2021
| tm.assert_frame_equal(result, expected) | ||
|
|
||
|
|
||
| def test_notnull(client): | ||
| table = client.table('nan_table') | ||
| def test_isna(client): |
There was a problem hiding this comment.
Can you move this to the shared test to ensure same behavior?
There was a problem hiding this comment.
Moved to test_generic.py
icexelloss
suggested changes
Jul 29, 2021
jreback
suggested changes
Jul 30, 2021
jreback
reviewed
Jul 30, 2021
| @@ -30,6 +30,43 @@ def test_fillna_nullif(backend, con, expr, expected): | |||
| assert con.execute(expr) == expected | |||
|
|
|||
|
|
|||
| @pytest.mark.only_on_backends(['pandas', 'dask', 'pyspark']) | |||
There was a problem hiding this comment.
do these work on other backends?
There was a problem hiding this comment.
They error out in SQL, impala, etc. https://github.com/ibis-project/ibis/runs/3196422295
jreback
approved these changes
Jul 31, 2021
|
thanks @emilyreff7 |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Proposed Change
Unify the Pyspark backend's treatment of
fillnaandisnato match the Pandas backend.Before this PR:
fillnanp.nanfillnaNoneisnanp.nanisnaNoneAfter this PR, the Pyspark behavior for
fillnawithnp.nan, andisnawith nulls, will match the Pandas behavior.Testing
Added tests for Pyspark in
test_null.pyto assert this new behavior.