Merge branch 'main' into enable_experiment_aggregate

Author: dqhl76

tests/shell_env.sh

@@ -11,82 +11,66 @@ export QUERY_MYSQL_HANDLER_HOST=${QUERY_MYSQL_HANDLER_HOST:="127.0.0.1"}
 export QUERY_MYSQL_HANDLER_PORT=${QUERY_MYSQL_HANDLER_PORT:="3307"}
 export QUERY_HTTP_HANDLER_PORT=${QUERY_HTTP_HANDLER_PORT:="8000"}
 
-bendsql_client() {
-	local stderr_file status
-
-	stderr_file=$(mktemp) || return 1
-	bendsql "$@" 2>"$stderr_file"
-	status=$?
-	sed -E 's/ \[v[0-9][^]]*\]$//' "$stderr_file" >&2
-	rm -f "$stderr_file"
-	return "$status"
-}
+export BENDSQL_ERROR_NO_VERSION=1
 
-bendsql_query_http_connect() {
-	bendsql_client \
+bendsql_connect() {
+	bendsql \
 		--host "${QUERY_MYSQL_HANDLER_HOST}" \
 		--port "${QUERY_HTTP_HANDLER_PORT}" \
 		"$@"
 }
 
-bendsql_query_http_user_connect() {
+bendsql_connect_user() {
 	local user="$1"
 	local password="$2"
 	shift 2
 
-	bendsql_query_http_connect \
+	bendsql_connect \
 		--user "${user}" \
 		--password "${password}" \
 		"$@"
 }
 
-bendsql_client_connect() {
-	bendsql_query_http_connect -uroot --quote-style=never "$@"
+bendsql_connect_root() {
+	bendsql_connect -uroot --quote-style=never "$@"
 }
 
-bendsql_client_output_null() {
-	bendsql_client_connect --output null "$@"
+bendsql_connect_root_null() {
+	bendsql_connect_root --output null "$@"
 }
 
-export BENDSQL_CLIENT_CONNECT="bendsql_client_connect"
-export BENDSQL_CLIENT_OUTPUT_NULL="bendsql_client_output_null"
-
-
 # share client
 export QUERY_MYSQL_HANDLER_SHARE_PROVIDER_PORT="18000"
 export QUERY_MYSQL_HANDLER_SHARE_CONSUMER_PORT="28000"
 
-bendsql_client_share_provider_connect() {
-	bendsql_client \
+bendsql_connect_share_provider() {
+	bendsql \
 		-uroot \
 		--host "${QUERY_MYSQL_HANDLER_HOST}" \
 		--port "${QUERY_MYSQL_HANDLER_SHARE_PROVIDER_PORT}" \
 		--quote-style=never \
 		"$@"
 }
 
-bendsql_client_share_consumer_connect() {
-	bendsql_client \
+bendsql_connect_share_consumer() {
+	bendsql \
 		-uroot \
 		--host "${QUERY_MYSQL_HANDLER_HOST}" \
 		--port "${QUERY_MYSQL_HANDLER_SHARE_CONSUMER_PORT}" \
 		--quote-style=never \
 		"$@"
 }
 
-export BENDSQL_CLIENT_PROVIDER_CONNECT="bendsql_client_share_provider_connect"
-export BENDSQL_CLIENT_CONSUMER_CONNECT="bendsql_client_share_consumer_connect"
-
 
 query() {
 	echo ">>>> $1"
-	echo "$1" | $BENDSQL_CLIENT_CONNECT
+	echo "$1" | bendsql_connect_root
 	echo "<<<<"
 }
 
 stmt() {
 	echo ">>>> $1"
-	echo "$1" | $BENDSQL_CLIENT_CONNECT
+	echo "$1" | bendsql_connect_root
 	if [ $? -ne 0 ]; then
 		echo "<<<<"
 	fi
@@ -95,7 +79,7 @@ stmt() {
 
 stmt_fail() {
 	echo ">>>> $1"
-	echo "$1" | $BENDSQL_CLIENT_CONNECT > /dev/null 2>&1
+	echo "$1" | bendsql_connect_root > /dev/null 2>&1
 	if [ $? -eq 0 ]; then
 		return 1
 	fi
@@ -109,7 +93,7 @@ comment() {
 
 # Execute SQL as root user, useful for setup/teardown blocks
 run_root_sql() {
-	cat <<SQL | $BENDSQL_CLIENT_CONNECT
+	cat <<SQL | bendsql_connect_root
 $1
 SQL
 }

tests/sqllogictests/scripts/prepare_stage.sh

@@ -7,21 +7,21 @@
 # most of the time, the tests will succeed with with "s3" too.
 # todo: add storage "http"?
 DATADIR="fs://${PWD}/tests/data/"
-echo "drop stage if exists data" | $BENDSQL_CLIENT_CONNECT
-echo "create or replace connection my_conn_s3 storage_type = 's3' access_key_id ='minioadmin' secret_access_key ='minioadmin' endpoint_url='http://127.0.0.1:9900'" | $BENDSQL_CLIENT_CONNECT
-echo "create or replace stage data_s3 url='s3://testbucket/data/' connection=(connection_name='my_conn_s3') FILE_FORMAT = (type = PARQUET);" | $BENDSQL_CLIENT_CONNECT
-echo "create or replace stage data_fs url = '${DATADIR}' FILE_FORMAT = (type = PARQUET);" | $BENDSQL_CLIENT_CONNECT
+echo "drop stage if exists data" | bendsql_connect_root
+echo "create or replace connection my_conn_s3 storage_type = 's3' access_key_id ='minioadmin' secret_access_key ='minioadmin' endpoint_url='http://127.0.0.1:9900'" | bendsql_connect_root
+echo "create or replace stage data_s3 url='s3://testbucket/data/' connection=(connection_name='my_conn_s3') FILE_FORMAT = (type = PARQUET);" | bendsql_connect_root
+echo "create or replace stage data_fs url = '${DATADIR}' FILE_FORMAT = (type = PARQUET);" | bendsql_connect_root
 if [ -z "$TEST_STAGE_STORAGE" ] || [ "$TEST_STAGE_STORAGE" == "fs" ]; then
-	echo "create or replace stage data url = '${DATADIR}' FILE_FORMAT = (type = PARQUET);" | $BENDSQL_CLIENT_CONNECT
+	echo "create or replace stage data url = '${DATADIR}' FILE_FORMAT = (type = PARQUET);" | bendsql_connect_root
 elif [ "$TEST_STAGE_STORAGE" == "s3" ]; then
-	echo "create or replace stage data url='s3://testbucket/data/' connection=(connection_name='my_conn_s3') FILE_FORMAT = (type = PARQUET);" | $BENDSQL_CLIENT_CONNECT
+	echo "create or replace stage data url='s3://testbucket/data/' connection=(connection_name='my_conn_s3') FILE_FORMAT = (type = PARQUET);" | bendsql_connect_root
 else
 	echo "unknown TEST_STAGE_STORAGE value: ${TEST_STAGE_STORAGE}"
 	exit 1
 fi
 
-echo "drop table if exists ontime" | $BENDSQL_CLIENT_CONNECT
-cat tests/data/ddl/ontime.sql | $BENDSQL_CLIENT_CONNECT
+echo "drop table if exists ontime" | bendsql_connect_root
+cat tests/data/ddl/ontime.sql | bendsql_connect_root
 
 if [ -z "$TEST_STAGE_DEDUP" ] || [ "$TEST_STAGE_DEDUP" = "full_path" ]; then
     FULL_PATH=1
@@ -32,12 +32,12 @@ else
     exit 1
 fi
 
-echo "set global copy_dedup_full_path_by_default = ${FULL_PATH}" | $BENDSQL_CLIENT_CONNECT
+echo "set global copy_dedup_full_path_by_default = ${FULL_PATH}" | bendsql_connect_root
 
 if [ -z "$TEST_STAGE_SIZE" ] || [ "$TEST_STAGE_SIZE" = "small" ]; then
-		echo "set global parquet_fast_read_bytes = 1048576" | $BENDSQL_CLIENT_CONNECT
+		echo "set global parquet_fast_read_bytes = 1048576" | bendsql_connect_root
 elif [ "$TEST_STAGE_SIZE" = "large" ]; then
-		echo "set global parquet_fast_read_bytes = 0" | $BENDSQL_CLIENT_CONNECT
+		echo "set global parquet_fast_read_bytes = 0" | bendsql_connect_root
 else
     echo "TEST_STAGE_DEDUP must be 'small' or 'large'" >&2
     exit 1

tests/sqllogictests/scripts/prepare_tpcds_data.sh

@@ -36,10 +36,10 @@ tables=(
 
 force=${2:-"1"}
 if [ "$force" == "0" ]; then
-	table_exists=$(echo "SELECT COUNT() FROM system.tables WHERE database = '${db}' AND name = 'call_center'" | $BENDSQL_CLIENT_CONNECT --output tsv)
+	table_exists=$(echo "SELECT COUNT() FROM system.tables WHERE database = '${db}' AND name = 'call_center'" | bendsql_connect_root --output tsv)
 	table_exists=$(echo "$table_exists" | tr -d '\r\n[:space:]')
 	if [ -n "$table_exists" ] && [ "$table_exists" -gt 0 ]; then
-		res=$(echo "SELECT COUNT() from ${db}.call_center" | $BENDSQL_CLIENT_CONNECT --output tsv)
+		res=$(echo "SELECT COUNT() from ${db}.call_center" | bendsql_connect_root --output tsv)
 		res=$(echo "$res" | tr -d '\r\n[:space:]')
 		if [ -n "$res" ] && [ "$res" -gt 0 ]; then
 			echo "Table $db.call_center already exists and is not empty, size: ${res}. Use force=1 to override it."
@@ -48,11 +48,11 @@ if [ "$force" == "0" ]; then
 	fi
 fi
 
-echo "CREATE OR REPLACE DATABASE tpcds" | $BENDSQL_CLIENT_CONNECT
+echo "CREATE OR REPLACE DATABASE tpcds" | bendsql_connect_root
 
 # Create Tables;
 # shellcheck disable=SC2002
-cat ${target_dir}/scripts/tpcds.sql | $BENDSQL_CLIENT_CONNECT
+cat ${target_dir}/scripts/tpcds.sql | bendsql_connect_root
 python ${target_dir}/scripts/prepare_duckdb_tpcds_data.py 1
 
 stmt "drop stage if exists s1"

tests/sqllogictests/scripts/prepare_tpch_data.sh

@@ -9,10 +9,10 @@ db=${1:-"tpch_test"}
 force=${2:-"1"}
 
 if [ "$force" == "0" ]; then
-	table_exists=$(echo "SELECT COUNT() FROM system.tables WHERE database = '${db}' AND name = 'nation'" | $BENDSQL_CLIENT_CONNECT --output tsv)
+	table_exists=$(echo "SELECT COUNT() FROM system.tables WHERE database = '${db}' AND name = 'nation'" | bendsql_connect_root --output tsv)
 	table_exists=$(echo "$table_exists" | tr -d '\r\n[:space:]')
 	if [ -n "$table_exists" ] && [ "$table_exists" -gt 0 ]; then
-		res=$(echo "SELECT COUNT() from ${db}.nation" | $BENDSQL_CLIENT_CONNECT --output tsv)
+		res=$(echo "SELECT COUNT() from ${db}.nation" | bendsql_connect_root --output tsv)
 		res=$(echo "$res" | tr -d '\r\n[:space:]')
 		if [ -n "$res" ] && [ "$res" -gt 0 ]; then
 			echo "Table $db.nation already exists and is not empty, size: ${res}. Use force=1 to override it."
@@ -21,11 +21,11 @@ if [ "$force" == "0" ]; then
 	fi
 fi
 
-echo "DROP DATABASE if EXISTS ${db}" | $BENDSQL_CLIENT_CONNECT
-echo "CREATE DATABASE ${db}" | $BENDSQL_CLIENT_CONNECT
+echo "DROP DATABASE if EXISTS ${db}" | bendsql_connect_root
+echo "CREATE DATABASE ${db}" | bendsql_connect_root
 
 for t in customer lineitem nation orders partsupp part region supplier; do
-	echo "DROP TABLE IF EXISTS ${db}.$t" | $BENDSQL_CLIENT_CONNECT
+	echo "DROP TABLE IF EXISTS ${db}.$t" | bendsql_connect_root
 done
 
 # create tpch tables
@@ -35,14 +35,14 @@ echo "CREATE TABLE IF NOT EXISTS ${db}.nation
     n_name       STRING not null,
     n_regionkey  INTEGER not null,
     n_comment    STRING
-) CLUSTER BY (n_nationkey)" | $BENDSQL_CLIENT_CONNECT
+) CLUSTER BY (n_nationkey)" | bendsql_connect_root
 
 echo "CREATE TABLE IF NOT EXISTS ${db}.region
 (
     r_regionkey  INTEGER not null,
     r_name       STRING not null,
     r_comment    STRING
-) CLUSTER BY (r_regionkey)" | $BENDSQL_CLIENT_CONNECT
+) CLUSTER BY (r_regionkey)" | bendsql_connect_root
 
 echo "CREATE TABLE IF NOT EXISTS ${db}.part
 (
@@ -55,7 +55,7 @@ echo "CREATE TABLE IF NOT EXISTS ${db}.part
     p_container   STRING not null,
     p_retailprice DECIMAL(15, 2) not null,
     p_comment     STRING not null
-) CLUSTER BY (p_partkey)" | $BENDSQL_CLIENT_CONNECT
+) CLUSTER BY (p_partkey)" | bendsql_connect_root
 
 echo "CREATE TABLE IF NOT EXISTS ${db}.supplier
 (
@@ -66,7 +66,7 @@ echo "CREATE TABLE IF NOT EXISTS ${db}.supplier
     s_phone       STRING not null,
     s_acctbal     DECIMAL(15, 2) not null,
     s_comment     STRING not null
-) CLUSTER BY (s_suppkey)" | $BENDSQL_CLIENT_CONNECT
+) CLUSTER BY (s_suppkey)" | bendsql_connect_root
 
 echo "CREATE TABLE IF NOT EXISTS ${db}.partsupp
 (
@@ -75,7 +75,7 @@ echo "CREATE TABLE IF NOT EXISTS ${db}.partsupp
     ps_availqty    BIGINT not null,
     ps_supplycost  DECIMAL(15, 2)  not null,
     ps_comment     STRING not null
-) CLUSTER BY (ps_partkey)" | $BENDSQL_CLIENT_CONNECT
+) CLUSTER BY (ps_partkey)" | bendsql_connect_root
 
 echo "CREATE TABLE IF NOT EXISTS ${db}.customer
 (
@@ -87,7 +87,7 @@ echo "CREATE TABLE IF NOT EXISTS ${db}.customer
     c_acctbal     DECIMAL(15, 2)   not null,
     c_mktsegment  STRING not null,
     c_comment     STRING not null
-) CLUSTER BY (c_custkey)" | $BENDSQL_CLIENT_CONNECT
+) CLUSTER BY (c_custkey)" | bendsql_connect_root
 
 echo "CREATE TABLE IF NOT EXISTS ${db}.orders
 (
@@ -100,7 +100,7 @@ echo "CREATE TABLE IF NOT EXISTS ${db}.orders
     o_clerk          STRING not null,
     o_shippriority   INTEGER not null,
     o_comment        STRING not null
-) CLUSTER BY (o_orderkey, o_orderdate)" | $BENDSQL_CLIENT_CONNECT
+) CLUSTER BY (o_orderkey, o_orderdate)" | bendsql_connect_root
 
 echo "CREATE TABLE IF NOT EXISTS ${db}.lineitem
 (
@@ -120,7 +120,7 @@ echo "CREATE TABLE IF NOT EXISTS ${db}.lineitem
     l_shipinstruct STRING not null,
     l_shipmode     STRING not null,
     l_comment      STRING not null
-) CLUSTER BY(l_shipdate, l_orderkey)" | $BENDSQL_CLIENT_CONNECT
+) CLUSTER BY(l_shipdate, l_orderkey)" | bendsql_connect_root
 
 #import data
 CURDIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)

tests/suites/0_stateless/00_dummy/00_0003_dummy_select_sh.sh

@@ -4,8 +4,8 @@ CURDIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
 . "$CURDIR"/../../../shell_env.sh
 
 
-echo "SELECT 1;select 2;select 3;" | $BENDSQL_CLIENT_CONNECT
+echo "SELECT 1;select 2;select 3;" | bendsql_connect_root
 
-echo "SELECT 1" | $BENDSQL_CLIENT_CONNECT
-echo "SELECT 2" | $BENDSQL_CLIENT_CONNECT
-echo "SELECT 3" | $BENDSQL_CLIENT_CONNECT
+echo "SELECT 1" | bendsql_connect_root
+echo "SELECT 2" | bendsql_connect_root
+echo "SELECT 3" | bendsql_connect_root

tests/suites/0_stateless/02_ddl/02_0001_autoincrement.sh

@@ -3,7 +3,7 @@
 CURDIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
 . "$CURDIR"/../../../shell_env.sh
 
-echo "create or replace database test" | $BENDSQL_CLIENT_CONNECT
+echo "create or replace database test" | bendsql_connect_root
 
 
 stmt """

tests/suites/0_stateless/02_ddl/02_0001_show_create_table.sh

@@ -3,7 +3,7 @@
 CURDIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
 . "$CURDIR"/../../../shell_env.sh
 
-echo "create or replace database test" | $BENDSQL_CLIENT_CONNECT
+echo "create or replace database test" | bendsql_connect_root
 
 
 stmt """
@@ -37,7 +37,7 @@ and t.name = 'b'
 echo """
 set hide_options_in_show_create_table=0;
 SHOW CREATE TABLE test.b;
-""" | $BENDSQL_CLIENT_CONNECT
+""" | bendsql_connect_root
 
 stmt "create or replace view test.v_b as select * from test.b"
 
@@ -60,7 +60,7 @@ query "SHOW CREATE TABLE test.c"
 echo """
 create or replace table test.t(c1 int, c2 int);
 create or replace table test.t1(c1 int, c2 string);
-""" | $BENDSQL_CLIENT_CONNECT
+""" | bendsql_connect_root
 
 stmt "create or replace view test.v_union as select c1 from test.t union all select c1 from test.t1;"
 
@@ -87,7 +87,7 @@ show create table test.tc;
 set quoted_ident_case_sensitive=1;
 set sql_dialect='MySQL';
 show create table test.tc;
-""" | $BENDSQL_CLIENT_CONNECT
+""" | bendsql_connect_root
 
 stmt """
 create or replace table test.auto_increment(c1 int, c2 int autoincrement, c3 int identity (2, 3) order);

tests/suites/0_stateless/03_dml/03_0016_update_with_lock.sh

@@ -3,32 +3,32 @@
 CURDIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
 . "$CURDIR"/../../../shell_env.sh
 
-echo "drop database if exists test_update" | $BENDSQL_CLIENT_CONNECT
+echo "drop database if exists test_update" | bendsql_connect_root
 
-echo "CREATE DATABASE test_update" | $BENDSQL_CLIENT_CONNECT
-echo "create table test_update.t(a int, b int)" | $BENDSQL_CLIENT_CONNECT
-echo "set global enable_table_lock = 1" | $BENDSQL_CLIENT_CONNECT
+echo "CREATE DATABASE test_update" | bendsql_connect_root
+echo "create table test_update.t(a int, b int)" | bendsql_connect_root
+echo "set global enable_table_lock = 1" | bendsql_connect_root
 
 for i in $(seq 1 10);do
 	(
 		j=$(($i+1))
-		echo "insert into test_update.t values($i, $j)" | $BENDSQL_CLIENT_OUTPUT_NULL
+		echo "insert into test_update.t values($i, $j)" | bendsql_connect_root_null
 	)&
 done
 wait
 
-echo "optimize table test_update.t compact" | $BENDSQL_CLIENT_CONNECT
-echo "select count() from test_update.t where a + 1 = b" | $BENDSQL_CLIENT_CONNECT
+echo "optimize table test_update.t compact" | bendsql_connect_root
+echo "select count() from test_update.t where a + 1 = b" | bendsql_connect_root
 
 echo "Test table lock for update"
 for i in $(seq 1 10);do
 	(
-		echo "update test_update.t set b = $i where a = $i" | $BENDSQL_CLIENT_OUTPUT_NULL
+		echo "update test_update.t set b = $i where a = $i" | bendsql_connect_root_null
 	)&
 done
 wait
 
-echo "select count() from test_update.t where a = b" | $BENDSQL_CLIENT_CONNECT
+echo "select count() from test_update.t where a = b" | bendsql_connect_root
 
-echo "drop table test_update.t all" | $BENDSQL_CLIENT_CONNECT
-echo "drop database test_update" | $BENDSQL_CLIENT_CONNECT
+echo "drop table test_update.t all" | bendsql_connect_root
+echo "drop database test_update" | bendsql_connect_root