Resolve conflicts

Author: Robert Kruszewski

R/pkg/NAMESPACE

@@ -205,13 +205,9 @@ exportMethods("%<=>%",
               "array_max",
               "array_min",
               "array_position",
-<<<<<<< HEAD
-              "array_sort",
-=======
               "array_repeat",
               "array_sort",
               "arrays_overlap",
->>>>>>> master
               "asc",
               "ascii",
               "asin",

R/pkg/R/client.R

@@ -63,11 +63,7 @@ generateSparkSubmitArgs <- function(args, sparkHome, jars, sparkSubmitOpts, pack
 checkJavaVersion <- function() {
   javaBin <- "java"
   javaHome <- Sys.getenv("JAVA_HOME")
-<<<<<<< HEAD
-  javaReqs <- utils::packageDescription(utils::packageName(), fields=c("SystemRequirements"))
-=======
   javaReqs <- utils::packageDescription(utils::packageName(), fields = c("SystemRequirements"))
->>>>>>> master
   sparkJavaVersion <- as.numeric(tail(strsplit(javaReqs, "[(=)]")[[1]], n = 1L))
   if (javaHome != "") {
     javaBin <- file.path(javaHome, "bin", javaBin)
@@ -94,12 +90,8 @@ checkJavaVersion <- function() {
   # Extract 8 from it to compare to sparkJavaVersion
   javaVersionNum <- as.integer(strsplit(javaVersionStr, "[.]")[[1L]][2])
   if (javaVersionNum != sparkJavaVersion) {
-<<<<<<< HEAD
-    stop(paste("Java version", sparkJavaVersion, "is required for this package; found version:", javaVersionStr))
-=======
     stop(paste("Java version", sparkJavaVersion, "is required for this package; found version:",
                javaVersionStr))
->>>>>>> master
   }
 }
 

R/pkg/R/functions.R

@@ -208,11 +208,7 @@ NULL
 #' tmp <- mutate(df, v1 = create_array(df$mpg, df$cyl, df$hp))
 #' head(select(tmp, array_contains(tmp$v1, 21), size(tmp$v1)))
 #' head(select(tmp, array_max(tmp$v1), array_min(tmp$v1)))
-<<<<<<< HEAD
-#' head(select(tmp, array_position(tmp$v1, 21), array_sort(tmp$v1)))
-=======
 #' head(select(tmp, array_position(tmp$v1, 21), array_repeat(df$mpg, 3), array_sort(tmp$v1)))
->>>>>>> master
 #' head(select(tmp, flatten(tmp$v1), reverse(tmp$v1)))
 #' tmp2 <- mutate(tmp, v2 = explode(tmp$v1))
 #' head(tmp2)
@@ -221,22 +217,13 @@ NULL
 #' head(select(tmp, sort_array(tmp$v1)))
 #' head(select(tmp, sort_array(tmp$v1, asc = FALSE)))
 #' tmp3 <- mutate(df, v3 = create_map(df$model, df$cyl))
-<<<<<<< HEAD
-#' head(select(tmp3, map_keys(tmp3$v3)))
-#' head(select(tmp3, map_values(tmp3$v3)))
-#' head(select(tmp3, element_at(tmp3$v3, "Valiant")))
-#' tmp4 <- mutate(df, v4 = create_array(df$mpg, df$cyl), v5 = create_array(df$hp))
-#' head(select(tmp4, concat(tmp4$v4, tmp4$v5)))
-#' head(select(tmp, concat(df$mpg, df$cyl, df$hp)))}
-=======
 #' head(select(tmp3, map_entries(tmp3$v3), map_keys(tmp3$v3), map_values(tmp3$v3)))
 #' head(select(tmp3, element_at(tmp3$v3, "Valiant")))
 #' tmp4 <- mutate(df, v4 = create_array(df$mpg, df$cyl), v5 = create_array(df$cyl, df$hp))
 #' head(select(tmp4, concat(tmp4$v4, tmp4$v5), arrays_overlap(tmp4$v4, tmp4$v5)))
 #' head(select(tmp, concat(df$mpg, df$cyl, df$hp)))
 #' tmp5 <- mutate(df, v6 = create_array(df$model, df$model))
 #' head(select(tmp5, array_join(tmp5$v6, "#"), array_join(tmp5$v6, "#", "NULL")))}
->>>>>>> master
 NULL
 
 #' Window functions for Column operations
@@ -1991,7 +1978,7 @@ setMethod("levenshtein", signature(y = "Column"),
           })
 
 #' @details
-#' \code{months_between}: Returns number of months between dates \code{y} and \code{x}. 
+#' \code{months_between}: Returns number of months between dates \code{y} and \code{x}.
 #' If \code{y} is later than \code{x}, then the result is positive. If \code{y} and \code{x}
 #' are on the same day of month, or both are the last day of month, time of day will be ignored.
 #' Otherwise, the difference is calculated based on 31 days per month, and rounded to 8 digits.
@@ -3085,8 +3072,6 @@ setMethod("array_position",
           })
 
 #' @details
-<<<<<<< HEAD
-=======
 #' \code{array_repeat}: Creates an array containing \code{x} repeated the number of times
 #' given by \code{count}.
 #'
@@ -3107,7 +3092,6 @@ setMethod("array_repeat",
           })
 
 #' @details
->>>>>>> master
 #' \code{array_sort}: Sorts the input array in ascending order. The elements of the input array
 #' must be orderable. NA elements will be placed at the end of the returned array.
 #'
@@ -3122,8 +3106,6 @@ setMethod("array_sort",
           })
 
 #' @details
-<<<<<<< HEAD
-=======
 #' \code{arrays_overlap}: Returns true if the input arrays have at least one non-null element in
 #' common. If not and both arrays are non-empty and any of them contains a null, it returns null.
 #' It returns false otherwise.
@@ -3139,7 +3121,6 @@ setMethod("arrays_overlap",
           })
 
 #' @details
->>>>>>> master
 #' \code{flatten}: Creates a single array from an array of arrays.
 #' If a structure of nested arrays is deeper than two levels, only one level of nesting is removed.
 #'
@@ -3239,13 +3220,8 @@ setMethod("size",
 #' (or starting from the end if start is negative) with the specified length.
 #'
 #' @rdname column_collection_functions
-<<<<<<< HEAD
-#' @param start an index indicating the first element occuring in the result.
-#' @param length a number of consecutive elements choosen to the result.
-=======
 #' @param start an index indicating the first element occurring in the result.
 #' @param length a number of consecutive elements chosen to the result.
->>>>>>> master
 #' @aliases slice slice,Column-method
 #' @note slice since 2.4.0
 setMethod("slice",

R/pkg/R/generics.R

@@ -775,10 +775,6 @@ setGeneric("array_position", function(x, value) { standardGeneric("array_positio
 
 #' @rdname column_collection_functions
 #' @name NULL
-<<<<<<< HEAD
-setGeneric("array_sort", function(x) { standardGeneric("array_sort") })
-
-=======
 setGeneric("array_repeat", function(x, count) { standardGeneric("array_repeat") })
 
 #' @rdname column_collection_functions
@@ -789,7 +785,6 @@ setGeneric("array_sort", function(x) { standardGeneric("array_sort") })
 #' @name NULL
 setGeneric("arrays_overlap", function(x, y) { standardGeneric("arrays_overlap") })
 
->>>>>>> master
 #' @rdname column_string_functions
 #' @name NULL
 setGeneric("ascii", function(x) { standardGeneric("ascii") })

R/pkg/tests/fulltests/test_sparkSQL.R

@@ -1503,8 +1503,6 @@ test_that("column functions", {
   result <- collect(select(df2, reverse(df2[[1]])))[[1]]
   expect_equal(result, "cba")
 
-<<<<<<< HEAD
-=======
   # Test array_repeat()
   df <- createDataFrame(list(list("a", 3L), list("b", 2L)))
   result <- collect(select(df, array_repeat(df[[1]], df[[2]])))[[1]]
@@ -1535,7 +1533,6 @@ test_that("column functions", {
   result <- collect(select(df3, array_join(df3[[1]], "#")))[[1]]
   expect_equal(result, "Hello#World!")
 
->>>>>>> master
   # Test array_sort() and sort_array()
   df <- createDataFrame(list(list(list(2L, 1L, 3L, NA)), list(list(NA, 6L, 5L, NA, 4L))))
 
@@ -1551,23 +1548,13 @@ test_that("column functions", {
   df <- createDataFrame(list(list(list(1L, 2L, 3L)), list(list(4L, 5L))))
   result <- collect(select(df, slice(df[[1]], 2L, 2L)))[[1]]
   expect_equal(result, list(list(2L, 3L), list(5L)))
-<<<<<<< HEAD
 
   # Test concat()
   df <- createDataFrame(list(list(list(1L, 2L, 3L), list(4L, 5L, 6L)),
                         list(list(7L, 8L, 9L), list(10L, 11L, 12L))))
   result <- collect(select(df, concat(df[[1]], df[[2]])))[[1]]
   expect_equal(result, list(list(1L, 2L, 3L, 4L, 5L, 6L), list(7L, 8L, 9L, 10L, 11L, 12L)))
 
-=======
-
-  # Test concat()
-  df <- createDataFrame(list(list(list(1L, 2L, 3L), list(4L, 5L, 6L)),
-                        list(list(7L, 8L, 9L), list(10L, 11L, 12L))))
-  result <- collect(select(df, concat(df[[1]], df[[2]])))[[1]]
-  expect_equal(result, list(list(1L, 2L, 3L, 4L, 5L, 6L), list(7L, 8L, 9L, 10L, 11L, 12L)))
-
->>>>>>> master
   # Test flatten()
   df <- createDataFrame(list(list(list(list(1L, 2L), list(3L, 4L))),
                         list(list(list(5L, 6L), list(7L, 8L)))))

build/mvn

@@ -150,8 +150,4 @@ export MAVEN_OPTS=${MAVEN_OPTS:-"$_COMPILE_JVM_OPTS"}
 echo "Using \`mvn\` from path: $MVN_BIN" 1>&2
 
 # Last, call the `mvn` command as usual
-<<<<<<< HEAD
-${MVN_BIN} -DzincPort=${ZINC_PORT} -e "$@"
-=======
-"${MVN_BIN}" -DzincPort=${ZINC_PORT} "$@"
->>>>>>> master
+"${MVN_BIN}" -DzincPort=${ZINC_PORT} -e "$@"

core/src/main/scala/org/apache/spark/scheduler/OutputCommitCoordinator.scala

@@ -182,32 +182,6 @@ private[spark] class OutputCommitCoordinator(conf: SparkConf, isDriver: Boolean)
           s"task attempt $attemptNumber already marked as failed.")
         false
       case Some(state) =>
-<<<<<<< HEAD
-        state.authorizedCommitters(partition) match {
-          case NO_AUTHORIZED_COMMITTER =>
-            logDebug(s"Authorizing attemptNumber=$attemptNumber to commit for stage=$stage, " +
-              s"partition=$partition")
-            state.authorizedCommitters(partition) = attemptNumber
-            true
-          case existingCommitter if existingCommitter == attemptNumber =>
-            logWarning(s"Authorizing duplicate request to commit for " +
-              s"attemptNumber=$attemptNumber to commit for stage=$stage, partition=$partition; " +
-              s"existingCommitter = $existingCommitter. This can indicate dropped network traffic.")
-            true
-          case existingCommitter =>
-            // Coordinator should be idempotent when receiving AskPermissionToCommit.
-            if (existingCommitter == attemptNumber) {
-              logWarning(s"Authorizing duplicate request to commit for " +
-                s"attemptNumber=$attemptNumber to commit for stage=$stage," +
-                s" partition=$partition; existingCommitter = $existingCommitter." +
-                s" This can indicate dropped network traffic.")
-              true
-            } else {
-              logDebug(s"Denying attemptNumber=$attemptNumber to commit for stage=$stage, " +
-                s"partition=$partition; existingCommitter = $existingCommitter")
-              false
-            }
-=======
         val existing = state.authorizedCommitters(partition)
         if (existing == null) {
           logDebug(s"Commit allowed for stage=$stage.$stageAttempt, partition=$partition, " +
@@ -218,7 +192,6 @@ private[spark] class OutputCommitCoordinator(conf: SparkConf, isDriver: Boolean)
           logDebug(s"Commit denied for stage=$stage.$stageAttempt, partition=$partition: " +
             s"already committed by $existing")
           false
->>>>>>> master
         }
       case None =>
         logDebug(s"Commit denied for stage=$stage.$stageAttempt, partition=$partition: " +