revert usage of gettextf

Author: Michael Chirico

R/pkg/R/DataFrame.R

@@ -691,13 +691,13 @@ setMethod("storageLevel",
 
 #' Coalesce
 #'
-#' Returns a new SparkDataFrame that has exactly \code{numPartitions} partitions.
+#' Returns a new SparkDataFrame that has exactly \code{"rtitions} partitions.
 #' This operation results in a narrow dependency, e.g. if you go from 1000 partitions to 100
 #' partitions, there will not be a shuffle, instead each of the 100 new partitions will claim 10 of
 #' the current partitions. If a larger number of partitions is requested, it will stay at the
 #' current number of partitions.
 #'
-#' However, if you're doing a drastic coalesce on a SparkDataFrame, e.g. to numPartitions = 1,
+#' However, if you're doing a drastic coalesce on a SparkDataFrame, e.g. to "rtitions = 1,
 #' this may result in your computation taking place on fewer nodes than
 #' you like (e.g. one node in the case of numPartitions = 1). To avoid this,
 #' call \code{repartition}. This will add a shuffle step, but means the
@@ -829,11 +829,8 @@ setMethod("repartitionByRange",
                 jcol <- lapply(cols, function(c) { c@jc })
                 sdf <- callJMethod(x@sdf, "repartitionByRange", numToInt(numPartitions), jcol)
               } else {
-                stop(gettextf(
-                  "numPartitions and col must be numeric and Column; however, got %s and %s",
-                  class(numPartitions), class(col), domain = "R-SparkR"),
-                  domain = NA
-                )
+                stop("numPartitions and col must be numeric and Column; however, got ",
+                     class(numPartitions), " and ", class(col))
               }
             } else if (!is.null(col))  {
               # only columns are specified
@@ -2620,9 +2617,8 @@ setMethod("join",
                   joinType <- gsub("_", "", joinType, fixed = TRUE)
                   sdf <- callJMethod(x@sdf, "join", y@sdf, joinExpr@jc, joinType)
                 } else {
-                  stop(gettextf("joinType must be one of the following types: '%s'",
-                                paste(valid_join_types, collapse = "', '"), domain = "R-SparkR"),
-                       domain = NA)
+                  stop("joinType must be one of the following types: ",
+                       "'", paste(valid_join_types, collapse = "', '"), "'")
                 }
               }
             }

R/pkg/R/SQLContext.R

@@ -112,7 +112,7 @@ sparkR.conf <- function(key, defaultValue) {
               error = function(e) {
                 estr <- as.character(e)
                 if (any(grepl("java.util.NoSuchElementException", estr, fixed = TRUE))) {
-                  stop(gettextf("Config '%s' is not set", key, domain = "R-SparkR"), domain = NA)
+                  stop("Config '", key, "' is not set")
                 } else {
                   stop("Unknown error: ", estr)
                 }
@@ -208,8 +208,7 @@ getSchema <- function(schema, firstRow = NULL, rdd = NULL) {
     names <- lapply(names, function(n) {
       nn <- gsub(".", "_", n, fixed = TRUE)
       if (nn != n) {
-        warning(gettextf("Use %s instead of %s as column name",
-                         nn, n, domain = "R-SparkR"), domain = NA)
+        warning("Use ", nn, " instead of ", n, " as column name")
       }
       nn
     })

R/pkg/R/client.R

@@ -102,17 +102,9 @@ checkJavaVersion <- function() {
     javaVersionNum <- as.integer(versions[1])
   }
   if (javaVersionNum < minJavaVersion || javaVersionNum >= maxJavaVersion) {
-    stop(
-      gettextf(
-        "Java version, greater than or equal to %s and less than %s, ",
-        minJavaVersion, maxJavaVersion, domain = "R-SparkR"
-      ),
-      gettextf(
-        "is required for this package; found version: %s",
-        javaVersionStr, domain = "R-SparkR"
-      ),
-      domain = NA
-    )
+    stop("Java version, greater than or equal to ", minJavaVersion,
+         " and less than ", maxJavaVersion, ", is required for this ",
+         "package; found version: ", javaVersionStr)
   }
   return(javaVersionNum)
 }

R/pkg/R/install.R

@@ -103,14 +103,11 @@ install.spark <- function(hadoopVersion = "2.7", mirrorUrl = NULL,
   # can use dir.exists(packageLocalDir) under R 3.2.0 or later
   if (!is.na(file.info(packageLocalDir)$isdir) && !overwrite) {
     if (releaseUrl != "") {
-      message(gettextf("%s found, setting SPARK_HOME to %s",
-                       packageName, packageLocalDir, domain = "R-SparkR"),
-              domain = NA)
+      message(packageName, " found, setting SPARK_HOME to ", packageLocalDir)
     } else {
-      message(gettextf("%s for Hadoop %s found, setting SPARK_HOME to %s",
-                       version, if (hadoopVersion == "without") "Free build" else hadoopVersion,
-                       packageLocalDir, domain = "R-SparkR"),
-              domain = NA)
+      message(version, " for Hadoop ",
+              if (hadoopVersion == "without") "Free build" else hadoopVersion,
+              " found, setting SPARK_HOME to ", packageLocalDir)
     }
     Sys.setenv(SPARK_HOME = packageLocalDir)
     return(invisible(packageLocalDir))
@@ -200,11 +197,9 @@ robustDownloadTar <- function(mirrorUrl, version, hadoopVersion, packageName, pa
     # remove any partially downloaded file
     unlink(packageLocalPath)
     message("Unable to download from default mirror site: ", mirrorUrl)
-    stop(gettextf("Unable to download Spark %s for Hadoop %s. ",
-                  version, if (hadoopVersion == "without") "Free build" else hadoopVersion,
-                  domain = "R-SparkR"),
-         "Please check network connection, Hadoop version, or provide other mirror sites.",
-         domain = NA)
+    stop("Unable to download Spark ", version,
+         " for Hadoop ", if (hadoopVersion == "without") "Free build" else hadoopVersion,
+         ". Please check network connection, Hadoop version, or provide other mirror sites.")
   }
 }
 
@@ -230,10 +225,9 @@ getPreferredMirror <- function(version, packageName) {
 
 directDownloadTar <- function(mirrorUrl, version, hadoopVersion, packageName, packageLocalPath) {
   packageRemotePath <- paste0(file.path(mirrorUrl, version, packageName), ".tgz")
-  message(gettextf("Downloading %s for Hadoop %s from:\n- %s",
-                   version, if (hadoopVersion == "without") "Free build" else hadoopVersion,
-                   packageRemotePath, domain = "R-SparkR"),
-          domain = NA)
+  message("Downloading ", version, " for Hadoop ",
+          if (hadoopVersion == "without") "Free build" else hadoopVersion,
+          " from:\n- ", packageRemotePath)
   downloadUrl(packageRemotePath, packageLocalPath)
 }
 
@@ -289,7 +283,7 @@ sparkCachePath <- function() {
         Sys.getenv("XDG_CACHE_HOME", file.path(Sys.getenv("HOME"), ".cache")), "spark")
     }
   } else {
-    stop(gettextf("Unknown OS: %s", .Platform$OS.type, domain = "R-SparkR"), domain = NA)
+    stop("Unknown OS: ", .Platform$OS.type)
   }
   normalizePath(path, mustWork = FALSE)
 }

R/pkg/R/sparkR.R

@@ -439,11 +439,9 @@ sparkR.session <- function(
   rPackageVersion <- paste0(packageVersion("SparkR"))
 
   if (jvmVersionStrip != rPackageVersion) {
-    warning(
-      "Version mismatch between Spark JVM and SparkR package. ",
-      gettextf("JVM version was %s, while R package version was %s",
-               jvmVersion, rPackageVersion, domain = "R-SparkR"),
-      domain = NA)
+    warning("Version mismatch between Spark JVM and SparkR package. ",
+            "JVM version was ", jvmVersion,
+            ", while R package version was ", rPackageVersion)
   }
 
   sparkSession

R/pkg/R/utils.R

@@ -354,10 +354,8 @@ varargsToStrEnv <- function(...) {
       } else {
         value <- pairs[[name]]
         if (!(is.logical(value) || is.numeric(value) || is.character(value) || is.null(value))) {
-          stop(gettextf("Unsupported type for %s : %s. ",
-                        name, class(value), domain = "R-SparkR"),
-               "Supported types are logical, numeric, character and NULL.",
-               call. = FALSE, domain = NA)
+          stop("Unsupported type for ", name, " : ", toString(class(value)), ". ",
+               "Supported types are logical, numeric, character and NULL.")
         }
         if (is.logical(value)) {
           env[[name]] <- tolower(as.character(value))
@@ -371,9 +369,7 @@ varargsToStrEnv <- function(...) {
   }
 
   if (length(ignoredNames) != 0) {
-    warning(gettextf("Unnamed arguments ignored: %s.",
-                     paste(ignoredNames, collapse = ", "), domain = "R-SparkR"),
-            call. = FALSE, domain = NA)
+    warning("Unnamed arguments ignored: ", toString(ignoredNames))
   }
   env
 }