Skip to content

Changing method prototype in doc processor #5871

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

Open
wants to merge 1 commit into
base: main
Choose a base branch
from
Open

Changing method prototype in doc processor #5871

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
24 changes: 11 additions & 13 deletions quickwit/quickwit-indexing/src/actors/doc_processor.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -150,15 +150,11 @@ fn try_into_vrl_doc(
Ok(vrl_doc)
}

fn try_into_json_docs(
input_format: SourceInputFormat,
raw_doc: Bytes,
num_bytes: usize,
) -> JsonDocIterator {
fn try_into_json_docs(input_format: SourceInputFormat, raw_doc: Bytes) -> JsonDocIterator {
match input_format {
SourceInputFormat::Json => {
let json_doc_result = serde_json::from_slice::<JsonObject>(&raw_doc)
.map(|json_obj| JsonDoc::new(json_obj, num_bytes));
.map(|json_obj| JsonDoc::new(json_obj, raw_doc.len()));
JsonDocIterator::from(json_doc_result)
}
SourceInputFormat::OtlpLogsJson => {
Expand All @@ -182,7 +178,7 @@ fn try_into_json_docs(
let mut json_obj = serde_json::Map::with_capacity(1);
let key = PLAIN_TEXT.to_string();
json_obj.insert(key, JsonValue::String(value));
JsonDoc::new(json_obj, num_bytes)
JsonDoc::new(json_obj, raw_doc.len())
});
JsonDocIterator::from(json_doc_result)
}
Expand Down Expand Up @@ -210,10 +206,9 @@ fn parse_raw_doc(
fn parse_raw_doc(
input_format: SourceInputFormat,
raw_doc: Bytes,
num_bytes: usize,
_vrl_program_opt: Option<&mut VrlProgram>,
) -> JsonDocIterator {
try_into_json_docs(input_format, raw_doc, num_bytes)
try_into_json_docs(input_format, raw_doc)
}

enum JsonDocIterator {
Expand Down Expand Up @@ -462,14 +457,14 @@ impl DocProcessor {
}

fn process_raw_doc(&mut self, raw_doc: Bytes, processed_docs: &mut Vec<ProcessedDoc>) {
let num_bytes = raw_doc.len();

#[cfg(feature = "vrl")]
let transform_opt = self.transform_opt.as_mut();
#[cfg(not(feature = "vrl"))]
let transform_opt: Option<&mut VrlProgram> = None;

for json_doc_result in parse_raw_doc(self.input_format, raw_doc, num_bytes, transform_opt) {
let raw_doc_num_bytes = raw_doc.len();

for json_doc_result in parse_raw_doc(self.input_format, raw_doc, transform_opt) {
let processed_doc_result =
json_doc_result.and_then(|json_doc| self.process_json_doc(json_doc));

Expand All @@ -485,7 +480,10 @@ impl DocProcessor {
source_id = self.counters.source_id,
"{error}",
);
self.counters.record_error(error, num_bytes as u64);
// WARN The num bytes value is wrong here. Depending on the source,
// raw_doc could be generating more than one doc. In that case, raw_doc_num_bytes
// is not the size of the faulty doc we just encountered.
self.counters.record_error(error, raw_doc_num_bytes as u64);
}
}
}
Expand Down
Loading