Skip to content
Merged
Show file tree
Hide file tree
Changes from 5 commits
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
36 changes: 14 additions & 22 deletions Cargo.lock

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

1 change: 1 addition & 0 deletions Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -171,6 +171,7 @@ databend-enterprise-resources-management = { path = "src/query/ee_features/resou
databend-enterprise-row-access-policy-feature = { path = "src/query/ee_features/row_access_policy" }
databend-enterprise-storage-encryption = { path = "src/query/ee_features/storage_encryption" }
databend-enterprise-stream-handler = { path = "src/query/ee_features/stream_handler" }
databend-enterprise-table-ref-handler = { path = "src/query/ee_features/table_ref_handler" }
databend-enterprise-vacuum-handler = { path = "src/query/ee_features/vacuum_handler" }
databend-enterprise-virtual-column = { path = "src/query/ee_features/virtual_column" }
databend-functions-scalar-arithmetic = { path = "src/query/functions/src/scalars/arithmetic" }
Expand Down
1 change: 0 additions & 1 deletion src/common/cloud_control/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,6 @@ hyper-util = { workspace = true }
prost = { workspace = true }
serde = { workspace = true }
tonic = { workspace = true }
#tonic-prost = { workspace = true }

[build-dependencies]
lenient_semver = { workspace = true }
Expand Down
16 changes: 15 additions & 1 deletion src/common/exception/src/exception_code.rs
Original file line number Diff line number Diff line change
Expand Up @@ -333,6 +333,20 @@ build_exceptions! {
UnsupportedEngineParams(2703),
}

// Table reference Errors [2745-2749]
build_exceptions! {
/// Unknown reference
UnknownReference(2745),
/// Reference already exists
ReferenceAlreadyExists(2746),
/// Illegal reference
IllegalReference(2747),
/// Mismatched reference type
MismatchedReferenceType(2748),
/// Reference expired
ReferenceExpired(2749),
}

// License Errors [1401-1404]
build_exceptions! {
/// License key parse error
Expand Down Expand Up @@ -497,7 +511,7 @@ build_exceptions! {
IllegalUser(2218),
}

// Database and Catalog Management Errors [2301-2317, 2321-2323]
// Database and Catalog Management Errors [2301-2317, 2321-2326]
build_exceptions! {
/// Database already exists
DatabaseAlreadyExists(2301),
Expand Down
11 changes: 10 additions & 1 deletion src/common/license/src/license.rs
Original file line number Diff line number Diff line change
Expand Up @@ -39,6 +39,8 @@ pub enum Feature {
StorageEncryption,
#[serde(alias = "stream", alias = "STREAM")]
Stream,
#[serde(alias = "table_ref", alias = "TABLE_REF")]
TableRef,
#[serde(alias = "attach_table", alias = "ATTACH_TABLE")]
AttacheTable,
#[serde(alias = "amend_table", alias = "AMEND_TABLE")]
Expand Down Expand Up @@ -80,6 +82,7 @@ impl fmt::Display for Feature {
Feature::ComputedColumn => write!(f, "computed_column"),
Feature::StorageEncryption => write!(f, "storage_encryption"),
Feature::Stream => write!(f, "stream"),
Feature::TableRef => write!(f, "table_ref"),
Feature::AttacheTable => write!(f, "attach_table"),
Feature::AmendTable => write!(f, "amend_table"),
Feature::SystemManagement => write!(f, "system_management"),
Expand Down Expand Up @@ -118,6 +121,7 @@ impl Feature {
| (Feature::Vacuum, Feature::Vacuum)
| (Feature::LicenseInfo, Feature::LicenseInfo)
| (Feature::Stream, Feature::Stream)
| (Feature::TableRef, Feature::TableRef)
| (Feature::DataMask, Feature::DataMask)
| (Feature::RowAccessPolicy, Feature::RowAccessPolicy)
| (Feature::VirtualColumn, Feature::VirtualColumn)
Expand Down Expand Up @@ -226,6 +230,10 @@ mod tests {
Feature::Stream,
serde_json::from_str::<Feature>("\"Stream\"").unwrap()
);
assert_eq!(
Feature::TableRef,
serde_json::from_str::<Feature>("\"TableRef\"").unwrap()
);
assert_eq!(
Feature::AttacheTable,
serde_json::from_str::<Feature>("\"ATTACH_TABLE\"").unwrap()
Expand Down Expand Up @@ -287,6 +295,7 @@ mod tests {
Feature::ComputedColumn,
Feature::StorageEncryption,
Feature::Stream,
Feature::TableRef,
Feature::AttacheTable,
Feature::AmendTable,
Feature::HilbertClustering,
Expand All @@ -298,7 +307,7 @@ mod tests {
};

assert_eq!(
"LicenseInfo{ type: enterprise, org: databend, tenants: [databend_tenant,foo], features: [amend_table,attach_table,computed_column,data_mask,hilbert_clustering,license_info,private_task,row_access_policy,storage_encryption,stream,system_history,vacuum,virtual_column,workload_group] }",
"LicenseInfo{ type: enterprise, org: databend, tenants: [databend_tenant,foo], features: [amend_table,attach_table,computed_column,data_mask,hilbert_clustering,license_info,private_task,row_access_policy,storage_encryption,stream,system_history,table_ref,vacuum,virtual_column,workload_group] }",
license_info.to_string()
);
}
Expand Down
1 change: 0 additions & 1 deletion src/common/timezone/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,6 @@ edition = { workspace = true }
jiff = { workspace = true }

[dev-dependencies]
rand = { workspace = true }

[lints]
workspace = true
Loading
Loading