From 68124b67e5b3d209637f1e0f342ebe791063a86c Mon Sep 17 00:00:00 2001 From: morningman Date: Tue, 24 Sep 2024 10:26:21 +0800 Subject: [PATCH] 2 --- .../external_table_p0/tvf/upgrade/test.out | 45 --------------- .../external_table_p0/tvf/upgrade/load.groovy | 55 ------------------- .../external_table_p0/tvf/upgrade/test.groovy | 34 ------------ 3 files changed, 134 deletions(-) delete mode 100644 regression-test/data/external_table_p0/tvf/upgrade/test.out delete mode 100644 regression-test/suites/external_table_p0/tvf/upgrade/load.groovy delete mode 100644 regression-test/suites/external_table_p0/tvf/upgrade/test.groovy diff --git a/regression-test/data/external_table_p0/tvf/upgrade/test.out b/regression-test/data/external_table_p0/tvf/upgrade/test.out deleted file mode 100644 index 12289c2571814a..00000000000000 --- a/regression-test/data/external_table_p0/tvf/upgrade/test.out +++ /dev/null @@ -1,45 +0,0 @@ --- This file is automatically generated. You should know what you did if you want to edit this --- !create_view -- -0 -1 -10 -100 -101 -102 -103 -104 -105 -106 -107 -108 -109 -11 -110 -111 -112 -113 -114 -115 - --- !alter_view -- -0 -1 -10 -100 -101 -102 -103 -104 -105 -106 -107 -108 -109 -11 -110 -111 -112 -113 -114 -115 - diff --git a/regression-test/suites/external_table_p0/tvf/upgrade/load.groovy b/regression-test/suites/external_table_p0/tvf/upgrade/load.groovy deleted file mode 100644 index 5fac50e64ffa81..00000000000000 --- a/regression-test/suites/external_table_p0/tvf/upgrade/load.groovy +++ /dev/null @@ -1,55 +0,0 @@ -// Licensed to the Apache Software Foundation (ASF) under one -// or more contributor license agreements. See the NOTICE file -// distributed with this work for additional information -// regarding copyright ownership. The ASF licenses this file -// to you 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. - -suite("test_tvf_upgrade_load", "p0,external,hive,external_docker,external_docker_hive,restart_fe,upgrade_case") { - String hdfs_port = context.config.otherConfigs.get("hive2HdfsPort") - String externalEnvIp = context.config.otherConfigs.get("externalEnvIp") - - // It's okay to use random `hdfsUser`, but can not be empty. - def hdfsUserName = "doris" - def format = "csv" - def defaultFS = "hdfs://${externalEnvIp}:${hdfs_port}" - def uri = "" - - String enabled = context.config.otherConfigs.get("enableHiveTest") - if (enabled != null && enabled.equalsIgnoreCase("true")) { - // test create view from tvf and alter view from tvf - uri = "${defaultFS}" + "/user/doris/preinstalled_data/csv_format_test/all_types.csv" - format = "csv" - sql """ DROP VIEW IF EXISTS test_hdfs_tvf_create_view;""" - sql """ - create view test_hdfs_tvf_create_view as - select * from HDFS( - "uri" = "${uri}", - "hadoop.username" = "${hdfsUserName}", - "column_separator" = ",", - "format" = "${format}") order by c1; - """ - logger.info("View test_hdfs_tvf_create_view created") - - - sql """ - alter view test_hdfs_tvf_create_view as - select c1 from HDFS( - "uri" = "${uri}", - "hadoop.username" = "${hdfsUserName}", - "column_separator" = ",", - "format" = "${format}") order by c1; - """ - logger.info("View test_hdfs_tvf_create_view altered") - } -} \ No newline at end of file diff --git a/regression-test/suites/external_table_p0/tvf/upgrade/test.groovy b/regression-test/suites/external_table_p0/tvf/upgrade/test.groovy deleted file mode 100644 index a3b0795ef46f98..00000000000000 --- a/regression-test/suites/external_table_p0/tvf/upgrade/test.groovy +++ /dev/null @@ -1,34 +0,0 @@ -// Licensed to the Apache Software Foundation (ASF) under one -// or more contributor license agreements. See the NOTICE file -// distributed with this work for additional information -// regarding copyright ownership. The ASF licenses this file -// to you 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. - -suite("test_tvf_upgrade_test", "p0,external,hive,external_docker,external_docker_hive,restart_fe,upgrade_case") { - String hdfs_port = context.config.otherConfigs.get("hive2HdfsPort") - String externalEnvIp = context.config.otherConfigs.get("externalEnvIp") - - // It's okay to use random `hdfsUser`, but can not be empty. - def hdfsUserName = "doris" - def format = "csv" - def defaultFS = "hdfs://${externalEnvIp}:${hdfs_port}" - def uri = "" - - String enabled = context.config.otherConfigs.get("enableHiveTest") - if (enabled != null && enabled.equalsIgnoreCase("true")) { - order_qt_create_view """ select * from test_hdfs_tvf_create_view order by c1 limit 20; """ - - order_qt_alter_view """ select * from test_hdfs_tvf_create_view order by c1 limit 20; """ - } -} \ No newline at end of file