Skip to content

Commit 4753744

Browse files
Tishjcarlopi
authored andcommitted
changes required to get a source build somewhat working
1 parent 7f924a2 commit 4753744

File tree

4 files changed

+8
-8
lines changed

4 files changed

+8
-8
lines changed

Makefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -357,7 +357,7 @@ app: wasm wasmpack shell docs js_tests_release
357357
yarn workspace @duckdb/duckdb-wasm-app build:release
358358

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

362362
build_loadable_unsigned: build_loadable
363363
# need to propagate the unsigned flag

lib/src/config.cc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -63,7 +63,7 @@ WebDBConfig WebDBConfig::ReadFrom(std::string_view args_json) {
6363
.arrow_lossless_conversion = false,
6464
.custom_user_agent = ""};
6565
rapidjson::Document doc;
66-
rapidjson::ParseResult ok = doc.Parse(args_json.begin(), args_json.size());
66+
rapidjson::ParseResult ok = doc.Parse(args_json.data(), args_json.size());
6767
if (ok) {
6868
if (doc.HasMember("path") && doc["path"].IsString()) {
6969
config.path = doc["path"].GetString();

lib/src/json_parser.cc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -898,7 +898,7 @@ arrow::Result<std::shared_ptr<arrow::Array>> ArrayFromJSON(const std::shared_ptr
898898
std::string_view json) {
899899
rapidjson::Document json_doc;
900900
try {
901-
json_doc.Parse<rapidjson::kParseNanAndInfFlag>(json.begin(), json.size());
901+
json_doc.Parse<rapidjson::kParseNanAndInfFlag>(json.data(), json.size());
902902
} catch (...) {
903903
return arrow::Status::Invalid("invalid json document: ", json);
904904
}

lib/src/webdb.cc

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -354,7 +354,7 @@ arrow::Result<duckdb::unique_ptr<duckdb::QueryResult>> WebDB::Connection::Execut
354354
return arrow::Status{arrow::StatusCode::KeyError, "No prepared statement found with ID"};
355355

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

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

@@ -550,7 +550,7 @@ arrow::Status WebDB::Connection::InsertArrowFromIPCStream(nonstd::span<const uin
550550
/// We deliberately do this BEFORE creating the ipc stream.
551551
/// This ensures that we always have valid options.
552552
rapidjson::Document options_doc;
553-
options_doc.Parse(options_json.begin(), options_json.size());
553+
options_doc.Parse(options_json.data(), options_json.size());
554554
ArrowInsertOptions options;
555555
ARROW_RETURN_NOT_OK(options.ReadFrom(options_doc));
556556
arrow_insert_options_ = options;
@@ -596,7 +596,7 @@ arrow::Status WebDB::Connection::InsertCSVFromPath(std::string_view path, std::s
596596
try {
597597
/// Read table options
598598
rapidjson::Document options_doc;
599-
options_doc.Parse(options_json.begin(), options_json.size());
599+
options_doc.Parse(options_json.data(), options_json.size());
600600
csv::CSVInsertOptions options;
601601
ARROW_RETURN_NOT_OK(options.ReadFrom(options_doc));
602602

@@ -664,7 +664,7 @@ arrow::Status WebDB::Connection::InsertJSONFromPath(std::string_view path, std::
664664
try {
665665
/// Read table options
666666
rapidjson::Document options_doc;
667-
options_doc.Parse(options_json.begin(), options_json.size());
667+
options_doc.Parse(options_json.data(), options_json.size());
668668
json::JSONInsertOptions options;
669669
ARROW_RETURN_NOT_OK(options.ReadFrom(options_doc));
670670

0 commit comments

Comments
 (0)