Skip to content
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
2 changes: 1 addition & 1 deletion Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -357,7 +357,7 @@ app: wasm wasmpack shell docs js_tests_release
yarn workspace @duckdb/duckdb-wasm-app build:release

build_loadable:
USE_GENERATED_EXPORTED_LIST=yes DUCKDB_PLATFORM=wasm_${TARGET} DUCKDB_WASM_LOADABLE_EXTENSIONS=1 GEN=ninja ./scripts/wasm_build_lib.sh relsize ${TARGET}
USE_GENERATED_EXPORTED_LIST=yes DUCKDB_PLATFORM=wasm_${TARGET} DUCKDB_WASM_LOADABLE_EXTENSIONS=1 ./scripts/wasm_build_lib.sh relsize ${TARGET}

build_loadable_unsigned: build_loadable
# need to propagate the unsigned flag
Expand Down
2 changes: 1 addition & 1 deletion lib/src/config.cc
Original file line number Diff line number Diff line change
Expand Up @@ -63,7 +63,7 @@ WebDBConfig WebDBConfig::ReadFrom(std::string_view args_json) {
.arrow_lossless_conversion = false,
.custom_user_agent = ""};
rapidjson::Document doc;
rapidjson::ParseResult ok = doc.Parse(args_json.begin(), args_json.size());
rapidjson::ParseResult ok = doc.Parse(args_json.data(), args_json.size());
if (ok) {
if (doc.HasMember("path") && doc["path"].IsString()) {
config.path = doc["path"].GetString();
Expand Down
2 changes: 1 addition & 1 deletion lib/src/json_parser.cc
Original file line number Diff line number Diff line change
Expand Up @@ -898,7 +898,7 @@ arrow::Result<std::shared_ptr<arrow::Array>> ArrayFromJSON(const std::shared_ptr
std::string_view json) {
rapidjson::Document json_doc;
try {
json_doc.Parse<rapidjson::kParseNanAndInfFlag>(json.begin(), json.size());
json_doc.Parse<rapidjson::kParseNanAndInfFlag>(json.data(), json.size());
} catch (...) {
return arrow::Status::Invalid("invalid json document: ", json);
}
Expand Down
10 changes: 5 additions & 5 deletions lib/src/webdb.cc
Original file line number Diff line number Diff line change
Expand Up @@ -354,7 +354,7 @@ arrow::Result<duckdb::unique_ptr<duckdb::QueryResult>> WebDB::Connection::Execut
return arrow::Status{arrow::StatusCode::KeyError, "No prepared statement found with ID"};

rapidjson::Document args_doc;
rapidjson::ParseResult ok = args_doc.Parse(args_json.begin(), args_json.size());
rapidjson::ParseResult ok = args_doc.Parse(args_json.data(), args_json.size());
if (!ok) return arrow::Status{arrow::StatusCode::Invalid, rapidjson::GetParseError_En(ok.Code())};
if (!args_doc.IsArray()) return arrow::Status{arrow::StatusCode::Invalid, "Arguments must be given as array"};

Expand Down Expand Up @@ -409,7 +409,7 @@ arrow::Status WebDB::Connection::ClosePreparedStatement(size_t statement_id) {
arrow::Status WebDB::Connection::CreateScalarFunction(std::string_view def_json) {
// Read the function definiton
rapidjson::Document def_doc;
def_doc.Parse(def_json.begin(), def_json.size());
def_doc.Parse(def_json.data(), def_json.size());
auto def = duckdb::make_shared_ptr<UDFFunctionDeclaration>();
ARROW_RETURN_NOT_OK(def->ReadFrom(def_doc));

Expand Down Expand Up @@ -550,7 +550,7 @@ arrow::Status WebDB::Connection::InsertArrowFromIPCStream(nonstd::span<const uin
/// We deliberately do this BEFORE creating the ipc stream.
/// This ensures that we always have valid options.
rapidjson::Document options_doc;
options_doc.Parse(options_json.begin(), options_json.size());
options_doc.Parse(options_json.data(), options_json.size());
ArrowInsertOptions options;
ARROW_RETURN_NOT_OK(options.ReadFrom(options_doc));
arrow_insert_options_ = options;
Expand Down Expand Up @@ -596,7 +596,7 @@ arrow::Status WebDB::Connection::InsertCSVFromPath(std::string_view path, std::s
try {
/// Read table options
rapidjson::Document options_doc;
options_doc.Parse(options_json.begin(), options_json.size());
options_doc.Parse(options_json.data(), options_json.size());
csv::CSVInsertOptions options;
ARROW_RETURN_NOT_OK(options.ReadFrom(options_doc));

Expand Down Expand Up @@ -664,7 +664,7 @@ arrow::Status WebDB::Connection::InsertJSONFromPath(std::string_view path, std::
try {
/// Read table options
rapidjson::Document options_doc;
options_doc.Parse(options_json.begin(), options_json.size());
options_doc.Parse(options_json.data(), options_json.size());
json::JSONInsertOptions options;
ARROW_RETURN_NOT_OK(options.ReadFrom(options_doc));

Expand Down