You are viewing a plain text version of this content. The canonical link for it is here.
Posted to notifications@shardingsphere.apache.org by du...@apache.org on 2024/12/17 00:11:16 UTC

(shardingsphere) branch master updated: Add DBCOMPATIBILITY 'B' parameter to opengauss database (#34062)

This is an automated email from the ASF dual-hosted git repository.

duanzhengqiang pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/shardingsphere.git


The following commit(s) were added to refs/heads/master by this push:
     new a93e579f4d9 Add DBCOMPATIBILITY 'B' parameter to opengauss database (#34062)
a93e579f4d9 is described below

commit a93e579f4d9395da2036487d6c5a4d0816d28e58
Author: YaoFly <24...@qq.com>
AuthorDate: Tue Dec 17 08:11:09 2024 +0800

    Add DBCOMPATIBILITY 'B' parameter to opengauss database (#34062)
    
    * Support GroupConcat sql for aggregating multiple shards(#33797)
    
    * Check Style fix(#33797)
    
    * Check Style fix(#33797)
    
    * spotless fix (#33797)
    
    * unit test fix  (#33797)
    
    * spotless fix (#33797)
    
    * group_concat distinct compatible  (#33797)
    
    * group_concat distinct compatible  (#33797)
    
    * unit test fix for distinct group_concat  (#33797)
    
    * e2e test for group_concat  (#33797)
    
    * e2e test for group_concat  (#33797)
    
    * code format  (#33797)
    
    * e2e test  (#33797)
    
    * e2e test  (#33797)
    
    * e2e test  (#33797)
    
    * remove useless code(#33797)
    
    * code optimization (#33797)
    
    * sql parse unit test (#33797)
    
    * RELEASE-NOTES.md updated(#33797)
    
    * Code Optimization (#33797)
    
    * Support GroupConcat sql for aggregating multiple shards in opengauss and doris database(#33797)
    
    * doris parse unit test fix (#33797)
    
    * spotless fix (#33797)
    
    * Update RELEASE-NOTES.md
    
    * Add DBCOMPATIBILITY 'B' parameter to opengauss database (#33992)
    
    * Add DBCOMPATIBILITY 'B' parameter to opengauss database for dbtbl_with_readwrite_splitting and  readwrite_splitting scenarios(#33992)
    
    * add openGauss test case for group_concat. (#33992)
    
    ---------
    
    Co-authored-by: yaofly <wa...@yonghui.cn>
    Co-authored-by: Zhengqiang Duan <du...@apache.org>
---
 .../cases/dql/e2e-dql-select-aggregate.xml         |  4 +--
 .../actual/init-sql/opengauss/01-actual-init.sql   | 20 +++++------
 .../init-sql/opengauss/01-expected-init.sql        |  2 +-
 .../actual/init-sql/opengauss/01-actual-init.sql   | 20 +++++------
 .../init-sql/opengauss/01-expected-init.sql        |  2 +-
 .../actual/init-sql/opengauss/01-actual-init.sql   | 40 +++++++++++-----------
 .../init-sql/opengauss/01-expected-init.sql        |  4 +--
 .../actual/init-sql/opengauss/01-actual-init.sql   |  6 ++--
 .../init-sql/opengauss/01-expected-init.sql        |  4 +--
 .../actual/init-sql/opengauss/01-actual-init.sql   |  2 +-
 .../init-sql/opengauss/01-expected-init.sql        |  2 +-
 11 files changed, 53 insertions(+), 53 deletions(-)

diff --git a/test/e2e/sql/src/test/resources/cases/dql/e2e-dql-select-aggregate.xml b/test/e2e/sql/src/test/resources/cases/dql/e2e-dql-select-aggregate.xml
index f4bd5b48092..643f8d69e48 100644
--- a/test/e2e/sql/src/test/resources/cases/dql/e2e-dql-select-aggregate.xml
+++ b/test/e2e/sql/src/test/resources/cases/dql/e2e-dql-select-aggregate.xml
@@ -145,11 +145,11 @@
         <assertion parameters="abc:String" expected-data-source-name="read_dataset" />
     </test-case>
 
-    <test-case sql="SELECT GROUP_CONCAT(o.remark) as order_id_group_concat FROM t_order o where o.order_id > 1 - 1" db-types="MySQL" scenario-types="db,tbl,dbtbl_with_readwrite_splitting,readwrite_splitting,db_tbl_sql_federation">
+    <test-case sql="SELECT GROUP_CONCAT(o.remark) as order_id_group_concat FROM t_order o where o.order_id > 1 - 1" db-types="MySQL,openGauss" scenario-types="db,tbl,dbtbl_with_readwrite_splitting,readwrite_splitting,db_tbl_sql_federation">
         <assertion expected-data-source-name="read_dataset" />
     </test-case>
 
-    <test-case sql="SELECT GROUP_CONCAT(distinct o.remark SEPARATOR ' ') as order_id_group_concat FROM t_order o where o.order_id > 1 - 1" db-types="MySQL" scenario-types="db,tbl,dbtbl_with_readwrite_splitting,readwrite_splitting">
+    <test-case sql="SELECT GROUP_CONCAT(distinct o.remark SEPARATOR ' ') as order_id_group_concat FROM t_order o where o.order_id > 1 - 1" db-types="MySQL,openGauss" scenario-types="db,tbl,dbtbl_with_readwrite_splitting,readwrite_splitting">
         <assertion expected-data-source-name="read_dataset" />
     </test-case>
 </e2e-test-cases>
diff --git a/test/e2e/sql/src/test/resources/env/scenario/db/data/actual/init-sql/opengauss/01-actual-init.sql b/test/e2e/sql/src/test/resources/env/scenario/db/data/actual/init-sql/opengauss/01-actual-init.sql
index fad044bb043..89ed888cc2e 100644
--- a/test/e2e/sql/src/test/resources/env/scenario/db/data/actual/init-sql/opengauss/01-actual-init.sql
+++ b/test/e2e/sql/src/test/resources/env/scenario/db/data/actual/init-sql/opengauss/01-actual-init.sql
@@ -15,16 +15,16 @@
 -- limitations under the License.
 --
 
-CREATE DATABASE db_0;
-CREATE DATABASE db_1;
-CREATE DATABASE db_2;
-CREATE DATABASE db_3;
-CREATE DATABASE db_4;
-CREATE DATABASE db_5;
-CREATE DATABASE db_6;
-CREATE DATABASE db_7;
-CREATE DATABASE db_8;
-CREATE DATABASE db_9;
+CREATE DATABASE db_0 DBCOMPATIBILITY 'B';
+CREATE DATABASE db_1 DBCOMPATIBILITY 'B';
+CREATE DATABASE db_2 DBCOMPATIBILITY 'B';
+CREATE DATABASE db_3 DBCOMPATIBILITY 'B';
+CREATE DATABASE db_4 DBCOMPATIBILITY 'B';
+CREATE DATABASE db_5 DBCOMPATIBILITY 'B';
+CREATE DATABASE db_6 DBCOMPATIBILITY 'B';
+CREATE DATABASE db_7 DBCOMPATIBILITY 'B';
+CREATE DATABASE db_8 DBCOMPATIBILITY 'B';
+CREATE DATABASE db_9 DBCOMPATIBILITY 'B';
 
 GRANT ALL PRIVILEGES ON DATABASE db_0 TO test_user;
 GRANT ALL PRIVILEGES ON DATABASE db_1 TO test_user;
diff --git a/test/e2e/sql/src/test/resources/env/scenario/db/data/expected/init-sql/opengauss/01-expected-init.sql b/test/e2e/sql/src/test/resources/env/scenario/db/data/expected/init-sql/opengauss/01-expected-init.sql
index e40a76ac64f..a12380e8208 100644
--- a/test/e2e/sql/src/test/resources/env/scenario/db/data/expected/init-sql/opengauss/01-expected-init.sql
+++ b/test/e2e/sql/src/test/resources/env/scenario/db/data/expected/init-sql/opengauss/01-expected-init.sql
@@ -16,7 +16,7 @@
 --
 
 DROP DATABASE IF EXISTS expected_dataset;
-CREATE DATABASE expected_dataset;
+CREATE DATABASE expected_dataset DBCOMPATIBILITY 'B';
 
 GRANT ALL PRIVILEGES ON DATABASE expected_dataset TO test_user;
 
diff --git a/test/e2e/sql/src/test/resources/env/scenario/db_tbl_sql_federation/data/actual/init-sql/opengauss/01-actual-init.sql b/test/e2e/sql/src/test/resources/env/scenario/db_tbl_sql_federation/data/actual/init-sql/opengauss/01-actual-init.sql
index 90972c9a869..73c5c30f988 100644
--- a/test/e2e/sql/src/test/resources/env/scenario/db_tbl_sql_federation/data/actual/init-sql/opengauss/01-actual-init.sql
+++ b/test/e2e/sql/src/test/resources/env/scenario/db_tbl_sql_federation/data/actual/init-sql/opengauss/01-actual-init.sql
@@ -15,16 +15,16 @@
 -- limitations under the License.
 --
 
-CREATE DATABASE sql_federation_ds_0;
-CREATE DATABASE sql_federation_ds_1;
-CREATE DATABASE sql_federation_ds_2;
-CREATE DATABASE sql_federation_ds_3;
-CREATE DATABASE sql_federation_ds_4;
-CREATE DATABASE sql_federation_ds_5;
-CREATE DATABASE sql_federation_ds_6;
-CREATE DATABASE sql_federation_ds_7;
-CREATE DATABASE sql_federation_ds_8;
-CREATE DATABASE sql_federation_ds_9;
+CREATE DATABASE sql_federation_ds_0 DBCOMPATIBILITY 'B';
+CREATE DATABASE sql_federation_ds_1 DBCOMPATIBILITY 'B';
+CREATE DATABASE sql_federation_ds_2 DBCOMPATIBILITY 'B';
+CREATE DATABASE sql_federation_ds_3 DBCOMPATIBILITY 'B';
+CREATE DATABASE sql_federation_ds_4 DBCOMPATIBILITY 'B';
+CREATE DATABASE sql_federation_ds_5 DBCOMPATIBILITY 'B';
+CREATE DATABASE sql_federation_ds_6 DBCOMPATIBILITY 'B';
+CREATE DATABASE sql_federation_ds_7 DBCOMPATIBILITY 'B';
+CREATE DATABASE sql_federation_ds_8 DBCOMPATIBILITY 'B';
+CREATE DATABASE sql_federation_ds_9 DBCOMPATIBILITY 'B';
 
 GRANT ALL PRIVILEGES ON DATABASE sql_federation_ds_0 TO test_user;
 GRANT ALL PRIVILEGES ON DATABASE sql_federation_ds_1 TO test_user;
diff --git a/test/e2e/sql/src/test/resources/env/scenario/db_tbl_sql_federation/data/expected/init-sql/opengauss/01-expected-init.sql b/test/e2e/sql/src/test/resources/env/scenario/db_tbl_sql_federation/data/expected/init-sql/opengauss/01-expected-init.sql
index 8464b97016b..4acf00d141f 100644
--- a/test/e2e/sql/src/test/resources/env/scenario/db_tbl_sql_federation/data/expected/init-sql/opengauss/01-expected-init.sql
+++ b/test/e2e/sql/src/test/resources/env/scenario/db_tbl_sql_federation/data/expected/init-sql/opengauss/01-expected-init.sql
@@ -16,7 +16,7 @@
 --
 
 DROP DATABASE IF EXISTS sql_federation;
-CREATE DATABASE sql_federation;
+CREATE DATABASE sql_federation DBCOMPATIBILITY 'B';
 
 GRANT ALL PRIVILEGES ON DATABASE sql_federation TO test_user;
 
diff --git a/test/e2e/sql/src/test/resources/env/scenario/dbtbl_with_readwrite_splitting/data/actual/init-sql/opengauss/01-actual-init.sql b/test/e2e/sql/src/test/resources/env/scenario/dbtbl_with_readwrite_splitting/data/actual/init-sql/opengauss/01-actual-init.sql
index 4e1037ceb43..393d92102f0 100644
--- a/test/e2e/sql/src/test/resources/env/scenario/dbtbl_with_readwrite_splitting/data/actual/init-sql/opengauss/01-actual-init.sql
+++ b/test/e2e/sql/src/test/resources/env/scenario/dbtbl_with_readwrite_splitting/data/actual/init-sql/opengauss/01-actual-init.sql
@@ -15,26 +15,26 @@
 -- limitations under the License.
 --
 
-CREATE DATABASE write_ds_0;
-CREATE DATABASE write_ds_1;
-CREATE DATABASE write_ds_2;
-CREATE DATABASE write_ds_3;
-CREATE DATABASE write_ds_4;
-CREATE DATABASE write_ds_5;
-CREATE DATABASE write_ds_6;
-CREATE DATABASE write_ds_7;
-CREATE DATABASE write_ds_8;
-CREATE DATABASE write_ds_9;
-CREATE DATABASE read_ds_0;
-CREATE DATABASE read_ds_1;
-CREATE DATABASE read_ds_2;
-CREATE DATABASE read_ds_3;
-CREATE DATABASE read_ds_4;
-CREATE DATABASE read_ds_5;
-CREATE DATABASE read_ds_6;
-CREATE DATABASE read_ds_7;
-CREATE DATABASE read_ds_8;
-CREATE DATABASE read_ds_9;
+CREATE DATABASE write_ds_0 DBCOMPATIBILITY 'B';
+CREATE DATABASE write_ds_1 DBCOMPATIBILITY 'B';
+CREATE DATABASE write_ds_2 DBCOMPATIBILITY 'B';
+CREATE DATABASE write_ds_3 DBCOMPATIBILITY 'B';
+CREATE DATABASE write_ds_4 DBCOMPATIBILITY 'B';
+CREATE DATABASE write_ds_5 DBCOMPATIBILITY 'B';
+CREATE DATABASE write_ds_6 DBCOMPATIBILITY 'B';
+CREATE DATABASE write_ds_7 DBCOMPATIBILITY 'B';
+CREATE DATABASE write_ds_8 DBCOMPATIBILITY 'B';
+CREATE DATABASE write_ds_9 DBCOMPATIBILITY 'B';
+CREATE DATABASE read_ds_0 DBCOMPATIBILITY 'B';
+CREATE DATABASE read_ds_1 DBCOMPATIBILITY 'B';
+CREATE DATABASE read_ds_2 DBCOMPATIBILITY 'B';
+CREATE DATABASE read_ds_3 DBCOMPATIBILITY 'B';
+CREATE DATABASE read_ds_4 DBCOMPATIBILITY 'B';
+CREATE DATABASE read_ds_5 DBCOMPATIBILITY 'B';
+CREATE DATABASE read_ds_6 DBCOMPATIBILITY 'B';
+CREATE DATABASE read_ds_7 DBCOMPATIBILITY 'B';
+CREATE DATABASE read_ds_8 DBCOMPATIBILITY 'B';
+CREATE DATABASE read_ds_9 DBCOMPATIBILITY 'B';
 
 GRANT ALL PRIVILEGES ON DATABASE write_ds_0 TO test_user;
 GRANT ALL PRIVILEGES ON DATABASE write_ds_1 TO test_user;
diff --git a/test/e2e/sql/src/test/resources/env/scenario/dbtbl_with_readwrite_splitting/data/expected/init-sql/opengauss/01-expected-init.sql b/test/e2e/sql/src/test/resources/env/scenario/dbtbl_with_readwrite_splitting/data/expected/init-sql/opengauss/01-expected-init.sql
index 34c1f4f9765..91376f90441 100644
--- a/test/e2e/sql/src/test/resources/env/scenario/dbtbl_with_readwrite_splitting/data/expected/init-sql/opengauss/01-expected-init.sql
+++ b/test/e2e/sql/src/test/resources/env/scenario/dbtbl_with_readwrite_splitting/data/expected/init-sql/opengauss/01-expected-init.sql
@@ -16,7 +16,7 @@
 --
 
 DROP DATABASE IF EXISTS write_dataset;
-CREATE DATABASE write_dataset;
+CREATE DATABASE write_dataset DBCOMPATIBILITY 'B';
 
 GRANT ALL PRIVILEGES ON DATABASE write_dataset TO test_user;
 
@@ -44,7 +44,7 @@ CREATE INDEX order_index_t_order ON t_order (order_id);
 
 
 DROP DATABASE IF EXISTS read_dataset;
-CREATE DATABASE read_dataset;
+CREATE DATABASE read_dataset DBCOMPATIBILITY 'B';
 
 GRANT ALL PRIVILEGES ON DATABASE read_dataset TO test_user;
 
diff --git a/test/e2e/sql/src/test/resources/env/scenario/readwrite_splitting/data/actual/init-sql/opengauss/01-actual-init.sql b/test/e2e/sql/src/test/resources/env/scenario/readwrite_splitting/data/actual/init-sql/opengauss/01-actual-init.sql
index 119ad3c56fd..0f50ce5f867 100644
--- a/test/e2e/sql/src/test/resources/env/scenario/readwrite_splitting/data/actual/init-sql/opengauss/01-actual-init.sql
+++ b/test/e2e/sql/src/test/resources/env/scenario/readwrite_splitting/data/actual/init-sql/opengauss/01-actual-init.sql
@@ -15,9 +15,9 @@
 -- limitations under the License.
 --
 
-CREATE DATABASE write_ds;
-CREATE DATABASE read_0;
-CREATE DATABASE read_1;
+CREATE DATABASE write_ds DBCOMPATIBILITY 'B';
+CREATE DATABASE read_0 DBCOMPATIBILITY 'B';
+CREATE DATABASE read_1 DBCOMPATIBILITY 'B';
 
 GRANT ALL PRIVILEGES ON DATABASE write_ds TO test_user;
 GRANT ALL PRIVILEGES ON DATABASE read_0 TO test_user;
diff --git a/test/e2e/sql/src/test/resources/env/scenario/readwrite_splitting/data/expected/init-sql/opengauss/01-expected-init.sql b/test/e2e/sql/src/test/resources/env/scenario/readwrite_splitting/data/expected/init-sql/opengauss/01-expected-init.sql
index 0711965cf69..95f2c0dbb21 100644
--- a/test/e2e/sql/src/test/resources/env/scenario/readwrite_splitting/data/expected/init-sql/opengauss/01-expected-init.sql
+++ b/test/e2e/sql/src/test/resources/env/scenario/readwrite_splitting/data/expected/init-sql/opengauss/01-expected-init.sql
@@ -16,7 +16,7 @@
 --
 
 DROP DATABASE IF EXISTS write_dataset;
-CREATE DATABASE write_dataset;
+CREATE DATABASE write_dataset DBCOMPATIBILITY 'B';
 
 GRANT ALL PRIVILEGES ON DATABASE write_dataset TO test_user;
 
@@ -32,7 +32,7 @@ CREATE INDEX order_index_t_order ON t_order (order_id);
 
 
 DROP DATABASE IF EXISTS read_dataset;
-CREATE DATABASE read_dataset;
+CREATE DATABASE read_dataset DBCOMPATIBILITY 'B';
 
 GRANT ALL PRIVILEGES ON DATABASE read_dataset TO test_user;
 
diff --git a/test/e2e/sql/src/test/resources/env/scenario/tbl/data/actual/init-sql/opengauss/01-actual-init.sql b/test/e2e/sql/src/test/resources/env/scenario/tbl/data/actual/init-sql/opengauss/01-actual-init.sql
index e39ea90dad5..45ff2a42238 100644
--- a/test/e2e/sql/src/test/resources/env/scenario/tbl/data/actual/init-sql/opengauss/01-actual-init.sql
+++ b/test/e2e/sql/src/test/resources/env/scenario/tbl/data/actual/init-sql/opengauss/01-actual-init.sql
@@ -15,7 +15,7 @@
 -- limitations under the License.
 --
 
-CREATE DATABASE tbl;
+CREATE DATABASE tbl DBCOMPATIBILITY 'B';
 
 GRANT ALL PRIVILEGES ON DATABASE tbl TO test_user;
 
diff --git a/test/e2e/sql/src/test/resources/env/scenario/tbl/data/expected/init-sql/opengauss/01-expected-init.sql b/test/e2e/sql/src/test/resources/env/scenario/tbl/data/expected/init-sql/opengauss/01-expected-init.sql
index 49fb8c1ca4f..9522ffa9451 100644
--- a/test/e2e/sql/src/test/resources/env/scenario/tbl/data/expected/init-sql/opengauss/01-expected-init.sql
+++ b/test/e2e/sql/src/test/resources/env/scenario/tbl/data/expected/init-sql/opengauss/01-expected-init.sql
@@ -16,7 +16,7 @@
 --
 
 DROP DATABASE IF EXISTS expected_dataset;
-CREATE DATABASE expected_dataset;
+CREATE DATABASE expected_dataset DBCOMPATIBILITY 'B';
 
 GRANT ALL PRIVILEGES ON DATABASE expected_dataset TO test_user;