This is an automated email from the ASF dual-hosted git repository.
jacktengg pushed a commit to branch branch-2.0
in repository https://gitbox.apache.org/repos/asf/doris.git
The following commit(s) were added to refs/heads/branch-2.0 by this push:
new 5f7ffa02175 [fix](case) include some case and adjust expect result
(#35592)
5f7ffa02175 is described below
commit 5f7ffa02175e1d833dd9290b73f55155ba994118
Author: Dongyang Li <hello_step...@qq.com>
AuthorDate: Tue Jun 11 14:25:20 2024 +0800
[fix](case) include some case and adjust expect result (#35592)
## Proposed changes
Issue Number: close #xxx
<!--Describe your changes.-->
---------
Co-authored-by: stephen <hello-step...@qq.com>
---
.../jdbc/test_doris_jdbc_catalog.out | 4 +-
regression-test/pipeline/external/conf/be.conf | 78 ++++++++++++++++++++++
.../{p0 => external}/conf/regression-conf.groovy | 22 ++++--
.../pipeline/p0/conf/regression-conf.groovy | 16 ++++-
4 files changed, 111 insertions(+), 9 deletions(-)
diff --git
a/regression-test/data/external_table_p0/jdbc/test_doris_jdbc_catalog.out
b/regression-test/data/external_table_p0/jdbc/test_doris_jdbc_catalog.out
index bcb4537bcad..211b33a07d0 100644
--- a/regression-test/data/external_table_p0/jdbc/test_doris_jdbc_catalog.out
+++ b/regression-test/data/external_table_p0/jdbc/test_doris_jdbc_catalog.out
@@ -84,8 +84,8 @@ decimal_col DECIMAL(10, 5) Yes false \N NONE
decimal_col2 DECIMAL(30, 10) Yes false \N NONE
date_col DATE Yes false \N NONE
datetime_col DATETIME(3) Yes false \N NONE
-char_col CHAR(10) Yes false \N NONE
-varchar_col VARCHAR(10) Yes false \N NONE
+char_col TEXT Yes false \N NONE
+varchar_col TEXT Yes false \N NONE
json_col JSON Yes false \N NONE
-- !desc_ctas_arr --
diff --git a/regression-test/pipeline/external/conf/be.conf
b/regression-test/pipeline/external/conf/be.conf
new file mode 100644
index 00000000000..eb4e91730ea
--- /dev/null
+++ b/regression-test/pipeline/external/conf/be.conf
@@ -0,0 +1,78 @@
+# 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.
+
+PPROF_TMPDIR="$DORIS_HOME/log/"
+
+# INFO, WARNING, ERROR, FATAL
+sys_log_level = INFO
+
+# ports for admin, web, heartbeat service
+be_port = 9161
+webserver_port = 8141
+heartbeat_service_port = 9151
+brpc_port = 8161
+
+mem_limit = 90%
+disable_minidump = true
+path_gc_check_interval_second=1
+max_garbage_sweep_interval=180
+rowbatch_align_tuple_offset=true
+
+buffer_pool_limit = 2%
+storage_page_cache_limit = 0%
+disable_storage_page_cache = true
+chunk_reserved_bytes_limit = 134217728
+# Choose one if there are more than one ip except loopback address.
+# Note that there should at most one ip match this list.
+# If no ip match this rule, will choose one randomly.
+# use CIDR format, e.g. 10.10.10.0/24
+# Default value is empty.
+# priority_networks = 10.10.10.0/24;192.168.0.0/16
+
+# data root path, separate by ';'
+# you can specify the storage medium of each root path, HDD or SSD
+# you can add capacity limit at the end of each root path, seperate by ','
+# eg:
+# /home/disk2/doris, capacity limit is disk capacity, HDD(default)
+#
+# you also can specify the properties by setting '<property>:<value>',
seperate by ','
+# property 'medium' has a higher priority than the extension of path
+#
+# Default value is ${DORIS_HOME}/storage, you should create it by hand.
+
+# Advanced configurations
+# sys_log_dir = ${DORIS_HOME}/log
+# sys_log_roll_mode = SIZE-MB-1024
+# sys_log_roll_num = 10
+# sys_log_verbose_modules = *
+log_buffer_level = -1
+# palo_cgroups
+#storage_root_path=/mnt/hdd01/doris.SSD/NON_VEC_RELEASE;/mnt/hdd01/doris.HDD/NON_VEC_RELEASE;/mnt/hdd02/doris.SSD/NON_VEC_RELEASE;/mnt/hdd02/doris.HDD/NON_VEC_RELEASE;/mnt/hdd03/doris.SSD/NON_VEC_RELEASE;/mnt/hdd03/doris.HDD/NON_VEC_RELEASE;/mnt/hdd04/doris.SSD/NON_VEC_RELEASE;/mnt/hdd04/doris.HDD/NON_VEC_RELEASE;/mnt/hdd05/doris.SSD/NON_VEC_RELEASE;/mnt/hdd05/doris.HDD/NON_VEC_RELEASE;/mnt/hdd06/doris.SSD/NON_VEC_RELEASE;/mnt/hdd06/doris.HDD/NON_VEC_RELEASE;
+
+storage_root_path=/mnt/ssd01/cluster_storage/doris.SSD/P0/cluster1
+disable_auto_compaction=true
+tablet_map_shard_size=256
+priority_networks=172.19.0.0/24
+fragment_pool_thread_num_max=5000
+enable_fuzzy_mode=true
+max_depth_of_expr_tree=200
+enable_set_in_bitmap_value=true
+enable_feature_binlog=true
+max_sys_mem_available_low_water_mark_bytes=69206016
+user_files_secure_path=/
+enable_merge_on_write_correctness_check=false
+enable_debug_points=true
diff --git a/regression-test/pipeline/p0/conf/regression-conf.groovy
b/regression-test/pipeline/external/conf/regression-conf.groovy
similarity index 86%
copy from regression-test/pipeline/p0/conf/regression-conf.groovy
copy to regression-test/pipeline/external/conf/regression-conf.groovy
index 615cb4f81c0..5aa03266b26 100644
--- a/regression-test/pipeline/p0/conf/regression-conf.groovy
+++ b/regression-test/pipeline/external/conf/regression-conf.groovy
@@ -59,10 +59,22 @@ testDirectories = ""
// this groups will not be executed
excludeGroups = ""
// this suites will not be executed
-excludeSuites =
"test_information_schema_external,test_outfile_exception,test_digest,test_aggregate_all_functions2,test_hive_read_orc_complex_type,test_with_and_two_phase_agg,explode,test_cast_function,test_profile,test_broker_load_p2,test_spark_load,test_analyze_stats_p1,test_refresh_mtmv,test_bitmap_filter,test_export_parquet,test_doris_jdbc_catalog"
+excludeSuites = "test_information_schema_external," +
+ "test_outfile_exception," +
+ "explode," +
+ "test_profile," +
+ "test_broker_load_p2," +
+ "test_spark_load," +
+ "test_analyze_stats_p1," +
+ "test_refresh_mtmv," +
+ "test_export_parquet"
// this directories will not be executed
-excludeDirectories =
"nereids_tpcds_shape_sf100_p0,nereids_tpch_shape_sf1000_p0,nereids_tpch_shape_sf500_p0,workload_manager_p1,fault_injection_p0"
+excludeDirectories = "nereids_tpcds_shape_sf100_p0," +
+ "nereids_tpch_shape_sf1000_p0," +
+ "nereids_tpch_shape_sf500_p0," +
+ "workload_manager_p1," +
+ "fault_injection_p0"
customConf1 = "test_custom_conf_value"
@@ -79,14 +91,14 @@ enableBrokerLoad=true
// jdbc connector test config
// To enable jdbc test, you need first start mysql/pg container.
// See `docker/thirdparties/start-thirdparties-docker.sh`
-enableJdbcTest=false
+enableJdbcTest=true
mysql_57_port=7111
pg_14_port=7121
mariadb_10_port=3326
// hive catalog test config
// To enable jdbc test, you need first start hive container.
// See `docker/thirdparties/start-thirdparties-docker.sh`
-enableHiveTest=false
+enableHiveTest=true
hms_port=7141
hiveServerPort=10000
@@ -99,7 +111,7 @@ kafka_port=19193
// iceberg test config
iceberg_rest_uri_port=18181
-enableEsTest=false
+enableEsTest=true
es_6_port=19200
es_7_port=29200
es_8_port=39200
diff --git a/regression-test/pipeline/p0/conf/regression-conf.groovy
b/regression-test/pipeline/p0/conf/regression-conf.groovy
index 615cb4f81c0..57257a07bf2 100644
--- a/regression-test/pipeline/p0/conf/regression-conf.groovy
+++ b/regression-test/pipeline/p0/conf/regression-conf.groovy
@@ -59,10 +59,22 @@ testDirectories = ""
// this groups will not be executed
excludeGroups = ""
// this suites will not be executed
-excludeSuites =
"test_information_schema_external,test_outfile_exception,test_digest,test_aggregate_all_functions2,test_hive_read_orc_complex_type,test_with_and_two_phase_agg,explode,test_cast_function,test_profile,test_broker_load_p2,test_spark_load,test_analyze_stats_p1,test_refresh_mtmv,test_bitmap_filter,test_export_parquet,test_doris_jdbc_catalog"
+excludeSuites = "test_information_schema_external," +
+ "test_outfile_exception," +
+ "explode," +
+ "test_profile," +
+ "test_broker_load_p2," +
+ "test_spark_load," +
+ "test_analyze_stats_p1," +
+ "test_refresh_mtmv," +
+ "test_export_parquet"
// this directories will not be executed
-excludeDirectories =
"nereids_tpcds_shape_sf100_p0,nereids_tpch_shape_sf1000_p0,nereids_tpch_shape_sf500_p0,workload_manager_p1,fault_injection_p0"
+excludeDirectories = "nereids_tpcds_shape_sf100_p0," +
+ "nereids_tpch_shape_sf1000_p0," +
+ "nereids_tpch_shape_sf500_p0," +
+ "workload_manager_p1," +
+ "fault_injection_p0"
customConf1 = "test_custom_conf_value"
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscr...@doris.apache.org
For additional commands, e-mail: commits-h...@doris.apache.org
