ARROW-12408: [R] Delete Scan()

Suppressing deprecation warnings is disallowed by `R CMD check`, so let's just delete it entirely. Closes apache#10053 from lidavidm/arrow-12408 Authored-by: David Li <[email protected]> Signed-off-by: David Li <[email protected]>
Kyligence · Apr 15, 2021 · fac30e7 · fac30e7
1 parent d11aaf4
commit fac30e7
Show file tree

Hide file tree

Showing 6 changed files with 3 additions and 64 deletions.
diff --git a/r/NEWS.md b/r/NEWS.md
@@ -45,6 +45,7 @@ Over 100 functions can now be called on Arrow objects inside a `dplyr` verb:
 * `write_dataset()` now defaults to `format = "parquet"` and better validates the `format` argument
 * Invalid input for `schema` in `open_dataset()` is now correctly handled
 * Collecting 0 columns from a Dataset now no longer returns all of the columns
+* The `Scanner$Scan()` method has been removed; use `Scanner$ScanBatches()`
 
 ## Other improvements
 

diff --git a/r/R/arrowExports.R b/r/R/arrowExports.R
diff --git a/r/R/dataset-scan.R b/r/R/dataset-scan.R
@@ -56,12 +56,7 @@
 Scanner <- R6Class("Scanner", inherit = ArrowObject,
   public = list(
     ToTable = function() dataset___Scanner__ToTable(self),
-    ScanBatches = function() dataset___Scanner__ScanBatches(self),
-    Scan = function() {
-        # Planned for removal in ARROW-11782
-        .Deprecated("ScanBatches")
-        dataset___Scanner__Scan(self)
-    }
+    ScanBatches = function() dataset___Scanner__ScanBatches(self)
   ),
   active = list(
     schema = function() dataset___Scanner__schema(self)

diff --git a/r/src/arrowExports.cpp b/r/src/arrowExports.cpp
diff --git a/r/src/dataset.cpp b/r/src/dataset.cpp
@@ -441,35 +441,6 @@ std::shared_ptr<arrow::Table> dataset___Scanner__head(
   return ValueOrStop(scanner->Head(n));
 }
 
-// TODO (ARROW-11782) Remove calls to Scan()
-#if defined(__GNUC__) || defined(__clang__)
-#pragma GCC diagnostic push
-#pragma GCC diagnostic ignored "-Wdeprecated-declarations"
-#elif defined(_MSC_VER)
-#pragma warning(push)
-#pragma warning(disable : 4996)
-#endif
-
-// [[dataset::export]]
-cpp11::list dataset___Scanner__Scan(const std::shared_ptr<ds::Scanner>& scanner) {
-  auto it = ValueOrStop(scanner->Scan());
-  std::vector<std::shared_ptr<ds::ScanTask>> out;
-  std::shared_ptr<ds::ScanTask> scan_task;
-  // TODO(npr): can this iteration be parallelized?
-  for (auto st : it) {
-    scan_task = ValueOrStop(st);
-    out.push_back(scan_task);
-  }
-
-  return arrow::r::to_r_list(out);
-}
-
-#if defined(__GNUC__) || defined(__clang__)
-#pragma GCC diagnostic pop
-#elif defined(_MSC_VER)
-#pragma warning(pop)
-#endif
-
 // [[dataset::export]]
 std::shared_ptr<arrow::Schema> dataset___Scanner__schema(
     const std::shared_ptr<ds::Scanner>& sc) {

diff --git a/r/tests/testthat/test-dataset.R b/r/tests/testthat/test-dataset.R
@@ -1345,14 +1345,6 @@ test_that("Dataset and query print methods", {
   )
 })
 
-test_that("Scanner$Scan is deprecated", {
-  ds <- open_dataset(ipc_dir, partitioning = "part", format = "feather")
-  expect_deprecated(
-    ds$NewScan()$Finish()$Scan(),
-    "ScanBatches"
-  )
-})
-
 test_that("Scanner$ScanBatches", {
   ds <- open_dataset(ipc_dir, format = "feather")
   batches <- ds$NewScan()$Finish()$ScanBatches()
@@ -1388,7 +1380,7 @@ test_that("Assembling a Dataset manually and getting a Table", {
   fmt <- FileFormat$create("parquet")
   factory <- FileSystemDatasetFactory$create(fs, selector, NULL, fmt, partitioning = partitioning)
   expect_r6_class(factory, "FileSystemDatasetFactory")
-  
+
   schm <- factory$Inspect()
   expect_r6_class(schm, "Schema")