-
Notifications
You must be signed in to change notification settings - Fork 1k
exclude ... from tables() search
#5199
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
Merged
Merged
Changes from all commits
Commits
Show all changes
7 commits
Select commit
Hold shift + click to select a range
e32864b
exclude `...` from tables() search
MichaelChirico 73c2b04
add a test
MichaelChirico 75cc738
small tweaks to avoid double-sorting
MichaelChirico 3412a2c
coverage
MichaelChirico af73d5f
NEWS
MichaelChirico b7571ba
use mget() over repeated get()
MichaelChirico 0cd1ad1
merge master, tweak news item
mattdowle File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or 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
This file contains hidden or 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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -2,12 +2,13 @@ | |
| MB = NCOL = NROW = NULL | ||
|
|
||
| tables = function(mb=TRUE, order.col="NAME", width=80, | ||
| env=parent.frame(), silent=FALSE, index=FALSE) | ||
| env=parent.frame(), silent=FALSE, index=FALSE) | ||
| { | ||
| # Prints name, size and colnames of all data.tables in the calling environment by default | ||
| all_obj = objects(envir=env, all.names=TRUE) | ||
| is_DT = which(vapply_1b(all_obj, function(x) is.data.table(get(x, envir=env)))) | ||
| if (!length(is_DT)) { | ||
| # include "hidden" objects (starting with .) via all.names=TRUE, but exclude ... specifically, #5197 | ||
| all_obj = grep("...", objects(envir=env, all.names=TRUE, sorted=order.col == "NAME"), invert=TRUE, fixed=TRUE, value=TRUE) | ||
| is_DT = vapply_1b(mget(all_obj, envir=env), is.data.table) | ||
|
Member
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. changing from |
||
| if (!any(is_DT)) { | ||
| if (!silent) catf("No objects of class data.table exist in %s\n", if (identical(env, .GlobalEnv)) ".GlobalEnv" else format(env)) | ||
| return(invisible(data.table(NULL))) | ||
| } | ||
|
|
@@ -23,8 +24,11 @@ tables = function(mb=TRUE, order.col="NAME", width=80, | |
| KEY = list(key(DT)), | ||
| INDICES = if (index) list(indices(DT))) | ||
| })) | ||
| if (!order.col %chin% names(info)) stopf("order.col='%s' not a column name of info", order.col) | ||
| info = info[base::order(info[[order.col]])] # base::order to maintain locale ordering of table names | ||
| # objects() above handled the sorting for order.col=="NAME" | ||
| if (order.col != "NAME") { | ||
| if (!order.col %chin% names(info)) stopf("order.col='%s' not a column name of info", order.col) | ||
| info = info[base::order(info[[order.col]])] # base::order to maintain locale ordering of table names | ||
| } | ||
| if (!silent) { | ||
| # prettier printing on console | ||
| pretty_format = function(x, width) { | ||
|
|
||
This file contains hidden or 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
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.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
we could also pass
pattern="^([^.]|[.][^.]|[.][.][^.])"to do it in one call, but that's pretty ugly, and anywayobjects()itself is just callinggrep()so there's no efficiency benefit (i.e.,patternis not being handled in C), so wrapping ingrep()does the same thing with a more readablegrep()call.Uh oh!
There was an error while loading. Please reload this page.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
objects()only callsgrep()whenpatternis notmissing, iiuc. Butpatternis missing in thisobjects()call. So doesn't addinggrephere add overhead ofgrepwhen all we want to do is remove the string"..."if it's present?