internal distinct_impl gains a second argument. #97

tidyverse · Sep 10, 2014 · a52d210 · a52d210
1 parent 03728e7
commit a52d210
Show file tree

Hide file tree

Showing 5 changed files with 11 additions and 8 deletions.
diff --git a/NEWS.md b/NEWS.md
@@ -1,5 +1,7 @@
 # dplyr 0.2.0.99
 
+* Internal `distinct_impl` gets a second argument to control the variables (#97). 
+
 * `rbind_all` now handles list columns (#463). 
 
 * allow list, i.e. `VECSXP` columns in mutate (#555).

diff --git a/R/RcppExports.R b/R/RcppExports.R
@@ -51,8 +51,8 @@ cbind_all <- function(dots) {
     .Call('dplyr_cbind_all', PACKAGE = 'dplyr', dots)
 }
 
-distinct_impl <- function(df) {
-    .Call('dplyr_distinct_impl', PACKAGE = 'dplyr', df)
+distinct_impl <- function(df, vars) {
+    .Call('dplyr_distinct_impl', PACKAGE = 'dplyr', df, vars)
 }
 
 semi_join_impl <- function(x, y, by) {

diff --git a/R/distinct.R b/R/distinct.R
@@ -33,7 +33,7 @@ distinct_ <- function(.data, vars = character()) {
 #' @export
 distinct_.data.frame <- function(.data, vars = character()) {
   vars <- standardise_vars(vars)
-  distinct_impl(.data)
+  distinct_impl(.data, vars)
 }
 
 #' @export

diff --git a/src/RcppExports.cpp b/src/RcppExports.cpp
@@ -146,14 +146,15 @@ BEGIN_RCPP
 END_RCPP
 }
 // distinct_impl
-SEXP distinct_impl(DataFrame df);
-RcppExport SEXP dplyr_distinct_impl(SEXP dfSEXP) {
+SEXP distinct_impl(DataFrame df, CharacterVector vars);
+RcppExport SEXP dplyr_distinct_impl(SEXP dfSEXP, SEXP varsSEXP) {
 BEGIN_RCPP
     SEXP __sexp_result;
     {
         Rcpp::RNGScope __rngScope;
         Rcpp::traits::input_parameter< DataFrame >::type df(dfSEXP );
-        SEXP __result = distinct_impl(df);
+        Rcpp::traits::input_parameter< CharacterVector >::type vars(varsSEXP );
+        SEXP __result = distinct_impl(df, vars);
         PROTECT(__sexp_result = Rcpp::wrap(__result));
     }
     UNPROTECT(1);

diff --git a/src/distinct.cpp b/src/distinct.cpp
@@ -4,8 +4,8 @@ using namespace Rcpp ;
 using namespace dplyr ;
 
 // [[Rcpp::export]]
-SEXP distinct_impl( DataFrame df ){
-    DataFrameVisitors visitors(df) ;
+SEXP distinct_impl( DataFrame df, CharacterVector vars){
+    DataFrameVisitors visitors(df, vars) ;
 
     std::vector<int> indices ;
     VisitorSetIndexSet<DataFrameVisitors> set(visitors) ;