fixed existing R tests

.github/actions/r_build/action.yml

@@ -10,8 +10,8 @@ runs:
     - name: Create download location for Spark
       shell: bash
       run: |
-        sudo mkdir -p /usr/spark-download/raw
         sudo mkdir -p /usr/spark-download/unzipped
+        sudo mkdir -p /usr/spark-download/raw
         sudo chown -R $USER: /usr/spark-download/
     - name: Cache Spark download
       id: cache-spark

R/.gitignore

@@ -1 +1,2 @@
 **/.Rhistory
+**/*.tar.gz

R/install_deps.R

@@ -31,6 +31,6 @@ for(repo in names(mirror_status)){
 
 .libPaths(c("/usr/lib/R/site-library", .libPaths()))
 
-install.packages("pkgbuild", repos=repo)
-install.packages("roxygen2", repos=repo)
-install.packages("sparklyr", repos=repo)
+install.packages("pkgbuild", repos="https://packagemanager.posit.co/cran/__linux__/bullseye/latest")
+install.packages("roxygen2", repos="https://packagemanager.posit.co/cran/__linux__/bullseye/latest")
+install.packages("sparklyr", repos="https://packagemanager.posit.co/cran/__linux__/bullseye/latest")

R/sparkR-mosaic/sparkrMosaic/DESCRIPTION

@@ -8,7 +8,7 @@ Description: This package extends SparkR to bring the Databricks Mosaic for geos
 License: Databricks
 Encoding: UTF-8
 Roxygen: list(markdown = TRUE)
-RoxygenNote: 7.2.0
+RoxygenNote: 7.2.3
 Collate: 
     'enableMosaic.R'
     'generics.R'

R/sparkR-mosaic/tests.R

@@ -66,15 +66,15 @@ sdf <- withColumn(sdf, "transformed_geom", st_transform(column("geom_with_srid")
 # Grid functions
 sdf <- withColumn(sdf, "grid_longlatascellid", grid_longlatascellid(lit(1), lit(1), lit(1L)))
 sdf <- withColumn(sdf, "grid_pointascellid", grid_pointascellid(column("point_wkt"), lit(1L)))
-sdf <- withColumn(sdf, "grid_boundaryaswkb", grid_boundaryaswkb( SparkR::cast(lit(1), "long")))
+sdf <- withColumn(sdf, "grid_boundaryaswkb", grid_boundaryaswkb(column("grid_pointascellid")))
 sdf <- withColumn(sdf, "grid_polyfill", grid_polyfill(column("wkt"), lit(1L)))
 sdf <- withColumn(sdf, "grid_tessellateexplode", grid_tessellateexplode(column("wkt"), lit(1L)))
 sdf <- withColumn(sdf, "grid_tessellate", grid_tessellate(column("wkt"), lit(1L)))
 
 # Deprecated
 sdf <- withColumn(sdf, "point_index_lonlat", point_index_lonlat(lit(1), lit(1), lit(1L)))
 sdf <- withColumn(sdf, "point_index_geom", point_index_geom(column("point_wkt"), lit(1L)))
-sdf <- withColumn(sdf, "index_geometry", index_geometry( SparkR::cast(lit(1), "long")))
+sdf <- withColumn(sdf, "index_geometry", index_geometry(column("point_index_geom")))
 sdf <- withColumn(sdf, "polyfill", polyfill(column("wkt"), lit(1L)))
 sdf <- withColumn(sdf, "mosaic_explode", mosaic_explode(column("wkt"), lit(1L)))
 sdf <- withColumn(sdf, "mosaicfill", mosaicfill(column("wkt"), lit(1L)))

R/sparklyr-mosaic/sparklyrMosaic/DESCRIPTION

@@ -8,7 +8,7 @@ Description: This package extends sparklyr to bring the Databricks Mosaic for ge
 License: Databricks
 Encoding: UTF-8
 Roxygen: list(markdown = TRUE)
-RoxygenNote: 7.2.0
+RoxygenNote: 7.2.3
 Collate: 
     'enableMosaic.R'
     'sparkFunctions.R'