Influxdata
/
influxdb
mirror of https://github.com/influxdata/influxdb.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

fix: Remove greater_than_sequence_number from IngesterQueryRequest (#3856)

pull/24376/head
Carol (Nichols || Goulding) 2022-02-24 14:23:44 -05:00 committed by GitHub
parent a3a628c783
commit 723a0c659f
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 3 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
generated_types/protos/influxdata/iox/ingester/v1/query.proto
View File

@ -21,8 +21,9 @@ message IngesterQueryRequest {
// Predicate for filtering
optional Predicate predicate = 5;
// Optionally only return rows with a sequence number greater than this
optional uint64 greater_than_sequence_number = 6;
// Was for only returning rows with a sequence number greater than this
reserved "greater_than_sequence_number";
reserved 6;
// Namespace to search
string namespace = 7;

14
ingester/src/data.rs
View File

@ -1051,8 +1051,6 @@ pub struct IngesterQueryRequest {
columns: Vec<String>,
/// Predicate for filtering
predicate: Option<Predicate>,
/// Optionally only return rows with a sequence number greater than this
greater_than_sequence_number: Option<SequenceNumber>,
}
impl IngesterQueryRequest {
@ -1064,7 +1062,6 @@ impl IngesterQueryRequest {
table: String,
columns: Vec<String>,
predicate: Option<Predicate>,
greater_than_sequence_number: Option<SequenceNumber>,
) -> Self {
Self {
namespace,
@ -1072,7 +1069,6 @@ impl IngesterQueryRequest {
table,
columns,
predicate,
greater_than_sequence_number,
}
}
}
@ -1087,16 +1083,10 @@ impl TryFrom<proto::IngesterQueryRequest> for IngesterQueryRequest {
table,
columns,
predicate,
greater_than_sequence_number,
} = proto;
let predicate = predicate.map(TryInto::try_into).transpose()?;
let sequencer_id: i16 = sequencer_id.try_into().scope("sequencer_id")?;
let greater_than_sequence_number = greater_than_sequence_number
.map(TryInto::try_into)
.transpose()
.scope("greater_than_sequence_number")?
.map(SequenceNumber::new);
Ok(Self::new(
namespace,
@ -1104,7 +1094,6 @@ impl TryFrom<proto::IngesterQueryRequest> for IngesterQueryRequest {
table,
columns,
predicate,
greater_than_sequence_number,
))
}
}
@ -1118,7 +1107,6 @@ pub struct IngesterQueryResponse {
pub schema: Schema,
/// Max persisted sequence number of the table
/// Only return this if it is larger than the IngesterQueryRequest's greater_than_sequence_number
pub max_sequencer_number: Option<SequenceNumber>,
}
@ -1184,7 +1172,6 @@ mod tests {
"cpu".into(),
vec!["usage".into(), "time".into()],
Some(rust_predicate),
Some(SequenceNumber::new(5)),
);
let proto_query = proto::IngesterQueryRequest {
@ -1193,7 +1180,6 @@ mod tests {
table: "cpu".into(),
columns: vec!["usage".into(), "time".into()],
predicate: Some(proto_predicate),
greater_than_sequence_number: Some(5),
};
let rust_query_converted = IngesterQueryRequest::try_from(proto_query).unwrap();