Fix NearestNeighbors _ensureIdCol to check whether id_col in df.columns instead of relying on isSet(idCol) #642
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
|
build |
eordentlich
reviewed
May 8, 2024
python/src/spark_rapids_ml/knn.py
Outdated
| @@ -151,7 +151,7 @@ def _ensureIdCol(self, df: DataFrame) -> DataFrame: | |||
| id_col_name = self.getIdCol() | |||
| df_withid = ( | |||
| df | |||
| if self.isSet("idCol") | |||
| if id_col_name in df.columns | |||
There was a problem hiding this comment.
The following case is still broken it seems. idCol was not set, but queryDf contains a column with the same name as the default id column. The above check for this case on self.isSet("idCol") would not work as expected because of the copy. Seems like relying on isSet leads to very confusing and convoluted logic because of its behavior under copy. Any alternative?
There was a problem hiding this comment.
Revised. The alternative first checks whether getIdCol() is inside the df.
And it throws a ValueError if query_df has a column with the same default name but idCol was not set.
Signed-off-by: Jinfeng <[email protected]>
|
build |
|
build |
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.
No description provided.