From e4e2cbd2e3bc8edc60c8033ce1e4d24d589a8b4f Mon Sep 17 00:00:00 2001
From: Denis Smirnov <sd@picodata.io>
Date: Thu, 18 Aug 2022 18:30:00 +0700
Subject: [PATCH] perf: remove redundant clons while merging tuples
---
src/ir/transformation/dnf.rs | 9 +++++++++
src/ir/transformation/merge_tuples.rs | 11 +++++------
2 files changed, 14 insertions(+), 6 deletions(-)
diff --git a/src/ir/transformation/dnf.rs b/src/ir/transformation/dnf.rs
index 922e722360..3eb25c7cfe 100644
--- a/src/ir/transformation/dnf.rs
+++ b/src/ir/transformation/dnf.rs
@@ -89,6 +89,14 @@ impl Chain {
}
}
+ fn reserve(&mut self, additional: usize) {
+ self.nodes.reserve(additional);
+ }
+
+ fn length(&self) -> usize {
+ self.nodes.len()
+ }
+
/// Append a new node to the chain. Keep AND and OR nodes in the back,
/// while other nodes in the front of the chain double-ended queue.
fn push(&mut self, expr_id: usize, plan: &Plan) -> Result<(), QueryPlannerError> {
@@ -196,6 +204,7 @@ impl Plan {
}
Bool::Or => {
let mut new_chain = chain.clone();
+ new_chain.reserve(capacity - new_chain.length());
new_chain.push(*right, self)?;
stack.push(new_chain);
chain.push(*left, self)?;
diff --git a/src/ir/transformation/merge_tuples.rs b/src/ir/transformation/merge_tuples.rs
index b1f7725773..35d208ff2f 100644
--- a/src/ir/transformation/merge_tuples.rs
+++ b/src/ir/transformation/merge_tuples.rs
@@ -93,8 +93,8 @@ impl Chain {
match self.grouped.entry(group_op) {
Entry::Occupied(mut entry) => {
let (left, right) = entry.get_mut();
- let new_left_id = plan.expr_clone(left_id)?;
- let new_right_id = plan.expr_clone(right_id)?;
+ let new_left_id = left_id;
+ let new_right_id = right_id;
plan.get_columns_or_self(new_left_id)?
.iter()
.for_each(|id| {
@@ -107,8 +107,8 @@ impl Chain {
});
}
Entry::Vacant(entry) => {
- let new_left_id = plan.expr_clone(left_id)?;
- let new_right_id = plan.expr_clone(right_id)?;
+ let new_left_id = left_id;
+ let new_right_id = right_id;
entry.insert((
plan.get_columns_or_self(new_left_id)?,
plan.get_columns_or_self(new_right_id)?,
@@ -119,8 +119,7 @@ impl Chain {
}
}
- let new_expr_id = plan.expr_clone(expr_id)?;
- self.other.push(new_expr_id);
+ self.other.push(expr_id);
Ok(())
}
--
GitLab