add comparison expression to relational api

duckdb · Oct 15, 2024 · 4552bbd · 4552bbd
1 parent 9007b30
commit 4552bbd
Show file tree

Hide file tree

Showing 4 changed files with 37 additions and 0 deletions.
diff --git a/R/cpp11.R b/R/cpp11.R
@@ -56,6 +56,10 @@ rapi_expr_constant <- function(val) {
   .Call(`_duckdb_rapi_expr_constant`, val)
 }
 
+rapi_expr_comparison <- function(exprs, cmp_op) {
+  .Call(`_duckdb_rapi_expr_comparison`, exprs, cmp_op)
+}
+
 rapi_expr_function <- function(name, args, order_bys, filter_bys) {
   .Call(`_duckdb_rapi_expr_function`, name, args, order_bys, filter_bys)
 }

diff --git a/R/relational.R b/R/relational.R
@@ -27,6 +27,15 @@ expr_reference <- function(names, table = NULL) {
 #' const_str_expr <- expr_constant("Hello, World")
 expr_constant <- rapi_expr_constant
 
+#' Create a comparison expression
+#' @param exprs a vector of size two, the expressions to compare
+#' @param cmp_op the comparison operators
+#' @return a comparison expression
+#' @noRd
+#' @examples
+#' comp_expr <- expr_comparison(list(expr_constant(-42), expr_constant(42)), ">")
+expr_comparison <- rapi_expr_comparison
+
 #' Create a function call expression
 #' @param name the function name
 #' @param args the a list of expressions for the function arguments

diff --git a/src/cpp11.cpp b/src/cpp11.cpp
@@ -111,6 +111,13 @@ extern "C" SEXP _duckdb_rapi_expr_constant(SEXP val) {
   END_CPP11
 }
 // relational.cpp
+SEXP rapi_expr_comparison(list exprs, std::string cmp_op);
+extern "C" SEXP _duckdb_rapi_expr_comparison(SEXP exprs, SEXP cmp_op) {
+  BEGIN_CPP11
+    return cpp11::as_sexp(rapi_expr_comparison(cpp11::as_cpp<cpp11::decay_t<list>>(exprs),cpp11::as_cpp<cpp11::decay_t<std::string>>(cmp_op)));
+  END_CPP11
+}
+// relational.cpp
 SEXP rapi_expr_function(std::string name, list args, list order_bys, list filter_bys);
 extern "C" SEXP _duckdb_rapi_expr_function(SEXP name, SEXP args, SEXP order_bys, SEXP filter_bys) {
   BEGIN_CPP11
@@ -432,6 +439,7 @@ static const R_CallMethodDef CallEntries[] = {
     {"_duckdb_rapi_execute",                 (DL_FUNC) &_duckdb_rapi_execute,                 3},
     {"_duckdb_rapi_execute_arrow",           (DL_FUNC) &_duckdb_rapi_execute_arrow,           2},
     {"_duckdb_rapi_expr_constant",           (DL_FUNC) &_duckdb_rapi_expr_constant,           1},
+    {"_duckdb_rapi_expr_comparison",         (DL_FUNC) &_duckdb_rapi_expr_comparison,         2},
     {"_duckdb_rapi_expr_function",           (DL_FUNC) &_duckdb_rapi_expr_function,           4},
     {"_duckdb_rapi_expr_reference",          (DL_FUNC) &_duckdb_rapi_expr_reference,          1},
     {"_duckdb_rapi_expr_set_alias",          (DL_FUNC) &_duckdb_rapi_expr_set_alias,          2},

diff --git a/src/relational.cpp b/src/relational.cpp
@@ -7,6 +7,7 @@
 
 #include "duckdb/parser/expression/columnref_expression.hpp"
 #include "duckdb/parser/expression/constant_expression.hpp"
+#include "duckdb/parser/expression/comparison_expression.hpp"
 #include "duckdb/parser/expression/function_expression.hpp"
 #include "duckdb/parser/expression/comparison_expression.hpp"
 #include "duckdb/parser/expression/conjunction_expression.hpp"
@@ -67,6 +68,21 @@ external_pointer<T> make_external_prot(const string &rclass, SEXP prot, ARGS &&.
 	return make_external<ConstantExpression>("duckdb_expr", RApiTypes::SexpToValue(val, 0, false));
 }
 
+[[cpp11::register]] SEXP rapi_expr_comparison(list exprs, std::string cmp_op) {
+
+	ExpressionType expr_type = OperatorToExpressionType(cmp_op);
+	if (expr_type ==ExpressionType::INVALID) {
+		stop("expr_comparison: Invalid comparison operator");
+	}
+
+	return make_external<ComparisonExpression>(
+		"duckdb_expr",
+		expr_type,
+		expr_extptr_t(exprs[0])->Copy(),
+		expr_extptr_t(exprs[1])->Copy()
+	);
+}
+
 [[cpp11::register]] SEXP rapi_expr_function(std::string name, list args, list order_bys, list filter_bys) {
 	if (name.size() == 0) {
 		stop("expr_function: Zero length name");