Skip to content

[SPARK-22063][R] Fixes lint check failures in R by latest commit sha1 ID of lint-r #19290

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.

Sign up for GitHub

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

Closed
HyukjinKwon wants to merge 7 commits into from
Closed

[SPARK-22063][R] Fixes lint check failures in R by latest commit sha1 ID of lint-r #19290

Changes from 1 commit
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
327e5ee
Upgrade lintr to latest commit sha1 ID
HyukjinKwon Sep 19, 2017
b4b1dc9
Let's do nolint for LaTex hrefs
HyukjinKwon Sep 20, 2017
e83fd5a
Remove generateAliasesForIntersectedCols in the doc and shorten the name
HyukjinKwon Sep 21, 2017
fd64752
[SPARK-22082][SparkR]Spelling mistake: choosen in API doc of R.
Sep 21, 2017
3a5be94
Installs lintr if lintr is not installed already or not the specified…
HyukjinKwon Sep 24, 2017
2e89c2a
Remove note in genAliasesForIntersectedCols
HyukjinKwon Sep 24, 2017
550750e
Revert auto-detection back so that it does not try to upgrade lintr
HyukjinKwon Sep 29, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Remove generateAliasesForIntersectedCols in the doc and shorten the name
  • Loading branch information
@HyukjinKwon
HyukjinKwon committed Sep 29, 2017
commit e83fd5a78fd5aa66a5efa8d33549e5de80862353
9 changes: 5 additions & 4 deletions R/pkg/R/DataFrame.R
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2614,8 +2614,8 @@ setMethod("merge",
}

# sets alias for making colnames unique in dataframes 'x' and 'y'
colsX <- generateAliasesForIntersectedCols(x, by, suffixes[1]) # nolint
colsY <- generateAliasesForIntersectedCols(y, by, suffixes[2]) # nolint
colsX <- genAliasesForIntersectedCols(x, by, suffixes[1])
colsY <- genAliasesForIntersectedCols(y, by, suffixes[2])

# selects columns with their aliases from dataframes
# in case same column names are present in both data frames
Expand Down Expand Up @@ -2664,8 +2664,9 @@ setMethod("merge",
#' @param suffix a suffix for the column name
#' @return list of columns
#'
#' @note generateAliasesForIntersectedCols since 1.6.0
generateAliasesForIntersectedCols <- function(x, intersectedColNames, suffix) { # nolint
#' @note genAliasesForIntersectedCols since 1.6.0
Copy link
Member

@felixcheung felixcheung Sep 23, 2017

Choose a reason for hiding this comment

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

nit: I'd remove this @note too

#' @noRd
genAliasesForIntersectedCols <- function(x, intersectedColNames, suffix) {
allColNames <- names(x)
# sets alias for making colnames unique in dataframe 'x'
cols <- lapply(allColNames, function(colName) {
Expand Down