Skip to content
Merged
Show file tree
Hide file tree
Changes from 1 commit
Commits
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
72 changes: 36 additions & 36 deletions Cargo.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

12 changes: 6 additions & 6 deletions Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -89,12 +89,12 @@ uuid = { version = "1.10.0", features = ["v4", "serde"] }
validator = { version = "0.20.0", features = ["derive"] }

[patch.crates-io]
datafusion = { git = "https://github.com/Embucket/datafusion.git", rev = "330a88732a63376af59d48a57ca15072ce3b336a" }
datafusion-common = { git = "https://github.com/Embucket/datafusion.git", rev = "330a88732a63376af59d48a57ca15072ce3b336a" }
datafusion-expr = { git = "https://github.com/Embucket/datafusion.git", rev = "330a88732a63376af59d48a57ca15072ce3b336a" }
datafusion-physical-plan = { git = "https://github.com/Embucket/datafusion.git", rev = "330a88732a63376af59d48a57ca15072ce3b336a" }
datafusion-doc = { git = "https://github.com/Embucket/datafusion.git", rev = "330a88732a63376af59d48a57ca15072ce3b336a" }
datafusion-macros = { git = "https://github.com/Embucket/datafusion.git", rev = "330a88732a63376af59d48a57ca15072ce3b336a" }
datafusion = { git = "https://github.com/Embucket/datafusion.git", rev = "087ebef56368ce471532b6d6b69eaab94cddd651" }
datafusion-common = { git = "https://github.com/Embucket/datafusion.git", rev = "087ebef56368ce471532b6d6b69eaab94cddd651" }
datafusion-expr = { git = "https://github.com/Embucket/datafusion.git", rev = "087ebef56368ce471532b6d6b69eaab94cddd651" }
datafusion-physical-plan = { git = "https://github.com/Embucket/datafusion.git", rev = "087ebef56368ce471532b6d6b69eaab94cddd651" }
datafusion-doc = { git = "https://github.com/Embucket/datafusion.git", rev = "087ebef56368ce471532b6d6b69eaab94cddd651" }
datafusion-macros = { git = "https://github.com/Embucket/datafusion.git", rev = "087ebef56368ce471532b6d6b69eaab94cddd651" }

[workspace.lints.clippy]
all = { level = "deny", priority = -1 }
Expand Down
3 changes: 2 additions & 1 deletion crates/api-iceberg-rest/src/error.rs
Original file line number Diff line number Diff line change
Expand Up @@ -70,7 +70,8 @@ impl IntoResponse for Error {
| core_metastore::Error::DatabaseAlreadyExists { .. }
| core_metastore::Error::SchemaAlreadyExists { .. }
| core_metastore::Error::TableAlreadyExists { .. }
| core_metastore::Error::VolumeInUse { .. } => http::StatusCode::CONFLICT,
| core_metastore::Error::VolumeInUse { .. }
| core_metastore::Error::DatabaseInUse { .. } => http::StatusCode::CONFLICT,
core_metastore::Error::TableRequirementFailed { .. } => {
http::StatusCode::UNPROCESSABLE_ENTITY
}
Expand Down
3 changes: 2 additions & 1 deletion crates/api-internal-rest/src/error.rs
Original file line number Diff line number Diff line change
Expand Up @@ -109,7 +109,8 @@ impl IntoResponse for Error {
| core_metastore::Error::DatabaseAlreadyExists { .. }
| core_metastore::Error::SchemaAlreadyExists { .. }
| core_metastore::Error::TableAlreadyExists { .. }
| core_metastore::Error::VolumeInUse { .. } => http::StatusCode::CONFLICT,
| core_metastore::Error::VolumeInUse { .. }
| core_metastore::Error::DatabaseInUse { .. } => http::StatusCode::CONFLICT,
core_metastore::Error::TableRequirementFailed { .. } => {
http::StatusCode::UNPROCESSABLE_ENTITY
}
Expand Down
2 changes: 1 addition & 1 deletion crates/core-executor/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ datafusion-functions-json = { workspace = true }
datafusion-physical-plan = { workspace = true }
datafusion_iceberg = { workspace = true }
futures = { workspace = true }
sqlparser = { git = "https://github.com/Embucket/datafusion-sqlparser-rs.git", rev = "97c03c04230fdf789c49c64eaaa5c0e77ffc8c78", features = [
sqlparser = { git = "https://github.com/Embucket/datafusion-sqlparser-rs.git", rev = "12655c2be19d4796236154f8826e23f84d2978b0", features = [
"visitor",
] }
iceberg-rust = { workspace = true }
Expand Down
10 changes: 5 additions & 5 deletions crates/core-executor/src/error.rs
Original file line number Diff line number Diff line change
Expand Up @@ -277,6 +277,11 @@ pub enum Error {
#[snafu(implicit)]
location: Location,
},
#[snafu(display("Failed to create database without external volume"))]
ExternalVolumeRequiredForCreateDatabase {
#[snafu(implicit)]
location: Location,
},

#[snafu(display("Failed to drop catalog: {source}"))]
DropCatalog {
Expand Down Expand Up @@ -304,11 +309,6 @@ pub enum Error {
#[snafu(implicit)]
location: Location,
},
#[snafu(display("Only CREATE TABLE/CREATE SCHEMA statements are supported"))]
OnlyTableSchemaCreateStatements {
#[snafu(implicit)]
location: Location,
},
#[snafu(display("Only DROP statements are supported"))]
OnlyDropStatements {
#[snafu(implicit)]
Expand Down
Loading