-
Notifications
You must be signed in to change notification settings - Fork 985
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
[cbindlist/mergelist] Add ERR to the mult enum in bmerge.c #6432
base: cbind-merge-list-prep
Are you sure you want to change the base?
Conversation
Warning This pull request is not mergeable via GitHub because a downstack PR is open. Once all requirements are satisfied, merge this PR as a stack on Graphite.
This stack of pull requests is managed by Graphite. Learn more about stacking. |
456a8e6
to
e165121
Compare
8a519b4
to
275c386
Compare
Generated via commit 7342791 Download link for the artifact containing the test results: ↓ atime-results.zip
|
@jangorecki is there any user-facing change in this PR? Should it get its own NEWS item/tests directly of |
Yes new.supported value for mult sounds like user facing change |
OK thanks. Please add NEWS, I think it should get direct tests in tests.Rraw besides what's done implicitly in mergelist.Rraw, too. |
e165121
to
7a6a141
Compare
275c386
to
82b940a
Compare
7a6a141
to
707d5cf
Compare
82b940a
to
cb6358d
Compare
db210a8
to
4684f67
Compare
cb6358d
to
1b06b9c
Compare
4684f67
to
761bbee
Compare
1b06b9c
to
80ec084
Compare
761bbee
to
01233bf
Compare
80ec084
to
39fc30e
Compare
Codecov ReportAttention: Patch coverage is
Additional details and impacted files@@ Coverage Diff @@
## cbind-merge-list-prep #6432 +/- ##
=========================================================
- Coverage 98.62% 98.61% -0.02%
=========================================================
Files 79 79
Lines 14472 14474 +2
=========================================================
Hits 14273 14273
- Misses 199 201 +2 ☔ View full report in Codecov by Sentry. |
@jangorecki I'm confused, how is this actually supposed to work? DT1=data.table(a=1, b=2)
DT2=data.table(a=1, c=3:4)
DT1[DT2, on=.(a >= a), mult='error']
# Error in bmerge(i, x, leftcols, rightcols, roll, rollends, nomatch, mult, :
# Internal error in nestedid: invalid value for 'mult'. Please report to the data.table issues tracker. That's from: Line 166 in 7419796
So it looks like we don't actually have support for I used Lines 405 to 440 in 7419796
Do we actually need to expose |
Firstly I would check what is the output of the original branch so rule out issues related to conflicts resolution. But afair this PR was not meant to change [ yet, only provide new functions. |
Yea, I get the same error at the end of the chain (#4370). So I think we should not make the change to data.table.R here. |
add cbind by reference, timing R prototype of mergelist wording use lower overhead funs stick to int32 for now, correct R_alloc bmerge C refactor for codecov and one loop for speed address revealed codecov gaps refactor vecseq for codecov seqexp helper, some alloccol export on C bmerge codecov, types handled in R bmerge already better comment seqexp bmerge mult=error #655 multiple new C utils swap if branches explain new C utils comments mostly reduce conflicts to PR #4386 comment C code address multiple matches during update-on-join #3747 Revert "address multiple matches during update-on-join #3747" This reverts commit b64c0c3. merge.dt has temporarily mult arg, for testing minor changes to cbindlist c dev mergelist, for single pair now add quiet option to cc() mergelist tests add check for names to perhaps.dt rm mult from merge.dt method rework, clean, polish multer, fix righ and full joins make full join symmetric mergepair inner function to loop on extra check for symmetric mergelist manual ensure no df-dt passed where list expected comments and manual handle 0 cols tables more tests more tests and debugging move more logic closer to bmerge, simplify mergepair more tests revert not used changes reduce not needed checks, cleanup copy arg behavior, manual, no tests yet cbindlist manual, export both cleanup processing bmerge to dtmatch test function match order for easier preview vecseq gets short-circuit batch test allow browser big cleanup remmove unneeded stuff, reduce diff more cleanup, minor manual fixes add proper test scripts Merge branch 'master' into cbind-merge-list comment out not used code for coverage more tests, some nocopy opts rename sql test script, should fix codecov simplify dtmatch inner branch more precise copy, now copy only T or F unused arg not yet in api, wording comments and refer issues codecov hasindex coverage codecov gap tests for join using key, cols argument fix missing import forderv more tests, improve missing on handling more tests for order of inner and full join for long keys new allow.cartesian option, #4383, #914 reduce diff, improve codecov reduce diff, comments need more DT, not lists, mergelist 3+ tbls proper escape heavy check unit tests more tests, address overalloc failure mergelist and cbindlist retain index manual, examples fix manual minor clarify in manual retain keys, right outer join for snowflake schema joins duplicates in cbindlist recycling in cbindlist escape 0 input in copyCols empty input handling closing cbindlist vectorized _on_ and _join.many_ arg rename dtmatch to dtmerge vectorized args: how, mult push down input validation add support for cross join, semi join, anti join full join, reduce overhead for mult=error mult default value dynamic fix manual add "see details" to Rd mention shared on in arg description amend feedback from Michael semi and anti joins will not reorder x columns Merge branch 'master' into cbind-merge-list spelling, thx to @jan-glx check all new funs used and add comments bugfix, sort=T needed for now Merge branch 'master' into cbind-merge-list Update NEWS.md Merge branch 'master' into cbind-merge-list Merge branch 'master' into cbind-merge-list NEWS placement numbering ascArg->order Merge remote-tracking branch 'origin/cbind-merge-list' into cbind-merge-list attempt to restore from master Update to stopf() error style Need isFrame for now More quality checks: any(!x)->!all(x); use vapply_1{b,c,i} really restore from master try to PROTECT() before duplicate() update error message in test appease the rchk gods extraneous space missing ';' use catf simplify perhapsDataTableR move sqlite.Rraw.manual into other.Rraw simplify for loop Merge remote-tracking branch 'origin/cbind-merge-list' into cbind-merge-list
39fc30e
to
0ab0f5e
Compare
OK, this PR is G2G. |
Towards #4370. Support for this value of
mult
is required bymergepair()
later; not actually exposed to use here, so ignoring codecov report. To be tested later.