Skip to content

[SPARK-19342][SPARKR] bug fixed in collect method for collecting timestamp column #16689

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
titicaca wants to merge 9 commits into from
Closed

[SPARK-19342][SPARKR] bug fixed in collect method for collecting timestamp column #16689

Changes from 1 commit
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
a51c2eb
SPARK-19342 bug fixed in collect method for collecting timestamp column
titicaca Jan 24, 2017
5829ddd
SPARK-19342 bug fixed in collect method for collecting timestamp column
titicaca Jan 24, 2017
6a0eb3f
SPARK-19342 bug fixed in collect method for collecting timestamp colu…
titicaca Jan 25, 2017
09d4dfb
SPARK-19342 fix R code style error in test
titicaca Jan 25, 2017
43e334a
SPARK-19342 If vec is an vector with only NAs, the type will be cast …
titicaca Jan 25, 2017
7903bb3
SPARK-19342 fix for R style checks
titicaca Jan 31, 2017
8379c38
SPARK-19342 remove the comment
titicaca Jan 31, 2017
407c625
SPARK-19342 modify PRIMITIVE_TYPES for type timestamp
titicaca Feb 1, 2017
d6d454e
SPARK-19342 fix for method coltypes in test_sparkSQL.R#2262
titicaca Feb 4, 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
12 changes: 10 additions & 2 deletions R/pkg/R/DataFrame.R
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1136,9 +1136,17 @@ setMethod("collect",

# Note that "binary" columns behave like complex types.
if (!is.null(PRIMITIVE_TYPES[[colType]]) && colType != "binary") {
vec <- do.call(c, col)
valueIndex <- which(!is.na(col))
if (length(valueIndex) > 0 && valueIndex[1] > 1) {
colTail <- col[-(1 : (valueIndex[1] - 1))]
vec <- do.call(c, colTail)
classVal <- class(vec)
vec <- c(rep(NA, valueIndex[1] - 1), vec)
class(vec) <- classVal
Copy link
Member

@felixcheung felixcheung Jan 24, 2017

Choose a reason for hiding this comment

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

Hmm, what happened here?
if you want to drop the NA and use the rest to infer the class you can do col[!is.na(col)]

} else {
vec <- do.call(c, col)
}
stopifnot(class(vec) != "list")
class(vec) <- PRIMITIVE_TYPES[[colType]]
df[[colIndex]] <- vec
} else {
df[[colIndex]] <- col
Expand Down