Skip to content
New issue

Have a question about this project? # for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “#”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? # to your account

feat: Include rfuns extension #144

Merged
merged 3 commits into from
Apr 29, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 4 additions & 0 deletions R/cpp11.R
Original file line number Diff line number Diff line change
Expand Up @@ -223,3 +223,7 @@ rapi_adbc_init_func <- function() {
rapi_ptr_to_str <- function(extptr) {
.Call(`_duckdb_rapi_ptr_to_str`, extptr)
}

rapi_load_rfuns <- function(dual) {
invisible(.Call(`_duckdb_rapi_load_rfuns`, dual))
}
2 changes: 1 addition & 1 deletion src/Makevars
Original file line number Diff line number Diff line change
Expand Up @@ -16,4 +16,4 @@ include Makevars.duckdb

CXX_STD = CXX17
PKG_CPPFLAGS = -Iinclude -I../inst/include -DDUCKDB_DISABLE_PRINT -DDUCKDB_R_BUILD -Iduckdb/src/include -Iduckdb/third_party/concurrentqueue -Iduckdb/third_party/fast_float -Iduckdb/third_party/fastpforlib -Iduckdb/third_party/fmt/include -Iduckdb/third_party/fsst -Iduckdb/third_party/httplib -Iduckdb/third_party/hyperloglog -Iduckdb/third_party/jaro_winkler -Iduckdb/third_party/jaro_winkler/details -Iduckdb/third_party/libpg_query -Iduckdb/third_party/libpg_query/include -Iduckdb/third_party/lz4 -Iduckdb/third_party/mbedtls -Iduckdb/third_party/mbedtls/include -Iduckdb/third_party/mbedtls/library -Iduckdb/third_party/miniz -Iduckdb/third_party/pcg -Iduckdb/third_party/re2 -Iduckdb/third_party/skiplist -Iduckdb/third_party/tdigest -Iduckdb/third_party/utf8proc -Iduckdb/third_party/utf8proc/include -Iduckdb/extension/parquet/include -Iduckdb/third_party/parquet -Iduckdb/third_party/thrift -Iduckdb/third_party/lz4 -Iduckdb/third_party/snappy -Iduckdb/third_party/zstd/include -Iduckdb/third_party/mbedtls -Iduckdb/third_party/mbedtls/include -I../inst/include -Iduckdb -DDUCKDB_EXTENSION_PARQUET_LINKED -DDUCKDB_BUILD_LIBRARY
OBJECTS=database.o connection.o statement.o register.o relational.o scan.o transform.o utils.o reltoaltrep.o types.o cpp11.o $(SOURCES)
OBJECTS=rfuns.o database.o connection.o statement.o register.o relational.o scan.o transform.o utils.o reltoaltrep.o types.o cpp11.o $(SOURCES)
2 changes: 1 addition & 1 deletion src/Makevars.in
Original file line number Diff line number Diff line change
Expand Up @@ -16,5 +16,5 @@ include Makevars.duckdb

CXX_STD = CXX17
PKG_CPPFLAGS = -Iinclude -I../inst/include -DDUCKDB_DISABLE_PRINT -DDUCKDB_R_BUILD {{ INCLUDES }}
OBJECTS=database.o connection.o statement.o register.o relational.o scan.o transform.o utils.o reltoaltrep.o types.o cpp11.o $(SOURCES)
OBJECTS=rfuns.o database.o connection.o statement.o register.o relational.o scan.o transform.o utils.o reltoaltrep.o types.o cpp11.o $(SOURCES)
PKG_LIBS={{ LINK_FLAGS }}
2 changes: 1 addition & 1 deletion src/Makevars.win
Original file line number Diff line number Diff line change
Expand Up @@ -16,5 +16,5 @@ include Makevars.duckdb

CXX_STD = CXX17
PKG_CPPFLAGS = -Iinclude -I../inst/include -DDUCKDB_DISABLE_PRINT -DDUCKDB_R_BUILD -Iduckdb/src/include -Iduckdb/third_party/concurrentqueue -Iduckdb/third_party/fast_float -Iduckdb/third_party/fastpforlib -Iduckdb/third_party/fmt/include -Iduckdb/third_party/fsst -Iduckdb/third_party/httplib -Iduckdb/third_party/hyperloglog -Iduckdb/third_party/jaro_winkler -Iduckdb/third_party/jaro_winkler/details -Iduckdb/third_party/libpg_query -Iduckdb/third_party/libpg_query/include -Iduckdb/third_party/lz4 -Iduckdb/third_party/mbedtls -Iduckdb/third_party/mbedtls/include -Iduckdb/third_party/mbedtls/library -Iduckdb/third_party/miniz -Iduckdb/third_party/pcg -Iduckdb/third_party/re2 -Iduckdb/third_party/skiplist -Iduckdb/third_party/tdigest -Iduckdb/third_party/utf8proc -Iduckdb/third_party/utf8proc/include -Iduckdb/extension/parquet/include -Iduckdb/third_party/parquet -Iduckdb/third_party/thrift -Iduckdb/third_party/lz4 -Iduckdb/third_party/snappy -Iduckdb/third_party/zstd/include -Iduckdb/third_party/mbedtls -Iduckdb/third_party/mbedtls/include -I../inst/include -Iduckdb -DDUCKDB_EXTENSION_PARQUET_LINKED -DDUCKDB_BUILD_LIBRARY -DDUCKDB_PLATFORM_RTOOLS=1
OBJECTS=database.o connection.o statement.o register.o relational.o scan.o transform.o utils.o reltoaltrep.o types.o cpp11.o $(SOURCES)
OBJECTS=rfuns.o database.o connection.o statement.o register.o relational.o scan.o transform.o utils.o reltoaltrep.o types.o cpp11.o $(SOURCES)
PKG_LIBS=-lws2_32 -L. -lrstrtmgr
9 changes: 9 additions & 0 deletions src/cpp11.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -407,6 +407,14 @@ extern "C" SEXP _duckdb_rapi_ptr_to_str(SEXP extptr) {
return cpp11::as_sexp(rapi_ptr_to_str(cpp11::as_cpp<cpp11::decay_t<SEXP>>(extptr)));
END_CPP11
}
// utils.cpp
void rapi_load_rfuns(duckdb::db_eptr_t dual);
extern "C" SEXP _duckdb_rapi_load_rfuns(SEXP dual) {
BEGIN_CPP11
rapi_load_rfuns(cpp11::as_cpp<cpp11::decay_t<duckdb::db_eptr_t>>(dual));
return R_NilValue;
END_CPP11
}

extern "C" {
static const R_CallMethodDef CallEntries[] = {
Expand All @@ -427,6 +435,7 @@ static const R_CallMethodDef CallEntries[] = {
{"_duckdb_rapi_get_substrait_json", (DL_FUNC) &_duckdb_rapi_get_substrait_json, 3},
{"_duckdb_rapi_is_locked", (DL_FUNC) &_duckdb_rapi_is_locked, 1},
{"_duckdb_rapi_list_arrow", (DL_FUNC) &_duckdb_rapi_list_arrow, 1},
{"_duckdb_rapi_load_rfuns", (DL_FUNC) &_duckdb_rapi_load_rfuns, 1},
{"_duckdb_rapi_lock", (DL_FUNC) &_duckdb_rapi_lock, 1},
{"_duckdb_rapi_prepare", (DL_FUNC) &_duckdb_rapi_prepare, 2},
{"_duckdb_rapi_prepare_substrait", (DL_FUNC) &_duckdb_rapi_prepare_substrait, 2},
Expand Down
80 changes: 80 additions & 0 deletions src/include/rfuns_extension.hpp
Original file line number Diff line number Diff line change
@@ -0,0 +1,80 @@
#pragma once

#include "duckdb.hpp"

namespace duckdb {
namespace rfuns {

template <LogicalTypeId LOGICAL_TYPE>
struct physical ;

template <>
struct physical<LogicalType::BOOLEAN> {
using type = bool;
};
template <>
struct physical<LogicalType::INTEGER> {
using type = int32_t;
};
template <>
struct physical<LogicalType::DOUBLE> {
using type = double;
};
template <>
struct physical<LogicalType::VARCHAR> {
using type = string_t;
};
template <>
struct physical<LogicalType::TIMESTAMP> {
using type = timestamp_t;
};
template <>
struct physical<LogicalType::DATE> {
using type = date_t;
};

struct BinaryChunk {
duckdb::Vector &lefts;
duckdb::Vector &rights;
};

template <LogicalTypeId LHS_LOGICAL_TYPE, LogicalTypeId RHS_LOGICAL_TYPE>
BinaryChunk BinaryTypeAssert(DataChunk &args) {
auto &lefts = args.data[0];
D_ASSERT(lefts.GetType() == LHS_LOGICAL_TYPE);

auto &rights = args.data[1];
D_ASSERT(rights.GetType() == LHS_LOGICAL_TYPE);

return {lefts, rights};
}

ScalarFunctionSet base_r_add();

// relop
ScalarFunctionSet base_r_eq();
ScalarFunctionSet base_r_neq();
ScalarFunctionSet base_r_lt();
ScalarFunctionSet base_r_lte();
ScalarFunctionSet base_r_gt();
ScalarFunctionSet base_r_gte();

// sum
AggregateFunctionSet base_r_sum();
AggregateFunctionSet base_r_min();
AggregateFunctionSet base_r_max();

ScalarFunctionSet binary_dispatch(ScalarFunctionSet fn) ;

// is_na
ScalarFunctionSet base_r_is_na();

} // namespace rfuns

class RfunsExtension : public Extension {
public:
void Load(DuckDB &db) override;
std::string Name() override;
};

} // namespace duckdb
Loading
Loading