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

fix: fix unit_test setting to have the desired results

pull/24376/head
Nga Tran 2021-07-22 14:22:08 -04:00
parent b2063fb29f
commit 11ba4b5f6a
2 changed files with 9 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
query/src/frontend/reorg.rs
View File

@ -297,6 +297,7 @@ mod test {
.with_tag_column_with_stats("tag1", Some("UT"), Some("WA"))
.with_i64_field_column("field_int")
.with_i64_field_column("field_int2")
.with_may_contain_pk_duplicates(true)
.with_four_rows_of_data(),
);
@ -337,6 +338,8 @@ mod test {
#[tokio::test]
async fn test_compact_plan() {
test_helpers::maybe_start_logging();
let (schema, chunks) = get_test_chunks().await;
let mut sort_key = SortKey::with_capacity(2);
@ -380,7 +383,6 @@ mod test {
"| field_int | field_int2 | tag1 | time |",
"+-----------+------------+------+-------------------------------+",
"| 1000 | 1000 | WA | 1970-01-01 00:00:00.000028 |",
"| 10 | 10 | VT | 1970-01-01 00:00:00.000210 |", // BUG: This row should be deduplicated
"| 50 | 50 | VT | 1970-01-01 00:00:00.000210 |",
"| 70 | 70 | UT | 1970-01-01 00:00:00.000220 |",
"| 1000 | | MT | 1970-01-01 00:00:00.000001 |",
@ -458,7 +460,6 @@ mod test {
"| 5 | | MT | 1970-01-01 00:00:00.000005 |",
"| 10 | | MT | 1970-01-01 00:00:00.000007 |",
"| 1000 | 1000 | WA | 1970-01-01 00:00:00.000028 |",
"| 10 | 10 | VT | 1970-01-01 00:00:00.000210 |", // BUG: this row should be dedupplicated
"| 50 | 50 | VT | 1970-01-01 00:00:00.000210 |",
"| 70 | 70 | UT | 1970-01-01 00:00:00.000220 |",
"+-----------+------------+------+----------------------------+",

6
query/src/provider.rs
View File

@ -348,6 +348,7 @@ impl<C: QueryChunk + 'static> Deduplicater<C> {
let mut plans = vec![];
if self.no_duplicates() {
// Neither overlaps nor duplicates, no deduplicating needed
trace!("All chunks in the scan neither overlap nor duplicates. The scan is simply an IOxReaderFilterNode");
let plan = Self::build_plans_for_non_duplicates_chunk(
Arc::clone(&table_name),
Arc::clone(&output_schema),
@ -356,6 +357,11 @@ impl<C: QueryChunk + 'static> Deduplicater<C> {
);
plans.push(plan);
} else {
trace!(overlapped_chunks=?self.overlapped_chunks_set.len(),
in_chunk_duplicates=?self.in_chunk_duplicates_chunks.len(),
no_duplicates_chunks=?self.no_duplicates_chunks.len(),
"Chunks after classifying: ");
// Go over overlapped set, build deduplicate plan for each vector of overlapped chunks
for overlapped_chunks in self.overlapped_chunks_set.to_vec() {
plans.push(Self::build_deduplicate_plan_for_overlapped_chunks(