Skip to content

Fix merge into #163

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

Merged
merged 3 commits into from
Jan 23, 2025
Merged

Fix merge into #163

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
b43474c
Fix merge into
osipovartem Jan 23, 2025
5793289
Merge branch 'main' of github.com:Embucket/control-plane-v2 into issu…
osipovartem Jan 23, 2025
7680c41
deps
osipovartem Jan 23, 2025
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
2 changes: 1 addition & 1 deletion Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ datafusion = { version = "43" }
snafu = { version = "0.8.5", features = ["futures"] }

[patch.crates-io]
datafusion = { git="https://github.com/Embucket/datafusion.git", rev = "cc37c5920463b0cb0b224fc7f567fd4ae0368ffe" }
datafusion = { git="https://github.com/Embucket/datafusion.git", rev = "d176c5872a93b0c5dfdd1d2bc717ad22739e9c18" }


[workspace.lints.clippy]
Expand Down
12 changes: 6 additions & 6 deletions crates/control_plane/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,13 +18,13 @@ flatbuffers = { version = "24.3.25" }
#iceberg-rest-catalog = { git = "https://github.com/JanKaul/iceberg-rust.git", rev = "836f11f" }
#datafusion_iceberg = { git = "https://github.com/JanKaul/iceberg-rust.git", rev = "836f11f" }

datafusion = { git="https://github.com/Embucket/datafusion.git", rev = "cc37c5920463b0cb0b224fc7f567fd4ae0368ffe" }
datafusion-common = { git="https://github.com/Embucket/datafusion.git", rev = "cc37c5920463b0cb0b224fc7f567fd4ae0368ffe" }
datafusion-expr = { git="https://github.com/Embucket/datafusion.git", rev = "cc37c5920463b0cb0b224fc7f567fd4ae0368ffe" }
datafusion = { git="https://github.com/Embucket/datafusion.git", rev = "d176c5872a93b0c5dfdd1d2bc717ad22739e9c18" }
datafusion-common = { git="https://github.com/Embucket/datafusion.git", rev = "d176c5872a93b0c5dfdd1d2bc717ad22739e9c18" }
datafusion-expr = { git="https://github.com/Embucket/datafusion.git", rev = "d176c5872a93b0c5dfdd1d2bc717ad22739e9c18" }

iceberg-rust = { git = "https://github.com/Embucket/iceberg-rust.git", rev = "09090f0e9b11153a549ed447581a5b595484b245" }
iceberg-rest-catalog = { git = "https://github.com/Embucket/iceberg-rust.git", rev = "09090f0e9b11153a549ed447581a5b595484b245" }
datafusion_iceberg = { git = "https://github.com/Embucket/iceberg-rust.git", rev = "09090f0e9b11153a549ed447581a5b595484b245" }
iceberg-rust = { git = "https://github.com/Embucket/iceberg-rust.git", rev = "4114c25c46d0c7ad272031e61ece1e62a892ddfc" }
iceberg-rest-catalog = { git = "https://github.com/Embucket/iceberg-rust.git", rev = "4114c25c46d0c7ad272031e61ece1e62a892ddfc" }
datafusion_iceberg = { git = "https://github.com/Embucket/iceberg-rust.git", rev = "4114c25c46d0c7ad272031e61ece1e62a892ddfc" }

arrow = { version = "53" }
arrow-json = { version = "53" }
Expand Down
12 changes: 6 additions & 6 deletions crates/runtime/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,13 +14,13 @@ serde = { workspace = true }
serde_json = { workspace = true }
object_store = { workspace = true }

datafusion = { git="https://github.com/Embucket/datafusion.git", rev = "cc37c5920463b0cb0b224fc7f567fd4ae0368ffe" }
datafusion-common = { git="https://github.com/Embucket/datafusion.git", rev = "cc37c5920463b0cb0b224fc7f567fd4ae0368ffe" }
datafusion-expr = { git="https://github.com/Embucket/datafusion.git", rev = "cc37c5920463b0cb0b224fc7f567fd4ae0368ffe" }
datafusion = { git="https://github.com/Embucket/datafusion.git", rev = "d176c5872a93b0c5dfdd1d2bc717ad22739e9c18" }
datafusion-common = { git="https://github.com/Embucket/datafusion.git", rev = "d176c5872a93b0c5dfdd1d2bc717ad22739e9c18" }
datafusion-expr = { git="https://github.com/Embucket/datafusion.git", rev = "d176c5872a93b0c5dfdd1d2bc717ad22739e9c18" }

iceberg-rust = { git = "https://github.com/Embucket/iceberg-rust.git", rev = "09090f0e9b11153a549ed447581a5b595484b245" }
iceberg-rest-catalog = { git = "https://github.com/Embucket/iceberg-rust.git", rev = "09090f0e9b11153a549ed447581a5b595484b245" }
datafusion_iceberg = { git = "https://github.com/Embucket/iceberg-rust.git", rev = "09090f0e9b11153a549ed447581a5b595484b245" }
iceberg-rust = { git = "https://github.com/Embucket/iceberg-rust.git", rev = "4114c25c46d0c7ad272031e61ece1e62a892ddfc" }
iceberg-rest-catalog = { git = "https://github.com/Embucket/iceberg-rust.git", rev = "4114c25c46d0c7ad272031e61ece1e62a892ddfc" }
datafusion_iceberg = { git = "https://github.com/Embucket/iceberg-rust.git", rev = "4114c25c46d0c7ad272031e61ece1e62a892ddfc" }

arrow = { version = "53" }
arrow-json = { version = "53" }
Expand Down
88 changes: 51 additions & 37 deletions crates/runtime/src/datafusion/execution.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -83,7 +83,8 @@ impl SqlExecutor {
| Statement::Commit { .. }
| Statement::Insert { .. }
| Statement::ShowSchemas { .. }
| Statement::ShowVariable { .. } => {
| Statement::ShowVariable { .. }
| Statement::Update { .. } => {
return Box::pin(self.execute_with_custom_plan(&query, warehouse_name)).await;
}
Statement::Query(mut subquery) => {
Expand Down Expand Up @@ -291,8 +292,8 @@ impl SqlExecutor {
self.update_tables_in_table_factor(&mut table, warehouse_name);
self.update_tables_in_table_factor(&mut source, warehouse_name);

let (target_table, target_alias) = self.get_table_with_alias(table);
let (source_table, _source_alias) = self.get_table_with_alias(source.clone());
let (target_table, target_alias) = Self::get_table_with_alias(table);
let (_source_table, source_alias) = Self::get_table_with_alias(source.clone());

let source_query = if let TableFactor::Derived {
subquery,
Expand Down Expand Up @@ -323,41 +324,37 @@ impl SqlExecutor {
};

// Check NOT MATCHED for records to INSERT
let select_query =
format!("SELECT * FROM {source_query} JOIN {target_table} {target_alias} ON {on}{where_clause_str}");
self.execute_with_custom_plan(&select_query, warehouse_name)
.await?;

// Extract columns and values from clauses
let mut columns = Vec::new();
let mut values = Vec::new();
let mut columns = String::new();
let mut values = String::new();
for clause in clauses {
if clause.clause_kind == MergeClauseKind::NotMatched {
if let MergeAction::Insert(insert) = clause.action {
columns = insert.columns;
columns = insert
.columns
.iter()
.map(ToString::to_string)
.collect::<Vec<_>>()
.join(", ");
if let MergeInsertKind::Values(values_insert) = insert.kind {
values = values_insert.rows.into_iter().flatten().collect();
values = values_insert
.rows
.into_iter()
.flatten()
.collect::<Vec<_>>()
.iter()
.map(|v| format!("{source_alias}.{v}"))
.collect::<Vec<_>>()
.join(", ");
}
}
}
}
// Construct the INSERT statement
let insert_query = format!(
"INSERT INTO {} ({}) SELECT {} FROM {}",
target_table,
columns
.iter()
.map(ToString::to_string)
.collect::<Vec<_>>()
.join(", "),
values
.iter()
.map(ToString::to_string)
.collect::<Vec<_>>()
.join(", "),
source_table
);
let select_query =
format!("SELECT {values} FROM {source_query} JOIN {target_table} {target_alias} ON {on}{where_clause_str}");

// Construct the INSERT statement
let insert_query = format!("INSERT INTO {target_table} ({columns}) {select_query}");
self.execute_with_custom_plan(&insert_query, warehouse_name)
.await
} else {
Expand Down Expand Up @@ -643,6 +640,7 @@ impl SqlExecutor {
}

#[must_use]
#[allow(clippy::too_many_lines)]
pub fn update_statement_references(
&self,
statement: DFStatement,
Expand Down Expand Up @@ -736,6 +734,28 @@ impl SqlExecutor {
statement
}
}
Statement::Update {
mut table,
assignments,
mut from,
selection,
returning,
or,
} => {
self.update_tables_in_table_with_joins(&mut table, warehouse_name);
if let Some(from) = from.as_mut() {
self.update_tables_in_table_with_joins(from, warehouse_name);
}
let modified_statement = Statement::Update {
table,
assignments,
from,
selection,
returning,
or,
};
DFStatement::Statement(Box::new(modified_statement))
}
_ => statement,
},
_ => statement,
Expand Down Expand Up @@ -773,21 +793,15 @@ impl SqlExecutor {
}

#[allow(clippy::only_used_in_recursion)]
fn get_table_with_alias(&self, factor: TableFactor) -> (ObjectName, String) {
fn get_table_with_alias(factor: TableFactor) -> (ObjectName, String) {
match factor {
TableFactor::Table { name, alias, .. } => {
let target_alias = alias.map_or_else(String::new, |alias| alias.to_string());
(name, target_alias)
}
TableFactor::Derived {
subquery, alias, ..
} => {
// Return only alias for derived tables
TableFactor::Derived { alias, .. } => {
let target_alias = alias.map_or_else(String::new, |alias| alias.to_string());
if let sqlparser::ast::SetExpr::Select(select) = subquery.body.as_ref() {
if let Some(table_with_joins) = select.from.first() {
return self.get_table_with_alias(table_with_joins.relation.clone());
}
}
(ObjectName(vec![]), target_alias)
}
_ => (ObjectName(vec![]), String::new()),
Expand Down
3 changes: 2 additions & 1 deletion crates/runtime/src/datafusion/planner.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -93,7 +93,8 @@ where
match statement.clone() {
Statement::AlterTable { .. }
| Statement::StartTransaction { .. }
| Statement::Commit { .. } => Ok(LogicalPlan::default()),
| Statement::Commit { .. }
| Statement::Update { .. } => Ok(LogicalPlan::default()),
Statement::ShowSchemas { .. } => self.show_variable_to_plan(&["schemas".into()]),
Statement::ShowVariable { variable } => self.show_variable_to_plan(&variable),
Statement::CreateTable(CreateTableStatement {
Expand Down
Loading