-
Notifications
You must be signed in to change notification settings - Fork 599
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge branch 'main' into xxh/fix-iceberg-source
- Loading branch information
Showing
27 changed files
with
439 additions
and
179 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
50 changes: 50 additions & 0 deletions
50
src/frontend/src/catalog/system_catalog/rw_catalog/rw_streaming_jobs.rs
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,50 @@ | ||
| // Copyright 2025 RisingWave Labs | ||
| // | ||
| // Licensed under the Apache License, Version 2.0 (the "License"); | ||
| // you may not use this file except in compliance with the License. | ||
| // You may obtain a copy of the License at | ||
| // | ||
| // http://www.apache.org/licenses/LICENSE-2.0 | ||
| // | ||
| // Unless required by applicable law or agreed to in writing, software | ||
| // distributed under the License is distributed on an "AS IS" BASIS, | ||
| // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||
| // See the License for the specific language governing permissions and | ||
| // limitations under the License. | ||
|
|
||
| use risingwave_common::types::Fields; | ||
| use risingwave_frontend_macro::system_catalog; | ||
|
|
||
| use crate::catalog::system_catalog::{extract_parallelism_from_table_state, SysCatalogReaderImpl}; | ||
| use crate::error::Result; | ||
|
|
||
| #[derive(Fields)] | ||
| struct RwStreamingJob { | ||
| #[primary_key] | ||
| job: i32, | ||
| name: String, | ||
| status: String, | ||
| parallelism: String, | ||
| max_parallelism: i32, | ||
| resource_group: String, | ||
| } | ||
|
|
||
| #[system_catalog(table, "rw_catalog.rw_streaming_jobs")] | ||
| async fn read_rw_streaming_jobs(reader: &SysCatalogReaderImpl) -> Result<Vec<RwStreamingJob>> { | ||
| let states = reader.meta_client.list_streaming_job_states().await?; | ||
|
|
||
| Ok(states | ||
| .into_iter() | ||
| .map(|state| { | ||
| let parallelism = extract_parallelism_from_table_state(&state); | ||
| RwStreamingJob { | ||
| job: state.table_id as i32, | ||
| status: state.state().as_str_name().into(), | ||
| name: state.name, | ||
| parallelism: parallelism.to_uppercase(), | ||
| max_parallelism: state.max_parallelism as i32, | ||
| resource_group: state.resource_group, | ||
| } | ||
| }) | ||
| .collect()) | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
72 changes: 72 additions & 0 deletions
72
src/frontend/src/expr/function_impl/pg_table_is_visible.rs
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,72 @@ | ||
| // Copyright 2025 RisingWave Labs | ||
| // | ||
| // Licensed under the Apache License, Version 2.0 (the "License"); | ||
| // you may not use this file except in compliance with the License. | ||
| // You may obtain a copy of the License at | ||
| // | ||
| // http://www.apache.org/licenses/LICENSE-2.0 | ||
| // | ||
| // Unless required by applicable law or agreed to in writing, software | ||
| // distributed under the License is distributed on an "AS IS" BASIS, | ||
| // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||
| // See the License for the specific language governing permissions and | ||
| // limitations under the License. | ||
|
|
||
| use risingwave_common::acl::AclMode; | ||
| use risingwave_common::session_config::SearchPath; | ||
| use risingwave_expr::{capture_context, function, Result}; | ||
| use risingwave_pb::user::grant_privilege::Object as GrantObject; | ||
|
|
||
| use super::context::{AUTH_CONTEXT, CATALOG_READER, DB_NAME, SEARCH_PATH, USER_INFO_READER}; | ||
| use crate::catalog::system_catalog::is_system_catalog; | ||
| use crate::catalog::CatalogReader; | ||
| use crate::expr::function_impl::has_privilege::user_not_found_err; | ||
| use crate::session::AuthContext; | ||
| use crate::user::user_service::UserInfoReader; | ||
|
|
||
| #[function("pg_table_is_visible(int4) -> boolean")] | ||
| fn pg_table_is_visible(oid: i32) -> Result<Option<bool>> { | ||
| pg_table_is_visible_impl_captured(oid) | ||
| } | ||
|
|
||
| #[capture_context(CATALOG_READER, USER_INFO_READER, AUTH_CONTEXT, SEARCH_PATH, DB_NAME)] | ||
| fn pg_table_is_visible_impl( | ||
| catalog: &CatalogReader, | ||
| user_info: &UserInfoReader, | ||
| auth_context: &AuthContext, | ||
| search_path: &SearchPath, | ||
| db_name: &str, | ||
| oid: i32, | ||
| ) -> Result<Option<bool>> { | ||
| // To maintain consistency with PostgreSQL, we ensure that system catalogs are always visible. | ||
| if is_system_catalog(oid as u32) { | ||
| return Ok(Some(true)); | ||
| } | ||
|
|
||
| let catalog_reader = catalog.read_guard(); | ||
| let user_reader = user_info.read_guard(); | ||
| let user_info = user_reader | ||
| .get_user_by_name(&auth_context.user_name) | ||
| .ok_or(user_not_found_err( | ||
| format!("User {} not found", auth_context.user_name).as_str(), | ||
| ))?; | ||
| // Return true only if: | ||
| // 1. The schema of the object exists in the search path. | ||
| // 2. User have `USAGE` privilege on the schema. | ||
| for schema in search_path.path() { | ||
| if let Ok(schema) = catalog_reader.get_schema_by_name(db_name, schema) { | ||
| if schema.contains_object(oid as u32) { | ||
| return if user_info.is_super | ||
| || user_info | ||
| .check_privilege(&GrantObject::SchemaId(schema.id()), AclMode::Usage) | ||
| { | ||
| Ok(Some(true)) | ||
| } else { | ||
| Ok(Some(false)) | ||
| }; | ||
| } | ||
| } | ||
| } | ||
|
|
||
| Ok(None) | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.