Merge pull request #3440 from sparklyr/updates

Fixes #3439
sparklyr · May 8, 2024 · 22aa571 · 22aa571
2 parents 286a7d7 + 230b92c
commit 22aa571
Show file tree

Hide file tree

Showing 4 changed files with 15 additions and 1 deletion.
diff --git a/DESCRIPTION b/DESCRIPTION
@@ -1,7 +1,7 @@
 Type: Package
 Package: sparklyr
 Title: R Interface to Apache Spark
-Version: 1.8.6
+Version: 1.8.6.9000
 Authors@R:
     c(person(given = "Javier",
              family = "Luraschi",

diff --git a/NAMESPACE b/NAMESPACE
@@ -190,6 +190,7 @@ S3method(glance,ml_model_naive_bayes)
 S3method(glance,ml_model_pca)
 S3method(glance,ml_model_random_forest_classification)
 S3method(glance,ml_model_random_forest_regression)
+S3method(head,tbl_spark)
 S3method(hive_context,spark_connection)
 S3method(initialize_connection,livy_connection)
 S3method(initialize_connection,spark_shell_connection)

diff --git a/NEWS.md b/NEWS.md
@@ -1,3 +1,8 @@
+# Sparklyr (dev)
+
+- `sdf_sql()` now returns nothing, including an error, when the query outputs an
+empty dataset (#3439)
+
 # Sparklyr 1.8.6
 
 - Addresses issues with R 4.4.0. The root cause was that version checking functions

diff --git a/R/dplyr_sql.R b/R/dplyr_sql.R
@@ -162,3 +162,11 @@ check_frac <- function(size, replace = FALSE) {
   )
 }
 
+#' @export
+head.tbl_spark <- function(x, n = 6L, ...) {
+  if (ncol(x) == 0) {
+    return(x)
+  } else {
+    NextMethod()
+  }
+}