Skip to content

Commit 3b39863

Browse files
authored
Create database with external volume (#1335)
* Create database with external volume * Fix errors * ObjectType enum * Update snap
1 parent 1fc1ac8 commit 3b39863

File tree

19 files changed

+342
-123
lines changed

19 files changed

+342
-123
lines changed

Cargo.lock

Lines changed: 36 additions & 36 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Cargo.toml

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -89,12 +89,12 @@ uuid = { version = "1.10.0", features = ["v4", "serde"] }
8989
validator = { version = "0.20.0", features = ["derive"] }
9090

9191
[patch.crates-io]
92-
datafusion = { git = "https://github.com/Embucket/datafusion.git", rev = "330a88732a63376af59d48a57ca15072ce3b336a" }
93-
datafusion-common = { git = "https://github.com/Embucket/datafusion.git", rev = "330a88732a63376af59d48a57ca15072ce3b336a" }
94-
datafusion-expr = { git = "https://github.com/Embucket/datafusion.git", rev = "330a88732a63376af59d48a57ca15072ce3b336a" }
95-
datafusion-physical-plan = { git = "https://github.com/Embucket/datafusion.git", rev = "330a88732a63376af59d48a57ca15072ce3b336a" }
96-
datafusion-doc = { git = "https://github.com/Embucket/datafusion.git", rev = "330a88732a63376af59d48a57ca15072ce3b336a" }
97-
datafusion-macros = { git = "https://github.com/Embucket/datafusion.git", rev = "330a88732a63376af59d48a57ca15072ce3b336a" }
92+
datafusion = { git = "https://github.com/Embucket/datafusion.git", rev = "087ebef56368ce471532b6d6b69eaab94cddd651" }
93+
datafusion-common = { git = "https://github.com/Embucket/datafusion.git", rev = "087ebef56368ce471532b6d6b69eaab94cddd651" }
94+
datafusion-expr = { git = "https://github.com/Embucket/datafusion.git", rev = "087ebef56368ce471532b6d6b69eaab94cddd651" }
95+
datafusion-physical-plan = { git = "https://github.com/Embucket/datafusion.git", rev = "087ebef56368ce471532b6d6b69eaab94cddd651" }
96+
datafusion-doc = { git = "https://github.com/Embucket/datafusion.git", rev = "087ebef56368ce471532b6d6b69eaab94cddd651" }
97+
datafusion-macros = { git = "https://github.com/Embucket/datafusion.git", rev = "087ebef56368ce471532b6d6b69eaab94cddd651" }
9898

9999
[workspace.lints.clippy]
100100
all = { level = "deny", priority = -1 }

crates/api-iceberg-rest/src/error.rs

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -70,7 +70,8 @@ impl IntoResponse for Error {
7070
| core_metastore::Error::DatabaseAlreadyExists { .. }
7171
| core_metastore::Error::SchemaAlreadyExists { .. }
7272
| core_metastore::Error::TableAlreadyExists { .. }
73-
| core_metastore::Error::VolumeInUse { .. } => http::StatusCode::CONFLICT,
73+
| core_metastore::Error::VolumeInUse { .. }
74+
| core_metastore::Error::DatabaseInUse { .. } => http::StatusCode::CONFLICT,
7475
core_metastore::Error::TableRequirementFailed { .. } => {
7576
http::StatusCode::UNPROCESSABLE_ENTITY
7677
}

crates/api-internal-rest/src/error.rs

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -109,7 +109,8 @@ impl IntoResponse for Error {
109109
| core_metastore::Error::DatabaseAlreadyExists { .. }
110110
| core_metastore::Error::SchemaAlreadyExists { .. }
111111
| core_metastore::Error::TableAlreadyExists { .. }
112-
| core_metastore::Error::VolumeInUse { .. } => http::StatusCode::CONFLICT,
112+
| core_metastore::Error::VolumeInUse { .. }
113+
| core_metastore::Error::DatabaseInUse { .. } => http::StatusCode::CONFLICT,
113114
core_metastore::Error::TableRequirementFailed { .. } => {
114115
http::StatusCode::UNPROCESSABLE_ENTITY
115116
}

crates/core-executor/Cargo.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ datafusion-functions-json = { workspace = true }
2424
datafusion-physical-plan = { workspace = true }
2525
datafusion_iceberg = { workspace = true }
2626
futures = { workspace = true }
27-
sqlparser = { git = "https://github.com/Embucket/datafusion-sqlparser-rs.git", rev = "97c03c04230fdf789c49c64eaaa5c0e77ffc8c78", features = [
27+
sqlparser = { git = "https://github.com/Embucket/datafusion-sqlparser-rs.git", rev = "12655c2be19d4796236154f8826e23f84d2978b0", features = [
2828
"visitor",
2929
] }
3030
iceberg-rust = { workspace = true }

0 commit comments

Comments
 (0)