Skip to content
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.

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

fix type coercion in bmerge #6603

Draft
wants to merge 23 commits into
base: master
Choose a base branch
from
Draft

fix type coercion in bmerge #6603

wants to merge 23 commits into from

Conversation

ben-schwen
Copy link
Member

@ben-schwen ben-schwen commented Nov 3, 2024

Closes #6602

NB: I'm not happy that a user can get different messages, depending on the number of join conditions, but coercing both Dates to double when multiple column conditions exist, seems like the right decision.

Base does not encounter this problem since one join column can not be in multiple join conditions.

Copy link

github-actions bot commented Nov 3, 2024

Comparison Plot

Generated via commit 91c53c5

Download link for the artifact containing the test results: ↓ atime-results.zip

Task Duration
R setup and installing dependencies 4 minutes and 37 seconds
Installing different package versions 7 minutes and 47 seconds
Running and plotting the test cases 2 minutes and 27 seconds

Copy link

codecov bot commented Nov 3, 2024

Codecov Report

All modified and coverable lines are covered by tests ✅

Project coverage is 98.61%. Comparing base (6a15f86) to head (91c53c5).
Report is 10 commits behind head on master.

Additional details and impacted files
@@           Coverage Diff           @@
##           master    #6603   +/-   ##
=======================================
  Coverage   98.60%   98.61%           
=======================================
  Files          79       79           
  Lines       14516    14547   +31     
=======================================
+ Hits        14314    14345   +31     
  Misses        202      202           

☔ View full report in Codecov by Sentry.
📢 Have feedback on the report? Share it here.

@ben-schwen ben-schwen marked this pull request as ready for review November 3, 2024 21:52
@ben-schwen
Copy link
Member Author

ben-schwen commented Nov 3, 2024

@MichaelChirico is it worth to make the if more specific to this corner case e.g.

(length(unique(icols))!=length(icols) || length(unique(xcols))!=length(xcols))

ensuring that either icols has a double condition or xcols has a double condition?

R/bmerge.R Outdated Show resolved Hide resolved
@MichaelChirico
Copy link
Member

Sorry, I just saw that this is a CRAN requirement, checking now.

R/bmerge.R Outdated
@@ -71,7 +71,13 @@ bmerge = function(i, x, icols, xcols, roll, rollends, nomatch, mult, ops, verbos
stopf("Incompatible join types: %s (%s) and %s (%s). Factor columns must join to factor or character columns.", xname, xclass, iname, iclass)
}
if (xclass == iclass) {
Copy link
Member

@MichaelChirico MichaelChirico Nov 22, 2024

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

aside: {x,i}class seem like poor name choices here, given that they typically come from typeof() (and class() is never called, except maybe internally by inherits()).

{x,i}type would be more appropriate, but {x,i}_merge_type might be even better?

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

another aside: It looks like we do x[[xc]] and i[[ic]] extraction at least one and up to several times. Should we just store the extracted column locally?

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

aside: {x,i}class seem like poor name choices here, given that they typically come from typeof() (and class() is never called, except maybe internally by inherits()).

Yes but didn't want to change more than needed for the quick fix

@MichaelChirico
Copy link
Member

Definitely thanks for triaging a fix here. I think we both agree it's pretty hack-y & ideally not needed.

I'm not sure I fully understand the bug yet, but as stated in OP we're doing as.Date().

IMO as.Date() should always coerce to double storage, even if it's possible to get Date objects with integer storage. Therefore I would hold off until (1) R-core confirms that yes, as.Date(x) might return integer sometimes; and/or (2) I get a clearer understanding of the underlying issue here.

@ben-schwen
Copy link
Member Author

IMO as.Date() should always coerce to double storage, even if it's possible to get Date objects with integer storage. Therefore I would hold off until (1) R-core confirms that yes, as.Date(x) might return integer sometimes; and/or (2) I get a clearer understanding of the underlying issue here.

Unfortunately this "contract" does not hold. I have a Windows dev version installed here and get the following

> typeof(.Date(0L))
[1] "integer"
> typeof(as.Date(.Date(0L)))
[1] "integer"

@MichaelChirico
Copy link
Member

I have a Windows dev version installed here and get the following

Thanks, also confirmed that on 4.4.1

@TysonStanley
Copy link
Member

This is strange as Kurt mentioned there wasn't an intention to do this but I figure it would have been fixed by now if that were the case.

@ben-schwen
Copy link
Member Author

Update this fix now can convert into one direction from integer to double

# this works
x = data.table(a=1L)
y = data.table(c=1L, d=2)
y[x, on=.(c==a, d==a)]
y[x, on=.(d==a, c==a)]
# this still needs to fixed
x = data.table(a=1)
y = data.table(c=1, d=2L)
y[x, on=.(c==a, d==a)]
y[x, on=.(d==a, c==a)]

@MichaelChirico
Copy link
Member

this still needs to fixed

Should I consider this PR in-progress for now?

The diff has grown enough that it would help to add a brief overview of the changes to the PR description to orient reading

R/bmerge.R Outdated
newvalue = chmatch(i[[ic]], levels(x[[xc]]), nomatch=0L)
if (anyNA(i[[ic]])) newvalue[is.na(i[[ic]])] = NA_integer_ # NA_character_ should match to NA in factor, #3809
set(i, j=ic, value=newvalue)
if (nrow(i)) {
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Haven't read carefully yet, but given the description of the problem as I understand it now, I had expected something like this to be needed:

(1) A pass over the join columns to determine the "join type" of each column
(2) A second pass to actually do the coercions as needed

Does that make sense to you? If so, each step could be a helper function which would improve readability & modularity.

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

In theory yes, but we actually only have to take a look the case of mixing double and integer columns, since this is the only case where we previously made bmerge smart enough to cater for different types (besides character and factors)

@ben-schwen ben-schwen marked this pull request as draft November 25, 2024 11:58
@TysonStanley
Copy link
Member

Just received the "deadline" on this from Kurt:

Please correct before 2024-12-09 to safely retain your package on CRAN. Note that this will be the final reminder.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

as.Date can result in different underlying types
4 participants