R Client 2.0 - Table Ops

R/rdeephaven/R/client_wrapper.R

@@ -20,6 +20,8 @@ setMethod(
   signature = c(target = "character"),
   function(target,
            auth_type = "anonymous",
+           username = "",
+           password = "",
            auth_token = "",
            session_type = "python",
            use_tls = FALSE,
@@ -40,11 +42,12 @@ setMethod(
     if (auth_type == "anonymous") {
       options$set_default_authentication()
     } else if (auth_type == "basic") {
-      if (auth_token != "") {
-        verify_string("auth_token", auth_token, TRUE)
-        options$set_basic_authentication(auth_token)
+      if ((username != "") && (password != "")) {
+        verify_string("username", username, TRUE)
+        verify_string("password", password, TRUE)
+        options$set_basic_authentication(username, password)
       } else {
-        stop("Basic authentication was requested, but no 'auth_token' was provided.")
+        stop("Basic authentication was requested, but at least one of 'username' or 'password' was not provided.")
       }
     } else {
       if (auth_token != "") {
@@ -102,6 +105,10 @@ setMethod(
     if ((auth_token != "") && (auth_type == "anonymous")) {
       warning("'auth_token' was set but it will not be used, as 'auth_type' is 'anonymous'.")
     }
+
+    if (((username != "") || (password != "")) && auth_type != "basic") {
+      warning("At least one of 'username' and 'password' were set but they will not be used, as 'auth_type' is not 'basic'.")
+    }
 
     if ((tls_root_certs != "") && (use_tls == FALSE)) {
       warning("'tls_root_certs' was set but it will not be used, as 'use_tls is FALSE.")

R/rdeephaven/R/table_ops.R

@@ -19,39 +19,19 @@ base_merge <- function(x, y, ...) {
 #' @export
 setMethod(
   "merge",
-  signature = c(x = "TableHandle"),
-  function(x, y = NULL, ...) {
-    return(base_merge(x, y, c(...)))
-  }
-)
-
-#' @export
-setMethod(
-  "merge",
-  signature = c(x = "list"),
-  function(x, y = NULL, ...) {
+  signature = c(x = "list", y = "missing"),
+  function(x, y = NULL) {
     verify_type("x", x, "TableHandle", "Deephaven TableHandle", FALSE)
-    return(base_merge(x, y, c(...)))
-  }
-)
-
-#' @export
-setMethod(
-  "merge",
-  signature = c(x = "TableHandle", y = "list"),
-  function(x, y, ...) {
-    verify_type("y", y, "TableHandle", "Deephaven TableHandle", FALSE)
-    return(base_merge(x, y, c(...)))
+    return(base_merge(x, y))
   }
 )
 
 #' @export
 setMethod(
   "merge",
-  signature = c(x = "list", y = "TableHandle"),
-  function(x, y, ...) {
-    verify_type("x", x, "TableHandle", "Deephaven TableHandle", FALSE)
-    return(base_merge(x, y, c(...)))
+  signature = c(x = "TableHandle", y = "missing"),
+  function(x, y = NULL) {
+    return(base_merge(x, y))
   }
 )
 
@@ -60,58 +40,90 @@ setMethod(
   "merge",
   signature = c(x = "TableHandle", y = "TableHandle"),
   function(x, y, ...) {
+    if (length(c(...)) != 0) {
+      verify_type("...", c(...), "TableHandle", "Deephaven TableHandle", FALSE)
+    }
     return(base_merge(x, y, c(...)))
   }
 )
 
-#' @export
-setMethod(
-  "merge",
-  signature = c(x = "list", y = "list"),
-  function(x, y, ...) {
-    verify_type("x", x, "TableHandle", "Deephaven TableHandle", FALSE)
-    verify_type("y", y, "TableHandle", "Deephaven TableHandle", FALSE)
-    return(base_merge(x, y, c(...)))
-  }
-)
-
-#' @export
-setMethod(
-  "merge",
-  signature = c(x = "NULL", y = "TableHandle"),
-  function(x, y, ...) {
-    return(base_merge(x, y, c(...)))
-  }
-)
-
-#' @export
-setMethod(
-  "merge",
-  signature = c(x = "NULL", y = "list"),
-  function(x, y, ...) {
-    verify_type("y", y, "TableHandle", "Deephaven TableHandle", FALSE)
-    return(base_merge(x, y, c(...)))
-  }
-)
-
-#' @export
-setMethod(
-  "merge",
-  signature = c(x = "TableHandle", y = "NULL"),
-  function(x, y, ...) {
-    return(base_merge(x, y, c(...)))
-  }
-)
-
-#' @export
-setMethod(
-  "merge",
-  signature = c(x = "list", y = "NULL"),
-  function(x, y, ...) {
-    verify_type("x", x, "TableHandle", "Deephaven TableHandle", FALSE)
-    return(base_merge(x, y, c(...)))
-  }
-)
+#' #' @export
+#' setMethod(
+#'   "merge",
+#'   signature = c(x = "TableHandle", y = "list"),
+#'   function(x, y, ...) {
+#'     verify_type("y", y, "TableHandle", "Deephaven TableHandle", FALSE)
+#'     return(base_merge(x, y, c(...)))
+#'   }
+#' )
+#' 
+#' #' @export
+#' setMethod(
+#'   "merge",
+#'   signature = c(x = "list", y = "TableHandle"),
+#'   function(x, y, ...) {
+#'     verify_type("x", x, "TableHandle", "Deephaven TableHandle", FALSE)
+#'     return(base_merge(x, y, c(...)))
+#'   }
+#' )
+#' 
+#' #' @export
+#' setMethod(
+#'   "merge",
+#'   signature = c(x = "TableHandle", y = "TableHandle"),
+#'   function(x, y, ...) {
+#'     return(base_merge(x, y, c(...)))
+#'   }
+#' )
+#' 
+#' #' @export
+#' setMethod(
+#'   "merge",
+#'   signature = c(x = "list", y = "list"),
+#'   function(x, y, ...) {
+#'     verify_type("x", x, "TableHandle", "Deephaven TableHandle", FALSE)
+#'     verify_type("y", y, "TableHandle", "Deephaven TableHandle", FALSE)
+#'     return(base_merge(x, y, c(...)))
+#'   }
+#' )
+#' 
+#' #' @export
+#' setMethod(
+#'   "merge",
+#'   signature = c(x = "NULL", y = "TableHandle"),
+#'   function(x, y, ...) {
+#'     return(base_merge(x, y, c(...)))
+#'   }
+#' )
+#' 
+#' #' @export
+#' setMethod(
+#'   "merge",
+#'   signature = c(x = "NULL", y = "list"),
+#'   function(x, y, ...) {
+#'     verify_type("y", y, "TableHandle", "Deephaven TableHandle", FALSE)
+#'     return(base_merge(x, y, c(...)))
+#'   }
+#' )
+#' 
+#' #' @export
+#' setMethod(
+#'   "merge",
+#'   signature = c(x = "TableHandle", y = "NULL"),
+#'   function(x, y, ...) {
+#'     return(base_merge(x, y, c(...)))
+#'   }
+#' )
+#' 
+#' #' @export
+#' setMethod(
+#'   "merge",
+#'   signature = c(x = "list", y = "NULL"),
+#'   function(x, y, ...) {
+#'     verify_type("x", x, "TableHandle", "Deephaven TableHandle", FALSE)
+#'     return(base_merge(x, y, c(...)))
+#'   }
+#' )
 
 setGeneric(
   "select",
@@ -622,7 +634,7 @@ setMethod(
 #' @export
 setGeneric(
   "sort",
-  function(table_handle, by = character(), descending = FALSE, ...) {
+  function(table_handle, by = character(), descending = FALSE, abs_col = FALSE, ...) {
     standardGeneric("sort")
   },
   signature = c("table_handle", "by", "descending")
@@ -632,12 +644,16 @@ setGeneric(
 setMethod(
   "sort",
   signature = c(table_handle = "TableHandle"),
-  function(table_handle, by, descending = FALSE) {
+  function(table_handle, by, descending = FALSE, abs_col = FALSE) {
     verify_string("by", by, FALSE)
     verify_bool("descending", descending, FALSE)
+    verify_bool("abs_col", abs_col, FALSE)
     if ((length(descending) > 1) && length(descending) != length(by)) {
-      stop(paste0("'descending' must be the same length as 'by' if more than one entry is supplied. Got 'by' with length ", length(by), " and 'descending' with length", length(descending), "."))
+      stop(paste0("'descending' must be the same length as 'by' if more than one entry is supplied. Got 'by' with length ", length(by), " and 'descending' with length ", length(descending), "."))
+    }
+    if ((length(abs_col) > 1) && length(abs_col) != length(by)) {
+      stop(paste0("'abs_col' must be the same length as 'by' if more than one entry is supplied. Got 'by' with length ", length(by), " and 'abs_col' with length ", length(abs_col), "."))
     }
-    return(new("TableHandle", .internal_rcpp_object = table_handle@.internal_rcpp_object$sort(by, descending)))
+    return(new("TableHandle", .internal_rcpp_object = table_handle@.internal_rcpp_object$sort(by, descending, abs_col)))
   }
 )

R/rdeephaven/inst/tests/testthat/test_client_wrapper.R

@@ -186,7 +186,7 @@ test_that("dhConnect fails nicely with bad inputs", {
 
   expect_error(
     dhConnect(target = "localhost:10000", auth_type = "basic"),
-    "Basic authentication was requested, but no 'auth_token' was provided."
+    "Basic authentication was requested, but at least one of 'username' or 'password' was not provided."
   )
   expect_error(
     dhConnect(target = "localhost:10000", auth_type = "custom"),
@@ -198,7 +198,7 @@ test_that("dhConnect fails nicely with bad inputs", {
   )
   expect_error(
     dhConnect(target = "localhost:10000", auth_type = "basic", auth_token = 1234),
-    "'auth_token' must be a single string. Got an object of class numeric."
+    "Basic authentication was requested, but at least one of 'username' or 'password' was not provided."
   )
   expect_error(
     dhConnect(target = "localhost:10000", session_type = "blahblah"),

R/rdeephaven/inst/tests/testthat/test_table_ops.R

@@ -72,39 +72,13 @@ test_that("merge behaves as expected", {
   new_th3 <- merge(data$th5, data$th6, data$th6, data$th5)
   expect_equal(as.data.frame(new_th3), new_df3)
 
-  new_th4 <- merge(data$th5, NULL)
-  expect_equal(as.data.frame(new_th4), new_df1)
+  new_th4 <- merge(c(data$th5, data$th6))
+  expect_equal(as.data.frame(new_th4), new_df2)
 
-  new_th5 <- merge(NULL, data$th5)
-  expect_equal(as.data.frame(new_th5), new_df1)
-
-  new_th6 <- merge(c(data$th5, data$th6))
-  expect_equal(as.data.frame(new_th6), new_df2)
-
-  new_th7 <- merge(NULL, c(data$th5, data$th6))
-  expect_equal(as.data.frame(new_th7), new_df2)
-
-  new_th8 <- merge(c(data$th5, data$th6), NULL)
-  expect_equal(as.data.frame(new_th8), new_df2)
-
-  new_th9 <- merge(data$th5, c(data$th6, data$th6, data$th5))
-  expect_equal(as.data.frame(new_th9), new_df3)
-
-  new_th10 <- merge(c(data$th5, data$th6, data$th6), data$th5)
-  expect_equal(as.data.frame(new_th10), new_df3)
-
-  new_th11 <- merge(c(data$th5, data$th6), c(data$th6, data$th5))
-  expect_equal(as.data.frame(new_th11), new_df3)
-
-  new_th12 <- merge(c(data$th5, data$th6, data$th6, data$th5))
-  expect_equal(as.data.frame(new_th12), new_df3)
-
-  new_th13 <- merge(data$th5, c(data$th6, NULL))
-  expect_equal(as.data.frame(new_th13), new_df2)
-
-  new_th14 <- merge(c(NULL, data$th5), data$th6)
-  expect_equal(as.data.frame(new_th14), new_df2)
+  new_th5 <- merge(c(data$th5, data$th6, NULL, data$th6, data$th5))
+  expect_equal(as.data.frame(new_th5), new_df3)
 
+  close(data$client)
 })
 
 test_that("select behaves as expected", {

R/rdeephaven/src/client.cpp

@@ -241,29 +241,23 @@ class TableHandleWrapper {
         return new TableHandleWrapper(internal_tbl_hdl.Merge(converted_sources));
     };
 
-    TableHandleWrapper* Sort(std::vector<std::string> columnSpecs, std::vector<bool> descending) {
+    TableHandleWrapper* Sort(std::vector<std::string> columnSpecs, std::vector<bool> descending, std::vector<bool> absCol) {
         std::vector<deephaven::client::SortPair> sort_pairs;
         sort_pairs.reserve(columnSpecs.size());
 
         if (descending.size() == 1) {
-            if (!descending[0]) {
-                for(int i = 0; i < columnSpecs.size(); i++) {
-                    sort_pairs.push_back(deephaven::client::SortPair::Ascending(columnSpecs[i], false));
-                }
-            } else {
-                for(int i = 0; i < columnSpecs.size(); i++) {
-                    sort_pairs.push_back(deephaven::client::SortPair::Descending(columnSpecs[i], false));
-                }
-            }
+            descending = std::vector<bool>(columnSpecs.size(), descending[0]);
         }
 
-        else {
-            for(int i = 0; i < columnSpecs.size(); i++) {
-                if (!descending[i]) {
-                    sort_pairs.push_back(deephaven::client::SortPair::Ascending(columnSpecs[i], false));
-                } else {
-                    sort_pairs.push_back(deephaven::client::SortPair::Descending(columnSpecs[i], false));
-                }
+        if (absCol.size() == 1) {
+            absCol = std::vector<bool>(columnSpecs.size(), absCol[0]);
+        }
+
+        for(int i = 0; i < columnSpecs.size(); i++) {
+            if (!descending[i]) {
+                sort_pairs.push_back(deephaven::client::SortPair::Ascending(columnSpecs[i], absCol[i]));
+            } else {
+                sort_pairs.push_back(deephaven::client::SortPair::Descending(columnSpecs[i], absCol[i]));
             }
         }
 
@@ -335,9 +329,8 @@ class ClientOptionsWrapper {
         internal_options->SetDefaultAuthentication();
     }
 
-    void SetBasicAuthentication(const std::string &authentication_token) {
-        const std::string authentication_token_base64 = Base64Encode(authentication_token);
-        internal_options->SetCustomAuthentication("Basic", authentication_token_base64);
+    void SetBasicAuthentication(const std::string &username, const std::string &password) {
+        internal_options->SetBasicAuthentication(username, password);
     }
 
     void SetCustomAuthentication(const std::string &authentication_type, const std::string &authentication_token) {