Skip to content

Commit 0496efb

Browse files
authored
Merge pull request #10658 from xinlifoobar/dev/xinli/select-list-stage
feat(query): list_stage table function.
2 parents 9e554b4 + 1cc158a commit 0496efb

File tree

21 files changed

+387
-143
lines changed

21 files changed

+387
-143
lines changed

src/query/service/src/interpreters/access/management_mode_access.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -47,6 +47,7 @@ impl AccessChecker for ManagementModeAccess {
4747
| RewriteKind::ShowUsers
4848
| RewriteKind::ShowStages
4949
| RewriteKind::DescribeStage
50+
| RewriteKind::ListStage
5051
| RewriteKind::ShowRoles),
5152
_ => false
5253
}
@@ -80,7 +81,6 @@ impl AccessChecker for ManagementModeAccess {
8081
// Stage.
8182
| Plan::CreateStage(_)
8283
| Plan::DropStage(_)
83-
| Plan::ListStage(_)
8484

8585
// UDF
8686
| Plan::CreateUDF(_)

src/query/service/src/interpreters/access/privilege_access.rs

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -429,7 +429,6 @@ impl AccessChecker for PrivilegeAccess {
429429
| Plan::ShowCreateCatalog(_)
430430
| Plan::CreateCatalog(_)
431431
| Plan::DropCatalog(_)
432-
| Plan::ListStage(_)
433432
| Plan::CreateStage(_)
434433
| Plan::DropStage(_)
435434
| Plan::RemoveStage(_)

src/query/service/src/interpreters/interpreter_factory.rs

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -259,7 +259,6 @@ impl InterpreterFactory {
259259
)?)),
260260

261261
// Stages
262-
Plan::ListStage(s) => Ok(Arc::new(ListInterpreter::try_create(ctx, *s.clone())?)),
263262
Plan::CreateStage(create_stage) => Ok(Arc::new(
264263
CreateUserStageInterpreter::try_create(ctx, *create_stage.clone())?,
265264
)),

src/query/service/src/interpreters/interpreter_list.rs

Lines changed: 0 additions & 104 deletions
This file was deleted.

src/query/service/src/interpreters/mod.rs

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,6 @@ mod interpreter_file_format_drop;
3535
mod interpreter_file_format_show;
3636
mod interpreter_insert;
3737
mod interpreter_kill;
38-
mod interpreter_list;
3938
mod interpreter_metrics;
4039
mod interpreter_presign;
4140
mod interpreter_privilege_grant;
@@ -108,7 +107,6 @@ pub use interpreter_explain::ExplainInterpreter;
108107
pub use interpreter_factory::InterpreterFactory;
109108
pub use interpreter_insert::InsertInterpreter;
110109
pub use interpreter_kill::KillInterpreter;
111-
pub use interpreter_list::ListInterpreter;
112110
pub use interpreter_metrics::InterpreterMetrics;
113111
pub use interpreter_privilege_grant::GrantPrivilegeInterpreter;
114112
pub use interpreter_privilege_revoke::RevokePrivilegeInterpreter;

src/query/service/src/servers/mysql/mysql_interactive_worker.rs

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -77,7 +77,6 @@ fn has_result_set_by_plan(plan: &Plan) -> bool {
7777
| Plan::ShowGrantTenantsOfShare(_)
7878
| Plan::DescribeTable(_)
7979
| Plan::ShowGrants(_)
80-
| Plan::ListStage(_)
8180
| Plan::Presign(_)
8281
)
8382
}

src/query/storages/fuse/src/table_functions/infer_schema/infer_schema_table.rs renamed to src/query/service/src/table_functions/infer_schema/infer_schema_table.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,8 @@ use common_catalog::plan::DataSourcePlan;
1919
use common_catalog::plan::PartStatistics;
2020
use common_catalog::plan::Partitions;
2121
use common_catalog::plan::PushDownInfo;
22+
use common_catalog::table::Table;
23+
use common_catalog::table_args::TableArgs;
2224
use common_exception::ErrorCode;
2325
use common_exception::Result;
2426
use common_expression::types::BooleanType;
@@ -47,9 +49,7 @@ use crate::pipelines::processors::port::OutputPort;
4749
use crate::pipelines::Pipeline;
4850
use crate::sessions::TableContext;
4951
use crate::table_functions::infer_schema::table_args::InferSchemaArgsParsed;
50-
use crate::table_functions::TableArgs;
5152
use crate::table_functions::TableFunction;
52-
use crate::Table;
5353

5454
const INFER_SCHEMA: &str = "infer_schema";
5555

src/query/storages/fuse/src/table_functions/infer_schema/mod.rs renamed to src/query/service/src/table_functions/infer_schema/mod.rs

File renamed without changes.

src/query/storages/fuse/src/table_functions/infer_schema/table_args.rs renamed to src/query/service/src/table_functions/infer_schema/table_args.rs

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -12,12 +12,11 @@
1212
// See the License for the specific language governing permissions and
1313
// limitations under the License.
1414

15+
use common_catalog::table_args::TableArgs;
1516
use common_exception::ErrorCode;
1617
use common_exception::Result;
1718
use common_storage::StageFilesInfo;
18-
19-
use crate::table_functions::string_value;
20-
use crate::table_functions::TableArgs;
19+
use common_storages_fuse::table_functions::string_value;
2120

2221
#[derive(Clone)]
2322
pub(crate) struct InferSchemaArgsParsed {

0 commit comments

Comments
 (0)