Skip to content

fix: Fail with non-UTF8-encoded strings during data frame scan instead of attempting to reencode #1795

New issue

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

Sign up for GitHub

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

Already on GitHub? Sign in to your account

Merged
krlmlr merged 5 commits into from
Dec 1, 2025
Merged

fix: Fail with non-UTF8-encoded strings during data frame scan instead of attempting to reencode #1795

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
18442a7
fix: Fail with non-UTF8-encoded strings during data frame scan instea…
krlmlr Dec 1, 2025
c2ee4af
Merge remote-tracking branch 'origin/main' into b-utf8-scan
krlmlr Dec 1, 2025
12a4af8
chore: Auto-update from GitHub Actions
krlmlr Dec 1, 2025
194f809
Revert "chore: Auto-update from GitHub Actions"
krlmlr Dec 1, 2025
6ef892e
Avoid
krlmlr Dec 1, 2025
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
2 changes: 0 additions & 2 deletions src/include/rapi.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -155,8 +155,6 @@ struct ReplacementDataDBWrapper : public ReplacementScanData {

cpp11::strings StringsToSexp(vector<std::string> s);

SEXP ToUtf8(SEXP string_sexp);

static constexpr char R_STRING_TYPE_NAME[] = "r_string";

struct RStringsType {
Expand Down
17 changes: 10 additions & 7 deletions src/utils.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,11 +11,6 @@ using namespace duckdb;
return R_MakeExternalPtrFn((DL_FUNC)duckdb_adbc_init, R_NilValue, R_NilValue);
}

SEXP duckdb::ToUtf8(SEXP string_sexp) {
cpp11::function enc2utf8 = RStrings::get().enc2utf8_sym;
return enc2utf8(string_sexp);
}

[[cpp11::register]] cpp11::r_string rapi_ptr_to_str(SEXP extptr) {
if (TYPEOF(extptr) != EXTPTRSXP) {
rapi_error_with_context("rapi_ptr_to_str", "Need external pointer parameter");
Expand Down Expand Up @@ -151,8 +146,16 @@ Value RApiTypes::SexpToValue(SEXP valsexp, R_len_t idx, bool typed_logical_null)
}
}
case RType::STRING: {
auto str_val = STRING_ELT(ToUtf8(valsexp), idx);
return str_val == NA_STRING ? Value(LogicalType::VARCHAR) : Value(CHAR(str_val));
auto str_val = STRING_ELT(valsexp, idx);
if (str_val == NA_STRING) {
return Value(LogicalType::VARCHAR);
}

auto ce = Rf_getCharCE(str_val);
if (ce != CE_UTF8 && ce != CE_NATIVE) {
rapi_error_with_context("SexpToValue", "Only UTF-8 encoded strings are supported for the data frame scan.");
}
return Value(CHAR(str_val));
}
case RTypeId::FACTOR: {
auto int_val = INTEGER_POINTER(valsexp)[idx];
Expand Down
Loading