aljaz/turso
1
0
Fork 0
mirror of https://github.com/aljazceru/turso.git synced 2026-02-20 07:25:14 +01:00
Code Issues Packages Projects Releases Wiki Activity

fix join

Browse Source
This commit is contained in:
Mikaël Francoeur
2025-11-10 17:08:44 -05:00
parent 7c96b6d9f9
commit 8ea038c00b
1 changed files with 17 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files

46
simulator/model/mod.rs
View File

@@ -3,16 +3,15 @@ use std::fmt::Display;
use anyhow::Context;
use bitflags::bitflags;
use indexmap::IndexSet;
use itertools::Itertools;
use serde::{Deserialize, Serialize};
use sql_generation::model::{
query::{
Create, CreateIndex, Delete, Drop, DropIndex, Insert, Select,
alter_table::{AlterTable, AlterTableType},
pragma::Pragma,
select::{CompoundOperator, FromClause, ResultColumn, SelectInner},
transaction::{Begin, Commit, Rollback},
update::Update,
alter_table::{AlterTable, AlterTableType}, pragma::Pragma, select::{CompoundOperator, FromClause, ResultColumn, SelectInner}, transaction::{Begin, Commit, Rollback}, update::Update, Create, CreateIndex,
Delete,
Drop,
DropIndex,
Insert,
Select,
},
table::{Index, JoinTable, JoinType, SimValue, Table, TableContext},
};
@@ -362,7 +361,7 @@ impl Shadow for FromClause {
let mut join_table = JoinTable {
tables: vec![first_table.clone()],
rows: Vec::new(),
rows: first_table.rows.clone(),
};
for join in &self.joins {
@@ -375,29 +374,18 @@ impl Shadow for FromClause {
match join.join_type {
JoinType::Inner => {
// Implement inner join logic
let join_rows = joined_table
.rows
.iter()
.filter(|row| join.on.test(row, joined_table))
.cloned()
.collect::<Vec<_>>();
// take a cartesian product of the rows
let all_row_pairs = join_table
.rows
.clone()
.into_iter()
.cartesian_product(join_rows.iter());
for (row1, row2) in all_row_pairs {
let row = row1.iter().chain(row2.iter()).cloned().collect::<Vec<_>>();
let is_in = join.on.test(&row, &join_table);
if is_in {
join_table.rows.push(row);
let prev_rows = std::mem::take(&mut join_table.rows);
let mut new_rows = Vec::new();
for row1 in prev_rows.into_iter() {
for row2 in joined_table.rows.iter() {
let combined_row =
row1.iter().chain(row2.iter()).cloned().collect::<Vec<_>>();
if join.on.test(&combined_row, &join_table) {
new_rows.push(combined_row);
}
}
}
join_table.rows = new_rows;
}
_ => todo!(),
}