weaselab/weaseldb
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Only pass CommitRequest to begin_streaming_parse

Browse Source
This commit is contained in:
Andrew Noyes
2025-08-17 15:20:37 -04:00
parent 032a4184cc
commit 519c9457cd
6 changed files with 27 additions and 36 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
src/json_commit_request_parser.cpp
View File

@@ -453,8 +453,8 @@ bool JsonCommitRequestParser::parse(CommitRequest &request, char *data,
if (!begin_streaming_parse(request)) {
return false;
}
parse_chunk(request, data, len);
finish_streaming_parse(request);
parse_chunk(data, len);
finish_streaming_parse();
return !has_parse_error() && !request.leader_id().empty() &&
parser_context_->has_read_version_been_set;
@@ -481,8 +481,7 @@ bool JsonCommitRequestParser::begin_streaming_parse(CommitRequest &request) {
}
JsonCommitRequestParser::ParseStatus
JsonCommitRequestParser::parse_chunk(CommitRequest &request, char *data,
size_t len) {
JsonCommitRequestParser::parse_chunk(char *data, size_t len) {
if (!json_parser_ || !parser_context_) {
return ParseStatus::Error;
}
@@ -495,7 +494,6 @@ JsonCommitRequestParser::parse_chunk(CommitRequest &request, char *data,
return ParseStatus::Complete;
}
current_request_ = &request;
WeaselJsonStatus status = WeaselJsonParser_parse(json_parser_, data, len);
switch (status) {
@@ -514,7 +512,7 @@ JsonCommitRequestParser::parse_chunk(CommitRequest &request, char *data,
}
JsonCommitRequestParser::ParseStatus
JsonCommitRequestParser::finish_streaming_parse(CommitRequest &request) {
JsonCommitRequestParser::finish_streaming_parse() {
if (!json_parser_ || !parser_context_) {
return ParseStatus::Error;
}
@@ -523,15 +521,13 @@ JsonCommitRequestParser::finish_streaming_parse(CommitRequest &request) {
return ParseStatus::Error;
}
current_request_ = &request;
// Signal end of input
WeaselJsonStatus status = WeaselJsonParser_parse(json_parser_, nullptr, 0);
if (status == WeaselJson_OK && parser_context_->parse_complete &&
!parser_context_->parse_error) {
// Clear the memory used only during parsing
parser_context_->reset_arena_memory(&request.arena());
parser_context_->reset_arena_memory(&current_request_->arena());
return ParseStatus::Complete;
} else {
parser_context_->parse_error =