Skip to content

Commit 3b3c1af

Browse files
author
Michael Chirico
committed
pick a more logical ordering for valid joinTypes
1 parent 961ec34 commit 3b3c1af

File tree

2 files changed

+2
-2
lines changed

2 files changed

+2
-2
lines changed

R/pkg/R/DataFrame.R

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2607,7 +2607,7 @@ setMethod("join",
26072607
"outer", "full", "fullouter", "full_outer",
26082608
"left", "leftouter", "left_outer",
26092609
"right", "rightouter", "right_outer",
2610-
"semi", "left_semi", "leftsemi", "anti", "left_anti", "leftanti")
2610+
"semi", "leftsemi", "left_semi", "anti", "leftanti", "left_anti")
26112611
if (joinType %in% valid_join_types) {
26122612
joinType <- gsub("_", "", joinType, fixed = TRUE)
26132613
sdf <- callJMethod(x@sdf, "join", y@sdf, joinExpr@jc, joinType)

R/pkg/tests/fulltests/test_sparkSQL.R

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2558,7 +2558,7 @@ test_that("join(), crossJoin() and merge() on a DataFrame", {
25582558
error_msg <- paste("joinType must be one of the following types:",
25592559
"'inner', 'cross', 'outer', 'full', 'fullouter', 'full_outer',",
25602560
"'left', 'leftouter', 'left_outer', 'right', 'rightouter', 'right_outer',",
2561-
"'semi', 'left_semi', 'leftsemi', 'anti', 'left_anti', 'leftanti'")
2561+
"'semi', 'leftsemi', 'left_semi', 'anti', 'leftanti', 'left_anti'")
25622562
expect_error(join(df2, df, df2$name == df$name, "invalid"), error_msg)
25632563

25642564
merged <- merge(df, df2, by.x = "name", by.y = "name", all.x = TRUE, all.y = TRUE)

0 commit comments

Comments
 (0)